Merge r181620 - REGRESSION(r180924): Unable to build WebKitGTK+ with …

…threaded compositor Unreviewed build fix. * WebProcess/WebPage/LayerTreeHost.h: Remove duplicated declaration of setNativeSurfaceHandleForCompositing.
WebKit · Mar 17, 2015 · f6e2a5c · f6e2a5c
1 parent a4b0003
commit f6e2a5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-17  Gwang Yoon Hwang  <yoon@igalia.com>
+
+        REGRESSION(r180924): Unable to build WebKitGTK+ with threaded compositor
+
+        Unreviewed build fix.
+
+        * WebProcess/WebPage/LayerTreeHost.h:
+        Remove duplicated declaration of setNativeSurfaceHandleForCompositing.
+
 2015-03-16  Alexey Proskuryakov  <ap@apple.com>
 
         ASSERT(m_plugin) on plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
@@ -84,7 +84,6 @@ class LayerTreeHost : public RefCounted<LayerTreeHost> {
 #endif
 
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
     virtual void viewportSizeChanged(const WebCore::IntSize&) = 0;
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) = 0;
 #endif