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

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

Issue 2755143003: [LayoutNG] Make NGLineBuilder work with inline floats (Closed)
Patch Set: make setIsInPlacedTree to be available for LayoutNG 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void setHeight(LayoutUnit height) { 101 void setHeight(LayoutUnit height) {
102 ASSERT(!isInPlacedTree()); 102 ASSERT(!isInPlacedTree());
103 m_frameRect.setHeight(height); 103 m_frameRect.setHeight(height);
104 } 104 }
105 105
106 const LayoutRect& frameRect() const { 106 const LayoutRect& frameRect() const {
107 ASSERT(isPlaced()); 107 ASSERT(isPlaced());
108 return m_frameRect; 108 return m_frameRect;
109 } 109 }
110 110
111 #if DCHECK_IS_ON()
112 bool isInPlacedTree() const { return m_isInPlacedTree; } 111 bool isInPlacedTree() const { return m_isInPlacedTree; }
113 void setIsInPlacedTree(bool value) { m_isInPlacedTree = value; } 112 void setIsInPlacedTree(bool value) { m_isInPlacedTree = value; }
114 #endif
115 113
116 bool shouldPaint() const { return m_shouldPaint; } 114 bool shouldPaint() const { return m_shouldPaint; }
117 void setShouldPaint(bool shouldPaint) { m_shouldPaint = shouldPaint; } 115 void setShouldPaint(bool shouldPaint) { m_shouldPaint = shouldPaint; }
118 bool isDescendant() const { return m_isDescendant; } 116 bool isDescendant() const { return m_isDescendant; }
119 void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; } 117 void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; }
120 bool isLowestNonOverhangingFloatInChild() const { 118 bool isLowestNonOverhangingFloatInChild() const {
121 return m_isLowestNonOverhangingFloatInChild; 119 return m_isLowestNonOverhangingFloatInChild;
122 } 120 }
123 void setIsLowestNonOverhangingFloatInChild( 121 void setIsLowestNonOverhangingFloatInChild(
124 bool isLowestNonOverhangingFloatInChild) { 122 bool isLowestNonOverhangingFloatInChild) {
(...skipping 16 matching lines...) Expand all
141 139
142 LayoutBox* m_layoutObject; 140 LayoutBox* m_layoutObject;
143 RootInlineBox* m_originatingLine; 141 RootInlineBox* m_originatingLine;
144 LayoutRect m_frameRect; 142 LayoutRect m_frameRect;
145 143
146 unsigned m_type : 2; // Type (left or right aligned) 144 unsigned m_type : 2; // Type (left or right aligned)
147 unsigned m_shouldPaint : 1; 145 unsigned m_shouldPaint : 1;
148 unsigned m_isDescendant : 1; 146 unsigned m_isDescendant : 1;
149 unsigned m_isPlaced : 1; 147 unsigned m_isPlaced : 1;
150 unsigned m_isLowestNonOverhangingFloatInChild : 1; 148 unsigned m_isLowestNonOverhangingFloatInChild : 1;
151 #if DCHECK_IS_ON()
152 unsigned m_isInPlacedTree : 1; 149 unsigned m_isInPlacedTree : 1;
153 #endif
154 }; 150 };
155 151
156 struct FloatingObjectHashFunctions { 152 struct FloatingObjectHashFunctions {
157 STATIC_ONLY(FloatingObjectHashFunctions); 153 STATIC_ONLY(FloatingObjectHashFunctions);
158 static unsigned hash(FloatingObject* key) { 154 static unsigned hash(FloatingObject* key) {
159 return DefaultHash<LayoutBox*>::Hash::hash(key->layoutObject()); 155 return DefaultHash<LayoutBox*>::Hash::hash(key->layoutObject());
160 } 156 }
161 static unsigned hash(const std::unique_ptr<FloatingObject>& key) { 157 static unsigned hash(const std::unique_ptr<FloatingObject>& key) {
162 return hash(key.get()); 158 return hash(key.get());
163 } 159 }
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 }; 276 };
281 template <> 277 template <>
282 struct ValueToString<FloatingObject*> { 278 struct ValueToString<FloatingObject*> {
283 static String toString(const FloatingObject*); 279 static String toString(const FloatingObject*);
284 }; 280 };
285 #endif 281 #endif
286 282
287 } // namespace blink 283 } // namespace blink
288 284
289 #endif // FloatingObjects_h 285 #endif // FloatingObjects_h
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698