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

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

Issue 7833032: Merge 94543 - Style not propagated to anonymous boxes and anonymous (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 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:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderRuby.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 } 67 }
68 68
69 RenderTable::~RenderTable() 69 RenderTable::~RenderTable()
70 { 70 {
71 } 71 }
72 72
73 void RenderTable::styleDidChange(StyleDifference diff, const RenderStyle* oldSty le) 73 void RenderTable::styleDidChange(StyleDifference diff, const RenderStyle* oldSty le)
74 { 74 {
75 RenderBlock::styleDidChange(diff, oldStyle); 75 RenderBlock::styleDidChange(diff, oldStyle);
76 propagateStyleToAnonymousChildren();
76 77
77 ETableLayout oldTableLayout = oldStyle ? oldStyle->tableLayout() : TAUTO; 78 ETableLayout oldTableLayout = oldStyle ? oldStyle->tableLayout() : TAUTO;
78 79
79 // In the collapsed border model, there is no cell spacing. 80 // In the collapsed border model, there is no cell spacing.
80 m_hSpacing = collapseBorders() ? 0 : style()->horizontalBorderSpacing(); 81 m_hSpacing = collapseBorders() ? 0 : style()->horizontalBorderSpacing();
81 m_vSpacing = collapseBorders() ? 0 : style()->verticalBorderSpacing(); 82 m_vSpacing = collapseBorders() ? 0 : style()->verticalBorderSpacing();
82 m_columnPos[0] = m_hSpacing; 83 m_columnPos[0] = m_hSpacing;
83 84
84 if (!m_tableLayout || style()->tableLayout() != oldTableLayout) { 85 if (!m_tableLayout || style()->tableLayout() != oldTableLayout) {
85 // According to the CSS2 spec, you only use fixed table layout if an 86 // According to the CSS2 spec, you only use fixed table layout if an
(...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) { 1207 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI nContainer))) {
1207 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation))); 1208 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo utSize(adjustedLocation)));
1208 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect)) 1209 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound sRect))
1209 return true; 1210 return true;
1210 } 1211 }
1211 1212
1212 return false; 1213 return false;
1213 } 1214 }
1214 1215
1215 } 1216 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderRuby.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698