Add OVERRIDE to a bunch of virtual member functions on clients
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Sep 2011 19:24:34 +0000 (19:24 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Sep 2011 19:24:34 +0000 (19:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=68712

Reviewed by Sam Weinig.

../..:

* WebKit.xcodeproj/project.pbxproj:

../../mac:

* Configurations/Base.xcconfig:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebContextMenuClient.h:
* WebCoreSupport/WebDeviceOrientationClient.h:
* WebCoreSupport/WebDragClient.h:
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameNetworkingContext.h:
* WebCoreSupport/WebGeolocationClient.h:
* WebCoreSupport/WebIconDatabaseClient.h:
* WebCoreSupport/WebInspectorClient.h:
* WebCoreSupport/WebPlatformStrategies.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/Base.xcconfig
Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h
Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.h
Source/WebKit/mac/WebCoreSupport/WebDragClient.h
Source/WebKit/mac/WebCoreSupport/WebEditorClient.h
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h
Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.h
Source/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.h
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h
Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h

index 2b60a8b..874481b 100644 (file)
@@ -1,3 +1,12 @@
+2011-09-23  Anders Carlsson  <andersca@apple.com>
+
+        Add OVERRIDE to a bunch of virtual member functions on clients
+        https://bugs.webkit.org/show_bug.cgi?id=68712
+
+        Reviewed by Sam Weinig.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2011-09-21  Dan Bernstein  <mitz@apple.com>
 
         WebKit part of: Prevent the WebKit frameworks from defining inappropriately-named Objective-C classes
index 25be63a..4b58f08 100644 (file)
                        children = (
                                B82958D1132707D0000D0E79 /* CorrectionPanel.h */,
                                B82958D2132707D0000D0E79 /* CorrectionPanel.mm */,
-                               598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */,
                                598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */,
+                               598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */,
                                B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */,
                                B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */,
                                A5DEFC1111D5344B00885273 /* WebApplicationCacheQuotaManager.h */,
index a2a7c1e..ffa6ebc 100644 (file)
@@ -1,3 +1,23 @@
+2011-09-23  Anders Carlsson  <andersca@apple.com>
+
+        Add OVERRIDE to a bunch of virtual member functions on clients
+        https://bugs.webkit.org/show_bug.cgi?id=68712
+
+        Reviewed by Sam Weinig.
+
+        * Configurations/Base.xcconfig:
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebContextMenuClient.h:
+        * WebCoreSupport/WebDeviceOrientationClient.h:
+        * WebCoreSupport/WebDragClient.h:
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameNetworkingContext.h:
+        * WebCoreSupport/WebGeolocationClient.h:
+        * WebCoreSupport/WebIconDatabaseClient.h:
+        * WebCoreSupport/WebInspectorClient.h:
+        * WebCoreSupport/WebPlatformStrategies.h:
+
 2011-09-22  Dean Jackson  <dino@apple.com>
 
         Add ENABLE_CSS_FILTERS
index e40cb13..798465b 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "CompilerVersion.xcconfig"
 
+CLANG_WARN_CXX0X_EXTENSIONS = NO;
 DEBUG_INFORMATION_FORMAT = dwarf;
 GCC_C_LANGUAGE_STANDARD = gnu99;
 GCC_DEBUGGING_SYMBOLS = default;
index 4df10d0..2a03b93 100644 (file)
@@ -38,153 +38,149 @@ public:
     WebChromeClient(WebView*);
     virtual void* webView() const { return static_cast<void*>(m_webView); }
     
-    virtual void chromeDestroyed();
+    virtual void chromeDestroyed() OVERRIDE;
     
-    virtual void setWindowRect(const WebCore::FloatRect&);
-    virtual WebCore::FloatRect windowRect();
+    virtual void setWindowRect(const WebCore::FloatRect&) OVERRIDE;
+    virtual WebCore::FloatRect windowRect() OVERRIDE;
 
-    virtual WebCore::FloatRect pageRect();
+    virtual WebCore::FloatRect pageRect() OVERRIDE;
 
-    virtual void focus();
-    virtual void unfocus();
+    virtual void focus() OVERRIDE;
+    virtual void unfocus() OVERRIDE;
     
-    virtual bool canTakeFocus(WebCore::FocusDirection);
-    virtual void takeFocus(WebCore::FocusDirection);
+    virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE;
+    virtual void takeFocus(WebCore::FocusDirection) OVERRIDE;
 
-    virtual void focusedNodeChanged(WebCore::Node*);
-    virtual void focusedFrameChanged(WebCore::Frame*);
+    virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE;
+    virtual void focusedFrameChanged(WebCore::Frame*) OVERRIDE;
 
-    virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&);
-    virtual void show();
+    virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) OVERRIDE;
+    virtual void show() OVERRIDE;
 
-    virtual bool canRunModal();
-    virtual void runModal();
+    virtual bool canRunModal() OVERRIDE;
+    virtual void runModal() OVERRIDE;
 
-    virtual void setToolbarsVisible(bool);
-    virtual bool toolbarsVisible();
+    virtual void setToolbarsVisible(bool) OVERRIDE;
+    virtual bool toolbarsVisible() OVERRIDE;
     
-    virtual void setStatusbarVisible(bool);
-    virtual bool statusbarVisible();
+    virtual void setStatusbarVisible(bool) OVERRIDE;
+    virtual bool statusbarVisible() OVERRIDE;
     
-    virtual void setScrollbarsVisible(bool);
-    virtual bool scrollbarsVisible();
+    virtual void setScrollbarsVisible(bool) OVERRIDE;
+    virtual bool scrollbarsVisible() OVERRIDE;
     
-    virtual void setMenubarVisible(bool);
-    virtual bool menubarVisible();
+    virtual void setMenubarVisible(bool) OVERRIDE;
+    virtual bool menubarVisible() OVERRIDE;
     
-    virtual void setResizable(bool);
+    virtual void setResizable(bool) OVERRIDE;
     
-    virtual void addMessageToConsole(WebCore::MessageSource source, WebCore::MessageType type, WebCore::MessageLevel level, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceURL);
+    virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceURL) OVERRIDE;
 
