Changeset 186333 in webkit
- Timestamp:
- Jul 6, 2015 2:48:38 AM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r186304 r186333 1 2015-07-06 Zan Dobersek <zdobersek@igalia.com> 2 3 [GTK] Guard X11-specific code in webkitWebViewBaseDidRelaunchWebProcess() 4 https://bugs.webkit.org/show_bug.cgi?id=146627 5 6 Reviewed by Carlos Garcia Campos. 7 8 * UIProcess/API/gtk/WebKitWebViewBase.cpp: 9 (webkitWebViewBaseDidRelaunchWebProcess): 10 Guard calls to DrawingAreaImpl::setNativeSurfaceHandleForCompositing() 11 that pass in an X11 Window ID with the PLATFORM(X11) build guards. 12 1 13 2015-07-05 Chris Dumez <cdumez@apple.com> 2 14 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
r186221 r186333 1391 1391 void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase* webkitWebViewBase) 1392 1392 { 1393 #if PLATFORM(X11) 1393 1394 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 1394 1395 DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()); … … 1403 1404 drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(webkitWebViewBase)))); 1404 1405 #endif 1405 } 1406 #else 1407 UNUSED_PARAM(webkitWebViewBase); 1408 #endif 1409 }
Note: See TracChangeset
for help on using the changeset viewer.