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

Side by Side Diff: Source/WebCore/rendering/RenderTableSection.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, 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 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 910
911 LayoutPoint adjustedPaintOffset = paintOffset + location(); 911 LayoutPoint adjustedPaintOffset = paintOffset + location();
912 912
913 PaintPhase phase = paintInfo.phase; 913 PaintPhase phase = paintInfo.phase;
914 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset); 914 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset);
915 paintObject(paintInfo, adjustedPaintOffset); 915 paintObject(paintInfo, adjustedPaintOffset);
916 if (pushedClip) 916 if (pushedClip)
917 popContentsClip(paintInfo, phase, adjustedPaintOffset); 917 popContentsClip(paintInfo, phase, adjustedPaintOffset);
918 918
919 if ((phase == PaintPhaseOutline || phase == PaintPhaseSelfOutline) && style( )->visibility() == VISIBLE) 919 if ((phase == PaintPhaseOutline || phase == PaintPhaseSelfOutline) && style( )->visibility() == VISIBLE)
920 paintOutline(paintInfo.context, LayoutRect(adjustedPaintOffset, size())) ; 920 paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size()));
921 } 921 }
922 922
923 static inline bool compareCellPositions(RenderTableCell* elem1, RenderTableCell* elem2) 923 static inline bool compareCellPositions(RenderTableCell* elem1, RenderTableCell* elem2)
924 { 924 {
925 return elem1->rowIndex() < elem2->rowIndex(); 925 return elem1->rowIndex() < elem2->rowIndex();
926 } 926 }
927 927
928 // This comparison is used only when we have overflowing cells as we have an uns orted array to sort. We thus need 928 // This comparison is used only when we have overflowing cells as we have an uns orted array to sort. We thus need
929 // to sort both on rows and columns to properly repaint. 929 // to sort both on rows and columns to properly repaint.
930 static inline bool compareCellPositionsWithOverflowingCells(RenderTableCell* ele m1, RenderTableCell* elem2) 930 static inline bool compareCellPositionsWithOverflowingCells(RenderTableCell* ele m1, RenderTableCell* elem2)
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 info.addMember(logicalHeight, "logicalHeight"); 1448 info.addMember(logicalHeight, "logicalHeight");
1449 } 1449 }
1450 1450
1451 void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryO bjectInfo) const 1451 void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryO bjectInfo) const
1452 { 1452 {
1453 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1453 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1454 info.addMember(cells, "cells"); 1454 info.addMember(cells, "cells");
1455 } 1455 }
1456 1456
1457 } // namespace WebCore 1457 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | Source/WebCore/rendering/RenderTextControl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698