-    virtual bool canRunBeforeUnloadConfirmPanel();
-    virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame);
+    virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE;
+    virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) OVERRIDE;
 
-    virtual void closeWindowSoon();
+    virtual void closeWindowSoon() OVERRIDE;
 
-    virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&);
-    virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
-    virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
-    virtual bool shouldInterruptJavaScript();
+    virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) OVERRIDE;
+    virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) OVERRIDE;
+    virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) OVERRIDE;
+    virtual bool shouldInterruptJavaScript() OVERRIDE;
 
-    virtual WebCore::IntRect windowResizerRect() const;
+    virtual WebCore::IntRect windowResizerRect() const OVERRIDE;
 
-    virtual void invalidateWindow(const WebCore::IntRect&, bool);
-    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
-    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
-    virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
+    virtual void invalidateWindow(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) OVERRIDE;
 
-    virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
-    virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
-    virtual PlatformPageClient platformPageClient() const;
-    virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
-    virtual void scrollRectIntoView(const WebCore::IntRect&) const;
+    virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const OVERRIDE;
+    virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const OVERRIDE;
+    virtual PlatformPageClient platformPageClient() const OVERRIDE;
+    virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE;
+    virtual void scrollRectIntoView(const WebCore::IntRect&) const OVERRIDE;
     
-    virtual void setStatusbarText(const WTF::String&);
+    virtual void setStatusbarText(const WTF::String&) OVERRIDE;
 
-    virtual void scrollbarsModeDidChange() const { }
-    virtual bool shouldMissingPluginMessageBeButton() const;
-    virtual void missingPluginButtonClicked(WebCore::Element*) const;
-    virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags);
+    virtual void scrollbarsModeDidChange() const OVERRIDE { }
+    virtual bool shouldMissingPluginMessageBeButton() const OVERRIDE;
+    virtual void missingPluginButtonClicked(WebCore::Element*) const OVERRIDE;
+    virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) OVERRIDE;
 
-    virtual void setToolTip(const WTF::String&, WebCore::TextDirection);
+    virtual void setToolTip(const WTF::String&, WebCore::TextDirection) OVERRIDE;
 
-    virtual void print(WebCore::Frame*);
+    virtual void print(WebCore::Frame*) OVERRIDE;
 #if ENABLE(SQL_DATABASE)
-    virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
+    virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName) OVERRIDE;
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
-    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
+    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) OVERRIDE;
+    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) OVERRIDE;
 #endif
-    virtual void populateVisitedLinks();
+    virtual void populateVisitedLinks() OVERRIDE;
 
 #if ENABLE(DASHBOARD_SUPPORT)
-    virtual void dashboardRegionsChanged();
+    virtual void dashboardRegionsChanged() OVERRIDE;
 #endif
 
-    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
-    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
+    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
+    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*) OVERRIDE;
 
-    virtual void setCursor(const WebCore::Cursor&);
-    virtual void setCursorHiddenUntilMouseMoves(bool);
+    virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
+    virtual void setCursorHiddenUntilMouseMoves(bool) OVERRIDE;
 
-    virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type,
-        const WebCore::FloatRect& lineRect);
-    virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type,
-        const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,
-        bool behindText, bool entireLine);
+    virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) OVERRIDE;
+    virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) OVERRIDE;
 
-    virtual WebCore::KeyboardUIMode keyboardUIMode();
+    virtual WebCore::KeyboardUIMode keyboardUIMode() OVERRIDE;
 
-    virtual NSResponder *firstResponder();
-    virtual void makeFirstResponder(NSResponder *);
+    virtual NSResponder *firstResponder() OVERRIDE;
+    virtual void makeFirstResponder(NSResponder *) OVERRIDE;
 
-    virtual void willPopUpMenu(NSMenu *);
+    virtual void willPopUpMenu(NSMenu *) OVERRIDE;
     
-    virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename);
-    virtual WTF::String generateReplacementFile(const WTF::String& path);
+    virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) OVERRIDE;
+    virtual WTF::String generateReplacementFile(const WTF::String& path) OVERRIDE;
 
-    virtual void formStateDidChange(const WebCore::Node*) { }
+    virtual void formStateDidChange(const WebCore::Node*) OVERRIDE { }
 
-    virtual void elementDidFocus(const WebCore::Node*);
-    virtual void elementDidBlur(const WebCore::Node*);
+    virtual void elementDidFocus(const WebCore::Node*) OVERRIDE;
+    virtual void elementDidBlur(const WebCore::Node*) OVERRIDE;
 
 #if USE(ACCELERATED_COMPOSITING)
