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

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

Issue 27142003: Revert "Use srcset's resource pixel density to determine intrinsic size" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderImageResource.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 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_imageDevicePixelRatio(1.0f)
63 { 62 {
64 updateAltText(); 63 updateAltText();
65 } 64 }
66 65
67 RenderImage* RenderImage::createAnonymous(Document* document) 66 RenderImage* RenderImage::createAnonymous(Document* document)
68 { 67 {
69 RenderImage* image = new RenderImage(0); 68 RenderImage* image = new RenderImage(0);
70 image->setDocumentForAnonymous(document); 69 image->setDocumentForAnonymous(document);
71 return image; 70 return image;
72 } 71 }
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 return 0; 604 return 0;
606 605
607 ImageResource* cachedImage = m_imageResource->cachedImage(); 606 ImageResource* cachedImage = m_imageResource->cachedImage();
608 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 607 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
609 return toSVGImage(cachedImage->image())->embeddedContentBox(); 608 return toSVGImage(cachedImage->image())->embeddedContentBox();
610 609
611 return 0; 610 return 0;
612 } 611 }
613 612
614 } // namespace WebCore 613 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderImageResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698