Changeset 126877 in webkit

Timestamp:

Aug 28, 2012, 8:03:30 AM (14 years ago)

Author:

zeno.albisser@nokia.com

Message:

LayerTreeCoordinatorProxy should use uint64_t for surface key.
​https://bugs.webkit.org/show_bug.cgi?id=95175

GraphicsSurface tokens are of type uint64_t.
Therefore LayerTreeCoordinatorProxy must use the same type to
identify a GraphicsSurface/ShareableSurface.

Reviewed by Noam Rosenthal.

• Shared/ShareableSurface.h:

(WebKit::ShareableSurface::Handle::graphicsSurfaceToken):

• UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp:

(WebKit::LayerTreeCoordinatorProxy::updateTileForLayer):

• UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h:

(LayerTreeCoordinatorProxy):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ShareableSurface.h (modified) (1 diff)
• UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp (modified) (1 diff)
• UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-28  Zeno Albisser  <zeno@webkit.org>
+
+        LayerTreeCoordinatorProxy should use uint64_t for surface key.
+        https://bugs.webkit.org/show_bug.cgi?id=95175
+
+        GraphicsSurface tokens are of type uint64_t.
+        Therefore LayerTreeCoordinatorProxy must use the same type to
+        identify a GraphicsSurface/ShareableSurface.
+
+        Reviewed by Noam Rosenthal.
+
+        * Shared/ShareableSurface.h:
+        (WebKit::ShareableSurface::Handle::graphicsSurfaceToken):
+        * UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp:
+        (WebKit::LayerTreeCoordinatorProxy::updateTileForLayer):
+        * UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h:
+        (LayerTreeCoordinatorProxy):
+
 2012-08-28  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit2/Shared/ShareableSurface.h

@@ -56 +56 @@
 
 #if USE(GRAPHICS_SURFACE)
-        uint32_t graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
+        uint64_t graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
 #endif
 

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

@@ -67 +67 @@
     RefPtr<ShareableSurface> surface;
 #if USE(GRAPHICS_SURFACE)
-    int token = updateInfo.surfaceHandle.graphicsSurfaceToken();
+    uint64_t token = updateInfo.surfaceHandle.graphicsSurfaceToken();
     if (token) {
-        HashMap<uint32_t, RefPtr<ShareableSurface> >::iterator it = m_surfaces.find(token);
+        HashMap<uint64_t, RefPtr<ShareableSurface> >::iterator it = m_surfaces.find(token);
         if (it == m_surfaces.end()) {
             surface = ShareableSurface::create(updateInfo.surfaceHandle);

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

@@ -89 +89 @@
     WebCore::FloatPoint m_lastSentTrajectoryVector;
 #if USE(GRAPHICS_SURFACE)
-    HashMap<uint32_t, RefPtr<ShareableSurface> > m_surfaces;
+    HashMap<uint64_t, RefPtr<ShareableSurface> > m_surfaces;
 #endif
 };