Changeset 153788 in webkit

Timestamp:

Aug 7, 2013 8:02:39 AM (11 years ago)

Author:

Antti Koivisto

Message:

2.5% regression on page cycler moz
​https://bugs.webkit.org/show_bug.cgi?id=102822

Source/WebCore:

Reviewed by Andreas Kling.

DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache() triggers a style recalc for quirks mode
documents in the beginning of document parsing via Document::setCompatibilityMode. This often coalesces
with style recalc triggered by stylesheet loading. However on very simple documents it can generate genuinely
unnecessary work.

• dom/DocumentStyleSheetCollection.cpp:

(WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache):

Check that we actually have cached injected stylesheets before triggering style recalc.

• page/PageGroup.cpp:

(WebCore::PageGroup::addUserStyleSheetToWorld):
(WebCore::PageGroup::removeUserStyleSheetFromWorld):
(WebCore::PageGroup::removeUserStyleSheetsFromWorld):
(WebCore::PageGroup::removeAllUserContent):

Fix a misspelling.

(WebCore::PageGroup::invalidateInjectedStyleSheetCacheInAllFrames):

Always invalidate style when user sheets change since we don't do that in
DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache anymore.

• page/PageGroup.h:

LayoutTests:

Reviewed by Andreas Kling.

This is a progression.

• inspector/timeline/timeline-script-tag-1-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/DocumentStyleSheetCollection.cpp (modified) (1 diff)
• Source/WebCore/page/PageGroup.cpp (modified) (4 diffs)
• Source/WebCore/page/PageGroup.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-07  Antti Koivisto  <antti@apple.com>
+
+        2.5% regression on page cycler moz
+        https://bugs.webkit.org/show_bug.cgi?id=102822
+
+        Reviewed by Andreas Kling.
+        
+        This is a progression.
+
+        * inspector/timeline/timeline-script-tag-1-expected.txt:
+
 2013-08-07  Mirela Budaes  <mbudaes@adobe.com>
 

trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt

@@ -4 +4 @@
 
 ParseHTML
-----> ScheduleStyleRecalculation
 ----> InvalidateLayout
 ParseHTML
-----> ScheduleStyleRecalculation
 ----> EvaluateScript
 --------> TimeStamp : SCRIPT TAG

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-07  Antti Koivisto  <antti@apple.com>
+
+        2.5% regression on page cycler moz
+        https://bugs.webkit.org/show_bug.cgi?id=102822
+
+        Reviewed by Andreas Kling.
+
+        DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache() triggers a style recalc for quirks mode
+        documents in the beginning of document parsing via Document::setCompatibilityMode. This often coalesces 
+        with style recalc triggered by stylesheet loading. However on very simple documents it can generate genuinely
+        unnecessary work.
+
+        * dom/DocumentStyleSheetCollection.cpp:
+        (WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache):
+        
+            Check that we actually have cached injected stylesheets before triggering style recalc.
+            
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::addUserStyleSheetToWorld):
+        (WebCore::PageGroup::removeUserStyleSheetFromWorld):
+        (WebCore::PageGroup::removeUserStyleSheetsFromWorld):
+        (WebCore::PageGroup::removeAllUserContent):
+        
+            Fix a misspelling.
+
+        (WebCore::PageGroup::invalidateInjectedStyleSheetCacheInAllFrames):
+        
+            Always invalidate style when user sheets change since we don't do that in
+            DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache anymore.
+
+        * page/PageGroup.h:
+
 2013-08-07  Andre Moreira Magalhaes   <andre.magalhaes@collabora.co.uk>
 

trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp

@@ -188 +188 @@
 void DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache()
 {
+    if (!m_injectedStyleSheetCacheValid)
+        return;
     m_injectedStyleSheetCacheValid = false;
+    if (m_injectedUserStyleSheets.isEmpty() && m_injectedAuthorStyleSheets.isEmpty())
+        return;
     m_document->styleResolverChanged(DeferRecalcStyle);
 }

trunk/Source/WebCore/page/PageGroup.cpp

@@ -306 +306 @@
 
     if (injectionTime == InjectInExistingDocuments)
-        invalidatedInjectedStyleSheetCacheInAllFrames();
+        invalidateInjectedStyleSheetCacheInAllFrames();
 }
 
@@ -356 +356 @@
         m_userStyleSheets->remove(it);
 
-    invalidatedInjectedStyleSheetCacheInAllFrames();
+    invalidateInjectedStyleSheetCacheInAllFrames();
 }
 
@@ -386 +386 @@
     m_userStyleSheets->remove(it);
 
-    invalidatedInjectedStyleSheetCacheInAllFrames();
+    invalidateInjectedStyleSheetCacheInAllFrames();
 }
 
@@ -395 +395 @@
     if (m_userStyleSheets) {
         m_userStyleSheets.clear();
-        invalidatedInjectedStyleSheetCacheInAllFrames();
-    }
-}
-
-void PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames()
+        invalidateInjectedStyleSheetCacheInAllFrames();
+    }
+}
+
+void PageGroup::invalidateInjectedStyleSheetCacheInAllFrames()
 {
     // Clear our cached sheets and have them just reparse.
     HashSet<Page*>::const_iterator end = m_pages.end();
     for (HashSet<Page*>::const_iterator it = m_pages.begin(); it != end; ++it) {
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
             frame->document()->styleSheetCollection()->invalidateInjectedStyleSheetCache();
+            frame->document()->styleResolverChanged(DeferRecalcStyle);
+        }
     }
 }

trunk/Source/WebCore/page/PageGroup.h

@@ -120 +120 @@
 
         void addVisitedLink(LinkHash);
-        void invalidatedInjectedStyleSheetCacheInAllFrames();
+        void invalidateInjectedStyleSheetCacheInAllFrames();
 
         String m_name;