Changeset 181847 in webkit
- Timestamp:
- Mar 23, 2015 1:06:02 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r181793 r181847 1 2015-03-23 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add a configure option to build without Redirected XComposite Window 4 https://bugs.webkit.org/show_bug.cgi?id=142865 5 6 Reviewed by Žan Doberšek. 7 8 The Redirected XComposite Window was added to support some 9 features like GtkOverlay, but in cases where we don't need such 10 features, it's more efficient to use the XID of the WebKitWebView 11 window as the native surface handle for the accelerated 12 compositing. This patch adds USE_REDIRECTED_XCOMPOSITE_WINDOW, 13 that is enabled by default for X11 target when OpenGL is enabled. 14 15 * Source/cmake/OptionsGTK.cmake: 16 1 17 2015-03-20 Zan Dobersek <zdobersek@igalia.com> 2 18 -
trunk/Source/WebKit2/ChangeLog
r181838 r181847 1 2015-03-23 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add a configure option to build without Redirected XComposite Window 4 https://bugs.webkit.org/show_bug.cgi?id=142865 5 6 Reviewed by Žan Doberšek. 7 8 Use USE(REDIRECTED_XCOMPOSITE_WINDOW) instead of 9 USE(TEXTURE_MAPPER_GL) && PLATFORM(X11). 10 11 * UIProcess/API/gtk/WebKitWebViewBase.cpp: 12 (webkitWebViewBaseRealize): Use the XID of the WebKitWebView 13 window as native surface handle when REDIRECTED_XCOMPOSITE_WINDOW 14 is disabled. 15 (webkitWebViewRenderAcceleratedCompositingResults): 16 (resizeWebKitWebViewBaseFromAllocation): 17 (webkitWebViewBaseEnterAcceleratedCompositingMode): 18 (webkitWebViewBaseExitAcceleratedCompositingMode): 19 * UIProcess/gtk/RedirectedXCompositeWindow.cpp: 20 * UIProcess/gtk/RedirectedXCompositeWindow.h: 21 1 22 2015-03-22 Eric Carlson <eric.carlson@apple.com> 2 23 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
r181798 r181847 68 68 #endif 69 69 70 #if PLATFORM(X11)70 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 71 71 #include <gdk/gdkx.h> 72 72 #endif 73 73 74 #if PLATFORM(WAYLAND) 74 75 #include <gdk/gdkwayland.h> … … 185 186 #endif 186 187 187 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)188 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 188 189 std::unique_ptr<RedirectedXCompositeWindow> redirectedWindow; 189 190 #endif … … 319 320 WebKitWebViewBasePrivate* priv = webView->priv; 320 321 321 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)322 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 322 323 GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); 323 324 if (GDK_IS_X11_DISPLAY(display)) { … … 370 371 gdk_window_set_user_data(window, widget); 371 372 373 #if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW) 374 DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()); 375 drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window)); 376 #endif 377 372 378 gtk_style_context_set_background(gtk_widget_get_style_context(widget), window); 373 379 … … 518 524 return false; 519 525 520 #if PLATFORM(X11)526 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 521 527 // To avoid flashes when initializing accelerated compositing for the first 522 528 // time, we wait until we know there's a frame ready before rendering. … … 631 637 DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()); 632 638 633 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)639 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 634 640 if (sizeChanged && priv->redirectedWindow && drawingArea && drawingArea->isInAcceleratedCompositingMode()) 635 641 priv->redirectedWindow->resize(viewRect.size()); … … 1324 1330 void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase) 1325 1331 { 1326 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)1332 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 1327 1333 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 1328 1334 if (!priv->redirectedWindow) … … 1342 1348 void webkitWebViewBaseExitAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase) 1343 1349 { 1344 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)1350 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 1345 1351 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv; 1346 1352 if (priv->redirectedWindow) -
trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp
r179397 r181847 28 28 #include "RedirectedXCompositeWindow.h" 29 29 30 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)30 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 31 31 32 32 #include <X11/extensions/Xcomposite.h> … … 283 283 } // namespace WebCore 284 284 285 #endif // USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)285 #endif // USE(REDIRECTED_XCOMPOSITE_WINDOW) -
trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h
r178413 r181847 28 28 #define RedirectedXCompositeWindow_h 29 29 30 #if USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)30 #if USE(REDIRECTED_XCOMPOSITE_WINDOW) 31 31 32 32 #include <WebCore/IntSize.h> … … 65 65 } // namespace WebKit 66 66 67 #endif // USE( TEXTURE_MAPPER_GL) && PLATFORM(X11)67 #endif // USE(REDIRECTED_XCOMPOSITE_WINDOW) 68 68 69 69 #endif // RedirectedXCompositeWindow_h -
trunk/Source/cmake/OptionsGTK.cmake
r181793 r181847 83 83 WEBKIT_OPTION_BEGIN() 84 84 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON) 85 WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." ON) 85 86 86 87 if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND)) 87 88 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON) 89 90 if (ENABLE_X11_TARGET) 91 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW ON) 92 else () 93 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW OFF) 94 endif () 88 95 89 96 if (OPENGL_FOUND) … … 107 114 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF) 108 115 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF) 116 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW OFF) 109 117 endif () 110 118 … … 361 369 add_definitions(-DENABLE_3D_RENDERING=1) 362 370 371 if (ENABLE_X11_TARGET AND USE_REDIRECTED_XCOMPOSITE_WINDOW) 372 add_definitions(-DWTF_USE_REDIRECTED_XCOMPOSITE_WINDOW=1) 373 endif () 374 363 375 if (OPENGLES2_FOUND) 364 376 set(WTF_USE_OPENGL_ES_2 1)
Note: See TracChangeset
for help on using the changeset viewer.