Changeset 95847 in webkit


Ignore:
Timestamp:
Sep 23, 2011 12:24:34 PM (13 years ago)
Author:
andersca@apple.com
Message:

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:

../../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:
Location:
trunk/Source/WebKit
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r95655 r95847  
     12011-09-23  Anders Carlsson  <andersca@apple.com>
     2
     3        Add OVERRIDE to a bunch of virtual member functions on clients
     4        https://bugs.webkit.org/show_bug.cgi?id=68712
     5
     6        Reviewed by Sam Weinig.
     7
     8        * WebKit.xcodeproj/project.pbxproj:
     9
    1102011-09-21  Dan Bernstein  <mitz@apple.com>
    211

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r95655 r95847  
    12791279                                B82958D1132707D0000D0E79 /* CorrectionPanel.h */,
    12801280                                B82958D2132707D0000D0E79 /* CorrectionPanel.mm */,
     1281                                598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */,
    12811282                                598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */,
    1282                                 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */,
    12831283                                B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */,
    12841284                                B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */,

  • trunk/Source/WebKit/mac/ChangeLog

    r95766 r95847  
     12011-09-23  Anders Carlsson  <andersca@apple.com>
     2
     3        Add OVERRIDE to a bunch of virtual member functions on clients
     4        https://bugs.webkit.org/show_bug.cgi?id=68712
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig:
     9        * WebCoreSupport/WebChromeClient.h:
     10        * WebCoreSupport/WebContextMenuClient.h:
     11        * WebCoreSupport/WebDeviceOrientationClient.h:
     12        * WebCoreSupport/WebDragClient.h:
     13        * WebCoreSupport/WebEditorClient.h:
     14        * WebCoreSupport/WebFrameLoaderClient.h:
     15        * WebCoreSupport/WebFrameNetworkingContext.h:
     16        * WebCoreSupport/WebGeolocationClient.h:
     17        * WebCoreSupport/WebIconDatabaseClient.h:
     18        * WebCoreSupport/WebInspectorClient.h:
     19        * WebCoreSupport/WebPlatformStrategies.h:
     20
    1212011-09-22  Dean Jackson  <dino@apple.com>
    222

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r95049 r95847  
    2424#include "CompilerVersion.xcconfig"
    2525
     26CLANG_WARN_CXX0X_EXTENSIONS = NO;
    2627DEBUG_INFORMATION_FORMAT = dwarf;
    2728GCC_C_LANGUAGE_STANDARD = gnu99;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r95271 r95847  
    3939    virtual void* webView() const { return static_cast<void*>(m_webView); }
    4040   
    41     virtual void chromeDestroyed();
     41    virtual void chromeDestroyed() OVERRIDE;
    4242   
    43     virtual void setWindowRect(const WebCore::FloatRect&);
    44     virtual WebCore::FloatRect windowRect();
     43    virtual void setWindowRect(const WebCore::FloatRect&) OVERRIDE;
     44    virtual WebCore::FloatRect windowRect() OVERRIDE;
    4545
    46     virtual WebCore::FloatRect pageRect();
     46    virtual WebCore::FloatRect pageRect() OVERRIDE;
    4747
    48     virtual void focus();
    49     virtual void unfocus();
     48    virtual void focus() OVERRIDE;
     49    virtual void unfocus() OVERRIDE;
    5050   
    51     virtual bool canTakeFocus(WebCore::FocusDirection);
    52     virtual void takeFocus(WebCore::FocusDirection);
     51    virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE;
     52    virtual void takeFocus(WebCore::FocusDirection) OVERRIDE;
    5353
    54     virtual void focusedNodeChanged(WebCore::Node*);
    55     virtual void focusedFrameChanged(WebCore::Frame*);
     54    virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE;
     55    virtual void focusedFrameChanged(WebCore::Frame*) OVERRIDE;
    5656
    57     virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&);
    58     virtual void show();
     57    virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) OVERRIDE;
     58    virtual void show() OVERRIDE;
    5959
    60     virtual bool canRunModal();
    61     virtual void runModal();
     60    virtual bool canRunModal() OVERRIDE;
     61    virtual void runModal() OVERRIDE;
    6262
    63     virtual void setToolbarsVisible(bool);
    64     virtual bool toolbarsVisible();
     63    virtual void setToolbarsVisible(bool) OVERRIDE;
     64    virtual bool toolbarsVisible() OVERRIDE;
    6565   
    66     virtual void setStatusbarVisible(bool);
    67     virtual bool statusbarVisible();
     66    virtual void setStatusbarVisible(bool) OVERRIDE;
     67    virtual bool statusbarVisible() OVERRIDE;
    6868   
    69     virtual void setScrollbarsVisible(bool);
    70     virtual bool scrollbarsVisible();
     69    virtual void setScrollbarsVisible(bool) OVERRIDE;
     70    virtual bool scrollbarsVisible() OVERRIDE;
    7171   
    72     virtual void setMenubarVisible(bool);
    73     virtual bool menubarVisible();
     72    virtual void setMenubarVisible(bool) OVERRIDE;
     73    virtual bool menubarVisible() OVERRIDE;
    7474   
    75     virtual void setResizable(bool);
     75    virtual void setResizable(bool) OVERRIDE;
    7676   
    77     virtual void addMessageToConsole(WebCore::MessageSource source, WebCore::MessageType type, WebCore::MessageLevel level, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceURL);
     77    virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceURL) OVERRIDE;
    7878
    79     virtual bool canRunBeforeUnloadConfirmPanel();
    80     virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame);
     79    virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE;
     80    virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) OVERRIDE;
    8181
    82     virtual void closeWindowSoon();
     82    virtual void closeWindowSoon() OVERRIDE;
    8383
    84     virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&);
    85     virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
    86     virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
    87     virtual bool shouldInterruptJavaScript();
     84    virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) OVERRIDE;
     85    virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) OVERRIDE;
     86    virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) OVERRIDE;
     87    virtual bool shouldInterruptJavaScript() OVERRIDE;
    8888
    89     virtual WebCore::IntRect windowResizerRect() const;
     89    virtual WebCore::IntRect windowResizerRect() const OVERRIDE;
    9090
    91     virtual void invalidateWindow(const WebCore::IntRect&, bool);
    92     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
    93     virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    94     virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
     91    virtual void invalidateWindow(const WebCore::IntRect&, bool) OVERRIDE;
     92    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) OVERRIDE;
     93    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
     94    virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) OVERRIDE;
    9595
    96     virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
    97     virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
    98     virtual PlatformPageClient platformPageClient() const;
    99     virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
    100     virtual void scrollRectIntoView(const WebCore::IntRect&) const;
     96    virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const OVERRIDE;
     97    virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const OVERRIDE;
     98    virtual PlatformPageClient platformPageClient() const OVERRIDE;
     99    virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE;
     100    virtual void scrollRectIntoView(const WebCore::IntRect&) const OVERRIDE;
    101101   
    102     virtual void setStatusbarText(const WTF::String&);
     102    virtual void setStatusbarText(const WTF::String&) OVERRIDE;
    103103
    104     virtual void scrollbarsModeDidChange() const { }
    105     virtual bool shouldMissingPluginMessageBeButton() const;
    106     virtual void missingPluginButtonClicked(WebCore::Element*) const;
    107     virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags);
     104    virtual void scrollbarsModeDidChange() const OVERRIDE { }
     105    virtual bool shouldMissingPluginMessageBeButton() const OVERRIDE;
     106    virtual void missingPluginButtonClicked(WebCore::Element*) const OVERRIDE;
     107    virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) OVERRIDE;
    108108
    109     virtual void setToolTip(const WTF::String&, WebCore::TextDirection);
     109    virtual void setToolTip(const WTF::String&, WebCore::TextDirection) OVERRIDE;
    110110
    111     virtual void print(WebCore::Frame*);
     111    virtual void print(WebCore::Frame*) OVERRIDE;
    112112#if ENABLE(SQL_DATABASE)
    113     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
     113    virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName) OVERRIDE;
    114114#endif
    115115#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    116     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
    117     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
     116    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) OVERRIDE;
     117    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) OVERRIDE;
    118118#endif
    119     virtual void populateVisitedLinks();
     119    virtual void populateVisitedLinks() OVERRIDE;
    120120
    121121#if ENABLE(DASHBOARD_SUPPORT)
    122     virtual void dashboardRegionsChanged();
     122    virtual void dashboardRegionsChanged() OVERRIDE;
    123123#endif
    124124
    125     virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    126     virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
     125    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
     126    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*) OVERRIDE;
    127127
    128     virtual void setCursor(const WebCore::Cursor&);
    129     virtual void setCursorHiddenUntilMouseMoves(bool);
     128    virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
     129    virtual void setCursorHiddenUntilMouseMoves(bool) OVERRIDE;
    130130
    131     virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type,
    132         const WebCore::FloatRect& lineRect);
    133     virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type,
    134         const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,
    135         bool behindText, bool entireLine);
     131    virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) OVERRIDE;
     132    virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) OVERRIDE;
    136133
    137     virtual WebCore::KeyboardUIMode keyboardUIMode();
     134    virtual WebCore::KeyboardUIMode keyboardUIMode() OVERRIDE;
    138135
    139     virtual NSResponder *firstResponder();
    140     virtual void makeFirstResponder(NSResponder *);
     136    virtual NSResponder *firstResponder() OVERRIDE;
     137    virtual void makeFirstResponder(NSResponder *) OVERRIDE;
    141138
    142     virtual void willPopUpMenu(NSMenu *);
     139    virtual void willPopUpMenu(NSMenu *) OVERRIDE;
    143140   
    144     virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename);
    145     virtual WTF::String generateReplacementFile(const WTF::String& path);
     141    virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) OVERRIDE;
     142    virtual WTF::String generateReplacementFile(const WTF::String& path) OVERRIDE;
    146143
    147     virtual void formStateDidChange(const WebCore::Node*) { }
     144    virtual void formStateDidChange(const WebCore::Node*) OVERRIDE { }
    148145
    149     virtual void elementDidFocus(const WebCore::Node*);
    150     virtual void elementDidBlur(const WebCore::Node*);
     146    virtual void elementDidFocus(const WebCore::Node*) OVERRIDE;
     147    virtual void elementDidBlur(const WebCore::Node*) OVERRIDE;
    151148
    152149#if USE(ACCELERATED_COMPOSITING)
    153     virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
    154     virtual void setNeedsOneShotDrawingSynchronization();
    155     virtual void scheduleCompositingLayerSync();
     150    virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) OVERRIDE;
     151    virtual void setNeedsOneShotDrawingSynchronization() OVERRIDE;
     152    virtual void scheduleCompositingLayerSync() OVERRIDE;
    156153#endif
    157154
    158155#if ENABLE(VIDEO)
    159     virtual bool supportsFullscreenForNode(const WebCore::Node*);
    160     virtual void enterFullscreenForNode(WebCore::Node*);
    161     virtual void exitFullscreenForNode(WebCore::Node*);
    162     virtual void fullScreenRendererChanged(WebCore::RenderBox*);
     156    virtual bool supportsFullscreenForNode(const WebCore::Node*) OVERRIDE;
     157    virtual void enterFullscreenForNode(WebCore::Node*) OVERRIDE;
     158    virtual void exitFullscreenForNode(WebCore::Node*) OVERRIDE;
     159    virtual void fullScreenRendererChanged(WebCore::RenderBox*) OVERRIDE;
    163160#endif
    164161   
    165162#if ENABLE(FULLSCREEN_API)
    166     virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard);
    167     virtual void enterFullScreenForElement(WebCore::Element*);
    168     virtual void exitFullScreenForElement(WebCore::Element*);
     163    virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) OVERRIDE;
     164    virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
     165    virtual void exitFullScreenForElement(WebCore::Element*) OVERRIDE;
    169166#endif
    170167
    171168    // FIXME: Remove once all ports are using client-based geolocation. https://bugs.webkit.org/show_bug.cgi?id=40373
    172169    // For client-based geolocation, these two methods have moved to WebGeolocationClient. https://bugs.webkit.org/show_bug.cgi?id=50061
    173     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
    174     virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
     170    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE { }
     171    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE { }
    175172
    176     virtual bool selectItemWritingDirectionIsNatural();
    177     virtual bool selectItemAlignmentFollowsMenuWritingDirection();
    178     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    179     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
     173    virtual bool selectItemWritingDirectionIsNatural() OVERRIDE;
     174    virtual bool selectItemAlignmentFollowsMenuWritingDirection() OVERRIDE;
     175    virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE;
     176    virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE;
    180177
    181178#if ENABLE(CONTEXT_MENUS)
    182     virtual void showContextMenu();
     179    virtual void showContextMenu() OVERRIDE;
    183180#endif
    184181   
    185     virtual void numWheelEventHandlersChanged(unsigned) { }
    186    
    187     virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const { return false; }
     182    virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE { }
     183    virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE { return false; }
    188184private:
    189185    WebView *m_webView;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h

    r65021 r95847  
    3535    WebContextMenuClient(WebView *webView);
    3636   
    37     virtual void contextMenuDestroyed();
     37    virtual void contextMenuDestroyed() OVERRIDE;
    3838   
    39     virtual NSMutableArray* getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
    40     virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
     39    virtual NSMutableArray* getCustomMenuFromDefaultItems(WebCore::ContextMenu*) OVERRIDE;
     40    virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) OVERRIDE;
    4141   
    42     virtual void downloadURL(const WebCore::KURL&);
    43     virtual void searchWithGoogle(const WebCore::Frame*);
    44     virtual void lookUpInDictionary(WebCore::Frame*);
    45     virtual bool isSpeaking();
    46     virtual void speak(const WTF::String&);
    47     virtual void stopSpeaking();
    48     virtual void searchWithSpotlight();
     42    virtual void downloadURL(const WebCore::KURL&) OVERRIDE;
     43    virtual void searchWithGoogle(const WebCore::Frame*) OVERRIDE;
     44    virtual void lookUpInDictionary(WebCore::Frame*) OVERRIDE;
     45    virtual bool isSpeaking() OVERRIDE;
     46    virtual void speak(const WTF::String&) OVERRIDE;
     47    virtual void stopSpeaking() OVERRIDE;
     48    virtual void searchWithSpotlight() OVERRIDE;
    4949
    5050    WebView *webView() { return m_webView; }

  • trunk/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.h

    r67949 r95847  
    4444
    4545    // DeviceOrientationClient methods
    46     virtual void setController(WebCore::DeviceOrientationController*);
    47     virtual void startUpdating();
    48     virtual void stopUpdating();
    49     virtual WebCore::DeviceOrientation* lastOrientation() const;
    50     virtual void deviceOrientationControllerDestroyed();
     46    virtual void setController(WebCore::DeviceOrientationController*) OVERRIDE;
     47    virtual void startUpdating() OVERRIDE;
     48    virtual void stopUpdating() OVERRIDE;
     49    virtual WebCore::DeviceOrientation* lastOrientation() const OVERRIDE;
     50    virtual void deviceOrientationControllerDestroyed() OVERRIDE;
    5151
    5252private:

  • trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h

    r77870 r95847  
    3131public:
    3232    WebDragClient(WebView*);
    33     virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*);
    34     virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*);
    35     virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*);
    36     virtual void dragControllerDestroyed();
    37     virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint);
    38     virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag);
    39     virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*);
     33    virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*) OVERRIDE;
     34    virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*) OVERRIDE;
     35    virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*) OVERRIDE;
     36    virtual void dragControllerDestroyed() OVERRIDE;
     37    virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) OVERRIDE;
     38    virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag) OVERRIDE;
     39    virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*) OVERRIDE;
    4040private:
    4141    WebView* m_webView;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h

    r85036 r95847  
    4242    WebEditorClient(WebView *);
    4343    virtual ~WebEditorClient();
    44     virtual void pageDestroyed();
     44    virtual void pageDestroyed() OVERRIDE;
    4545
    46     virtual bool isGrammarCheckingEnabled();
    47     virtual void toggleGrammarChecking();
    48     virtual bool isContinuousSpellCheckingEnabled();
    49     virtual void toggleContinuousSpellChecking();
    50     virtual int spellCheckerDocumentTag();
     46    virtual bool isGrammarCheckingEnabled() OVERRIDE;
     47    virtual void toggleGrammarChecking() OVERRIDE;
     48    virtual bool isContinuousSpellCheckingEnabled() OVERRIDE;
     49    virtual void toggleContinuousSpellChecking() OVERRIDE;
     50    virtual int spellCheckerDocumentTag() OVERRIDE;
    5151
    52     virtual bool smartInsertDeleteEnabled();
    53     virtual bool isSelectTrailingWhitespaceEnabled();
     52    virtual bool smartInsertDeleteEnabled() OVERRIDE;
     53    virtual bool isSelectTrailingWhitespaceEnabled() OVERRIDE;
    5454
    55     virtual bool shouldDeleteRange(WebCore::Range*);   
    56     virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*);
     55    virtual bool shouldDeleteRange(WebCore::Range*) OVERRIDE;
     56    virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) OVERRIDE;
    5757
    58     virtual bool shouldBeginEditing(WebCore::Range*);
    59     virtual bool shouldEndEditing(WebCore::Range*);
    60     virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction);
    61     virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
    62     virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
     58    virtual bool shouldBeginEditing(WebCore::Range*) OVERRIDE;
     59    virtual bool shouldEndEditing(WebCore::Range*) OVERRIDE;
     60    virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
     61    virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
     62    virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
    6363
    64     virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*);
     64    virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*) OVERRIDE;
    6565   
    66     virtual bool shouldMoveRangeAfterDelete(WebCore::Range* range, WebCore::Range* rangeToBeReplaced);
     66    virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range* rangeToBeReplaced) OVERRIDE;
    6767
    68     virtual void didBeginEditing();
    69     virtual void didEndEditing();
    70     virtual void didWriteSelectionToPasteboard();
    71     virtual void didSetSelectionTypesForPasteboard();
     68    virtual void didBeginEditing() OVERRIDE;
     69    virtual void didEndEditing() OVERRIDE;
     70    virtual void didWriteSelectionToPasteboard() OVERRIDE;
     71    virtual void didSetSelectionTypesForPasteboard() OVERRIDE;
    7272
    73     virtual NSString* userVisibleString(NSURL *);
    74     virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&);
    75     virtual void setInsertionPasteboard(NSPasteboard *);
    76     virtual NSURL* canonicalizeURL(NSURL*);
    77     virtual NSURL* canonicalizeURLString(NSString*);
     73    virtual NSString* userVisibleString(NSURL *) OVERRIDE;
     74    virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) OVERRIDE;
     75    virtual void setInsertionPasteboard(NSPasteboard *) OVERRIDE;
     76    virtual NSURL* canonicalizeURL(NSURL*) OVERRIDE;
     77    virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE;
    7878   
    7979#ifndef BUILDING_ON_LEOPARD
    80     virtual void uppercaseWord();
    81     virtual void lowercaseWord();
    82     virtual void capitalizeWord();
    83     virtual void showSubstitutionsPanel(bool show);
    84     virtual bool substitutionsPanelIsShowing();
    85     virtual void toggleSmartInsertDelete();
    86     virtual bool isAutomaticQuoteSubstitutionEnabled();
    87     virtual void toggleAutomaticQuoteSubstitution();
    88     virtual bool isAutomaticLinkDetectionEnabled();
    89     virtual void toggleAutomaticLinkDetection();
    90     virtual bool isAutomaticDashSubstitutionEnabled();
    91     virtual void toggleAutomaticDashSubstitution();
    92     virtual bool isAutomaticTextReplacementEnabled();
    93     virtual void toggleAutomaticTextReplacement();
    94     virtual bool isAutomaticSpellingCorrectionEnabled();
    95     virtual void toggleAutomaticSpellingCorrection();
     80    virtual void uppercaseWord() OVERRIDE;
     81    virtual void lowercaseWord() OVERRIDE;
     82    virtual void capitalizeWord() OVERRIDE;
     83    virtual void showSubstitutionsPanel(bool show) OVERRIDE;
     84    virtual bool substitutionsPanelIsShowing() OVERRIDE;
     85    virtual void toggleSmartInsertDelete() OVERRIDE;
     86    virtual bool isAutomaticQuoteSubstitutionEnabled() OVERRIDE;
     87    virtual void toggleAutomaticQuoteSubstitution() OVERRIDE;
     88    virtual bool isAutomaticLinkDetectionEnabled() OVERRIDE;
     89    virtual void toggleAutomaticLinkDetection() OVERRIDE;
     90    virtual bool isAutomaticDashSubstitutionEnabled() OVERRIDE;
     91    virtual void toggleAutomaticDashSubstitution() OVERRIDE;
     92    virtual bool isAutomaticTextReplacementEnabled() OVERRIDE;
     93    virtual void toggleAutomaticTextReplacement() OVERRIDE;
     94    virtual bool isAutomaticSpellingCorrectionEnabled() OVERRIDE;
     95    virtual void toggleAutomaticSpellingCorrection() OVERRIDE;
    9696#endif
    9797
    98     TextCheckerClient* textChecker() { return this; }
     98    TextCheckerClient* textChecker() OVERRIDE { return this; }
    9999
    100     virtual void respondToChangedContents();
    101     virtual void respondToChangedSelection();
     100    virtual void respondToChangedContents() OVERRIDE;
     101    virtual void respondToChangedSelection() OVERRIDE;
    102102
    103     virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>);
    104     virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>);
    105     virtual void clearUndoRedoOperations();
     103    virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
     104    virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
     105    virtual void clearUndoRedoOperations() OVERRIDE;
    106106
    107     virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const;
    108     virtual bool canPaste(WebCore::Frame*, bool defaultValue) const;
    109     virtual bool canUndo() const;
    110     virtual bool canRedo() const;
     107    virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const OVERRIDE;
     108    virtual bool canPaste(WebCore::Frame*, bool defaultValue) const OVERRIDE;
     109    virtual bool canUndo() const OVERRIDE;
     110    virtual bool canRedo() const OVERRIDE;
    111111   
    112     virtual void undo();
    113     virtual void redo();
     112    virtual void undo() OVERRIDE;
     113    virtual void redo() OVERRIDE;
    114114   
    115     virtual void handleKeyboardEvent(WebCore::KeyboardEvent*);
    116     virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*);
     115    virtual void handleKeyboardEvent(WebCore::KeyboardEvent*) OVERRIDE;
     116    virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*) OVERRIDE;
    117117
    118     virtual void textFieldDidBeginEditing(WebCore::Element*);
    119     virtual void textFieldDidEndEditing(WebCore::Element*);
    120     virtual void textDidChangeInTextField(WebCore::Element*);
    121     virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*);
    122     virtual void textWillBeDeletedInTextField(WebCore::Element*);
    123     virtual void textDidChangeInTextArea(WebCore::Element*);
     118    virtual void textFieldDidBeginEditing(WebCore::Element*) OVERRIDE;
     119    virtual void textFieldDidEndEditing(WebCore::Element*) OVERRIDE;
     120    virtual void textDidChangeInTextField(WebCore::Element*) OVERRIDE;
     121    virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) OVERRIDE;
     122    virtual void textWillBeDeletedInTextField(WebCore::Element*) OVERRIDE;
     123    virtual void textDidChangeInTextArea(WebCore::Element*) OVERRIDE;
    124124   
    125     virtual void ignoreWordInSpellDocument(const WTF::String&);
    126     virtual void learnWord(const WTF::String&);
    127     virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
    128     virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&);
    129     virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
    130     virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, WTF::Vector<WebCore::TextCheckingResult>& results);
    131     virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&);
    132     virtual void updateSpellingUIWithMisspelledWord(const WTF::String&);
    133     virtual void showSpellingUI(bool show);
    134     virtual bool spellingUIIsShowing();
    135     virtual void getGuessesForWord(const WTF::String& word, const WTF::String& context, WTF::Vector<WTF::String>& guesses);
    136     virtual void willSetInputMethodState();
    137     virtual void setInputMethodState(bool enabled);
    138     virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&);
     125    virtual void ignoreWordInSpellDocument(const WTF::String&) OVERRIDE;
     126    virtual void learnWord(const WTF::String&) OVERRIDE;
     127    virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE;
     128    virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) OVERRIDE;
     129    virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE;
     130    virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, WTF::Vector<WebCore::TextCheckingResult>& results) OVERRIDE;
     131    virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) OVERRIDE;
     132    virtual void updateSpellingUIWithMisspelledWord(const WTF::String&) OVERRIDE;
     133    virtual void showSpellingUI(bool show) OVERRIDE;
     134    virtual bool spellingUIIsShowing() OVERRIDE;
     135    virtual void getGuessesForWord(const WTF::String& word, const WTF::String& context, WTF::Vector<WTF::String>& guesses) OVERRIDE;
     136    virtual void willSetInputMethodState() OVERRIDE;
     137    virtual void setInputMethodState(bool enabled) OVERRIDE;
     138    virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) OVERRIDE;
    139139#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    140     virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
    141     virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel);
    142     virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel);
    143     virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString);
     140    virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
     141    virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE;
     142    virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE;
     143    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
    144144#endif
    145145private:

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

    r95387 r95847  
    5656    WebFrame* webFrame() const { return m_webFrame.get(); }
    5757
    58     virtual void frameLoaderDestroyed();
     58    virtual void frameLoaderDestroyed() OVERRIDE;
    5959    void receivedPolicyDecison(WebCore::PolicyAction);
    6060
    6161private:
    62     virtual bool hasWebView() const; // mainly for assertions
    63 
    64     virtual void makeRepresentation(WebCore::DocumentLoader*);
    65     virtual bool hasHTMLView() const;
    66     virtual void forceLayout();
    67     virtual void forceLayoutForNonHTML();
    68 
    69     virtual void setCopiesOnScroll();
    70 
    71     virtual void detachedFromParent2();
    72     virtual void detachedFromParent3();
    73 
    74     virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    75 
    76     virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
    77 
    78     virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
    79     virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier);
    80     virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
    81     virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
     62    virtual bool hasWebView() const OVERRIDE; // mainly for assertions
     63
     64    virtual void makeRepresentation(WebCore::DocumentLoader*) OVERRIDE;
     65    virtual bool hasHTMLView() const OVERRIDE;
     66    virtual void forceLayout() OVERRIDE;
     67    virtual void forceLayoutForNonHTML() OVERRIDE;
     68
     69    virtual void setCopiesOnScroll() OVERRIDE;
     70
     71    virtual void detachedFromParent2() OVERRIDE;
     72    virtual void detachedFromParent3() OVERRIDE;
     73
     74    virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) OVERRIDE;
     75
     76    virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) OVERRIDE;
     77
     78    virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
     79    virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
     80    virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE;
     81    virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE;
    8282#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    83     virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&);
    84 #endif
    85     virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&);
    86     virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength);
    87     virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier);
    88     virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&);
    89 
    90     virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const;
    91 
    92     virtual void dispatchDidHandleOnloadEvents();
    93     virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
    94     virtual void dispatchDidCancelClientRedirect();
    95     virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate);
    96     virtual void dispatchDidChangeLocationWithinPage();
    97     virtual void dispatchDidPushStateWithinPage();
    98     virtual void dispatchDidReplaceStateWithinPage();
    99     virtual void dispatchDidPopStateWithinPage();
    100    
    101     virtual void dispatchWillClose();
    102     virtual void dispatchDidReceiveIcon();
    103     virtual void dispatchDidStartProvisionalLoad();
    104     virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    105     virtual void dispatchDidChangeIcons(WebCore::IconType);
    106     virtual void dispatchDidCommitLoad();
    107     virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
    108     virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
    109     virtual void dispatchDidFinishDocumentLoad();
    110     virtual void dispatchDidFinishLoad();
    111     virtual void dispatchDidFirstLayout();
    112     virtual void dispatchDidFirstVisuallyNonEmptyLayout();
    113 
    114     virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&);
    115     virtual void dispatchShow();
     83    virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) OVERRIDE;
     84#endif
     85    virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) OVERRIDE;
     86    virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) OVERRIDE;
     87    virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
     88    virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) OVERRIDE;
     89
     90    virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const OVERRIDE;
     91
     92    virtual void dispatchDidHandleOnloadEvents() OVERRIDE;
     93    virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE;
     94    virtual void dispatchDidCancelClientRedirect() OVERRIDE;
     95    virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate) OVERRIDE;
     96    virtual void dispatchDidChangeLocationWithinPage() OVERRIDE;
     97    virtual void dispatchDidPushStateWithinPage() OVERRIDE;
     98    virtual void dispatchDidReplaceStateWithinPage() OVERRIDE;
     99    virtual void dispatchDidPopStateWithinPage() OVERRIDE;
     100   
     101    virtual void dispatchWillClose() OVERRIDE;
     102    virtual void dispatchDidReceiveIcon() OVERRIDE;
     103    virtual void dispatchDidStartProvisionalLoad() OVERRIDE;
     104    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) OVERRIDE;
     105    virtual void dispatchDidChangeIcons(WebCore::IconType) OVERRIDE;
     106    virtual void dispatchDidCommitLoad() OVERRIDE;
     107    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) OVERRIDE;
     108    virtual void dispatchDidFailLoad(const WebCore::ResourceError&) OVERRIDE;
     109    virtual void dispatchDidFinishDocumentLoad() OVERRIDE;
     110    virtual void dispatchDidFinishLoad() OVERRIDE;
     111    virtual void dispatchDidFirstLayout() OVERRIDE;
     112    virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE;
     113
     114    virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) OVERRIDE;
     115    virtual void dispatchShow() OVERRIDE;
    116116
    117117    virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction,
    118118        const WebCore::ResourceResponse&, const WebCore::ResourceRequest&);
    119119    virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction,
    120         const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName);
     120        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName) OVERRIDE;
    121121    virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction,
    122         const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>);
    123     virtual void cancelPolicyCheck();
    124 
    125     virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
    126 
    127     virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) { }
    128     virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>);
    129 
    130     virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*);
    131     virtual void revertToProvisionalState(WebCore::DocumentLoader*);
    132     virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
    133     virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length);
    134 
    135     virtual void willChangeEstimatedProgress();
    136     virtual void didChangeEstimatedProgress();
    137     virtual void postProgressStartedNotification();
    138     virtual void postProgressEstimateChangedNotification();
    139     virtual void postProgressFinishedNotification();
    140    
    141     virtual void setMainFrameDocumentReady(bool);
    142 
    143     virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String());
    144 
    145     virtual void willChangeTitle(WebCore::DocumentLoader*);
    146     virtual void didChangeTitle(WebCore::DocumentLoader*);
    147 
    148     virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
    149     virtual void finishedLoading(WebCore::DocumentLoader*);
    150     virtual void updateGlobalHistory();
    151     virtual void updateGlobalHistoryRedirectLinks();
    152 
    153     virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
    154     virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const;
    155     virtual void updateGlobalHistoryItemForPage();
    156 
    157     virtual void didDisplayInsecureContent();
    158     virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&);
    159 
    160     virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
    161     virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    162     virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    163     virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    164 
    165     virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
    166     virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
    167     virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
    168 
    169     virtual bool shouldFallBack(const WebCore::ResourceError&);
    170 
    171     virtual WTF::String userAgent(const WebCore::KURL&);
    172    
    173     virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
    174     virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
    175     virtual void transitionToCommittedForNewPage();
    176 
    177     virtual void didSaveToPageCache();
    178     virtual void didRestoreFromPageCache();
    179 
    180     virtual void dispatchDidBecomeFrameset(bool);
    181 
    182     virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
    183     virtual bool canShowMIMEType(const WTF::String& MIMEType) const;
    184     virtual bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const;
    185     virtual bool representationExistsForURLScheme(const WTF::String& URLScheme) const;
    186     virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const;
    187 
    188     virtual void frameLoadCompleted();
    189     virtual void saveViewStateToItem(WebCore::HistoryItem*);
    190     virtual void restoreViewState();
    191     virtual void provisionalLoadStarted();
    192     virtual void didFinishLoad();
    193     virtual void prepareForDataSourceReplacement();
    194     virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
    195 
    196     virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&);
     122        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>) OVERRIDE;
     123    virtual void cancelPolicyCheck() OVERRIDE;
     124
     125    virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) OVERRIDE;
     126
     127    virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) OVERRIDE { }
     128    virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>) OVERRIDE;
     129
     130    virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*) OVERRIDE;
     131    virtual void revertToProvisionalState(WebCore::DocumentLoader*) OVERRIDE;
     132    virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) OVERRIDE;
     133    virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) OVERRIDE;
     134
     135    virtual void willChangeEstimatedProgress() OVERRIDE;
     136    virtual void didChangeEstimatedProgress() OVERRIDE;
     137    virtual void postProgressStartedNotification() OVERRIDE;
     138    virtual void postProgressEstimateChangedNotification() OVERRIDE;
     139    virtual void postProgressFinishedNotification() OVERRIDE;
     140   
     141    virtual void setMainFrameDocumentReady(bool) OVERRIDE;
     142
     143    virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) OVERRIDE;
     144
     145    virtual void willChangeTitle(WebCore::DocumentLoader*) OVERRIDE;
     146    virtual void didChangeTitle(WebCore::DocumentLoader*) OVERRIDE;
     147
     148    virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) OVERRIDE;
     149    virtual void finishedLoading(WebCore::DocumentLoader*) OVERRIDE;
     150    virtual void updateGlobalHistory() OVERRIDE;
     151    virtual void updateGlobalHistoryRedirectLinks() OVERRIDE;
     152
     153    virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const OVERRIDE;
     154    virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const OVERRIDE;
     155    virtual void updateGlobalHistoryItemForPage() OVERRIDE;
     156
     157    virtual void didDisplayInsecureContent() OVERRIDE;
     158    virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
     159
     160    virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) OVERRIDE;
     161    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) OVERRIDE;
     162    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) OVERRIDE;
     163    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) OVERRIDE;
     164
     165    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) OVERRIDE;
     166    virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) OVERRIDE;
     167    virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) OVERRIDE;
     168
     169    virtual bool shouldFallBack(const WebCore::ResourceError&) OVERRIDE;
     170
     171    virtual WTF::String userAgent(const WebCore::KURL&) OVERRIDE;
     172   
     173    virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) OVERRIDE;
     174    virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) OVERRIDE;
     175    virtual void transitionToCommittedForNewPage() OVERRIDE;
     176
     177    virtual void didSaveToPageCache() OVERRIDE;
     178    virtual void didRestoreFromPageCache() OVERRIDE;
     179
     180    virtual void dispatchDidBecomeFrameset(bool) OVERRIDE;
     181
     182    virtual bool canHandleRequest(const WebCore::ResourceRequest&) const OVERRIDE;
     183    virtual bool canShowMIMEType(const WTF::String& MIMEType) const OVERRIDE;
     184    virtual bool canShowMIMETypeAsHTML(const WTF::String& MIMEType) const OVERRIDE;
     185    virtual bool representationExistsForURLScheme(const WTF::String& URLScheme) const OVERRIDE;
     186    virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const OVERRIDE;
     187
     188    virtual void frameLoadCompleted() OVERRIDE;
     189    virtual void saveViewStateToItem(WebCore::HistoryItem*) OVERRIDE;
     190    virtual void restoreViewState() OVERRIDE;
     191    virtual void provisionalLoadStarted() OVERRIDE;
     192    virtual void didFinishLoad() OVERRIDE;
     193    virtual void prepareForDataSourceReplacement() OVERRIDE;
     194    virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) OVERRIDE;
     195
     196    virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&) OVERRIDE;
    197197
    198198    virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement*,
    199                                         const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
    200     virtual void didTransferChildFrameToNewDocument(WebCore::Page* oldPage);
     199                                        const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) OVERRIDE;
     200    virtual void didTransferChildFrameToNewDocument(WebCore::Page* oldPage) OVERRIDE;
    201201    virtual void transferLoadingResourceFromPage(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, WebCore::Page* oldPage);
    202202    virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<WTF::String>&,
    203                                           const Vector<WTF::String>&, const WTF::String&, bool);
    204     virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
     203                                          const Vector<WTF::String>&, const WTF::String&, bool) OVERRIDE;
     204    virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget) OVERRIDE;
    205205   
    206206    virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL,
    207                                                     const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues);
     207                                                    const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) OVERRIDE;
    208208   
    209209#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    210210    virtual PassRefPtr<WebCore::Widget> createMediaPlayerProxyPlugin(const WebCore::IntSize&, WebCore::HTMLMediaElement*, const WebCore::KURL&,
    211                                         const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&);
    212     virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*);
    213     virtual void showMediaPlayerProxyPlugin(WebCore::Widget*);
    214 #endif
    215    
    216     virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
    217     virtual WTF::String overrideMediaType() const;
    218    
    219     virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
    220     virtual void documentElementAvailable();
    221     virtual void didPerformFirstNavigation() const;
    222 
    223     virtual void registerForIconNotification(bool listen);
     211                                        const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&) OVERRIDE;
     212    virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*) OVERRIDE;
     213    virtual void showMediaPlayerProxyPlugin(WebCore::Widget*) OVERRIDE;
     214#endif
     215   
     216    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
     217    virtual WTF::String overrideMediaType() const OVERRIDE;
     218   
     219    virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*) OVERRIDE;
     220    virtual void documentElementAvailable() OVERRIDE;
     221    virtual void didPerformFirstNavigation() const OVERRIDE;
     222
     223    virtual void registerForIconNotification(bool listen) OVERRIDE;
    224224
    225225#if ENABLE(JAVA_BRIDGE)
    226     virtual jobject javaApplet(NSView*);
     226    virtual jobject javaApplet(NSView*) OVERRIDE;
    227227#endif
    228228
    229229#if PLATFORM(MAC)
    230     virtual RemoteAXObjectRef accessibilityRemoteObject() { return 0; }
     230    virtual RemoteAXObjectRef accessibilityRemoteObject() OVERRIDE { return 0; }
    231231#endif
    232232   

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h

    r65579 r95847  
    3333    }
    3434
    35     virtual bool needsSiteSpecificQuirks() const;
    36     virtual bool localFileContentSniffingEnabled() const;
    37     virtual WebCore::SchedulePairHashSet* scheduledRunLoopPairs() const;
    38     virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
     35    virtual bool needsSiteSpecificQuirks() const OVERRIDE;
     36    virtual bool localFileContentSniffingEnabled() const OVERRIDE;
     37    virtual WebCore::SchedulePairHashSet* scheduledRunLoopPairs() const OVERRIDE;
     38    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
    3939};

  • trunk/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.h

    r73163 r95847  
    3838    WebView *webView() { return m_webView; }
    3939
    40     void geolocationDestroyed();
    41     void startUpdating();
    42     void stopUpdating();
    43     void setEnableHighAccuracy(bool) { }
     40    virtual void geolocationDestroyed() OVERRIDE;
     41    virtual void startUpdating() OVERRIDE;
     42    virtual void stopUpdating() OVERRIDE;
     43    virtual void setEnableHighAccuracy(bool) OVERRIDE { }
    4444
    45     WebCore::GeolocationPosition* lastPosition();
     45    virtual WebCore::GeolocationPosition* lastPosition() OVERRIDE;
    4646
    47     void requestPermission(WebCore::Geolocation*);
    48     void cancelPermissionRequest(WebCore::Geolocation*) { };
     47    virtual void requestPermission(WebCore::Geolocation*) OVERRIDE;
     48    virtual void cancelPermissionRequest(WebCore::Geolocation*) OVERRIDE { };
    4949
    5050private:

  • trunk/Source/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.h

    r81719 r95847  
    3232class WebIconDatabaseClient : public WebCore::IconDatabaseClient {
    3333public:
    34     virtual bool performImport();
    35     virtual void didRemoveAllIcons();
    36     virtual void didImportIconURLForPageURL(const String&);
    37     virtual void didImportIconDataForPageURL(const String&);
    38     virtual void didChangeIconForPageURL(const String&);
    39     virtual void didFinishURLImport();
     34    virtual bool performImport() OVERRIDE;
     35    virtual void didRemoveAllIcons() OVERRIDE;
     36    virtual void didImportIconURLForPageURL(const String&) OVERRIDE;
     37    virtual void didImportIconDataForPageURL(const String&) OVERRIDE;
     38    virtual void didChangeIconForPageURL(const String&) OVERRIDE;
     39    virtual void didFinishURLImport() OVERRIDE;
    4040};

  • trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h

    r92300 r95847  
    5656    WebInspectorClient(WebView *);
    5757
    58     virtual void inspectorDestroyed();
     58    virtual void inspectorDestroyed() OVERRIDE;
    5959
    60     virtual void openInspectorFrontend(WebCore::InspectorController*);
     60    virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
    6161
    62     virtual void highlight();
    63     virtual void hideHighlight();
     62    virtual void highlight() OVERRIDE;
     63    virtual void hideHighlight() OVERRIDE;
    6464
    65     virtual bool sendMessageToFrontend(const WTF::String&);
     65    virtual bool sendMessageToFrontend(const WTF::String&) OVERRIDE;
    6666
    6767    bool inspectorStartsAttached();

  • trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h

    r95604 r95847  
    4040   
    4141    // WebCore::PlatformStrategies
    42     virtual WebCore::CookiesStrategy* createCookiesStrategy();
    43     virtual WebCore::PluginStrategy* createPluginStrategy();
    44     virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy();
     42    virtual WebCore::CookiesStrategy* createCookiesStrategy() OVERRIDE;
     43    virtual WebCore::PluginStrategy* createPluginStrategy() OVERRIDE;
     44    virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() OVERRIDE;
    4545
    4646    // WebCore::CookiesStrategy
    47     virtual void notifyCookiesChanged();
     47    virtual void notifyCookiesChanged() OVERRIDE;
    4848
    4949    // WebCore::PluginStrategy
    50     virtual void refreshPlugins();
    51     virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
     50    virtual void refreshPlugins() OVERRIDE;
     51    virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) OVERRIDE;
    5252
    5353    // WebCore::VisitedLinkStrategy
    54     virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
    55     virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
     54    virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL) OVERRIDE;
     55    virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) OVERRIDE;
    5656};
    5757
Note: See TracChangeset for help on using the changeset viewer.