-    virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
-    virtual void setNeedsOneShotDrawingSynchronization();
-    virtual void scheduleCompositingLayerSync();
+    virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) OVERRIDE;
+    virtual void setNeedsOneShotDrawingSynchronization() OVERRIDE;
+    virtual void scheduleCompositingLayerSync() OVERRIDE;
 #endif
 
 #if ENABLE(VIDEO)
-    virtual bool supportsFullscreenForNode(const WebCore::Node*);
-    virtual void enterFullscreenForNode(WebCore::Node*);
-    virtual void exitFullscreenForNode(WebCore::Node*);
-    virtual void fullScreenRendererChanged(WebCore::RenderBox*);
+    virtual bool supportsFullscreenForNode(const WebCore::Node*) OVERRIDE;
+    virtual void enterFullscreenForNode(WebCore::Node*) OVERRIDE;
+    virtual void exitFullscreenForNode(WebCore::Node*) OVERRIDE;
+    virtual void fullScreenRendererChanged(WebCore::RenderBox*) OVERRIDE;
 #endif
     
 #if ENABLE(FULLSCREEN_API)
-    virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard);
-    virtual void enterFullScreenForElement(WebCore::Element*);
-    virtual void exitFullScreenForElement(WebCore::Element*);
+    virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) OVERRIDE;
+    virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
+    virtual void exitFullScreenForElement(WebCore::Element*) OVERRIDE;
 #endif
 
     // FIXME: Remove once all ports are using client-based geolocation. https://bugs.webkit.org/show_bug.cgi?id=40373
     // For client-based geolocation, these two methods have moved to WebGeolocationClient. https://bugs.webkit.org/show_bug.cgi?id=50061
-    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
-    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
+    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE { }
+    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE { }
 
-    virtual bool selectItemWritingDirectionIsNatural();
-    virtual bool selectItemAlignmentFollowsMenuWritingDirection();
-    virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
-    virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
+    virtual bool selectItemWritingDirectionIsNatural() OVERRIDE;
+    virtual bool selectItemAlignmentFollowsMenuWritingDirection() OVERRIDE;
+    virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE;
+    virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE;
 
 #if ENABLE(CONTEXT_MENUS)
-    virtual void showContextMenu();
+    virtual void showContextMenu() OVERRIDE;
 #endif
     
-    virtual void numWheelEventHandlersChanged(unsigned) { }
-    
-    virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const { return false; }
+    virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE { }
+    virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE { return false; }
 private:
     WebView *m_webView;
 };
index 077cd16..21b0d0f 100644 (file)
@@ -34,18 +34,18 @@ class WebContextMenuClient : public WebCore::ContextMenuClient {
 public:
     WebContextMenuClient(WebView *webView);
     
-    virtual void contextMenuDestroyed();
+    virtual void contextMenuDestroyed() OVERRIDE;
     
-    virtual NSMutableArray* getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
-    virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
+    virtual NSMutableArray* getCustomMenuFromDefaultItems(WebCore::ContextMenu*) OVERRIDE;
+    virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) OVERRIDE;
     
-    virtual void downloadURL(const WebCore::KURL&);
-    virtual void searchWithGoogle(const WebCore::Frame*);
-    virtual void lookUpInDictionary(WebCore::Frame*);
-    virtual bool isSpeaking();
-    virtual void speak(const WTF::String&);
-    virtual void stopSpeaking();
-    virtual void searchWithSpotlight();
+    virtual void downloadURL(const WebCore::KURL&) OVERRIDE;
+    virtual void searchWithGoogle(const WebCore::Frame*) OVERRIDE;
+    virtual void lookUpInDictionary(WebCore::Frame*) OVERRIDE;
+    virtual bool isSpeaking() OVERRIDE;
+    virtual void speak(const WTF::String&) OVERRIDE;
+    virtual void stopSpeaking() OVERRIDE;
+    virtual void searchWithSpotlight() OVERRIDE;
 
     WebView *webView() { return m_webView; }
         
index 8e1c274..ed407eb 100644 (file)
@@ -43,11 +43,11 @@ public:
     WebDeviceOrientationClient(WebView*);
 
     // DeviceOrientationClient methods
-    virtual void setController(WebCore::DeviceOrientationController*);
-    virtual void startUpdating();
-    virtual void stopUpdating();
-    virtual WebCore::DeviceOrientation* lastOrientation() const;
-    virtual void deviceOrientationControllerDestroyed();
+    virtual void setController(WebCore::DeviceOrientationController*) OVERRIDE;
+    virtual void startUpdating() OVERRIDE;
+    virtual void stopUpdating() OVERRIDE;
+    virtual WebCore::DeviceOrientation* lastOrientation() const OVERRIDE;
+    virtual void deviceOrientationControllerDestroyed() OVERRIDE;
 
 private:
     id<WebDeviceOrientationProvider> getProvider() const;
index 34a5c2e..e472fb7 100644 (file)
 class WebDragClient : public WebCore::DragClient {
 public:
     WebDragClient(WebView*);
-    virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*);
-    virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*);
-    virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*);
-    virtual void dragControllerDestroyed();
-    virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint);
-    virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag);
-    virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*);
+    virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*) OVERRIDE;
+    virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*) OVERRIDE;
+    virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*) OVERRIDE;
+    virtual void dragControllerDestroyed() OVERRIDE;
+    virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) OVERRIDE;
+    virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag) OVERRIDE;
+    virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*) OVERRIDE;
 private:
     WebView* m_webView;
 };
