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

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

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 years, 8 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 /* 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 return true; 235 return true;
236 } 236 }
237 } 237 }
238 } 238 }
239 239
240 return false; 240 return false;
241 } 241 }
242 242
243 void RenderLineBoxList::dirtyLinesFromChangedChild(RenderObject* container, Rend erObject* child) 243 void RenderLineBoxList::dirtyLinesFromChangedChild(RenderObject* container, Rend erObject* child)
244 { 244 {
245 if (!container->parent() || (container->isRenderBlock() && (container->selfN eedsLayout() || !container->isRenderBlockFlow()))) 245 if (!container->parent() || (container->isRenderBlock() && (container->selfN eedsLayout() || !container->isRenderParagraph())))
246 return; 246 return;
247 247
248 RenderInline* inlineContainer = container->isRenderInline() ? toRenderInline (container) : 0; 248 RenderInline* inlineContainer = container->isRenderInline() ? toRenderInline (container) : 0;
249 InlineBox* firstBox = inlineContainer ? inlineContainer->firstLineBoxIncludi ngCulling() : firstLineBox(); 249 InlineBox* firstBox = inlineContainer ? inlineContainer->firstLineBoxIncludi ngCulling() : firstLineBox();
250 250
251 // If we have no first line box, then just bail early. 251 // If we have no first line box, then just bail early.
252 if (!firstBox) { 252 if (!firstBox) {
253 // For an empty inline, go ahead and propagate the check up to our paren t, unless the parent 253 // For an empty inline, go ahead and propagate the check up to our paren t, unless the parent
254 // is already dirty. 254 // is already dirty.
255 if (container->isInline() && !container->ancestorLineBoxDirty()) { 255 if (container->isInline() && !container->ancestorLineBoxDirty()) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 ASSERT(child->prevLineBox() == prev); 338 ASSERT(child->prevLineBox() == prev);
339 prev = child; 339 prev = child;
340 } 340 }
341 ASSERT(prev == m_lastLineBox); 341 ASSERT(prev == m_lastLineBox);
342 #endif 342 #endif
343 } 343 }
344 344
345 #endif 345 #endif
346 346
347 } 347 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderFlexibleBox.cpp ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698