Changeset 113645 in webkit

Timestamp:

Apr 9, 2012 5:03:01 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Prepare html classes for sub-pixel LayoutUnits
​https://bugs.webkit.org/show_bug.cgi?id=83491

Reviewed by Eric Seidel.

This patch brings the entire HTML folder up to the current state of the subpixellayout branch. Adding
an intValue flavor of Length that maps to the current value function was also necessary to get us
there. See ​https://trac.webkit.org/wiki/LayoutUnit and the descriptions below for details.

No new tests. No change in behavior.

• html/HTMLMarqueeElement.cpp:

(WebCore::HTMLMarqueeElement::scrollAmount): Fixes a compiler error when length returns a float, as
we intend it to do when switching to sub-pixel layout.

• html/ImageDocument.cpp:

(WebCore::ImageDocumentParser::finish): imageSize is always integral.

• platform/Length.h:

(WebCore::Length::Length): Added a constructor that takes a FractionalLayoutUnit.
(Length):
(WebCore::Length::intValue): Currently maps directly to Length::value, but the current logic of value
will be migrated here when value is changed to return a float.
(WebCore::Length::setValue): Added a variant that takes a FractionalLayoutUnit.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMarqueeElement.cpp (modified) (1 diff)
• html/ImageDocument.cpp (modified) (1 diff)
• platform/Length.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-09  Levi Weintraub  <leviw@chromium.org>
+
+        Prepare html classes for sub-pixel LayoutUnits
+        https://bugs.webkit.org/show_bug.cgi?id=83491
+
+        Reviewed by Eric Seidel.
+
+        This patch brings the entire HTML folder up to the current state of the subpixellayout branch. Adding
+        an intValue flavor of Length that maps to the current value function was also necessary to get us
+        there. See https://trac.webkit.org/wiki/LayoutUnit and the descriptions below for details.
+
+        No new tests. No change in behavior.
+
+        * html/HTMLMarqueeElement.cpp:
+        (WebCore::HTMLMarqueeElement::scrollAmount): Fixes a compiler error when length returns a float, as
+        we intend it to do when switching to sub-pixel layout.
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocumentParser::finish): imageSize is always integral.
+        * platform/Length.h:
+        (WebCore::Length::Length): Added a constructor that takes a FractionalLayoutUnit.
+        (Length):
+        (WebCore::Length::intValue): Currently maps directly to Length::value, but the current logic of value
+        will be migrated here when value is changed to return a float.
+        (WebCore::Length::setValue): Added a variant that takes a FractionalLayoutUnit.
+
 2012-04-09  Andrew Lo  <anlo@rim.com>
 

trunk/Source/WebCore/html/HTMLMarqueeElement.cpp

@@ -126 +126 @@
     bool ok;
     int scrollAmount = fastGetAttribute(scrollamountAttr).toInt(&ok);
-    return ok && scrollAmount >= 0 ? scrollAmount : RenderStyle::initialMarqueeIncrement().value();
+    return ok && scrollAmount >= 0 ? scrollAmount : RenderStyle::initialMarqueeIncrement().intValue();
 }
     

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -156 +156 @@
         // Report the natural image size in the page title, regardless of zoom
         // level.
-        LayoutSize size = cachedImage->imageSizeForRenderer(document()->imageElement()->renderer(), 1.0f);
+        IntSize size = cachedImage->imageSizeForRenderer(document()->imageElement()->renderer(), 1.0f);
         if (size.width()) {
             // Compute the title, we use the decoded filename of the resource, falling

trunk/Source/WebCore/platform/Length.h

@@ -25 +25 @@
 
 #include "AnimationUtilities.h"
+#include "LayoutTypes.h"
 #include <wtf/Assertions.h>
 #include <wtf/FastAllocBase.h>
@@ -56 +57 @@
     }
     
+    Length(FractionalLayoutUnit v, LengthType t, bool q = false)
+        : m_floatValue(v.toFloat()), m_quirk(q), m_type(t), m_isFloat(true)
+    {
+    }
+    
     Length(float v, LengthType t, bool q = false)
     : m_floatValue(v), m_quirk(q), m_type(t), m_isFloat(true)
@@ -113 +119 @@
     }
 
+    // FIXME: When we switch to sub-pixel layout, value will return float by default, and this will inherit
+    // the current implementation of value().
+    int intValue() const
+    {
+        return value();
+    }
+
     float percent() const
     {
@@ -146 +159 @@
 
     void setValue(LengthType t, float value)
+    {
+        m_type = t;
+        m_floatValue = value;
+        m_isFloat = true;    
+    }
+
+    void setValue(LengthType t, FractionalLayoutUnit value)
     {
         m_type = t;