Simplify jettisoning of style resolvers on memory pressure.

<https://webkit.org/b/129644>

Now that we have Document::allDocuments(), we can jettison all the
style resolvers by walking the set of live documents and calling
clearStyleResolver() on each one, instead of having a function on
Page that walks the frame tree of every living page, etc.

Reviewed by Antti Koivisto.

* page/Page.cpp:
* page/Page.h:
* platform/mac/MemoryPressureHandlerMac.mm:
(WebCore::MemoryPressureHandler::releaseMemory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@165629 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 20bd340806eb5b1c1e2f378750013bedd41e399f..48b4f21e5b776247e8e04da621a896b6a0da4cb5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2014-03-14  Andreas Kling  <akling@apple.com>
+
+        Simplify jettisoning of style resolvers on memory pressure.
+        <https://webkit.org/b/129644>
+
+        Now that we have Document::allDocuments(), we can jettison all the
+        style resolvers by walking the set of live documents and calling
+        clearStyleResolver() on each one, instead of having a function on
+        Page that walks the frame tree of every living page, etc.
+
+        Reviewed by Antti Koivisto.
+
+        * page/Page.cpp:
+        * page/Page.h:
+        * platform/mac/MemoryPressureHandlerMac.mm:
+        (WebCore::MemoryPressureHandler::releaseMemory):
+
 2014-03-07  Jer Noble  <jer.noble@apple.com>
 
         Add Remote Control command support to HTLMediaElement

diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index d1df772c017b9a05e2ff8a3b5037445a97280636..d1a348a4f6be7c5e3f205f90ebbcbcd6a57dd57f 100644 (file)
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -433,20 +433,6 @@ void Page::setNeedsRecalcStyleInAllFrames()
     }
 }
 
-void Page::jettisonStyleResolversInAllDocuments()
-{
-    if (!allPages)
-        return;
-
-    for (auto it = allPages->begin(), end = allPages->end(); it != end; ++it) {
-        Page& page = **it;
-        for (Frame* frame = &page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
-            if (Document* document = frame->document())
-                document->clearStyleResolver();
-        }
-    }
-}
-
 void Page::refreshPlugins(bool reload)
 {
     if (!allPages)

diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
index ff206a5163bbf3f579c6cb2fedc7338cbbe540e3..a6f7c39cf1075008ccab830dea0001792e983889 100644 (file)
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
@@ -117,7 +117,6 @@ class Page : public Supplementable<Page> {
 
 public:
     static void updateStyleForAllPagesAfterGlobalChangeInEnvironment();
-    static void jettisonStyleResolversInAllDocuments();
 
     // It is up to the platform to ensure that non-null clients are provided where required.
     struct PageClients {

diff --git a/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm b/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
index 4c808e43ffd5bc1d62880a0f66122a1648cc0a29..e16cdb21ab61630f75ac05e92668771710377078 100644 (file)
--- a/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
+++ b/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
@@ -27,6 +27,7 @@
 #import "MemoryPressureHandler.h"
 
 #import <WebCore/CSSValuePool.h>
+#import <WebCore/Document.h>
 #import <WebCore/GCController.h>
 #import <WebCore/FontCache.h>
 #import <WebCore/MemoryCache.h>
@@ -170,7 +171,8 @@ void MemoryPressureHandler::releaseMemory(bool)
 
     clearWidthCaches();
 
-    Page::jettisonStyleResolversInAllDocuments();
+    for (auto* document : Document::allDocuments())
+        document->clearStyleResolver();
 
     gcController().discardAllCompiledCode();