Bug 1304302 part 2 - Some small fixes. r=heycam

MozReview-Commit-ID: 7rnl4wkMorC
2016-09-26 22:03:25 +10:00
parent 51c2a1c391
commit bb435b8c71
3 changed files with 3 additions and 2 deletions
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1121,7 +1121,7 @@ Loader::CreateSheet(nsIURI* aURI,
      // Then our per-document complete sheets.
      URIPrincipalReferrerPolicyAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode, aReferrerPolicy);

-      StyleSheetHandle completeSheet;
+      StyleSheetHandle completeSheet = nullptr;
      mSheets->mCompleteSheets.Get(&key, &completeSheet);
      sheet = completeSheet;
      LOG(("  From completed: %p", sheet->AsVoidPtr()));
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -32,7 +32,7 @@ ServoStyleSheet::IsApplicable() const
 bool
 ServoStyleSheet::HasRules() const
 {
-  return Servo_StyleSheet_HasRules(RawSheet());
+  return mSheet && Servo_StyleSheet_HasRules(mSheet);
 }

 nsIDocument*
--- a/layout/style/StyleSheetHandleInlines.h
+++ b/layout/style/StyleSheetHandleInlines.h
@@ -171,6 +171,7 @@ StyleSheetHandle::Ptr::List(FILE* aOut, int32_t aIndex) const
 #endif

 #undef FORWARD
+#undef FORWARD_CONCRETE

 inline void
 ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,