Changeset 98401 in webkit

Timestamp:

Oct 25, 2011, 3:51:34 PM (15 years ago)

Author:

leviw@chromium.org

Message:

Mac build fixes and adding pixelSnapped convenience methods for accessors that needed them.

Location:

branches/subpixellayout/Source

Files:

• WebCore/rendering/InlineFlowBox.cpp (modified) (4 diffs)
• WebCore/rendering/RenderBlock.cpp (modified) (4 diffs)
• WebCore/rendering/RenderBlock.h (modified) (4 diffs)
• WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (modified) (3 diffs)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

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

@@ -577 +577 @@
                                                LayoutUnit& lineTopIncludingMargins, LayoutUnit& lineBottomIncludingMargins, bool& hasAnnotationsBefore, bool& hasAnnotationsAfter, FontBaseline baselineType)
 {
-    // We need to use an integer top for positioning inline boxes because we can't round in painting in the inline box tree
-    int roundedTop = top.round();
+    // We need to snap the top to pixel bounds for positioning inline boxes because we can't round in painting in the inline box tree
+    LayoutUnit pixelSnappedTop = top.round();
     bool isRootBox = isRootInlineBox();
     if (isRootBox) {
         const FontMetrics& fontMetrics = renderer()->style(m_firstLine)->fontMetrics();
-        setLogicalTop(roundedTop + maxAscent - fontMetrics.ascent(baselineType));
+        setLogicalTop(pixelSnappedTop + maxAscent - fontMetrics.ascent(baselineType));
     }
 
@@ -604 +604 @@
         bool childAffectsTopBottomPos = true;
         if (curr->verticalAlign() == TOP)
-            curr->setLogicalTop(roundedTop);
+            curr->setLogicalTop(pixelSnappedTop);
         else if (curr->verticalAlign() == BOTTOM)
-            curr->setLogicalTop(roundedTop + maxHeight - curr->lineHeight());
+            curr->setLogicalTop(pixelSnappedTop + maxHeight - curr->lineHeight());
         else {
             if (!strictMode && inlineFlowBox && !inlineFlowBox->hasTextChildren() && !curr->boxModelObject()->hasInlineDirectionBordersOrPadding()
@@ -612 +612 @@
                 childAffectsTopBottomPos = false;
             LayoutUnit posAdjust = maxAscent - curr->baselinePosition(baselineType);
-            curr->setLogicalTop(curr->logicalTop() + roundedTop + posAdjust);
+            curr->setLogicalTop(curr->logicalTop() + pixelSnappedTop + posAdjust);
         }
 
@@ -684 +684 @@
         // line-height).
         if (inlineFlowBox)
-            inlineFlowBox->placeBoxesInBlockDirection(roundedTop, maxHeight, maxAscent, strictMode, lineTop, lineBottom, setLineTop,
+            inlineFlowBox->placeBoxesInBlockDirection(pixelSnappedTop, maxHeight, maxAscent, strictMode, lineTop, lineBottom, setLineTop,
                                                       lineTopIncludingMargins, lineBottomIncludingMargins, hasAnnotationsBefore, hasAnnotationsAfter, baselineType);
     }

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

@@ -3571 +3571 @@
     if (r->type() == FloatTypeValue && interval.low() <= m_value && m_value < interval.high()) {
         // All the objects returned from the tree should be already placed.
-        ASSERT(r->isPlaced() && m_renderer->logicalTopForFloat(r).round() <= m_value && m_renderer->logicalBottomForFloat(r).round() > m_value);
+        ASSERT(r->isPlaced() && m_renderer->pixelSnappedLogicalTopForFloat(r) <= m_value && m_renderer->pixelSnappedLogicalBottomForFloat(r) > m_value);
 
         if (FloatTypeValue == FloatingObject::FloatLeft 
-            && m_renderer->logicalRightForFloat(r).round() > m_offset) {
-            m_offset = m_renderer->logicalRightForFloat(r).round();
+            && m_renderer->pixelSnappedLogicalRightForFloat(r) > m_offset) {
+            m_offset = m_renderer->pixelSnappedLogicalRightForFloat(r);
             if (m_heightRemaining)
                 *m_heightRemaining = m_renderer->logicalBottomForFloat(r) - m_value;
@@ -3581 +3581 @@
 
         if (FloatTypeValue == FloatingObject::FloatRight
-            && m_renderer->logicalLeftForFloat(r).round() < m_offset) {
-            m_offset = m_renderer->logicalLeftForFloat(r).round();
+            && m_renderer->pixelSnappedLogicalRightForFloat(r) < m_offset) {
+            m_offset = m_renderer->pixelSnappedLogicalLeftForFloat(r);
             if (m_heightRemaining)
                 *m_heightRemaining = m_renderer->logicalBottomForFloat(r) - m_value;
@@ -3641 +3641 @@
 
         LayoutUnit rightFloatOffset = fixedOffset;
-        FloatIntervalSearchAdapter<FloatingObject::FloatRight> adapter(this, logicalTop.round(), rightFloatOffset, heightRemaining);
+        FloatIntervalSearchAdapter<FloatingObject::FloatRight> adapter(this, logicalTop, rightFloatOffset, heightRemaining);
         m_floatingObjects->placedFloatsTree().allOverlapsWithAdapter(adapter);
         right = min(right, rightFloatOffset);
@@ -6803 +6803 @@
 {
     if (m_horizontalWritingMode)
-        return RenderBlock::FloatingObjectInterval(floatingObject->y().round(), floatingObject->maxY().round(), floatingObject);
-    return RenderBlock::FloatingObjectInterval(floatingObject->x().round(), floatingObject->maxX().round(), floatingObject);
+        return RenderBlock::FloatingObjectInterval(floatingObject->pixelSnappedY(), floatingObject->pixelSnappedMaxY(), floatingObject);
+    return RenderBlock::FloatingObjectInterval(floatingObject->pixelSnappedX(), floatingObject->pixelSnappedMaxX(), floatingObject);
 }
 

branches/subpixellayout/Source/WebCore/rendering/RenderBlock.h

@@ -164 +164 @@
             : logicalWidth() - logicalRightOffsetForLine(position, firstLine);
     }
+
+    int pixelSnappedLogicalRightOffsetForLine(LayoutUnit position, bool firstLine) const 
+    {
+        return logicalRightOffsetForLine(position, logicalRightOffsetForContent(position), firstLine, 0).round();
+    }
+    int pixelSnappedLogicalLeftOffsetForLine(LayoutUnit position, bool firstLine) const 
+    {
+        return logicalLeftOffsetForLine(position, logicalLeftOffsetForContent(position), firstLine, 0).round();
+    }
     
     LayoutUnit startAlignedOffsetForLine(RenderBox* child, LayoutUnit position, bool firstLine);
@@ -542 +551 @@
         LayoutUnit height() const { return m_frameRect.height(); }
 
+        int pixelSnappedX() const { return x().round(); }
+        int pixelSnappedMaxX() const { return maxX().round(); }
+        int pixelSnappedY() const { return y().round(); }
+        int pixelSnappedMaxY() const { return maxY().round(); }
+        int pixelSnappedWidth() const { return width().round(); }
+        int pixelSnappedHeight() const { return height().round(); }
+
         void setX(LayoutUnit x) { ASSERT(!isInPlacedTree()); m_frameRect.setX(x); }
         void setY(LayoutUnit y) { ASSERT(!isInPlacedTree()); m_frameRect.setY(y); }
@@ -575 +591 @@
     LayoutUnit logicalRightForFloat(const FloatingObject* child) const { return isHorizontalWritingMode() ? child->maxX() : child->maxY(); }
     LayoutUnit logicalWidthForFloat(const FloatingObject* child) const { return isHorizontalWritingMode() ? child->width() : child->height(); }
+
+    int pixelSnappedLogicalTopForFloat(const FloatingObject* child) const { return logicalTopForFloat(child).round(); }
+    int pixelSnappedLogicalBottomForFloat(const FloatingObject* child) const { return logicalBottomForFloat(child).round(); }
+    int pixelSnappedLogicalLeftForFloat(const FloatingObject* child) const { return logicalLeftForFloat(child).round(); }
+    int pixelSnappedLogicalRightForFloat(const FloatingObject* child) const { return logicalRightForFloat(child).round(); }
+    int pixelSnappedLogicalWidthForFloat(const FloatingObject* child) const { return logicalWidthForFloat(child).round(); }
     void setLogicalTopForFloat(FloatingObject* child, LayoutUnit logicalTop)
     {
@@ -932 +954 @@
         }
         
+        FloatIntervalSearchAdapter(const RenderBlock* renderer, LayoutUnit value, LayoutUnit& offset, LayoutUnit* heightRemaining)
+            : m_renderer(renderer)
+            , m_value(value.round())
+            , m_offset(offset)
+            , m_heightRemaining(heightRemaining)
+        {
+        }
+        
         inline int lowValue() const { return m_value; }
         inline int highValue() const { return m_value; }

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

@@ -751 +751 @@
 {
     ETextAlign textAlign = textAlignmentForLine(!reachedEnd && !lineBox->endsWithBreak());
-    float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), lineInfo.isFirstLine()).round();
-    float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), lineInfo.isFirstLine()).round() - logicalLeft;
+    float logicalLeft = pixelSnappedLogicalLeftOffsetForLine(logicalHeight(), lineInfo.isFirstLine());
+    float availableLogicalWidth = pixelSnappedLogicalRightOffsetForLine(logicalHeight(), lineInfo.isFirstLine()) - logicalLeft;
 
     bool needsWordSpacing = false;

branches/subpixellayout/Source/WebKit/mac/WebView/WebView.mm

@@ -2449 +2449 @@
         return nil;
 
-    const Vector<IntRect>& repaintRects = view->trackedRepaintRects();
+    const Vector<WebCore::FixedRect>& repaintRects = view->trackedRepaintRects();
     NSMutableArray* rectsArray = [[NSMutableArray alloc] initWithCapacity:repaintRects.size()];
     

branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp

@@ -304 +304 @@
         GraphicsContextStateSaver stateSaver(*graphicsContext);
         IntRect scrollbarDirtyRect = dirtyRect;
-        scrollbarDirtyRect.moveBy(pluginView()->frameRect().location());
+        scrollbarDirtyRect.moveBy(roundedIntPoint(pluginView()->frameRect().location()));
         graphicsContext->translate(-pluginView()->frameRect().x(), -pluginView()->frameRect().y());
 
@@ -314 +314 @@
     }
 
