Bug 1457920: Remove ServoStyleSheet.{h,cpp}. r=xidorn
authorEmilio Cobos Álvarez <emilio@crisal.io>
Mon, 30 Apr 2018 19:23:53 +0200
changeset 416543 174b29e059781c268a853a429ba42a6a2de2965b
parent 416542 04bb8bf9a707b925182b3ec604d41fffc2484b8a
child 416544 2de7dbfe200c55cfcb976ec53eae217114d91082
push id33931
push usercsabou@mozilla.com
push dateWed, 02 May 2018 15:00:50 +0000
treeherdermozilla-central@f877359308b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersxidorn
bugs1457920
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1457920: Remove ServoStyleSheet.{h,cpp}. r=xidorn MozReview-Commit-ID: 1T39DoLUBZk
layout/style/ServoStyleSheet.cpp
layout/style/ServoStyleSheet.h
layout/style/StyleSheet.cpp
layout/style/moz.build
deleted file mode 100644
--- a/layout/style/ServoStyleSheet.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/ServoStyleSheet.h"
-
-#include "mozilla/css/Rule.h"
-#include "mozilla/ServoBindings.h"
-#include "mozilla/ServoCSSRuleList.h"
-#include "mozilla/ServoImportRule.h"
-#include "mozilla/StaticPrefs.h"
-#include "mozilla/css/GroupRule.h"
-#include "mozilla/dom/CSSRuleList.h"
-#include "mozilla/dom/MediaList.h"
-#include "nsIStyleSheetLinkingElement.h"
-#include "ErrorReporter.h"
-#include "Loader.h"
-
-
-#include "mozAutoDocUpdate.h"
-
-using namespace mozilla::dom;
-
-namespace mozilla {
-
-} // namespace mozilla
deleted file mode 100644
--- a/layout/style/ServoStyleSheet.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_ServoStyleSheet_h
-#define mozilla_ServoStyleSheet_h
-
-#include "mozilla/ServoBindingTypes.h"
-#include "mozilla/StyleSheet.h"
-
-namespace mozilla {
-
-typedef StyleSheet ServoStyleSheet;
-
-} // namespace mozilla
-
-#endif // mozilla_ServoStyleSheet_h
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -2,25 +2,27 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/StyleSheet.h"
 
 #include "mozilla/ComputedStyleInlines.h"
+#include "mozilla/css/ErrorReporter.h"
 #include "mozilla/css/GroupRule.h"
 #include "mozilla/dom/CSSImportRule.h"
 #include "mozilla/dom/CSSRuleList.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/MediaList.h"
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/dom/ShadowRootBinding.h"
 #include "mozilla/ServoCSSRuleList.h"
 #include "mozilla/ServoStyleSet.h"
+#include "mozilla/StaticPrefs.h"
 #include "mozilla/StyleSheetInlines.h"
 
 #include "mozAutoDocUpdate.h"
 #include "NullPrincipal.h"
 
 namespace mozilla {
 
 StyleSheet::StyleSheet(css::SheetParsingMode aParsingMode,
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -95,17 +95,16 @@ EXPORTS.mozilla += [
     'ServoKeyframesRule.h',
     'ServoMediaRule.h',
     'ServoNamespaceRule.h',
     'ServoPageRule.h',
     'ServoSpecifiedValues.h',
     'ServoStyleRule.h',
     'ServoStyleSet.h',
     'ServoStyleSetInlines.h',
-    'ServoStyleSheet.h',
     'ServoSupportsRule.h',
     'ServoTraversalStatistics.h',
     'ServoTypes.h',
     'ServoUtils.h',
     'SheetType.h',
     'StyleAnimationValue.h',
     'StyleComplexColor.h',
     'StyleSheet.h',
@@ -214,17 +213,16 @@ UNIFIED_SOURCES += [
     'ServoKeyframeRule.cpp',
     'ServoKeyframesRule.cpp',
     'ServoMediaRule.cpp',
     'ServoNamespaceRule.cpp',
     'ServoPageRule.cpp',
     'ServoSpecifiedValues.cpp',
     'ServoStyleRule.cpp',
     'ServoStyleSet.cpp',
-    'ServoStyleSheet.cpp',
     'ServoSupportsRule.cpp',
     'StreamLoader.cpp',
     'StyleAnimationValue.cpp',
     'StyleSheet.cpp',
     'URLExtraData.cpp',
 ]
 
 SOURCES += [