Changeset 126925 in webkit

Timestamp:

Aug 28, 2012, 1:46:57 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Spellcheck should be enabled if undefined in content.
​https://bugs.webkit.org/show_bug.cgi?id=95139

Currently we only enable spellcheck if it is defined as such in
the web content explicitly.
Making this change to enable by default, and only turn off if it is
explicitly set, or if we expect the field to be a username, email or
url.

Internally reviewed by Mike Fenton.

Patch by Nima Ghanavatian <​nghanavatian@rim.com> on 2012-08-28
Reviewed by Rob Buis.

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::requestCheckingOfString):
(BlackBerry::WebKit::InputHandler::setElementFocused):
(BlackBerry::WebKit::InputHandler::unlockSequenceMap):
(WebKit):
(BlackBerry::WebKit::InputHandler::shouldSpellCheckElement):

• WebKitSupport/InputHandler.h:

(InputHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (3 diffs)
• WebKitSupport/InputHandler.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-08-28  Nima Ghanavatian  <nghanavatian@rim.com>
+
+        [BlackBerry] Spellcheck should be enabled if undefined in content.
+        https://bugs.webkit.org/show_bug.cgi?id=95139
+
+        Currently we only enable spellcheck if it is defined as such in
+        the web content explicitly.
+        Making this change to enable by default, and only turn off if it is
+        explicitly set, or if we expect the field to be a username, email or
+        url.
+
+        Internally reviewed by Mike Fenton.
+
+        Reviewed by Rob Buis.
+
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::requestCheckingOfString):
+        (BlackBerry::WebKit::InputHandler::setElementFocused):
+        (BlackBerry::WebKit::InputHandler::unlockSequenceMap):
+        (WebKit):
+        (BlackBerry::WebKit::InputHandler::shouldSpellCheckElement):
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+
 2012-08-28  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

@@ -542 +542 @@
     }
 
-    // Check if field explicitly asked for spellchecking.
-    if (DOMSupport::elementSupportsSpellCheck(m_currentFocusElement.get()) != DOMSupport::On) {
+    // Check if the field should be spellchecked.
+    if (!shouldSpellCheckElement(m_currentFocusElement.get())) {
         spellCheckingRequestCancelled(sequenceId, true /* isSequenceId */);
         return;
@@ -843 +843 @@
 #endif
 
-    // Check if the field explicitly asks for spellchecking.
-    if (DOMSupport::elementSupportsSpellCheck(element) != DOMSupport::On)
+    // Check if the field should be spellchecked.
+    if (!shouldSpellCheckElement(element))
         return;
 
@@ -854 +854 @@
     SpellingLog(LogLevelInfo, "InputHandler::setElementFocused Spellchecking the field increased the total time to focus to %f seconds.", timer.elapsed());
 #endif
+}
+
+bool InputHandler::shouldSpellCheckElement(const Element* element) const
+{
+    DOMSupport::AttributeState spellCheckAttr = DOMSupport::elementSupportsSpellCheck(element);
+
+    // Explicitly set to off.
+    if (spellCheckAttr == DOMSupport::Off)
+        return false;
+
+    // Undefined and part of a set of cases which we do not wish to check. This includes user names and email addresses, so we are piggybacking on NoAutocomplete cases.
+    if (spellCheckAttr == DOMSupport::Default && (m_currentFocusElementTextEditMask & NO_AUTO_TEXT))
+        return false;
+
+    return true;
 }
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h

@@ -200 +200 @@
     void cancelAllSpellCheckingRequests();
     WebCore::SpellChecker* getSpellChecker();
+    bool shouldSpellCheckElement(const WebCore::Element*) const;
 
     WebPagePrivate* m_webPage;