Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / resolver / MatchRequest.h

diff --git a/src/third_party/WebKit/Source/core/css/resolver/MatchRequest.h b/src/third_party/WebKit/Source/core/css/resolver/MatchRequest.h
index 652a420..66e41b7 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/resolver/MatchRequest.h
+++ b/src/third_party/WebKit/Source/core/css/resolver/MatchRequest.h
@@ -26,33 +26,34 @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/RuleSet.h"
 
-namespace WebCore {
+namespace blink {
 
 class ContainerNode;
 
 class MatchRequest {
+    STACK_ALLOCATED();
 public:
-    MatchRequest(RuleSet* ruleSet, bool includeEmptyRules = false, const ContainerNode* scope = 0, bool elementApplyAuthorStyles = true, unsigned styleSheetIndex = 0, const CSSStyleSheet* cssSheet = 0)
+    MatchRequest(RuleSet* ruleSet, bool includeEmptyRules = false, const ContainerNode* scope = 0, const CSSStyleSheet* cssSheet = 0, bool elementApplyAuthorStyles = true, unsigned styleSheetIndex = 0)
         : ruleSet(ruleSet)
         , includeEmptyRules(includeEmptyRules)
         , scope(scope)
+        , styleSheet(cssSheet)
         , elementApplyAuthorStyles(elementApplyAuthorStyles)
         , styleSheetIndex(styleSheetIndex)
-        , styleSheet(cssSheet)
     {
         // Now that we're about to read from the RuleSet, we're done adding more
         // rules to the set and we should make sure it's compacted.
         ruleSet->compactRulesIfNeeded();
     }
 
-    const RuleSet* ruleSet;
+    RawPtrWillBeMember<const RuleSet> ruleSet;
     const bool includeEmptyRules;
-    const ContainerNode* scope;
+    RawPtrWillBeMember<const ContainerNode> scope;
+    RawPtrWillBeMember<const CSSStyleSheet> styleSheet;
     const bool elementApplyAuthorStyles;
     const unsigned styleSheetIndex;
-    const CSSStyleSheet* styleSheet;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // MatchRequest_h