Changeset 71101 in webkit

Timestamp:

Nov 1, 2010 10:30:42 PM (13 years ago)

Author:

morrita@google.com

Message:

2010-11-01 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

@spellcheck attribute at the child of contentEditable node is ignored.
​https://bugs.webkit.org/show_bug.cgi?id=48418

• editing/spelling/script-tests/spelling-attribute-at-child.js: Added.
• editing/spelling/spelling-attribute-at-child-expected.txt: Added.
• editing/spelling/spelling-attribute-at-child.html: Added.

2010-11-01 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

@spellcheck attribute at the child of contentEditable node is ignored.
​https://bugs.webkit.org/show_bug.cgi?id=48418

Changed to check spellcheck availability against a node under the
selection (caret) instead of the focus. For shadow elements, the
check now refers its host node. Note that the original code didn't
care shadows because focus is never set on them.

Test: editing/spelling/spelling-attribute-at-child.html

• dom/Element.h:
• editing/Editor.cpp: (WebCore::Editor::markMisspellingsOrBadGrammar): (WebCore::Editor::isSpellCheckingEnabledFor): (WebCore::Editor::isSpellCheckingEnabledInFocusedNode): Now just calling isSpellCheckingEnabledFor() (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
• editing/Editor.h:
• platform/ContextMenu.cpp: (WebCore::ContextMenu::populate):
• rendering/TextControlInnerElements.cpp: (WebCore::TextControlInnerElement::isSpellCheckingEnabled): Added.
• rendering/TextControlInnerElements.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/spelling/script-tests/spelling-attribute-at-child.js (added)
• LayoutTests/editing/spelling/spelling-attribute-at-child-expected.txt (added)
• LayoutTests/editing/spelling/spelling-attribute-at-child.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (4 diffs)
• WebCore/editing/Editor.h (modified) (1 diff)
• WebCore/platform/ContextMenu.cpp (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.cpp (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-01  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        @spellcheck attribute at the child of contentEditable node is ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=48418
+
+        * editing/spelling/script-tests/spelling-attribute-at-child.js: Added.
+        * editing/spelling/spelling-attribute-at-child-expected.txt: Added.
+        * editing/spelling/spelling-attribute-at-child.html: Added.
+
 2010-11-01  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-01  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        @spellcheck attribute at the child of contentEditable node is ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=48418
+
+        Changed to check spellcheck availability against a node under the
+        selection (caret) instead of the focus. For shadow elements, the
+        check now refers its host node.  Note that the original code didn't
+        care shadows because focus is never set on them.
+        
+        Test: editing/spelling/spelling-attribute-at-child.html
+
+        * dom/Element.h:
+        * editing/Editor.cpp:
+        (WebCore::Editor::markMisspellingsOrBadGrammar):
+        (WebCore::Editor::isSpellCheckingEnabledFor): 
+        (WebCore::Editor::isSpellCheckingEnabledInFocusedNode): Now just calling isSpellCheckingEnabledFor()
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
+        * editing/Editor.h:
+        * platform/ContextMenu.cpp:
+        (WebCore::ContextMenu::populate):
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::TextControlInnerElement::isSpellCheckingEnabled): Added.
+        * rendering/TextControlInnerElements.h:
+
 2010-11-01  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebCore/dom/Element.h

@@ -327 +327 @@
 #endif
 
-    bool isSpellCheckingEnabled() const;
+    virtual bool isSpellCheckingEnabled() const;
 
 protected:

trunk/WebCore/editing/Editor.cpp

@@ -2096 +2096 @@
         return;
 
-    if (!isSpellCheckingEnabledInFocusedNode())
+    if (!isSpellCheckingEnabledFor(editableNode))
         return;
 
@@ -2116 +2116 @@
 }
 
-bool Editor::isSpellCheckingEnabledInFocusedNode() const
-{
-    // Ascend the DOM tree to find a "spellcheck" attribute.
-    // When we find a "spellcheck" attribute, retrieve its value and return false if its value is "false".
-    const Node* node = frame()->document()->focusedNode();
+bool Editor::isSpellCheckingEnabledFor(Node* node) const
+{
     if (!node)
         return false;
@@ -2127 +2124 @@
         return false;
     return focusedElement->isSpellCheckingEnabled();
+}
+
+bool Editor::isSpellCheckingEnabledInFocusedNode() const
+{
+    return isSpellCheckingEnabledFor(m_frame->selection()->start().node());
 }
 
@@ -2171 +2173 @@
         return;
 
-    if (!isSpellCheckingEnabledInFocusedNode())
+    if (!isSpellCheckingEnabledFor(editableNode))
         return;
 

trunk/WebCore/editing/Editor.h

@@ -220 +220 @@
     Vector<String> guessesForMisspelledOrUngrammaticalSelection(bool& misspelled, bool& ungrammatical);
     bool isSpellCheckingEnabledInFocusedNode() const;
+    bool isSpellCheckingEnabledFor(Node*) const;
     void markMisspellingsAfterTypingToPosition(const VisiblePosition&);
     void markMisspellings(const VisibleSelection&, RefPtr<Range>& firstMisspellingRange);

trunk/WebCore/platform/ContextMenu.cpp

@@ -430 +430 @@
         SelectionController* selection = frame->selection();
         bool inPasswordField = selection->isInPasswordField();
-        bool spellCheckingEnabled = frame->editor()->isSpellCheckingEnabledInFocusedNode();
+        bool spellCheckingEnabled = frame->editor()->isSpellCheckingEnabledFor(node);
         
         if (!inPasswordField && spellCheckingEnabled) {

trunk/WebCore/rendering/TextControlInnerElements.cpp

@@ -125 +125 @@
 }
 
+bool TextControlInnerElement::isSpellCheckingEnabled() const
+{
+    return m_shadowParent && m_shadowParent->isSpellCheckingEnabled();
+}
+
 // ----------------------------
 

trunk/WebCore/rendering/TextControlInnerElements.h

@@ -50 +50 @@
     virtual bool isShadowNode() const { return m_shadowParent; }
     virtual ContainerNode* shadowParentNode() { return m_shadowParent; }
+    virtual bool isSpellCheckingEnabled() const;
     void setShadowParentNode(HTMLElement* shadowParent) { m_shadowParent = shadowParent; }