Changeset 90600 in webkit
- Timestamp:
- Jul 7, 2011 4:17:55 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r90599 r90600 1 2011-07-07 Levi Weintraub <leviw@chromium.org> 2 3 Switch remaining paint functions to new layout types 4 https://bugs.webkit.org/show_bug.cgi?id=64116 5 6 Reviewed by Eric Seidel. 7 8 Switching all functions with IntPoint paintOffsets to the new Layout types. 9 10 No new tests, no functionality changes. 11 12 * rendering/EllipsisBox.cpp: 13 (WebCore::EllipsisBox::paint): 14 (WebCore::EllipsisBox::paintSelection): 15 * rendering/EllipsisBox.h: 16 * rendering/InlineBox.cpp: 17 (WebCore::InlineBox::paint): 18 * rendering/InlineBox.h: 19 * rendering/InlineFlowBox.cpp: 20 (WebCore::InlineFlowBox::paint): 21 * rendering/InlineFlowBox.h: 22 * rendering/InlineTextBox.cpp: 23 (WebCore::InlineTextBox::paint): 24 (WebCore::InlineTextBox::paintCustomHighlight): 25 * rendering/InlineTextBox.h: 26 * rendering/LayoutTypes.h: 27 * rendering/RenderBlock.cpp: 28 (WebCore::RenderBlock::paintColumnRules): 29 (WebCore::RenderBlock::paintColumnContents): 30 (WebCore::RenderBlock::paintContents): 31 (WebCore::RenderBlock::paintChildren): 32 (WebCore::RenderBlock::paintCaret): 33 (WebCore::RenderBlock::paintObject): 34 (WebCore::RenderBlock::paintFloats): 35 (WebCore::RenderBlock::paintEllipsisBoxes): 36 (WebCore::RenderBlock::paintContinuationOutlines): 37 (WebCore::RenderBlock::paintSelection): 38 * rendering/RenderBlock.h: 39 * rendering/RenderBox.cpp: 40 (WebCore::RenderBox::paintCustomHighlight): 41 * rendering/RenderBox.h: 42 * rendering/RenderInline.cpp: 43 (WebCore::RenderInline::paintOutline): 44 (WebCore::RenderInline::paintOutlineForLine): 45 * rendering/RenderInline.h: 46 * rendering/RenderLayer.cpp: 47 (WebCore::RenderLayer::paintOverflowControls): 48 (WebCore::RenderLayer::paintScrollCorner): 49 (WebCore::RenderLayer::paintResizer): 50 * rendering/RenderLayer.h: 51 * rendering/RenderLineBoxList.cpp: 52 (WebCore::RenderLineBoxList::paint): 53 * rendering/RenderListBox.cpp: 54 (WebCore::RenderListBox::paintScrollbar): 55 (WebCore::RenderListBox::paintItemForeground): 56 (WebCore::RenderListBox::paintItemBackground): 57 * rendering/RenderListBox.h: 58 * rendering/RenderObject.cpp: 59 (WebCore::RenderObject::paintFocusRing): 60 (WebCore::RenderObject::paintOutline): 61 * rendering/RenderObject.h: 62 * rendering/RenderReplaced.cpp: 63 (WebCore::RenderReplaced::shouldPaint): 64 * rendering/RenderReplaced.h: 65 * rendering/RenderScrollbarPart.cpp: 66 (WebCore::RenderScrollbarPart::paintIntoRect): 67 * rendering/RenderScrollbarPart.h: 68 * rendering/RenderTableCell.cpp: 69 (WebCore::RenderTableCell::paintBackgroundsBehindCell): 70 * rendering/RenderTableSection.cpp: 71 (WebCore::RenderTableSection::paintCell): 72 * rendering/RenderTableSection.h: 73 * rendering/RenderTextControl.cpp: 74 (WebCore::RenderTextControl::paintPlaceholder): 75 * rendering/RootInlineBox.cpp: 76 (WebCore::RootInlineBox::paintEllipsisBox): 77 (WebCore::RootInlineBox::paintCustomHighlight): 78 (WebCore::RootInlineBox::paint): 79 * rendering/RootInlineBox.h: 80 * rendering/mathml/RenderMathMLBlock.cpp: 81 (WebCore::RenderMathMLBlock::paint): 82 * rendering/mathml/RenderMathMLFraction.cpp: 83 (WebCore::RenderMathMLFraction::paint): 84 * rendering/mathml/RenderMathMLRoot.cpp: 85 (WebCore::RenderMathMLRoot::paint): 86 * rendering/mathml/RenderMathMLSquareRoot.cpp: 87 (WebCore::RenderMathMLSquareRoot::paint): 88 1 89 2011-07-07 Steve VanDeBogart <vandebo@chromium.org> 2 90 -
trunk/Source/WebCore/rendering/EllipsisBox.cpp
r90515 r90600 31 31 namespace WebCore { 32 32 33 void EllipsisBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)33 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 34 34 { 35 35 GraphicsContext* context = paintInfo.context; … … 40 40 bool setShadow = false; 41 41 if (style->textShadow()) { 42 context->setShadow( IntSize(style->textShadow()->x(), style->textShadow()->y()),42 context->setShadow(LayoutSize(style->textShadow()->x(), style->textShadow()->y()), 43 43 style->textShadow()->blur(), style->textShadow()->color(), style->colorSpace()); 44 44 setShadow = true; … … 56 56 57 57 // FIXME: Why is this always LTR? Fix by passing correct text run flags below. 58 context->drawText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(x() + paintOffset.x(), y() + paintOffset.y() + style->fontMetrics().ascent()));58 context->drawText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + style->fontMetrics().ascent())); 59 59 60 60 // Restore the regular fill color. … … 67 67 if (m_markupBox) { 68 68 // Paint the markup box 69 IntPoint adjustedPaintOffset = paintOffset;69 LayoutPoint adjustedPaintOffset = paintOffset; 70 70 adjustedPaintOffset.move(x() + m_logicalWidth - m_markupBox->x(), 71 71 y() + style->fontMetrics().ascent() - (m_markupBox->y() + m_markupBox->renderer()->style(m_firstLine)->fontMetrics().ascent())); … … 82 82 } 83 83 84 void EllipsisBox::paintSelection(GraphicsContext* context, const IntPoint& paintOffset, RenderStyle* style, const Font& font)84 void EllipsisBox::paintSelection(GraphicsContext* context, const LayoutPoint& paintOffset, RenderStyle* style, const Font& font) 85 85 { 86 86 Color textColor = style->visitedDependentColor(CSSPropertyColor); … … 95 95 96 96 GraphicsContextStateSaver stateSaver(*context); 97 int top = root()->selectionTop(); 98 int h = root()->selectionHeight(); 97 LayoutUnit top = root()->selectionTop(); 98 LayoutUnit h = root()->selectionHeight(); 99 // FIXME: We'll need to apply the correct clip rounding here: https://bugs.webkit.org/show_bug.cgi?id=63656 99 100 context->clip(IntRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h)); 100 101 // FIXME: Why is this always LTR? Fix by passing correct text run flags below. -
trunk/Source/WebCore/rendering/EllipsisBox.h
r90515 r90600 40 40 } 41 41 42 virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);42 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom); 43 43 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom); 44 44 void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; } … … 48 48 virtual int height() const { return m_height; } 49 49 virtual RenderObject::SelectionState selectionState() { return m_selectionState; } 50 void paintSelection(GraphicsContext*, const IntPoint&, RenderStyle*, const Font&);50 void paintSelection(GraphicsContext*, const LayoutPoint&, RenderStyle*, const Font&); 51 51 52 52 int m_height; -
trunk/Source/WebCore/rendering/InlineBox.cpp
r90515 r90600 197 197 } 198 198 199 void InlineBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int /* lineTop */, int /*lineBottom*/)199 void InlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /* lineTop */, LayoutUnit /*lineBottom*/) 200 200 { 201 201 if (!paintInfo.shouldPaintWithinRoot(renderer()) || (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection)) 202 202 return; 203 203 204 IntPoint childPoint = paintOffset;204 LayoutPoint childPoint = paintOffset; 205 205 if (parent()->renderer()->style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock(). 206 206 childPoint = renderer()->containingBlock()->flipForWritingMode(toRenderBox(renderer()), childPoint, RenderBox::ParentToChildFlippingAdjustment); -
trunk/Source/WebCore/rendering/InlineBox.h
r90515 r90600 127 127 } 128 128 129 virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);129 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom); 130 130 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom); 131 131 -
trunk/Source/WebCore/rendering/InlineFlowBox.cpp
r90515 r90600 947 947 } 948 948 949 void InlineFlowBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)950 { 951 IntRect overflowRect(visualOverflowRect(lineTop, lineBottom));949 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 950 { 951 LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom)); 952 952 overflowRect.inflate(renderer()->maximalOutlineSize(paintInfo.phase)); 953 953 flipForWritingMode(overflowRect); -
trunk/Source/WebCore/rendering/InlineFlowBox.h
r90517 r90600 109 109 void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver); 110 110 void paintBoxShadow(GraphicsContext*, RenderStyle*, ShadowStyle, const LayoutRect&); 111 virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);111 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom); 112 112 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom); 113 113 -
trunk/Source/WebCore/rendering/InlineTextBox.cpp
r90596 r90600 467 467 } 468 468 469 void InlineTextBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int /*lineTop*/, int /*lineBottom*/)469 void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /*lineTop*/, LayoutUnit /*lineBottom*/) 470 470 { 471 471 if (isLineBreak() || !paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE || … … 475 475 ASSERT(paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintPhaseChildOutlines); 476 476 477 int logicalLeftSide = logicalLeftVisualOverflow();478 int logicalRightSide = logicalRightVisualOverflow();479 int logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x() : paintOffset.y());480 int logicalExtent = logicalRightSide - logicalLeftSide;481 482 int paintEnd = isHorizontal() ? paintInfo.rect.maxX() : paintInfo.rect.maxY();483 int paintStart = isHorizontal() ? paintInfo.rect.x() : paintInfo.rect.y();484 485 IntPoint adjustedPaintOffset = paintOffset;477 LayoutUnit logicalLeftSide = logicalLeftVisualOverflow(); 478 LayoutUnit logicalRightSide = logicalRightVisualOverflow(); 479 LayoutUnit logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x() : paintOffset.y()); 480 LayoutUnit logicalExtent = logicalRightSide - logicalLeftSide; 481 482 LayoutUnit paintEnd = isHorizontal() ? paintInfo.rect.maxX() : paintInfo.rect.maxY(); 483 LayoutUnit paintStart = isHorizontal() ? paintInfo.rect.x() : paintInfo.rect.y(); 484 485 LayoutPoint adjustedPaintOffset = paintOffset; 486 486 487 487 if (logicalStart >= paintEnd || logicalStart + logicalExtent <= paintStart) … … 506 506 // NOTE: WebKit's behavior differs from that of IE which appears to just overlay the ellipsis on top of the 507 507 // truncated string i.e. |Hello|CBA| -> |...lo|CBA| 508 int widthOfVisibleText = toRenderText(renderer())->width(m_start, m_truncation, textPos(), m_firstLine);509 int widthOfHiddenText = m_logicalWidth - widthOfVisibleText;510 // FIXME: The hit testing logic also needs to take this translation int account.511 IntSize truncationOffset(isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText, 0);508 LayoutUnit widthOfVisibleText = toRenderText(renderer())->width(m_start, m_truncation, textPos(), m_firstLine); 509 LayoutUnit widthOfHiddenText = m_logicalWidth - widthOfVisibleText; 510 // FIXME: The hit testing logic also needs to take this translation into account. 511 LayoutSize truncationOffset(isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText, 0); 512 512 adjustedPaintOffset.move(isHorizontal() ? truncationOffset : truncationOffset.transposedSize()); 513 513 } … … 522 522 FloatPoint boxOrigin = locationIncludingFlipping(); 523 523 boxOrigin.move(adjustedPaintOffset.x(), adjustedPaintOffset.y()); 524 FloatRect boxRect(boxOrigin, IntSize(logicalWidth(), logicalHeight()));524 FloatRect boxRect(boxOrigin, LayoutSize(logicalWidth(), logicalHeight())); 525 525 526 526 RenderCombineText* combinedText = styleToUse->hasTextCombine() && textRenderer()->isCombineText() && toRenderCombineText(textRenderer())->isCombined() ? toRenderCombineText(textRenderer()) : 0; … … 854 854 #if PLATFORM(MAC) 855 855 856 void InlineTextBox::paintCustomHighlight(const IntPoint& paintOffset, const AtomicString& type)856 void InlineTextBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type) 857 857 { 858 858 Frame* frame = renderer()->frame(); -
trunk/Source/WebCore/rendering/InlineTextBox.h
r90596 r90600 111 111 112 112 protected: 113 virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);114 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom);113 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom); 114 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom); 115 115 116 116 public: … … 170 170 void paintCompositionUnderline(GraphicsContext*, const FloatPoint& boxOrigin, const CompositionUnderline&); 171 171 #if PLATFORM(MAC) 172 void paintCustomHighlight(const IntPoint&, const AtomicString& type);172 void paintCustomHighlight(const LayoutPoint&, const AtomicString& type); 173 173 #endif 174 174 -
trunk/Source/WebCore/rendering/LayoutTypes.h
r90590 r90600 37 37 #define LayoutTypes_h 38 38 39 #include "FloatPoint.h"40 39 #include "FloatRect.h" 41 40 #include "IntRect.h" -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r90596 r90600 2294 2294 } 2295 2295 2296 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const IntPoint& paintOffset)2296 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 2297 2297 { 2298 2298 if (paintInfo.context->paintingDisabled()) … … 2302 2302 bool ruleTransparent = style()->columnRuleIsTransparent(); 2303 2303 EBorderStyle ruleStyle = style()->columnRuleStyle(); 2304 int ruleWidth = style()->columnRuleWidth();2305 int colGap = columnGap();2304 LayoutUnit ruleWidth = style()->columnRuleWidth(); 2305 LayoutUnit colGap = columnGap(); 2306 2306 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent && ruleWidth <= colGap; 2307 2307 if (!renderRule) … … 2311 2311 ColumnInfo* colInfo = columnInfo(); 2312 2312 unsigned colCount = columnCount(colInfo); 2313 int currLogicalLeftOffset = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth();2314 int ruleAdd = logicalLeftOffsetForContent();2315 int ruleLogicalLeft = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth();2313 LayoutUnit currLogicalLeftOffset = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth(); 2314 LayoutUnit ruleAdd = logicalLeftOffsetForContent(); 2315 LayoutUnit ruleLogicalLeft = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth(); 2316 2316 2317 2317 const AffineTransform& currentCTM = paintInfo.context->getCTM(); … … 2321 2321 LayoutRect colRect = columnRectAt(colInfo, i); 2322 2322 2323 int inlineDirectionSize = isHorizontalWritingMode() ? colRect.width() : colRect.height();2323 LayoutUnit inlineDirectionSize = isHorizontalWritingMode() ? colRect.width() : colRect.height(); 2324 2324 2325 2325 // Move to the next position. … … 2334 2334 // Now paint the column rule. 2335 2335 if (i < colCount - 1) { 2336 int ruleLeft = isHorizontalWritingMode() ? paintOffset.x() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : paintOffset.x() + borderBefore() + paddingBefore();2337 int ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleWidth : ruleLeft + contentWidth();2338 int ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd;2339 int ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleWidth;2336 LayoutUnit ruleLeft = isHorizontalWritingMode() ? paintOffset.x() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : paintOffset.x() + borderBefore() + paddingBefore(); 2337 LayoutUnit ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleWidth : ruleLeft + contentWidth(); 2338 LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd; 2339 LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleWidth; 2340 2340 drawLineForBoxSide(paintInfo.context, ruleLeft, ruleTop, ruleRight, ruleBottom, 2341 2341 style()->isLeftToRightDirection() ? BSLeft : BSRight, ruleColor, ruleStyle, 0, 0, antialias); … … 2346 2346 } 2347 2347 2348 void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const IntPoint& paintOffset, bool paintingFloats)2348 void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset, bool paintingFloats) 2349 2349 { 2350 2350 // We need to do multiple passes, breaking up our child painting into strips. … … 2354 2354 if (!colCount) 2355 2355 return; 2356 int currLogicalTopOffset = 0;2356 LayoutUnit currLogicalTopOffset = 0; 2357 2357 for (unsigned i = 0; i < colCount; i++) { 2358 2358 // For each rect, we clip to the rect, and then we adjust our coords. 2359 2359 LayoutRect colRect = columnRectAt(colInfo, i); 2360 2360 flipForWritingMode(colRect); 2361 int logicalLeftOffset = (isHorizontalWritingMode() ? colRect.x() : colRect.y()) - logicalLeftOffsetForContent();2362 IntSize offset = isHorizontalWritingMode() ? IntSize(logicalLeftOffset, currLogicalTopOffset) : IntSize(currLogicalTopOffset, logicalLeftOffset);2361 LayoutUnit logicalLeftOffset = (isHorizontalWritingMode() ? colRect.x() : colRect.y()) - logicalLeftOffsetForContent(); 2362 LayoutSize offset = isHorizontalWritingMode() ? LayoutSize(logicalLeftOffset, currLogicalTopOffset) : LayoutSize(currLogicalTopOffset, logicalLeftOffset); 2363 2363 colRect.moveBy(paintOffset); 2364 2364 PaintInfo info(paintInfo); … … 2373 2373 2374 2374 // Adjust our x and y when painting. 2375 IntPoint adjustedPaintOffset = paintOffset + offset;2375 LayoutPoint adjustedPaintOffset = paintOffset + offset; 2376 2376 if (paintingFloats) 2377 2377 paintFloats(info, adjustedPaintOffset, paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip); … … 2380 2380 } 2381 2381 2382 int blockDelta = (isHorizontalWritingMode() ? colRect.height() : colRect.width());2382 LayoutUnit blockDelta = (isHorizontalWritingMode() ? colRect.height() : colRect.width()); 2383 2383 if (style()->isFlippedBlocksWritingMode()) 2384 2384 currLogicalTopOffset += blockDelta; … … 2388 2388 } 2389 2389 2390 void RenderBlock::paintContents(PaintInfo& paintInfo, const IntPoint& paintOffset)2390 void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 2391 2391 { 2392 2392 // Avoid painting descendants of the root element when stylesheets haven't loaded. This eliminates FOUC. … … 2402 2402 } 2403 2403 2404 void RenderBlock::paintChildren(PaintInfo& paintInfo, const IntPoint& paintOffset)2404 void RenderBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 2405 2405 { 2406 2406 PaintPhase newPhase = (paintInfo.phase == PaintPhaseChildOutlines) ? PaintPhaseOutline : paintInfo.phase; … … 2420 2420 // Check for page-break-before: always, and if it's set, break and bail. 2421 2421 bool checkBeforeAlways = !childrenInline() && (usePrintRect && child->style()->pageBreakBefore() == PBALWAYS); 2422 int absoluteChildY = paintOffset.y() + child->y();2422 LayoutUnit absoluteChildY = paintOffset.y() + child->y(); 2423 2423 if (checkBeforeAlways 2424 2424 && absoluteChildY > paintInfo.rect.y() … … 2439 2439 } 2440 2440 2441 IntPoint childPoint = flipForWritingMode(child, paintOffset, ParentToChildFlippingAdjustment);2441 LayoutPoint childPoint = flipForWritingMode(child, paintOffset, ParentToChildFlippingAdjustment); 2442 2442 if (!child->hasSelfPaintingLayer() && !child->isFloating()) 2443 2443 child->paint(info, childPoint); … … 2454 2454 } 2455 2455 2456 void RenderBlock::paintCaret(PaintInfo& paintInfo, const IntPoint& paintOffset, CaretType type)2456 void RenderBlock::paintCaret(PaintInfo& paintInfo, const LayoutPoint& paintOffset, CaretType type) 2457 2457 { 2458 2458 // Paint the caret if the FrameSelection says so or if caret browsing is enabled … … 2471 2471 // Convert the painting offset into the local coordinate system of this renderer, 2472 2472 // to match the localCaretRect computed by the FrameSelection 2473 IntPoint adjustedPaintOffset = paintOffset;2473 LayoutPoint adjustedPaintOffset = paintOffset; 2474 2474 offsetForContents(adjustedPaintOffset); 2475 2475 … … 2531 2531 // 5. paint outline. 2532 2532 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && hasOutline() && style()->visibility() == VISIBLE) 2533 paintOutline(paintInfo.context, IntRect(paintOffset, size()));2533 paintOutline(paintInfo.context, LayoutRect(paintOffset, size())); 2534 2534 2535 2535 // 6. paint continuation outlines. … … 2578 2578 } 2579 2579 2580 void RenderBlock::paintFloats(PaintInfo& paintInfo, const IntPoint& paintOffset, bool preservePhase)2580 void RenderBlock::paintFloats(PaintInfo& paintInfo, const LayoutPoint& paintOffset, bool preservePhase) 2581 2581 { 2582 2582 if (!m_floatingObjects) … … 2591 2591 PaintInfo currentPaintInfo(paintInfo); 2592 2592 currentPaintInfo.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground; 2593 IntPoint childPoint = flipFloatForWritingMode(r, IntPoint(paintOffset.x() + xPositionForFloatIncludingMargin(r) - r->m_renderer->x(), paintOffset.y() + yPositionForFloatIncludingMargin(r) - r->m_renderer->y()));2593 LayoutPoint childPoint = flipFloatForWritingMode(r, LayoutPoint(paintOffset.x() + xPositionForFloatIncludingMargin(r) - r->m_renderer->x(), paintOffset.y() + yPositionForFloatIncludingMargin(r) - r->m_renderer->y())); 2594 2594 r->m_renderer->paint(currentPaintInfo, childPoint); 2595 2595 if (!preservePhase) { … … 2607 2607 } 2608 2608 2609 void RenderBlock::paintEllipsisBoxes(PaintInfo& paintInfo, const IntPoint& paintOffset)2609 void RenderBlock::paintEllipsisBoxes(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 2610 2610 { 2611 2611 if (!paintInfo.shouldPaintWithinRoot(this) || !firstLineBox()) … … 2615 2615 // We can check the first box and last box and avoid painting if we don't 2616 2616 // intersect. 2617 int yPos = paintOffset.y() + firstLineBox()->y();2618 int h = lastLineBox()->y() + lastLineBox()->logicalHeight() - firstLineBox()->y();2617 LayoutUnit yPos = paintOffset.y() + firstLineBox()->y(); 2618 LayoutUnit h = lastLineBox()->y() + lastLineBox()->logicalHeight() - firstLineBox()->y(); 2619 2619 if (yPos >= paintInfo.rect.maxY() || yPos + h <= paintInfo.rect.y()) 2620 2620 return; … … 2684 2684 } 2685 2685 2686 void RenderBlock::paintContinuationOutlines(PaintInfo& info, const IntPoint& paintOffset)2686 void RenderBlock::paintContinuationOutlines(PaintInfo& info, const LayoutPoint& paintOffset) 2687 2687 { 2688 2688 ContinuationOutlineTableMap* table = continuationOutlineTable(); … … 2694 2694 return; 2695 2695 2696 IntPoint accumulatedPaintOffset = paintOffset;2696 LayoutPoint accumulatedPaintOffset = paintOffset; 2697 2697 // Paint each continuation outline. 2698 2698 ListHashSet<RenderInline*>::iterator end = continuations->end(); … … 2762 2762 } 2763 2763 2764 void RenderBlock::paintSelection(PaintInfo& paintInfo, const IntPoint& paintOffset)2764 void RenderBlock::paintSelection(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 2765 2765 { 2766 2766 if (shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) { 2767 int lastTop = 0;2768 int lastLeft = logicalLeftSelectionOffset(this, lastTop);2769 int lastRight = logicalRightSelectionOffset(this, lastTop);2767 LayoutUnit lastTop = 0; 2768 LayoutUnit lastLeft = logicalLeftSelectionOffset(this, lastTop); 2769 LayoutUnit lastRight = logicalRightSelectionOffset(this, lastTop); 2770 2770 GraphicsContextStateSaver stateSaver(*paintInfo.context); 2771 2771 2772 IntRect gapRectsBounds = selectionGaps(this, paintOffset, IntSize(), lastTop, lastLeft, lastRight, &paintInfo);2772 LayoutRect gapRectsBounds = selectionGaps(this, paintOffset, LayoutSize(), lastTop, lastLeft, lastRight, &paintInfo); 2773 2773 if (!gapRectsBounds.isEmpty()) { 2774 2774 if (RenderLayer* layer = enclosingLayer()) { 2775 2775 gapRectsBounds.moveBy(-paintOffset); 2776 2776 if (!hasLayer()) { 2777 IntRect localBounds(gapRectsBounds);2777 LayoutRect localBounds(gapRectsBounds); 2778 2778 flipForWritingMode(localBounds); 2779 2779 gapRectsBounds = localToContainerQuad(FloatRect(localBounds), layer->renderer()).enclosingBoundingBox(); -
trunk/Source/WebCore/rendering/RenderBlock.h
r90596 r90600 563 563 // End of functions defined in RenderBlockLineLayout.cpp. 564 564 565 void paintFloats(PaintInfo&, const IntPoint&, bool preservePhase = false);566 void paintContents(PaintInfo&, const IntPoint&);567 void paintColumnContents(PaintInfo&, const IntPoint&, bool paintFloats = false);568 void paintColumnRules(PaintInfo&, const IntPoint&);569 void paintChildren(PaintInfo&, const IntPoint&);570 void paintEllipsisBoxes(PaintInfo&, const IntPoint&);571 void paintSelection(PaintInfo&, const IntPoint&);572 void paintCaret(PaintInfo&, const IntPoint&, CaretType);565 void paintFloats(PaintInfo&, const LayoutPoint&, bool preservePhase = false); 566 void paintContents(PaintInfo&, const LayoutPoint&); 567 void paintColumnContents(PaintInfo&, const LayoutPoint&, bool paintFloats = false); 568 void paintColumnRules(PaintInfo&, const LayoutPoint&); 569 void paintChildren(PaintInfo&, const LayoutPoint&); 570 void paintEllipsisBoxes(PaintInfo&, const LayoutPoint&); 571 void paintSelection(PaintInfo&, const LayoutPoint&); 572 void paintCaret(PaintInfo&, const LayoutPoint&, CaretType); 573 573 574 574 FloatingObject* insertFloatingObject(RenderBox*); -
trunk/Source/WebCore/rendering/RenderBox.cpp
r90590 r90600 1080 1080 #if PLATFORM(MAC) 1081 1081 1082 void RenderBox::paintCustomHighlight(const IntPoint& paintOffset, const AtomicString& type, bool behindText)1082 void RenderBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type, bool behindText) 1083 1083 { 1084 1084 Frame* frame = this->frame(); -
trunk/Source/WebCore/rendering/RenderBox.h
r90590 r90600 421 421 422 422 #if PLATFORM(MAC) 423 void paintCustomHighlight(const IntPoint&, const AtomicString& type, bool behindText);423 void paintCustomHighlight(const LayoutPoint&, const AtomicString& type, bool behindText); 424 424 #endif 425 425 -
trunk/Source/WebCore/rendering/RenderInline.cpp
r90590 r90600 1364 1364 } 1365 1365 1366 void RenderInline::paintOutline(GraphicsContext* graphicsContext, const IntPoint& paintOffset)1366 void RenderInline::paintOutline(GraphicsContext* graphicsContext, const LayoutPoint& paintOffset) 1367 1367 { 1368 1368 if (!hasOutline()) … … 1383 1383 return; 1384 1384 1385 Vector< IntRect> rects;1386 1387 rects.append( IntRect());1385 Vector<LayoutRect> rects; 1386 1387 rects.append(LayoutRect()); 1388 1388 for (InlineFlowBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) { 1389 1389 RootInlineBox* root = curr->root(); 1390 int top = max(root->lineTop(), curr->logicalTop());1391 int bottom = min(root->lineBottom(), curr->logicalBottom());1392 rects.append( IntRect(curr->x(), top, curr->logicalWidth(), bottom - top));1393 } 1394 rects.append( IntRect());1390 LayoutUnit top = max(root->lineTop(), curr->logicalTop()); 1391 LayoutUnit bottom = min(root->lineBottom(), curr->logicalBottom()); 1392 rects.append(LayoutRect(curr->x(), top, curr->logicalWidth(), bottom - top)); 1393 } 1394 rects.append(LayoutRect()); 1395 1395 1396 1396 Color outlineColor = styleToUse->visitedDependentColor(CSSPropertyOutlineColor); … … 1416 1416 } 1417 1417 1418 void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const IntPoint& paintOffset,1419 const IntRect& lastline, const IntRect& thisline, const IntRect& nextline,1418 void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const LayoutPoint& paintOffset, 1419 const LayoutRect& lastline, const LayoutRect& thisline, const LayoutRect& nextline, 1420 1420 const Color outlineColor) 1421 1421 { 1422 1422 RenderStyle* styleToUse = style(); 1423 int ow= styleToUse->outlineWidth();1424 EBorderStyle o s= styleToUse->outlineStyle();1423 LayoutUnit outlineWidth = styleToUse->outlineWidth(); 1424 EBorderStyle outlineStyle = styleToUse->outlineStyle(); 1425 1425 1426 1426 const AffineTransform& currentCTM = graphicsContext->getCTM(); 1427 1427 bool antialias = !currentCTM.isIdentityOrTranslationOrFlipped(); 1428 1428 1429 int offset = style()->outlineOffset();1430 1431 int t= paintOffset.y() + thisline.y() - offset;1432 int l= paintOffset.x() + thisline.x() - offset;1433 int b= paintOffset.y() + thisline.maxY() + offset;1434 int r= paintOffset.x() + thisline.maxX() + offset;1429 LayoutUnit offset = style()->outlineOffset(); 1430 1431 LayoutUnit top = paintOffset.y() + thisline.y() - offset; 1432 LayoutUnit left = paintOffset.x() + thisline.x() - offset; 1433 LayoutUnit bottom = paintOffset.y() + thisline.maxY() + offset; 1434 LayoutUnit right = paintOffset.x() + thisline.maxX() + offset; 1435 1435 1436 1436 // left edge 1437 1437 drawLineForBoxSide(graphicsContext, 1438 l - ow,1439 t - (lastline.isEmpty() || thisline.x() < lastline.x() || (lastline.maxX() - 1) <= thisline.x() ? ow: 0),1440 l,1441 b + (nextline.isEmpty() || thisline.x() <= nextline.x() || (nextline.maxX() - 1) <= thisline.x() ? ow: 0),1442 1443 outlineColor, os,1444 (lastline.isEmpty() || thisline.x() < lastline.x() || (lastline.maxX() - 1) <= thisline.x() ? ow : -ow),1445 (nextline.isEmpty() || thisline.x() <= nextline.x() || (nextline.maxX() - 1) <= thisline.x() ? ow : -ow),1446 1438 left - outlineWidth, 1439 top - (lastline.isEmpty() || thisline.x() < lastline.x() || (lastline.maxX() - 1) <= thisline.x() ? outlineWidth : 0), 1440 left, 1441 bottom + (nextline.isEmpty() || thisline.x() <= nextline.x() || (nextline.maxX() - 1) <= thisline.x() ? outlineWidth : 0), 1442 BSLeft, 1443 outlineColor, outlineStyle, 1444 (lastline.isEmpty() || thisline.x() < lastline.x() || (lastline.maxX() - 1) <= thisline.x() ? outlineWidth : -outlineWidth), 1445 (nextline.isEmpty() || thisline.x() <= nextline.x() || (nextline.maxX() - 1) <= thisline.x() ? outlineWidth : -outlineWidth), 1446 antialias); 1447 1447 1448 1448 // right edge 1449 1449 drawLineForBoxSide(graphicsContext, 1450 r,1451 t - (lastline.isEmpty() || lastline.maxX() < thisline.maxX() || (thisline.maxX() - 1) <= lastline.x() ? ow: 0),1452 r + ow,1453 b + (nextline.isEmpty() || nextline.maxX() <= thisline.maxX() || (thisline.maxX() - 1) <= nextline.x() ? ow: 0),1454 1455 outlineColor, os,1456 (lastline.isEmpty() || lastline.maxX() < thisline.maxX() || (thisline.maxX() - 1) <= lastline.x() ? ow : -ow),1457 (nextline.isEmpty() || nextline.maxX() <= thisline.maxX() || (thisline.maxX() - 1) <= nextline.x() ? ow : -ow),1458 1450 right, 1451 top - (lastline.isEmpty() || lastline.maxX() < thisline.maxX() || (thisline.maxX() - 1) <= lastline.x() ? outlineWidth : 0), 1452 right + outlineWidth, 1453 bottom + (nextline.isEmpty() || nextline.maxX() <= thisline.maxX() || (thisline.maxX() - 1) <= nextline.x() ? outlineWidth : 0), 1454 BSRight, 1455 outlineColor, outlineStyle, 1456 (lastline.isEmpty() || lastline.maxX() < thisline.maxX() || (thisline.maxX() - 1) <= lastline.x() ? outlineWidth : -outlineWidth), 1457 (nextline.isEmpty() || nextline.maxX() <= thisline.maxX() || (thisline.maxX() - 1) <= nextline.x() ? outlineWidth : -outlineWidth), 1458 antialias); 1459 1459 // upper edge 1460 1460 if (thisline.x() < lastline.x()) 1461 1461 drawLineForBoxSide(graphicsContext, 1462 l - ow,1463 t - ow,1464 min(r+ow, (lastline.isEmpty() ? 1000000 : paintOffset.x() + lastline.x())),1465 t,1466 BSTop, outlineColor, os,1467 ow,1468 (!lastline.isEmpty() && paintOffset.x() + lastline.x() + 1 < r + ow) ? -ow : ow,1469 1462 left - outlineWidth, 1463 top - outlineWidth, 1464 min(right + outlineWidth, (lastline.isEmpty() ? 1000000 : paintOffset.x() + lastline.x())), 1465 top, 1466 BSTop, outlineColor, outlineStyle, 1467 outlineWidth, 1468 (!lastline.isEmpty() && paintOffset.x() + lastline.x() + 1 < right + outlineWidth) ? -outlineWidth : outlineWidth, 1469 antialias); 1470 1470 1471 1471 if (lastline.maxX() < thisline.maxX()) 1472 1472 drawLineForBoxSide(graphicsContext, 1473 max(lastline.isEmpty() ? -1000000 : paintOffset.x() + lastline.maxX(), l - ow),1474 t - ow,1475 r + ow,1476 t,1477 BSTop, outlineColor, os,1478 (!lastline.isEmpty() && l - ow < paintOffset.x() + lastline.maxX()) ? -ow : ow,1479 ow, antialias);1473 max(lastline.isEmpty() ? -1000000 : paintOffset.x() + lastline.maxX(), left - outlineWidth), 1474 top - outlineWidth, 1475 right + outlineWidth, 1476 top, 1477 BSTop, outlineColor, outlineStyle, 1478 (!lastline.isEmpty() && left - outlineWidth < paintOffset.x() + lastline.maxX()) ? -outlineWidth : outlineWidth, 1479 outlineWidth, antialias); 1480 1480 1481 1481 // lower edge 1482 1482 if (thisline.x() < nextline.x()) 1483 1483 drawLineForBoxSide(graphicsContext, 1484 l - ow,1485 b,1486 min(r + ow, !nextline.isEmpty() ? paintOffset.x() + nextline.x() + 1 : 1000000),1487 b + ow,1488 BSBottom, outlineColor, os,1489 ow,1490 (!nextline.isEmpty() && paintOffset.x() + nextline.x() + 1 < r + ow) ? -ow : ow,1491 1484 left - outlineWidth, 1485 bottom, 1486 min(right + outlineWidth, !nextline.isEmpty() ? paintOffset.x() + nextline.x() + 1 : 1000000), 1487 bottom + outlineWidth, 1488 BSBottom, outlineColor, outlineStyle, 1489 outlineWidth, 1490 (!nextline.isEmpty() && paintOffset.x() + nextline.x() + 1 < right + outlineWidth) ? -outlineWidth : outlineWidth, 1491 antialias); 1492 1492 1493 1493 if (nextline.maxX() < thisline.maxX()) 1494 1494 drawLineForBoxSide(graphicsContext, 1495 max(!nextline.isEmpty() ? paintOffset.x() + nextline.maxX() : -1000000, l - ow),1496 b,1497 r + ow,1498 b + ow,1499 BSBottom, outlineColor, os,1500 (!nextline.isEmpty() && l - ow < paintOffset.x() + nextline.maxX()) ? -ow : ow,1501 ow, antialias);1495 max(!nextline.isEmpty() ? paintOffset.x() + nextline.maxX() : -1000000, left - outlineWidth), 1496 bottom, 1497 right + outlineWidth, 1498 bottom + outlineWidth, 1499 BSBottom, outlineColor, outlineStyle, 1500 (!nextline.isEmpty() && left - outlineWidth < paintOffset.x() + nextline.maxX()) ? -outlineWidth : outlineWidth, 1501 outlineWidth, antialias); 1502 1502 } 1503 1503 -
trunk/Source/WebCore/rendering/RenderInline.h
r90590 r90600 77 77 78 78 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint&); 79 void paintOutline(GraphicsContext*, const IntPoint&);79 void paintOutline(GraphicsContext*, const LayoutPoint&); 80 80 81 81 using RenderBoxModelObject::continuation; … … 163 163 static RenderInline* cloneInline(RenderInline* src); 164 164 165 void paintOutlineForLine(GraphicsContext*, const IntPoint&, const IntRect& prevLine, const IntRect& thisLine,166 const IntRect& nextLine, const Color);165 void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutRect& prevLine, const LayoutRect& thisLine, 166 const LayoutRect& nextLine, const Color); 167 167 RenderBoxModelObject* continuationBefore(RenderObject* beforeChild); 168 168 -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r90485 r90600 2280 2280 } 2281 2281 2282 void RenderLayer::paintOverflowControls(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls)2282 void RenderLayer::paintOverflowControls(GraphicsContext* context, const LayoutPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls) 2283 2283 { 2284 2284 // Don't do anything if we have no overflow. … … 2304 2304 return; 2305 2305 2306 IntPoint adjustedPaintOffset = paintOffset;2306 LayoutPoint adjustedPaintOffset = paintOffset; 2307 2307 if (paintingOverlayControls) 2308 2308 adjustedPaintOffset = m_cachedOverlayScrollbarOffset; … … 2340 2340 } 2341 2341 2342 void RenderLayer::paintScrollCorner(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)2342 void RenderLayer::paintScrollCorner(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& damageRect) 2343 2343 { 2344 2344 RenderBox* box = renderBox(); 2345 2345 ASSERT(box); 2346 2346 2347 IntRect absRect = scrollCornerRect();2347 LayoutRect absRect = scrollCornerRect(); 2348 2348 absRect.moveBy(paintOffset); 2349 2349 if (!absRect.intersects(damageRect)) … … 2366 2366 } 2367 2367 2368 void RenderLayer::paintResizer(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)2368 void RenderLayer::paintResizer(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& damageRect) 2369 2369 { 2370 2370 if (renderer()->style()->resize() == RESIZE_NONE) … … 2374 2374 ASSERT(box); 2375 2375 2376 IntRect absRect = resizerCornerRect(this, box->borderBoxRect());2376 LayoutRect absRect = resizerCornerRect(this, box->borderBoxRect()); 2377 2377 absRect.moveBy(paintOffset); 2378 2378 if (!absRect.intersects(damageRect)) … … 2391 2391 // Paint the resizer control. 2392 2392 DEFINE_STATIC_LOCAL(RefPtr<Image>, resizeCornerImage, (Image::loadPlatformResource("textAreaResizeCorner"))); 2393 IntPoint imagePoint(absRect.maxX() - resizeCornerImage->width(), absRect.maxY() - resizeCornerImage->height());2393 LayoutPoint imagePoint(absRect.maxX() - resizeCornerImage->width(), absRect.maxY() - resizeCornerImage->height()); 2394 2394 context->drawImage(resizeCornerImage.get(), box->style()->colorSpace(), imagePoint); 2395 2395 … … 2399 2399 GraphicsContextStateSaver stateSaver(*context); 2400 2400 context->clip(absRect); 2401 IntRect largerCorner = absRect;2402 largerCorner.setSize( IntSize(largerCorner.width() + 1, largerCorner.height() + 1));2401 LayoutRect largerCorner = absRect; 2402 largerCorner.setSize(LayoutSize(largerCorner.width() + 1, largerCorner.height() + 1)); 2403 2403 context->setStrokeColor(Color(makeRGB(217, 217, 217)), ColorSpaceDeviceRGB); 2404 2404 context->setStrokeThickness(1.0f); -
trunk/Source/WebCore/rendering/RenderLayer.h
r90485 r90600 270 270 LayoutSize offsetFromResizeCorner(const LayoutPoint& absolutePoint) const; 271 271 272 void paintOverflowControls(GraphicsContext*, const IntPoint&, const IntRect& damageRect, bool paintingOverlayControls = false);273 void paintScrollCorner(GraphicsContext*, const IntPoint&, const IntRect& damageRect);274 void paintResizer(GraphicsContext*, const IntPoint&, const IntRect& damageRect);272 void paintOverflowControls(GraphicsContext*, const LayoutPoint&, const LayoutRect& damageRect, bool paintingOverlayControls = false); 273 void paintScrollCorner(GraphicsContext*, const LayoutPoint&, const LayoutRect& damageRect); 274 void paintResizer(GraphicsContext*, const LayoutPoint&, const LayoutRect& damageRect); 275 275 276 276 void updateScrollInfoAfterLayout(); -
trunk/Source/WebCore/rendering/RenderLineBoxList.cpp
r88319 r90600 201 201 } 202 202 203 void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintInfo, const IntPoint& paintOffset) const203 void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintInfo, const LayoutPoint& paintOffset) const 204 204 { 205 205 // Only paint during the foreground/selection phases. … … 219 219 RenderView* v = renderer->view(); 220 220 bool usePrintRect = !v->printRect().isEmpty(); 221 int outlineSize = renderer->maximalOutlineSize(paintInfo.phase);221 LayoutUnit outlineSize = renderer->maximalOutlineSize(paintInfo.phase); 222 222 if (!anyLineIntersectsRect(renderer, paintInfo.rect, paintOffset, usePrintRect, outlineSize)) 223 223 return; … … 236 236 // text pages, so we don't have to deal with vertical lines at all here. 237 237 RootInlineBox* root = curr->root(); 238 int topForPaginationCheck = curr->logicalTopVisualOverflow(root->lineTop());239 int bottomForPaginationCheck = curr->logicalLeftVisualOverflow();238 LayoutUnit topForPaginationCheck = curr->logicalTopVisualOverflow(root->lineTop()); 239 LayoutUnit bottomForPaginationCheck = curr->logicalLeftVisualOverflow(); 240 240 if (!curr->parent()) { 241 241 // We're a root box. Use lineTop and lineBottom as well here. -
trunk/Source/WebCore/rendering/RenderListBox.cpp
r90590 r90600 331 331 } 332 332 333 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const IntPoint& paintOffset)333 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 334 334 { 335 335 if (m_vBar) { 336 IntRect scrollRect(paintOffset.x() + width() - borderRight() - m_vBar->width(),337 338 339 336 LayoutRect scrollRect(paintOffset.x() + width() - borderRight() - m_vBar->width(), 337 paintOffset.y() + borderTop(), 338 m_vBar->width(), 339 height() - (borderTop() + borderBottom())); 340 340 m_vBar->setFrameRect(scrollRect); 341 341 m_vBar->paint(paintInfo.context, paintInfo.rect); … … 362 362 } 363 363 364 void RenderListBox::paintItemForeground(PaintInfo& paintInfo, const IntPoint& paintOffset, int listIndex)364 void RenderListBox::paintItemForeground(PaintInfo& paintInfo, const LayoutPoint& paintOffset, int listIndex) 365 365 { 366 366 FontCachePurgePreventer fontCachePurgePreventer; … … 400 400 TextRun textRun(string, length, false, 0, 0, TextRun::AllowTrailingExpansion, itemStyle->direction(), itemStyle->unicodeBidi() == Override, TextRun::NoRounding); 401 401 Font itemFont = style()->font(); 402 IntRect r = itemBoundingBoxRect(paintOffset, listIndex);402 LayoutRect r = itemBoundingBoxRect(paintOffset, listIndex); 403 403 r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r)); 404 404 … … 415 415 } 416 416 417 void RenderListBox::paintItemBackground(PaintInfo& paintInfo, const IntPoint& paintOffset, int listIndex)417 void RenderListBox::paintItemBackground(PaintInfo& paintInfo, const LayoutPoint& paintOffset, int listIndex) 418 418 { 419 419 SelectElement* select = toSelectElement(static_cast<Element*>(node())); … … 434 434 if (!element->renderStyle() || element->renderStyle()->visibility() != HIDDEN) { 435 435 ColorSpace colorSpace = element->renderStyle() ? element->renderStyle()->colorSpace() : style()->colorSpace(); 436 IntRect itemRect = itemBoundingBoxRect(paintOffset, listIndex);436 LayoutRect itemRect = itemBoundingBoxRect(paintOffset, listIndex); 437 437 itemRect.intersect(controlClipRect(paintOffset)); 438 438 paintInfo.context->fillRect(itemRect, backColor, colorSpace); -
trunk/Source/WebCore/rendering/RenderListBox.h
r90590 r90600 136 136 int numItems() const; 137 137 int listHeight() const; 138 void paintScrollbar(PaintInfo&, const IntPoint&);139 void paintItemForeground(PaintInfo&, const IntPoint&, int listIndex);140 void paintItemBackground(PaintInfo&, const IntPoint&, int listIndex);138 void paintScrollbar(PaintInfo&, const LayoutPoint&); 139 void paintItemForeground(PaintInfo&, const LayoutPoint&, int listIndex); 140 void paintItemBackground(PaintInfo&, const LayoutPoint&, int listIndex); 141 141 void scrollToRevealSelection(); 142 142 -
trunk/Source/WebCore/rendering/RenderObject.cpp
r90530 r90600 1006 1006 #endif 1007 1007 1008 void RenderObject::paintFocusRing(GraphicsContext* context, const IntPoint& paintOffset, RenderStyle* style)1009 { 1010 Vector< IntRect> focusRingRects;1008 void RenderObject::paintFocusRing(GraphicsContext* context, const LayoutPoint& paintOffset, RenderStyle* style) 1009 { 1010 Vector<LayoutRect> focusRingRects; 1011 1011 addFocusRingRects(focusRingRects, paintOffset); 1012 1012 if (style->outlineStyleIsAuto()) … … 1029 1029 } 1030 1030 1031 void RenderObject::paintOutline(GraphicsContext* graphicsContext, const IntRect& paintRect)1031 void RenderObject::paintOutline(GraphicsContext* graphicsContext, const LayoutRect& paintRect) 1032 1032 { 1033 1033 if (!hasOutline()) … … 1035 1035 1036 1036 RenderStyle* styleToUse = style(); 1037 int outlineWidth = styleToUse->outlineWidth();1037 LayoutUnit outlineWidth = styleToUse->outlineWidth(); 1038 1038 EBorderStyle outlineStyle = styleToUse->outlineStyle(); 1039 1039 1040 1040 Color outlineColor = styleToUse->visitedDependentColor(CSSPropertyOutlineColor); 1041 1041 1042 int offset = styleToUse->outlineOffset();1042 LayoutUnit offset = styleToUse->outlineOffset(); 1043 1043 1044 1044 if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) { … … 1052 1052 return; 1053 1053 1054 IntRect adjustedPaintRec = paintRect;1054 LayoutRect adjustedPaintRec = paintRect; 1055 1055 adjustedPaintRec.inflate(offset); 1056 1056 … … 1068 1068 #endif 1069 1069 1070 int leftOuter = adjustedPaintRec.x() - outlineWidth;1071 int leftInner = adjustedPaintRec.x();1072 int rightOuter = adjustedPaintRec.maxX() + outlineWidth;1073 int rightInner = adjustedPaintRec.maxX();1074 int topOuter = adjustedPaintRec.y() - outlineWidth;1075 int topInner = adjustedPaintRec.y();1076 int bottomOuter = adjustedPaintRec.maxY() + outlineWidth;1077 int bottomInner = adjustedPaintRec.maxY();1070 LayoutUnit leftOuter = adjustedPaintRec.x() - outlineWidth; 1071 LayoutUnit leftInner = adjustedPaintRec.x(); 1072 LayoutUnit rightOuter = adjustedPaintRec.maxX() + outlineWidth; 1073 LayoutUnit rightInner = adjustedPaintRec.maxX(); 1074 LayoutUnit topOuter = adjustedPaintRec.y() - outlineWidth; 1075 LayoutUnit topInner = adjustedPaintRec.y(); 1076 LayoutUnit bottomOuter = adjustedPaintRec.maxY() + outlineWidth; 1077 LayoutUnit bottomInner = adjustedPaintRec.maxY(); 1078 1078 1079 1079 drawLineForBoxSide(graphicsContext, leftOuter, topOuter, leftInner, bottomOuter, BSLeft, outlineColor, outlineStyle, outlineWidth, outlineWidth); -
trunk/Source/WebCore/rendering/RenderObject.h
r90596 r90600 794 794 Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false); 795 795 796 void paintFocusRing(GraphicsContext*, const IntPoint&, RenderStyle*);797 void paintOutline(GraphicsContext*, const IntRect&);796 void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*); 797 void paintOutline(GraphicsContext*, const LayoutRect&); 798 798 void addPDFURLRect(GraphicsContext*, const IntRect&); 799 799 -
trunk/Source/WebCore/rendering/RenderReplaced.cpp
r90596 r90600 164 164 } 165 165 166 bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, const IntPoint& paintOffset)166 bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 167 167 { 168 168 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseOutline && paintInfo.phase != PaintPhaseSelfOutline … … 177 177 return false; 178 178 179 IntPoint adjustedPaintOffset = paintOffset + location();179 LayoutPoint adjustedPaintOffset = paintOffset + location(); 180 180 181 181 // Early exit if the element touches the edges. 182 int top = adjustedPaintOffset.y() + minYVisualOverflow();183 int bottom = adjustedPaintOffset.y() + maxYVisualOverflow();182 LayoutUnit top = adjustedPaintOffset.y() + minYVisualOverflow(); 183 LayoutUnit bottom = adjustedPaintOffset.y() + maxYVisualOverflow(); 184 184 if (isSelected() && m_inlineBoxWrapper) { 185 int selTop = paintOffset.y() + m_inlineBoxWrapper->root()->selectionTop();186 int selBottom = paintOffset.y() + selTop + m_inlineBoxWrapper->root()->selectionHeight();185 LayoutUnit selTop = paintOffset.y() + m_inlineBoxWrapper->root()->selectionTop(); 186 LayoutUnit selBottom = paintOffset.y() + selTop + m_inlineBoxWrapper->root()->selectionHeight(); 187 187 top = min(selTop, top); 188 188 bottom = max(selBottom, bottom); 189 189 } 190 190 191 int os = 2 * maximalOutlineSize(paintInfo.phase);191 LayoutUnit os = 2 * maximalOutlineSize(paintInfo.phase); 192 192 if (adjustedPaintOffset.x() + minXVisualOverflow() >= paintInfo.rect.maxX() + os || adjustedPaintOffset.x() + maxXVisualOverflow() <= paintInfo.rect.x() - os) 193 193 return false; -
trunk/Source/WebCore/rendering/RenderReplaced.h
r90596 r90600 56 56 57 57 virtual void paint(PaintInfo&, const LayoutPoint&); 58 bool shouldPaint(PaintInfo&, const IntPoint&);58 bool shouldPaint(PaintInfo&, const LayoutPoint&); 59 59 IntRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left). 60 60 -
trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp
r90302 r90600 160 160 } 161 161 162 void RenderScrollbarPart::paintIntoRect(GraphicsContext* graphicsContext, const IntPoint& paintOffset, const IntRect& rect)162 void RenderScrollbarPart::paintIntoRect(GraphicsContext* graphicsContext, const LayoutPoint& paintOffset, const LayoutRect& rect) 163 163 { 164 164 // Make sure our dimensions match the rect. -
trunk/Source/WebCore/rendering/RenderScrollbarPart.h
r88250 r90600 46 46 virtual void computePreferredLogicalWidths(); 47 47 48 void paintIntoRect(GraphicsContext*, const IntPoint&, const IntRect&);48 void paintIntoRect(GraphicsContext*, const LayoutPoint&, const LayoutRect&); 49 49 50 50 protected: -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r90525 r90600 961 961 } 962 962 963 void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const IntPoint& paintOffset, RenderObject* backgroundObject)963 void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const LayoutPoint& paintOffset, RenderObject* backgroundObject) 964 964 { 965 965 if (!paintInfo.shouldPaintWithinRoot(this)) … … 976 976 return; 977 977 978 IntPoint adjustedPaintOffset = paintOffset;978 LayoutPoint adjustedPaintOffset = paintOffset; 979 979 if (backgroundObject != this) 980 980 adjustedPaintOffset.move(location()); … … 989 989 GraphicsContextStateSaver stateSaver(*paintInfo.context, shouldClip); 990 990 if (shouldClip) { 991 IntRect clipRect(adjustedPaintOffset.x() + borderLeft(), adjustedPaintOffset.y() + borderTop(),991 LayoutRect clipRect(adjustedPaintOffset.x() + borderLeft(), adjustedPaintOffset.y() + borderTop(), 992 992 width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom()); 993 993 paintInfo.context->clip(clipRect); 994 994 } 995 paintFillLayers(paintInfo, c, bgLayer, IntRect(adjustedPaintOffset, size()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);995 paintFillLayers(paintInfo, c, bgLayer, LayoutRect(adjustedPaintOffset, size()), BackgroundBleedNone, CompositeSourceOver, backgroundObject); 996 996 } 997 997 } -
trunk/Source/WebCore/rendering/RenderTableSection.cpp
r90515 r90600 914 914 } 915 915 916 void RenderTableSection::paintCell(RenderTableCell* cell, PaintInfo& paintInfo, const IntPoint& paintOffset)917 { 918 IntPoint cellPoint = flipForWritingMode(cell, paintOffset, ParentToChildFlippingAdjustment);916 void RenderTableSection::paintCell(RenderTableCell* cell, PaintInfo& paintInfo, const LayoutPoint& paintOffset) 917 { 918 LayoutPoint cellPoint = flipForWritingMode(cell, paintOffset, ParentToChildFlippingAdjustment); 919 919 PaintPhase paintPhase = paintInfo.phase; 920 920 RenderTableRow* row = toRenderTableRow(cell->parent()); -
trunk/Source/WebCore/rendering/RenderTableSection.h
r90515 r90600 134 134 135 135 virtual void paint(PaintInfo&, const LayoutPoint&); 136 virtual void paintCell(RenderTableCell*, PaintInfo&, const IntPoint&);136 virtual void paintCell(RenderTableCell*, PaintInfo&, const LayoutPoint&); 137 137 virtual void paintObject(PaintInfo&, const LayoutPoint&); 138 138 -
trunk/Source/WebCore/rendering/RenderTextControl.cpp
r90591 r90600 588 588 } 589 589 590 void RenderTextControl::paintPlaceholder(PaintInfo& paintInfo, const IntPoint& paintOffset)590 void RenderTextControl::paintPlaceholder(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 591 591 { 592 592 if (style()->visibility() != VISIBLE) 593 593 return; 594 594 595 IntRect clipRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderBottom() - borderTop());595 LayoutRect clipRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderBottom() - borderTop()); 596 596 if (clipRect.isEmpty()) 597 597 return; … … 611 611 RenderBox* textRenderer = innerTextElement() ? innerTextElement()->renderBox() : 0; 612 612 if (textRenderer) { 613 IntPoint textPoint;613 LayoutPoint textPoint; 614 614 textPoint.setY(paintOffset.y() + textBlockInsetTop() + placeholderStyle->fontMetrics().ascent()); 615 int styleTextIndent = placeholderStyle->textIndent().isFixed() ? placeholderStyle->textIndent().calcMinValue(0) : 0;615 LayoutUnit styleTextIndent = placeholderStyle->textIndent().isFixed() ? placeholderStyle->textIndent().calcMinValue(0) : 0; 616 616 if (placeholderStyle->isLeftToRightDirection()) 617 617 textPoint.setX(paintOffset.x() + styleTextIndent + textBlockInsetLeft()); -
trunk/Source/WebCore/rendering/RootInlineBox.cpp
r90596 r90600 134 134 } 135 135 136 void RootInlineBox::paintEllipsisBox(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom) const136 void RootInlineBox::paintEllipsisBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) const 137 137 { 138 138 if (hasEllipsisBox() && paintInfo.shouldPaintWithinRoot(renderer()) && renderer()->style()->visibility() == VISIBLE … … 158 158 } 159 159 160 void RootInlineBox::paintCustomHighlight(PaintInfo& paintInfo, const IntPoint& paintOffset, const AtomicString& highlightType)160 void RootInlineBox::paintCustomHighlight(PaintInfo& paintInfo, const LayoutPoint& paintOffset, const AtomicString& highlightType) 161 161 { 162 162 if (!paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseForeground) … … 179 179 #endif 180 180 181 void RootInlineBox::paint(PaintInfo& paintInfo, const IntPoint& paintOffset, int lineTop, int lineBottom)181 void RootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 182 182 { 183 183 InlineFlowBox::paint(paintInfo, paintOffset, lineTop, lineBottom); -
trunk/Source/WebCore/rendering/RootInlineBox.h
r90596 r90600 86 86 EllipsisBox* ellipsisBox() const; 87 87 88 void paintEllipsisBox(PaintInfo&, const IntPoint&, int lineTop, int lineBottom) const;88 void paintEllipsisBox(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) const; 89 89 90 90 virtual void clearTruncation(); … … 95 95 #if PLATFORM(MAC) 96 96 void addHighlightOverflow(); 97 void paintCustomHighlight(PaintInfo&, const IntPoint&, const AtomicString& highlightType);97 void paintCustomHighlight(PaintInfo&, const LayoutPoint&, const AtomicString& highlightType); 98 98 #endif 99 99 100 virtual void paint(PaintInfo&, const IntPoint&, int lineTop, int lineBottom);100 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom); 101 101 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom); 102 102 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
r88250 r90600 76 76 77 77 #if ENABLE(DEBUG_MATH_LAYOUT) 78 void RenderMathMLBlock::paint(PaintInfo& info, const IntPoint& paintOffset)78 void RenderMathMLBlock::paint(PaintInfo& info, const LayoutPoint& paintOffset) 79 79 { 80 80 RenderBlock::paint(info, paintOffset); … … 83 83 return; 84 84 85 IntPoint adjustedPaintOffset = paintOffset + location();85 LayoutPoint adjustedPaintOffset = paintOffset + location(); 86 86 87 87 GraphicsContextStateSaver stateSaver(*info.context); … … 91 91 info.context->setStrokeColor(Color(0, 0, 255), ColorSpaceSRGB); 92 92 93 info.context->drawLine(adjustedPaintOffset, IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y()));94 info.context->drawLine( IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y()), IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + offsetHeight()));95 info.context->drawLine( IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + offsetHeight()), IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + offsetHeight()));96 info.context->drawLine(adjustedPaintOffset, IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + offsetHeight()));93 info.context->drawLine(adjustedPaintOffset, LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y())); 94 info.context->drawLine(LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y()), LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + offsetHeight())); 95 info.context->drawLine(LayoutPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + offsetHeight()), LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + offsetHeight())); 96 info.context->drawLine(adjustedPaintOffset, LayoutPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + offsetHeight())); 97 97 98 98 int topStart = paddingTop(); … … 100 100 info.context->setStrokeColor(Color(0, 255, 0), ColorSpaceSRGB); 101 101 102 info.context->drawLine( IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + topStart), IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + topStart));102 info.context->drawLine(LayoutPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + topStart), LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + topStart)); 103 103 104 104 int baseline = baselinePosition(AlphabeticBaseline, true, HorizontalLine); … … 106 106 info.context->setStrokeColor(Color(255, 0, 0), ColorSpaceSRGB); 107 107 108 info.context->drawLine( IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + baseline), IntPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + baseline));108 info.context->drawLine(LayoutPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + baseline), LayoutPoint(adjustedPaintOffset.x() + offsetWidth(), adjustedPaintOffset.y() + baseline)); 109 109 } 110 110 #endif // ENABLE(DEBUG_MATH_LAYOUT) -
trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
r88250 r90600 132 132 } 133 133 134 void RenderMathMLFraction::paint(PaintInfo& info, const IntPoint& paintOffset)134 void RenderMathMLFraction::paint(PaintInfo& info, const LayoutPoint& paintOffset) 135 135 { 136 136 RenderMathMLBlock::paint(info, paintOffset); … … 141 141 return; 142 142 143 int verticalOffset = 0;143 LayoutUnit verticalOffset = 0; 144 144 // The children are always RenderMathMLBlock instances 145 145 if (firstChild()->isRenderMathMLBlock()) { … … 154 154 } 155 155 156 IntPoint adjustedPaintOffset = paintOffset + location();156 LayoutPoint adjustedPaintOffset = paintOffset + location(); 157 157 adjustedPaintOffset.setY(adjustedPaintOffset.y() + verticalOffset); 158 158 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
r90302 r90600 95 95 } 96 96 97 void RenderMathMLRoot::paint(PaintInfo& info, const IntPoint& paintOffset)97 void RenderMathMLRoot::paint(PaintInfo& info, const LayoutPoint& paintOffset) 98 98 { 99 99 RenderMathMLBlock::paint(info, paintOffset); … … 105 105 return; 106 106 107 IntPoint adjustedPaintOffset = paintOffset + location();107 LayoutPoint adjustedPaintOffset = paintOffset + location(); 108 108 109 109 RenderBoxModelObject* indexBox = toRenderBoxModelObject(lastChild()); 110 110 111 int maxHeight = indexBox->offsetHeight();111 LayoutUnit maxHeight = indexBox->offsetHeight(); 112 112 // default to the font size in pixels if we're empty 113 113 if (!maxHeight) 114 114 maxHeight = style()->fontSize(); 115 int width = indexBox->offsetWidth();116 117 int indexWidth = 0;115 LayoutUnit width = indexBox->offsetWidth(); 116 117 LayoutUnit indexWidth = 0; 118 118 RenderObject* current = firstChild(); 119 119 while (current != lastChild()) { … … 140 140 141 141 int rootPad = static_cast<int>(gRootPadding * style()->fontSize()); 142 int start = adjustedPaintOffset.x() + indexWidth + gRadicalLeftMargin + style()->paddingLeft().value() - rootPad;142 LayoutUnit start = adjustedPaintOffset.x() + indexWidth + gRadicalLeftMargin + style()->paddingLeft().value() - rootPad; 143 143 adjustedPaintOffset.setY(adjustedPaintOffset.y() + style()->paddingTop().value() - rootPad); 144 144 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp
r90302 r90600 67 67 } 68 68 69 void RenderMathMLSquareRoot::paint(PaintInfo& info, const IntPoint& paintOffset)69 void RenderMathMLSquareRoot::paint(PaintInfo& info, const LayoutPoint& paintOffset) 70 70 { 71 71 RenderMathMLBlock::paint(info, paintOffset); … … 74 74 return; 75 75 76 IntPoint adjustedPaintOffset = paintOffset + location();76 LayoutPoint adjustedPaintOffset = paintOffset + location(); 77 77 78 int maxHeight = 0;79 int width = 0;78 LayoutUnit maxHeight = 0; 79 LayoutUnit width = 0; 80 80 RenderObject* current = firstChild(); 81 81 while (current) {
Note: See TracChangeset
for help on using the changeset viewer.