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

Side by Side Diff: sky/engine/core/rendering/RenderParagraph.cpp

Issue 840483004: Get rid of the *AndFullPaintInvalidation methods. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/engine/config.h" 5 #include "sky/engine/config.h"
6 #include "sky/engine/core/rendering/RenderParagraph.h" 6 #include "sky/engine/core/rendering/RenderParagraph.h"
7 7
8 #include "sky/engine/core/rendering/BidiRunForLine.h" 8 #include "sky/engine/core/rendering/BidiRunForLine.h"
9 #include "sky/engine/core/rendering/InlineIterator.h" 9 #include "sky/engine/core/rendering/InlineIterator.h"
10 #include "sky/engine/core/rendering/RenderLayer.h" 10 #include "sky/engine/core/rendering/RenderLayer.h"
(...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 break; 1377 break;
1378 } 1378 }
1379 // Check if a new float has been inserted after the last known float. 1379 // Check if a new float has been inserted after the last known float.
1380 if (!curr && floatIndex < layoutState.floats().size()) 1380 if (!curr && floatIndex < layoutState.floats().size())
1381 layoutState.markForFullLayout(); 1381 layoutState.markForFullLayout();
1382 } 1382 }
1383 1383
1384 if (layoutState.isFullLayout()) { 1384 if (layoutState.isFullLayout()) {
1385 // If we encountered a new float and have inline children, mark ourself to force us to issue paint invalidations. 1385 // If we encountered a new float and have inline children, mark ourself to force us to issue paint invalidations.
1386 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { 1386 if (layoutState.hasInlineChild() && !selfNeedsLayout()) {
1387 setNeedsLayoutAndFullPaintInvalidation(MarkOnlyThis); 1387 setNeedsLayout(MarkOnlyThis);
1388 } 1388 }
1389 1389
1390 // FIXME: This should just call deleteLineBoxTree, but that causes 1390 // FIXME: This should just call deleteLineBoxTree, but that causes
1391 // crashes for fast/repaint tests. 1391 // crashes for fast/repaint tests.
1392 curr = firstRootBox(); 1392 curr = firstRootBox();
1393 while (curr) { 1393 while (curr) {
1394 // Note: This uses nextRootBox() insted of nextLineBox() like delete LineBoxTree does. 1394 // Note: This uses nextRootBox() insted of nextLineBox() like delete LineBoxTree does.
1395 RootInlineBox* next = curr->nextRootBox(); 1395 RootInlineBox* next = curr->nextRootBox();
1396 curr->deleteLine(); 1396 curr->deleteLine();
1397 curr = next; 1397 curr = next;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 curr->adjustLogicalPosition(logicalLeft, 0); 1582 curr->adjustLogicalPosition(logicalLeft, 0);
1583 else 1583 else
1584 curr->adjustLogicalPosition(logicalLeft - (availableLogicalW idth - totalLogicalWidth), 0); 1584 curr->adjustLogicalPosition(logicalLeft - (availableLogicalW idth - totalLogicalWidth), 0);
1585 } 1585 }
1586 } 1586 }
1587 firstLine = false; 1587 firstLine = false;
1588 } 1588 }
1589 } 1589 }
1590 1590
1591 } // namespace blink 1591 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObjectChildList.cpp ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698