Changeset 181150 in webkit

Timestamp:

Mar 6, 2015 2:48:19 AM (9 years ago)

Author:

zandobersek@gmail.com

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-06  Zan Dobersek  <zdobersek@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  <ddkilzer@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -457 +457 @@
 
     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);