diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/bridge | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/bridge')
-rw-r--r-- | Source/WebCore/bridge/Bridge.h | 5 | ||||
-rw-r--r-- | Source/WebCore/bridge/IdentifierRep.h | 3 | ||||
-rw-r--r-- | Source/WebCore/bridge/jsc/BridgeJSC.h | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Source/WebCore/bridge/Bridge.h b/Source/WebCore/bridge/Bridge.h index 50efc64..00d6f36 100644 --- a/Source/WebCore/bridge/Bridge.h +++ b/Source/WebCore/bridge/Bridge.h @@ -28,14 +28,15 @@ #define Bridge_h #include "BridgeJSC.h" -#include <wtf/Noncopyable.h> namespace JSC { namespace Bindings { -class Method : public Noncopyable { +class Method { + WTF_MAKE_NONCOPYABLE(Method); WTF_MAKE_FAST_ALLOCATED; public: + Method() { } virtual int numParameters() const = 0; virtual ~Method() { } diff --git a/Source/WebCore/bridge/IdentifierRep.h b/Source/WebCore/bridge/IdentifierRep.h index 99bae0b..8646e92 100644 --- a/Source/WebCore/bridge/IdentifierRep.h +++ b/Source/WebCore/bridge/IdentifierRep.h @@ -33,7 +33,8 @@ namespace WebCore { -class IdentifierRep : public FastAllocBase { +class IdentifierRep { + WTF_MAKE_FAST_ALLOCATED; public: static IdentifierRep* get(int); static IdentifierRep* get(const char*); diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.h b/Source/WebCore/bridge/jsc/BridgeJSC.h index 96974d9..ebcfaad 100644 --- a/Source/WebCore/bridge/jsc/BridgeJSC.h +++ b/Source/WebCore/bridge/jsc/BridgeJSC.h @@ -59,8 +59,10 @@ public: virtual ~Field() { } }; -class Class : public Noncopyable { +class Class { + WTF_MAKE_NONCOPYABLE(Class); WTF_MAKE_FAST_ALLOCATED; public: + Class() { } virtual MethodList methodsNamed(const Identifier&, Instance*) const = 0; virtual Field* fieldNamed(const Identifier&, Instance*) const = 0; virtual JSValue fallbackObject(ExecState*, Instance*, const Identifier&) { return jsUndefined(); } @@ -125,7 +127,8 @@ private: WeakGCPtr<RuntimeObject> m_runtimeObject; }; -class Array : public Noncopyable { +class Array { + WTF_MAKE_NONCOPYABLE(Array); public: Array(PassRefPtr<RootObject>); virtual ~Array(); |