Source/WebCore/svg/SVGFontFaceElement.h - Issue 6469011: Merge 76990

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/SVGFontFaceElement.h

Issue 6469011: Merge 76990 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

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

« no previous file with comments | « Source/WebCore/css/CSSFontFaceSource.cpp ('k') | Source/WebCore/svg/SVGFontFaceElement.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

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

3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>	3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>

4 * Copyright (C) 2008 Apple Inc. All rights reserved.	4 * Copyright (C) 2008 Apple Inc. All rights reserved.

5 *	5 *

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

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

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

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

10 *	10 *

(...skipping 29 matching lines...) Expand all Loading...
40 float horizontalOriginX() const;	40 float horizontalOriginX() const;

41 float horizontalOriginY() const;	41 float horizontalOriginY() const;

42 float horizontalAdvanceX() const;	42 float horizontalAdvanceX() const;

43 float verticalOriginX() const;	43 float verticalOriginX() const;

44 float verticalOriginY() const;	44 float verticalOriginY() const;

45 float verticalAdvanceY() const;	45 float verticalAdvanceY() const;

46 int ascent() const;	46 int ascent() const;

47 int descent() const;	47 int descent() const;

48 String fontFamily() const;	48 String fontFamily() const;

49	49

50 SVGFontElement* associatedFontElement() const { return m_fontElement; }	50 SVGFontElement* associatedFontElement() const;

51 void rebuildFontFace();	51 void rebuildFontFace();

52 void removeFromMappedElementSheet();	52 void removeFromMappedElementSheet();

53	53

54 private:	54 private:

55 SVGFontFaceElement(const QualifiedName&, Document*);	55 SVGFontFaceElement(const QualifiedName&, Document*);

56	56

57 virtual void parseMappedAttribute(Attribute*);	57 virtual void parseMappedAttribute(Attribute*);

58	58

59 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0);	59 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0);

60 virtual void insertedIntoDocument();	60 virtual void insertedIntoDocument();

61 virtual void removedFromDocument();	61 virtual void removedFromDocument();

62	62

63 RefPtr<CSSFontFaceRule> m_fontFaceRule;	63 RefPtr<CSSFontFaceRule> m_fontFaceRule;

64 RefPtr<CSSMutableStyleDeclaration> m_styleDeclaration;	64 RefPtr<CSSMutableStyleDeclaration> m_styleDeclaration;

65	65

66 SVGFontElement* m_fontElement;	66 RefPtr<SVGFontElement> m_fontElement;

67 };	67 };

68	68

69 } // namespace WebCore	69 } // namespace WebCore

70	70

71 #endif // ENABLE(SVG_FONTS)	71 #endif // ENABLE(SVG_FONTS)

72 #endif	72 #endif

73	73

74 // vim:ts=4:noet	74 // vim:ts=4:noet

OLD	NEW