diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/glue/cpp_bound_class.cc | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_bound_class.cc')
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index b77aa4a..5a4c8c9 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -22,7 +22,7 @@ #pragma warning(disable:4067) #include "npruntime_priv.h" -#if USE(JAVASCRIPTCORE_BINDINGS) +#if USE(JSC) #pragma warning(push, 0) #include "JSLock.h" #pragma warning(pop) @@ -146,7 +146,7 @@ CppBoundClass::~CppBoundClass() { // Unregister objects we created and bound to a frame. for (BoundObjectList::iterator i = bound_objects_.begin(); i != bound_objects_.end(); ++i) { -#if USE(V8_BINDING) +#if USE(V8) _NPN_UnregisterObject(*i); #endif NPN_ReleaseObject(*i); @@ -236,7 +236,7 @@ bool CppBoundClass::IsMethodRegistered(std::string name) { void CppBoundClass::BindToJavascript(WebFrame* frame, const std::wstring& classname) { -#if USE(JAVASCRIPTCORE_BINDINGS) +#if USE(JSC) KJS::JSLock lock; #endif |