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

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

Issue 12641003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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, 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 212 }
213 213
214 return false; 214 return false;
215 } 215 }
216 216
217 void RenderTableRow::paintOutlineForRowIfNeeded(PaintInfo& paintInfo, const Layo utPoint& paintOffset) 217 void RenderTableRow::paintOutlineForRowIfNeeded(PaintInfo& paintInfo, const Layo utPoint& paintOffset)
218 { 218 {
219 LayoutPoint adjustedPaintOffset = paintOffset + location(); 219 LayoutPoint adjustedPaintOffset = paintOffset + location();
220 PaintPhase paintPhase = paintInfo.phase; 220 PaintPhase paintPhase = paintInfo.phase;
221 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && style()->visibility() == VISIBLE) 221 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && style()->visibility() == VISIBLE)
222 paintOutline(paintInfo.context, LayoutRect(adjustedPaintOffset, size())) ; 222 paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size()));
223 } 223 }
224 224
225 void RenderTableRow::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 225 void RenderTableRow::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
226 { 226 {
227 ASSERT(hasSelfPaintingLayer()); 227 ASSERT(hasSelfPaintingLayer());
228 228
229 paintOutlineForRowIfNeeded(paintInfo, paintOffset); 229 paintOutlineForRowIfNeeded(paintInfo, paintOffset);
230 for (RenderObject* child = firstChild(); child; child = child->nextSibling() ) { 230 for (RenderObject* child = firstChild(); child; child = child->nextSibling() ) {
231 if (child->isTableCell()) { 231 if (child->isTableCell()) {
232 // Paint the row background behind the cell. 232 // Paint the row background behind the cell.
(...skipping 29 matching lines...) Expand all
262 } 262 }
263 263
264 void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 264 void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
265 { 265 {
266 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 266 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
267 RenderBox::reportMemoryUsage(memoryObjectInfo); 267 RenderBox::reportMemoryUsage(memoryObjectInfo);
268 info.addMember(m_children, "children"); 268 info.addMember(m_children, "children");
269 } 269 }
270 270
271 } // namespace WebCore 271 } // 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