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

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

Issue 893093002: Delete remaining masks dead code. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
10 * 10 *
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 m_imageDevicePixelRatio = 1 / m_imageResource->cachedImage()->devicePixe lRatioHeaderValue(); 102 m_imageDevicePixelRatio = 1 / m_imageResource->cachedImage()->devicePixe lRatioHeaderValue();
103 103
104 // If the RenderImage was just created we don't have style() or a parent() 104 // If the RenderImage was just created we don't have style() or a parent()
105 // yet so all we can do is update our intrinsic size. Once we're inserted 105 // yet so all we can do is update our intrinsic size. Once we're inserted
106 // the resulting layout will do the rest of the work. 106 // the resulting layout will do the rest of the work.
107 if (!parent()) { 107 if (!parent()) {
108 updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize()); 108 updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize());
109 return; 109 return;
110 } 110 }
111 111
112 if (hasBoxDecorationBackground() || hasMask()) 112 if (hasBoxDecorationBackground())
113 RenderReplaced::imageChanged(newImage, rect); 113 RenderReplaced::imageChanged(newImage, rect);
114 114
115 ASSERT(isRooted()); 115 ASSERT(isRooted());
116 116
117 LayoutSize oldIntrinsicSize = intrinsicSize(); 117 LayoutSize oldIntrinsicSize = intrinsicSize();
118 LayoutSize newIntrinsicSize = m_imageResource->intrinsicSize(); 118 LayoutSize newIntrinsicSize = m_imageResource->intrinsicSize();
119 updateIntrinsicSizeIfNeeded(newIntrinsicSize); 119 updateIntrinsicSizeIfNeeded(newIntrinsicSize);
120 120
121 bool imageSourceHasChangedSize = oldIntrinsicSize != newIntrinsicSize; 121 bool imageSourceHasChangedSize = oldIntrinsicSize != newIntrinsicSize;
122 if (imageSourceHasChangedSize) 122 if (imageSourceHasChangedSize)
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 return; 247 return;
248 } 248 }
249 } 249 }
250 250
251 bool RenderImage::needsPreferredWidthsRecalculation() const 251 bool RenderImage::needsPreferredWidthsRecalculation() const
252 { 252 {
253 return RenderReplaced::needsPreferredWidthsRecalculation(); 253 return RenderReplaced::needsPreferredWidthsRecalculation();
254 } 254 }
255 255
256 } // namespace blink 256 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698