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

Side by Side Diff: Source/core/layout/LayoutImage.cpp

Issue 1025213002: Begin tracking why layout is invalidated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 // If the actual area occupied by the image has changed and it is not constr ained by style then a layout is required. 150 // If the actual area occupied by the image has changed and it is not constr ained by style then a layout is required.
151 bool imageSizeIsConstrained = style()->logicalWidth().isSpecified() && style ()->logicalHeight().isSpecified(); 151 bool imageSizeIsConstrained = style()->logicalWidth().isSpecified() && style ()->logicalHeight().isSpecified();
152 152
153 // FIXME: We only need to recompute the containing block's preferred size if the containing block's size 153 // FIXME: We only need to recompute the containing block's preferred size if the containing block's size
154 // depends on the image's size (i.e., the container uses shrink-to-fit sizin g). 154 // depends on the image's size (i.e., the container uses shrink-to-fit sizin g).
155 // There's no easy way to detect that shrink-to-fit is needed, always force a layout. 155 // There's no easy way to detect that shrink-to-fit is needed, always force a layout.
156 bool containingBlockNeedsToRecomputePreferredSize = style()->logicalWidth(). isPercent() || style()->logicalMaxWidth().isPercent() || style()->logicalMinWid th().isPercent(); 156 bool containingBlockNeedsToRecomputePreferredSize = style()->logicalWidth(). isPercent() || style()->logicalMaxWidth().isPercent() || style()->logicalMinWid th().isPercent();
157 157
158 if (imageSourceHasChangedSize && (!imageSizeIsConstrained || containingBlock NeedsToRecomputePreferredSize)) { 158 if (imageSourceHasChangedSize && (!imageSizeIsConstrained || containingBlock NeedsToRecomputePreferredSize)) {
159 setNeedsLayoutAndFullPaintInvalidation(); 159 setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::SizeCha nged);
160 return; 160 return;
161 } 161 }
162 162
163 // The image hasn't changed in size or its style constrains its size, so a p aint invalidation will suffice. 163 // The image hasn't changed in size or its style constrains its size, so a p aint invalidation will suffice.
164 if (everHadLayout() && !selfNeedsLayout()) { 164 if (everHadLayout() && !selfNeedsLayout()) {
165 // The inner content rectangle is calculated during layout, but may need an update now 165 // The inner content rectangle is calculated during layout, but may need an update now
166 // (unless the box has already been scheduled for layout). In order to c alculate it, we 166 // (unless the box has already been scheduled for layout). In order to c alculate it, we
167 // may need values from the containing block, though, so make sure that we're not too 167 // may need values from the containing block, though, so make sure that we're not too
168 // early. It may be that layout hasn't even taken place once yet. 168 // early. It may be that layout hasn't even taken place once yet.
169 updateInnerContentRect(); 169 updateInnerContentRect();
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 return 0; 363 return 0;
364 364
365 ImageResource* cachedImage = m_imageResource->cachedImage(); 365 ImageResource* cachedImage = m_imageResource->cachedImage();
366 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 366 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
367 return toSVGImage(cachedImage->image())->embeddedContentBox(); 367 return toSVGImage(cachedImage->image())->embeddedContentBox();
368 368
369 return 0; 369 return 0;
370 } 370 }
371 371
372 } // namespace blink 372 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698