Changeset 208279 in webkit

Timestamp:

Nov 2, 2016 6:18:46 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r207753-207755): ASSERTION FAILED: m_parsedStyleSheetCache->isInMemoryCache()
​https://bugs.webkit.org/show_bug.cgi?id=163905

Patch by Youenn Fablet <​youenn@apple.com> on 2016-11-02
Reviewed by Antti Koivisto.

Source/WebCore:

Covered by existing tests and http/tests/security/cached-cross-origin-shared-css-stylesheet.html

Small refactoring to do more member fields initialization in StyleSheetContents header.
Refactored StyleSheetContents::m_isInMemoryCache to be a counter instead of a boolean.
This allows StyleSheetContents to be linked to several CachedCSSStyleSheets.

• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::StyleSheetContents):
(WebCore::StyleSheetContents::addedToMemoryCache):
(WebCore::StyleSheetContents::removedFromMemoryCache):

• css/StyleSheetContents.h:
• loader/cache/CachedCSSStyleSheet.cpp:

(WebCore::CachedCSSStyleSheet::setBodyDataFrom): Making reuse of saveParsedStyleSheet to handle update of StyleSheetContents cache count.

LayoutTests:

• http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt: Added.
• http/tests/security/cached-cross-origin-shared-css-stylesheet.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt (added)
• LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleSheetContents.cpp (modified) (3 diffs)
• Source/WebCore/css/StyleSheetContents.h (modified) (2 diffs)
• Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-02  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION(r207753-207755): ASSERTION FAILED: m_parsedStyleSheetCache->isInMemoryCache()
+        https://bugs.webkit.org/show_bug.cgi?id=163905
+
+        Reviewed by Antti Koivisto.
+
+        * http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt: Added.
+        * http/tests/security/cached-cross-origin-shared-css-stylesheet.html: Added.
+
 2016-11-02  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-02  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION(r207753-207755): ASSERTION FAILED: m_parsedStyleSheetCache->isInMemoryCache()
+        https://bugs.webkit.org/show_bug.cgi?id=163905
+
+        Reviewed by Antti Koivisto.
+
+        Covered by existing tests and http/tests/security/cached-cross-origin-shared-css-stylesheet.html
+
+        Small refactoring to do more member fields initialization in StyleSheetContents header.
+        Refactored StyleSheetContents::m_isInMemoryCache to be a counter instead of a boolean.
+        This allows StyleSheetContents to be linked to several CachedCSSStyleSheets.
+
+        * css/StyleSheetContents.cpp:
+        (WebCore::StyleSheetContents::StyleSheetContents):
+        (WebCore::StyleSheetContents::addedToMemoryCache):
+        (WebCore::StyleSheetContents::removedFromMemoryCache):
+        * css/StyleSheetContents.h:
+        * loader/cache/CachedCSSStyleSheet.cpp:
+        (WebCore::CachedCSSStyleSheet::setBodyDataFrom): Making reuse of saveParsedStyleSheet to handle update of StyleSheetContents cache count.
+
 2016-11-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/css/StyleSheetContents.cpp

@@ -64 +64 @@
     , m_originalURL(originalURL)
     , m_defaultNamespace(starAtom)
-    , m_loadCompleted(false)
     , m_isUserStyleSheet(ownerRule && ownerRule->parentStyleSheet() && ownerRule->parentStyleSheet()->isUserStyleSheet())
-    , m_hasSyntacticallyValidCSSHeader(true)
-    , m_didLoadErrorOccur(false)
-    , m_usesStyleBasedEditability(false)
-    , m_isMutable(false)
-    , m_isInMemoryCache(false)
     , m_parserContext(context)
 {
@@ -85 +79 @@
     , m_namespaces(o.m_namespaces)
     , m_defaultNamespace(o.m_defaultNamespace)
+    , m_isUserStyleSheet(o.m_isUserStyleSheet)
     , m_loadCompleted(true)
-    , m_isUserStyleSheet(o.m_isUserStyleSheet)
     , m_hasSyntacticallyValidCSSHeader(o.m_hasSyntacticallyValidCSSHeader)
-    , m_didLoadErrorOccur(false)
     , m_usesStyleBasedEditability(o.m_usesStyleBasedEditability)
-    , m_isMutable(false)
-    , m_isInMemoryCache(false)
     , m_parserContext(o.m_parserContext)
 {
@@ -533 +524 @@
 void StyleSheetContents::addedToMemoryCache()
 {
-    ASSERT(!m_isInMemoryCache);
     ASSERT(isCacheable());
-    m_isInMemoryCache = true;
+    ++m_inMemoryCacheCount;
 }
 
 void StyleSheetContents::removedFromMemoryCache()
 {
-    ASSERT(m_isInMemoryCache);
+    ASSERT(m_inMemoryCacheCount);
     ASSERT(isCacheable());
-    m_isInMemoryCache = false;
+    --m_inMemoryCacheCount;
 }
 

trunk/Source/WebCore/css/StyleSheetContents.h

@@ -139 +139 @@
     void setMutable() { m_isMutable = true; }
 
-    bool isInMemoryCache() const { return m_isInMemoryCache; }
+    bool isInMemoryCache() const { return m_inMemoryCacheCount; }
     void addedToMemoryCache();
     void removedFromMemoryCache();
@@ -163 +163 @@
     AtomicString m_defaultNamespace;
 
-    bool m_loadCompleted : 1;
-    bool m_isUserStyleSheet : 1;
-    bool m_hasSyntacticallyValidCSSHeader : 1;
-    bool m_didLoadErrorOccur : 1;
-    bool m_usesStyleBasedEditability : 1;
-    bool m_isMutable : 1;
-    bool m_isInMemoryCache : 1;
-    
+    bool m_isUserStyleSheet;
+    bool m_loadCompleted { false };
+    bool m_hasSyntacticallyValidCSSHeader { true };
+    bool m_didLoadErrorOccur { false };
+    bool m_usesStyleBasedEditability { false };
+    bool m_isMutable { false };
+    unsigned m_inMemoryCacheCount { 0 };
+
     CSSParserContext m_parserContext;
 

trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp

@@ -97 +97 @@
     m_decoder = sheet.m_decoder;
     m_decodedSheetText = sheet.m_decodedSheetText;
-    m_parsedStyleSheetCache = sheet.m_parsedStyleSheetCache;
+    if (sheet.m_parsedStyleSheetCache)
+        saveParsedStyleSheet(*sheet.m_parsedStyleSheetCache);
 }