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

Unified Diff: Source/WebCore/svg/graphics/filters/SVGFEImage.h

Issue 9117045: Merge 105612 - <feImage> has problems referencing local elements (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/svg/SVGFEImageElement.cpp ('k') | Source/WebCore/svg/graphics/filters/SVGFEImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/svg/graphics/filters/SVGFEImage.h
===================================================================
--- Source/WebCore/svg/graphics/filters/SVGFEImage.h (revision 105779)
+++ Source/WebCore/svg/graphics/filters/SVGFEImage.h (working copy)
@@ -29,11 +29,14 @@
namespace WebCore {
+class Document;
class Image;
+class RenderObject;
class FEImage : public FilterEffect {
public:
- static PassRefPtr<FEImage> create(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
+ static PassRefPtr<FEImage> createWithImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
+ static PassRefPtr<FEImage> createWithIRIReference(Filter*, Document*, const String&, const SVGPreserveAspectRatio&);
void setAbsoluteSubregion(const FloatRect& absoluteSubregion) { m_absoluteSubregion = absoluteSubregion; }
@@ -47,9 +50,14 @@
virtual TextStream& externalRepresentation(TextStream&, int indention) const;
private:
+ virtual ~FEImage() { }
FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
+ FEImage(Filter*, Document*, const String&, const SVGPreserveAspectRatio&);
+ RenderObject* referencedRenderer() const;
RefPtr<Image> m_image;
+ Document* m_document;
+ String m_href;
SVGPreserveAspectRatio m_preserveAspectRatio;
FloatRect m_absoluteSubregion;
};
« no previous file with comments | « Source/WebCore/svg/SVGFEImageElement.cpp ('k') | Source/WebCore/svg/graphics/filters/SVGFEImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698