Source/WebCore/svg/graphics/SVGImage.h - Issue 12314169: Merge 143541

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: Source/WebCore/svg/graphics/SVGImage.h

Issue 12314169: Merge 143541 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 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

« no previous file with comments | « Source/WebCore/loader/cache/CachedImage.cpp ('k') | Source/WebCore/svg/graphics/SVGImage.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org>	2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org>

3 * Copyright (C) 2009 Apple Inc. All rights reserved.	3 * Copyright (C) 2009 Apple Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 virtual unsigned decodedSize() const { return 0; }	82 virtual unsigned decodedSize() const { return 0; }

83	83

84 virtual NativeImagePtr frameAtIndex(size_t) { return 0; }	84 virtual NativeImagePtr frameAtIndex(size_t) { return 0; }

85	85

86 // FIXME: Implement this to be less conservative.	86 // FIXME: Implement this to be less conservative.

87 virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }	87 virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }

88	88

89 SVGImage(ImageObserver*);	89 SVGImage(ImageObserver*);

90 virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRe ct& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);	90 virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRe ct& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);

91 void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatR ect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);	91 void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatR ect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);

92 void drawPatternForContainer(GraphicsContext*, const FloatSize, float, float , const FloatRect&, const AffineTransform&,	92 void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace,

93 const FloatPoint&, ColorSpace, CompositeOperator, const FloatRect&);	93 CompositeOperator, const FloatRect&);

94	94

95 OwnPtr<SVGImageChromeClient> m_chromeClient;	95 OwnPtr<SVGImageChromeClient> m_chromeClient;

96 OwnPtr<Page> m_page;	96 OwnPtr<Page> m_page;

97 };	97 };

98 }	98 }

99	99

100 #endif // ENABLE(SVG)	100 #endif // ENABLE(SVG)

101 #endif // SVGImage_h	101 #endif // SVGImage_h

OLD	NEW