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

Side by Side Diff: Source/core/rendering/RenderImageResource.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 * 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 ASSERT(m_renderer); 96 ASSERT(m_renderer);
97 if (m_cachedImage) 97 if (m_cachedImage)
98 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom()); 98 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom());
99 } 99 }
100 100
101 Image* RenderImageResource::nullImage() 101 Image* RenderImageResource::nullImage()
102 { 102 {
103 return Image::nullImage(); 103 return Image::nullImage();
104 } 104 }
105 105
106 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const
107 {
108 LayoutSize size = m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_rend erer, multiplier, type) : LayoutSize();
pdr. 2013/10/11 05:17:33 May want to slightly refactor this to not scale si
Yoav Weiss 2013/10/11 07:22:32 OK
109 if (m_renderer)
110 size.scale(m_renderer->intrinsicSizeFactor());
111 return size;
112 }
113
106 } // namespace WebCore 114 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698