Changeset 67102 in webkit

Timestamp:

Sep 9, 2010 11:55:13 AM (14 years ago)

Author:

rniwa@webkit.org

Message:

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

Reviewed by Darin Adler.

QueryCommandValue('FontSize') returns pixel values instead of IE font numbers
​https://bugs.webkit.org/show_bug.cgi?id=21033

Modified selectionStartCSSPropertyValue to return legacy font size instead of pixel size.
To implement the conversion between pixel font size and legacy font size,
added legacyFontSize to CSSStyleSelector with a helper static function findNearestLegacyFontSize.

Fixed a bug in selectionComputedStyle where it obtains the style of the previous editing position
even when the selection is a range. This change revealed a crash in executeToggleStyleInList,
which was also fixed.

Test: editing/execCommand/query-font-size.html

• css/CSSComputedStyleDeclaration.cpp: (WebCore::CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword): Corrected style. (WebCore::CSSComputedStyleDeclaration::useFixedFontDefaultSize): Added.
• css/CSSComputedStyleDeclaration.h:
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::fontSizeForKeyword): Renamed fixed/monospace to shouldUseFixedDefaultSize. (WebCore::findNearestLegacyFontSize): Added, a helper for legacyFontSize. (WebCore::CSSStyleSelector::legacyFontSize): Added.
• css/CSSStyleSelector.h:
• editing/Editor.cpp: (WebCore::Editor::selectionStartCSSPropertyValue): Added a conversion from pixel to legacy font size.
• editing/EditorCommand.cpp: (WebCore::executeToggleStyleInList): Crash fix.
• page/Frame.cpp: (WebCore::Frame::selectionComputedStyle): See above.

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

Reviewed by Darin Adler.

queryCommandValue('FontSize') returns pixel values instead of IE font numbers
​https://bugs.webkit.org/show_bug.cgi?id=21033

Added a test to ensure queryCommandValue('fontSize') returns legacy font size
for both variable width and fixed width fonts.

• editing/execCommand/query-font-size-expected.txt: Added.
• editing/execCommand/query-font-size.html: Added.
• fast/serializer: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/query-font-size-expected.txt (added)
• LayoutTests/editing/execCommand/query-font-size.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• WebCore/css/CSSComputedStyleDeclaration.h (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (3 diffs)
• WebCore/css/CSSStyleSelector.h (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (3 diffs)
• WebCore/editing/EditorCommand.cpp (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        queryCommandValue('FontSize') returns pixel values instead of IE font numbers
+        https://bugs.webkit.org/show_bug.cgi?id=21033
+
+        Added a test to ensure queryCommandValue('fontSize') returns legacy font size
+        for both variable width and fixed width fonts.
+
+        * editing/execCommand/query-font-size-expected.txt: Added.
+        * editing/execCommand/query-font-size.html: Added.
+        * fast/serializer: Added.
+
 2010-09-09  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        QueryCommandValue('FontSize') returns pixel values instead of IE font numbers
+        https://bugs.webkit.org/show_bug.cgi?id=21033
+
+        Modified selectionStartCSSPropertyValue to return legacy font size instead of pixel size.
+        To implement the conversion between pixel font size and legacy font size,
+        added legacyFontSize to CSSStyleSelector with a helper static function findNearestLegacyFontSize.
+
+        Fixed a bug in selectionComputedStyle where it obtains the style of the previous editing position
+        even when the selection is a range. This change revealed a crash in executeToggleStyleInList,
+        which was also fixed.
+
+        Test: editing/execCommand/query-font-size.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword): Corrected style.
+        (WebCore::CSSComputedStyleDeclaration::useFixedFontDefaultSize): Added.
+        * css/CSSComputedStyleDeclaration.h:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::fontSizeForKeyword): Renamed fixed/monospace to shouldUseFixedDefaultSize.
+        (WebCore::findNearestLegacyFontSize): Added, a helper for legacyFontSize.
+        (WebCore::CSSStyleSelector::legacyFontSize): Added.
+        * css/CSSStyleSelector.h:
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectionStartCSSPropertyValue): Added a conversion from pixel to legacy font size.
+        * editing/EditorCommand.cpp:
+        (WebCore::executeToggleStyleInList): Crash fix.
+        * page/Frame.cpp:
+        (WebCore::Frame::selectionComputedStyle): See above.
+
 2010-09-09  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -572 +572 @@
 PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() const
 {
-    Node* node = m_node.get();
-    if (!node)
+    if (!m_node)
         return 0;
 
-    node->document()->updateLayoutIgnorePendingStylesheets();
-
-    RefPtr<RenderStyle> style = node->computedStyle(m_pseudoElementSpecifier);
+    m_node->document()->updateLayoutIgnorePendingStylesheets();
+
+    RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier);
     if (!style)
         return 0;
@@ -586 +585 @@
 
     return CSSPrimitiveValue::create(style->fontDescription().computedPixelSize(), CSSPrimitiveValue::CSS_PX);
+}
+
+bool CSSComputedStyleDeclaration::useFixedFontDefaultSize() const
+{
+    if (!m_node)
+        return false;
+
+    RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier);
+    if (!style)
+        return false;
+
+    return style->fontDescription().useFixedDefaultSize();
 }
 

trunk/WebCore/css/CSSComputedStyleDeclaration.h

@@ -59 +59 @@
     PassRefPtr<CSSValue> getPropertyCSSValue(int propertyID, EUpdateLayout) const;
     PassRefPtr<CSSValue> getFontSizeCSSValuePreferringKeyword() const;
+    bool useFixedFontDefaultSize() const;
 #if ENABLE(SVG)
     PassRefPtr<CSSValue> getSVGPropertyCSSValue(int propertyID, EUpdateLayout) const;

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -6312 +6312 @@
 static const float fontSizeFactors[totalKeywords] = { 0.60f, 0.75f, 0.89f, 1.0f, 1.2f, 1.5f, 2.0f, 3.0f };
 
