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

Side by Side Diff: Source/core/rendering/RenderImageResource.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/RenderImageResource.h ('k') | Source/core/rendering/RenderReplaced.cpp » ('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 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> 4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> 5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
10 * 10 *
(...skipping 12 matching lines...) Expand all
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 * 25 *
26 */ 26 */
27 27
28 #include "config.h" 28 #include "config.h"
29 #include "core/rendering/RenderImageResource.h" 29 #include "core/rendering/RenderImageResource.h"
30 30
31 #include "core/fetch/ImageResource.h" 31 #include "core/fetch/ImageResource.h"
32 #include "core/platform/graphics/Image.h" 32 #include "core/platform/graphics/Image.h"
33 #include "core/rendering/RenderImage.h"
34 #include "core/rendering/RenderObject.h" 33 #include "core/rendering/RenderObject.h"
35 34
36 namespace WebCore { 35 namespace WebCore {
37 36
38 RenderImageResource::RenderImageResource() 37 RenderImageResource::RenderImageResource()
39 : m_renderer(0) 38 : m_renderer(0)
40 , m_cachedImage(0) 39 , m_cachedImage(0)
41 { 40 {
42 } 41 }
43 42
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ASSERT(m_renderer); 96 ASSERT(m_renderer);
98 if (m_cachedImage) 97 if (m_cachedImage)
99 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom()); 98 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom());
100 } 99 }
101 100
102 Image* RenderImageResource::nullImage() 101 Image* RenderImageResource::nullImage()
103 { 102 {
104 return Image::nullImage(); 103 return Image::nullImage();
105 } 104 }
106 105
107 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const
108 {
109 if (!m_cachedImage)
110 return LayoutSize();
111 LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier , type);
112 if (m_renderer && m_renderer->isRenderImage())
113 size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio());
114 return size;
115 }
116
117 } // namespace WebCore 106 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImageResource.h ('k') | Source/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698