Changeset 79398 in webkit

Timestamp:

Feb 22, 2011, 9:35:44 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

2011-02-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

Make Editor::selectionComputedStyle return EditingStyle
​https://bugs.webkit.org/show_bug.cgi?id=54933

Renamed selectionComputedStyle to selectionStartStyle and changed the return type to EditingStyle.
It also no longer takes a boolean shouldUseFixedFontDefaultSize.

Also added EditingStyle::mergeTypingStyle which replaced old editingStyleIncludingTypingStyle. This function
doesn't extract inheritable properties prior to merge because this turned out be a bug, which was revealed
by an existing layout test only after the code was shared with selectionStartStyle.

No tests are added since this is a refactoring.

• editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::moveParagraphs): Calls EditingStyle::create and EditingStyle::mergeTypingStyle. (WebCore::CompositeEditCommand::breakOutOfEmptyListItem): Ditto.
• editing/EditingStyle.cpp: Removed editingStyleIncludingTypingStyle. (WebCore::EditingStyle::mergeTypingStyle): Added.
• editing/EditingStyle.h: (WebCore::EditingStyle::shouldUseFixedDefaultFontSize): Added.
• editing/Editor.cpp: (WebCore::Editor::selectionStartHasStyle): Calls selectionStartStyle. (WebCore::Editor::selectionHasStyle): Ditto. (WebCore::Editor::selectionStartCSSPropertyValue): Ditto. (WebCore::Editor::selectionStartStyle): Renamed from selectionComputedStyle; returns EditingStyle.
• editing/Editor.h:
• editing/EditorCommand.cpp: (WebCore::executeToggleStyleInList): Calls selectionStartStyle.
• editing/InsertLineBreakCommand.cpp:
• editing/InsertParagraphSeparatorCommand.cpp: (WebCore::InsertParagraphSeparatorCommand::calculateStyleBeforeInsertion): Calls EditingStyle::create and EditingStyle::mergeTypingStyle.
• editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::doApply): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/CompositeEditCommand.cpp (modified) (2 diffs)
• editing/EditingStyle.cpp (modified) (1 diff)
• editing/EditingStyle.h (modified) (3 diffs)
• editing/Editor.cpp (modified) (4 diffs)
• editing/Editor.h (modified) (1 diff)
• editing/EditorCommand.cpp (modified) (1 diff)
• editing/InsertLineBreakCommand.cpp (modified) (1 diff)
• editing/InsertParagraphSeparatorCommand.cpp (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Make Editor::selectionComputedStyle return EditingStyle
+        https://bugs.webkit.org/show_bug.cgi?id=54933
+
+        Renamed selectionComputedStyle to selectionStartStyle and changed the return type to EditingStyle.
+        It also no longer takes a boolean shouldUseFixedFontDefaultSize.
+
+        Also added EditingStyle::mergeTypingStyle which replaced old editingStyleIncludingTypingStyle. This function
+        doesn't extract inheritable properties prior to merge because this turned out be a bug, which was revealed
+        by an existing layout test only after the code was shared with selectionStartStyle.
+
+        No tests are added since this is a refactoring.
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs): Calls EditingStyle::create and EditingStyle::mergeTypingStyle.
+        (WebCore::CompositeEditCommand::breakOutOfEmptyListItem): Ditto.
+        * editing/EditingStyle.cpp: Removed editingStyleIncludingTypingStyle.
+        (WebCore::EditingStyle::mergeTypingStyle): Added.
+        * editing/EditingStyle.h:
+        (WebCore::EditingStyle::shouldUseFixedDefaultFontSize): Added.
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectionStartHasStyle): Calls selectionStartStyle.
+        (WebCore::Editor::selectionHasStyle): Ditto.
+        (WebCore::Editor::selectionStartCSSPropertyValue): Ditto.
+        (WebCore::Editor::selectionStartStyle): Renamed from selectionComputedStyle; returns EditingStyle.
+        * editing/Editor.h:
+        * editing/EditorCommand.cpp:
+        (WebCore::executeToggleStyleInList): Calls selectionStartStyle.
+        * editing/InsertLineBreakCommand.cpp:
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::calculateStyleBeforeInsertion): Calls EditingStyle::create and
+        EditingStyle::mergeTypingStyle.
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::doApply): Ditto.
+
 2011-02-22  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -968 +968 @@
     RefPtr<EditingStyle> styleInEmptyParagraph;
     if (startOfParagraphToMove == endOfParagraphToMove && preserveStyle) {
-        styleInEmptyParagraph = editingStyleIncludingTypingStyle(startOfParagraphToMove.deepEquivalent());
+        styleInEmptyParagraph = EditingStyle::create(startOfParagraphToMove.deepEquivalent());
+        styleInEmptyParagraph->mergeTypingStyle(document());
         // The moved paragraph should assume the block style of the destination.
         styleInEmptyParagraph->removeBlockProperties();
@@ -1037 +1038 @@
         return false;
 
-    RefPtr<EditingStyle> style = editingStyleIncludingTypingStyle(endingSelection().start());
+    RefPtr<EditingStyle> style = EditingStyle::create(endingSelection().start());
+    style->mergeTypingStyle(document());
 
     ContainerNode* listNode = emptyListItem->parentNode();

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -403 +403 @@
 }
 
