| Index: sky/engine/core/rendering/RenderBlock.cpp
|
| diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
|
| index c1b72e516cb4e7ac466e45d240a8443d024980d1..ee8c6d7c6dd5f2dd341ee90ee9172602aee0f610 100644
|
| --- a/sky/engine/core/rendering/RenderBlock.cpp
|
| +++ b/sky/engine/core/rendering/RenderBlock.cpp
|
| @@ -785,7 +785,7 @@ void RenderBlock::removeChild(RenderObject* oldChild)
|
| } else {
|
| // Take all the children out of the |next| block and put them in
|
| // the |prev| block.
|
| - nextBlock->moveAllChildrenIncludingFloatsTo(prevBlock, nextBlock->hasLayer() || prevBlock->hasLayer());
|
| + nextBlock->moveAllChildrenTo(prevBlock, nextBlock->hasLayer() || prevBlock->hasLayer());
|
|
|
| // Delete the now-empty block's lines and nuke it.
|
| nextBlock->deleteLineBoxTree();
|
| @@ -1255,8 +1255,6 @@ void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf
|
| if (!preservePhase) {
|
| info.phase = PaintPhaseChildBlockBackgrounds;
|
| renderer->paint(info, childPoint);
|
| - info.phase = PaintPhaseFloat;
|
| - renderer->paint(info, childPoint);
|
| info.phase = PaintPhaseForeground;
|
| renderer->paint(info, childPoint);
|
| info.phase = PaintPhaseOutline;
|
| @@ -1330,10 +1328,6 @@ void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| // FIXME: Make this work with multi column layouts. For now don't fill gaps.
|
| paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
|
|
|
| - // 4. paint floats.
|
| - if (paintPhase == PaintPhaseFloat || paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip)
|
| - paintFloats(paintInfo, scrolledOffset, paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
|
| -
|
| // 5. paint outline.
|
| if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && style()->hasOutline()) {
|
| // Don't paint focus ring for anonymous block continuation because the
|
| @@ -2078,8 +2072,6 @@ bool RenderBlock::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu
|
| updateHitTestResult(result, locationInContainer.point() - localOffset);
|
| return true;
|
| }
|
| - if (hitTestAction == HitTestFloat && hitTestFloats(request, result, locationInContainer, toLayoutPoint(scrolledOffset)))
|
| - return true;
|
| }
|
|
|
| // Check if the point is outside radii.
|
|
|