5 files changed, 33 insertions, 5 deletions
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index d71c5e4..841a94c 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,28 @@
+2010-07-16  Zhe Su  <suzhe@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
+        https://bugs.webkit.org/show_bug.cgi?id=42253
+
+        Dummy implementation of EditorClient::willSetInputMethodState.
+
+        * WebCoreSupport/EditorClientHaiku.cpp:
+        (WebCore::EditorClientHaiku::willSetInputMethodState):
+        * WebCoreSupport/EditorClientHaiku.h:
+
+2010-07-14  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=42232
+        Make changing Cursors work in WebKit2.
+
+        * WebCoreSupport/ChromeClientHaiku.cpp:
+        (WebCore::ChromeClientHaiku::setCursor):
+        * WebCoreSupport/ChromeClientHaiku.h:
+        Change prototype to match new one.
+
 2010-06-14  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
index 2cf5c31..d18b84d 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
@@ -362,10 +362,9 @@ void ChromeClientHaiku::chooseIconForFiles(const Vector<String>& filenames, File
     chooser->iconLoaded(Icon::createIconForFiles(filenames));
 }
 
-bool ChromeClientHaiku::setCursor(PlatformCursorHandle)
+void ChromeClientHaiku::setCursor(const Cursor&)
 {
     notImplemented();
-    return false;
 }
 
 // Notification that the given form element has changed. This function
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index d5a372b..963e72f 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -140,7 +140,7 @@ namespace WebCore {
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, FileChooser*);
 
-        bool setCursor(PlatformCursorHandle);
+        void setCursor(const Cursor&);
 
         // Notification that the given form element has changed. This function
         // will be called frequently, so handling should be very fast.
diff --git a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
index 2e23af7..bdd7eb8 100644
--- a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
@@ -466,6 +466,11 @@ void EditorClientHaiku::getGuessesForWord(const String&, Vector<String>&)
     notImplemented();
 }
 
+void EditorClientHaiku::willSetInputMethodState()
+{
+    notImplemented();
+}
+
 void EditorClientHaiku::setInputMethodState(bool enabled)
 {
     notImplemented();
@@ -477,4 +482,3 @@ bool EditorClientHaiku::isEditing() const
 }
 
 } // namespace WebCore
-
diff --git a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
index eda9597..5cbec27 100644
--- a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
@@ -108,6 +108,7 @@ namespace WebCore {
         virtual void showSpellingUI(bool show);
         virtual bool spellingUIIsShowing();
         virtual void getGuessesForWord(const String&, Vector<String>& guesses);
+        virtual void willSetInputMethodState();
         virtual void setInputMethodState(bool enabled);
 
         bool isEditing() const;
@@ -121,4 +122,3 @@ namespace WebCore {
 } // namespace WebCore
 
 #endif // EditorClientHaiku_h
-