Changeset 63243 in webkit

Timestamp:

Jul 13, 2010 1:31:33 PM (14 years ago)

Author:

aa@chromium.org

Message:

2010-07-13 Aaron Boodman <​aa@chromium.org>

Reviewed by Timothy Hatcher.

Don't reset per-document user style caches when user styles are updated in
Chromium.

​https://bugs.webkit.org/show_bug.cgi?id=42003

• page/PageGroup.cpp: (WebCore::PageGroup::addUserStyleSheetToWorld): (WebCore::PageGroup::removeUserStyleSheetFromWorld): (WebCore::PageGroup::removeUserStyleSheetsFromWorld): (WebCore::PageGroup::removeAllUserContent): (WebCore::PageGroup::resetUserStyleCacheInAllFrames):
• page/PageGroup.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/PageGroup.cpp (modified) (3 diffs)
• page/PageGroup.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-13  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Don't reset per-document user style caches when user styles are updated in
+        Chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42003
+
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::addUserStyleSheetToWorld):
+        (WebCore::PageGroup::removeUserStyleSheetFromWorld):
+        (WebCore::PageGroup::removeUserStyleSheetsFromWorld):
+        (WebCore::PageGroup::removeAllUserContent):
+        (WebCore::PageGroup::resetUserStyleCacheInAllFrames):
+        * page/PageGroup.h:
+
 2010-07-13  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/page/PageGroup.cpp

@@ -243 +243 @@
     styleSheetsInWorld->append(userStyleSheet.release());
 
-    // 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())
-            frame->document()->clearPageGroupUserSheets();
-    }
+    resetUserStyleCacheInAllFrames();
 }
 
@@ -302 +297 @@
         m_userStyleSheets->remove(it);
     }
-    
+
+    resetUserStyleCacheInAllFrames();
+}
+
+void PageGroup::removeUserScriptsFromWorld(DOMWrapperWorld* world)
+{
+    ASSERT_ARG(world, world);
+
+    if (!m_userScripts)
+        return;
+
+    UserScriptMap::iterator it = m_userScripts->find(world);
+    if (it == m_userScripts->end())
+        return;
+       
+    delete it->second;
+    m_userScripts->remove(it);
+}
+
+void PageGroup::removeUserStyleSheetsFromWorld(DOMWrapperWorld* world)
+{
+    ASSERT_ARG(world, world);
+
+    if (!m_userStyleSheets)
+        return;
+    
+    UserStyleSheetMap::iterator it = m_userStyleSheets->find(world);
+    if (it == m_userStyleSheets->end())
+        return;
+    
+    delete it->second;
+    m_userStyleSheets->remove(it);
+
+    resetUserStyleCacheInAllFrames();
+}
+
+void PageGroup::removeAllUserContent()
+{
+    if (m_userScripts) {
+        deleteAllValues(*m_userScripts);
+        m_userScripts.clear();
+    }
+
+    if (m_userStyleSheets) {
+        deleteAllValues(*m_userStyleSheets);
+        m_userStyleSheets.clear();
+        resetUserStyleCacheInAllFrames();
+    }
+}
+
+void PageGroup::resetUserStyleCacheInAllFrames()
+{
+#if !PLATFORM(CHROMIUM)
     // Clear our cached sheets and have them just reparse.
     HashSet<Page*>::const_iterator end = m_pages.end();
@@ -309 +356 @@
             frame->document()->clearPageGroupUserSheets();
     }
-}
-
-void PageGroup::removeUserScriptsFromWorld(DOMWrapperWorld* world)
-{
-    ASSERT_ARG(world, world);
-
-    if (!m_userScripts)
-        return;
-
-    UserScriptMap::iterator it = m_userScripts->find(world);
-    if (it == m_userScripts->end())
-        return;
-       
-    delete it->second;
-    m_userScripts->remove(it);
-}
-
-void PageGroup::removeUserStyleSheetsFromWorld(DOMWrapperWorld* world)
-{
-    ASSERT_ARG(world, world);
-
-    if (!m_userStyleSheets)
-        return;
-    
-    UserStyleSheetMap::iterator it = m_userStyleSheets->find(world);
-    if (it == m_userStyleSheets->end())
-        return;
-    
-    delete it->second;
-    m_userStyleSheets->remove(it);
-
-    // 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())
-            frame->document()->clearPageGroupUserSheets();
-    }
-}
-
-void PageGroup::removeAllUserContent()
-{
-    if (m_userScripts) {
-        deleteAllValues(*m_userScripts);
-        m_userScripts.clear();
-    }
-    
-    
-    if (m_userStyleSheets) {
-        deleteAllValues(*m_userStyleSheets);
-        m_userStyleSheets.clear();
-    }
+#endif
 }
 

trunk/WebCore/page/PageGroup.h

@@ -95 +95 @@
     private:
         void addVisitedLink(LinkHash stringHash);
-
+        void resetUserStyleCacheInAllFrames();
+  
         String m_name;