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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderSVGImage.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 2 Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
3 Copyright (C) 2006 Apple Computer, Inc. 3 Copyright (C) 2006 Apple Computer, Inc.
4 Copyright (C) 2007 Rob Buis <buis@kde.org> 4 Copyright (C) 2007 Rob Buis <buis@kde.org>
5 5
6 This file is part of the WebKit project. 6 This file is part of the WebKit project.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 25 matching lines...) Expand all
36 class SVGPreserveAspectRatio; 36 class SVGPreserveAspectRatio;
37 37
38 class RenderSVGImage : public RenderImage { 38 class RenderSVGImage : public RenderImage {
39 public: 39 public:
40 RenderSVGImage(SVGImageElement*); 40 RenderSVGImage(SVGImageElement*);
41 virtual ~RenderSVGImage(); 41 virtual ~RenderSVGImage();
42 42
43 virtual TransformationMatrix localTransform() const { return m_localTran sform; } 43 virtual TransformationMatrix localTransform() const { return m_localTran sform; }
44 44
45 virtual FloatRect relativeBBox(bool includeStroke = true) const; 45 virtual FloatRect relativeBBox(bool includeStroke = true) const;
46 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repa intContainer); 46 virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContaine r);
47 virtual void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLev el = true); 47 virtual void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLev el = true);
48 virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true); 48 virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);
49 virtual void addFocusRingRects(GraphicsContext*, int tx, int ty); 49 virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
50 50
51 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 51 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
52 void adjustRectsForAspectRatio(FloatRect& destRect, FloatRect& srcRect, SVGPreserveAspectRatio*); 52 void adjustRectsForAspectRatio(FloatRect& destRect, FloatRect& srcRect, SVGPreserveAspectRatio*);
53 53
54 virtual void layout(); 54 virtual void layout();
55 virtual void paint(PaintInfo&, int parentX, int parentY); 55 virtual void paint(PaintInfo&, int parentX, int parentY);
56 56
57 bool requiresLayer() const { return false; } 57 bool requiresLayer() const { return false; }
58 58
59 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int _x, int _y, int _tx, int _ty, HitTestAction); 59 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int _x, int _y, int _tx, int _ty, HitTestAction);
60 60
61 bool calculateLocalTransform(); 61 bool calculateLocalTransform();
62 62
63 private: 63 private:
64 void calculateAbsoluteBounds(); 64 void calculateAbsoluteBounds();
65 TransformationMatrix m_localTransform; 65 TransformationMatrix m_localTransform;
66 FloatRect m_localBounds; 66 FloatRect m_localBounds;
67 IntRect m_absoluteBounds; 67 IntRect m_absoluteBounds;
68 }; 68 };
69 69
70 } // namespace WebCore 70 } // namespace WebCore
71 71
72 #endif // ENABLE(SVG) 72 #endif // ENABLE(SVG)
73 #endif // RenderSVGImage_h 73 #endif // RenderSVGImage_h
74 74
75 // vim:ts=4:noet 75 // vim:ts=4:noet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698