Title: [181955] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 181955
- Author
- carlo...@webkit.org
- Date
- 2015-03-25 05:53:37 -0700 (Wed, 25 Mar 2015)
Log Message
Merge r181937 - [WK2] Clean up DrawingAreaImpl vtable overrides
https://bugs.webkit.org/show_bug.cgi?id=143044
Reviewed by Carlos Garcia Campos.
Declare virtual methods of the DrawingAreaImpl class as overridden where necessary.
* WebProcess/WebPage/DrawingAreaImpl.h:
(WebKit::DrawingAreaImpl::layerTreeStateIsFrozen): Deleted.
(WebKit::DrawingAreaImpl::layerTreeHost): Deleted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181954 => 181955)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-25 12:48:35 UTC (rev 181954)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-25 12:53:37 UTC (rev 181955)
@@ -1,3 +1,16 @@
+2015-03-25 Zan Dobersek <zdober...@igalia.com>
+
+ [WK2] Clean up DrawingAreaImpl vtable overrides
+ https://bugs.webkit.org/show_bug.cgi?id=143044
+
+ Reviewed by Carlos Garcia Campos.
+
+ Declare virtual methods of the DrawingAreaImpl class as overridden where necessary.
+
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ (WebKit::DrawingAreaImpl::layerTreeStateIsFrozen): Deleted.
+ (WebKit::DrawingAreaImpl::layerTreeHost): Deleted.
+
2015-03-23 Anders Carlsson <ander...@apple.com>
Make platform/mac-wk2/plugins/destroy-during-async-npp-new.html work again.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (181954 => 181955)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-03-25 12:48:35 UTC (rev 181954)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-03-25 12:53:37 UTC (rev 181955)
@@ -51,15 +51,15 @@
// DrawingArea
virtual void setNeedsDisplay() override;
virtual void setNeedsDisplayInRect(const WebCore::IntRect&) override;
- virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta);
+ virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta) override;
virtual void pageBackgroundTransparencyChanged() override;
- virtual void setLayerTreeStateIsFrozen(bool);
- virtual bool layerTreeStateIsFrozen() const { return m_layerTreeStateIsFrozen; }
- virtual LayerTreeHost* layerTreeHost() const { return m_layerTreeHost.get(); }
- virtual void forceRepaint();
- virtual bool forceRepaintAsync(uint64_t callbackID);
+ virtual void setLayerTreeStateIsFrozen(bool) override;
+ virtual bool layerTreeStateIsFrozen() const override { return m_layerTreeStateIsFrozen; }
+ virtual LayerTreeHost* layerTreeHost() const override { return m_layerTreeHost.get(); }
+ virtual void forceRepaint() override;
+ virtual bool forceRepaintAsync(uint64_t callbackID) override;
- virtual void setPaintingEnabled(bool);
+ virtual void setPaintingEnabled(bool) override;
virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) override;
virtual void updatePreferences(const WebPreferencesStore&) override;
@@ -68,15 +68,15 @@
virtual void scheduleCompositingLayerFlush() override;
virtual void scheduleCompositingLayerFlushImmediately() override;
- virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
+ virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) override;
#endif
// IPC message handlers.
- virtual void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset);
- virtual void didUpdate();
+ virtual void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override;
+ virtual void didUpdate() override;
virtual void suspendPainting();
virtual void resumePainting();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
