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/bindings/v8/ScriptState.h | |
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/bindings/v8/ScriptState.h')
-rw-r--r-- | Source/WebCore/bindings/v8/ScriptState.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/bindings/v8/ScriptState.h b/Source/WebCore/bindings/v8/ScriptState.h index 11813b0..0fecee8 100644 --- a/Source/WebCore/bindings/v8/ScriptState.h +++ b/Source/WebCore/bindings/v8/ScriptState.h @@ -42,7 +42,8 @@ class Frame; class Node; class Page; -class ScriptState : public Noncopyable { +class ScriptState { + WTF_MAKE_NONCOPYABLE(ScriptState); public: bool hadException() { return !m_exception.IsEmpty(); } void setException(v8::Local<v8::Value> exception) @@ -79,7 +80,8 @@ public: ~EmptyScriptState() { } }; -class ScriptStateProtectedPtr : public Noncopyable { +class ScriptStateProtectedPtr { + WTF_MAKE_NONCOPYABLE(ScriptStateProtectedPtr); public: ScriptStateProtectedPtr() : m_scriptState(0) { } ScriptStateProtectedPtr(ScriptState* scriptState) : m_scriptState(scriptState) |