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

Side by Side Diff: third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.h

Issue 1685353004: Clean up Image::computeIntrinsicDimensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits Created 4 years, 10 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 FloatSize containerSizeWithoutZoom(containerSize); 42 FloatSize containerSizeWithoutZoom(containerSize);
43 containerSizeWithoutZoom.scale(1 / zoom); 43 containerSizeWithoutZoom.scale(1 / zoom);
44 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom, url)); 44 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom, url));
45 } 45 }
46 46
47 bool isTextureBacked() override; 47 bool isTextureBacked() override;
48 IntSize size() const override; 48 IntSize size() const override;
49 49
50 bool usesContainerSize() const override { return m_image->usesContainerSize( ); } 50 bool usesContainerSize() const override { return m_image->usesContainerSize( ); }
51 bool hasRelativeSize() const override { return m_image->hasRelativeSize(); } 51 bool hasRelativeSize() const override { return m_image->hasRelativeSize(); }
52 void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHei ght, FloatSize& intrinsicRatio) override 52 void computeIntrinsicDimensions(FloatSize& intrinsicSize, FloatSize& intrins icRatio) override
53 { 53 {
54 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, int rinsicRatio); 54 m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
55 } 55 }
56 56
57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override; 57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override;
58 58
59 void drawPattern(GraphicsContext&, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const FloatSize& repeatSpacing ) override; 59 void drawPattern(GraphicsContext&, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const FloatSize& repeatSpacing ) override;
60 60
61 // FIXME: Implement this to be less conservative. 61 // FIXME: Implement this to be less conservative.
62 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override { return false; } 62 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override { return false; }
63 63
64 PassRefPtr<SkImage> imageForCurrentFrame() override; 64 PassRefPtr<SkImage> imageForCurrentFrame() override;
(...skipping 10 matching lines...) Expand all
75 void destroyDecodedData(bool) override { } 75 void destroyDecodedData(bool) override { }
76 76
77 SVGImage* m_image; 77 SVGImage* m_image;
78 const FloatSize m_containerSize; 78 const FloatSize m_containerSize;
79 const float m_zoom; 79 const float m_zoom;
80 const KURL m_url; 80 const KURL m_url;
81 }; 81 };
82 } // namespace blink 82 } // namespace blink
83 83
84 #endif // SVGImageForContainer_h 84 #endif // SVGImageForContainer_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp ('k') | third_party/WebKit/Source/platform/graphics/GeneratedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698