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

Side by Side Diff: Source/WebCore/rendering/RenderTable.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 * 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 while (o && o != ptr) 105 while (o && o != ptr)
106 o = o->previousSibling(); 106 o = o->previousSibling();
107 if (!o) 107 if (!o)
108 ptr = 0; 108 ptr = 0;
109 } 109 }
110 110
111 void RenderTable::addChild(RenderObject* child, RenderObject* beforeChild) 111 void RenderTable::addChild(RenderObject* child, RenderObject* beforeChild)
112 { 112 {
113 // Make sure we don't append things after :after-generated content if we hav e it. 113 // Make sure we don't append things after :after-generated content if we hav e it.
114 if (!beforeChild) 114 if (!beforeChild)
115 beforeChild = findAfterContentRenderer(); 115 beforeChild = afterPseudoElementRenderer();
116 116
117 bool wrapInAnonymousSection = !child->isPositioned(); 117 bool wrapInAnonymousSection = !child->isPositioned();
118 118
119 if (child->isRenderBlock() && child->style()->display() == TABLE_CAPTION) { 119 if (child->isRenderBlock() && child->style()->display() == TABLE_CAPTION) {
120 // First caption wins. 120 // First caption wins.
121 if (beforeChild && m_caption) { 121 if (beforeChild && m_caption) {
122 RenderObject* o = beforeChild->previousSibling(); 122 RenderObject* o = beforeChild->previousSibling();
123 while (o && o != m_caption) 123 while (o && o != m_caption)
124 o = o->previousSibling(); 124 o = o->previousSibling();
125 if (!o) { 125 if (!o) {
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) { 1242 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) {
1243 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation))); 1243 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation)));
1244 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect)) 1244 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect))
1245 return true; 1245 return true;
1246 } 1246 }
1247 1247
1248 return false; 1248 return false;
1249 } 1249 }
1250 1250
1251 } 1251 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObjectChildList.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698