Changeset 141325 in webkit

Timestamp:

Jan 30, 2013 3:00:20 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Coordinated Graphics: LayerTreeRenderer manages the surface of UpdateAtlas.
​https://bugs.webkit.org/show_bug.cgi?id=107224

Patch by Huang Dongsung <​luxtella@company100.net> on 2013-01-30
Reviewed by Benjamin Poulain.

Currently, CoordinatedLayerTreeHostProxy manages the surface of UpdateAtlas, but
all other resources are managed by LayerTreeRenderer. This patch matches the
surface of UpdateAtlas to other resources.

• UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:

(WebKit::CoordinatedLayerTreeHostProxy::updateTileForLayer):
(WebKit::CoordinatedLayerTreeHostProxy::createUpdateAtlas):
(WebKit::CoordinatedLayerTreeHostProxy::removeUpdateAtlas):
(WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):

• UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:

(CoordinatedLayerTreeHostProxy):

• UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:

(WebKit::LayerTreeRenderer::updateTile):
(WebKit::LayerTreeRenderer::createUpdateAtlas):
(WebKit):
(WebKit::LayerTreeRenderer::removeUpdateAtlas):
(WebKit::LayerTreeRenderer::purgeGLResources):

• UIProcess/CoordinatedGraphics/LayerTreeRenderer.h:

(TileUpdate):
(WebKit::LayerTreeRenderer::TileUpdate::TileUpdate):
(LayerTreeRenderer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (modified) (3 diffs)
• UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h (modified) (1 diff)
• UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp (modified) (2 diffs)
• UIProcess/CoordinatedGraphics/LayerTreeRenderer.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-30  Huang Dongsung  <luxtella@company100.net>
+
+        Coordinated Graphics: LayerTreeRenderer manages the surface of UpdateAtlas.
+        https://bugs.webkit.org/show_bug.cgi?id=107224
+
+        Reviewed by Benjamin Poulain.
+
+        Currently, CoordinatedLayerTreeHostProxy manages the surface of UpdateAtlas, but
+        all other resources are managed by LayerTreeRenderer. This patch matches the
+        surface of UpdateAtlas to other resources.
+
+        * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+        (WebKit::CoordinatedLayerTreeHostProxy::updateTileForLayer):
+        (WebKit::CoordinatedLayerTreeHostProxy::createUpdateAtlas):
+        (WebKit::CoordinatedLayerTreeHostProxy::removeUpdateAtlas):
+        (WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
+        * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
+        (CoordinatedLayerTreeHostProxy):
+        * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
+        (WebKit::LayerTreeRenderer::updateTile):
+        (WebKit::LayerTreeRenderer::createUpdateAtlas):
+        (WebKit):
+        (WebKit::LayerTreeRenderer::removeUpdateAtlas):
+        (WebKit::LayerTreeRenderer::purgeGLResources):
+        * UIProcess/CoordinatedGraphics/LayerTreeRenderer.h:
+        (TileUpdate):
+        (WebKit::LayerTreeRenderer::TileUpdate::TileUpdate):
+        (LayerTreeRenderer):
+
 2013-01-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp

@@ -68 +68 @@
 void CoordinatedLayerTreeHostProxy::updateTileForLayer(CoordinatedLayerID layerID, uint32_t tileID, const IntRect& tileRect, const WebKit::SurfaceUpdateInfo& updateInfo)
 {
-    SurfaceMap::iterator it = m_surfaces.find(updateInfo.atlasID);
-    ASSERT(it != m_surfaces.end());
-    dispatchUpdate(bind(&LayerTreeRenderer::updateTile, m_renderer.get(), layerID, tileID, LayerTreeRenderer::TileUpdate(updateInfo.updateRect, tileRect, it->value, updateInfo.surfaceOffset)));
+    dispatchUpdate(bind(&LayerTreeRenderer::updateTile, m_renderer.get(), layerID, tileID, LayerTreeRenderer::TileUpdate(updateInfo.updateRect, tileRect, updateInfo.atlasID, updateInfo.surfaceOffset)));
 }
 
@@ -80 +78 @@
 void CoordinatedLayerTreeHostProxy::createUpdateAtlas(uint32_t atlasID, const WebCoordinatedSurface::Handle& handle)
 {
-    ASSERT(!m_surfaces.contains(atlasID));
-    m_surfaces.add(atlasID, WebCoordinatedSurface::create(handle));
+    dispatchUpdate(bind(&LayerTreeRenderer::createUpdateAtlas, m_renderer.get(), atlasID, WebCoordinatedSurface::create(handle)));
 }
 
 void CoordinatedLayerTreeHostProxy::removeUpdateAtlas(uint32_t atlasID)
 {
-    ASSERT(m_surfaces.contains(atlasID));
-    m_surfaces.remove(atlasID);
+    dispatchUpdate(bind(&LayerTreeRenderer::removeUpdateAtlas, m_renderer.get(), atlasID));
 }
 
@@ -241 +237 @@
 void CoordinatedLayerTreeHostProxy::purgeBackingStores()
 {
-    m_surfaces.clear();
     m_drawingAreaProxy->page()->process()->send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
 }

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h

@@ -104 +104 @@
     WebCore::FloatRect m_lastSentVisibleRect;
     WebCore::FloatPoint m_lastSentTrajectoryVector;
-    typedef HashMap<uint32_t /* atlasID */, RefPtr<CoordinatedSurface> > SurfaceMap;
-    SurfaceMap m_surfaces;
 };
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp

@@ -469 +469 @@
     RefPtr<CoordinatedBackingStore> backingStore = m_backingStores.get(layer);
     ASSERT(backingStore);
-    backingStore->updateTile(tileID, update.sourceRect, update.tileRect, update.surface, update.offset);
+
+    SurfaceMap::iterator it = m_surfaces.find(update.atlasID);
+    ASSERT(it != m_surfaces.end());
+
+    backingStore->updateTile(tileID, update.sourceRect, update.tileRect, it->value, update.offset);
     resetBackingStoreSizeToLayerSize(layer);
     m_backingStoresWithPendingBuffers.add(backingStore);
+}
+
+void LayerTreeRenderer::createUpdateAtlas(uint32_t atlasID, PassRefPtr<CoordinatedSurface> surface)
+{
+    ASSERT(!m_surfaces.contains(atlasID));
+    m_surfaces.add(atlasID, surface);
+}
+
+void LayerTreeRenderer::removeUpdateAtlas(uint32_t atlasID)
+{
+    ASSERT(m_surfaces.contains(atlasID));
+    m_surfaces.remove(atlasID);
 }
 
