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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

Issue 2536453002: Rename some functions about layout locations (Closed)
Patch Set: Rebase Created 4 years 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. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 LayoutUnit totWidth = 65 LayoutUnit totWidth =
66 marginBorderPaddingLogicalLeft() + marginBorderPaddingLogicalRight(); 66 marginBorderPaddingLogicalLeft() + marginBorderPaddingLogicalRight();
67 for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) { 67 for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
68 if (curr->isInlineFlowBox()) 68 if (curr->isInlineFlowBox())
69 totWidth += toInlineFlowBox(curr)->getFlowSpacingLogicalWidth(); 69 totWidth += toInlineFlowBox(curr)->getFlowSpacingLogicalWidth();
70 } 70 }
71 return totWidth; 71 return totWidth;
72 } 72 }
73 73
74 LayoutRect InlineFlowBox::frameRect() const { 74 LayoutRect InlineFlowBox::frameRect() const {
75 return LayoutRect(topLeft(), size()); 75 return LayoutRect(location(), size());
76 } 76 }
77 77
78 static void setHasTextDescendantsOnAncestors(InlineFlowBox* box) { 78 static void setHasTextDescendantsOnAncestors(InlineFlowBox* box) {
79 while (box && !box->hasTextDescendants()) { 79 while (box && !box->hasTextDescendants()) {
80 box->setHasTextDescendants(); 80 box->setHasTextDescendants();
81 box = box->parent(); 81 box = box->parent();
82 } 82 }
83 } 83 }
84 84
85 static inline bool hasIdenticalLineHeightProperties( 85 static inline bool hasIdenticalLineHeightProperties(
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 ASSERT(child->prevOnLine() == prev); 1642 ASSERT(child->prevOnLine() == prev);
1643 prev = child; 1643 prev = child;
1644 } 1644 }
1645 ASSERT(prev == m_lastChild); 1645 ASSERT(prev == m_lastChild);
1646 #endif 1646 #endif
1647 } 1647 }
1648 1648
1649 #endif 1649 #endif
1650 1650
1651 } // namespace blink 1651 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698