bindings: Makes more DOM classes inherit from ScriptWrappable (part 3).

As same as http://crrev.com/407073009 , this CL may increase the size of these classes by +16 or +8 bytes. +8 bytes for |m_wrapperOrTypeInfo| (type of uintptr_t) in ScriptWrappable. Another +8 bytes for vtbl.

BUG=235436

Review URL: https://codereview.chromium.org/412183003

git-svn-id: svn://svn.chromium.org/blink/trunk@179010 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7c55c111
...@@ -28,6 +28,7 @@ namespace blink { ...@@ -28,6 +28,7 @@ namespace blink {
CSSRuleList::CSSRuleList() CSSRuleList::CSSRuleList()
{ {
ScriptWrappable::init(this);
} }
CSSRuleList::~CSSRuleList() CSSRuleList::~CSSRuleList()
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#ifndef CSSRuleList_h #ifndef CSSRuleList_h
#define CSSRuleList_h #define CSSRuleList_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/PassRefPtr.h" #include "wtf/PassRefPtr.h"
#include "wtf/RefPtr.h" #include "wtf/RefPtr.h"
...@@ -32,7 +33,7 @@ namespace blink { ...@@ -32,7 +33,7 @@ namespace blink {
class CSSRule; class CSSRule;
class CSSStyleSheet; class CSSStyleSheet;
class CSSRuleList : public NoBaseWillBeGarbageCollectedFinalized<CSSRuleList> { class CSSRuleList : public NoBaseWillBeGarbageCollectedFinalized<CSSRuleList>, public ScriptWrappable {
WTF_MAKE_NONCOPYABLE(CSSRuleList); WTF_MAKE_NONCOPYABLE(CSSRuleList);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public: public:
......
...@@ -123,6 +123,7 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents ...@@ -123,6 +123,7 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents
, m_startPosition(TextPosition::minimumPosition()) , m_startPosition(TextPosition::minimumPosition())
, m_loadCompleted(false) , m_loadCompleted(false)
{ {
ScriptWrappable::init(this);
m_contents->registerClient(this); m_contents->registerClient(this);
} }
...@@ -135,6 +136,7 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents ...@@ -135,6 +136,7 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents
, m_startPosition(startPosition) , m_startPosition(startPosition)
, m_loadCompleted(false) , m_loadCompleted(false)
{ {
ScriptWrappable::init(this);
ASSERT(isAcceptableCSSStyleSheetParent(ownerNode)); ASSERT(isAcceptableCSSStyleSheetParent(ownerNode));
m_contents->registerClient(this); m_contents->registerClient(this);
} }
......
...@@ -21,12 +21,13 @@ ...@@ -21,12 +21,13 @@
#ifndef Counter_h #ifndef Counter_h
#define Counter_h #define Counter_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSPrimitiveValue.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
namespace blink { namespace blink {
class Counter : public RefCountedWillBeGarbageCollected<Counter> { class Counter : public RefCountedWillBeGarbageCollected<Counter>, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<Counter> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator) static PassRefPtrWillBeRawPtr<Counter> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
{ {
...@@ -65,6 +66,7 @@ private: ...@@ -65,6 +66,7 @@ private:
, m_listStyle(listStyle) , m_listStyle(listStyle)
, m_separator(separator) , m_separator(separator)
{ {
ScriptWrappable::init(this);
} }
RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#ifndef DOMWindowCSS_h #ifndef DOMWindowCSS_h
#define DOMWindowCSS_h #define DOMWindowCSS_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include "wtf/PassRefPtr.h" #include "wtf/PassRefPtr.h"
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
namespace blink { namespace blink {
class DOMWindowCSS : public RefCountedWillBeGarbageCollected<DOMWindowCSS> { class DOMWindowCSS : public RefCountedWillBeGarbageCollected<DOMWindowCSS>, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<DOMWindowCSS> create(); static PassRefPtrWillBeRawPtr<DOMWindowCSS> create();
...@@ -49,6 +50,7 @@ public: ...@@ -49,6 +50,7 @@ public:
private: private:
DOMWindowCSS() DOMWindowCSS()
{ {
ScriptWrappable::init(this);
} }
}; };
......
...@@ -205,6 +205,7 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl ...@@ -205,6 +205,7 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl
FontFace::FontFace() FontFace::FontFace()
: m_status(Unloaded) : m_status(Unloaded)
{ {
ScriptWrappable::init(this);
} }
FontFace::~FontFace() FontFace::~FontFace()
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#define FontFace_h #define FontFace_h
#include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/CSSPropertyNames.h" #include "core/CSSPropertyNames.h"
#include "core/css/CSSValue.h" #include "core/css/CSSValue.h"
#include "core/dom/DOMError.h" #include "core/dom/DOMError.h"
...@@ -51,7 +52,7 @@ class FontFaceReadyPromiseResolver; ...@@ -51,7 +52,7 @@ class FontFaceReadyPromiseResolver;
class StylePropertySet; class StylePropertySet;
class StyleRuleFontFace; class StyleRuleFontFace;
class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace> { class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, public ScriptWrappable {
public: public:
enum LoadStatus { Unloaded, Loading, Loaded, Error }; enum LoadStatus { Unloaded, Loading, Loaded, Error };
......
...@@ -182,6 +182,7 @@ MediaList::MediaList(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet) ...@@ -182,6 +182,7 @@ MediaList::MediaList(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet)
, m_parentStyleSheet(parentSheet) , m_parentStyleSheet(parentSheet)
, m_parentRule(nullptr) , m_parentRule(nullptr)
{ {
ScriptWrappable::init(this);
} }
MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule) MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule)
...@@ -189,6 +190,7 @@ MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule) ...@@ -189,6 +190,7 @@ MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule)
, m_parentStyleSheet(nullptr) , m_parentStyleSheet(nullptr)
, m_parentRule(parentRule) , m_parentRule(parentRule)
{ {
ScriptWrappable::init(this);
} }
MediaList::~MediaList() MediaList::~MediaList()
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef MediaList_h #ifndef MediaList_h
#define MediaList_h #define MediaList_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/dom/ExceptionCode.h" #include "core/dom/ExceptionCode.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
...@@ -69,7 +70,7 @@ private: ...@@ -69,7 +70,7 @@ private:
WillBeHeapVector<OwnPtrWillBeMember<MediaQuery> > m_queries; WillBeHeapVector<OwnPtrWillBeMember<MediaQuery> > m_queries;
}; };
class MediaList : public RefCountedWillBeGarbageCollectedFinalized<MediaList> { class MediaList : public RefCountedWillBeGarbageCollectedFinalized<MediaList>, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet) static PassRefPtrWillBeRawPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet)
{ {
...@@ -106,7 +107,6 @@ public: ...@@ -106,7 +107,6 @@ public:
void trace(Visitor*); void trace(Visitor*);
private: private:
MediaList();
MediaList(MediaQuerySet*, CSSStyleSheet* parentSheet); MediaList(MediaQuerySet*, CSSStyleSheet* parentSheet);
MediaList(MediaQuerySet*, CSSRule* parentRule); MediaList(MediaQuerySet*, CSSRule* parentRule);
......
...@@ -41,6 +41,7 @@ MediaQueryList::MediaQueryList(ExecutionContext* context, PassRefPtrWillBeRawPtr ...@@ -41,6 +41,7 @@ MediaQueryList::MediaQueryList(ExecutionContext* context, PassRefPtrWillBeRawPtr
, m_matchesDirty(true) , m_matchesDirty(true)
, m_matches(false) , m_matches(false)
{ {
ScriptWrappable::init(this);
m_matcher->addMediaQueryList(this); m_matcher->addMediaQueryList(this);
updateMatches(); updateMatches();
} }
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#ifndef MediaQueryList_h #ifndef MediaQueryList_h
#define MediaQueryList_h #define MediaQueryList_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/dom/ActiveDOMObject.h" #include "core/dom/ActiveDOMObject.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
...@@ -39,7 +40,7 @@ class MediaQuerySet; ...@@ -39,7 +40,7 @@ class MediaQuerySet;
// retrieve the current value of the given media query and to add/remove listeners that // retrieve the current value of the given media query and to add/remove listeners that
// will be called whenever the value of the query changes. // will be called whenever the value of the query changes.
class MediaQueryList FINAL : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryList>, public ActiveDOMObject { class MediaQueryList FINAL : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryList>, public ActiveDOMObject, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<MediaQueryList> create(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaQueryMatcher>, PassRefPtrWillBeRawPtr<MediaQuerySet>); static PassRefPtrWillBeRawPtr<MediaQueryList> create(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaQueryMatcher>, PassRefPtrWillBeRawPtr<MediaQuerySet>);
virtual ~MediaQueryList(); virtual ~MediaQueryList();
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
namespace blink { namespace blink {
class CSSPrimitiveValue; class CSSPrimitiveValue;
class RGBColor : public RefCountedWillBeGarbageCollected<RGBColor> { class RGBColor : public RefCountedWillBeGarbageCollected<RGBColor> {
public: public:
static PassRefPtrWillBeRawPtr<RGBColor> create(unsigned rgbColor); static PassRefPtrWillBeRawPtr<RGBColor> create(unsigned rgbColor);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> red(); PassRefPtrWillBeRawPtr<CSSPrimitiveValue> red();
...@@ -48,14 +48,14 @@ namespace blink { ...@@ -48,14 +48,14 @@ namespace blink {
void trace(Visitor*) { } void trace(Visitor*) { }
private: private:
RGBColor(unsigned rgbColor) RGBColor(unsigned rgbColor)
: m_rgbColor(rgbColor) : m_rgbColor(rgbColor)
{ {
} }
RGBA32 m_rgbColor; RGBA32 m_rgbColor;
}; };
} // namespace blink } // namespace blink
......
...@@ -37,6 +37,7 @@ namespace blink { ...@@ -37,6 +37,7 @@ namespace blink {
StyleMedia::StyleMedia(LocalFrame* frame) StyleMedia::StyleMedia(LocalFrame* frame)
: DOMWindowProperty(frame) : DOMWindowProperty(frame)
{ {
ScriptWrappable::init(this);
} }
AtomicString StyleMedia::type() const AtomicString StyleMedia::type() const
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#ifndef StyleMedia_h #ifndef StyleMedia_h
#define StyleMedia_h #define StyleMedia_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/frame/DOMWindowProperty.h" #include "core/frame/DOMWindowProperty.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/RefCounted.h" #include "wtf/RefCounted.h"
...@@ -36,7 +37,7 @@ namespace blink { ...@@ -36,7 +37,7 @@ namespace blink {
class LocalFrame; class LocalFrame;
class StyleMedia : public RefCountedWillBeGarbageCollectedFinalized<StyleMedia>, public DOMWindowProperty { class StyleMedia : public RefCountedWillBeGarbageCollectedFinalized<StyleMedia>, public DOMWindowProperty, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<StyleMedia> create(LocalFrame* frame) { return adoptRefWillBeNoop(new StyleMedia(frame));} static PassRefPtrWillBeRawPtr<StyleMedia> create(LocalFrame* frame) { return adoptRefWillBeNoop(new StyleMedia(frame));}
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef StyleSheet_h #ifndef StyleSheet_h
#define StyleSheet_h #define StyleSheet_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/css/CSSParserMode.h" #include "core/css/CSSParserMode.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
...@@ -34,8 +35,12 @@ class MediaList; ...@@ -34,8 +35,12 @@ class MediaList;
class Node; class Node;
class StyleSheet; class StyleSheet;
class StyleSheet : public RefCountedWillBeGarbageCollectedFinalized<StyleSheet> { class StyleSheet : public RefCountedWillBeGarbageCollectedFinalized<StyleSheet>, public ScriptWrappable {
public: public:
StyleSheet()
{
ScriptWrappable::init(this);
}
virtual ~StyleSheet(); virtual ~StyleSheet();
virtual bool disabled() const = 0; virtual bool disabled() const = 0;
......
...@@ -34,6 +34,7 @@ using namespace HTMLNames; ...@@ -34,6 +34,7 @@ using namespace HTMLNames;
StyleSheetList::StyleSheetList(TreeScope* treeScope) StyleSheetList::StyleSheetList(TreeScope* treeScope)
: m_treeScope(treeScope) : m_treeScope(treeScope)
{ {
ScriptWrappable::init(this);
} }
StyleSheetList::~StyleSheetList() StyleSheetList::~StyleSheetList()
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef StyleSheetList_h #ifndef StyleSheetList_h
#define StyleSheetList_h #define StyleSheetList_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/css/CSSStyleSheet.h" #include "core/css/CSSStyleSheet.h"
#include "core/dom/TreeScope.h" #include "core/dom/TreeScope.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
...@@ -33,7 +34,7 @@ namespace blink { ...@@ -33,7 +34,7 @@ namespace blink {
class HTMLStyleElement; class HTMLStyleElement;
class StyleSheet; class StyleSheet;
class StyleSheetList : public RefCountedWillBeGarbageCollectedFinalized<StyleSheetList> { class StyleSheetList : public RefCountedWillBeGarbageCollectedFinalized<StyleSheetList>, public ScriptWrappable {
public: public:
static PassRefPtrWillBeRawPtr<StyleSheetList> create(TreeScope* treeScope) { return adoptRefWillBeNoop(new StyleSheetList(treeScope)); } static PassRefPtrWillBeRawPtr<StyleSheetList> create(TreeScope* treeScope) { return adoptRefWillBeNoop(new StyleSheetList(treeScope)); }
~StyleSheetList(); ~StyleSheetList();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment