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

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

Issue 8222024: Merge 97114 - <rdar://problem/10246137> Duplicate ::after content when both ::before and ::after ... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 if (!wrapInAnonymousSection) { 169 if (!wrapInAnonymousSection) {
170 // If the next renderer is actually wrapped in an anonymous table sectio n, we need to go up and find that. 170 // If the next renderer is actually wrapped in an anonymous table sectio n, we need to go up and find that.
171 while (beforeChild && beforeChild->parent() != this) 171 while (beforeChild && beforeChild->parent() != this)
172 beforeChild = beforeChild->parent(); 172 beforeChild = beforeChild->parent();
173 173
174 RenderBox::addChild(child, beforeChild); 174 RenderBox::addChild(child, beforeChild);
175 return; 175 return;
176 } 176 }
177 177
178 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil d()->isAnonymous()) { 178 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil d()->isAnonymous() && !lastChild()->isBeforeContent()) {
179 lastChild()->addChild(child); 179 lastChild()->addChild(child);
180 return; 180 return;
181 } 181 }
182 182
183 if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == t his) { 183 if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == t his) {
184 RenderObject* section = beforeChild->previousSibling(); 184 RenderObject* section = beforeChild->previousSibling();
185 if (section && section->isTableSection()) { 185 if (section && section->isTableSection()) {
186 ASSERT(section->isAnonymous()); 186 ASSERT(section->isAnonymous());
187 section->addChild(child); 187 section->addChild(child);
188 return; 188 return;
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1217 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) { 1217 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) {
1218 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation))); 1218 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation)));
1219 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect)) 1219 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect))
1220 return true; 1220 return true;
1221 } 1221 }
1222 1222
1223 return false; 1223 return false;
1224 } 1224 }
1225 1225
1226 } 1226 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698