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

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

Issue 226203010: [CSS Shapes] shape-outside from image doesn't load properly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: corrected a flaw in clearShapeOutside that cropped up in webkit_unit_test Created 6 years, 8 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/core/rendering/RenderBox.cpp ('k') | Source/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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void RenderImage::styleDidChange(StyleDifference diff, const RenderStyle* oldSty le) 143 void RenderImage::styleDidChange(StyleDifference diff, const RenderStyle* oldSty le)
144 { 144 {
145 RenderReplaced::styleDidChange(diff, oldStyle); 145 RenderReplaced::styleDidChange(diff, oldStyle);
146 } 146 }
147 147
148 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect) 148 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
149 { 149 {
150 if (documentBeingDestroyed()) 150 if (documentBeingDestroyed())
151 return; 151 return;
152 152
153 if (hasBoxDecorations() || hasMask()) 153 if (hasBoxDecorations() || hasMask() || hasShapeOutside())
154 RenderReplaced::imageChanged(newImage, rect); 154 RenderReplaced::imageChanged(newImage, rect);
155 155
156 if (!m_imageResource) 156 if (!m_imageResource)
157 return; 157 return;
158 158
159 if (newImage != m_imageResource->imagePtr()) 159 if (newImage != m_imageResource->imagePtr())
160 return; 160 return;
161 161
162 // Per the spec, we let the server-sent header override srcset/other sources of dpr. 162 // Per the spec, we let the server-sent header override srcset/other sources of dpr.
163 // https://github.com/igrigorik/http-client-hints/blob/master/draft-grigorik -http-client-hints-01.txt#L255 163 // https://github.com/igrigorik/http-client-hints/blob/master/draft-grigorik -http-client-hints-01.txt#L255
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 return 0; 637 return 0;
638 638
639 ImageResource* cachedImage = m_imageResource->cachedImage(); 639 ImageResource* cachedImage = m_imageResource->cachedImage();
640 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 640 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
641 return toSVGImage(cachedImage->image())->embeddedContentBox(); 641 return toSVGImage(cachedImage->image())->embeddedContentBox();
642 642
643 return 0; 643 return 0;
644 } 644 }
645 645
646 } // namespace WebCore 646 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698