index dd3a880..6a27400 100644 (file)
@@ -41,106 +41,106 @@ class WebEditorClient : public WebCore::EditorClient, public WebCore::TextChecke
 public:
     WebEditorClient(WebView *);
     virtual ~WebEditorClient();
-    virtual void pageDestroyed();
+    virtual void pageDestroyed() OVERRIDE;
 
-    virtual bool isGrammarCheckingEnabled();
-    virtual void toggleGrammarChecking();
-    virtual bool isContinuousSpellCheckingEnabled();
-    virtual void toggleContinuousSpellChecking();
-    virtual int spellCheckerDocumentTag();
+    virtual bool isGrammarCheckingEnabled() OVERRIDE;
+    virtual void toggleGrammarChecking() OVERRIDE;
+    virtual bool isContinuousSpellCheckingEnabled() OVERRIDE;
+    virtual void toggleContinuousSpellChecking() OVERRIDE;
+    virtual int spellCheckerDocumentTag() OVERRIDE;
 
-    virtual bool smartInsertDeleteEnabled();
-    virtual bool isSelectTrailingWhitespaceEnabled();
+    virtual bool smartInsertDeleteEnabled() OVERRIDE;
+    virtual bool isSelectTrailingWhitespaceEnabled() OVERRIDE;
 
-    virtual bool shouldDeleteRange(WebCore::Range*);    
-    virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*);
+    virtual bool shouldDeleteRange(WebCore::Range*) OVERRIDE;
+    virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) OVERRIDE;
 
-    virtual bool shouldBeginEditing(WebCore::Range*);
-    virtual bool shouldEndEditing(WebCore::Range*);
-    virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction);
-    virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
-    virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
+    virtual bool shouldBeginEditing(WebCore::Range*) OVERRIDE;
+    virtual bool shouldEndEditing(WebCore::Range*) OVERRIDE;
+    virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
+    virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
+    virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
 
-    virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*);
+    virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*) OVERRIDE;
     
-    virtual bool shouldMoveRangeAfterDelete(WebCore::Range* range, WebCore::Range* rangeToBeReplaced); 
-
-    virtual void didBeginEditing();
-    virtual void didEndEditing();
-    virtual void didWriteSelectionToPasteboard();
-    virtual void didSetSelectionTypesForPasteboard();
-
-    virtual NSString* userVisibleString(NSURL *);
-    virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&);
-    virtual void setInsertionPasteboard(NSPasteboard *);
-    virtual NSURL* canonicalizeURL(NSURL*);
-    virtual NSURL* canonicalizeURLString(NSString*);
+    virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range* rangeToBeReplaced) OVERRIDE;
+
+    virtual void didBeginEditing() OVERRIDE;
+    virtual void didEndEditing() OVERRIDE;
+    virtual void didWriteSelectionToPasteboard() OVERRIDE;
+    virtual void didSetSelectionTypesForPasteboard() OVERRIDE;
+
+    virtual NSString* userVisibleString(NSURL *) OVERRIDE;
+    virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) OVERRIDE;
+    virtual void setInsertionPasteboard(NSPasteboard *) OVERRIDE;
+    virtual NSURL* canonicalizeURL(NSURL*) OVERRIDE;
+    virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE;
     
 #ifndef BUILDING_ON_LEOPARD
-    virtual void uppercaseWord();
-    virtual void lowercaseWord();
-    virtual void capitalizeWord();
-    virtual void showSubstitutionsPanel(bool show);
-    virtual bool substitutionsPanelIsShowing();
-    virtual void toggleSmartInsertDelete();
-    virtual bool isAutomaticQuoteSubstitutionEnabled();
-    virtual void toggleAutomaticQuoteSubstitution();
-    virtual bool isAutomaticLinkDetectionEnabled();
-    virtual void toggleAutomaticLinkDetection();
-    virtual bool isAutomaticDashSubstitutionEnabled();
-    virtual void toggleAutomaticDashSubstitution();
-    virtual bool isAutomaticTextReplacementEnabled();
-    virtual void toggleAutomaticTextReplacement();
-    virtual bool isAutomaticSpellingCorrectionEnabled();
-    virtual void toggleAutomaticSpellingCorrection();
+    virtual void uppercaseWord() OVERRIDE;
+    virtual void lowercaseWord() OVERRIDE;
+    virtual void capitalizeWord() OVERRIDE;
+    virtual void showSubstitutionsPanel(bool show) OVERRIDE;
+    virtual bool substitutionsPanelIsShowing() OVERRIDE;
+    virtual void toggleSmartInsertDelete() OVERRIDE;
+    virtual bool isAutomaticQuoteSubstitutionEnabled() OVERRIDE;
+    virtual void toggleAutomaticQuoteSubstitution() OVERRIDE;
+    virtual bool isAutomaticLinkDetectionEnabled() OVERRIDE;
+    virtual void toggleAutomaticLinkDetection() OVERRIDE;
+    virtual bool isAutomaticDashSubstitutionEnabled() OVERRIDE;
+    virtual void toggleAutomaticDashSubstitution() OVERRIDE;
+    virtual bool isAutomaticTextReplacementEnabled() OVERRIDE;
+    virtual void toggleAutomaticTextReplacement() OVERRIDE;
+    virtual bool isAutomaticSpellingCorrectionEnabled() OVERRIDE;
+    virtual void toggleAutomaticSpellingCorrection() OVERRIDE;
 #endif
 
