[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:34:24 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ff98e4a3cf222ba6b0e252a76d372952f37f8f05
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 21 20:13:23 2011 +0000
2011-01-21 Sailesh Agrawal <sail at chromium.org>
Reviewed by Ryosuke Niwa.
[chromium] Notify WebFrameClient when spellcheck state changes
https://bugs.webkit.org/show_bug.cgi?id=52680
* public/WebFrameClient.h:
(WebKit::WebFrameClient::continuousSpellCheckingEnabledStateChanged):
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::toggleContinuousSpellChecking):
* src/WebFrameImpl.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 0cd666c..c50aa6f 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-21 Sailesh Agrawal <sail at chromium.org>
+
+ Reviewed by Ryosuke Niwa.
+
+ [chromium] Notify WebFrameClient when spellcheck state changes
+ https://bugs.webkit.org/show_bug.cgi?id=52680
+
+ * public/WebFrameClient.h:
+ (WebKit::WebFrameClient::continuousSpellCheckingEnabledStateChanged):
+ * src/EditorClientImpl.cpp:
+ (WebKit::EditorClientImpl::toggleContinuousSpellChecking):
+ * src/WebFrameImpl.cpp:
+
2011-01-21 Tony Chang <tony at chromium.org>
Unreviewed, updating chromium DEPS so we can pull in linux theme changes.
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index 1c6fd04..2e1890a 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -109,6 +109,9 @@ public:
// Controls whether images are allowed for this frame.
virtual bool allowImages(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; }
+ // Notifies the client that continuous spell checking has been enabled or
+ // disabled.
+ virtual void didToggleContinuousSpellChecking(WebFrame*) { }
// Load commands -------------------------------------------------------
diff --git a/Source/WebKit/chromium/src/EditorClientImpl.cpp b/Source/WebKit/chromium/src/EditorClientImpl.cpp
index 19b5873..68694c2 100644
--- a/Source/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/Source/WebKit/chromium/src/EditorClientImpl.cpp
@@ -45,6 +45,7 @@
#include "WebAutoFillClient.h"
#include "WebEditingAction.h"
#include "WebElement.h"
+#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebKit.h"
#include "WebInputElement.h"
@@ -161,6 +162,11 @@ void EditorClientImpl::toggleContinuousSpellChecking()
m_spellCheckThisFieldStatus = SpellCheckForcedOff;
else
m_spellCheckThisFieldStatus = SpellCheckForcedOn;
+
+ WebFrameImpl* webframe = WebFrameImpl::fromFrame(
+ m_webView->focusedWebCoreFrame());
+ if (webframe)
+ webframe->client()->didToggleContinuousSpellChecking(webframe);
}
bool EditorClientImpl::isGrammarCheckingEnabled()
diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
index 4af9707..f95611a 100644
--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1199,6 +1199,9 @@ void WebFrameImpl::enableContinuousSpellChecking(bool enable)
{
if (enable == isContinuousSpellCheckingEnabled())
return;
+ // Note, the editor will will notify the client that the continuous spell
+ // checking state has changed by calling
+ // WebFrameClient::didToggleContinuousSpellChecking().
frame()->editor()->toggleContinuousSpellChecking();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list