| Index: Source/core/rendering/InlineBox.cpp
|
| diff --git a/Source/core/rendering/InlineBox.cpp b/Source/core/rendering/InlineBox.cpp
|
| index bfd9db658ecabfab5fee8a714dd84e49622eeb2c..6a7dbc531efcd9335398e0995f15ca7559bced71 100644
|
| --- a/Source/core/rendering/InlineBox.cpp
|
| +++ b/Source/core/rendering/InlineBox.cpp
|
| @@ -197,7 +197,7 @@ void InlineBox::adjustPosition(float dx, float dy)
|
|
|
| void InlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /* lineTop */, LayoutUnit /*lineBottom*/)
|
| {
|
| - if (!paintInfo.shouldPaintWithinRoot(renderer()) || (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection))
|
| + if (!paintInfo.shouldPaintWithinRoot(renderer()) || (paintInfo.getPhase() != PaintPhaseForeground && paintInfo.getPhase() != PaintPhaseSelection))
|
| return;
|
|
|
| LayoutPoint childPoint = paintOffset;
|
| @@ -207,18 +207,19 @@ void InlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, Layo
|
| // Paint all phases of replaced elements atomically, as though the replaced element established its
|
| // own stacking context. (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1
|
| // specification.)
|
| - bool preservePhase = paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip;
|
| + bool preservePhase = paintInfo.getPhase() == PaintPhaseSelection || paintInfo.getPhase() == PaintPhaseTextClip;
|
| PaintInfo info(paintInfo);
|
| - info.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground;
|
| + PaintPhase phase = preservePhase ? paintInfo.getPhase() : PaintPhaseBlockBackground;
|
| + info.setPhase(phase);
|
| renderer()->paint(info, childPoint);
|
| if (!preservePhase) {
|
| - info.phase = PaintPhaseChildBlockBackgrounds;
|
| + info.setPhase(PaintPhaseChildBlockBackgrounds);
|
| renderer()->paint(info, childPoint);
|
| - info.phase = PaintPhaseFloat;
|
| + info.setPhase(PaintPhaseFloat);
|
| renderer()->paint(info, childPoint);
|
| - info.phase = PaintPhaseForeground;
|
| + info.setPhase(PaintPhaseForeground);
|
| renderer()->paint(info, childPoint);
|
| - info.phase = PaintPhaseOutline;
|
| + info.setPhase(PaintPhaseOutline);
|
| renderer()->paint(info, childPoint);
|
| }
|
| }
|
|
|