-    TextCheckerClient* textChecker() { return this; }
+    TextCheckerClient* textChecker() OVERRIDE { return this; }
 
-    virtual void respondToChangedContents();
-    virtual void respondToChangedSelection();
+    virtual void respondToChangedContents() OVERRIDE;
+    virtual void respondToChangedSelection() OVERRIDE;
 
-    virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>);
-    virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>);
-    virtual void clearUndoRedoOperations();
+    virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
+    virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
+    virtual void clearUndoRedoOperations() OVERRIDE;
 
-    virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const;
-    virtual bool canPaste(WebCore::Frame*, bool defaultValue) const;
-    virtual bool canUndo() const;
-    virtual bool canRedo() const;
+    virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const OVERRIDE;
+    virtual bool canPaste(WebCore::Frame*, bool defaultValue) const OVERRIDE;
+    virtual bool canUndo() const OVERRIDE;
+    virtual bool canRedo() const OVERRIDE;
     
-    virtual void undo();
-    virtual void redo();
+    virtual void undo() OVERRIDE;
+    virtual void redo() OVERRIDE;
     
-    virtual void handleKeyboardEvent(WebCore::KeyboardEvent*);
-    virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*);
-
-    virtual void textFieldDidBeginEditing(WebCore::Element*);
-    virtual void textFieldDidEndEditing(WebCore::Element*);
-    virtual void textDidChangeInTextField(WebCore::Element*);
-    virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*);
-    virtual void textWillBeDeletedInTextField(WebCore::Element*);
-    virtual void textDidChangeInTextArea(WebCore::Element*);
+    virtual void handleKeyboardEvent(WebCore::KeyboardEvent*) OVERRIDE;
+    virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*) OVERRIDE;
+
+    virtual void textFieldDidBeginEditing(WebCore::Element*) OVERRIDE;
+    virtual void textFieldDidEndEditing(WebCore::Element*) OVERRIDE;
+    virtual void textDidChangeInTextField(WebCore::Element*) OVERRIDE;
+    virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) OVERRIDE;
+    virtual void textWillBeDeletedInTextField(WebCore::Element*) OVERRIDE;
+    virtual void textDidChangeInTextArea(WebCore::Element*) OVERRIDE;
     
-    virtual void ignoreWordInSpellDocument(const WTF::String&);
-    virtual void learnWord(const WTF::String&);
-    virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
-    virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&);
-    virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
-    virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, WTF::Vector<WebCore::TextCheckingResult>& results);
-    virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&);
-    virtual void updateSpellingUIWithMisspelledWord(const WTF::String&);
-    virtual void showSpellingUI(bool show);
-    virtual bool spellingUIIsShowing();
-    virtual void getGuessesForWord(const WTF::String& word, const WTF::String& context, WTF::Vector<WTF::String>& guesses);
-    virtual void willSetInputMethodState();
-    virtual void setInputMethodState(bool enabled);
-    virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&);
+    virtual void ignoreWordInSpellDocument(const WTF::String&) OVERRIDE;
+    virtual void learnWord(const WTF::String&) OVERRIDE;
+    virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE;
+    virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) OVERRIDE;
+    virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE;
+    virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, WTF::Vector<WebCore::TextCheckingResult>& results) OVERRIDE;
+    virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) OVERRIDE;
+    virtual void updateSpellingUIWithMisspelledWord(const WTF::String&) OVERRIDE;
+    virtual void showSpellingUI(bool show) OVERRIDE;
+    virtual bool spellingUIIsShowing() OVERRIDE;
+    virtual void getGuessesForWord(const WTF::String& word, const WTF::String& context, WTF::Vector<WTF::String>& guesses) OVERRIDE;
+    virtual void willSetInputMethodState() OVERRIDE;
+    virtual void setInputMethodState(bool enabled) OVERRIDE;
+    virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) OVERRIDE;
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
-    virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel);
-    virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel);
-    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString);
+    virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
+    virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE;
+    virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE;
+    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
 #endif
 private:
     void registerCommandForUndoOrRedo(PassRefPtr<WebCore::EditCommand>, bool isRedo);
index 72fd04d..79bf2af 100644 (file)
@@ -55,179 +55,179 @@ public:
 
     WebFrame* webFrame() const { return m_webFrame.get(); }
 
-    virtual void frameLoaderDestroyed();
+    virtual void frameLoaderDestroyed() OVERRIDE;
     void receivedPolicyDecison(WebCore::PolicyAction);
 
 private:
-    virtual bool hasWebView() const; // mainly for assertions
+    virtual bool hasWebView() const OVERRIDE; // mainly for assertions
 
-    virtual void makeRepresentation(WebCore::DocumentLoader*);
-    virtual bool hasHTMLView() const;
-    virtual void forceLayout();
-    virtual void forceLayoutForNonHTML();
+    virtual void makeRepresentation(WebCore::DocumentLoader*) OVERRIDE;
+    virtual bool hasHTMLView() const OVERRIDE;
+    virtual void forceLayout() OVERRIDE;
+    virtual void forceLayoutForNonHTML() OVERRIDE;
 
