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

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

Issue 10383285: Merge 116174 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights 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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 CollapsedBorderValue& RenderTableSection::cachedCollapsedBorder(const RenderTabl eCell* cell, CollapsedBorderSide side) 1407 CollapsedBorderValue& RenderTableSection::cachedCollapsedBorder(const RenderTabl eCell* cell, CollapsedBorderSide side)
1408 { 1408 {
1409 ASSERT(table()->collapseBorders()); 1409 ASSERT(table()->collapseBorders());
1410 HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue>::iterator i t = m_cellsCollapsedBorders.find(make_pair(cell, side)); 1410 HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue>::iterator i t = m_cellsCollapsedBorders.find(make_pair(cell, side));
1411 ASSERT(it != m_cellsCollapsedBorders.end()); 1411 ASSERT(it != m_cellsCollapsedBorders.end());
1412 return it->second; 1412 return it->second;
1413 } 1413 }
1414 1414
1415 RenderTableSection* RenderTableSection::createAnonymousWithParentRenderer(const RenderObject* parent) 1415 RenderTableSection* RenderTableSection::createAnonymousWithParentRenderer(const RenderObject* parent)
1416 { 1416 {
1417 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parent->sty le()); 1417 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_ROW_GROUP);
1418 newStyle->setDisplay(TABLE_ROW_GROUP);
1419
1420 RenderTableSection* newSection = new (parent->renderArena()) RenderTableSect ion(parent->document() /* is anonymous */); 1418 RenderTableSection* newSection = new (parent->renderArena()) RenderTableSect ion(parent->document() /* is anonymous */);
1421 newSection->setStyle(newStyle.release()); 1419 newSection->setStyle(newStyle.release());
1422 return newSection; 1420 return newSection;
1423 } 1421 }
1424 1422
1425 } // namespace WebCore 1423 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698