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

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

Issue 129853005: Fix checkForRepaintDuringLayout do return false when doing repaintAfterLayout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 1619
1620 void RenderBlockFlow::repaintDirtyFloats(Vector<FloatWithRect>& floats) 1620 void RenderBlockFlow::repaintDirtyFloats(Vector<FloatWithRect>& floats)
1621 { 1621 {
1622 size_t floatCount = floats.size(); 1622 size_t floatCount = floats.size();
1623 // Floats that did not have layout did not repaint when we laid them out. Th ey would have 1623 // Floats that did not have layout did not repaint when we laid them out. Th ey would have
1624 // painted by now if they had moved, but if they stayed at (0, 0), they stil l need to be 1624 // painted by now if they had moved, but if they stayed at (0, 0), they stil l need to be
1625 // painted. 1625 // painted.
1626 for (size_t i = 0; i < floatCount; ++i) { 1626 for (size_t i = 0; i < floatCount; ++i) {
1627 if (!floats[i].everHadLayout) { 1627 if (!floats[i].everHadLayout) {
1628 RenderBox* f = floats[i].object; 1628 RenderBox* f = floats[i].object;
1629 if (!f->x() && !f->y() && f->checkForRepaintDuringLayout()) { 1629 if (!f->x() && !f->y() && f->checkForRepaint()) {
1630 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) 1630 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
1631 f->setShouldDoFullRepaintAfterLayout(true); 1631 f->setShouldDoFullRepaintAfterLayout(true);
1632 else 1632 else
1633 f->repaint(); 1633 f->repaint();
1634 } 1634 }
1635 } 1635 }
1636 } 1636 }
1637 } 1637 }
1638 1638
1639 void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& re paintLogicalTop, LayoutUnit& repaintLogicalBottom, LayoutUnit afterEdge) 1639 void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& re paintLogicalTop, LayoutUnit& repaintLogicalBottom, LayoutUnit afterEdge)
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache); 2333 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache);
2334 2334
2335 setLineGridBox(lineGridBox); 2335 setLineGridBox(lineGridBox);
2336 2336
2337 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying 2337 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying
2338 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping 2338 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping
2339 // to this grid. 2339 // to this grid.
2340 } 2340 }
2341 2341
2342 } 2342 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698