Title: [134946] trunk/Source/WebKit2
- Revision
- 134946
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-16 06:58:37 -0800 (Fri, 16 Nov 2012)
Log Message
[Qt][Mac] Fix the build after r124873
https://bugs.webkit.org/show_bug.cgi?id=102475
Patch by Peter Gal <galpe...@inf.u-szeged.hu> on 2012-11-16
Reviewed by Noam Rosenthal.
Change the CoordinatedImageBackingID typedef from uintptr_t to uint64_t.
* Shared/WebLayerTreeInfo.h:
* UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.messages.in:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (134945 => 134946)
--- trunk/Source/WebKit2/ChangeLog 2012-11-16 14:55:36 UTC (rev 134945)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-16 14:58:37 UTC (rev 134946)
@@ -1,3 +1,15 @@
+2012-11-16 Peter Gal <galpe...@inf.u-szeged.hu>
+
+ [Qt][Mac] Fix the build after r124873
+ https://bugs.webkit.org/show_bug.cgi?id=102475
+
+ Reviewed by Noam Rosenthal.
+
+ Change the CoordinatedImageBackingID typedef from uintptr_t to uint64_t.
+
+ * Shared/WebLayerTreeInfo.h:
+ * UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.messages.in:
+
2012-11-16 Sudarsana Nagineni <sudarsana.nagin...@intel.com>
[EFL][WK2] Unset the tooltip when the web process has crashed
Modified: trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h (134945 => 134946)
--- trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2012-11-16 14:55:36 UTC (rev 134945)
+++ trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2012-11-16 14:58:37 UTC (rev 134946)
@@ -33,7 +33,7 @@
typedef uint32_t WebLayerID;
enum { InvalidWebLayerID = 0 };
-typedef uintptr_t CoordinatedImageBackingID;
+typedef uint64_t CoordinatedImageBackingID;
enum { InvalidCoordinatedImageBackingID = 0 };
// NOTE: WebLayerInfo should only use POD types, as to make serialization faster.
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.messages.in (134945 => 134946)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.messages.in 2012-11-16 14:55:36 UTC (rev 134945)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeCoordinatorProxy.messages.in 2012-11-16 14:58:37 UTC (rev 134946)
@@ -31,9 +31,9 @@
RemoveTileForLayer(uint32_t layerID, int tileID)
CreateUpdateAtlas(int atlasID, WebKit::ShareableSurface::Handle handle)
RemoveUpdateAtlas(int atlasID)
- CreateImageBacking(uintptr_t imageID)
- UpdateImageBacking(uintptr_t imageID, WebKit::ShareableSurface::Handle handle)
- RemoveImageBacking(uintptr_t imageID)
+ CreateImageBacking(uint64_t imageID)
+ UpdateImageBacking(uint64_t imageID, WebKit::ShareableSurface::Handle handle)
+ RemoveImageBacking(uint64_t imageID)
DidRenderFrame(WebCore::IntSize contentsSize, WebCore::IntRect coveredRect)
DidChangeScrollPosition(WebCore::IntPoint position)
SetLayerAnimations(uint32_t id, WebCore::GraphicsLayerAnimations animations)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
