Title: [111701] branches/subpixellayout/Source/WebCore/rendering/RenderListMarker.cpp
- Revision
- 111701
- Author
- le...@chromium.org
- Date
- 2012-03-22 08:09:50 -0700 (Thu, 22 Mar 2012)
Log Message
Fixing pixel snapping in RenderListMarker and correcting the use of LayoutUnits mixed with fonts.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderListMarker.cpp (111700 => 111701)
--- branches/subpixellayout/Source/WebCore/rendering/RenderListMarker.cpp 2012-03-22 15:09:08 UTC (rev 111700)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderListMarker.cpp 2012-03-22 15:09:50 UTC (rev 111701)
@@ -1094,8 +1094,7 @@
{
InlineBox* box = inlineBoxWrapper();
if (!box)
- // FIXME: Should pixel snap?
- return IntRect(IntPoint(), expandedIntSize(size()));
+ return IntRect(IntPoint(), frameRect().pixelSnappedSize());
RootInlineBox* root = m_inlineBoxWrapper->root();
int newLogicalTop = root->block()->style()->isFlippedBlocksWritingMode() ? m_inlineBoxWrapper->logicalBottom() - root->selectionBottom() : root->selectionTop() - m_inlineBoxWrapper->logicalTop();
if (root->block()->style()->isHorizontalWritingMode())
@@ -1350,7 +1349,7 @@
if (isImage()) {
// FIXME: This is a somewhat arbitrary width. Generated images for markers really won't become particularly useful
// until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box.
- LayoutUnit bulletWidth = fontMetrics.ascent() / 2;
+ int bulletWidth = fontMetrics.ascent() / 2;
m_image->setContainerSizeForRenderer(this, IntSize(bulletWidth, bulletWidth), style()->effectiveZoom());
LayoutSize imageSize = m_image->imageSize(this, style()->effectiveZoom());
m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