-    virtual void setCopiesOnScroll();
+    virtual void setCopiesOnScroll() OVERRIDE;
 
-    virtual void detachedFromParent2();
-    virtual void detachedFromParent3();
+    virtual void detachedFromParent2() OVERRIDE;
+    virtual void detachedFromParent3() OVERRIDE;
 
-    virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+    virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) OVERRIDE;
 
-    virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
+    virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) OVERRIDE;
 
-    virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
-    virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier);
-    virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
-    virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
+    virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
+    virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
+    virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE;
+    virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE;
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
-    virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&);
+    virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) OVERRIDE;
 #endif
-    virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&);
-    virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength);
-    virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier);
-    virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&);
-
-    virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const;
-
-    virtual void dispatchDidHandleOnloadEvents();
-    virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
-    virtual void dispatchDidCancelClientRedirect();
-    virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate);
-    virtual void dispatchDidChangeLocationWithinPage();
-    virtual void dispatchDidPushStateWithinPage();
-    virtual void dispatchDidReplaceStateWithinPage();
-    virtual void dispatchDidPopStateWithinPage();
+    virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) OVERRIDE;
+    virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) OVERRIDE;
+    virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
+    virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) OVERRIDE;
+
+    virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const OVERRIDE;
+
+    virtual void dispatchDidHandleOnloadEvents() OVERRIDE;
+    virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE;
+    virtual void dispatchDidCancelClientRedirect() OVERRIDE;
+    virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate) OVERRIDE;
+    virtual void dispatchDidChangeLocationWithinPage() OVERRIDE;
+    virtual void dispatchDidPushStateWithinPage() OVERRIDE;
+    virtual void dispatchDidReplaceStateWithinPage() OVERRIDE;
+    virtual void dispatchDidPopStateWithinPage() OVERRIDE;
     
-    virtual void dispatchWillClose();
-    virtual void dispatchDidReceiveIcon();
-    virtual void dispatchDidStartProvisionalLoad();
-    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
-    virtual void dispatchDidChangeIcons(WebCore::IconType);
-    virtual void dispatchDidCommitLoad();
-    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
-    virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
-    virtual void dispatchDidFinishDocumentLoad();
-    virtual void dispatchDidFinishLoad();
-    virtual void dispatchDidFirstLayout();
-    virtual void dispatchDidFirstVisuallyNonEmptyLayout();
-
-    virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&);
-    virtual void dispatchShow();
+    virtual void dispatchWillClose() OVERRIDE;
+    virtual void dispatchDidReceiveIcon() OVERRIDE;
+    virtual void dispatchDidStartProvisionalLoad() OVERRIDE;
+    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) OVERRIDE;
+    virtual void dispatchDidChangeIcons(WebCore::IconType) OVERRIDE;
+    virtual void dispatchDidCommitLoad() OVERRIDE;
+    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) OVERRIDE;
+    virtual void dispatchDidFailLoad(const WebCore::ResourceError&) OVERRIDE;
+    virtual void dispatchDidFinishDocumentLoad() OVERRIDE;
+    virtual void dispatchDidFinishLoad() OVERRIDE;
+    virtual void dispatchDidFirstLayout() OVERRIDE;
+    virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE;
+
+    virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) OVERRIDE;
+    virtual void dispatchShow() OVERRIDE;
 
     virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction, 
         const WebCore::ResourceResponse&, const WebCore::ResourceRequest&);
     virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction,
-        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName);
+        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName) OVERRIDE;
     virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction,
-        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>);
-    virtual void cancelPolicyCheck();
+        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>) OVERRIDE;
+    virtual void cancelPolicyCheck() OVERRIDE;
 
-    virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
+    virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) OVERRIDE;
 
-    virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) { }
-    virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>);
+    virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) OVERRIDE { }
+    virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>) OVERRIDE;
 
-    virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*);
-    virtual void revertToProvisionalState(WebCore::DocumentLoader*);
-    virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
-    virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length);
+    virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*) OVERRIDE;
+    virtual void revertToProvisionalState(WebCore::DocumentLoader*) OVERRIDE;
+    virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) OVERRIDE;
+    virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) OVERRIDE;
 
-    virtual void willChangeEstimatedProgress();
-    virtual void didChangeEstimatedProgress();
-    virtual void postProgressStartedNotification();
-    virtual void postProgressEstimateChangedNotification();
-    virtual void postProgressFinishedNotification();
+    virtual void willChangeEstimatedProgress() OVERRIDE;
+    virtual void didChangeEstimatedProgress() OVERRIDE;
+    virtual void postProgressStartedNotification() OVERRIDE;
+    virtual void postProgressEstimateChangedNotification() OVERRIDE;
+    virtual void postProgressFinishedNotification() OVERRIDE;
     
-    virtual void setMainFrameDocumentReady(bool);
+    virtual void setMainFrameDocumentReady(bool) OVERRIDE;
 
-    virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String());
+    virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) OVERRIDE;
 
