Changeset 68423 in webkit

Timestamp:

Sep 27, 2010 2:10:54 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

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

Reviewed by Antonio Gomes.

stateStyle (@EditorCommand.cpp) should ask EditingBehavior for platform specific behavior
​https://bugs.webkit.org/show_bug.cgi?id=41989

queryCommandState returns true even when in the mixed state
​https://bugs.webkit.org/show_bug.cgi?id=46382

Fixed stateStyle so that it calls selectionStartHasStyle when shouldToggleStyleBasedOnStartOfSelection
is true (Mac platforms) and calls selectionHasStyle otherwise (non-Mac platforms).

Also fixed queryCommandState so that it only returns true when the state is TrueTriState
as supposed to returning true whenever the state is not FalseTriState. New behavior matches that of
other browsers such as Firefox and Internet Explorer.

• dom/Document.cpp: (WebCore::Document::queryCommandState):
• editing/EditorCommand.cpp: (WebCore::executeToggleStyle): (WebCore::stateStyle):

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

Reviewed by Antonio Gomes.

stateStyle (@EditorCommand.cpp) should ask EditingBehavior for platform specific behavior
​https://bugs.webkit.org/show_bug.cgi?id=41989

Added a test to ensure queryCommandState returns correct values on Mac and Windows.

• editing/execCommand/query-command-state-expected.txt: Added.
• editing/execCommand/script-tests/query-command-state.js: Added. (testQueryCommandState): (selectAll): (selectSecondWord): (selectFirstTwoWords): (runTests):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/query-command-state-expected.txt (added)
• LayoutTests/editing/execCommand/query-command-state.html (added)
• LayoutTests/editing/execCommand/script-tests/query-command-state.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/editing/EditorCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        stateStyle (@EditorCommand.cpp) should ask EditingBehavior for platform specific behavior
+        https://bugs.webkit.org/show_bug.cgi?id=41989
+
+        Added a test to ensure queryCommandState returns correct values on Mac and Windows.
+
+        * editing/execCommand/query-command-state-expected.txt: Added.
+        * editing/execCommand/script-tests/query-command-state.js: Added.
+        (testQueryCommandState):
+        (selectAll):
+        (selectSecondWord):
+        (selectFirstTwoWords):
+        (runTests):
+
 2010-09-27  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        stateStyle (@EditorCommand.cpp) should ask EditingBehavior for platform specific behavior
+        https://bugs.webkit.org/show_bug.cgi?id=41989
+
+        queryCommandState returns true even when in the mixed state
+        https://bugs.webkit.org/show_bug.cgi?id=46382
+
+        Fixed stateStyle so that it calls selectionStartHasStyle when shouldToggleStyleBasedOnStartOfSelection
+        is true (Mac platforms) and calls selectionHasStyle otherwise (non-Mac platforms).
+
+        Also fixed queryCommandState so that it only returns true when the state is TrueTriState
+        as supposed to returning true whenever the state is not FalseTriState. New behavior matches that of
+        other browsers such as Firefox and Internet Explorer.
+
+        * dom/Document.cpp:
+        (WebCore::Document::queryCommandState):
+        * editing/EditorCommand.cpp:
+        (WebCore::executeToggleStyle):
+        (WebCore::stateStyle):
+
 2010-09-27  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -3914 +3914 @@
 bool Document::queryCommandState(const String& commandName)
 {
-    return command(this, commandName).state() != FalseTriState;
+    return command(this, commandName).state() == TrueTriState;
 }
 

trunk/WebCore/editing/EditorCommand.cpp

@@ -161 +161 @@
 
     // Style is considered present when
-    // mac: present at the beginning of selection
+    // Mac: present at the beginning of selection
     // other: present throughout the selection
 
-    // FIXME: Make stateStyle() to use this editing method too for the cases where it's used for queryCommandState.
     bool styleIsPresent;
     if (frame->editor()->behavior().shouldToggleStyleBasedOnStartOfSelection())
@@ -232 +231 @@
     RefPtr<CSSMutableStyleDeclaration> style = CSSMutableStyleDeclaration::create();
     style->setProperty(propertyID, desiredValue);
+
+    if (frame->editor()->behavior().shouldToggleStyleBasedOnStartOfSelection())
+        return frame->editor()->selectionStartHasStyle(style.get()) ? TrueTriState : FalseTriState;
     return frame->editor()->selectionHasStyle(style.get());
 }