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

Side by Side Diff: Source/core/css/ElementRuleCollector.h

Issue 1312073003: Oilpan: fix build after r201639. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: revert MatchedRule::RuleData change Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 const RuleData* ruleData() const { return m_ruleData; } 55 const RuleData* ruleData() const { return m_ruleData; }
56 uint64_t position() const { return m_position; } 56 uint64_t position() const { return m_position; }
57 unsigned specificity() const { return ruleData()->specificity() + m_specific ity; } 57 unsigned specificity() const { return ruleData()->specificity() + m_specific ity; }
58 const CSSStyleSheet* parentStyleSheet() const { return m_parentStyleSheet; } 58 const CSSStyleSheet* parentStyleSheet() const { return m_parentStyleSheet; }
59 DEFINE_INLINE_TRACE() 59 DEFINE_INLINE_TRACE()
60 { 60 {
61 visitor->trace(m_parentStyleSheet); 61 visitor->trace(m_parentStyleSheet);
62 } 62 }
63 63
64 private: 64 private:
65 RawPtrWillBeMember<const RuleData> m_ruleData; 65 // FIXME: Oilpan: RuleData is in the oilpan heap and this pointer
66 // really should be traced. However, RuleData objects are
67 // allocated inside larger TerminatedArray objects and we cannot
68 // trace a raw rule data pointer at this point.
69 const RuleData* m_ruleData;
66 unsigned m_specificity; 70 unsigned m_specificity;
67 uint64_t m_position; 71 uint64_t m_position;
68 RawPtrWillBeMember<const CSSStyleSheet> m_parentStyleSheet; 72 RawPtrWillBeMember<const CSSStyleSheet> m_parentStyleSheet;
69 }; 73 };
70 74
71 } // namespace blink 75 } // namespace blink
72 76
73 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedRule); 77 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedRule);
74 78
75 namespace blink { 79 namespace blink {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 157
154 // Output. 158 // Output.
155 RefPtrWillBeMember<StaticCSSRuleList> m_cssRuleList; 159 RefPtrWillBeMember<StaticCSSRuleList> m_cssRuleList;
156 RefPtrWillBeMember<StyleRuleList> m_styleRuleList; 160 RefPtrWillBeMember<StyleRuleList> m_styleRuleList;
157 MatchResult m_result; 161 MatchResult m_result;
158 }; 162 };
159 163
160 } // namespace blink 164 } // namespace blink
161 165
162 #endif // ElementRuleCollector_h 166 #endif // ElementRuleCollector_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698