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

Side by Side Diff: Source/WebCore/rendering/RenderTableRow.cpp

Issue 8666016: Merge 100630 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 1 month 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, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 RenderTable* table = this->table(); 84 RenderTable* table = this->table();
85 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout () && oldStyle && oldStyle->border() != style()->border()) 85 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout () && oldStyle && oldStyle->border() != style()->border())
86 table->invalidateCollapsedBorders(); 86 table->invalidateCollapsedBorders();
87 } 87 }
88 } 88 }
89 89
90 void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild) 90 void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
91 { 91 {
92 // Make sure we don't append things after :after-generated content if we hav e it. 92 // Make sure we don't append things after :after-generated content if we hav e it.
93 if (!beforeChild) 93 if (!beforeChild)
94 beforeChild = findAfterContentRenderer(); 94 beforeChild = afterPseudoElementRenderer();
95 95
96 if (!child->isTableCell()) { 96 if (!child->isTableCell()) {
97 RenderObject* last = beforeChild; 97 RenderObject* last = beforeChild;
98 if (!last) 98 if (!last)
99 last = lastChild(); 99 last = lastChild();
100 if (last && last->isAnonymous() && last->isTableCell() && !last->isBefor eOrAfterContent()) { 100 if (last && last->isAnonymous() && last->isTableCell() && !last->isBefor eOrAfterContent()) {
101 if (beforeChild == last) 101 if (beforeChild == last)
102 beforeChild = last->firstChild(); 102 beforeChild = last->firstChild();
103 last->addChild(child, beforeChild); 103 last->addChild(child, beforeChild);
104 return; 104 return;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 } 241 }
242 } 242 }
243 243
244 void RenderTableRow::imageChanged(WrappedImagePtr, const IntRect*) 244 void RenderTableRow::imageChanged(WrappedImagePtr, const IntRect*)
245 { 245 {
246 // FIXME: Examine cells and repaint only the rect the image paints in. 246 // FIXME: Examine cells and repaint only the rect the image paints in.
247 repaint(); 247 repaint();
248 } 248 }
249 249
250 } // namespace WebCore 250 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTable.cpp ('k') | Source/WebCore/rendering/RenderTableSection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698