[webkit-changes] [112452] branches/subpixellayout/Source/WebCore

[eae]

Title: [112452] branches/subpixellayout/Source/WebCore

Revision

112452

Author

e...@chromium.org

Date

2012-03-28 15:12:50 -0700 (Wed, 28 Mar 2012)

Log Message

Cleanup RenderLayer and mac dom bindings on subpixel branch

Modified Paths

• branches/subpixellayout/Source/WebCore/bindings/objc/DOM.mm
• branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/bindings/objc/DOM.mm (112451 => 112452)

--- branches/subpixellayout/Source/WebCore/bindings/objc/DOM.mm	2012-03-28 22:11:47 UTC (rev 112451)
+++ branches/subpixellayout/Source/WebCore/bindings/objc/DOM.mm	2012-03-28 22:12:50 UTC (rev 112452)
@@ -258,7 +258,7 @@
     size_t size = rects.size();
     NSMutableArray *array = [NSMutableArray arrayWithCapacity:size];
     for (size_t i = 0; i < size; ++i)
-        [array addObject:[NSValue valueWithRect:FloatRect(rects[i])]];
+        [array addObject:[NSValue valueWithRect:rects[i]]];
     return array;
 }
 
@@ -390,7 +390,7 @@
     RefPtr<Range> range = Range::create(core(self)->document());
     WebCore::ExceptionCode ec = 0;
     range->selectNodeContents(core(self), ec);
-    Vector<IntRect> rects;
+    Vector<WebCore::IntRect> rects;
     range->textRects(rects);
     return kit(rects);
 }
@@ -430,7 +430,7 @@
 - (NSArray *)textRects
 {
     // FIXME: The call to updateLayoutIgnorePendingStylesheets should be moved into WebCore::Range.
-    Vector<IntRect> rects;
+    Vector<WebCore::IntRect> rects;
     core(self)->ownerDocument()->updateLayoutIgnorePendingStylesheets();
     core(self)->textRects(rects);
     return kit(rects);

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp (112451 => 112452)

--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp	2012-03-28 22:11:47 UTC (rev 112451)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp	2012-03-28 22:12:50 UTC (rev 112452)
@@ -1761,7 +1761,7 @@
         }
         LayoutUnit baseWidth = renderer->width() - (isBoxSizingBorder ? zeroLayoutUnit : renderer->borderAndPaddingWidth());
         baseWidth = baseWidth / zoomFactor;
-        styledElement->setInlineStyleProperty(CSSPropertyWidth, String::number((baseWidth + difference.width()).toFloat()) + "px", false);
+        styledElement->setInlineStyleProperty(CSSPropertyWidth, String::number(roundToInt(baseWidth + difference.width())) + "px", false);
     }
 
     if (resize != RESIZE_HORIZONTAL && difference.height()) {
@@ -1772,7 +1772,7 @@
         }
         LayoutUnit baseHeight = renderer->height() - (isBoxSizingBorder ? zeroLayoutUnit : renderer->borderAndPaddingHeight());
         baseHeight = baseHeight / zoomFactor;
-        styledElement->setInlineStyleProperty(CSSPropertyHeight, String::number((baseHeight + difference.height()).toFloat()) + "px", false);
+        styledElement->setInlineStyleProperty(CSSPropertyHeight, String::number(roundToInt(baseHeight + difference.height())) + "px", false);
     }
 
     document->updateLayout();

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes