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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 9 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) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 { 66 {
67 // Internet Explorer and Firefox always create a marker for list items, even 67 // Internet Explorer and Firefox always create a marker for list items, even
68 // when the list-style-type is none. We do not make a marker in the 68 // when the list-style-type is none. We do not make a marker in the
69 // list-style-type: none case, since it is wasteful to do so. 69 // list-style-type: none case, since it is wasteful to do so.
70 // However, in order to match other browsers we have to pretend like an 70 // However, in order to match other browsers we have to pretend like an
71 // invisible marker exists. The side effect of having an invisible marker 71 // invisible marker exists. The side effect of having an invisible marker
72 // is that the quirks mode behavior of shrinking lines with no text children 72 // is that the quirks mode behavior of shrinking lines with no text children
73 // must not apply. This change also means that gaps will exist between image 73 // must not apply. This change also means that gaps will exist between image
74 // bullet list items. Even when the list bullet is an image, the line is 74 // bullet list items. Even when the list bullet is an image, the line is
75 // still considered to be immune from the quirk. 75 // still considered to be immune from the quirk.
76 m_hasTextChildren = lineLayoutItem.style()->display() == EDisplay::ListItem; 76 m_hasTextChildren =
77 lineLayoutItem.style()->display() == EDisplay::kListItem;
77 m_hasTextDescendants = m_hasTextChildren; 78 m_hasTextDescendants = m_hasTextChildren;
78 } 79 }
79 80
80 #if DCHECK_IS_ON() 81 #if DCHECK_IS_ON()
81 ~InlineFlowBox() override; 82 ~InlineFlowBox() override;
82 #endif 83 #endif
83 84
84 #ifndef NDEBUG 85 #ifndef NDEBUG
85 void showLineTreeAndMark(const InlineBox* = nullptr, 86 void showLineTreeAndMark(const InlineBox* = nullptr,
86 const char* = nullptr, 87 const char* = nullptr,
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 487
487 inline void InlineFlowBox::setHasBadChildList() { 488 inline void InlineFlowBox::setHasBadChildList() {
488 #if DCHECK_IS_ON() 489 #if DCHECK_IS_ON()
489 m_hasBadChildList = true; 490 m_hasBadChildList = true;
490 #endif 491 #endif
491 } 492 }
492 493
493 } // namespace blink 494 } // namespace blink
494 495
495 #endif // InlineFlowBox_h 496 #endif // InlineFlowBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698