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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... 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 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 lineTop, lineBottom); 1176 lineTop, lineBottom);
1177 } 1177 }
1178 1178
1179 void InlineFlowBox::setLayoutOverflow(const LayoutRect& rect, 1179 void InlineFlowBox::setLayoutOverflow(const LayoutRect& rect,
1180 const LayoutRect& frameBox) { 1180 const LayoutRect& frameBox) {
1181 ASSERT(!knownToHaveNoOverflow()); 1181 ASSERT(!knownToHaveNoOverflow());
1182 if (frameBox.contains(rect) || rect.isEmpty()) 1182 if (frameBox.contains(rect) || rect.isEmpty())
1183 return; 1183 return;
1184 1184
1185 if (!m_overflow) 1185 if (!m_overflow)
1186 m_overflow = makeUnique<SimpleOverflowModel>(frameBox, frameBox); 1186 m_overflow = WTF::makeUnique<SimpleOverflowModel>(frameBox, frameBox);
1187 1187
1188 m_overflow->setLayoutOverflow(rect); 1188 m_overflow->setLayoutOverflow(rect);
1189 } 1189 }
1190 1190
1191 void InlineFlowBox::setVisualOverflow(const LayoutRect& rect, 1191 void InlineFlowBox::setVisualOverflow(const LayoutRect& rect,
1192 const LayoutRect& frameBox) { 1192 const LayoutRect& frameBox) {
1193 ASSERT(!knownToHaveNoOverflow()); 1193 ASSERT(!knownToHaveNoOverflow());
1194 if (frameBox.contains(rect) || rect.isEmpty()) 1194 if (frameBox.contains(rect) || rect.isEmpty())
1195 return; 1195 return;
1196 1196
1197 if (!m_overflow) 1197 if (!m_overflow)
1198 m_overflow = makeUnique<SimpleOverflowModel>(frameBox, frameBox); 1198 m_overflow = WTF::makeUnique<SimpleOverflowModel>(frameBox, frameBox);
1199 1199
1200 m_overflow->setVisualOverflow(rect); 1200 m_overflow->setVisualOverflow(rect);
1201 } 1201 }
1202 1202
1203 void InlineFlowBox::setOverflowFromLogicalRects( 1203 void InlineFlowBox::setOverflowFromLogicalRects(
1204 const LayoutRect& logicalLayoutOverflow, 1204 const LayoutRect& logicalLayoutOverflow,
1205 const LayoutRect& logicalVisualOverflow, 1205 const LayoutRect& logicalVisualOverflow,
1206 LayoutUnit lineTop, 1206 LayoutUnit lineTop,
1207 LayoutUnit lineBottom) { 1207 LayoutUnit lineBottom) {
1208 ASSERT(!knownToHaveNoOverflow()); 1208 ASSERT(!knownToHaveNoOverflow());
(...skipping 433 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/TextAutosizer.cpp ('k') | third_party/WebKit/Source/core/layout/line/RootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698