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

Side by Side Diff: sky/engine/core/rendering/RenderReplaced.cpp

Issue 735033003: Remove a bunch of dead code from RenderLayer (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years 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 | « sky/engine/core/rendering/RenderObject.cpp ('k') | no next file » | 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 LayoutPoint adjustedPaintOffset = paintOffset + location(); 98 LayoutPoint adjustedPaintOffset = paintOffset + location();
99 99
100 if (hasBoxDecorationBackground() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection)) 100 if (hasBoxDecorationBackground() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection))
101 paintBoxDecorationBackground(paintInfo, adjustedPaintOffset); 101 paintBoxDecorationBackground(paintInfo, adjustedPaintOffset);
102 102
103 if (paintInfo.phase == PaintPhaseMask) { 103 if (paintInfo.phase == PaintPhaseMask) {
104 paintMask(paintInfo, adjustedPaintOffset); 104 paintMask(paintInfo, adjustedPaintOffset);
105 return; 105 return;
106 } 106 }
107 107
108 if (paintInfo.phase == PaintPhaseClippingMask && (!hasLayer() || !layer()->h asCompositedClippingMask())) 108 if (paintInfo.phase == PaintPhaseClippingMask)
109 return; 109 return;
110 110
111 LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size()); 111 LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
112 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth()) 112 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth())
113 paintOutline(paintInfo, paintRect); 113 paintOutline(paintInfo, paintRect);
114 114
115 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && !canHaveChildren() && paintInfo.phase != PaintPhaseClippingMask) 115 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && !canHaveChildren() && paintInfo.phase != PaintPhaseClippingMask)
116 return; 116 return;
117 117
118 if (!paintInfo.shouldPaintWithinRoot(this)) 118 if (!paintInfo.shouldPaintWithinRoot(this))
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const 522 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const
523 { 523 {
524 // The selectionRect can project outside of the overflowRect, so take their union 524 // The selectionRect can project outside of the overflowRect, so take their union
525 // for paint invalidation to avoid selection painting glitches. 525 // for paint invalidation to avoid selection painting glitches.
526 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect(); 526 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect();
527 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState); 527 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState);
528 return r; 528 return r;
529 } 529 }
530 530
531 } 531 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698