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

Side by Side Diff: Source/core/layout/LayoutTable.h

Issue 880113002: Fix crash when establishing an inline continuation inside a block continuation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserv ed. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserv ed.
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 { 115 {
116 if (style()->isHorizontalWritingMode()) 116 if (style()->isHorizontalWritingMode())
117 return style()->isFlippedBlocksWritingMode() ? outerBorderBefore() : outerBorderAfter(); 117 return style()->isFlippedBlocksWritingMode() ? outerBorderBefore() : outerBorderAfter();
118 return style()->isLeftToRightDirection() ? outerBorderEnd() : outerBorde rStart(); 118 return style()->isLeftToRightDirection() ? outerBorderEnd() : outerBorde rStart();
119 } 119 }
120 120
121 int calcBorderStart() const; 121 int calcBorderStart() const;
122 int calcBorderEnd() const; 122 int calcBorderEnd() const;
123 void recalcBordersInRowDirection(); 123 void recalcBordersInRowDirection();
124 124
125 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ov erride; 125 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ov erride final;
Julien - ping for review 2015/01/28 17:29:53 This is redundant, LayoutTable is marked as final
mstensho (USE GERRIT) 2015/01/28 17:51:26 Done.
126 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) override;
mstensho (USE GERRIT) 2015/01/28 10:43:16 LayoutTable has its own very special implementatio
Julien - ping for review 2015/01/28 17:29:53 We didn't need the override AFAICT as we never exp
mstensho (USE GERRIT) 2015/01/28 17:51:26 The parent of |beforeChild| in RenderBlock::addChi
Julien - ping for review 2015/01/29 10:28:31 I think it's safer to implement the function (thin
mstensho (USE GERRIT) 2015/01/29 12:08:42 Done.
mstensho (USE GERRIT) 2015/01/29 17:49:48 FYI, removing the assertion again. It got hit by f
mstensho (USE GERRIT) 2015/01/29 18:05:41 Reported crbug.com/453488 for the fast/table/crash
126 127
127 struct ColumnStruct { 128 struct ColumnStruct {
128 explicit ColumnStruct(unsigned initialSpan = 1) 129 explicit ColumnStruct(unsigned initialSpan = 1)
129 : span(initialSpan) 130 : span(initialSpan)
130 { 131 {
131 } 132 }
132 133
133 unsigned span; 134 unsigned span;
134 }; 135 };
135 136
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 if (m_firstBody) 360 if (m_firstBody)
360 return m_firstBody; 361 return m_firstBody;
361 return m_foot; 362 return m_foot;
362 } 363 }
363 364
364 DEFINE_RENDER_OBJECT_TYPE_CASTS(LayoutTable, isTable()); 365 DEFINE_RENDER_OBJECT_TYPE_CASTS(LayoutTable, isTable());
365 366
366 } // namespace blink 367 } // namespace blink
367 368
368 #endif // LayoutTable_h 369 #endif // LayoutTable_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698