-    IntRect dirtyCornerRect = intersection(scrollCornerRect(), dirtyRect);
+    IntRect dirtyCornerRect = intersection(enclosingIntRect(scrollCornerRect()), dirtyRect);
     ScrollbarTheme::theme()->paintScrollCorner(0, graphicsContext, dirtyCornerRect);
 }
@@ -665 +665 @@
 IntPoint BuiltInPDFView::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
 {
-    IntPoint point = pluginView()->frame()->view()->convertToRenderer(pluginView()->renderer(), parentPoint);
+    WebCore::FixedPoint point = pluginView()->frame()->view()->convertToRenderer(pluginView()->renderer(), parentPoint);
     point.move(pluginView()->location() - scrollbar->location());
 
-    return point;
+    return roundedIntPoint(point);
 }
 

branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -575 +575 @@
     } else {
         // FIXME: We should try to intersect the dirty rect with the plug-in's clip rect here.
-        paintRect = IntRect(IntPoint(), frameRect().size());
+        paintRect = IntRect(IntPoint(), expandedIntSize(frameRect().size()));
     }
 

branches/subpixellayout/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -420 +420 @@
         return ImmutableArray::create();
 
-    const Vector<IntRect>& rects = view->trackedRepaintRects();
+    const Vector<WebCore::FixedRect>& rects = view->trackedRepaintRects();
     size_t size = rects.size();
     if (!size)