Backed out changesets 4f459069cd2c and b5abd699f37b (bug 1381851) to see if it's causing Win7 ts_paint crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 09 Aug 2017 23:01:56 -0400
changeset 423490 1ac4724836cb86ae0f05ff10a729c51cb670abc0
parent 423489 397d0d91f9ad33bfe9ef0adc968cc10c05515f46
child 423491 aba6b0d5cd0f0eb3730cce1d28da4cb1dfe9d577
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1381851
milestone56.0
backs out4f459069cd2c50f72559fcb5c1435bf86b825457
b5abd699f37ba5836e281e67c8fd54dcc38576b5
Backed out changesets 4f459069cd2c and b5abd699f37b (bug 1381851) to see if it's causing Win7 ts_paint crashes.
dom/xbl/nsXBLPrototypeResources.cpp
layout/style/URLExtraData.h
--- a/dom/xbl/nsXBLPrototypeResources.cpp
+++ b/dom/xbl/nsXBLPrototypeResources.cpp
@@ -167,20 +167,19 @@ nsXBLPrototypeResources::GatherRuleProce
 void
 nsXBLPrototypeResources::ComputeServoStyleSet(nsPresContext* aPresContext)
 {
   mServoStyleSet.reset(new ServoStyleSet());
   mServoStyleSet->Init(aPresContext, nullptr);
   for (StyleSheet* sheet : mStyleSheetList) {
     MOZ_ASSERT(sheet->IsServo(),
                "This should only be called with Servo-flavored style backend!");
-    // The XBL style sheets aren't document level sheets, but we need to
-    // decide a particular SheetType to add them to style set. This type
-    // doesn't affect the place where we pull those rules from
-    // stylist::push_applicable_declarations_as_xbl_only_stylist().
+    // The sheets aren't document sheets, but we need to decide a particular
+    // SheetType so that we can pull them out from the right place on the
+    // Servo side.
     mServoStyleSet->AppendStyleSheet(SheetType::Doc, sheet->AsServo());
   }
   mServoStyleSet->UpdateStylistIfNeeded();
 }
 
 void
 nsXBLPrototypeResources::AppendStyleSheet(StyleSheet* aSheet)
 {
--- a/layout/style/URLExtraData.h
+++ b/layout/style/URLExtraData.h
@@ -4,17 +4,16 @@
  * 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/. */
 
 /* thread-safe container of information for resolving url values */
 
 #ifndef mozilla_URLExtraData_h
 #define mozilla_URLExtraData_h
 
-#include "mozilla/dom/URL.h"
 #include "mozilla/Move.h"
 #include "mozilla/StaticPtr.h"
 
 #include "nsCOMPtr.h"
 #include "nsIPrincipal.h"
 #include "nsIURI.h"
 
 namespace mozilla {
@@ -22,19 +21,16 @@ namespace mozilla {
 struct URLExtraData
 {
   URLExtraData(already_AddRefed<nsIURI> aBaseURI,
                already_AddRefed<nsIURI> aReferrer,
                already_AddRefed<nsIPrincipal> aPrincipal)
     : mBaseURI(Move(aBaseURI))
     , mReferrer(Move(aReferrer))
     , mPrincipal(Move(aPrincipal))
-      // When we hold the URI data of a style sheet, mReferrer is always
-      // equal to the sheet URI.
-    , mIsChrome(mReferrer ? dom::IsChromeURI(mReferrer) : false)
   {
     MOZ_ASSERT(mBaseURI);
   }
 
   URLExtraData(nsIURI* aBaseURI, nsIURI* aReferrer, nsIPrincipal* aPrincipal)
     : URLExtraData(do_AddRef(aBaseURI),
                    do_AddRef(aReferrer),
                    do_AddRef(aPrincipal)) {}
@@ -54,17 +50,14 @@ struct URLExtraData
 
 private:
   ~URLExtraData();
 
   nsCOMPtr<nsIURI> mBaseURI;
   nsCOMPtr<nsIURI> mReferrer;
   nsCOMPtr<nsIPrincipal> mPrincipal;
 
-  // True if mReferrer is a chrome:// URI.
-  const bool mIsChrome;
-
   static StaticRefPtr<URLExtraData> sDummy;
 };
 
 } // namespace mozilla
 
 #endif // mozilla_URLExtraData_h