Changeset 70810 in webkit

Timestamp:

Oct 28, 2010 2:38:45 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

2010-10-28 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

queryCommandValue should fall back to queryCommandState
​https://bugs.webkit.org/show_bug.cgi?id=48479

Added a fallback to Command::value so that commands with a state function without a value function
returns the value returned by the state function as a string.

• editing/EditorCommand.cpp: (WebCore::Editor::Command::value):

2010-10-28 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

queryCommandValue should fall back to queryCommandState
​https://bugs.webkit.org/show_bug.cgi?id=48479

Modified the existing tests to ensure queryCommandValue returns 'true' or 'false'
for commands that supports queryCommandState.

• editing/execCommand/script-tests/query-command-state.js: (testQueryCommandState):
• editing/execCommand/script-tests/query-text-alignment.js: (isEquivalentBoolean): (queryTextAlignment):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/script-tests/query-command-state.js (modified) (1 diff)
• LayoutTests/editing/execCommand/script-tests/query-text-alignment.js (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/EditorCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        queryCommandValue should fall back to queryCommandState
+        https://bugs.webkit.org/show_bug.cgi?id=48479
+
+        Modified the existing tests to ensure queryCommandValue returns 'true' or 'false'
+        for commands that supports queryCommandState.
+
+        * editing/execCommand/script-tests/query-command-state.js:
+        (testQueryCommandState):
+        * editing/execCommand/script-tests/query-text-alignment.js:
+        (isEquivalentBoolean):
+        (queryTextAlignment):
+
 2010-10-28  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/editing/execCommand/script-tests/query-command-state.js

@@ -10 +10 @@
     var selected = selector(testContainer);
     var actualState = document.queryCommandState(command);
+    var actualValue = document.queryCommandValue(command);
     var action = 'queryCommandState("' + command + '") returns ' + actualState + ' when selecting ' + selected + ' of "' + contents + '"';
-    if (actualState === expectedState)
+    if (actualState != expectedState)
+        testFailed(action + ', expected ' + expectedState + '');
+    else if (actualValue != actualState.toString())
+        testFailed(action + ' but queryCommandValue returned ' + actualValue);
+    else
         testPassed(action);
-    else
-        testFailed(action + ', expected ' + expectedState + '');
 }
 

trunk/LayoutTests/editing/execCommand/script-tests/query-text-alignment.js

@@ -13 +13 @@
     var left = document.queryCommandState('justifyLeft');
     var right = document.queryCommandState('justifyRight');
+    var centerValue = document.queryCommandValue('justifyCenter');
+    var fullValue = document.queryCommandValue('justifyFull');
+    var leftValue = document.queryCommandValue('justifyLeft');
+    var rightValue = document.queryCommandValue('justifyRight');
     if ((center && full) || (full && left) || (left && right) || (right && center))
         testFailed('Inconsistent state when selecting ' + selected + ' of "' + content + '".  More than one of justifyCenter, justifyFull, justifyRight, and justifyLeft returned true.')
@@ -18 +22 @@
     var actual = center ? 'center' : full ? 'full' : left ? 'left' : right ? 'right' : '';
     var action = "queryCommand('format') returns \"" + actual + '" when selecting ' + selected + ' of "' + content + '"';
-    if (actual == expected)
+    if (actual != expected)
+        testFailed(action + ' but expected "' + expected + '"');
+    else if (centerValue != center.toString() || fullValue != full.toString()
+        || leftValue != left.toString() || rightValue != right.toString())
+        testFailed(action + ' but values returned by queryCommandState and queryCommandValue did not match');
+    else
         testPassed(action);
-    else
-        testFailed(action + ' but expected "' + expected + '"');
 }
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        queryCommandValue should fall back to queryCommandState
+        https://bugs.webkit.org/show_bug.cgi?id=48479
+
+        Added a fallback to Command::value so that commands with a state function without a value function
+        returns the value returned by the state function as a string.
+
+        * editing/EditorCommand.cpp:
+        (WebCore::Editor::Command::value):
+
 2010-10-28  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/editing/EditorCommand.cpp

@@ -1639 +1639 @@
     if (!isSupported() || !m_frame)
         return String();
+    if (m_command->value == valueNull && m_command->state != stateNone)
+        return m_command->state(m_frame.get(), triggeringEvent) == TrueTriState ? "true" : "false";
     return m_command->value(m_frame.get(), triggeringEvent);
 }