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

Side by Side Diff: Source/core/rendering/line/BreakingContextInlineHeaders.h

Issue 143323014: *** DO NOT LAND *** Attempt to understand Regions complexity Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RootInlineBox.cpp ('k') | Source/core/rendering/line/LineLayoutState.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * Copyright (C) 2013 Adobe Systems Incorporated. 5 * Copyright (C) 2013 Adobe Systems Incorporated.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 return extraWidth; 351 return extraWidth;
352 } 352 }
353 353
354 inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit ionedObjects) 354 inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit ionedObjects)
355 { 355 {
356 // If our original display wasn't an inline type, then we can 356 // If our original display wasn't an inline type, then we can
357 // go ahead and determine our static inline position now. 357 // go ahead and determine our static inline position now.
358 RenderBox* box = toRenderBox(m_current.object()); 358 RenderBox* box = toRenderBox(m_current.object());
359 bool isInlineType = box->style()->isOriginalDisplayInlineType(); 359 bool isInlineType = box->style()->isOriginalDisplayInlineType();
360 if (!isInlineType) { 360 if (!isInlineType) {
361 m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent(m_block->logicalHeight())); 361 m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent());
362 } else { 362 } else {
363 // If our original display was an INLINE type, then we can go ahead 363 // If our original display was an INLINE type, then we can go ahead
364 // and determine our static y position now. 364 // and determine our static y position now.
365 box->layer()->setStaticBlockPosition(m_block->logicalHeight()); 365 box->layer()->setStaticBlockPosition(m_block->logicalHeight());
366 } 366 }
367 367
368 // If we're ignoring spaces, we have to stop and include this object and 368 // If we're ignoring spaces, we have to stop and include this object and
369 // then start ignoring spaces again. 369 // then start ignoring spaces again.
370 if (isInlineType || box->container()->isRenderInline()) { 370 if (isInlineType || box->container()->isRenderInline()) {
371 if (m_ignoringSpaces) 371 if (m_ignoringSpaces)
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 m_lineBreak.increment(); 992 m_lineBreak.increment();
993 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object())); 993 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object()));
994 } 994 }
995 995
996 return m_lineBreak; 996 return m_lineBreak;
997 } 997 }
998 998
999 } 999 }
1000 1000
1001 #endif // BreakingContextInlineHeaders_h 1001 #endif // BreakingContextInlineHeaders_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RootInlineBox.cpp ('k') | Source/core/rendering/line/LineLayoutState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698