Diff
Modified: trunk/Source/WebCore/ChangeLog (179235 => 179236)
--- trunk/Source/WebCore/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
@@ -1,3 +1,11 @@
+2015-01-27 Alexey Proskuryakov <[email protected]>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ * loader/icon/IconDatabase.h: Added missing override keywords.
+
2015-01-27 Roger Fong <[email protected]>
WebGL2: Disable various extensions on WebGL2 context that have been promoted to core.
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (179235 => 179236)
--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -130,8 +130,8 @@
// *** Any Thread ***
public:
- WEBCORE_EXPORT virtual bool isOpen() const;
- WEBCORE_EXPORT virtual String databasePath() const;
+ WEBCORE_EXPORT virtual bool isOpen() const override;
+ WEBCORE_EXPORT virtual String databasePath() const override;
WEBCORE_EXPORT static String defaultDatabaseFilename();
private:
@@ -178,7 +178,7 @@
// *** Sync Thread Only ***
public:
- WEBCORE_EXPORT virtual bool shouldStopThreadActivity() const;
+ WEBCORE_EXPORT virtual bool shouldStopThreadActivity() const override;
private:
static void iconDatabaseSyncThreadStart(void *);
Modified: trunk/Source/WebKit/mac/ChangeLog (179235 => 179236)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
@@ -1,3 +1,14 @@
+2015-01-27 Alexey Proskuryakov <[email protected]>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ Marked a deprecated accessibility method as such.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame accessibilityRoot]):
+
2015-01-27 Beth Dakin <[email protected]>
Immediate action gesture recognizer still doesn't work well with IB
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (179235 => 179236)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-28 02:29:06 UTC (rev 179236)
@@ -2234,7 +2234,10 @@
if (!AXObjectCache::accessibilityEnabled()) {
AXObjectCache::enableAccessibility();
#if !PLATFORM(IOS)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
AXObjectCache::setEnhancedUserInterfaceAccessibility([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue]);
+#pragma clang diagnostic pop
#endif
}
Modified: trunk/Source/WebKit2/ChangeLog (179235 => 179236)
--- trunk/Source/WebKit2/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
@@ -1,3 +1,34 @@
+2015-01-27 Alexey Proskuryakov <[email protected]>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ Added missing override keywords, marked some deprecated accessibility methods as such.
+
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ (WebKit::PluginProcessMainDelegate::doPreInitializationWork): Deleted.
+ (WebKit::PluginProcessMainDelegate::getExtraInitializationData): Deleted.
+ (WebKit::PluginProcessMainDelegate::doPostRunWork): Deleted.
+ * PluginProcess/WebProcessConnection.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/PageClientImpl.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
+ (PageOverlayClientImpl::actionContextForResultAtPoint): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidPresentUI): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidChangeUI): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidHideUI): Deleted.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ (WebKit::NetscapePlugin::isBeingAsynchronouslyInitialized): Deleted.
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PluginProcessConnection.h:
+ * WebProcess/Plugins/PluginProxy.h:
+ (WebKit::PluginProxy::isBeingAsynchronouslyInitialized): Deleted.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+
2015-01-27 Beth Dakin <[email protected]>
Immediate action gesture recognizer still doesn't work well with IB
Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (179235 => 179236)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 02:29:06 UTC (rev 179236)
@@ -51,7 +51,7 @@
{
}
- virtual void doPreInitializationWork()
+ virtual void doPreInitializationWork() override
{
// Remove the PluginProcess shim from the DYLD_INSERT_LIBRARIES environment variable so any processes
// spawned by the PluginProcess don't try to insert the shim and crash.
@@ -86,7 +86,7 @@
}
}
- virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData)
+ virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData) override
{
String pluginPath = m_commandLine["plugin-path"];
if (pluginPath.isEmpty())
@@ -106,7 +106,7 @@
[NSApp run];
}
- virtual void doPostRunWork()
+ virtual void doPostRunWork() override
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
// If we have private temporary and cache directories, clean them up.
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h (179235 => 179236)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -67,8 +67,8 @@
// IPC::Connection::Client
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&);
- virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
+ virtual void didClose(IPC::Connection&) override;
+ virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
// Message handlers.
void didReceiveWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179235 => 179236)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-28 02:29:06 UTC (rev 179236)
@@ -177,7 +177,10 @@
parameters.presenterApplicationPid = getpid();
#if PLATFORM(MAC)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
parameters.accessibilityEnhancedUserInterfaceEnabled = [[NSApp accessibilityAttributeValue:@"AXEnhancedUserInterface"] boolValue];
+#pragma clang diagnostic pop
#else
parameters.accessibilityEnhancedUserInterfaceEnabled = false;
#endif
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (179235 => 179236)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -122,7 +122,7 @@
virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier);
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
// Message handlers
void didCreateWebProcessConnection(const IPC::Attachment&, bool supportsAsynchronousPluginInitialization);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (179235 => 179236)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -1140,8 +1140,8 @@
#if ENABLE(INPUT_TYPE_COLOR)
void showColorPicker(const WebCore::Color& initialColor, const WebCore::IntRect&);
- void didChooseColor(const WebCore::Color&);
- void didEndColorPicker();
+ virtual void didChooseColor(const WebCore::Color&) override;
+ virtual void didEndColorPicker() override;
#endif
void editorStateChanged(const EditorState&);
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (179235 => 179236)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -56,45 +56,45 @@
private:
// PageClient
- virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewNeedsDisplay(const WebCore::IntRect&);
- virtual void displayView();
- virtual bool canScrollView();
- virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
- virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, bool isProgrammaticScroll);
+ virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() override;
+ virtual void setViewNeedsDisplay(const WebCore::IntRect&) override;
+ virtual void displayView() override;
+ virtual bool canScrollView() override;
+ virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) override;
+ virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, bool isProgrammaticScroll) override;
- virtual WebCore::IntSize viewSize();
- virtual bool isViewWindowActive();
- virtual bool isViewFocused();
- virtual bool isViewVisible();
- virtual bool isViewVisibleOrOccluded();
- virtual bool isViewInWindow();
- virtual bool isVisuallyIdle();
+ virtual WebCore::IntSize viewSize() override;
+ virtual bool isViewWindowActive() override;
+ virtual bool isViewFocused() override;
+ virtual bool isViewVisible() override;
+ virtual bool isViewVisibleOrOccluded() override;
+ virtual bool isViewInWindow() override;
+ virtual bool isVisuallyIdle() override;
virtual LayerHostingMode viewLayerHostingMode() override;
virtual ColorSpaceData colorSpace() override;
virtual void setAcceleratedCompositingRootLayer(LayerOrView *) override;
virtual LayerOrView *acceleratedCompositingRootLayer() const override;
- virtual void processDidExit();
- virtual void pageClosed();
- virtual void didRelaunchProcess();
+ virtual void processDidExit() override;
+ virtual void pageClosed() override;
+ virtual void didRelaunchProcess() override;
virtual void preferencesDidChange() override;
- virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
+ virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip) override;
virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
virtual void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&) override;
virtual void handleDownloadRequest(DownloadProxy*) override;
- virtual void setCursor(const WebCore::Cursor&);
- virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
+ virtual void setCursor(const WebCore::Cursor&) override;
+ virtual void setCursorHiddenUntilMouseMoves(bool) override;
+ virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
- virtual void clearAllEditCommands();
- virtual bool canUndoRedo(WebPageProxy::UndoOrRedo);
- virtual void executeUndoRedo(WebPageProxy::UndoOrRedo);
- virtual bool executeSavedCommandBySelector(const String& selector);
- virtual void setDragImage(const WebCore::IntPoint& clientPosition, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag);
+ virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo) override;
+ virtual void clearAllEditCommands() override;
+ virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
+ virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ virtual bool executeSavedCommandBySelector(const String& selector) override;
+ virtual void setDragImage(const WebCore::IntPoint& clientPosition, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag) override;
virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,
- const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer);
+ const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) override;
virtual void updateSecureInputState() override;
virtual void resetSecureInputState() override;
virtual void notifyInputContextAboutDiscardedComposition() override;
@@ -102,61 +102,61 @@
virtual void notifyApplicationAboutInputContextChange() override;
#endif
- virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
- virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
- virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
- virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
+ virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
+ virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
#if PLATFORM(IOS)
virtual WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) = 0;
virtual WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) = 0;
#endif
- CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const;
+ CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const override;
- virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
+ virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
- virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
- virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);
+ virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
+ virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
#if ENABLE(INPUT_TYPE_COLOR)
- virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&);
+ virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
#endif
virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut) override;
virtual void setTextIndicatorAnimationProgress(float) override;
- virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
- virtual void exitAcceleratedCompositingMode();
- virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
+ virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;
+ virtual void exitAcceleratedCompositingMode() override;
+ virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() override;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
- virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&);
+ virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) override;
- virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
- virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState);
+ virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) override;
+ virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) override;
- virtual void makeFirstResponder();
+ virtual void makeFirstResponder() override;
- virtual void didPerformDictionaryLookup(const DictionaryPopupInfo&);
- virtual void dismissContentRelativeChildWindows();
+ virtual void didPerformDictionaryLookup(const DictionaryPopupInfo&) override;
+ virtual void dismissContentRelativeChildWindows() override;
- virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
- virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText);
- virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText);
- virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString);
+ virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) override;
+ virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) override;
+ virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) override;
+ virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) override;
- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle);
+ virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) override;
- virtual WKView* wkView() const { return m_wkView; }
+ virtual WKView* wkView() const override { return m_wkView; }
virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize) override;
#if USE(DICTATION_ALTERNATIVES)
- virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&);
- virtual void removeDictationAlternatives(uint64_t dictationContext);
- virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
- virtual Vector<String> dictationAlternatives(uint64_t dictationContext);
+ virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&) override;
+ virtual void removeDictationAlternatives(uint64_t dictationContext) override;
+ virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) override;
+ virtual Vector<String> dictationAlternatives(uint64_t dictationContext) override;
#endif
#if USE(INSERTION_UNDO_GROUPING)
virtual void registerInsertionUndoGrouping() override;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-01-28 02:29:06 UTC (rev 179236)
@@ -135,7 +135,7 @@
}
#if PLATFORM(MAC)
- virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle)
+ virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) override
{
if (!m_client.actionContextForResultAtPoint)
return nil;
@@ -149,7 +149,7 @@
return actionContext;
}
- virtual void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay)
+ virtual void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay) override
{
if (!m_client.dataDetectorsDidPresentUI)
return;
@@ -157,7 +157,7 @@
m_client.dataDetectorsDidPresentUI(toAPI(&pageOverlay), m_client.base.clientInfo);
}
- virtual void dataDetectorsDidChangeUI(WebPageOverlay& pageOverlay)
+ virtual void dataDetectorsDidChangeUI(WebPageOverlay& pageOverlay) override
{
if (!m_client.dataDetectorsDidChangeUI)
return;
@@ -165,7 +165,7 @@
m_client.dataDetectorsDidChangeUI(toAPI(&pageOverlay), m_client.base.clientInfo);
}
- virtual void dataDetectorsDidHideUI(WebPageOverlay& pageOverlay)
+ virtual void dataDetectorsDidHideUI(WebPageOverlay& pageOverlay) override
{
if (!m_client.dataDetectorsDidHideUI)
return;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -59,7 +59,7 @@
static PassRefPtr<NetscapePlugin> fromNPP(NPP);
// In-process NetscapePlugins don't support asynchronous initialization.
- virtual bool isBeingAsynchronouslyInitialized() const { return false; }
+ virtual bool isBeingAsynchronouslyInitialized() const override { return false; }
#if PLATFORM(COCOA)
NPError setDrawingModel(NPDrawingModel);
@@ -177,38 +177,38 @@
static bool wantsPluginRelativeNPWindowCoordinates();
// Plugin
- virtual bool initialize(const Parameters&);
- virtual void destroy();
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
- virtual PassRefPtr<ShareableBitmap> snapshot();
+ virtual bool initialize(const Parameters&) override;
+ virtual void destroy() override;
+ virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect) override;
+ virtual PassRefPtr<ShareableBitmap> snapshot() override;
#if PLATFORM(COCOA)
- virtual PlatformLayer* pluginLayer();
+ virtual PlatformLayer* pluginLayer() override;
#endif
- virtual bool isTransparent();
+ virtual bool isTransparent() override;
virtual bool wantsWheelEvents() override;
- virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
- virtual void visibilityDidChange(bool isVisible);
- virtual void frameDidFinishLoading(uint64_t requestID);
- virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
+ virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) override;
+ virtual void visibilityDidChange(bool isVisible) override;
+ virtual void frameDidFinishLoading(uint64_t requestID) override;
+ virtual void frameDidFail(uint64_t requestID, bool wasCancelled) override;
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& result) override;
virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
- virtual void streamDidFinishLoading(uint64_t streamID);
- virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length) override;
+ virtual void streamDidFinishLoading(uint64_t streamID) override;
+ virtual void streamDidFail(uint64_t streamID, bool wasCancelled) override;
virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void manualStreamDidReceiveData(const char* bytes, int length);
- virtual void manualStreamDidFinishLoading();
- virtual void manualStreamDidFail(bool wasCancelled);
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void manualStreamDidReceiveData(const char* bytes, int length) override;
+ virtual void manualStreamDidFinishLoading() override;
+ virtual void manualStreamDidFail(bool wasCancelled) override;
- virtual bool handleMouseEvent(const WebMouseEvent&);
- virtual bool handleWheelEvent(const WebWheelEvent&);
- virtual bool handleMouseEnterEvent(const WebMouseEvent&);
- virtual bool handleMouseLeaveEvent(const WebMouseEvent&);
- virtual bool handleContextMenuEvent(const WebMouseEvent&);
- virtual bool handleKeyboardEvent(const WebKeyboardEvent&);
- virtual void setFocus(bool);
+ virtual bool handleMouseEvent(const WebMouseEvent&) override;
+ virtual bool handleWheelEvent(const WebWheelEvent&) override;
+ virtual bool handleMouseEnterEvent(const WebMouseEvent&) override;
+ virtual bool handleMouseLeaveEvent(const WebMouseEvent&) override;
+ virtual bool handleContextMenuEvent(const WebMouseEvent&) override;
+ virtual bool handleKeyboardEvent(const WebKeyboardEvent&) override;
+ virtual void setFocus(bool) override;
virtual bool handleEditingCommand(const String& commandName, const String& argument) override;
virtual bool isEditingCommandEnabled(const String&) override;
@@ -218,19 +218,19 @@
virtual bool handlesPageScaleFactor() override;
- virtual NPObject* pluginScriptableNPObject();
+ virtual NPObject* pluginScriptableNPObject() override;
virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
- virtual void windowFocusChanged(bool);
- virtual void windowVisibilityChanged(bool);
+ virtual void windowFocusChanged(bool) override;
+ virtual void windowVisibilityChanged(bool) override;
#if PLATFORM(COCOA)
- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) override;
- virtual uint64_t pluginComplexTextInputIdentifier() const;
- virtual void sendComplexTextInput(const String& textInput);
+ virtual uint64_t pluginComplexTextInputIdentifier() const override;
+ virtual void sendComplexTextInput(const String& textInput) override;
virtual void setLayerHostingMode(LayerHostingMode) override;
void pluginFocusOrWindowFocusChanged();
@@ -239,15 +239,15 @@
void updatePluginLayer();
#endif
- virtual void contentsScaleFactorChanged(float);
- virtual void storageBlockingStateChanged(bool);
- virtual void privateBrowsingStateChanged(bool);
- virtual bool getFormValue(String& formValue);
- virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
- virtual WebCore::Scrollbar* horizontalScrollbar();
- virtual WebCore::Scrollbar* verticalScrollbar();
+ virtual void contentsScaleFactorChanged(float) override;
+ virtual void storageBlockingStateChanged(bool) override;
+ virtual void privateBrowsingStateChanged(bool) override;
+ virtual bool getFormValue(String& formValue) override;
+ virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
+ virtual WebCore::Scrollbar* horizontalScrollbar() override;
+ virtual WebCore::Scrollbar* verticalScrollbar() override;
- virtual bool supportsSnapshotting() const;
+ virtual bool supportsSnapshotting() const override;
// Convert the given point from plug-in coordinates to root view coordinates.
virtual WebCore::IntPoint convertToRootView(const WebCore::IntPoint&) const override;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -107,7 +107,7 @@
explicit PDFPlugin(WebFrame*);
// Plugin functions.
- virtual bool initialize(const Parameters&);
+ virtual bool initialize(const Parameters&) override;
virtual void destroy() override;
virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRectInWindowCoordinates) override { }
virtual void updateControlTints(WebCore::GraphicsContext*) override;
@@ -200,7 +200,7 @@
virtual WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntPoint& scrollbarPoint) const override;
virtual WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const override;
virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
- virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const;
+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
// PDFPlugin functions.
void updateScrollbars();
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -66,7 +66,7 @@
// IPC::Connection::Client
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&);
+ virtual void didClose(IPC::Connection&) override;
virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
// Message handlers.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -66,72 +66,72 @@
void didReceivePluginProxyMessage(IPC::Connection&, IPC::MessageDecoder&);
void didReceiveSyncPluginProxyMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
- bool isBeingAsynchronouslyInitialized() const { return m_waitingOnAsynchronousInitialization; }
+ bool isBeingAsynchronouslyInitialized() const override { return m_waitingOnAsynchronousInitialization; }
private:
explicit PluginProxy(uint64_t pluginProcessToken, bool isRestartedProcess);
// Plugin
- virtual bool initialize(const Parameters&);
+ virtual bool initialize(const Parameters&) override;
bool initializeSynchronously();
- virtual void destroy();
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
- virtual bool supportsSnapshotting() const;
- virtual PassRefPtr<ShareableBitmap> snapshot();
+ virtual void destroy() override;
+ virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect) override;
+ virtual bool supportsSnapshotting() const override;
+ virtual PassRefPtr<ShareableBitmap> snapshot() override;
#if PLATFORM(COCOA)
- virtual PlatformLayer* pluginLayer();
+ virtual PlatformLayer* pluginLayer() override;
#endif
- virtual bool isTransparent();
+ virtual bool isTransparent() override;
virtual bool wantsWheelEvents() override;
- virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
- virtual void visibilityDidChange(bool isVisible);
- virtual void frameDidFinishLoading(uint64_t requestID);
- virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
- virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
- virtual void streamDidFinishLoading(uint64_t streamID);
- virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
- virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers, const String& suggestedFileName);
- virtual void manualStreamDidReceiveData(const char* bytes, int length);
- virtual void manualStreamDidFinishLoading();
- virtual void manualStreamDidFail(bool wasCancelled);
+ virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) override;
+ virtual void visibilityDidChange(bool isVisible) override;
+ virtual void frameDidFinishLoading(uint64_t requestID) override;
+ virtual void frameDidFail(uint64_t requestID, bool wasCancelled) override;
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& result) override;
+ virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length) override;
+ virtual void streamDidFinishLoading(uint64_t streamID) override;
+ virtual void streamDidFail(uint64_t streamID, bool wasCancelled) override;
+ virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers, const String& suggestedFileName) override;
+ virtual void manualStreamDidReceiveData(const char* bytes, int length) override;
+ virtual void manualStreamDidFinishLoading() override;
+ virtual void manualStreamDidFail(bool wasCancelled) override;
- virtual bool handleMouseEvent(const WebMouseEvent&);
- virtual bool handleWheelEvent(const WebWheelEvent&);
- virtual bool handleMouseEnterEvent(const WebMouseEvent&);
- virtual bool handleMouseLeaveEvent(const WebMouseEvent&);
- virtual bool handleContextMenuEvent(const WebMouseEvent&);
- virtual bool handleKeyboardEvent(const WebKeyboardEvent&);
- virtual void setFocus(bool);
+ virtual bool handleMouseEvent(const WebMouseEvent&) override;
+ virtual bool handleWheelEvent(const WebWheelEvent&) override;
+ virtual bool handleMouseEnterEvent(const WebMouseEvent&) override;
+ virtual bool handleMouseLeaveEvent(const WebMouseEvent&) override;
+ virtual bool handleContextMenuEvent(const WebMouseEvent&) override;
+ virtual bool handleKeyboardEvent(const WebKeyboardEvent&) override;
+ virtual void setFocus(bool) override;
virtual bool handleEditingCommand(const String& commandName, const String& argument) override;
virtual bool isEditingCommandEnabled(const String& commandName) override;
virtual bool shouldAllowScripting() override { return true; }
virtual bool shouldAllowNavigationFromDrags() override { return false; }
- virtual bool handlesPageScaleFactor();
+ virtual bool handlesPageScaleFactor() override;
- virtual NPObject* pluginScriptableNPObject();
+ virtual NPObject* pluginScriptableNPObject() override;
- virtual void windowFocusChanged(bool);
- virtual void windowVisibilityChanged(bool);
+ virtual void windowFocusChanged(bool) override;
+ virtual void windowVisibilityChanged(bool) override;
#if PLATFORM(COCOA)
- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
- virtual uint64_t pluginComplexTextInputIdentifier() const;
- virtual void sendComplexTextInput(const String& textInput);
+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) override;
+ virtual uint64_t pluginComplexTextInputIdentifier() const override;
+ virtual void sendComplexTextInput(const String& textInput) override;
virtual void setLayerHostingMode(LayerHostingMode) override;
#endif
- virtual void contentsScaleFactorChanged(float);
- virtual void storageBlockingStateChanged(bool);
- virtual void privateBrowsingStateChanged(bool);
+ virtual void contentsScaleFactorChanged(float) override;
+ virtual void storageBlockingStateChanged(bool) override;
+ virtual void privateBrowsingStateChanged(bool) override;
virtual void mutedStateChanged(bool) override;
- virtual bool getFormValue(String& formValue);
- virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
- virtual WebCore::Scrollbar* horizontalScrollbar();
- virtual WebCore::Scrollbar* verticalScrollbar();
+ virtual bool getFormValue(String& formValue) override;
+ virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
+ virtual WebCore::Scrollbar* horizontalScrollbar() override;
+ virtual WebCore::Scrollbar* verticalScrollbar() override;
virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned) override { return 0; }
virtual bool findString(const String&, WebCore::FindOptions, unsigned) override { return false; }
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (179235 => 179236)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-01-28 02:29:06 UTC (rev 179236)
@@ -42,7 +42,7 @@
}
private:
- virtual void contextMenuDestroyed();
+ virtual void contextMenuDestroyed() override;
#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>) override;
