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

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

Issue 106763012: Code cleanup: Removing redundant function calls from loadPendingImage(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing lint errors Created 6 years, 11 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
« no previous file with comments | « Source/core/rendering/RenderImageResource.h ('k') | no next file » | 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 m_renderer->repaint(); 90 m_renderer->repaint();
91 } 91 }
92 92
93 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai nerSize) 93 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai nerSize)
94 { 94 {
95 ASSERT(m_renderer); 95 ASSERT(m_renderer);
96 if (m_cachedImage) 96 if (m_cachedImage)
97 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom()); 97 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom());
98 } 98 }
99 99
100 Image* RenderImageResource::nullImage()
101 {
102 return Image::nullImage();
103 }
104
105 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const 100 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const
106 { 101 {
107 if (!m_cachedImage) 102 if (!m_cachedImage)
108 return LayoutSize(); 103 return LayoutSize();
109 LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier , type); 104 LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier , type);
110 if (m_renderer && m_renderer->isRenderImage()) 105 if (m_renderer && m_renderer->isRenderImage())
111 size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio()); 106 size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio());
112 return size; 107 return size;
113 } 108 }
114 109
115 } // namespace WebCore 110 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImageResource.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698