[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:18:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 11f23fe9a7379410492f6f553fb990e9fd927810
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jul 17 01:05:50 2010 +0000
2010-07-16 Zhe Su <suzhe at 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
This patch just reverts the change to WebCore/page/FocusController.cpp
made in changeset 61484, and add a new method named
willSetInputMethodState in EditorClient interface, which gets called
in FocusController just before changing the focused node.
No new tests, because no new functionality.
* loader/EmptyClients.h:
(WebCore::EmptyEditorClient::willSetInputMethodState):
* page/EditorClient.h:
* page/FocusController.cpp:
(WebCore::FocusController::setFocusedNode):
2010-07-16 Zhe Su <suzhe at 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.
* efl/WebCoreSupport/EditorClientEfl.cpp:
(WebCore::EditorClientEfl::willSetInputMethodState):
* efl/WebCoreSupport/EditorClientEfl.h:
2010-07-16 Zhe Su <suzhe at 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
Implement EditorClient::willSetInputMethodState which replaces
setInputMethodState method.
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::willSetInputMethodState):
(WebKit::EditorClientImpl::setInputMethodState):
* src/EditorClientImpl.h:
2010-07-16 Zhe Su <suzhe at 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/EditorClientGtk.cpp:
(WebKit::EditorClient::willSetInputMethodState):
* WebCoreSupport/EditorClientGtk.h:
2010-07-16 Zhe Su <suzhe at 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-16 Zhe Su <suzhe at 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/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::willSetInputMethodState):
2010-07-16 Zhe Su <suzhe at 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/EditorClientQt.cpp:
(WebCore::EditorClientQt::willSetInputMethodState):
* WebCoreSupport/EditorClientQt.h:
2010-07-16 Zhe Su <suzhe at 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/WebEditorClient.cpp:
(WebEditorClient::willSetInputMethodState):
* WebCoreSupport/WebEditorClient.h:
2010-07-16 Zhe Su <suzhe at 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.
* WebKitSupport/EditorClientWx.cpp:
(WebCore::EditorClientWx::willSetInputMethodState):
* WebKitSupport/EditorClientWx.h:
2010-07-16 Zhe Su <suzhe at 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.
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::willSetInputMethodState):
* WebProcess/WebCoreSupport/WebEditorClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63602 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf5a793..a8ea3aa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-16 Zhe Su <suzhe at 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
+
+ This patch just reverts the change to WebCore/page/FocusController.cpp
+ made in changeset 61484, and add a new method named
+ willSetInputMethodState in EditorClient interface, which gets called
+ in FocusController just before changing the focused node.
+
+ No new tests, because no new functionality.
+
+ * loader/EmptyClients.h:
+ (WebCore::EmptyEditorClient::willSetInputMethodState):
+ * page/EditorClient.h:
+ * page/FocusController.cpp:
+ (WebCore::FocusController::setFocusedNode):
+
2010-07-16 Matthew Delaney <mdelaney at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index 28d195d..ef5613e 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -434,6 +434,7 @@ public:
virtual void showSpellingUI(bool) { }
virtual bool spellingUIIsShowing() { return false; }
virtual void getGuessesForWord(const String&, Vector<String>&) { }
+ virtual void willSetInputMethodState() { }
virtual void setInputMethodState(bool) { }
@@ -495,4 +496,3 @@ public:
}
#endif // EmptyClients_h
-
diff --git a/WebCore/page/EditorClient.h b/WebCore/page/EditorClient.h
index 69f48e7..ff5bf94 100644
--- a/WebCore/page/EditorClient.h
+++ b/WebCore/page/EditorClient.h
@@ -183,10 +183,10 @@ public:
virtual void showSpellingUI(bool show) = 0;
virtual bool spellingUIIsShowing() = 0;
virtual void getGuessesForWord(const String&, Vector<String>& guesses) = 0;
+ virtual void willSetInputMethodState() = 0;
virtual void setInputMethodState(bool enabled) = 0;
};
}
#endif // EditorClient_h
-
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index 6ecdffd..53a4fa8 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -595,22 +595,21 @@ bool FocusController::setFocusedNode(Node* node, PassRefPtr<Frame> newFocusedFra
if (oldFocusedNode && oldFocusedNode->rootEditableElement() == oldFocusedNode && !relinquishesEditingFocus(oldFocusedNode))
return false;
- // Set input method state before changing the focused node, so that the
- // input method can still have a chance to finish the ongoing composition
- // session.
- m_page->editorClient()->setInputMethodState(node ? node->shouldUseInputMethod() : false);
+ m_page->editorClient()->willSetInputMethodState();
clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), node);
if (!node) {
if (oldDocument)
oldDocument->setFocusedNode(0);
+ m_page->editorClient()->setInputMethodState(false);
return true;
}
RefPtr<Document> newDocument = node->document();
if (newDocument && newDocument->focusedNode() == node) {
+ m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
return true;
}
@@ -622,6 +621,8 @@ bool FocusController::setFocusedNode(Node* node, PassRefPtr<Frame> newFocusedFra
if (newDocument)
newDocument->setFocusedNode(node);
+ m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
+
return true;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 38c36fc..ce0c379 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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.
+
+ * efl/WebCoreSupport/EditorClientEfl.cpp:
+ (WebCore::EditorClientEfl::willSetInputMethodState):
+ * efl/WebCoreSupport/EditorClientEfl.h:
+
2010-07-15 Mark Rowe <mrowe at apple.com>
Update the sorting in the Xcode project files.
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 879bdf2..8c2a117 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-16 Zhe Su <suzhe at 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
+
+ Implement EditorClient::willSetInputMethodState which replaces
+ setInputMethodState method.
+
+ * src/EditorClientImpl.cpp:
+ (WebKit::EditorClientImpl::willSetInputMethodState):
+ (WebKit::EditorClientImpl::setInputMethodState):
+ * src/EditorClientImpl.h:
+
2010-07-16 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/EditorClientImpl.cpp b/WebKit/chromium/src/EditorClientImpl.cpp
index 4ae4934..11977b6 100644
--- a/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/WebKit/chromium/src/EditorClientImpl.cpp
@@ -935,10 +935,14 @@ void EditorClientImpl::getGuessesForWord(const String&,
notImplemented();
}
-void EditorClientImpl::setInputMethodState(bool enabled)
+void EditorClientImpl::willSetInputMethodState()
{
if (m_webView->client())
m_webView->client()->resetInputMethod();
}
+void EditorClientImpl::setInputMethodState(bool)
+{
+}
+
} // namesace WebKit
diff --git a/WebKit/chromium/src/EditorClientImpl.h b/WebKit/chromium/src/EditorClientImpl.h
index 006b609..549a512 100644
--- a/WebKit/chromium/src/EditorClientImpl.h
+++ b/WebKit/chromium/src/EditorClientImpl.h
@@ -108,6 +108,7 @@ public:
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WebCore::String& word,
WTF::Vector<WebCore::String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
// Shows the form autofill popup for |node| if it is an HTMLInputElement and
diff --git a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
index 3c4016f..cf672eb 100644
--- a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
@@ -40,6 +40,11 @@ using namespace WebCore;
namespace WebCore {
+void EditorClientEfl::willSetInputMethodState()
+{
+ notImplemented();
+}
+
void EditorClientEfl::setInputMethodState(bool active)
{
notImplemented();
diff --git a/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/WebKit/efl/WebCoreSupport/EditorClientEfl.h
index a53d624..9f60cfb 100644
--- a/WebKit/efl/WebCoreSupport/EditorClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/EditorClientEfl.h
@@ -111,6 +111,7 @@ public:
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
private:
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 19ab240..803bf12 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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/EditorClientGtk.cpp:
+ (WebKit::EditorClient::willSetInputMethodState):
+ * WebCoreSupport/EditorClientGtk.h:
+
2010-07-16 Nate Chapin <japhet at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
index 77ed9b2..cd04782 100644
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
@@ -215,6 +215,10 @@ void EditorClient::updatePendingComposition(const gchar* newComposition)
m_pendingComposition.set(g_strconcat(m_pendingComposition.get(), newComposition, NULL));
}
+void EditorClient::willSetInputMethodState()
+{
+}
+
void EditorClient::setInputMethodState(bool active)
{
WebKitWebViewPrivate* priv = m_webView->priv;
diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
index 2e5c359..93f56ce 100644
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
@@ -130,6 +130,7 @@ namespace WebKit {
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
private:
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index fe3b6a1..841a94c 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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 at webkit.org>
Reviewed by Darin Adler.
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
-
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f8ae25e..8d5b1bc 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::willSetInputMethodState):
+
2010-07-16 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.h b/WebKit/mac/WebCoreSupport/WebEditorClient.h
index d7dfdd7..1cb2a59 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.h
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.h
@@ -127,6 +127,7 @@ public:
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
private:
void registerCommandForUndoOrRedo(PassRefPtr<WebCore::EditCommand>, bool isRedo);
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.mm b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
index ec9024a..d2f2706 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
@@ -818,6 +818,10 @@ void WebEditorClient::getGuessesForWord(const String& word, WTF::Vector<String>&
}
}
+void WebEditorClient::willSetInputMethodState()
+{
+}
+
void WebEditorClient::setInputMethodState(bool)
{
}
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 006b6a7..efbee15 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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/EditorClientQt.cpp:
+ (WebCore::EditorClientQt::willSetInputMethodState):
+ * WebCoreSupport/EditorClientQt.h:
+
2010-07-14 Sam Weinig <sam at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index e140968..74c8438 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -587,6 +587,10 @@ bool EditorClientQt::isEditing() const
return m_editing;
}
+void EditorClientQt::willSetInputMethodState()
+{
+}
+
void EditorClientQt::setInputMethodState(bool active)
{
QWebPageClient* webPageClient = m_page->d->client;
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.h b/WebKit/qt/WebCoreSupport/EditorClientQt.h
index a5f6b23..7d99d22 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.h
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.h
@@ -105,6 +105,7 @@ public:
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;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 52ee776..87c7b18 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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/WebEditorClient.cpp:
+ (WebEditorClient::willSetInputMethodState):
+ * WebCoreSupport/WebEditorClient.h:
+
2010-07-16 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/win/WebCoreSupport/WebEditorClient.cpp b/WebKit/win/WebCoreSupport/WebEditorClient.cpp
index c9118e5..e05951c 100644
--- a/WebKit/win/WebCoreSupport/WebEditorClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebEditorClient.cpp
@@ -776,6 +776,10 @@ void WebEditorClient::getGuessesForWord(const String& word, Vector<String>& gues
}
}
+void WebEditorClient::willSetInputMethodState()
+{
+}
+
void WebEditorClient::setInputMethodState(bool enabled)
{
m_webView->setInputMethodState(enabled);
diff --git a/WebKit/win/WebCoreSupport/WebEditorClient.h b/WebKit/win/WebCoreSupport/WebEditorClient.h
index a29a264..ac2e25e 100644
--- a/WebKit/win/WebCoreSupport/WebEditorClient.h
+++ b/WebKit/win/WebCoreSupport/WebEditorClient.h
@@ -109,6 +109,7 @@ public:
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool);
private:
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index f14e87c..32ff6fe 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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.
+
+ * WebKitSupport/EditorClientWx.cpp:
+ (WebCore::EditorClientWx::willSetInputMethodState):
+ * WebKitSupport/EditorClientWx.h:
+
2010-07-14 Sam Weinig <sam at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
index 627ebf9..2355141 100644
--- a/WebKit/wx/WebKitSupport/EditorClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
@@ -538,6 +538,11 @@ String EditorClientWx::getAutoCorrectSuggestionForMisspelledWord(const WebCore::
return String();
}
+void EditorClientWx::willSetInputMethodState()
+{
+ notImplemented();
+}
+
void EditorClientWx::setInputMethodState(bool enabled)
{
notImplemented();
diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.h b/WebKit/wx/WebKitSupport/EditorClientWx.h
index 93cf961..8d69e36 100644
--- a/WebKit/wx/WebKitSupport/EditorClientWx.h
+++ b/WebKit/wx/WebKitSupport/EditorClientWx.h
@@ -110,6 +110,7 @@ public:
virtual void getGuessesForWord(const String&, Vector<String>& guesses);
virtual String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
private:
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a32a0c0..2f55fb7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Zhe Su <suzhe at 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.
+
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::willSetInputMethodState):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+
2010-07-16 Alice Liu <alice.liu at apple.com>
Build fix, not reviewed.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index fd609ad..6fcb277 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -415,10 +415,14 @@ void WebEditorClient::getGuessesForWord(const String&, Vector<String>&)
notImplemented();
}
+void WebEditorClient::willSetInputMethodState()
+{
+ notImplemented();
+}
+
void WebEditorClient::setInputMethodState(bool)
{
notImplemented();
}
} // namespace WebKit
-
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
index e0ad99b..c0dba73 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
@@ -129,6 +129,7 @@ private:
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
WebPage* m_page;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list