Source/core/rendering/RenderBlock.cpp - Issue 21430003: Implement interfaces in PaintInfo and make it a class.

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 21430003: Implement interfaces in PaintInfo and make it a class. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@getterPaintInfo01

Patch Set: Second try Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/core/rendering/PaintInfo.h ('K') | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBox.h » ('j') | Source/core/rendering/svg/SVGRenderingContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlock.cpp

diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp

index b969ed81dab7591e3d6b44b3466b3cfd82695fef..9283253c88516d3b3148890d504b9580f8a9e3f4 100644

--- a/Source/core/rendering/RenderBlock.cpp

+++ b/Source/core/rendering/RenderBlock.cpp

@@ -2943,7 +2943,7 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

LayoutPoint adjustedPaintOffset = paintOffset + location();

- PaintPhase phase = paintInfo.phase;

+ PaintPhase phase = paintInfo.getPhase();

// Check if we need to do anything at all.

// FIXME: Could eliminate the isRoot() check if we fix background painting so that the RenderView

@@ -2951,9 +2951,9 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

if (!isRoot()) {

LayoutRect overflowBox = overflowRectForPaintRejection();

flipForWritingMode(overflowBox);

- overflowBox.inflate(maximalOutlineSize(paintInfo.phase));

+ overflowBox.inflate(maximalOutlineSize(paintInfo.getPhase()));

overflowBox.moveBy(adjustedPaintOffset);

- if (!overflowBox.intersects(paintInfo.rect))

+ if (!overflowBox.intersects(paintInfo.getRect()))

return;

}

@@ -2966,12 +2966,12 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

// z-index. We paint after we painted the background/border, so that the scrollbars will

// sit above the background/border.

if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == PaintPhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.shouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly())

- layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect);

+ layer()->paintOverflowControls(paintInfo.getContext(), roundedIntPoint(adjustedPaintOffset), paintInfo.getRect());

}

void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

{

- if (paintInfo.context->paintingDisabled())

+ if (paintInfo.getContext()->paintingDisabled())

return;

const Color& ruleColor = resolveColor(CSSPropertyWebkitColumnRuleColor);

@@ -2986,7 +2986,7 @@ void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain

ColumnInfo* colInfo = columnInfo();

unsigned colCount = columnCount(colInfo);

- bool antialias = shouldAntialiasLines(paintInfo.context);

+ bool antialias = shouldAntialiasLines(paintInfo.getContext());

if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {

bool leftToRight = style()->isLeftToRightDirection() ^ colInfo->progressionIsReversed();

@@ -3015,7 +3015,7 @@ void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain

LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness / 2 + ruleAdd;

LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleThickness;

IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft, ruleTop, ruleRight, ruleBottom);

- drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias);

+ drawLineForBoxSide(paintInfo.getContext(), pixelSnappedRuleRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias);

}

ruleLogicalLeft = currLogicalLeftOffset;

@@ -3052,7 +3052,7 @@ void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain

for (unsigned i = 1; i < colCount; i++) {

ruleRect.move(step);

IntRect pixelSnappedRuleRect = pixelSnappedIntRect(ruleRect);

- drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias);

}

@@ -3060,7 +3060,7 @@ void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain

void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset, bool paintingFloats)

{

// We need to do multiple passes, breaking up our child painting into strips.

- GraphicsContext* context = paintInfo.context;

+ GraphicsContext* context = paintInfo.getContext();

ColumnInfo* colInfo = columnInfo();

unsigned colCount = columnCount(colInfo);

if (!colCount)

@@ -3081,9 +3081,9 @@ void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const LayoutPoint& p

}

colRect.moveBy(paintOffset);

PaintInfo info(paintInfo);

- info.rect.intersect(pixelSnappedIntRect(colRect));

+ info.getRect().intersect(pixelSnappedIntRect(colRect));

- if (!info.rect.isEmpty()) {

+ if (!info.getRect().isEmpty()) {

GraphicsContextStateSaver stateSaver(*context);

LayoutRect clipRect(colRect);

@@ -3102,7 +3102,7 @@ void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const LayoutPoint& p

// Adjust our x and y when painting.

LayoutPoint adjustedPaintOffset = paintOffset + offset;

if (paintingFloats)

- paintFloats(info, adjustedPaintOffset, paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip);

+ paintFloats(info, adjustedPaintOffset, paintInfo.getPhase() == PaintPhaseSelection || paintInfo.getPhase() == PaintPhaseTextClip);

else

paintContents(info, adjustedPaintOffset);

}

@@ -3126,12 +3126,12 @@ void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOf

if (childrenInline())

m_lineBoxes.paint(this, paintInfo, paintOffset);

else {

- PaintPhase newPhase = (paintInfo.phase == PaintPhaseChildOutlines) ? PaintPhaseOutline : paintInfo.phase;

+ PaintPhase newPhase = (paintInfo.getPhase() == PaintPhaseChildOutlines) ? PaintPhaseOutline : paintInfo.getPhase();

newPhase = (newPhase == PaintPhaseChildBlockBackgrounds) ? PaintPhaseChildBlockBackground : newPhase;

// We don't paint our own background, but we do let the kids paint their backgrounds.

PaintInfo paintInfoForChild(paintInfo);

- paintInfoForChild.phase = newPhase;

+ paintInfoForChild.setPhase(newPhase);

paintInfoForChild.updatePaintingRootForChildren(this);

paintChildren(paintInfoForChild, paintOffset);

}

@@ -3167,15 +3167,15 @@ void RenderBlock::paintCaret(PaintInfo& paintInfo, const LayoutPoint& paintOffse

if (caretPainter == this && (isContentEditable || caretBrowsing)) {

if (type == CursorCaret)

- frame()->selection()->paintCaret(paintInfo.context, paintOffset, paintInfo.rect);

+ frame()->selection()->paintCaret(paintInfo.getContext(), paintOffset, paintInfo.getRect());

else

- frame()->page()->dragCaretController()->paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);

+ frame()->page()->dragCaretController()->paintDragCaret(frame(), paintInfo.getContext(), paintOffset, paintInfo.getRect());

}

void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

{

- PaintPhase paintPhase = paintInfo.phase;

+ PaintPhase paintPhase = paintInfo.getPhase();

// 1. paint background, borders etc

if ((paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChildBlockBackground) && style()->visibility() == VISIBLE) {

@@ -3286,17 +3286,18 @@ void RenderBlock::paintFloats(PaintInfo& paintInfo, const LayoutPoint& paintOffs

// Only paint the object if our m_shouldPaint flag is set.

if (r->shouldPaint() && !r->m_renderer->hasSelfPaintingLayer()) {

PaintInfo currentPaintInfo(paintInfo);

- currentPaintInfo.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground;

+ PaintPhase phase = preservePhase ? paintInfo.getPhase() : PaintPhaseBlockBackground;

+ currentPaintInfo.setPhase(phase);

LayoutPoint childPoint = flipFloatForWritingModeForChild(r, LayoutPoint(paintOffset.x() + xPositionForFloatIncludingMargin(r) - r->m_renderer->x(), paintOffset.y() + yPositionForFloatIncludingMargin(r) - r->m_renderer->y()));