Diff
Modified: trunk/Source/WebCore/ChangeLog (176914 => 176915)
--- trunk/Source/WebCore/ChangeLog 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/ChangeLog 2014-12-06 21:44:36 UTC (rev 176915)
@@ -1,6 +1,28 @@
2014-12-06 Anders Carlsson <[email protected]>
Fix build with newer versions of clang.
+ rdar://problem/18978733
+
+ Add a bunch of overrides since we're not disabling the "inconsistent missing override" warning in WebKit.
+
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingStateFixedNode.h:
+ * page/scrolling/ScrollingStateFrameScrollingNode.h:
+ * page/scrolling/ScrollingStateOverflowScrollingNode.h:
+ * page/scrolling/ScrollingStateStickyNode.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+ (WebCore::ScrollingTreeFrameScrollingNode::updateLayersAfterDelegatedScroll): Deleted.
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+ * platform/graphics/GraphicsLayerUpdater.h:
+ * platform/mac/ScrollbarThemeMac.h:
+ (WebCore::ScrollbarThemeMac::supportsControlTints): Deleted.
+ (WebCore::ScrollbarThemeMac::maxOverlapBetweenPages): Deleted.
+ * rendering/RenderLayerCompositor.h:
+ * rendering/RenderSnapshottedPlugIn.h:
+
+2014-12-06 Anders Carlsson <[email protected]>
+
+ Fix build with newer versions of clang.
rdar://problem/18978687
Add a bunch of overrides since we're not disabling the "inconsistent missing override" warning in WebKit.
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -88,8 +88,8 @@
WEBCORE_EXPORT virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) override;
- WEBCORE_EXPORT virtual void updateFrameScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, GraphicsLayer* insetClipLayer, const ScrollingGeometry* = nullptr);
- WEBCORE_EXPORT virtual void updateOverflowScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer, GraphicsLayer* scrolledContentsLayer, const ScrollingGeometry* = nullptr);
+ WEBCORE_EXPORT virtual void updateFrameScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, GraphicsLayer* insetClipLayer, const ScrollingGeometry* = nullptr) override;
+ WEBCORE_EXPORT virtual void updateOverflowScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer, GraphicsLayer* scrolledContentsLayer, const ScrollingGeometry* = nullptr) override;
virtual bool isRubberBandInProgress() const override;
virtual void setScrollPinningBehavior(ScrollPinningBehavior) override;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -41,7 +41,7 @@
public:
static PassRefPtr<ScrollingStateFixedNode> create(ScrollingStateTree&, ScrollingNodeID);
- virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&);
+ virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&) override;
virtual ~ScrollingStateFixedNode();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -42,7 +42,7 @@
public:
static PassRefPtr<ScrollingStateFrameScrollingNode> create(ScrollingStateTree&, ScrollingNodeID);
- virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&);
+ virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&) override;
virtual ~ScrollingStateFrameScrollingNode();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -36,7 +36,7 @@
public:
static PassRefPtr<ScrollingStateOverflowScrollingNode> create(ScrollingStateTree&, ScrollingNodeID);
- virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&);
+ virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&) override;
virtual ~ScrollingStateOverflowScrollingNode();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -41,7 +41,7 @@
public:
static PassRefPtr<ScrollingStateStickyNode> create(ScrollingStateTree&, ScrollingNodeID);
- virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&);
+ virtual PassRefPtr<ScrollingStateNode> clone(ScrollingStateTree&) override;
virtual ~ScrollingStateStickyNode();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -45,12 +45,12 @@
// FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
- virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
- virtual void setScrollPosition(const FloatPoint&);
- virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) = 0;
+ virtual void handleWheelEvent(const PlatformWheelEvent&) override = 0;
+ virtual void setScrollPosition(const FloatPoint&) override;
+ virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override = 0;
- virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) = 0;
- virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) { }
+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) override = 0;
+ virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) override { }
SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }
bool shouldUpdateScrollLayerPositionSynchronously() const { return m_synchronousScrollingReasons; }
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h (176914 => 176915)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -51,7 +51,7 @@
virtual FloatPoint scrollPosition() const override;
virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
- virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale);
+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) override;
virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) override;
virtual void setScrollLayerPosition(const FloatPoint&) override;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h (176914 => 176915)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -59,7 +59,7 @@
#endif
private:
- virtual void displayRefreshFired(double timestamp);
+ virtual void displayRefreshFired(double timestamp) override;
GraphicsLayerUpdaterClient* m_client;
bool m_scheduled;
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h (176914 => 176915)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -37,24 +37,24 @@
void preferencesChanged();
- virtual void updateEnabledState(ScrollbarThemeClient*);
+ virtual void updateEnabledState(ScrollbarThemeClient*) override;
- virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& damageRect);
+ virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& damageRect) override;
- virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar);
+ virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) override;
- virtual bool supportsControlTints() const { return true; }
- virtual bool usesOverlayScrollbars() const;
+ virtual bool supportsControlTints() const override { return true; }
+ virtual bool usesOverlayScrollbars() const override;
virtual void usesOverlayScrollbarsChanged() override;
- virtual void updateScrollbarOverlayStyle(ScrollbarThemeClient*);
+ virtual void updateScrollbarOverlayStyle(ScrollbarThemeClient*) override;
- virtual double initialAutoscrollTimerDelay();
- virtual double autoscrollTimerDelay();
+ virtual double initialAutoscrollTimerDelay() override;
+ virtual double autoscrollTimerDelay() override;
- virtual ScrollbarButtonsPlacement buttonsPlacement() const;
+ virtual ScrollbarButtonsPlacement buttonsPlacement() const override;
- virtual void registerScrollbar(ScrollbarThemeClient*);
- virtual void unregisterScrollbar(ScrollbarThemeClient*);
+ virtual void registerScrollbar(ScrollbarThemeClient*) override;
+ virtual void unregisterScrollbar(ScrollbarThemeClient*) override;
void setNewPainterForScrollbar(ScrollbarThemeClient*, ScrollbarPainter);
ScrollbarPainter painterForScrollbar(ScrollbarThemeClient*);
@@ -73,19 +73,19 @@
#endif
protected:
- virtual bool hasButtons(ScrollbarThemeClient*);
- virtual bool hasThumb(ScrollbarThemeClient*);
+ virtual bool hasButtons(ScrollbarThemeClient*) override;
+ virtual bool hasThumb(ScrollbarThemeClient*) override;
- virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
- virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
- virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false);
+ virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
+ virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
+ virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) override;
- virtual int maxOverlapBetweenPages() { return 40; }
+ virtual int maxOverlapBetweenPages() override { return 40; }
- virtual int minimumThumbLength(ScrollbarThemeClient*);
+ virtual int minimumThumbLength(ScrollbarThemeClient*) override;
- virtual bool shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent&);
- virtual bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const PlatformMouseEvent&);
+ virtual bool shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent&) override;
+ virtual bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const PlatformMouseEvent&) override;
int scrollbarPartToHIPressedState(ScrollbarPart);
#if ENABLE(RUBBER_BANDING)
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (176914 => 176915)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -393,7 +393,7 @@
ScrollingCoordinator* scrollingCoordinator() const;
#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
- PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const;
+ PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
#endif
bool requiresCompositingForAnimation(RenderLayerModelObject&) const;
Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h (176914 => 176915)
--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -47,7 +47,7 @@
private:
void frameOwnerElement() const = delete;
- virtual const char* renderName() const { return "RenderSnapshottedPlugIn"; }
+ virtual const char* renderName() const override { return "RenderSnapshottedPlugIn"; }
virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
virtual bool isSnapshottedPlugIn() const override { return true; }
Modified: trunk/Source/WebKit2/ChangeLog (176914 => 176915)
--- trunk/Source/WebKit2/ChangeLog 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-06 21:44:36 UTC (rev 176915)
@@ -1,5 +1,48 @@
2014-12-06 Anders Carlsson <[email protected]>
+ Fix build with newer versions of clang.
+ rdar://problem/18978733
+
+ Add missing overrides and casts.
+
+ * NetworkProcess/NetworkProcess.h:
+ * Shared/Downloads/DownloadAuthenticationClient.h:
+ (WebKit::DownloadAuthenticationClient::refAuthenticationClient): Deleted.
+ (WebKit::DownloadAuthenticationClient::derefAuthenticationClient): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration copyWithZone:]):
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateLayersAfterViewportChange): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm:
+ (WebKit::WebContentProcessMainDelegate::doPreInitializationWork): Deleted.
+ (WebKit::WebContentProcessMainDelegate::getConnectionIdentifier): Deleted.
+ (WebKit::WebContentProcessMainDelegate::getClientIdentifier): Deleted.
+ (WebKit::WebContentProcessMainDelegate::getClientProcessName): Deleted.
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
+ * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WebKit::InjectedBundle::initialize):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/WebBackForwardListProxy.h:
+ * WebProcess/WebPage/WebInspector.h:
+ (WebKit::WebInspector::didClose): Deleted.
+ (WebKit::WebInspector::didReceiveInvalidMessage): Deleted.
+ * WebProcess/WebPage/WebInspectorUI.h:
+ (WebKit::WebInspectorUI::didClose): Deleted.
+ (WebKit::WebInspectorUI::didReceiveInvalidMessage): Deleted.
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h:
+ * WebProcess/WebProcess.h:
+ * WebProcess/ios/WebVideoFullscreenManager.h:
+
+2014-12-06 Anders Carlsson <[email protected]>
+
Only include TUCallSPI on Mac.
* Platform/mac/MenuUtilities.mm:
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (176914 => 176915)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -96,7 +96,7 @@
// IPC::Connection::Client
virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
- virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
virtual void didClose(IPC::Connection*) override;
virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadAuthenticationClient.h (176914 => 176915)
--- trunk/Source/WebKit2/Shared/Downloads/DownloadAuthenticationClient.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadAuthenticationClient.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -51,14 +51,14 @@
private:
DownloadAuthenticationClient(Download*);
- virtual void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
- virtual void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
- virtual void receivedCancellation(const WebCore::AuthenticationChallenge&);
+ virtual void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&) override;
+ virtual void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&) override;
+ virtual void receivedCancellation(const WebCore::AuthenticationChallenge&) override;
virtual void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&) override;
virtual void receivedChallengeRejection(const WebCore::AuthenticationChallenge&) override;
- virtual void refAuthenticationClient() { ref(); }
- virtual void derefAuthenticationClient() { deref(); }
+ virtual void refAuthenticationClient() override { ref(); }
+ virtual void derefAuthenticationClient() override { deref(); }
Download* m_download;
};
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-12-06 21:44:36 UTC (rev 176915)
@@ -1601,7 +1601,7 @@
m_client.pinnedStateDidChange(toAPI(&page), m_client.base.clientInfo);
}
- virtual void didBeginTrackingPotentialLongMousePress(WebPageProxy* page, const IntPoint& mouseDownPosition, const WebHitTestResult::Data& data, API::Object* userInfo)
+ virtual void didBeginTrackingPotentialLongMousePress(WebPageProxy* page, const IntPoint& mouseDownPosition, const WebHitTestResult::Data& data, API::Object* userInfo) override
{
if (!m_client.didBeginTrackingPotentialLongMousePress)
return;
@@ -1610,7 +1610,7 @@
m_client.didBeginTrackingPotentialLongMousePress(toAPI(page), toAPI(mouseDownPosition), toAPI(webHitTestResult.get()), toAPI(userInfo), m_client.base.clientInfo);
}
- virtual void didRecognizeLongMousePress(WebPageProxy* page, API::Object* userInfo)
+ virtual void didRecognizeLongMousePress(WebPageProxy* page, API::Object* userInfo) override
{
if (!m_client.didRecognizeLongMousePress)
return;
@@ -1618,7 +1618,7 @@
m_client.didRecognizeLongMousePress(toAPI(page), toAPI(userInfo), m_client.base.clientInfo);
}
- virtual void didCancelTrackingPotentialLongMousePress(WebPageProxy* page, API::Object* userInfo)
+ virtual void didCancelTrackingPotentialLongMousePress(WebPageProxy* page, API::Object* userInfo) override
{
if (!m_client.didCancelTrackingPotentialLongMousePress)
return;
@@ -1626,7 +1626,7 @@
m_client.didCancelTrackingPotentialLongMousePress(toAPI(page), toAPI(userInfo), m_client.base.clientInfo);
}
- virtual void isPlayingAudioDidChange(WebPageProxy& page)
+ virtual void isPlayingAudioDidChange(WebPageProxy& page) override
{
if (!m_client.isPlayingAudioDidChange)
return;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-12-06 21:44:36 UTC (rev 176915)
@@ -114,7 +114,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
+ WKWebViewConfiguration *configuration = [(WKWebViewConfiguration *)[[self class] allocWithZone:zone] init];
configuration.processPool = self.processPool;
configuration.preferences = self.preferences;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2014-12-06 21:44:36 UTC (rev 176915)
@@ -66,7 +66,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- _WKProcessPoolConfiguration *configuration = [[[self class] allocWithZone:zone] init];
+ _WKProcessPoolConfiguration *configuration = [(_WKProcessPoolConfiguration *)[[self class] allocWithZone:zone] init];
configuration.maximumProcessCount = self.maximumProcessCount;
configuration.injectedBundleURL = self.injectedBundleURL;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -102,7 +102,7 @@
private:
virtual void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
- virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*);
+ virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) override;
virtual void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) override;
virtual void didCommitLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, uint64_t navigationID, API::Object*) override;
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -87,7 +87,7 @@
void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier);
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
WebContext& m_webContext;
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -57,7 +57,7 @@
virtual void setScrollLayerPosition(const WebCore::FloatPoint&) override;
- virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& fixedPositionRect, double scale) { }
+ virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& fixedPositionRect, double scale) override { }
virtual void updateLayersAfterDelegatedScroll(const WebCore::FloatPoint& scrollPosition) override;
virtual void updateLayersAfterAncestorChange(const WebCore::ScrollingTreeNode& changedNode, const WebCore::FloatRect& fixedPositionRect, const WebCore::FloatSize& cumulativeDelta) override;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (176914 => 176915)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -852,7 +852,7 @@
bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
// WebPopupMenuProxy::Client
- virtual NativeWebMouseEvent* currentlyProcessedMouseDownEvent();
+ virtual NativeWebMouseEvent* currentlyProcessedMouseDownEvent() override;
#if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
void setAcceleratedCompositingWindowId(uint64_t nativeWindowId);
@@ -979,8 +979,8 @@
virtual uint64_t messageSenderDestinationID() override;
// WebPopupMenuProxy::Client
- virtual void valueChangedForPopupMenu(WebPopupMenuProxy*, int32_t newSelectedIndex);
- virtual void setTextFromItemForPopupMenu(WebPopupMenuProxy*, int32_t index);
+ virtual void valueChangedForPopupMenu(WebPopupMenuProxy*, int32_t newSelectedIndex) override;
+ virtual void setTextFromItemForPopupMenu(WebPopupMenuProxy*, int32_t index) override;
#if PLATFORM(GTK)
virtual void failedToShowPopupMenu();
#endif
Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2014-12-06 21:44:36 UTC (rev 176915)
@@ -64,7 +64,7 @@
{
}
- virtual void doPreInitializationWork()
+ virtual void doPreInitializationWork() override
{
// Remove the WebProcess and SecItem shims from the DYLD_INSERT_LIBRARIES environment variable so any processes
// spawned by the WebProcess don't try to insert the shims and crash.
@@ -86,7 +86,7 @@
#endif // PLATFORM(IOS)
}
- virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier)
+ virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier) override
{
String clientExecutable = m_commandLine["client-executable"];
if (clientExecutable.isEmpty())
@@ -146,7 +146,7 @@
return true;
}
- virtual bool getClientIdentifier(String& clientIdentifier)
+ virtual bool getClientIdentifier(String& clientIdentifier) override
{
String clientExecutable = m_commandLine["client-executable"];
if (clientExecutable.isEmpty())
@@ -161,7 +161,7 @@
return true;
}
- virtual bool getClientProcessName(String& clientProcessName)
+ virtual bool getClientProcessName(String& clientProcessName) override
{
String clientExecutable = m_commandLine["client-executable"];
if (clientExecutable.isEmpty())
Modified: trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -43,24 +43,24 @@
explicit WebIconDatabaseProxy(WebProcess*);
virtual ~WebIconDatabaseProxy();
- virtual bool isEnabled() const;
- void setEnabled(bool);
+ virtual bool isEnabled() const override;
+ void setEnabled(bool) override;
- virtual void retainIconForPageURL(const String&);
- virtual void releaseIconForPageURL(const String&);
- virtual void setIconURLForPageURL(const String&, const String&);
- virtual void setIconDataForIconURL(PassRefPtr<WebCore::SharedBuffer>, const String&);
+ virtual void retainIconForPageURL(const String&) override;
+ virtual void releaseIconForPageURL(const String&) override;
+ virtual void setIconURLForPageURL(const String&, const String&) override;
+ virtual void setIconDataForIconURL(PassRefPtr<WebCore::SharedBuffer>, const String&) override;
- virtual String synchronousIconURLForPageURL(const String&);
- virtual bool synchronousIconDataKnownForIconURL(const String&);
- virtual WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*);
- virtual WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&);
+ virtual String synchronousIconURLForPageURL(const String&) override;
+ virtual bool synchronousIconDataKnownForIconURL(const String&) override;
+ virtual WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*) override;
+ virtual WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&) override;
// Asynchronous calls we should use to replace the above when supported.
- virtual bool supportsAsynchronousMode();
- virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>);
+ virtual bool supportsAsynchronousMode() override;
+ virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>) override;
void receivedIconLoadDecision(int decision, uint64_t callbackID);
- virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
+ virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>) override;
private:
// IPC::MessageReceiver
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2014-12-06 21:44:36 UTC (rev 176915)
@@ -118,7 +118,7 @@
return false;
}
- id <WKWebProcessPlugIn> instance = (id <WKWebProcessPlugIn>)[[principalClass alloc] init];
+ id <WKWebProcessPlugIn> instance = (id <WKWebProcessPlugIn>)[(NSObject *)[principalClass alloc] init];
if (!instance) {
WTFLogAlways("InjectedBundle::load failed - Could not initialize an instance of the principal class.\n");
return false;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -222,7 +222,7 @@
virtual PassRefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
#endif
- virtual CompositingTriggerFlags allowedCompositingTriggers() const
+ virtual CompositingTriggerFlags allowedCompositingTriggers() const override
{
return static_cast<CompositingTriggerFlags>(
ThreeDTransformTrigger |
@@ -251,9 +251,9 @@
#endif
#if PLATFORM(IOS)
- virtual bool supportsVideoFullscreen();
- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode);
- virtual void exitVideoFullscreen();
+ virtual bool supportsVideoFullscreen() override;
+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void exitVideoFullscreen() override;
#endif
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -159,7 +159,7 @@
virtual void didFinishLoad() override;
virtual void prepareForDataSourceReplacement() override;
- virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
+ virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
virtual String userAgent(const WebCore::URL&) override;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -50,17 +50,17 @@
private:
WebBackForwardListProxy(WebPage*);
- virtual void addItem(PassRefPtr<WebCore::HistoryItem>);
+ virtual void addItem(PassRefPtr<WebCore::HistoryItem>) override;
- virtual void goToItem(WebCore::HistoryItem*);
+ virtual void goToItem(WebCore::HistoryItem*) override;
- virtual WebCore::HistoryItem* itemAtIndex(int);
- virtual int backListCount();
- virtual int forwardListCount();
+ virtual WebCore::HistoryItem* itemAtIndex(int) override;
+ virtual int backListCount() override;
+ virtual int forwardListCount() override;
virtual bool isActive();
- virtual void close();
+ virtual void close() override;
#if PLATFORM(IOS)
virtual unsigned current() override;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -50,11 +50,11 @@
virtual bool sendMessageToFrontend(const String& message) override;
// Implemented in generated WebInspectorMessageReceiver.cpp
- void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
// IPC::Connection::Client
- void didClose(IPC::Connection*) { close(); }
- void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference) { close(); }
+ void didClose(IPC::Connection*) override { close(); }
+ void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference) override { close(); }
// Called by WebInspector messages
void connectionEstablished();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -45,11 +45,11 @@
WebPage* page() const { return m_page; }
// Implemented in generated WebInspectorUIMessageReceiver.cpp
- void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
// IPC::Connection::Client
- void didClose(IPC::Connection*) { closeWindow(); }
- void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference) { closeWindow(); }
+ void didClose(IPC::Connection*) override { closeWindow(); }
+ void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference) override { closeWindow(); }
// Called by WebInspectorUI messages
void establishConnection(IPC::Attachment connectionIdentifier, uint64_t inspectedPageIdentifier, bool underTest);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -52,7 +52,7 @@
virtual PassRefPtr<WebCore::PlatformCALayer> clone(WebCore::PlatformCALayerClient* owner) const override;
- virtual bool isPlatformCALayerRemoteCustom() const { return true; }
+ virtual bool isPlatformCALayerRemoteCustom() const override { return true; }
virtual CFTypeRef contents() const override;
virtual void setContents(CFTypeRef) override;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -278,9 +278,9 @@
// IPC::Connection::Client
friend class WebConnectionToUIProcess;
- virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
- virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
- virtual void didClose(IPC::Connection*);
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
+ virtual void didClose(IPC::Connection*) override;
virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
// Implemented in generated WebProcessMessageReceiver.cpp
Modified: trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h (176914 => 176915)
--- trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2014-12-06 21:43:22 UTC (rev 176914)
+++ trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2014-12-06 21:44:36 UTC (rev 176915)
@@ -57,7 +57,7 @@
static PassRefPtr<WebVideoFullscreenManager> create(PassRefPtr<WebPage>);
virtual ~WebVideoFullscreenManager();
- void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
bool supportsVideoFullscreen() const;
void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode);
