Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / StyleSheetContents.cpp

diff --git a/src/third_party/WebKit/Source/core/css/StyleSheetContents.cpp b/src/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
index 2b3da24..dca9cea 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
+++ b/src/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
@@ -36,7 +36,7 @@
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/Deque.h"
 
-namespace WebCore {
+namespace blink {
 
 // Rough size estimate for the memory cache.
 unsigned StyleSheetContents::estimatedSizeInBytes() const
@@ -318,7 +318,7 @@ const AtomicString& StyleSheetContents::determineNamespace(const AtomicString& p
 
 void StyleSheetContents::parseAuthorStyleSheet(const CSSStyleSheetResource* cachedStyleSheet, const SecurityOrigin* securityOrigin)
 {
-    TRACE_EVENT0("webkit", "StyleSheetContents::parseAuthorStyleSheet");
+    TRACE_EVENT0("blink", "StyleSheetContents::parseAuthorStyleSheet");
 
     bool quirksMode = isQuirksModeBehavior(m_parserContext.mode());
 
@@ -391,8 +391,8 @@ void StyleSheetContents::checkLoaded()
         return;
     }
 
-    StyleSheetContents* root = rootStyleSheet();
-    if (root->m_loadingClients.isEmpty())
+    ASSERT(this == rootStyleSheet());
+    if (m_loadingClients.isEmpty())
         return;
 
     // Avoid |CSSSStyleSheet| and |ownerNode| being deleted by scripts that run via
@@ -685,12 +685,14 @@ void StyleSheetContents::findFontFaceRules(WillBeHeapVector<RawPtrWillBeMember<c
 
 void StyleSheetContents::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_ownerRule);
     visitor->trace(m_importRules);
     visitor->trace(m_childRules);
     visitor->trace(m_loadingClients);
     visitor->trace(m_completedClients);
     visitor->trace(m_ruleSet);
+#endif
 }
 
 }