Title: [181150] trunk/Source/WebKit2
- Revision
- 181150
- Author
- zandober...@gmail.com
- Date
- 2015-03-06 02:48:19 -0800 (Fri, 06 Mar 2015)
Log Message
Unguarded GTK-specific member and method usage in DrawingAreaImpl
https://bugs.webkit.org/show_bug.cgi?id=142391
Reviewed by Carlos Garcia Campos.
r180924 introduced unguarded use of m_nativeSurfaceHandleForCompositing
and LayerTreeHost::setNativeSurfaceHandleForCompositing() in DrawingAreaImpl.
Definitions for both of these are guarded with USE(TEXTURE_MAPPER_GL) and PLATFORM(GTK),
so their use should be as well.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181149 => 181150)
--- trunk/Source/WebKit2/ChangeLog 2015-03-06 10:37:50 UTC (rev 181149)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-06 10:48:19 UTC (rev 181150)
@@ -1,3 +1,18 @@
+2015-03-06 Zan Dobersek <zdober...@igalia.com>
+
+ Unguarded GTK-specific member and method usage in DrawingAreaImpl
+ https://bugs.webkit.org/show_bug.cgi?id=142391
+
+ Reviewed by Carlos Garcia Campos.
+
+ r180924 introduced unguarded use of m_nativeSurfaceHandleForCompositing
+ and LayerTreeHost::setNativeSurfaceHandleForCompositing() in DrawingAreaImpl.
+ Definitions for both of these are guarded with USE(TEXTURE_MAPPER_GL) and PLATFORM(GTK),
+ so their use should be as well.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
+
2015-03-06 David Kilzer <ddkil...@apple.com>
REGRESSION (r181140): WebKit2 fails to build on Mavericks buildbot
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (181149 => 181150)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-03-06 10:37:50 UTC (rev 181149)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-03-06 10:48:19 UTC (rev 181150)
@@ -456,8 +456,10 @@
ASSERT(!m_layerTreeHost);
m_layerTreeHost = LayerTreeHost::create(&m_webPage);
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
if (m_nativeSurfaceHandleForCompositing)
m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
+#endif
if (!m_inUpdateBackingStoreState)
m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
