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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Renamed members Created 4 years, 2 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) 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 370
371 inline void BreakingContext::handleOutOfFlowPositioned(Vector<LineLayoutBox>& po sitionedObjects) 371 inline void BreakingContext::handleOutOfFlowPositioned(Vector<LineLayoutBox>& po sitionedObjects)
372 { 372 {
373 // If our original display wasn't an inline type, then we can 373 // If our original display wasn't an inline type, then we can
374 // go ahead and determine our static inline position now. 374 // go ahead and determine our static inline position now.
375 LineLayoutBox box(m_current.getLineLayoutItem()); 375 LineLayoutBox box(m_current.getLineLayoutItem());
376 bool isInlineType = box.style()->isOriginalDisplayInlineType(); 376 bool isInlineType = box.style()->isOriginalDisplayInlineType();
377 if (!isInlineType) { 377 if (!isInlineType) {
378 m_block.setStaticInlinePositionForChild(box, m_block.startOffsetForConte nt()); 378 m_block.setStaticInlinePositionForChild(box, m_block.startOffsetForConte nt());
379 } else { 379 } else {
380 // If our original display was an INLINE type, then we can determine our static y position 380 // If our original display was an EDisplay::Inline type, then we can det ermine our static y position
alancutter (OOO until 2018) 2016/09/26 04:23:47 This should not change.
381 // now. Note, however, that if we're paginated, we may have to update th is position after 381 // now. Note, however, that if we're paginated, we may have to update th is position after
382 // the line has been laid out, since the line may be pushed by a paginat ion strut. 382 // the line has been laid out, since the line may be pushed by a paginat ion strut.
383 box.layer()->setStaticBlockPosition(m_block.logicalHeight()); 383 box.layer()->setStaticBlockPosition(m_block.logicalHeight());
384 } 384 }
385 385
386 // If we're ignoring spaces, we have to stop and include this object and 386 // If we're ignoring spaces, we have to stop and include this object and
387 // then start ignoring spaces again. 387 // then start ignoring spaces again.
388 bool containerIsInline = box.container().isLayoutInline(); 388 bool containerIsInline = box.container().isLayoutInline();
389 if (isInlineType || containerIsInline) { 389 if (isInlineType || containerIsInline) {
390 if (m_ignoringSpaces) 390 if (m_ignoringSpaces)
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 1202
1203 if (style.getTextIndentType() == TextIndentHanging) 1203 if (style.getTextIndentType() == TextIndentHanging)
1204 indentText = indentText == IndentText ? DoNotIndentText : IndentText; 1204 indentText = indentText == IndentText ? DoNotIndentText : IndentText;
1205 1205
1206 return indentText; 1206 return indentText;
1207 } 1207 }
1208 1208
1209 } // namespace blink 1209 } // namespace blink
1210 1210
1211 #endif // BreakingContextInlineHeaders_h 1211 #endif // BreakingContextInlineHeaders_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698