third_party/WebKit/Source/core/layout/FloatingObjects.h - Issue 2283413003: Copy float list of ruby base when merging it with a sibling

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

Issue 2283413003: Copy float list of ruby base when merging it with a sibling (Closed)

Patch Set: Created 4 years, 3 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:

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/float/float-reparent-during-detach-crash.html ('k') | third_party/WebKit/Source/core/layout/FloatingObjects.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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. All rights reserved.	5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; }	84 void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; }

85 bool isLowestNonOverhangingFloatInChild() const { return m_isLowestNonOverha ngingFloatInChild; }	85 bool isLowestNonOverhangingFloatInChild() const { return m_isLowestNonOverha ngingFloatInChild; }

86 void setIsLowestNonOverhangingFloatInChild(bool isLowestNonOverhangingFloatI nChild) { m_isLowestNonOverhangingFloatInChild = isLowestNonOverhangingFloatInCh ild; }	86 void setIsLowestNonOverhangingFloatInChild(bool isLowestNonOverhangingFloatI nChild) { m_isLowestNonOverhangingFloatInChild = isLowestNonOverhangingFloatInCh ild; }

87	87

88 // FIXME: Callers of these methods are dangerous and should be whitelisted e xplicitly or removed.	88 // FIXME: Callers of these methods are dangerous and should be whitelisted e xplicitly or removed.

89 RootInlineBox* originatingLine() const { return m_originatingLine; }	89 RootInlineBox* originatingLine() const { return m_originatingLine; }

90 void setOriginatingLine(RootInlineBox* line) { m_originatingLine = line; }	90 void setOriginatingLine(RootInlineBox* line) { m_originatingLine = line; }

91	91

92 private:	92 private:

93 explicit FloatingObject(LayoutBox*);	93 explicit FloatingObject(LayoutBox*);

94 FloatingObject(LayoutBox*, Type, const LayoutRect&, bool shouldPaint, bool i sDescendant, bool isLowestNonOverhangingFloatInChild, bool performingUnsafeClone = false);	94 FloatingObject(LayoutBox*, Type, const LayoutRect&, bool shouldPaint, bool i sDescendant, bool isLowestNonOverhangingFloatInChild);

95	95

96 bool shouldPaintForCompositedLayoutPart();	96 bool shouldPaintForCompositedLayoutPart();

97	97

98 LayoutBox* m_layoutObject;	98 LayoutBox* m_layoutObject;

99 RootInlineBox* m_originatingLine;	99 RootInlineBox* m_originatingLine;

100 LayoutRect m_frameRect;	100 LayoutRect m_frameRect;

101	101

102 unsigned m_type : 2; // Type (left or right aligned)	102 unsigned m_type : 2; // Type (left or right aligned)

103 unsigned m_shouldPaint : 1;	103 unsigned m_shouldPaint : 1;

104 unsigned m_isDescendant : 1;	104 unsigned m_isDescendant : 1;

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
201 static String toString(const LayoutUnit value);	201 static String toString(const LayoutUnit value);

202 };	202 };

203 template<> struct ValueToString<FloatingObject*> {	203 template<> struct ValueToString<FloatingObject*> {

204 static String toString(const FloatingObject*);	204 static String toString(const FloatingObject*);

205 };	205 };

206 #endif	206 #endif

207	207

208 } // namespace blink	208 } // namespace blink

209	209

210 #endif // FloatingObjects_h	210 #endif // FloatingObjects_h

OLD	NEW