Changeset 95834 in webkit
- Timestamp:
- Sep 23, 2011 11:07:33 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r95804 r95834 1 2011-09-23 Anders Carlsson <andersca@apple.com> 2 3 Add OVERRIDE to overrides of virtual member functions in client classes 4 https://bugs.webkit.org/show_bug.cgi?id=68702 5 6 Reviewed by Darin Adler. 7 8 Disable the warning in Xcode and VS2005 for using override and final when compiling as C++98, 9 and remove WebEditorClient::isEditable, WebChromeClient::formDidFocus, 10 WebChromeClient::formDidBlur and WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest since 11 they have been removed from their respective base classes. 12 13 * Configurations/Base.xcconfig: 14 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 15 * WebProcess/WebCoreSupport/WebChromeClient.h: 16 * WebProcess/WebCoreSupport/WebContextMenuClient.h: 17 * WebProcess/WebCoreSupport/WebDatabaseManager.h: 18 * WebProcess/WebCoreSupport/WebDragClient.h: 19 * WebProcess/WebCoreSupport/WebEditorClient.cpp: 20 * WebProcess/WebCoreSupport/WebEditorClient.h: 21 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 22 * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: 23 * WebProcess/WebCoreSupport/WebGeolocationClient.h: 24 * WebProcess/WebCoreSupport/WebInspectorClient.h: 25 * WebProcess/WebCoreSupport/WebInspectorFrontendClient.h: 26 * WebProcess/WebCoreSupport/WebPlatformStrategies.h: 27 * WebProcess/WebCoreSupport/WebPopupMenu.h: 28 * WebProcess/WebCoreSupport/WebSearchPopupMenu.h: 29 * win/WebKit2Common.vsprops: 30 1 31 2011-09-23 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 32 -
trunk/Source/WebKit2/Configurations/Base.xcconfig
r95049 r95834 24 24 #include "CompilerVersion.xcconfig" 25 25 26 CLANG_WARN_CXX0X_EXTENSIONS = NO; 26 27 DEBUG_INFORMATION_FORMAT = dwarf; 27 28 GCC_C_LANGUAGE_STANDARD = gnu99; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r95303 r95834 667 667 } 668 668 669 void WebChromeClient::formDidFocus(const Node*)670 {671 notImplemented();672 }673 674 void WebChromeClient::formDidBlur(const Node*)675 {676 notImplemented();677 }678 679 669 bool WebChromeClient::selectItemWritingDirectionIsNatural() 680 670 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r95271 r95834 51 51 52 52 private: 53 virtual void chromeDestroyed() ;54 55 virtual void setWindowRect(const WebCore::FloatRect&) ;56 virtual WebCore::FloatRect windowRect() ;57 58 virtual WebCore::FloatRect pageRect() ;59 60 virtual void focus() ;61 virtual void unfocus() ;62 63 virtual bool canTakeFocus(WebCore::FocusDirection) ;64 virtual void takeFocus(WebCore::FocusDirection) ;65 66 virtual void focusedNodeChanged(WebCore::Node*) ;67 virtual void focusedFrameChanged(WebCore::Frame*) ;53 virtual void chromeDestroyed() OVERRIDE; 54 55 virtual void setWindowRect(const WebCore::FloatRect&) OVERRIDE; 56 virtual WebCore::FloatRect windowRect() OVERRIDE; 57 58 virtual WebCore::FloatRect pageRect() OVERRIDE; 59 60 virtual void focus() OVERRIDE; 61 virtual void unfocus() OVERRIDE; 62 63 virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE; 64 virtual void takeFocus(WebCore::FocusDirection) OVERRIDE; 65 66 virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE; 67 virtual void focusedFrameChanged(WebCore::Frame*) OVERRIDE; 68 68 69 69 // The Frame pointer provides the ChromeClient with context about which … … 71 71 // should not be shown to the user until the ChromeClient of the newly 72 72 // created Page has its show method called. 73 virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) ;74 virtual void show() ;75 76 virtual bool canRunModal() ;77 virtual void runModal() ;78 79 virtual void setToolbarsVisible(bool) ;80 virtual bool toolbarsVisible() ;81 82 virtual void setStatusbarVisible(bool) ;83 virtual bool statusbarVisible() ;84 85 virtual void setScrollbarsVisible(bool) ;86 virtual bool scrollbarsVisible() ;87 88 virtual void setMenubarVisible(bool) ;89 virtual bool menubarVisible() ;90 91 virtual void setResizable(bool) ;92 93 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID) ;94 95 virtual bool canRunBeforeUnloadConfirmPanel() ;96 virtual bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame* frame);97 98 virtual void closeWindowSoon() ;99 100 virtual void runJavaScriptAlert(WebCore::Frame*, const String&) ;101 virtual bool runJavaScriptConfirm(WebCore::Frame*, const String&) ;102 virtual bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) ;103 virtual void setStatusbarText(const String&) ;104 virtual bool shouldInterruptJavaScript() ;105 106 virtual WebCore::KeyboardUIMode keyboardUIMode() ;107 108 virtual WebCore::IntRect windowResizerRect() const ;109 110 // Methods used by HostWindow.111 virtual void invalidateWindow(const WebCore::IntRect&, bool) ;112 virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) ;113 virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) ;114 virtual void scroll(const WebCore::IntSize& scrollOffset, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) ;73 virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) OVERRIDE; 74 virtual void show() OVERRIDE; 75 76 virtual bool canRunModal() OVERRIDE; 77 virtual void runModal() OVERRIDE; 78 79 virtual void setToolbarsVisible(bool) OVERRIDE; 80 virtual bool toolbarsVisible() OVERRIDE; 81 82 virtual void setStatusbarVisible(bool) OVERRIDE; 83 virtual bool statusbarVisible() OVERRIDE; 84 85 virtual void setScrollbarsVisible(bool) OVERRIDE; 86 virtual bool scrollbarsVisible() OVERRIDE; 87 88 virtual void setMenubarVisible(bool) OVERRIDE; 89 virtual bool menubarVisible() OVERRIDE; 90 91 virtual void setResizable(bool) OVERRIDE; 92 93 virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID) OVERRIDE; 94 95 virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE; 96 virtual bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame*) OVERRIDE; 97 98 virtual void closeWindowSoon() OVERRIDE; 99 100 virtual void runJavaScriptAlert(WebCore::Frame*, const String&) OVERRIDE; 101 virtual bool runJavaScriptConfirm(WebCore::Frame*, const String&) OVERRIDE; 102 virtual bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) OVERRIDE; 103 virtual void setStatusbarText(const String&) OVERRIDE; 104 virtual bool shouldInterruptJavaScript() OVERRIDE; 105 106 virtual WebCore::KeyboardUIMode keyboardUIMode() OVERRIDE; 107 108 virtual WebCore::IntRect windowResizerRect() const OVERRIDE; 109 110 // HostWindow member function overrides. 111 virtual void invalidateWindow(const WebCore::IntRect&, bool) OVERRIDE; 112 virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) OVERRIDE; 113 virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE; 114 virtual void scroll(const WebCore::IntSize& scrollOffset, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) OVERRIDE; 115 115 #if ENABLE(TILED_BACKING_STORE) 116 virtual void delegatedScrollRequested(const WebCore::IntPoint& scrollOffset); 117 #endif 118 virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const; 119 virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const; 120 virtual PlatformPageClient platformPageClient() const; 121 virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const; 122 virtual void scrollRectIntoView(const WebCore::IntRect&) const; // Currently only Mac has a non empty implementation. 123 // End methods used by HostWindow. 124 125 virtual bool shouldMissingPluginMessageBeButton() const; 126 virtual void missingPluginButtonClicked(WebCore::Element*) const; 127 128 virtual void scrollbarsModeDidChange() const; 129 virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags); 130 131 virtual void setToolTip(const String&, WebCore::TextDirection); 132 133 virtual void print(WebCore::Frame*); 116 virtual void delegatedScrollRequested(const WebCore::IntPoint& scrollOffset) OVERRIDE; 117 #endif 118 virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const OVERRIDE; 119 virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const OVERRIDE; 120 virtual PlatformPageClient platformPageClient() const OVERRIDE; 121 virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE; 122 virtual void scrollRectIntoView(const WebCore::IntRect&) const OVERRIDE; // Currently only Mac has a non empty implementation. 123 124 virtual bool shouldMissingPluginMessageBeButton() const OVERRIDE; 125 virtual void missingPluginButtonClicked(WebCore::Element*) const OVERRIDE; 126 127 virtual void scrollbarsModeDidChange() const OVERRIDE; 128 virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) OVERRIDE; 129 130 virtual void setToolTip(const String&, WebCore::TextDirection) OVERRIDE; 131 132 virtual void print(WebCore::Frame*) OVERRIDE; 134 133 135 134 #if ENABLE(SQL_DATABASE) 136 virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName) ;135 virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName) OVERRIDE; 137 136 #endif 138 137 139 138 #if ENABLE(OFFLINE_WEB_APPLICATIONS) 140 virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) ;141 virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) ;139 virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) OVERRIDE; 140 virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) OVERRIDE; 142 141 #endif 143 142 144 143 #if ENABLE(DASHBOARD_SUPPORT) 145 virtual void dashboardRegionsChanged() ;146 #endif 147 148 virtual void populateVisitedLinks() ;149 150 virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) ;151 virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,152 bool behindText, bool entireLine) ;153 154 virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) ;155 virtual String generateReplacementFile(const String& path) ;144 virtual void dashboardRegionsChanged() OVERRIDE; 145 #endif 146 147 virtual void populateVisitedLinks() OVERRIDE; 148 149 virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) OVERRIDE; 150 virtual void paintCustomHighlight(WebCore::Node*, const AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, 151 bool behindText, bool entireLine) OVERRIDE; 152 153 virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) OVERRIDE; 154 virtual String generateReplacementFile(const String& path) OVERRIDE; 156 155 157 156 virtual bool paintCustomScrollbar(WebCore::GraphicsContext*, const WebCore::FloatRect&, WebCore::ScrollbarControlSize, 158 157 WebCore::ScrollbarControlState, WebCore::ScrollbarPart pressedPart, bool vertical, 159 float value, float proportion, WebCore::ScrollbarControlPartMask) ;160 virtual bool paintCustomScrollCorner(WebCore::GraphicsContext*, const WebCore::FloatRect&) ;161 162 virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) ;158 float value, float proportion, WebCore::ScrollbarControlPartMask) OVERRIDE; 159 virtual bool paintCustomScrollCorner(WebCore::GraphicsContext*, const WebCore::FloatRect&) OVERRIDE; 160 161 virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE; 163 162 164 163 // This is an asynchronous call. The ChromeClient can display UI asking the user for permission 165 164 // to use Geolococation. The ChromeClient must call Geolocation::setShouldClearCache() appropriately. 166 virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) ;167 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) ;168 169 virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) ;170 virtual void loadIconForFiles(const Vector<String>&, WebCore::FileIconLoader*) ;171 172 virtual void setCursor(const WebCore::Cursor&) ;173 virtual void setCursorHiddenUntilMouseMoves(bool) ;165 virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE; 166 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) OVERRIDE; 167 168 virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE; 169 virtual void loadIconForFiles(const Vector<String>&, WebCore::FileIconLoader*) OVERRIDE; 170 171 virtual void setCursor(const WebCore::Cursor&) OVERRIDE; 172 virtual void setCursorHiddenUntilMouseMoves(bool) OVERRIDE; 174 173 175 174 // Notification that the given form element has changed. This function 176 175 // will be called frequently, so handling should be very fast. 177 virtual void formStateDidChange(const WebCore::Node*); 178 179 virtual void formDidFocus(const WebCore::Node*); 180 virtual void formDidBlur(const WebCore::Node*); 181 182 virtual bool selectItemWritingDirectionIsNatural(); 183 virtual bool selectItemAlignmentFollowsMenuWritingDirection(); 184 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const; 185 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const; 176 virtual void formStateDidChange(const WebCore::Node*) OVERRIDE; 177 178 virtual bool selectItemWritingDirectionIsNatural() OVERRIDE; 179 virtual bool selectItemAlignmentFollowsMenuWritingDirection() OVERRIDE; 180 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE; 181 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const OVERRIDE; 186 182 187 183 #if ENABLE(CONTEXT_MENUS) 188 virtual void showContextMenu() ;184 virtual void showContextMenu() OVERRIDE; 189 185 #endif 190 186 191 187 #if USE(ACCELERATED_COMPOSITING) 192 virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) ;193 virtual void setNeedsOneShotDrawingSynchronization() ;194 virtual void scheduleCompositingLayerSync() ;188 virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) OVERRIDE; 189 virtual void setNeedsOneShotDrawingSynchronization() OVERRIDE; 190 virtual void scheduleCompositingLayerSync() OVERRIDE; 195 191 #endif 196 192 197 193 #if ENABLE(NOTIFICATIONS) 198 virtual WebCore::NotificationPresenter* notificationPresenter() const ;194 virtual WebCore::NotificationPresenter* notificationPresenter() const OVERRIDE; 199 195 #endif 200 196 201 197 #if ENABLE(TOUCH_EVENTS) 202 virtual void needTouchEvents(bool) ;198 virtual void needTouchEvents(bool) OVERRIDE; 203 199 #endif 204 200 205 201 #if PLATFORM(WIN) 206 virtual void setLastSetCursorToCurrentCursor() ;202 virtual void setLastSetCursorToCurrentCursor() OVERRIDE; 207 203 #endif 208 204 209 205 #if ENABLE(FULLSCREEN_API) 210 virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) ;211 virtual void enterFullScreenForElement(WebCore::Element*) ;212 virtual void exitFullScreenForElement(WebCore::Element*) ;213 virtual void setRootFullScreenLayer(WebCore::GraphicsLayer*) ;206 virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) OVERRIDE; 207 virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE; 208 virtual void exitFullScreenForElement(WebCore::Element*) OVERRIDE; 209 virtual void setRootFullScreenLayer(WebCore::GraphicsLayer*) OVERRIDE; 214 210 #endif 215 211 216 212 #if PLATFORM(MAC) 217 virtual void makeFirstResponder() ;218 #endif 219 220 virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments&) const ;221 222 virtual void didStartRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const ;223 virtual void didCompleteRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const ;224 virtual void didStartAnimatedScroll() const ;225 virtual void didCompleteAnimatedScroll() const ;226 227 virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) ;228 virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const ;229 230 virtual void numWheelEventHandlersChanged(unsigned) ;213 virtual void makeFirstResponder() OVERRIDE; 214 #endif 215 216 virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments&) const OVERRIDE; 217 218 virtual void didStartRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE; 219 virtual void didCompleteRubberBandForFrame(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE; 220 virtual void didStartAnimatedScroll() const OVERRIDE; 221 virtual void didCompleteAnimatedScroll() const OVERRIDE; 222 223 virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) OVERRIDE; 224 virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE; 225 226 virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE; 231 227 232 228 String m_cachedToolTip; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h
r73802 r95834 44 44 45 45 #if USE(CROSS_PLATFORM_CONTEXT_MENUS) 46 virtual PassOwnPtr<WebCore::ContextMenu> customizeMenu(PassOwnPtr<WebCore::ContextMenu>) ;46 virtual PassOwnPtr<WebCore::ContextMenu> customizeMenu(PassOwnPtr<WebCore::ContextMenu>) OVERRIDE; 47 47 #else 48 virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) ;48 virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) OVERRIDE; 49 49 #endif 50 virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) ;50 virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) OVERRIDE; 51 51 52 virtual void downloadURL(const WebCore::KURL& url);53 virtual void searchWithGoogle(const WebCore::Frame*) ;54 virtual void lookUpInDictionary(WebCore::Frame*) ;55 virtual bool isSpeaking() ;56 virtual void speak(const String&) ;57 virtual void stopSpeaking() ;52 virtual void downloadURL(const WebCore::KURL&) OVERRIDE; 53 virtual void searchWithGoogle(const WebCore::Frame*) OVERRIDE; 54 virtual void lookUpInDictionary(WebCore::Frame*) OVERRIDE; 55 virtual bool isSpeaking() OVERRIDE; 56 virtual void speak(const String&) OVERRIDE; 57 virtual void stopSpeaking() OVERRIDE; 58 58 59 59 #if PLATFORM(MAC) 60 virtual void searchWithSpotlight() ;60 virtual void searchWithSpotlight() OVERRIDE; 61 61 #endif 62 62 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
r82710 r95834 65 65 66 66 // WebCore::DatabaseTrackerClient 67 virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*) ;68 virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const String& databaseIdentifier) ;67 virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*) OVERRIDE; 68 virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const String& databaseIdentifier) OVERRIDE; 69 69 }; 70 70 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
r91266 r95834 51 51 52 52 private: 53 virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*) ;54 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*) ;55 virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*) ;56 virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) ;53 virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData*) OVERRIDE; 54 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard*) OVERRIDE; 55 virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData*) OVERRIDE; 56 virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) OVERRIDE; 57 57 58 virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false);58 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false) OVERRIDE; 59 59 60 60 #if PLATFORM(MAC) 61 virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*) ;61 virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, WebCore::Frame*) OVERRIDE; 62 62 #endif 63 63 64 virtual void dragEnded() ;64 virtual void dragEnded() OVERRIDE; 65 65 66 virtual void dragControllerDestroyed() ;66 virtual void dragControllerDestroyed() OVERRIDE; 67 67 68 68 WebPage* m_page; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
r84574 r95834 112 112 } 113 113 114 115 bool WebEditorClient::isEditable()116 {117 notImplemented();118 return false;119 }120 121 122 114 bool WebEditorClient::shouldBeginEditing(Range* range) 123 115 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
r85036 r95834 42 42 43 43 private: 44 virtual void pageDestroyed() ;44 virtual void pageDestroyed() OVERRIDE; 45 45 46 virtual bool shouldDeleteRange(WebCore::Range*) ;47 virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) ;48 virtual bool smartInsertDeleteEnabled() ;49 virtual bool isSelectTrailingWhitespaceEnabled() ;50 virtual bool isContinuousSpellCheckingEnabled() ;51 virtual void toggleContinuousSpellChecking() ;52 virtual bool isGrammarCheckingEnabled() ;53 virtual void toggleGrammarChecking() ;54 virtual int spellCheckerDocumentTag() ;46 virtual bool shouldDeleteRange(WebCore::Range*) OVERRIDE; 47 virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) OVERRIDE; 48 virtual bool smartInsertDeleteEnabled() OVERRIDE; 49 virtual bool isSelectTrailingWhitespaceEnabled() OVERRIDE; 50 virtual bool isContinuousSpellCheckingEnabled() OVERRIDE; 51 virtual void toggleContinuousSpellChecking() OVERRIDE; 52 virtual bool isGrammarCheckingEnabled() OVERRIDE; 53 virtual void toggleGrammarChecking() OVERRIDE; 54 virtual int spellCheckerDocumentTag() OVERRIDE; 55 55 56 virtual bool isEditable(); 56 virtual bool shouldBeginEditing(WebCore::Range*) OVERRIDE; 57 virtual bool shouldEndEditing(WebCore::Range*) OVERRIDE; 58 virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE; 59 virtual bool shouldInsertText(const String&, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE; 60 virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE; 61 62 virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*) OVERRIDE; 63 virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*) OVERRIDE; 57 64 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 String&, WebCore::Range*, WebCore::EditorInsertAction); 62 virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting); 65 virtual void didBeginEditing() OVERRIDE; 66 virtual void respondToChangedContents() OVERRIDE; 67 virtual void respondToChangedSelection() OVERRIDE; 68 virtual void didEndEditing() OVERRIDE; 69 virtual void didWriteSelectionToPasteboard() OVERRIDE; 70 virtual void didSetSelectionTypesForPasteboard() OVERRIDE; 63 71 64 virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*); 65 virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*); 72 virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>) OVERRIDE; 73 virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>) OVERRIDE; 74 virtual void clearUndoRedoOperations() OVERRIDE; 66 75 67 virtual void didBeginEditing(); 68 virtual void respondToChangedContents(); 69 virtual void respondToChangedSelection(); 70 virtual void didEndEditing(); 71 virtual void didWriteSelectionToPasteboard(); 72 virtual void didSetSelectionTypesForPasteboard(); 76 virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const OVERRIDE; 77 virtual bool canPaste(WebCore::Frame*, bool defaultValue) const OVERRIDE; 78 virtual bool canUndo() const OVERRIDE; 79 virtual bool canRedo() const OVERRIDE; 73 80 74 virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>); 75 virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>); 76 virtual void clearUndoRedoOperations(); 81 virtual void undo() OVERRIDE; 82 virtual void redo() OVERRIDE; 77 83 78 virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const; 79 virtual bool canPaste(WebCore::Frame*, bool defaultValue) const; 80 virtual bool canUndo() const; 81 virtual bool canRedo() const; 84 virtual void handleKeyboardEvent(WebCore::KeyboardEvent*) OVERRIDE; 85 virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*) OVERRIDE; 82 86 83 virtual void undo(); 84 virtual void redo(); 85 86 virtual void handleKeyboardEvent(WebCore::KeyboardEvent*); 87 virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*); 88 89 virtual void textFieldDidBeginEditing(WebCore::Element*); 90 virtual void textFieldDidEndEditing(WebCore::Element*); 91 virtual void textDidChangeInTextField(WebCore::Element*); 92 virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*); 93 virtual void textWillBeDeletedInTextField(WebCore::Element*); 94 virtual void textDidChangeInTextArea(WebCore::Element*); 87 virtual void textFieldDidBeginEditing(WebCore::Element*) OVERRIDE; 88 virtual void textFieldDidEndEditing(WebCore::Element*) OVERRIDE; 89 virtual void textDidChangeInTextField(WebCore::Element*) OVERRIDE; 90 virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) OVERRIDE; 91 virtual void textWillBeDeletedInTextField(WebCore::Element*) OVERRIDE; 92 virtual void textDidChangeInTextArea(WebCore::Element*) OVERRIDE; 95 93 96 94 #if PLATFORM(MAC) 97 virtual NSString *userVisibleString(NSURL *) ;98 virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) ;99 virtual void setInsertionPasteboard(NSPasteboard *) ;100 virtual NSURL* canonicalizeURL(NSURL*) ;101 virtual NSURL* canonicalizeURLString(NSString*) ;95 virtual NSString *userVisibleString(NSURL *) OVERRIDE; 96 virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) OVERRIDE; 97 virtual void setInsertionPasteboard(NSPasteboard *) OVERRIDE; 98 virtual NSURL* canonicalizeURL(NSURL*) OVERRIDE; 99 virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE; 102 100 #endif 103 101 104 102 #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) 105 virtual void uppercaseWord() ;106 virtual void lowercaseWord() ;107 virtual void capitalizeWord() ;108 virtual void showSubstitutionsPanel(bool show) ;109 virtual bool substitutionsPanelIsShowing() ;110 virtual void toggleSmartInsertDelete() ;111 virtual bool isAutomaticQuoteSubstitutionEnabled() ;112 virtual void toggleAutomaticQuoteSubstitution() ;113 virtual bool isAutomaticLinkDetectionEnabled() ;114 virtual void toggleAutomaticLinkDetection() ;115 virtual bool isAutomaticDashSubstitutionEnabled() ;116 virtual void toggleAutomaticDashSubstitution() ;117 virtual bool isAutomaticTextReplacementEnabled() ;118 virtual void toggleAutomaticTextReplacement() ;119 virtual bool isAutomaticSpellingCorrectionEnabled() ;120 virtual void toggleAutomaticSpellingCorrection() ;103 virtual void uppercaseWord() OVERRIDE; 104 virtual void lowercaseWord() OVERRIDE; 105 virtual void capitalizeWord() OVERRIDE; 106 virtual void showSubstitutionsPanel(bool show) OVERRIDE; 107 virtual bool substitutionsPanelIsShowing() OVERRIDE; 108 virtual void toggleSmartInsertDelete() OVERRIDE; 109 virtual bool isAutomaticQuoteSubstitutionEnabled() OVERRIDE; 110 virtual void toggleAutomaticQuoteSubstitution() OVERRIDE; 111 virtual bool isAutomaticLinkDetectionEnabled() OVERRIDE; 112 virtual void toggleAutomaticLinkDetection() OVERRIDE; 113 virtual bool isAutomaticDashSubstitutionEnabled() OVERRIDE; 114 virtual void toggleAutomaticDashSubstitution() OVERRIDE; 115 virtual bool isAutomaticTextReplacementEnabled() OVERRIDE; 116 virtual void toggleAutomaticTextReplacement() OVERRIDE; 117 virtual bool isAutomaticSpellingCorrectionEnabled() OVERRIDE; 118 virtual void toggleAutomaticSpellingCorrection() OVERRIDE; 121 119 #endif 122 120 123 121 #if PLATFORM(GTK) 124 bool executePendingEditorCommands(WebCore::Frame*, Vector<WTF::String>, bool) ;125 void getEditorCommandsForKeyEvent(const WebCore::KeyboardEvent*, Vector<WTF::String>&) ;122 bool executePendingEditorCommands(WebCore::Frame*, Vector<WTF::String>, bool) OVERRIDE; 123 void getEditorCommandsForKeyEvent(const WebCore::KeyboardEvent*, Vector<WTF::String>&) OVERRIDE; 126 124 #endif 127 125 128 TextCheckerClient* textChecker() { return this; }126 TextCheckerClient* textChecker() OVERRIDE { return this; } 129 127 130 virtual void ignoreWordInSpellDocument(const String&) ;131 virtual void learnWord(const String&) ;132 virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) ;133 virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) ;134 virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) ;128 virtual void ignoreWordInSpellDocument(const String&) OVERRIDE; 129 virtual void learnWord(const String&) OVERRIDE; 130 virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE; 131 virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) OVERRIDE; 132 virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE; 135 133 #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) 136 virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results) ;134 virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results) OVERRIDE; 137 135 #endif 138 virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail& detail);139 virtual void updateSpellingUIWithMisspelledWord(const String&) ;140 virtual void showSpellingUI(bool show) ;141 virtual bool spellingUIIsShowing() ;142 virtual void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) ;143 virtual void willSetInputMethodState() ;144 virtual void setInputMethodState(bool enabled) ;145 virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) ;136 virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail&) OVERRIDE; 137 virtual void updateSpellingUIWithMisspelledWord(const String&) OVERRIDE; 138 virtual void showSpellingUI(bool show) OVERRIDE; 139 virtual bool spellingUIIsShowing() OVERRIDE; 140 virtual void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) OVERRIDE; 141 virtual void willSetInputMethodState() OVERRIDE; 142 virtual void setInputMethodState(bool enabled) OVERRIDE; 143 virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) OVERRIDE; 146 144 #if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) 147 virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) ;148 virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel) ;149 virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel) ;150 virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) ;145 virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE; 146 virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE; 147 virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel) OVERRIDE; 148 virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE; 151 149 #endif 152 150 WebPage* m_page; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r95387 r95834 259 259 } 260 260 261 void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const String&)262 {263 notImplemented();264 }265 266 261 void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() 267 262 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
r95387 r95834 44 44 45 45 private: 46 virtual void frameLoaderDestroyed() ;47 48 virtual bool hasHTMLView() const ;49 virtual bool hasWebView() const ;50 51 virtual void makeRepresentation(WebCore::DocumentLoader*) ;52 virtual void forceLayout() ;53 virtual void forceLayoutForNonHTML() ;54 55 virtual void setCopiesOnScroll() ;56 57 virtual void detachedFromParent2() ;58 virtual void detachedFromParent3() ;59 60 virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) ;61 62 virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) ;63 virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) ;64 virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) ;65 virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) ;46 virtual void frameLoaderDestroyed() OVERRIDE; 47 48 virtual bool hasHTMLView() const OVERRIDE; 49 virtual bool hasWebView() const OVERRIDE; 50 51 virtual void makeRepresentation(WebCore::DocumentLoader*) OVERRIDE; 52 virtual void forceLayout() OVERRIDE; 53 virtual void forceLayoutForNonHTML() OVERRIDE; 54 55 virtual void setCopiesOnScroll() OVERRIDE; 56 57 virtual void detachedFromParent2() OVERRIDE; 58 virtual void detachedFromParent3() OVERRIDE; 59 60 virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) OVERRIDE; 61 62 virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE; 63 virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE; 64 virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE; 65 virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) OVERRIDE; 66 66 #if USE(PROTECTION_SPACE_AUTH_CALLBACK) 67 virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&); 68 #endif 69 virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&); 70 virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength); 71 virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier); 72 virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&); 73 virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length); 74 virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const WTF::String&); 75 76 virtual void dispatchDidHandleOnloadEvents(); 77 virtual void dispatchDidReceiveServerRedirectForProvisionalLoad(); 78 virtual void dispatchDidCancelClientRedirect(); 79 virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate); 80 virtual void dispatchDidChangeLocationWithinPage(); 81 virtual void dispatchDidPushStateWithinPage(); 82 virtual void dispatchDidReplaceStateWithinPage(); 83 virtual void dispatchDidPopStateWithinPage(); 84 virtual void dispatchWillClose(); 85 virtual void dispatchDidReceiveIcon(); 86 virtual void dispatchDidStartProvisionalLoad(); 87 virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&); 88 virtual void dispatchDidChangeIcons(WebCore::IconType); 89 virtual void dispatchDidCommitLoad(); 90 virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&); 91 virtual void dispatchDidFailLoad(const WebCore::ResourceError&); 92 virtual void dispatchDidFinishDocumentLoad(); 93 virtual void dispatchDidFinishLoad(); 94 95 virtual void dispatchDidFirstLayout(); 96 virtual void dispatchDidFirstVisuallyNonEmptyLayout(); 97 virtual void dispatchDidLayout(); 98 99 virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&); 100 virtual void dispatchShow(); 101 102 virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&); 103 virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const String& frameName); 104 virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>); 105 virtual void cancelPolicyCheck(); 106 107 virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&); 108 109 virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) { } 110 virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>); 111 112 virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*); 113 virtual void revertToProvisionalState(WebCore::DocumentLoader*); 114 virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&); 67 virtual bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) OVERRIDE; 68 #endif 69 virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) OVERRIDE; 70 virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) OVERRIDE; 71 virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE; 72 virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) OVERRIDE; 73 virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) OVERRIDE; 74 75 virtual void dispatchDidHandleOnloadEvents() OVERRIDE; 76 virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE; 77 virtual void dispatchDidCancelClientRedirect() OVERRIDE; 78 virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double interval, double fireDate) OVERRIDE; 79 virtual void dispatchDidChangeLocationWithinPage() OVERRIDE; 80 virtual void dispatchDidPushStateWithinPage() OVERRIDE; 81 virtual void dispatchDidReplaceStateWithinPage() OVERRIDE; 82 virtual void dispatchDidPopStateWithinPage() OVERRIDE; 83 virtual void dispatchWillClose() OVERRIDE; 84 virtual void dispatchDidReceiveIcon() OVERRIDE; 85 virtual void dispatchDidStartProvisionalLoad() OVERRIDE; 86 virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) OVERRIDE; 87 virtual void dispatchDidChangeIcons(WebCore::IconType) OVERRIDE; 88 virtual void dispatchDidCommitLoad() OVERRIDE; 89 virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) OVERRIDE; 90 virtual void dispatchDidFailLoad(const WebCore::ResourceError&) OVERRIDE; 91 virtual void dispatchDidFinishDocumentLoad() OVERRIDE; 92 virtual void dispatchDidFinishLoad() OVERRIDE; 93 94 virtual void dispatchDidFirstLayout() OVERRIDE; 95 virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE; 96 virtual void dispatchDidLayout() OVERRIDE; 97 98 virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) OVERRIDE; 99 virtual void dispatchShow() OVERRIDE; 100 101 virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&) OVERRIDE; 102 virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const String& frameName) OVERRIDE; 103 virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>) OVERRIDE; 104 virtual void cancelPolicyCheck() OVERRIDE; 105 106 virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) OVERRIDE; 107 108 virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) OVERRIDE { } 109 virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>) OVERRIDE; 110 111 virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*) OVERRIDE; 112 virtual void revertToProvisionalState(WebCore::DocumentLoader*) OVERRIDE; 113 virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) OVERRIDE; 115 114 116 115 // Maybe these should go into a ProgressTrackerClient some day 117 virtual void willChangeEstimatedProgress() ;118 virtual void didChangeEstimatedProgress() ;119 virtual void postProgressStartedNotification() ;120 virtual void postProgressEstimateChangedNotification() ;121 virtual void postProgressFinishedNotification() ;122 123 virtual void setMainFrameDocumentReady(bool) ;124 125 virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) ;126 127 virtual void willChangeTitle(WebCore::DocumentLoader*) ;128 virtual void didChangeTitle(WebCore::DocumentLoader*) ;129 130 virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) ;131 virtual void finishedLoading(WebCore::DocumentLoader*) ;132 133 virtual void updateGlobalHistory() ;134 virtual void updateGlobalHistoryRedirectLinks() ;135 136 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const ;137 virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const ;138 139 virtual void didDisplayInsecureContent() ;140 virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&) ;141 142 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) ;143 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) ;144 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) ;145 virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) ;146 147 virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) ;148 virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) ;149 virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) ;150 151 virtual bool shouldFallBack(const WebCore::ResourceError&) ;152 153 virtual bool canHandleRequest(const WebCore::ResourceRequest&) const ;154 virtual bool canShowMIMEType(const String& MIMEType) const ;155 virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const ;156 virtual bool representationExistsForURLScheme(const String& URLScheme) const ;157 virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const ;158 159 virtual void frameLoadCompleted() ;160 virtual void saveViewStateToItem(WebCore::HistoryItem*) ;161 virtual void restoreViewState() ;162 virtual void provisionalLoadStarted() ;163 virtual void didFinishLoad() ;164 virtual void prepareForDataSourceReplacement() ;116 virtual void willChangeEstimatedProgress() OVERRIDE; 117 virtual void didChangeEstimatedProgress() OVERRIDE; 118 virtual void postProgressStartedNotification() OVERRIDE; 119 virtual void postProgressEstimateChangedNotification() OVERRIDE; 120 virtual void postProgressFinishedNotification() OVERRIDE; 121 122 virtual void setMainFrameDocumentReady(bool) OVERRIDE; 123 124 virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) OVERRIDE; 125 126 virtual void willChangeTitle(WebCore::DocumentLoader*) OVERRIDE; 127 virtual void didChangeTitle(WebCore::DocumentLoader*) OVERRIDE; 128 129 virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) OVERRIDE; 130 virtual void finishedLoading(WebCore::DocumentLoader*) OVERRIDE; 131 132 virtual void updateGlobalHistory() OVERRIDE; 133 virtual void updateGlobalHistoryRedirectLinks() OVERRIDE; 134 135 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const OVERRIDE; 136 virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const OVERRIDE; 137 138 virtual void didDisplayInsecureContent() OVERRIDE; 139 virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE; 140 141 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) OVERRIDE; 142 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) OVERRIDE; 143 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) OVERRIDE; 144 virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) OVERRIDE; 145 146 virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) OVERRIDE; 147 virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) OVERRIDE; 148 virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) OVERRIDE; 149 150 virtual bool shouldFallBack(const WebCore::ResourceError&) OVERRIDE; 151 152 virtual bool canHandleRequest(const WebCore::ResourceRequest&) const OVERRIDE; 153 virtual bool canShowMIMEType(const String& MIMEType) const OVERRIDE; 154 virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const OVERRIDE; 155 virtual bool representationExistsForURLScheme(const String& URLScheme) const OVERRIDE; 156 virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const OVERRIDE; 157 158 virtual void frameLoadCompleted() OVERRIDE; 159 virtual void saveViewStateToItem(WebCore::HistoryItem*) OVERRIDE; 160 virtual void restoreViewState() OVERRIDE; 161 virtual void provisionalLoadStarted() OVERRIDE; 162 virtual void didFinishLoad() OVERRIDE; 163 virtual void prepareForDataSourceReplacement() OVERRIDE; 165 164 166 165 virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&); 167 virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&) ;168 169 virtual String userAgent(const WebCore::KURL&) ;170 171 virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) ;172 virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) ;173 virtual void transitionToCommittedForNewPage() ;174 175 virtual void didSaveToPageCache() ;176 virtual void didRestoreFromPageCache() ;177 178 virtual void dispatchDidBecomeFrameset(bool) ;179 180 virtual bool canCachePage() const ;181 virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) ;166 virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&) OVERRIDE; 167 168 virtual String userAgent(const WebCore::KURL&) OVERRIDE; 169 170 virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) OVERRIDE; 171 virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) OVERRIDE; 172 virtual void transitionToCommittedForNewPage() OVERRIDE; 173 174 virtual void didSaveToPageCache() OVERRIDE; 175 virtual void didRestoreFromPageCache() OVERRIDE; 176 177 virtual void dispatchDidBecomeFrameset(bool) OVERRIDE; 178 179 virtual bool canCachePage() const OVERRIDE; 180 virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) OVERRIDE; 182 181 183 182 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const String& name, WebCore::HTMLFrameOwnerElement* ownerElement, 184 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) ;185 virtual void didTransferChildFrameToNewDocument(WebCore::Page*) ;186 virtual void transferLoadingResourceFromPage(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, WebCore::Page*) ;187 188 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) ;189 virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget) ;190 191 virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) ;192 193 virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const String& mimeType, bool shouldPreferPlugInsForImages) ;194 virtual String overrideMediaType() const ;195 196 virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*) ;197 198 virtual void documentElementAvailable() ;199 virtual void didPerformFirstNavigation() const ; // "Navigation" here means a transition from one page to another that ends up in the back/forward list.200 201 virtual void registerForIconNotification(bool listen = true) ;183 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) OVERRIDE; 184 virtual void didTransferChildFrameToNewDocument(WebCore::Page*) OVERRIDE; 185 virtual void transferLoadingResourceFromPage(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, WebCore::Page*) OVERRIDE; 186 187 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) OVERRIDE; 188 virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget) OVERRIDE; 189 190 virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) OVERRIDE; 191 192 virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE; 193 virtual String overrideMediaType() const OVERRIDE; 194 195 virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*) OVERRIDE; 196 197 virtual void documentElementAvailable() OVERRIDE; 198 virtual void didPerformFirstNavigation() const OVERRIDE; // "Navigation" here means a transition from one page to another that ends up in the back/forward list. 199 200 virtual void registerForIconNotification(bool listen = true) OVERRIDE; 202 201 203 202 #if PLATFORM(MAC) 204 virtual RemoteAXObjectRef accessibilityRemoteObject() ;203 virtual RemoteAXObjectRef accessibilityRemoteObject() OVERRIDE; 205 204 206 205 #if ENABLE(MAC_JAVA_BRIDGE) 207 virtual jobject javaApplet(NSView*) ;208 #endif 209 virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const ;206 virtual jobject javaApplet(NSView*) OVERRIDE; 207 #endif 208 virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const OVERRIDE; 210 209 #endif 211 210 #if PLATFORM(WIN) && USE(CFNETWORK) 212 211 // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>. 213 virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) ;214 #endif 215 216 virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const ;217 218 virtual void didChangeScrollOffset() ;219 220 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() ;212 virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) OVERRIDE; 213 #endif 214 215 virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const OVERRIDE; 216 217 virtual void didChangeScrollOffset() OVERRIDE; 218 219 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() OVERRIDE; 221 220 222 221 WebFrame* m_frame; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGeolocationClient.h
r75508 r95834 45 45 46 46 private: 47 virtual void geolocationDestroyed() ;47 virtual void geolocationDestroyed() OVERRIDE; 48 48 49 virtual void startUpdating() ;50 virtual void stopUpdating() ;51 virtual void setEnableHighAccuracy(bool) ;49 virtual void startUpdating() OVERRIDE; 50 virtual void stopUpdating() OVERRIDE; 51 virtual void setEnableHighAccuracy(bool) OVERRIDE; 52 52 53 virtual WebCore::GeolocationPosition* lastPosition() ;53 virtual WebCore::GeolocationPosition* lastPosition() OVERRIDE; 54 54 55 virtual void requestPermission(WebCore::Geolocation*) ;56 virtual void cancelPermissionRequest(WebCore::Geolocation*) ;55 virtual void requestPermission(WebCore::Geolocation*) OVERRIDE; 56 virtual void cancelPermissionRequest(WebCore::Geolocation*) OVERRIDE; 57 57 58 58 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h
r92265 r95834 51 51 52 52 private: 53 virtual void inspectorDestroyed() ;53 virtual void inspectorDestroyed() OVERRIDE; 54 54 55 virtual void openInspectorFrontend(WebCore::InspectorController*) ;55 virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE; 56 56 57 virtual void highlight() ;58 virtual void hideHighlight() ;57 virtual void highlight() OVERRIDE; 58 virtual void hideHighlight() OVERRIDE; 59 59 60 virtual bool sendMessageToFrontend(const String&) ;60 virtual bool sendMessageToFrontend(const String&) OVERRIDE; 61 61 62 62 // PageOverlay::Client 63 virtual void pageOverlayDestroyed(PageOverlay*) ;64 virtual void willMoveToWebPage(PageOverlay*, WebPage*) ;65 virtual void didMoveToWebPage(PageOverlay*, WebPage*) ;66 virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect&) ;67 virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&) ;63 virtual void pageOverlayDestroyed(PageOverlay*) OVERRIDE; 64 virtual void willMoveToWebPage(PageOverlay*, WebPage*) OVERRIDE; 65 virtual void didMoveToWebPage(PageOverlay*, WebPage*) OVERRIDE; 66 virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect&) OVERRIDE; 67 virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&) OVERRIDE; 68 68 69 69 WebPage* m_page; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
r73324 r95834 40 40 41 41 private: 42 virtual void frontendLoaded() ;42 virtual void frontendLoaded() OVERRIDE; 43 43 44 virtual String localizedStringsURL() ;45 virtual String hiddenPanels() ;44 virtual String localizedStringsURL() OVERRIDE; 45 virtual String hiddenPanels() OVERRIDE; 46 46 47 virtual void bringToFront() ;48 virtual void closeWindow() ;49 virtual void disconnectFromBackend() ;47 virtual void bringToFront() OVERRIDE; 48 virtual void closeWindow() OVERRIDE; 49 virtual void disconnectFromBackend() OVERRIDE; 50 50 51 virtual void attachWindow() ;52 virtual void detachWindow() ;53 virtual void setAttachedWindowHeight(unsigned) ;51 virtual void attachWindow() OVERRIDE; 52 virtual void detachWindow() OVERRIDE; 53 virtual void setAttachedWindowHeight(unsigned) OVERRIDE; 54 54 55 virtual void inspectedURLChanged(const String&) ;55 virtual void inspectedURLChanged(const String&) OVERRIDE; 56 56 57 57 WebPage* m_page; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
r95604 r95834 44 44 45 45 // WebCore::PlatformStrategies 46 virtual WebCore::CookiesStrategy* createCookiesStrategy() ;47 virtual WebCore::PluginStrategy* createPluginStrategy() ;48 virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() ;46 virtual WebCore::CookiesStrategy* createCookiesStrategy() OVERRIDE; 47 virtual WebCore::PluginStrategy* createPluginStrategy() OVERRIDE; 48 virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() OVERRIDE; 49 49 50 50 // WebCore::CookiesStrategy 51 virtual void notifyCookiesChanged() ;51 virtual void notifyCookiesChanged() OVERRIDE; 52 52 53 53 // WebCore::PluginStrategy 54 virtual void refreshPlugins() ;55 virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) ;54 virtual void refreshPlugins() OVERRIDE; 55 virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) OVERRIDE; 56 56 void populatePluginCache(); 57 57 58 58 // WebCore::VisitedLinkStrategy 59 virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL) ;60 virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) ;59 virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL) OVERRIDE; 60 virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) OVERRIDE; 61 61 62 62 bool m_pluginCacheIsPopulated; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
r84011 r95834 50 50 void setTextForIndex(int newIndex); 51 51 52 virtual void show(const WebCore::IntRect&, WebCore::FrameView*, int index) ;53 virtual void hide() ;54 virtual void updateFromElement() ;55 virtual void disconnectClient() ;52 virtual void show(const WebCore::IntRect&, WebCore::FrameView*, int index) OVERRIDE; 53 virtual void hide() OVERRIDE; 54 virtual void updateFromElement() OVERRIDE; 55 virtual void disconnectClient() OVERRIDE; 56 56 57 57 private: -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h
r69899 r95834 31 31 static PassRefPtr<WebSearchPopupMenu> create(WebPage*, WebCore::PopupMenuClient*); 32 32 33 virtual WebCore::PopupMenu* popupMenu() ;34 virtual void saveRecentSearches(const WTF::AtomicString& name, const Vector<String>& searchItems) ;35 virtual void loadRecentSearches(const WTF::AtomicString& name, Vector<String>& searchItems) ;36 virtual bool enabled() ;33 virtual WebCore::PopupMenu* popupMenu() OVERRIDE; 34 virtual void saveRecentSearches(const WTF::AtomicString& name, const Vector<String>& searchItems) OVERRIDE; 35 virtual void loadRecentSearches(const WTF::AtomicString& name, Vector<String>& searchItems) OVERRIDE; 36 virtual bool enabled() OVERRIDE; 37 37 38 38 private: -
trunk/Source/WebKit2/win/WebKit2Common.vsprops
r81980 r95834 11 11 UsePrecompiledHeader="2" 12 12 PrecompiledHeaderThrough="WebKit2Prefix.h" 13 DisableSpecificWarnings="4 819"13 DisableSpecificWarnings="4481;4819" 14 14 ForcedIncludeFiles="WebKit2Prefix.h;ICUVersion.h" 15 15 />
Note: See TracChangeset
for help on using the changeset viewer.