diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/wince | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/wince')
9 files changed, 163 insertions, 17 deletions
diff --git a/Source/WebKit/wince/ChangeLog b/Source/WebKit/wince/ChangeLog index 77d6ef3..724b92a 100644 --- a/Source/WebKit/wince/ChangeLog +++ b/Source/WebKit/wince/ChangeLog @@ -1,3 +1,119 @@ +2011-03-07 Sam Weinig <sam@webkit.org> + + Reviewed by Anders Carlsson. + + Replace WebKit2's decidePolicyForMIMEType with decidePolicyForResponse + https://bugs.webkit.org/show_bug.cgi?id=55827 + + Renamed FrameLoaderClient::dispatchDecidePolicyForMIMEType to dispatchDecidePolicyForResponse + and pass the entire response, instead of just the MIMEType. + + * WebCoreSupport/FrameLoaderClientWinCE.cpp: + (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse): + * WebCoreSupport/FrameLoaderClientWinCE.h: + +2011-03-03 Alexey Proskuryakov <ap@apple.com> + + Removing an include of WebCoreKeyboardUIMode.h that Ive just added. It's already included + via ChromeClient.h + + * WebCoreSupport/ChromeClientWinCE.h: + +2011-03-02 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Darin Adler. + + REGRESSION (WebKit2): Tab keys no longer observe Full Keyboard Access + https://bugs.webkit.org/show_bug.cgi?id=55633 + <rdar://problem/8963023> + + * WebCoreSupport/ChromeClientWinCE.cpp: (WebKit::ChromeClientWinCE::keyboardUIMode): + * WebCoreSupport/ChromeClientWinCE.h: + Implement keyboardUIMode() instead of tabsToLinks(). No change in functionality, since + this platform doesn't observe or have full keyboard access state. + +2011-03-02 Brian Weinstein <bweinstein@apple.com> + + WinCE build fix. + + * WebCoreSupport/PlatformStrategiesWinCE.h: Add a needed include. + +2011-03-02 Brian Weinstein <bweinstein@apple.com> + + WinCE build fix. Have PlatformStrategiesWinCE inherit from CookiesStrategy, + and implement the needed methods. + + * WebCoreSupport/PlatformStrategiesWinCE.cpp: + (PlatformStrategiesWinCE::createCookiesStrategy): + (PlatformStrategiesWinCE::notifyCookiesChanged): + * WebCoreSupport/PlatformStrategiesWinCE.h: + +2011-02-28 Chang Shu <cshu@webkit.org> + + Reviewed by Ryosuke Niwa. + + Remove the support of Frame::isContentEditable and its dependencies. + https://bugs.webkit.org/show_bug.cgi?id=54292 + + Remove the WebKit side implementation. + + * WebCoreSupport/EditorClientWinCE.cpp: + * WebCoreSupport/EditorClientWinCE.h: + +2011-02-19 Charlie Reis <creis@chromium.org> + + Reviewed by Mihai Parparita. + + Ensure loading has stopped in HistoryController::goToItem + https://bugs.webkit.org/show_bug.cgi?id=54517 + + Add a FrameLoaderClient callback for whether to stop loading before goToItem. + + Test: http/tests/navigation/forward-to-fragment-fires-onload.html + + * WebCoreSupport/FrameLoaderClientWinCE.cpp: + (WebKit::FrameLoaderClientWinCE::shouldStopLoadingForHistoryItem): Added. + * WebCoreSupport/FrameLoaderClientWinCE.h: + +2011-02-10 Luiz Agostini <luiz.agostini@openbossa.org> + + Reviewed by Adam Roben. + + HTML5 <details> and <summary>: localized text + https://bugs.webkit.org/show_bug.cgi?id=54260 + + The method defaultDetailsSummaryText was added to LocalizationStrategy class. It is used to + provide the default label to be used by a <details> tag that has no <summary> child. + + * WebCoreSupport/PlatformStrategiesWinCE.cpp: + (PlatformStrategiesWinCE::defaultDetailsSummaryText): + * WebCoreSupport/PlatformStrategiesWinCE.h: + +2011-01-26 MORITA Hajime <morrita@google.com> + + Reviewed by Ryosuke Niwa. + + Refactoring: Extract TextCheckerClient from EditorClient + https://bugs.webkit.org/show_bug.cgi?id=53213 + + * WebCoreSupport/EditorClientWinCE.h: + (WebKit::EditorClientWinCE::textChecker): + +2011-02-07 Ryosuke Niwa <rniwa@webkit.org> + + Reviewed by Adam Barth. + + Add EditorClient callbacks to override isDOMPasteAllowed and javaScriptCanAccessClipboard + https://bugs.webkit.org/show_bug.cgi?id=52417 + + Added two callback functions, canCopyCut and canPaste to EditorClient. They are currently + not implemented. + + * WebCoreSupport/EditorClientWinCE.cpp: + (WebKit::EditorClientWinCE::canCopyCut): Added. + (WebKit::EditorClientWinCE::canPaste): Added. + * WebCoreSupport/EditorClientWinCE.h: + 2011-02-10 Nate Chapin <japhet@chromium.org> Reviewed by Adam Barth. diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp index 3430c66..4424c01 100644 --- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp +++ b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp @@ -219,9 +219,9 @@ bool ChromeClientWinCE::shouldInterruptJavaScript() return false; } -bool ChromeClientWinCE::tabsToLinks() const +KeyboardUIMode ChromeClientWinCE::keyboardUIMode() { - return true; + return KeyboardAccessTabsToLinks; } IntRect ChromeClientWinCE::windowResizerRect() const diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h index 781989d..06307ad 100644 --- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h +++ b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h @@ -89,7 +89,7 @@ public: virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result); virtual void setStatusbarText(const WTF::String&); virtual bool shouldInterruptJavaScript(); - virtual bool tabsToLinks() const; + virtual WebCore::KeyboardUIMode keyboardUIMode(); virtual WebCore::IntRect windowResizerRect() const; diff --git a/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp index 77cc720..0811c50 100644 --- a/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp +++ b/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp @@ -144,12 +144,6 @@ void EditorClientWinCE::didSetSelectionTypesForPasteboard() notImplemented(); } -bool EditorClientWinCE::isEditable() -{ - notImplemented(); - return false; -} - void EditorClientWinCE::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand> command) { notImplemented(); @@ -165,6 +159,16 @@ void EditorClientWinCE::clearUndoRedoOperations() notImplemented(); } +bool EditorClientWinCE::canCopyCut(bool defaultValue) const +{ + return defaultValue; +} + +bool EditorClientWinCE::canPaste(bool defaultValue) const +{ + return defaultValue; +} + bool EditorClientWinCE::canUndo() const { notImplemented(); diff --git a/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h index 8db8c16..d93ecc5 100644 --- a/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h +++ b/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h @@ -26,12 +26,13 @@ #define EditorClientWinCE_h #include "EditorClient.h" +#include "TextCheckerClient.h" class WebView; namespace WebKit { -class EditorClientWinCE : public WebCore::EditorClient { +class EditorClientWinCE : public WebCore::EditorClient, public WebCore::TextCheckerClient { public: EditorClientWinCE(WebView*); ~EditorClientWinCE(); @@ -48,8 +49,6 @@ public: virtual void toggleGrammarChecking(); virtual int spellCheckerDocumentTag(); - virtual bool isEditable(); - virtual bool shouldBeginEditing(WebCore::Range*); virtual bool shouldEndEditing(WebCore::Range*); virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction); @@ -70,6 +69,8 @@ public: virtual void registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>); virtual void clearUndoRedoOperations(); + virtual bool canCopyCut(bool defaultValue) const; + virtual bool canPaste(bool defaultValue) const; virtual bool canUndo() const; virtual bool canRedo() const; @@ -101,6 +102,7 @@ public: virtual void willSetInputMethodState(); virtual void setInputMethodState(bool); virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {} + virtual WebCore::TextCheckerClient* textChecker() { return this; } private: WebView* m_webView; diff --git a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp index 7d8f614..3fbed2b 100644 --- a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp +++ b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp @@ -127,9 +127,9 @@ void FrameLoaderClientWinCE::dispatchDidReceiveResponse(DocumentLoader*, unsigne m_response = response; } -void FrameLoaderClientWinCE::dispatchDecidePolicyForMIMEType(FramePolicyFunction policyFunction, const String& mimeType, const WebCore::ResourceRequest&) +void FrameLoaderClientWinCE::dispatchDecidePolicyForResponse(FramePolicyFunction policyFunction, const WebCore::ResourceResponse& response, const WebCore::ResourceRequest&) { - if (canShowMIMEType(mimeType)) + if (canShowMIMEType(response.mimeType())) (m_frame->loader()->policyChecker()->*policyFunction)(PolicyUse); else (m_frame->loader()->policyChecker()->*policyFunction)(PolicyDownload); @@ -248,6 +248,11 @@ bool FrameLoaderClientWinCE::shouldGoToHistoryItem(HistoryItem* item) const return item; } +bool FrameLoaderClientWinCE::shouldStopLoadingForHistoryItem(HistoryItem* item) const +{ + return true; +} + void FrameLoaderClientWinCE::dispatchDidAddBackForwardItem(HistoryItem*) const { } diff --git a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h index ed49d89..ce3a620 100644 --- a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h +++ b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h @@ -88,7 +88,7 @@ public: virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&); virtual void dispatchShow(); - virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WTF::String& MIMEType, const WebCore::ResourceRequest&); + virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&); virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>, const WTF::String& frameName); virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>); virtual void cancelPolicyCheck(); @@ -135,6 +135,7 @@ public: virtual void updateGlobalHistory(); virtual void updateGlobalHistoryRedirectLinks(); virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const; + virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const; virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const; virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const; virtual void dispatchDidChangeBackForwardIndex() const; diff --git a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp index 557d899..fc447ab 100644 --- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp +++ b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp @@ -50,7 +50,10 @@ PlatformStrategiesWinCE::PlatformStrategiesWinCE() setPlatformStrategies(this); } -// PluginStrategy +CookiesStrategy* PlatformStrategiesWinCE::createCookiesStrategy() +{ + return this; +} PluginStrategy* PlatformStrategiesWinCE::createPluginStrategy() { @@ -67,6 +70,10 @@ VisitedLinkStrategy* PlatformStrategiesWinCE::createVisitedLinkStrategy() return this; } +void PlatformStrategiesWinCE::notifyCookiesChanged() +{ +} + void PlatformStrategiesWinCE::refreshPlugins() { PluginDatabase::installedPlugins()->refresh(); @@ -137,6 +144,11 @@ String PlatformStrategiesWinCE::fileButtonNoFileSelectedLabel() return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected"); } +String PlatformStrategiesWinCE::defaultDetailsSummaryText() +{ + return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child"); +} + String PlatformStrategiesWinCE::contextMenuItemTagOpenLinkInNewWindow() { return UI_STRING("Open Link in New Window", "Open in New Window context menu item"); diff --git a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h index 02d87d3..e5f87ea 100644 --- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h +++ b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h @@ -25,12 +25,13 @@ #ifndef PlatformStrategiesWinCE_h #define PlatformStrategiesWinCE_h +#include "CookiesStrategy.h" #include "LocalizationStrategy.h" #include "PlatformStrategies.h" #include "PluginStrategy.h" #include "VisitedLinkStrategy.h" -class PlatformStrategiesWinCE : public WebCore::PlatformStrategies, private WebCore::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy { +class PlatformStrategiesWinCE : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy { public: static void initialize(); @@ -38,9 +39,13 @@ private: PlatformStrategiesWinCE(); // WebCore::PlatformStrategies + virtual WebCore::CookiesStrategy* createCookiesStrategy(); virtual WebCore::PluginStrategy* createPluginStrategy(); virtual WebCore::LocalizationStrategy* createLocalizationStrategy(); virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy(); + + // WebCore::CookiesStrategy + virtual void notifyCookiesChanged(); // WebCore::PluginStrategy virtual void refreshPlugins(); @@ -53,6 +58,7 @@ private: virtual WTF::String submitButtonDefaultLabel(); virtual WTF::String fileButtonChooseFileLabel(); virtual WTF::String fileButtonNoFileSelectedLabel(); + virtual WTF::String defaultDetailsSummaryText(); #if ENABLE(CONTEXT_MENUS) virtual WTF::String contextMenuItemTagOpenLinkInNewWindow(); virtual WTF::String contextMenuItemTagDownloadLinkToDisk(); |