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

Side by Side Diff: third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 23 matching lines...) Expand all
34 34
35 class CSSRule; 35 class CSSRule;
36 class CSSValue; 36 class CSSValue;
37 class Element; 37 class Element;
38 class ExceptionState; 38 class ExceptionState;
39 class MutableStylePropertySet; 39 class MutableStylePropertySet;
40 class StyleSheetContents; 40 class StyleSheetContents;
41 41
42 class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration { 42 class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
43 public: 43 public:
44 virtual Element* parentElement() const { return nullptr; } 44 virtual Element* parentElement() const { return 0; }
45 StyleSheetContents* contextStyleSheet() const; 45 StyleSheetContents* contextStyleSheet() const;
46 46
47 DECLARE_VIRTUAL_TRACE(); 47 DECLARE_VIRTUAL_TRACE();
48 48
49 private: 49 private:
50 CSSRule* parentRule() const override { return 0; } 50 CSSRule* parentRule() const override { return 0; }
51 unsigned length() const final; 51 unsigned length() const final;
52 String item(unsigned index) const final; 52 String item(unsigned index) const final;
53 String getPropertyValue(const String& propertyName) final; 53 String getPropertyValue(const String& propertyName) final;
54 String getPropertyPriority(const String& propertyName) final; 54 String getPropertyPriority(const String& propertyName) final;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 void didMutate(MutationType) override; 120 void didMutate(MutationType) override;
121 121
122 #if !ENABLE(OILPAN) 122 #if !ENABLE(OILPAN)
123 unsigned m_refCount; 123 unsigned m_refCount;
124 #endif 124 #endif
125 RawPtrWillBeMember<CSSRule> m_parentRule; 125 RawPtrWillBeMember<CSSRule> m_parentRule;
126 }; 126 };
127 127
128 class InlineCSSStyleDeclaration final : public AbstractPropertySetCSSStyleDeclar ation { 128 class InlineCSSStyleDeclaration final : public AbstractPropertySetCSSStyleDeclar ation {
129 public: 129 public:
130 explicit InlineCSSStyleDeclaration(Element* parentElement); 130 explicit InlineCSSStyleDeclaration(Element* parentElement)
131 : m_parentElement(parentElement)
132 {
133 }
131 134
132 DECLARE_VIRTUAL_TRACE(); 135 DECLARE_VIRTUAL_TRACE();
133 136
134 private: 137 private:
135 MutableStylePropertySet& propertySet() const override; 138 MutableStylePropertySet& propertySet() const override;
136 #if !ENABLE(OILPAN) 139 #if !ENABLE(OILPAN)
137 void ref() override; 140 void ref() override;
138 void deref() override; 141 void deref() override;
139 #endif 142 #endif
140 CSSStyleSheet* parentStyleSheet() const override; 143 CSSStyleSheet* parentStyleSheet() const override;
141 Element* parentElement() const override; 144 Element* parentElement() const override { return m_parentElement; }
142 145
143 void didMutate(MutationType) override; 146 void didMutate(MutationType) override;
144 147
145 RawPtrWillBeMember<Element> m_parentElement; 148 RawPtrWillBeMember<Element> m_parentElement;
146 }; 149 };
147 150
148 } // namespace blink 151 } // namespace blink
149 152
150 #endif 153 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698