Changeset 100189 in webkit

Timestamp:

Nov 14, 2011, 2:19:24 PM (15 years ago)

Author:

leviw@chromium.org

Message:

Reverting lengths to being stored as pixel values for the specified zoom level and adopting an enclosingIntRect model for reporting sizes in RenderTreeAsText. This vastly lowers the number of failing layout tests on our branch.

Location:

branches/subpixellayout/Source/WebCore

Files:

• css/CSSPrimitiveValue.cpp (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)

branches/subpixellayout/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -346 +346 @@
 {
     // FIXME: Length.h no longer expects 28 bit integers, so these bounds should be INT_MAX and INT_MIN
-    return Length(static_cast<float>(computeLengthDouble(style, rootStyle, multiplier, computingFontSize)), Fixed);
+    return Length(roundForImpreciseConversion<int, intMaxForLength, intMinForLength>(computeLengthDouble(style, rootStyle, multiplier, computingFontSize)), Fixed);
 }
 

branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -314 +314 @@
         r.move(0, -toRenderTableCell(o.containingBlock())->intrinsicPaddingBefore());
 
+    // FIXME: Convert layout test results to report sub-pixel values, in the meantime using enclosingIntRect
+    // for consistency with old results.
+    r = enclosingIntRect(r);
     ts << " " << r;