Changeset 112061 in webkit

Timestamp:

Mar 26, 2012, 1:35:42 AM (15 years ago)

Author:

leviw@chromium.org

Message:

Second round of RenderListMarker cleanup. Properly measuring text with integers.

File:

• branches/subpixellayout/Source/WebCore/rendering/RenderListMarker.cpp (modified) (5 diffs)

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

@@ -1111 +1111 @@
         return;
 
-    IntPoint boxOrigin(roundedIntPoint(paintOffset + location()));
-    IntRect overflowRect(pixelSnappedIntRect(visualOverflowRect()));
+    LayoutPoint boxOrigin(paintOffset + location());
+    LayoutRect overflowRect(visualOverflowRect());
     overflowRect.moveBy(boxOrigin);
     overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
 
-    if (!paintInfo.rect.intersects(overflowRect))
+    if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect)))
         return;
 
-    IntRect box(boxOrigin, frameRect().pixelSnappedSize());
+    LayoutRect box(boxOrigin, size());
     
     IntRect marker = getRelativeMarkerRect();
-    marker.moveBy(boxOrigin);
+    marker.moveBy(roundedIntPoint(boxOrigin));
 
     GraphicsContext* context = paintInfo.context;
@@ -1259 +1259 @@
     GraphicsContextStateSaver stateSaver(*context, false);
     if (!style()->isHorizontalWritingMode()) {
-        marker.moveBy(-boxOrigin);
+        marker.moveBy(roundedIntPoint(-boxOrigin));
         marker = marker.transposedRect();
-        marker.move(box.x(), box.y() - logicalHeight());
+        marker.moveBy(IntPoint(roundToInt(box.x()), roundToInt(box.y() - logicalHeight())));
         stateSaver.save();
         context->translate(marker.x(), marker.maxY());
@@ -1268 +1268 @@
     }
 
-    LayoutPoint textOrigin = LayoutPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
+    IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
 
     if (type == Asterisks || type == Footnotes)
@@ -1287 +1287 @@
         const UChar suffix = listMarkerSuffix(type, m_listItem->value());
         if (style()->isLeftToRightDirection()) {
-            LayoutUnit width = font.width(textRun);
+            int width = font.width(textRun);
             context->drawText(font, textRun, textOrigin);
             UChar suffixSpace[2] = { suffix, ' ' };
@@ -1294 +1294 @@
             UChar spaceSuffix[2] = { ' ', suffix };
             TextRun spaceSuffixRun = RenderBlock::constructTextRun(this, font, spaceSuffix, 2, style());
-            LayoutUnit width = font.width(spaceSuffixRun);
+            int width = font.width(spaceSuffixRun);
             context->drawText(font, spaceSuffixRun, textOrigin);
             context->drawText(font, textRun, textOrigin + IntSize(width, 0));