-PassRefPtr<EditingStyle> editingStyleIncludingTypingStyle(const Position& position)
-{
-    RefPtr<EditingStyle> editingStyle = EditingStyle::create(position);
-    RefPtr<EditingStyle> typingStyle = position.anchorNode()->document()->frame()->selection()->typingStyle();
-    if (typingStyle && typingStyle->style())
-        editingStyle->style()->merge(copyEditingProperties(typingStyle->style()).get());
-    return editingStyle;
+void EditingStyle::mergeTypingStyle(Document* document)
+{
+    ASSERT(document);
+
+    RefPtr<EditingStyle> typingStyle = document->frame()->selection()->typingStyle();
+    if (!typingStyle || !typingStyle->style() || typingStyle == this)
+        return;
+
+    if (m_mutableStyle)
+        m_mutableStyle->merge(typingStyle->style(), true);
+    else
+        m_mutableStyle = typingStyle->style()->copy();
 }
     

trunk/Source/WebCore/editing/EditingStyle.h

@@ -43 +43 @@
 class CSSComputedStyleDeclaration;
 class CSSMutableStyleDeclaration;
+class Document;
 class Node;
 class Position;
@@ -97 +98 @@
     }
     void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNotPreserveWritingDirection);
+    void mergeTypingStyle(Document*);
 
     float fontSizeDelta() const { return m_fontSizeDelta; }
     bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }
+    bool shouldUseFixedDefaultFontSize() const { return m_shouldUseFixedDefaultFontSize; }
 
 private:
@@ -117 +120 @@
 };
 
