Source/WebCore/dom/StyledElement.h - Issue 7169001: Merge 88601

Side by Side Diff: Source/WebCore/dom/StyledElement.h

Issue 7169001: Merge 88601 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2001 Peter Kelly (pmk@post.com)	4 * (C) 2001 Peter Kelly (pmk@post.com)

5 * (C) 2001 Dirk Mueller (mueller@kde.org)	5 * (C) 2001 Dirk Mueller (mueller@kde.org)

6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.	6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.

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 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 virtual void parseMappedAttribute(Attribute*);	77 virtual void parseMappedAttribute(Attribute*);

78 virtual void copyNonAttributeProperties(const Element*);	78 virtual void copyNonAttributeProperties(const Element*);

79	79

80 virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;	80 virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;

81	81

82 // classAttributeChanged() exists to share code between	82 // classAttributeChanged() exists to share code between

83 // parseMappedAttribute (called via setAttribute()) and	83 // parseMappedAttribute (called via setAttribute()) and

84 // svgAttributeChanged (called when element.className.baseValue is set)	84 // svgAttributeChanged (called when element.className.baseValue is set)

85 void classAttributeChanged(const AtomicString& newClassString);	85 void classAttributeChanged(const AtomicString& newClassString);

86	86

	87 virtual void insertedIntoDocument();

	88 virtual void removedFromDocument();

87 virtual void didMoveToNewOwnerDocument();	89 virtual void didMoveToNewOwnerDocument();

88	90

89 private:	91 private:

90 void createMappedDecl(Attribute*);	92 void createMappedDecl(Attribute*);

91	93

92 void createInlineStyleDecl();	94 void createInlineStyleDecl();

93 void destroyInlineStyleDecl();	95 void destroyInlineStyleDecl();

94 virtual void updateStyleAttribute() const;	96 virtual void updateStyleAttribute() const;

95	97

96 RefPtr<CSSMutableStyleDeclaration> m_inlineStyleDecl;	98 RefPtr<CSSMutableStyleDeclaration> m_inlineStyleDecl;

97 };	99 };

98	100

99 inline const SpaceSplitString& StyledElement::classNames() const	101 inline const SpaceSplitString& StyledElement::classNames() const

100 {	102 {

101 ASSERT(hasClass());	103 ASSERT(hasClass());

102 ASSERT(attributeMap());	104 ASSERT(attributeMap());

103 return attributeMap()->classNames();	105 return attributeMap()->classNames();

104 }	106 }

105	107

106 inline void StyledElement::invalidateStyleAttribute()	108 inline void StyledElement::invalidateStyleAttribute()

107 {	109 {

108 clearIsStyleAttributeValid();	110 clearIsStyleAttributeValid();

109 }	111 }

110	112

111 } //namespace	113 } //namespace

112	114

113 #endif	115 #endif

OLD	NEW

« no previous file with comments | « LayoutTests/fast/dom/styled-inline-style-decl-parent-crash-expected.txt ('k') | Source/WebCore/dom/StyledElement.cpp » ('j') | no next file with comments »