diff options
Diffstat (limited to 'WebKit/wince/WebCoreSupport')
7 files changed, 34 insertions, 11 deletions
diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp index e19d6ad..659d246 100644 --- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp @@ -305,7 +305,7 @@ void ChromeClientWinCE::print(Frame*) #if ENABLE(DATABASE) void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&) { - notImplemented() + notImplemented(); } #endif @@ -314,6 +314,11 @@ void ChromeClientWinCE::reachedMaxAppCacheSize(int64_t) { notImplemented(); } + +void ChromeClientWinCE::reachedApplicationCacheOriginQuota(SecurityOrigin*) +{ + notImplemented(); +} #endif #if ENABLE(TOUCH_EVENTS) diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h index 3069472..4e7fb28 100644 --- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h +++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h @@ -114,7 +114,7 @@ public: virtual void print(WebCore::Frame*); #if ENABLE(DATABASE) - virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName) = 0; + virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName); #endif #if ENABLE(OFFLINE_WEB_APPLICATIONS) @@ -123,7 +123,14 @@ public: // size or past the amount of free space on the device. // The chrome client would need to take some action such as evicting some // old caches. - virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) = 0; + virtual void reachedMaxAppCacheSize(int64_t spaceNeeded); + + // Callback invoked when the application cache origin quota is reached. This + // means that the resources attempting to be cached via the manifest are + // more than allowed on this origin. This callback allows the chrome client + // to take action, such as prompting the user to ask to increase the quota + // for this origin. + virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*); #endif #if ENABLE(CONTEXT_MENUS) @@ -131,7 +138,7 @@ public: #endif #if ENABLE(NOTIFICATIONS) - virtual WebCore::NotificationPresenter* notificationPresenter() const = 0; + virtual WebCore::NotificationPresenter* notificationPresenter() const; #endif // This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission diff --git a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp index 7358f2a..dda4d27 100644 --- a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp @@ -42,9 +42,9 @@ void ContextMenuClientWinCE::contextMenuDestroyed() delete this; } -PlatformMenuDescription ContextMenuClientWinCE::getCustomMenuFromDefaultItems(ContextMenu* menu) +PassOwnPtr<ContextMenu> ContextMenuClientWinCE::customizeMenu(PassOwnPtr<ContextMenu> menu) { - return menu->releasePlatformDescription(); + return menu; } void ContextMenuClientWinCE::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) diff --git a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h index 13d91d1..8cd1951 100644 --- a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h +++ b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h @@ -37,7 +37,7 @@ public: virtual void contextMenuDestroyed(); - virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*); + virtual PassOwnPtr<WebCore::ContextMenu> customizeMenu(PassOwnPtr<WebCore::ContextMenu>); virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*); virtual void downloadURL(const WebCore::KURL&); diff --git a/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp b/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp index c4555ed..77cc720 100644 --- a/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp @@ -353,25 +353,25 @@ bool EditorClientWinCE::handleEditingKeyboardEvent(KeyboardEvent* event) switch (keyEvent->windowsVirtualKeyCode()) { case VK_LEFT: frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove, - SelectionController::DirectionLeft, + DirectionLeft, keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, true); return true; case VK_RIGHT: frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove, - SelectionController::DirectionRight, + DirectionRight, keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, true); return true; case VK_UP: frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove, - SelectionController::DirectionBackward, + DirectionBackward, keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, true); return true; case VK_DOWN: frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove, - SelectionController::DirectionForward, + DirectionForward, keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, true); return true; diff --git a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp index f3643b2..6a8fb74 100644 --- a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp @@ -630,6 +630,14 @@ void FrameLoaderClientWinCE::transitionToCommittedForNewPage() m_frame->ownerRenderer()->setWidget(frameView); } +void FrameLoaderClientWinCE::didSaveToPageCache() +{ +} + +void FrameLoaderClientWinCE::didRestoreFromPageCache() +{ +} + void FrameLoaderClientWinCE::dispatchDidBecomeFrameset(bool) { } diff --git a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h index 46b3a19..c4dcf6d 100644 --- a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h +++ b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h @@ -175,6 +175,9 @@ public: virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedForNewPage(); + virtual void didSaveToPageCache(); + virtual void didRestoreFromPageCache(); + virtual void dispatchDidBecomeFrameset(bool); virtual bool canCachePage() const; |