Changeset 104370 in webkit

Timestamp:

Jan 6, 2012 6:50:25 PM (12 years ago)

Author:

ostapenko.viatcheslav@nokia.com

Message:

[Qt] [WK2] Minibrowser leaks memory ~6-7Mb per reload
​https://bugs.webkit.org/show_bug.cgi?id=75746

Reset WebGraphicsLayer::m_layerTreeTileClient of all dependent
layers from ~LayerTreeHostQt(). This replaces r103760 which
causes leaks of GraphicsLayerTextureMapper objects on UI side.

Reviewed by Noam Rosenthal.

• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:

(WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
(WebCore::WebGraphicsLayer::setLayerTreeTileClient):

• WebProcess/WebCoreSupport/WebGraphicsLayer.h:
• WebProcess/WebPage/qt/LayerTreeHostQt.cpp:

(WebKit::LayerTreeHostQt::~LayerTreeHostQt):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (modified) (3 diffs)
• WebProcess/WebCoreSupport/WebGraphicsLayer.h (modified) (1 diff)
• WebProcess/WebPage/qt/LayerTreeHostQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-06  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        [Qt] [WK2] Minibrowser leaks memory ~6-7Mb per reload
+        https://bugs.webkit.org/show_bug.cgi?id=75746
+
+        Reset WebGraphicsLayer::m_layerTreeTileClient of all dependent 
+        layers from ~LayerTreeHostQt(). This replaces r103760 which
+        causes leaks of GraphicsLayerTextureMapper objects on UI side. 
+
+        Reviewed by Noam Rosenthal.
+
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+        (WebCore::WebGraphicsLayer::setLayerTreeTileClient):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+        * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+        (WebKit::LayerTreeHostQt::~LayerTreeHostQt):
+
 2012-01-06  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp

@@ -402 +402 @@
 void WebGraphicsLayer::syncCompositingStateForThisLayerOnly()
 {
+    if (!m_layerTreeTileClient)
+        m_layerTreeTileClient = layerTreeTileClient();
+
     updateContentBuffers();
 
@@ -432 +435 @@
         m_layerInfo.children.append(toWebLayerID(children()[i]));
 
-    WebLayerTreeTileClient* tileClient = layerTreeTileClient();
-    ASSERT(tileClient);
+    ASSERT(m_layerTreeTileClient);
     if (m_layerInfo.imageIsUpdated && m_image && !m_layerInfo.imageBackingStoreID)
-        m_layerInfo.imageBackingStoreID = tileClient->adoptImageBackingStore(m_image.get());
-
-    tileClient->didSyncCompositingStateForLayer(m_layerInfo);
+        m_layerInfo.imageBackingStoreID = m_layerTreeTileClient->adoptImageBackingStore(m_image.get());
+
+    m_layerTreeTileClient->didSyncCompositingStateForLayer(m_layerInfo);
     m_modified = false;
     m_layerInfo.imageIsUpdated = false;
@@ -613 +615 @@
         setContentsNeedsDisplay();
 }
+
+void WebGraphicsLayer::setLayerTreeTileClient(WebKit::WebLayerTreeTileClient* client)
+{
+    if (m_layerTreeTileClient == client)
+        return;
+
+    for (size_t i = 0; i < children().size(); ++i) {
+        WebGraphicsLayer* layer = toWebGraphicsLayer(this->children()[i]);
+        layer->setLayerTreeTileClient(client);
+    }
+
+    // Have to force detach from remote layer here if layer tile client changes.
+    if (m_layerTreeTileClient)
+        m_layerTreeTileClient->didDeleteLayer(id());
+    m_layerTreeTileClient = client;
+}
 #endif
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h

@@ -125 +125 @@
     virtual void removeTile(int tileID);
 
-    void setLayerTreeTileClient(WebKit::WebLayerTreeTileClient* client) { m_layerTreeTileClient = client; }
+    void setLayerTreeTileClient(WebKit::WebLayerTreeTileClient*);
     WebKit::WebLayerTreeTileClient* layerTreeTileClient() const;
 

trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp

@@ -53 +53 @@
 LayerTreeHostQt::~LayerTreeHostQt()
 {
+    if (m_rootLayer)
+        toWebGraphicsLayer(m_rootLayer.get())->setLayerTreeTileClient(0);
 }