sky/engine/core/rendering/RenderImageResource.cpp - Issue 711203002: Remove zoom() and effectiveZoom().

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: sky/engine/core/rendering/RenderImageResource.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/rendering/RenderImageResource.h ('k') | sky/engine/core/rendering/RenderImageResourceStyleImage.h » ('j') | no next file with comments »

OLD	NEW
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 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86	86

87 image()->resetAnimation();	87 image()->resetAnimation();

88	88

89 m_renderer->setShouldDoFullPaintInvalidation(true);	89 m_renderer->setShouldDoFullPaintInvalidation(true);

90 }	90 }

91	91

92 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai nerSize)	92 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai nerSize)

93 {	93 {

94 ASSERT(m_renderer);	94 ASSERT(m_renderer);

95 if (m_cachedImage)	95 if (m_cachedImage)

96 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e, m_renderer->style()->effectiveZoom());	96 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz e);

97 }	97 }

98	98

99 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const	99 LayoutSize RenderImageResource::getImageSize(ImageResource::SizeType type) const

100 {	100 {

101 if (!m_cachedImage)	101 if (!m_cachedImage)

102 return LayoutSize();	102 return LayoutSize();

103 LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier , type);	103 LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, type);

104 if (m_renderer && m_renderer->isRenderImage())	104 if (m_renderer && m_renderer->isRenderImage())

105 size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio());	105 size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio());

106 return size;	106 return size;

107 }	107 }

108	108

109 } // namespace blink	109 } // namespace blink

OLD	NEW