-    virtual void willChangeTitle(WebCore::DocumentLoader*);
-    virtual void didChangeTitle(WebCore::DocumentLoader*);
+    virtual void willChangeTitle(WebCore::DocumentLoader*) OVERRIDE;
+    virtual void didChangeTitle(WebCore::DocumentLoader*) OVERRIDE;
 
-    virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
-    virtual void finishedLoading(WebCore::DocumentLoader*);
-    virtual void updateGlobalHistory();
-    virtual void updateGlobalHistoryRedirectLinks();
+    virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) OVERRIDE;
+    virtual void finishedLoading(WebCore::DocumentLoader*) OVERRIDE;
+    virtual void updateGlobalHistory() OVERRIDE;
+    virtual void updateGlobalHistoryRedirectLinks() OVERRIDE;
 
-    virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
-    virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const;
-    virtual void updateGlobalHistoryItemForPage();
+    virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const OVERRIDE;
+    virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const OVERRIDE;
+    virtual void updateGlobalHistoryItemForPage() OVERRIDE;
 
-    virtual void didDisplayInsecureContent();
-    virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&);
+    virtual void didDisplayInsecureContent() OVERRIDE;
+    virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
 
-    virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
-    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
-    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
-    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
+    virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) OVERRIDE;
+    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) OVERRIDE;
+    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) OVERRIDE;
+    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) OVERRIDE;
 
-    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
-    virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
-    virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
+    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) OVERRIDE;
+    virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) OVERRIDE;
+    virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) OVERRIDE;
 
-    virtual bool shouldFallBack(const WebCore::ResourceError&);
+    virtual bool shouldFallBack(const WebCore::ResourceError&) OVERRIDE;
 
-    virtual WTF::String userAgent(const WebCore::KURL&);
+    virtual WTF::String userAgent(const WebCore::KURL&) OVERRIDE;
     
-    virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
-    virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
-    virtual void transitionToCommittedForNewPage();
+    virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) OVERRIDE;
+    virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) OVERRIDE;
+    virtual void transitionToCommittedForNewPage() OVERRIDE;
 
-    virtual void didSaveToPageCache();
-    virtual void didRestoreFromPageCache();
+    virtual void didSaveToPageCache() OVERRIDE;
+    virtual void didRestoreFromPageCache() OVERRIDE;
 
-    virtual void dispatchDidBecomeFrameset(bool);
+    virtual void dispatchDidBecomeFrameset(bool) OVERRIDE;
 
-    virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
-    virtual bool canShowMIMEType(const WTF::String& MIMEType) const;
-    virtual bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const;
-    virtual bool representationExistsForURLScheme(const WTF::String& URLScheme) const;
-    virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const;
+    virtual bool canHandleRequest(const WebCore::ResourceRequest&) const OVERRIDE;
+    virtual bool canShowMIMEType(const WTF::String& MIMEType) const OVERRIDE;
+    virtual bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const OVERRIDE;
+    virtual bool representationExistsForURLScheme(const WTF::String& URLScheme) const OVERRIDE;
+    virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const OVERRIDE;
 
-    virtual void frameLoadCompleted();
-    virtual void saveViewStateToItem(WebCore::HistoryItem*);
-    virtual void restoreViewState();
-    virtual void provisionalLoadStarted();
-    virtual void didFinishLoad();
-    virtual void prepareForDataSourceReplacement();
-    virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
+    virtual void frameLoadCompleted() OVERRIDE;
+    virtual void saveViewStateToItem(WebCore::HistoryItem*) OVERRIDE;
+    virtual void restoreViewState() OVERRIDE;
+    virtual void provisionalLoadStarted() OVERRIDE;
+    virtual void didFinishLoad() OVERRIDE;
+    virtual void prepareForDataSourceReplacement() OVERRIDE;
+    virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) OVERRIDE;
 
-    virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&);
+    virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&) OVERRIDE;
 
     virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement*,
-                                        const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
-    virtual void didTransferChildFrameToNewDocument(WebCore::Page* oldPage);
+                                        const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) OVERRIDE;
+    virtual void didTransferChildFrameToNewDocument(WebCore::Page* oldPage) OVERRIDE;
     virtual void transferLoadingResourceFromPage(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, WebCore::Page* oldPage);
     virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<WTF::String>&,
-                                          const Vector<WTF::String>&, const WTF::String&, bool);
-    virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
+                                          const Vector<WTF::String>&, const WTF::String&, bool) OVERRIDE;
+    virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget) OVERRIDE;
     
     virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL,
-                                                    const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues);
+                                                    const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) OVERRIDE;
     
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     virtual PassRefPtr<WebCore::Widget> createMediaPlayerProxyPlugin(const WebCore::IntSize&, WebCore::HTMLMediaElement*, const WebCore::KURL&, 
-                                        const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&);
-    virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*);
-    virtual void showMediaPlayerProxyPlugin(WebCore::Widget*);
+                                        const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&) OVERRIDE;
+    virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*) OVERRIDE;
+    virtual void showMediaPlayerProxyPlugin(WebCore::Widget*) OVERRIDE;
 #endif
     
-    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
-    virtual WTF::String overrideMediaType() const;
+    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
+    virtual WTF::String overrideMediaType() const OVERRIDE;
     
