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

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

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderObject.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) 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 setIntrinsicSize(imageSize); 138 setIntrinsicSize(imageSize);
139 return true; 139 return true;
140 } 140 }
141 141
142 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect) 142 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
143 { 143 {
144 if (documentBeingDestroyed()) 144 if (documentBeingDestroyed())
145 return; 145 return;
146 146
147 if (hasBoxDecorationBackground() || hasMask() || hasShapeOutside()) 147 if (hasBoxDecorationBackground() || hasMask())
148 RenderReplaced::imageChanged(newImage, rect); 148 RenderReplaced::imageChanged(newImage, rect);
149 149
150 if (!m_imageResource) 150 if (!m_imageResource)
151 return; 151 return;
152 152
153 if (newImage != m_imageResource->imagePtr()) 153 if (newImage != m_imageResource->imagePtr())
154 return; 154 return;
155 155
156 // Per the spec, we let the server-sent header override srcset/other sources of dpr. 156 // Per the spec, we let the server-sent header override srcset/other sources of dpr.
157 // https://github.com/igrigorik/http-client-hints/blob/master/draft-grigorik -http-client-hints-01.txt#L255 157 // https://github.com/igrigorik/http-client-hints/blob/master/draft-grigorik -http-client-hints-01.txt#L255
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 return; 525 return;
526 } 526 }
527 } 527 }
528 528
529 bool RenderImage::needsPreferredWidthsRecalculation() const 529 bool RenderImage::needsPreferredWidthsRecalculation() const
530 { 530 {
531 return RenderReplaced::needsPreferredWidthsRecalculation(); 531 return RenderReplaced::needsPreferredWidthsRecalculation();
532 } 532 }
533 533
534 } // namespace blink 534 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698