WebCore/svg/SVGUseElement.h - Issue 6186003: Merge 75014 - Merge 74636

Side by Side Diff: WebCore/svg/SVGUseElement.h

Issue 6186003: Merge 75014 - Merge 74636 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/

Patch Set: Created 9 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 unified diff | Download patch

« no previous file with comments | « WebCore/svg/SVGElementInstance.cpp ('k') | WebCore/svg/SVGUseElement.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>	2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>

3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>	3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71	71

72 virtual void toClipPath(Path&) const;	72 virtual void toClipPath(Path&) const;

73	73

74 static void removeDisallowedElementsFromSubtree(Node* element);	74 static void removeDisallowedElementsFromSubtree(Node* element);

75	75

76 void setUpdatesBlocked(bool blocked) { m_updatesBlocked = blocked; }	76 void setUpdatesBlocked(bool blocked) { m_updatesBlocked = blocked; }

77	77

78 friend class RenderSVGShadowTreeRootContainer;	78 friend class RenderSVGShadowTreeRootContainer;

79 bool isPendingResource() const { return m_isPendingResource; }	79 bool isPendingResource() const { return m_isPendingResource; }

80 void buildShadowAndInstanceTree(SVGShadowTreeRootElement*);	80 void buildShadowAndInstanceTree(SVGShadowTreeRootElement*);

	81 void detachInstance();

81	82

82 virtual bool selfHasRelativeLengths() const;	83 virtual bool selfHasRelativeLengths() const;

83	84

84 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::xAttr, SVGLength, X, x)	85 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::xAttr, SVGLength, X, x)

85 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::yAttr, SVGLength, Y, y)	86 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::yAttr, SVGLength, Y, y)

86 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::widthAttr, SVGLen gth, Width, width)	87 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::widthAttr, SVGLen gth, Width, width)

87 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::heightAttr, SVGLe ngth, Height, height)	88 DECLARE_ANIMATED_PROPERTY_NEW(SVGUseElement, SVGNames::heightAttr, SVGLe ngth, Height, height)

88	89

89 // SVGURIReference	90 // SVGURIReference

90 DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGUseElement, XLinkNames::hrefAttr , String, Href, href)	91 DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGUseElement, XLinkNames::hrefAttr , String, Href, href)

(...skipping 27 matching lines...) Expand all Loading...
118 bool m_isPendingResource;	119 bool m_isPendingResource;

119 bool m_needsShadowTreeRecreation;	120 bool m_needsShadowTreeRecreation;

120 String m_resourceId;	121 String m_resourceId;

121 RefPtr<SVGElementInstance> m_targetElementInstance;	122 RefPtr<SVGElementInstance> m_targetElementInstance;

122 };	123 };

123	124

124 }	125 }

125	126

126 #endif	127 #endif

127 #endif	128 #endif

OLD	NEW