-    virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
-    virtual void documentElementAvailable();
-    virtual void didPerformFirstNavigation() const;
+    virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*) OVERRIDE;
+    virtual void documentElementAvailable() OVERRIDE;
+    virtual void didPerformFirstNavigation() const OVERRIDE;
 
-    virtual void registerForIconNotification(bool listen);
+    virtual void registerForIconNotification(bool listen) OVERRIDE;
 
 #if ENABLE(JAVA_BRIDGE)
-    virtual jobject javaApplet(NSView*);
+    virtual jobject javaApplet(NSView*) OVERRIDE;
 #endif
 
 #if PLATFORM(MAC)
-    virtual RemoteAXObjectRef accessibilityRemoteObject() { return 0; }
+    virtual RemoteAXObjectRef accessibilityRemoteObject() OVERRIDE { return 0; }
 #endif
     
     void setOriginalURLForDownload(WebDownload *, const WebCore::ResourceRequest&) const;
index de89024..4b30af9 100644 (file)
@@ -32,8 +32,8 @@ private:
     {
     }
 
-    virtual bool needsSiteSpecificQuirks() const;
-    virtual bool localFileContentSniffingEnabled() const;
-    virtual WebCore::SchedulePairHashSet* scheduledRunLoopPairs() const;
-    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
+    virtual bool needsSiteSpecificQuirks() const OVERRIDE;
+    virtual bool localFileContentSniffingEnabled() const OVERRIDE;
+    virtual WebCore::SchedulePairHashSet* scheduledRunLoopPairs() const OVERRIDE;
+    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
 };
index b8e7b87..5443622 100644 (file)
@@ -37,15 +37,15 @@ public:
     WebGeolocationClient(WebView *);
     WebView *webView() { return m_webView; }
 
-    void geolocationDestroyed();
-    void startUpdating();
-    void stopUpdating();
-    void setEnableHighAccuracy(bool) { }
+    virtual void geolocationDestroyed() OVERRIDE;
+    virtual void startUpdating() OVERRIDE;
+    virtual void stopUpdating() OVERRIDE;
+    virtual void setEnableHighAccuracy(bool) OVERRIDE { }
 
-    WebCore::GeolocationPosition* lastPosition();
+    virtual WebCore::GeolocationPosition* lastPosition() OVERRIDE;
 
-    void requestPermission(WebCore::Geolocation*);
-    void cancelPermissionRequest(WebCore::Geolocation*) { };
+    virtual void requestPermission(WebCore::Geolocation*) OVERRIDE;
+    virtual void cancelPermissionRequest(WebCore::Geolocation*) OVERRIDE { };
 
 private:
     WebView *m_webView;
index a557ab5..1705b1a 100644 (file)
 
 class WebIconDatabaseClient : public WebCore::IconDatabaseClient {
 public:
-    virtual bool performImport();
-    virtual void didRemoveAllIcons();
-    virtual void didImportIconURLForPageURL(const String&);
-    virtual void didImportIconDataForPageURL(const String&);
-    virtual void didChangeIconForPageURL(const String&);
-    virtual void didFinishURLImport();
+    virtual bool performImport() OVERRIDE;
+    virtual void didRemoveAllIcons() OVERRIDE;
+    virtual void didImportIconURLForPageURL(const String&) OVERRIDE;
+    virtual void didImportIconDataForPageURL(const String&) OVERRIDE;
+    virtual void didChangeIconForPageURL(const String&) OVERRIDE;
+    virtual void didFinishURLImport() OVERRIDE;
 };
index b85d573..e6a060a 100644 (file)
@@ -55,14 +55,14 @@ class WebInspectorClient : public WebCore::InspectorClient {
 public:
     WebInspectorClient(WebView *);
 
-    virtual void inspectorDestroyed();
+    virtual void inspectorDestroyed() OVERRIDE;
 
-    virtual void openInspectorFrontend(WebCore::InspectorController*);
+    virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
 
-    virtual void highlight();
-    virtual void hideHighlight();
+    virtual void highlight() OVERRIDE;
+    virtual void hideHighlight() OVERRIDE;
 
-    virtual bool sendMessageToFrontend(const WTF::String&);
+    virtual bool sendMessageToFrontend(const WTF::String&) OVERRIDE;
 
     bool inspectorStartsAttached();
     void setInspectorStartsAttached(bool);
index 953abe6..f1bd1a3 100644 (file)
@@ -39,20 +39,20 @@ private:
     WebPlatformStrategies();
     
     // WebCore::PlatformStrategies
-    virtual WebCore::CookiesStrategy* createCookiesStrategy();
-    virtual WebCore::PluginStrategy* createPluginStrategy();
-    virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy();
+    virtual WebCore::CookiesStrategy* createCookiesStrategy() OVERRIDE;
+    virtual WebCore::PluginStrategy* createPluginStrategy() OVERRIDE;
+    virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() OVERRIDE;
 
     // WebCore::CookiesStrategy
-    virtual void notifyCookiesChanged();
+    virtual void notifyCookiesChanged() OVERRIDE;
 
     // WebCore::PluginStrategy
-    virtual void refreshPlugins();
-    virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
+    virtual void refreshPlugins() OVERRIDE;
+    virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) OVERRIDE;
 
     // WebCore::VisitedLinkStrategy
-    virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
-    virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
+    virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL) OVERRIDE;
+    virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) OVERRIDE;
 };
 
 #endif // WebPlatformStrategies_h