-PassRefPtr<EditingStyle> editingStyleIncludingTypingStyle(const Position&);
-    
 } // namespace WebCore
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -986 +986 @@
 bool Editor::selectionStartHasStyle(CSSStyleDeclaration* style) const
 {
-    bool shouldUseFixedFontDefaultSize;
-    RefPtr<CSSMutableStyleDeclaration> selectionStyle = selectionComputedStyle(shouldUseFixedFontDefaultSize);
-    if (!selectionStyle)
-        return false;
-    return triStateOfStyle(style, selectionStyle.get()) == TrueTriState;
+    RefPtr<EditingStyle> selectionStyle = selectionStartStyle();
+    if (!selectionStyle || !selectionStyle->style())
+        return false;
+    return triStateOfStyle(style, selectionStyle->style()) == TrueTriState;
 }
 
 TriState Editor::selectionHasStyle(CSSStyleDeclaration* style) const
 {
+    if (!m_frame->selection()->isCaretOrRange())
+        return FalseTriState;
+
+    if (m_frame->selection()->isCaret()) {
+        RefPtr<EditingStyle> selectionStyle = selectionStartStyle();
+        if (!selectionStyle || !selectionStyle->style())
+            return FalseTriState;
+        return triStateOfStyle(style, selectionStyle->style());
+    }
+
     TriState state = FalseTriState;
-
-    if (!m_frame->selection()->isRange()) {
-        bool shouldUseFixedFontDefaultSize;
-        RefPtr<CSSMutableStyleDeclaration> selectionStyle = selectionComputedStyle(shouldUseFixedFontDefaultSize);
-        if (!selectionStyle)
-            return FalseTriState;
-        state = triStateOfStyle(style, selectionStyle.get());
-    } else {
-        for (Node* node = m_frame->selection()->start().deprecatedNode(); node; node = node->traverseNextNode()) {
-            RefPtr<CSSComputedStyleDeclaration> nodeStyle = computedStyle(node);
-            if (nodeStyle) {
-                TriState nodeState = triStateOfStyle(style, nodeStyle.get(), !node->isTextNode());
-                if (node == m_frame->selection()->start().deprecatedNode())
-                    state = nodeState;
-                else if (state != nodeState && node->isTextNode()) {
-                    state = MixedTriState;
-                    break;
-                }
+    for (Node* node = m_frame->selection()->start().deprecatedNode(); node; node = node->traverseNextNode()) {
+        RefPtr<CSSComputedStyleDeclaration> nodeStyle = computedStyle(node);
+        if (nodeStyle) {
+            TriState nodeState = triStateOfStyle(style, nodeStyle.get(), !node->isTextNode());
+            if (node == m_frame->selection()->start().deprecatedNode())
+                state = nodeState;
+            else if (state != nodeState && node->isTextNode()) {
+                state = MixedTriState;
+                break;
             }
-            if (node == m_frame->selection()->end().deprecatedNode())
-                break;
         }
+        if (node == m_frame->selection()->end().deprecatedNode())
+            break;
     }
 
@@ -1041 +1041 @@
 String Editor::selectionStartCSSPropertyValue(int propertyID)
 {
-    bool shouldUseFixedFontDefaultSize = false;
-    RefPtr<CSSMutableStyleDeclaration> selectionStyle = selectionComputedStyle(shouldUseFixedFontDefaultSize);
-    if (!selectionStyle)
+    RefPtr<EditingStyle> selectionStyle = selectionStartStyle();
+    if (!selectionStyle->style())
         return String();
 
-    String value = selectionStyle->getPropertyValue(propertyID);
+    String value = selectionStyle->style()->getPropertyValue(propertyID);
 
     // If background color is transparent, traverse parent nodes until we hit a different value or document root
     // Also, if the selection is a range, ignore the background color at the start of selection,
     // and find the background color of the common ancestor.
-    if (propertyID == CSSPropertyBackgroundColor && (m_frame->selection()->isRange() || hasTransparentBackgroundColor(selectionStyle.get()))) {
+    if (propertyID == CSSPropertyBackgroundColor && (m_frame->selection()->isRange() || hasTransparentBackgroundColor(selectionStyle->style()))) {
         RefPtr<Range> range(m_frame->selection()->toNormalizedRange());
         ExceptionCode ec = 0;
         for (Node* ancestor = range->commonAncestorContainer(ec); ancestor; ancestor = ancestor->parentNode()) {
-            selectionStyle = computedStyle(ancestor)->copy();
-            if (!hasTransparentBackgroundColor(selectionStyle.get())) {
-                value = selectionStyle->getPropertyValue(CSSPropertyBackgroundColor);
-                break;
-            }
+            RefPtr<CSSComputedStyleDeclaration> ancestorStyle = computedStyle(ancestor);
+            if (!hasTransparentBackgroundColor(ancestorStyle.get()))
+                return ancestorStyle->getPropertyValue(CSSPropertyBackgroundColor);
         }
     }
 
     if (propertyID == CSSPropertyFontSize) {
-        RefPtr<CSSValue> cssValue = selectionStyle->getPropertyCSSValue(CSSPropertyFontSize);
+        RefPtr<CSSValue> cssValue = selectionStyle->style()->getPropertyCSSValue(CSSPropertyFontSize);
         if (cssValue->isPrimitiveValue()) {
             value = String::number(legacyFontSizeFromCSSValue(m_frame->document(), static_cast<CSSPrimitiveValue*>(cssValue.get()),
-                shouldUseFixedFontDefaultSize, AlwaysUseLegacyFontSize));
+                selectionStyle->shouldUseFixedDefaultFontSize(), AlwaysUseLegacyFontSize));
         }
     }
@@ -3177 +3174 @@
 }
 
-PassRefPtr<CSSMutableStyleDeclaration> Editor::selectionComputedStyle(bool& shouldUseFixedFontDefaultSize) const
+PassRefPtr<EditingStyle> Editor::selectionStartStyle() const
 {
     if (m_frame->selection()->isNone())
@@ -3197 +3194 @@
         return 0;
 
-    RefPtr<Element> styleElement = element;
-    RefPtr<CSSComputedStyleDeclaration> style = computedStyle(styleElement.release());
-    RefPtr<CSSMutableStyleDeclaration> mutableStyle = style->copy();
-    shouldUseFixedFontDefaultSize = style->useFixedFontDefaultSize();
-
-    if (!m_frame->selection()->typingStyle())
-        return mutableStyle;
-
-    RefPtr<EditingStyle> typingStyle = m_frame->selection()->typingStyle()->copy();
-    typingStyle->prepareToApplyAt(position);
-    mutableStyle->merge(typingStyle->style());
-
-    return mutableStyle;
+    RefPtr<EditingStyle> style = EditingStyle::create(element, EditingStyle::AllProperties);
+    style->mergeTypingStyle(m_frame->document());
+    return style;
 }
 

trunk/Source/WebCore/editing/Editor.h

@@ -366 +366 @@
     void setMarkedTextMatchesAreHighlighted(bool);
 
-    PassRefPtr<CSSMutableStyleDeclaration> selectionComputedStyle(bool& shouldUseFixedFontDefaultSize) const;
+    PassRefPtr<EditingStyle> selectionStartStyle() const;
 
     void textFieldDidBeginEditing(Element*);

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -133 +133 @@
 {
     ExceptionCode ec = 0;
-    bool shouldUseFixedFontDefaultSize;
-    RefPtr<CSSMutableStyleDeclaration> selectionStyle = frame->editor()->selectionComputedStyle(shouldUseFixedFontDefaultSize);
-    if (!selectionStyle)
-        return false;
-
-    RefPtr<CSSValue> selectedCSSValue = selectionStyle->getPropertyCSSValue(propertyID);
+    RefPtr<EditingStyle> selectionStyle = frame->editor()->selectionStartStyle();
+    if (!selectionStyle || !selectionStyle->style())
+        return false;
+
+    RefPtr<CSSValue> selectedCSSValue = selectionStyle->style()->getPropertyCSSValue(propertyID);
     String newStyle = "none";
     if (selectedCSSValue->isValueList()) {

trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

@@ -27 +27 @@
 #include "InsertLineBreakCommand.h"
 
-#include "CSSMutableStyleDeclaration.h"
 #include "Document.h"
 #include "Frame.h"

trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -79 +79 @@
     if (!isStartOfParagraph(visiblePos) && !isEndOfParagraph(visiblePos))
         return;
-    
-    m_style = editingStyleIncludingTypingStyle(pos);
+
+    ASSERT(pos.isNotNull());
+    m_style = EditingStyle::create(pos);
+    m_style->mergeTypingStyle(pos.anchorNode()->document());
 }
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -798 +798 @@
         m_matchStyle = false;
     
-    if (m_matchStyle)
-        m_insertionStyle = editingStyleIncludingTypingStyle(selection.start());
+    if (m_matchStyle) {
+        m_insertionStyle = EditingStyle::create(selection.start());
+        m_insertionStyle->mergeTypingStyle(document());
+    }
 
     VisiblePosition visibleStart = selection.visibleStart();