Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Side by Side Diff: Source/core/rendering/InlineFlowBox.cpp

Issue 278293002: [Regression] Fix Draggable is float:left and container is overflow:hidden (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed Review Comments + Unit Tests Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 } else { 1135 } else {
1136 // Paint our background, border and box-shadow. 1136 // Paint our background, border and box-shadow.
1137 paintBoxDecorations(paintInfo, paintOffset); 1137 paintBoxDecorations(paintInfo, paintOffset);
1138 } 1138 }
1139 } 1139 }
1140 1140
1141 if (paintInfo.phase == PaintPhaseMask) 1141 if (paintInfo.phase == PaintPhaseMask)
1142 return; 1142 return;
1143 1143
1144 PaintPhase paintPhase = paintInfo.phase == PaintPhaseChildOutlines ? PaintPh aseOutline : paintInfo.phase; 1144 PaintPhase paintPhase = paintInfo.phase == PaintPhaseChildOutlines ? PaintPh aseOutline : paintInfo.phase;
1145 PaintInfo childInfo(paintInfo);
1146 childInfo.phase = paintPhase;
1147 childInfo.updatePaintingRootForChildren(&renderer());
1148 1145
1149 // Paint our children. 1146 // Paint our children.
1150 if (paintPhase != PaintPhaseSelfOutline) { 1147 if (paintPhase != PaintPhaseSelfOutline) {
1148 PaintInfo childInfo(paintInfo);
1149 childInfo.phase = paintPhase;
1150
1151 if (childInfo.paintingRoot && childInfo.paintingRoot->isDescendantOf(&re nderer()))
1152 childInfo.paintingRoot = 0;
1153 else
1154 childInfo.updatePaintingRootForChildren(&renderer());
1155
1151 for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) { 1156 for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
1152 if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPai ntingLayer()) 1157 if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPai ntingLayer())
1153 curr->paint(childInfo, paintOffset, lineTop, lineBottom); 1158 curr->paint(childInfo, paintOffset, lineTop, lineBottom);
1154 } 1159 }
1155 } 1160 }
1156 } 1161 }
1157 1162
1158 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const LayoutRect& rect, CompositeOperator op) 1163 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const LayoutRect& rect, CompositeOperator op)
1159 { 1164 {
1160 if (!fillLayer) 1165 if (!fillLayer)
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 ASSERT(child->prevOnLine() == prev); 1661 ASSERT(child->prevOnLine() == prev);
1657 prev = child; 1662 prev = child;
1658 } 1663 }
1659 ASSERT(prev == m_lastChild); 1664 ASSERT(prev == m_lastChild);
1660 #endif 1665 #endif
1661 } 1666 }
1662 1667
1663 #endif 1668 #endif
1664 1669
1665 } // namespace WebCore 1670 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698