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

Side by Side Diff: Source/core/rendering/RenderTableCol.cpp

Issue 377123002: Revert of Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix conflict Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTableCol.h ('k') | Source/core/rendering/RenderText.h » ('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, 2009 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return child->isRenderTableCol() && style->display() == TABLE_COLUMN; 87 return child->isRenderTableCol() && style->display() == TABLE_COLUMN;
88 } 88 }
89 89
90 bool RenderTableCol::canHaveChildren() const 90 bool RenderTableCol::canHaveChildren() const
91 { 91 {
92 // Cols cannot have children. This is actually necessary to fix a bug 92 // Cols cannot have children. This is actually necessary to fix a bug
93 // with libraries.uc.edu, which makes a <p> be a table-column. 93 // with libraries.uc.edu, which makes a <p> be a table-column.
94 return isTableColumnGroup(); 94 return isTableColumnGroup();
95 } 95 }
96 96
97 LayoutRect RenderTableCol::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const 97 LayoutRect RenderTableCol::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer) const
98 { 98 {
99 // For now, just repaint the whole table. 99 // For now, just repaint the whole table.
100 // FIXME: Find a better way to do this, e.g., need to repaint all the cells that we 100 // FIXME: Find a better way to do this, e.g., need to repaint all the cells that we
101 // might have propagated a background color or borders into. 101 // might have propagated a background color or borders into.
102 // FIXME: check for paintInvalidationContainer each time here? 102 // FIXME: check for paintInvalidationContainer each time here?
103 103
104 RenderTable* parentTable = table(); 104 RenderTable* parentTable = table();
105 if (!parentTable) 105 if (!parentTable)
106 return LayoutRect(); 106 return LayoutRect();
107 return parentTable->clippedOverflowRectForPaintInvalidation(paintInvalidatio nContainer, paintInvalidationState); 107 return parentTable->clippedOverflowRectForPaintInvalidation(paintInvalidatio nContainer);
108 } 108 }
109 109
110 void RenderTableCol::imageChanged(WrappedImagePtr, const IntRect*) 110 void RenderTableCol::imageChanged(WrappedImagePtr, const IntRect*)
111 { 111 {
112 // FIXME: Repaint only the rect the image paints in. 112 // FIXME: Repaint only the rect the image paints in.
113 paintInvalidationForWholeRenderer(); 113 paintInvalidationForWholeRenderer();
114 } 114 }
115 115
116 void RenderTableCol::clearPreferredLogicalWidthsDirtyBits() 116 void RenderTableCol::clearPreferredLogicalWidthsDirtyBits()
117 { 117 {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 return style()->borderStart(); 174 return style()->borderStart();
175 } 175 }
176 176
177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const 177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const
178 { 178 {
179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); 179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this);
180 return style()->borderEnd(); 180 return style()->borderEnd();
181 } 181 }
182 182
183 } 183 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTableCol.h ('k') | Source/core/rendering/RenderText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698