Title: [126877] trunk/Source/WebKit2
- Revision
- 126877
- Author
- [email protected]
- Date
- 2012-08-28 08:03:30 -0700 (Tue, 28 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (126876 => 126877)
--- trunk/Source/WebKit2/ChangeLog 2012-08-28 14:51:43 UTC (rev 126876)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-28 15:03:30 UTC (rev 126877)
@@ -1,3 +1,21 @@
+2012-08-28 Zeno Albisser <[email protected]>
+
+ 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 <[email protected]>
[EFL][WK2] Implement WebPopupMenuProxyEfl to support <select>
Modified: trunk/Source/WebKit2/Shared/ShareableSurface.h (126876 => 126877)
--- trunk/Source/WebKit2/Shared/ShareableSurface.h 2012-08-28 14:51:43 UTC (rev 126876)
+++ trunk/Source/WebKit2/Shared/ShareableSurface.h 2012-08-28 15:03:30 UTC (rev 126877)
@@ -55,7 +55,7 @@
static bool decode(CoreIPC::ArgumentDecoder*, Handle&);
#if USE(GRAPHICS_SURFACE)
- uint32_t graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
+ uint64_t graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
#endif
private:
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp (126876 => 126877)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp 2012-08-28 14:51:43 UTC (rev 126876)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.cpp 2012-08-28 15:03:30 UTC (rev 126877)
@@ -66,9 +66,9 @@
{
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);
m_surfaces.add(token, surface);
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h (126876 => 126877)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h 2012-08-28 14:51:43 UTC (rev 126876)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.h 2012-08-28 15:03:30 UTC (rev 126877)
@@ -88,7 +88,7 @@
float m_lastSentScale;
WebCore::FloatPoint m_lastSentTrajectoryVector;
#if USE(GRAPHICS_SURFACE)
- HashMap<uint32_t, RefPtr<ShareableSurface> > m_surfaces;
+ HashMap<uint64_t, RefPtr<ShareableSurface> > m_surfaces;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
