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

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

Issue 12545020: Revert 145087 (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
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | Source/WebCore/rendering/RenderTable.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paint Info.phase == PaintPhaseSelection)) 116 if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paint Info.phase == PaintPhaseSelection))
117 paintBoxDecorations(paintInfo, adjustedPaintOffset); 117 paintBoxDecorations(paintInfo, adjustedPaintOffset);
118 118
119 if (paintInfo.phase == PaintPhaseMask) { 119 if (paintInfo.phase == PaintPhaseMask) {
120 paintMask(paintInfo, adjustedPaintOffset); 120 paintMask(paintInfo, adjustedPaintOffset);
121 return; 121 return;
122 } 122 }
123 123
124 LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size()); 124 LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
125 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth()) 125 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth())
126 paintOutline(paintInfo, paintRect); 126 paintOutline(paintInfo.context, paintRect);
127 127
128 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && !canHaveChildren()) 128 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && !canHaveChildren())
129 return; 129 return;
130 130
131 if (!paintInfo.shouldPaintWithinRoot(this)) 131 if (!paintInfo.shouldPaintWithinRoot(this))
132 return; 132 return;
133 133
134 bool drawSelectionTint = selectionState() != SelectionNone && !document()->p rinting(); 134 bool drawSelectionTint = selectionState() != SelectionNone && !document()->p rinting();
135 if (paintInfo.phase == PaintPhaseSelection) { 135 if (paintInfo.phase == PaintPhaseSelection) {
136 if (selectionState() == SelectionNone) 136 if (selectionState() == SelectionNone)
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 return r; 585 return r;
586 } 586 }
587 587
588 void RenderReplaced::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 588 void RenderReplaced::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
589 { 589 {
590 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 590 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
591 RenderBox::reportMemoryUsage(memoryObjectInfo); 591 RenderBox::reportMemoryUsage(memoryObjectInfo);
592 } 592 }
593 593
594 } 594 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | Source/WebCore/rendering/RenderTable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698