Changeset 68670 in webkit

Timestamp:

Sep 29, 2010 11:44:02 AM (14 years ago)

Author:

rniwa@webkit.org

Message:

2010-09-29 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

queryCommandValue "formatBlock" always returns false
​https://bugs.webkit.org/show_bug.cgi?id=21305

Implemented queryCommandValue('formatBlock'). We match the Firefox's behavior exactly
because Firefox and Internet Explorer support the same set of elements
(address, h1, h2, h3, h4, h5, h6, and p) and Firefox's behavior is more compatible with Opera.
See the bug for the detailed discussion.

WebKit's implementation returns the local name of the lowest common ancestor
of the selection with the tag name address, h1, h2, h3, h4, h5, h6, or p.
It returns "" when there is no such an ancestor or there is no selection.

Test: editing/execCommand/query-format-block.html

• editing/Editor.cpp: (WebCore::isElementForFormatBlockCommand): (WebCore::Editor::elementForFormatBlockCommand):
• editing/Editor.h:
• editing/EditorCommand.cpp: (WebCore::valueFormatBlock): (WebCore::createCommandMap):

2010-09-29 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

queryCommandValue "formatBlock" always returns false
​https://bugs.webkit.org/show_bug.cgi?id=21305

Added a test for queryCommandValue('formatBlock').

• editing/execCommand/query-format-block-expected.txt: Added.
• editing/execCommand/query-format-block.html: Added.
• editing/execCommand/script-tests/query-format-block.js: Added. (queryFormatBlock): (selectFirstPosition): (selectMiddleOfHelloWorld):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/query-format-block-expected.txt (added)
• LayoutTests/editing/execCommand/query-format-block.html (added)
• LayoutTests/editing/execCommand/script-tests/query-format-block.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebCore/editing/Editor.h (modified) (1 diff)
• WebCore/editing/EditorCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-29  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        queryCommandValue "formatBlock" always returns false
+        https://bugs.webkit.org/show_bug.cgi?id=21305
+
+        Added a test for queryCommandValue('formatBlock').
+
+        * editing/execCommand/query-format-block-expected.txt: Added.
+        * editing/execCommand/query-format-block.html: Added.
+        * editing/execCommand/script-tests/query-format-block.js: Added.
+        (queryFormatBlock):
+        (selectFirstPosition):
+        (selectMiddleOfHelloWorld):
+
 2010-09-29  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-29  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        queryCommandValue "formatBlock" always returns false
+        https://bugs.webkit.org/show_bug.cgi?id=21305
+
+        Implemented queryCommandValue('formatBlock'). We match the Firefox's behavior exactly
+        because Firefox and Internet Explorer support the same set of elements
+        (address, h1, h2, h3, h4, h5, h6, and p) and Firefox's behavior is more compatible with Opera.
+        See the bug for the detailed discussion.
+
+        WebKit's implementation returns the local name of the lowest common ancestor
+        of the selection with the tag name address, h1, h2, h3, h4, h5, h6, or p.
+        It returns "" when there is no such an ancestor or there is no selection.
+
+        Test: editing/execCommand/query-format-block.html
+
+        * editing/Editor.cpp:
+        (WebCore::isElementForFormatBlockCommand):
+        (WebCore::Editor::elementForFormatBlockCommand):
+        * editing/Editor.h:
+        * editing/EditorCommand.cpp:
+        (WebCore::valueFormatBlock):
+        (WebCore::createCommandMap):
+
 2010-09-29  Matt Perry  <mpcomplete@chromium.org>
 

trunk/WebCore/editing/Editor.cpp

@@ -967 +967 @@
 }
 
+static bool isElementForFormatBlockCommand(const Node* node)
+{
+    return node->hasTagName(addressTag)
+        || node->hasTagName(h1Tag)
+        || node->hasTagName(h2Tag)
+        || node->hasTagName(h3Tag)
+        || node->hasTagName(h4Tag)
+        || node->hasTagName(h5Tag)
+        || node->hasTagName(h6Tag)
+        || node->hasTagName(pTag)
+        || node->hasTagName(preTag);
+}
+
+Element* Editor::elementForFormatBlockCommand() const
+{
+    const VisibleSelection& selection = m_frame->selection()->selection();
+    if (!selection.isNonOrphanedCaretOrRange() || !selection.isContentEditable())
+        return 0;
+
+    ExceptionCode ec;
+    Node* commonAncestor = selection.firstRange()->commonAncestorContainer(ec);
+    while (commonAncestor && !isElementForFormatBlockCommand(commonAncestor))
+        commonAncestor = commonAncestor->parentNode();
+
+    if (!commonAncestor)
+        return 0;
+
+    ASSERT(commonAncestor->isElementNode());
+    return static_cast<Element*>(commonAncestor);
+}
+
 void Editor::indent()
 {

trunk/WebCore/editing/Editor.h

@@ -126 +126 @@
     TriState selectionHasStyle(CSSStyleDeclaration*) const;
     String selectionStartCSSPropertyValue(int propertyID);
+    Element* elementForFormatBlockCommand() const;
     const SimpleFontData* fontForSelection(bool&) const;
     WritingDirection textDirectionForSelection(bool&) const;

trunk/WebCore/editing/EditorCommand.cpp

@@ -1347 +1347 @@
 }
 
+static String valueFormatBlock(Frame* frame, Event*)
+{
+    Element* formatBlockElement = frame->editor()->elementForFormatBlockCommand();
+    if (!formatBlockElement)
+        return "";
+    return formatBlockElement->localName();
+}
+
 // Map of functions
 
@@ -1383 +1391 @@
         { "FontSizeDelta", { executeFontSizeDelta, supported, enabledInEditableText, stateNone, valueFontSizeDelta, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "ForeColor", { executeForeColor, supported, enabledInRichlyEditableText, stateNone, valueForeColor, notTextInsertion, doNotAllowExecutionWhenDisabled } },
-        { "FormatBlock", { executeFormatBlock, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
+        { "FormatBlock", { executeFormatBlock, supported, enabledInRichlyEditableText, stateNone, valueFormatBlock, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "ForwardDelete", { executeForwardDelete, supported, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "HiliteColor", { executeBackColor, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },