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

Side by Side Diff: Source/core/svg/graphics/SVGImageForContainer.cpp

Issue 1001703003: Take NativeImageSkia out behind the woodshed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Switch to skia-style API (return bool instead of SkBitmap) Created 5 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "config.h" 20 #include "config.h"
21 #include "core/svg/graphics/SVGImageForContainer.h" 21 #include "core/svg/graphics/SVGImageForContainer.h"
22 22
23 #include "platform/geometry/FloatRect.h" 23 #include "platform/geometry/FloatRect.h"
24 #include "platform/geometry/FloatSize.h" 24 #include "platform/geometry/FloatSize.h"
25 #include "third_party/skia/include/core/SkBitmap.h"
25 #include "wtf/PassRefPtr.h" 26 #include "wtf/PassRefPtr.h"
26 27
27 namespace blink { 28 namespace blink {
28 29
29 IntSize SVGImageForContainer::size() const 30 IntSize SVGImageForContainer::size() const
30 { 31 {
31 FloatSize scaledContainerSize(m_containerSize); 32 FloatSize scaledContainerSize(m_containerSize);
32 scaledContainerSize.scale(m_zoom); 33 scaledContainerSize.scale(m_zoom);
33 return roundedIntSize(scaledContainerSize); 34 return roundedIntSize(scaledContainerSize);
34 } 35 }
35 36
36 void SVGImageForContainer::draw(GraphicsContext* context, const FloatRect& dstRe ct, 37 void SVGImageForContainer::draw(GraphicsContext* context, const FloatRect& dstRe ct,
37 const FloatRect& srcRect, SkXfermode::Mode compositeOp, RespectImageOrientat ionEnum) 38 const FloatRect& srcRect, SkXfermode::Mode compositeOp, RespectImageOrientat ionEnum)
38 { 39 {
39 m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect , compositeOp); 40 m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect , compositeOp);
40 } 41 }
41 42
42 void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect & srcRect, const FloatSize& scale, 43 void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect & srcRect, const FloatSize& scale,
43 const FloatPoint& phase, SkXfermode::Mode op, const FloatRect& dstRect, cons t IntSize& repeatSpacing) 44 const FloatPoint& phase, SkXfermode::Mode op, const FloatRect& dstRect, cons t IntSize& repeatSpacing)
44 { 45 {
45 m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, scale, phase, op, dstRect, repeatSpacing); 46 m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, scale, phase, op, dstRect, repeatSpacing);
46 } 47 }
47 48
48 PassRefPtr<NativeImageSkia> SVGImageForContainer::nativeImageForCurrentFrame() 49 bool SVGImageForContainer::bitmapForCurrentFrame(SkBitmap* bitmap)
49 { 50 {
50 return m_image->nativeImageForCurrentFrame(); 51 return m_image->bitmapForCurrentFrame(bitmap);
51 } 52 }
52 53
53 } // namespace blink 54 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/graphics/SVGImageForContainer.h ('k') | Source/core/svg/graphics/filters/SVGFEImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698