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

Side by Side Diff: Source/core/svg/graphics/SVGImage.h

Issue 26390004: Rework SVG sizing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mishap during rebase in svg.css Created 6 years, 8 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) 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 static bool isInSVGImage(const Element*); 50 static bool isInSVGImage(const Element*);
51 51
52 RenderBox* embeddedContentBox() const; 52 RenderBox* embeddedContentBox() const;
53 53
54 virtual bool isSVGImage() const OVERRIDE { return true; } 54 virtual bool isSVGImage() const OVERRIDE { return true; }
55 virtual IntSize size() const OVERRIDE { return m_intrinsicSize; } 55 virtual IntSize size() const OVERRIDE { return m_intrinsicSize; }
56 56
57 virtual bool currentFrameHasSingleSecurityOrigin() const OVERRIDE; 57 virtual bool currentFrameHasSingleSecurityOrigin() const OVERRIDE;
58 58
59 virtual bool hasRelativeWidth() const OVERRIDE;
60 virtual bool hasRelativeHeight() const OVERRIDE;
61
62 virtual void startAnimation(CatchUpAnimation = CatchUp) OVERRIDE; 59 virtual void startAnimation(CatchUpAnimation = CatchUp) OVERRIDE;
63 virtual void stopAnimation() OVERRIDE; 60 virtual void stopAnimation() OVERRIDE;
64 virtual void resetAnimation() OVERRIDE; 61 virtual void resetAnimation() OVERRIDE;
65 62
66 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE; 63 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE;
67 64
68 // Returns the SVG image document's frame. 65 // Returns the SVG image document's frame.
69 FrameView* frameView() const; 66 FrameView* frameView() const;
70 67
71 // Does the SVG image/document contain any animations? 68 // Does the SVG image/document contain any animations?
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 m_image->setImageObserver(m_observer); 121 m_image->setImageObserver(m_observer);
125 } 122 }
126 private: 123 private:
127 Image* m_image; 124 Image* m_image;
128 ImageObserver* m_observer; 125 ImageObserver* m_observer;
129 }; 126 };
130 127
131 } 128 }
132 129
133 #endif // SVGImage_h 130 #endif // SVGImage_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698