@@ -602 +618 @@
     m_surfaceBackingStores.clear();
 #endif
+    m_surfaces.clear();
 
     m_rootLayer.clear();

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h

@@ -57 +57 @@
         WebCore::IntRect sourceRect;
         WebCore::IntRect tileRect;
-        RefPtr<CoordinatedSurface> surface;
+        uint32_t atlasID;
         WebCore::IntPoint offset;
-        TileUpdate(const WebCore::IntRect& source, const WebCore::IntRect& tile, PassRefPtr<CoordinatedSurface> newSurface, const WebCore::IntPoint& newOffset)
+        TileUpdate(const WebCore::IntRect& source, const WebCore::IntRect& tile, uint32_t atlas, const WebCore::IntPoint& newOffset)
             : sourceRect(source)
             , tileRect(tile)
-            , surface(newSurface)
+            , atlasID(atlas)
             , offset(newOffset)
         {
@@ -106 +106 @@
     void removeTile(CoordinatedLayerID, uint32_t tileID);
     void updateTile(CoordinatedLayerID, uint32_t tileID, const TileUpdate&);
+    void createUpdateAtlas(uint32_t atlasID, PassRefPtr<CoordinatedSurface>);
+    void removeUpdateAtlas(uint32_t atlasID);
     void flushLayerChanges();
     void createImageBacking(CoordinatedImageBackingID);
@@ -181 +183 @@
     SurfaceBackingStoreMap m_surfaceBackingStores;
 #endif
+
+    typedef HashMap<uint32_t /* atlasID */, RefPtr<CoordinatedSurface> > SurfaceMap;
+    SurfaceMap m_surfaces;
 
     // Below two members are accessed by only the main thread. The painting thread must lock the main thread to access both members.