Title: [182176] trunk/Source/WebKit2
- Revision
- 182176
- Author
- [email protected]
- Date
- 2015-03-31 01:37:04 -0700 (Tue, 31 Mar 2015)
Log Message
Unreviewed. Fix GTK+ build with REDIRECTED_XCOMPOSITE_WINDOW disabled in X11 platform.
Also fix some unused parameter warnings when
REDIRECTED_XCOMPOSITE_WINDOW is disabled.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewRenderAcceleratedCompositingResults):
(resizeWebKitWebViewBaseFromAllocation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182175 => 182176)
--- trunk/Source/WebKit2/ChangeLog 2015-03-31 07:49:54 UTC (rev 182175)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-31 08:37:04 UTC (rev 182176)
@@ -1,5 +1,16 @@
2015-03-31 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix GTK+ build with REDIRECTED_XCOMPOSITE_WINDOW disabled in X11 platform.
+
+ Also fix some unused parameter warnings when
+ REDIRECTED_XCOMPOSITE_WINDOW is disabled.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewRenderAcceleratedCompositingResults):
+ (resizeWebKitWebViewBaseFromAllocation):
+
+2015-03-31 Carlos Garcia Campos <[email protected]>
+
[GTK] DnD icon/widget has odd background
https://bugs.webkit.org/show_bug.cgi?id=143217
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (182175 => 182176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-31 07:49:54 UTC (rev 182175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-31 08:37:04 UTC (rev 182176)
@@ -67,7 +67,7 @@
#include "WebFullScreenManagerProxy.h"
#endif
-#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(X11)
#include <gdk/gdkx.h>
#endif
@@ -541,6 +541,9 @@
return true;
#else
+ UNUSED_PARAM(webViewBase);
+ UNUSED_PARAM(cr);
+ UNUSED_PARAM(clipRect);
return false;
#endif
}
@@ -639,6 +642,8 @@
#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (sizeChanged && priv->redirectedWindow && drawingArea && drawingArea->isInAcceleratedCompositingMode())
priv->redirectedWindow->resize(viewRect.size());
+#else
+ UNUSED_PARAM(sizeChanged);
#endif
if (drawingArea)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes