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

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

Issue 25105004: Use srcset's resource pixel density to determine intrinsic size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cleantests
Patch Set: Fixed expected test results Created 7 years, 2 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 namespace WebCore { 53 namespace WebCore {
54 54
55 using namespace HTMLNames; 55 using namespace HTMLNames;
56 56
57 RenderImage::RenderImage(Element* element) 57 RenderImage::RenderImage(Element* element)
58 : RenderReplaced(element, IntSize()) 58 : RenderReplaced(element, IntSize())
59 , m_needsToSetSizeForAltText(false) 59 , m_needsToSetSizeForAltText(false)
60 , m_didIncrementVisuallyNonEmptyPixelCount(false) 60 , m_didIncrementVisuallyNonEmptyPixelCount(false)
61 , m_isGeneratedContent(false) 61 , m_isGeneratedContent(false)
62 , m_intrinsicSizeFactor(1.0f)
62 { 63 {
63 updateAltText(); 64 updateAltText();
64 } 65 }
65 66
66 RenderImage* RenderImage::createAnonymous(Document* document) 67 RenderImage* RenderImage::createAnonymous(Document* document)
67 { 68 {
68 RenderImage* image = new RenderImage(0); 69 RenderImage* image = new RenderImage(0);
69 image->setDocumentForAnonymous(document); 70 image->setDocumentForAnonymous(document);
70 return image; 71 return image;
71 } 72 }
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 if (!m_imageResource) 604 if (!m_imageResource)
604 return 0; 605 return 0;
605 606
606 ImageResource* cachedImage = m_imageResource->cachedImage(); 607 ImageResource* cachedImage = m_imageResource->cachedImage();
607 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 608 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
608 return toSVGImage(cachedImage->image())->embeddedContentBox(); 609 return toSVGImage(cachedImage->image())->embeddedContentBox();
609 610
610 return 0; 611 return 0;
611 } 612 }
612 613
614 LayoutSize RenderImage::intrinsicSize() const OVERRIDE
615 {
pdr. 2013/10/11 05:17:33 Can you add an assert here: ASSERT(m_imageResource
Yoav Weiss 2013/10/11 07:22:32 Sure
616 LayoutSize intrinsic = RenderReplaced::intrinsicSize();
617 ImageResource* cachedImage = m_imageResource->cachedImage();
618 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
pdr. 2013/10/11 05:17:33 I don't understand the cachedImage->image()->isSVG
Yoav Weiss 2013/10/11 07:22:32 It should. Applying it to bitmaps breaks them. Cur
619 intrinsic.scale(m_intrinsicSizeFactor);
620 return intrinsic;
621 }
622
623 LayoutSize RenderImage::unscaledIntrinsicSize() const
624 {
625 return RenderReplaced::intrinsicSize();
626 }
627
613 } // namespace WebCore 628 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698