Title: [191453] trunk/Source/WebKit2
- Revision
- 191453
- Author
- [email protected]
- Date
- 2015-10-22 07:24:57 -0700 (Thu, 22 Oct 2015)
Log Message
Unreviewed, GTK build fix for disabled redirected XComposite window support.
* UIProcess/API/gtk/WebKitWebViewBase.cpp: Add USE(REDIRECTED_XCOMPOSITE_WINDOW) guards.
* UIProcess/DrawingAreaProxyImpl.h: Mark virtual methods as override to avoid compilation warnings.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191452 => 191453)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 13:54:55 UTC (rev 191452)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 14:24:57 UTC (rev 191453)
@@ -1,3 +1,10 @@
+2015-10-22 Philippe Normand <[email protected]>
+
+ Unreviewed, GTK build fix for disabled redirected XComposite window support.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp: Add USE(REDIRECTED_XCOMPOSITE_WINDOW) guards.
+ * UIProcess/DrawingAreaProxyImpl.h: Mark virtual methods as override to avoid compilation warnings.
+
2015-10-22 Wenson Hsieh <[email protected]>
Implement touch-action: manipulation; for iOS
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (191452 => 191453)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-22 13:54:55 UTC (rev 191452)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-22 14:24:57 UTC (rev 191453)
@@ -1346,6 +1346,7 @@
webkitWebViewBase->priv->clickCounter.reset();
}
+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
static void webkitWebViewBaseClearRedirectedWindowSoon(WebKitWebViewBase* webkitWebViewBase)
{
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
@@ -1355,6 +1356,7 @@
priv->redirectedWindow->resize(IntSize());
}, clearRedirectedWindowSoonDelay);
}
+#endif
void webkitWebViewBaseWillEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase)
{
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (191452 => 191453)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-22 13:54:55 UTC (rev 191452)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-22 14:24:57 UTC (rev 191453)
@@ -54,11 +54,11 @@
private:
// DrawingAreaProxy
- virtual void sizeDidChange();
- virtual void deviceScaleFactorDidChange();
+ virtual void sizeDidChange() override;
+ virtual void deviceScaleFactorDidChange() override;
- virtual void setBackingStoreIsDiscardable(bool);
- virtual void waitForBackingStoreUpdateOnNextPaint();
+ virtual void setBackingStoreIsDiscardable(bool) override;
+ virtual void waitForBackingStoreUpdateOnNextPaint() override;
// IPC message handlers
virtual void update(uint64_t backingStoreStateID, const UpdateInfo&) override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes