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

Side by Side Diff: Source/core/layout/line/LineBoxList.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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/layout/line/LayoutTextInfo.h ('k') | Source/core/layout/line/TrailingObjects.h » ('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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 potentialLineBreakObjects.add(curr); 259 potentialLineBreakObjects.add(curr);
260 260
261 if (curr->isFloatingOrOutOfFlowPositioned()) 261 if (curr->isFloatingOrOutOfFlowPositioned())
262 continue; 262 continue;
263 263
264 if (curr->isReplaced()) { 264 if (curr->isReplaced()) {
265 InlineBox* wrapper = toLayoutBox(curr)->inlineBoxWrapper(); 265 InlineBox* wrapper = toLayoutBox(curr)->inlineBoxWrapper();
266 if (wrapper) 266 if (wrapper)
267 box = &wrapper->root(); 267 box = &wrapper->root();
268 } else if (curr->isText()) { 268 } else if (curr->isText()) {
269 InlineTextBox* textBox = toRenderText(curr)->lastTextBox(); 269 InlineTextBox* textBox = toLayoutText(curr)->lastTextBox();
270 if (textBox) 270 if (textBox)
271 box = &textBox->root(); 271 box = &textBox->root();
272 } else if (curr->isLayoutInline()) { 272 } else if (curr->isLayoutInline()) {
273 InlineBox* lastSiblingBox = toLayoutInline(curr)->lastLineBoxIncludi ngCulling(); 273 InlineBox* lastSiblingBox = toLayoutInline(curr)->lastLineBoxIncludi ngCulling();
274 if (lastSiblingBox) 274 if (lastSiblingBox)
275 box = &lastSiblingBox->root(); 275 box = &lastSiblingBox->root();
276 } 276 }
277 277
278 if (box) 278 if (box)
279 break; 279 break;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 ASSERT(child->prevLineBox() == prev); 327 ASSERT(child->prevLineBox() == prev);
328 prev = child; 328 prev = child;
329 } 329 }
330 ASSERT(prev == m_lastLineBox); 330 ASSERT(prev == m_lastLineBox);
331 #endif 331 #endif
332 } 332 }
333 333
334 #endif 334 #endif
335 335
336 } 336 }
OLDNEW
« no previous file with comments | « Source/core/layout/line/LayoutTextInfo.h ('k') | Source/core/layout/line/TrailingObjects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698