-float CSSStyleSelector::fontSizeForKeyword(Document* document, int keyword, bool fixed)
+float CSSStyleSelector::fontSizeForKeyword(Document* document, int keyword, bool shouldUseFixedDefaultSize)
 {
     Settings* settings = document->settings();
@@ -6319 +6319 @@
 
     bool quirksMode = document->inQuirksMode();
-    int mediumSize = fixed ? settings->defaultFixedFontSize() : settings->defaultFontSize();
+    int mediumSize = shouldUseFixedDefaultSize ? settings->defaultFixedFontSize() : settings->defaultFontSize();
     if (mediumSize >= fontSizeTableMin && mediumSize <= fontSizeTableMax) {
         // Look up the entry in the table.
@@ -6330 +6330 @@
     float minLogicalSize = max(settings->minimumLogicalFontSize(), 1);
     return max(fontSizeFactors[keyword - CSSValueXxSmall]*mediumSize, minLogicalSize);
+}
+
+template<typename T>
+static int findNearestLegacyFontSize(int pixelFontSize, const T* table, int multiplier)
+{
+    // Ignore table[0] because xx-small does not correspond to any legacy font size.
+    for (int i = 1; i < totalKeywords - 1; i++) {
+        if (pixelFontSize * 2 < (table[i] + table[i + 1]) * multiplier)
+            return i;
+    }
+    return totalKeywords - 1;
+}
+
+int CSSStyleSelector::legacyFontSize(Document* document, int pixelFontSize, bool shouldUseFixedDefaultSize)
+{
+    Settings* settings = document->settings();
+    if (!settings)
+        return 1;
+
+    bool quirksMode = document->inQuirksMode();
+    int mediumSize = shouldUseFixedDefaultSize ? settings->defaultFixedFontSize() : settings->defaultFontSize();
+    if (mediumSize >= fontSizeTableMin && mediumSize <= fontSizeTableMax) {
+        int row = mediumSize - fontSizeTableMin;
+        return findNearestLegacyFontSize<int>(pixelFontSize, quirksMode ? quirksFontSizeTable[row] : strictFontSizeTable[row], 1);
+    }
+
+    return findNearestLegacyFontSize<float>(pixelFontSize, fontSizeFactors, mediumSize);
 }
 

trunk/WebCore/css/CSSStyleSelector.h

@@ -123 +123 @@
         PassRefPtr<CSSRuleList> pseudoStyleRulesForElement(Element*, PseudoId, bool authorOnly);
 
+        // Given a font size in pixel, this function will return legacy font size between 1 and 7.
+        static int legacyFontSize(Document*, int pixelFontSize, bool shouldUseFixedDefaultSize);
+
     private:
         // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this function will return
         // the correct font size scaled relative to the user's default (medium).
-        static float fontSizeForKeyword(Document*, int keyword, bool monospace);
+        static float fontSizeForKeyword(Document*, int keyword, bool shouldUseFixedDefaultSize);
 
         // When the CSS keyword "larger" is used, this function will attempt to match within the keyword

trunk/WebCore/editing/Editor.cpp

@@ -34 +34 @@
 #include "CSSProperty.h"
 #include "CSSPropertyNames.h"
+#include "CSSStyleSelector.h"
 #include "CSSValueKeywords.h"
 #include "CharacterNames.h"
@@ -939 +940 @@
 {
     Node* nodeToRemove;
-    RefPtr<CSSStyleDeclaration> selectionStyle = m_frame->selectionComputedStyle(nodeToRemove);
+    RefPtr<CSSComputedStyleDeclaration> selectionStyle = m_frame->selectionComputedStyle(nodeToRemove);
     if (!selectionStyle)
         return String();
@@ -964 +965 @@
             }
         }
+    }
+
+    if (propertyID == CSSPropertyFontSize) {
+        RefPtr<CSSValue> value = selectionStyle->getPropertyCSSValue(CSSPropertyFontSize);
+        ASSERT(value->isPrimitiveValue());
+        int fontPixelSize = static_cast<CSSPrimitiveValue*>(value.get())->getIntValue(CSSPrimitiveValue::CSS_PX);
+        int size = CSSStyleSelector::legacyFontSize(m_frame->document(), fontPixelSize, selectionStyle->useFixedFontDefaultSize());
+        return String::number(size);
     }
 

trunk/WebCore/editing/EditorCommand.cpp

@@ -134 +134 @@
     Node* nodeToRemove = 0;
     RefPtr<CSSComputedStyleDeclaration> selectionStyle = frame->selectionComputedStyle(nodeToRemove);
+    if (!selectionStyle)
+        return false;
+
     RefPtr<CSSValue> selectedCSSValue = selectionStyle->getPropertyCSSValue(propertyID);
     String newStyle = "none";

trunk/WebCore/page/Frame.cpp

@@ -746 +746 @@
     Position pos = range->editingStartPosition();
 
+    // If the pos is at the end of a text node, then this node is not fully selected.
+    // Move it to the next deep equivalent position to avoid removing the style from this node.
+    // e.g. if pos was at Position("hello", 5) in <b>hello<div>world</div></b>, we want Position("world", 0) instead.
+    // We only do this for range because caret at Position("hello", 5) in <b>hello</b>world should give you font-weight: bold.
+    Node* posNode = pos.containerNode();
+    if (selection()->isRange() && posNode && posNode->isTextNode() && pos.computeOffsetInContainerNode() == posNode->maxCharacterOffset())
+        pos = nextVisuallyDistinctCandidate(pos);
+
     Element *elem = pos.element();
     if (!elem)