Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

6 files changed, 29 insertions, 17 deletions

diff --git a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
index 6ed11ea..b16e08c 100644
--- a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
@@ -253,9 +253,9 @@ bool ChromeClientHaiku::shouldInterruptJavaScript()
     return false;
 }
 
-bool ChromeClientHaiku::tabsToLinks() const
+KeyboardUIMode ChromeClientHaiku::keyboardUIMode()
 {
-    return false;
+    return KeyboardAccessDefault;
 }
 
 IntRect ChromeClientHaiku::windowResizerRect() const
diff --git a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index 3298c37..19fee81 100644
--- a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -101,7 +101,7 @@ namespace WebCore {
         virtual bool shouldInterruptJavaScript();
 
         virtual void setStatusbarText(const WTF::String&);
-        virtual bool tabsToLinks() const;
+        virtual WebCore::KeyboardUIMode keyboardUIMode();
         virtual IntRect windowResizerRect() const;
 
         virtual void invalidateWindow(const IntRect&, bool);
diff --git a/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
index 2b175d8..5c1b13f 100644
--- a/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
@@ -113,12 +113,6 @@ int EditorClientHaiku::spellCheckerDocumentTag()
     return 0;
 }
 
-bool EditorClientHaiku::isEditable()
-{
-    // FIXME: should be controllable
-    return false;
-}
-
 bool EditorClientHaiku::shouldBeginEditing(WebCore::Range*)
 {
     notImplemented();
@@ -210,6 +204,16 @@ void EditorClientHaiku::clearUndoRedoOperations()
     notImplemented();
 }
 
+bool EditorClientHaiku::canCopyCut(bool defaultValue) const
+{
+    return defaultValue;
+}
+
+bool EditorClientHaiku::canPaste(bool defaultValue) const
+{
+    return defaultValue;
+}
+
 bool EditorClientHaiku::canUndo() const
 {
     notImplemented();
@@ -246,7 +250,7 @@ void EditorClientHaiku::handleKeyboardEvent(KeyboardEvent* event)
     if (!kevent || kevent->type() == PlatformKeyboardEvent::KeyUp)
         return;
 
-    Node* start = frame->selection()->start().node();
+    Node* start = frame->selection()->start().containerNode();
     if (!start)
         return;
 
diff --git a/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h b/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
index ca270e9..bb0d8ac 100644
--- a/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
+++ b/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
@@ -32,6 +32,7 @@
 #define EditorClientHaiku_H
 
 #include "EditorClient.h"
+#include "TextCheckerClient.h"
 #include "RefCounted.h"
 #include "Page.h"
 
@@ -40,7 +41,7 @@
 
 namespace WebCore {
 
-    class EditorClientHaiku : public EditorClient {
+class EditorClientHaiku : public EditorClient, public TextCheckerClient {
     public:
         EditorClientHaiku();
         void setPage( Page* page );
@@ -57,8 +58,6 @@ namespace WebCore {
         virtual void toggleGrammarChecking();
         virtual int spellCheckerDocumentTag();
 
-        virtual bool isEditable();
-
         virtual bool shouldBeginEditing(Range*);
         virtual bool shouldEndEditing(Range*);
         virtual bool shouldInsertNode(Node*, Range*, EditorInsertAction);
@@ -80,6 +79,8 @@ namespace WebCore {
         virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
         virtual void clearUndoRedoOperations();
 
+        virtual bool canCopyCut(bool defaultValue) const;
+        virtual bool canPaste(bool defaultValue) const;
         virtual bool canUndo() const;
         virtual bool canRedo() const;
 
@@ -111,6 +112,7 @@ namespace WebCore {
         virtual void willSetInputMethodState();
         virtual void setInputMethodState(bool enabled);
         virtual void requestCheckingOfString(SpellChecker*, int, const String&) {}
+        virtual TextCheckerClient* textChecker() { return this; }
 
         bool isEditing() const;
 
diff --git a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
index 46ac489..8c42132 100644
--- a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
@@ -483,6 +483,11 @@ bool FrameLoaderClientHaiku::shouldGoToHistoryItem(WebCore::HistoryItem*) const
     return true;
 }
 
+bool FrameLoaderClientHaiku::shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const
+{
+    return true;
+}
+
 void FrameLoaderClientHaiku::dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const
 {
 }
@@ -651,8 +656,8 @@ Frame* FrameLoaderClientHaiku::dispatchCreatePage(const WebCore::NavigationActio
     return false;
 }
 
-void FrameLoaderClientHaiku::dispatchDecidePolicyForMIMEType(FramePolicyFunction function,
-                                                             const String& mimetype,
+void FrameLoaderClientHaiku::dispatchDecidePolicyForResponse(FramePolicyFunction function,
+                                                             const ResourceResponse& response,
                                                              const ResourceRequest& request)
 {
     if (!m_frame)
diff --git a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
index e54ba03..3e995a1 100644
--- a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
+++ b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
@@ -159,6 +159,7 @@ namespace WebCore {
         virtual void updateGlobalHistory();
         virtual void updateGlobalHistoryRedirectLinks();
         virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+        virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const;
         virtual void dispatchDidAddBackForwardItem(HistoryItem*) const;
         virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const;
         virtual void dispatchDidChangeBackForwardIndex() const;
@@ -205,8 +206,8 @@ namespace WebCore {
         virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
         virtual void dispatchDidFailLoad(const ResourceError&);
         virtual Frame* dispatchCreatePage(const NavigationAction&);
-        virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction,
-                                                     const String&,
+        virtual void dispatchDecidePolicyForResponse(FramePolicyFunction,
+                                                     const ResourceResponse&,
                                                      const ResourceRequest&);
         virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction,
                                                             const NavigationAction&,