diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 03:44:35 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 03:44:35 +0000 |
| commit | a5e2f667cecad6a1eea2b0ac51498d322b57db3d (patch) | |
| tree | 139f216ae764437895368bd4e0b9d8bf3ae784f2 /webkit/glue | |
| parent | b3e2fad0a13695466c07ce4c982fa98448e407a0 (diff) | |
| download | chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.zip chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.tar.gz chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.tar.bz2 | |
Fix the JSC build.
This involved fixing up vcproj files and making some KJS -> JSC changes. I also had to fix some issues related to ScriptCallContext.
I had to create a ScriptControllerChromium.cpp for the JSC build to provide an implementation of createScriptInstanceForWidget that knows how to talk to our plugin implementation. This file belongs in bindings/js alongside files like ScriptControllerWin.cpp, so I created webkit/port/bindings/js to house it.
R=dglazkov,ojan
Review URL: http://codereview.chromium.org/8947
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/npruntime_util.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index fa97eb6..95d67c0 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -240,7 +240,7 @@ bool CppBoundClass::IsMethodRegistered(std::string name) { void CppBoundClass::BindToJavascript(WebFrame* frame, const std::wstring& classname) { #if USE(JSC) - KJS::JSLock lock(false); + JSC::JSLock lock(false); #endif // Create an NPObject using our static NPClass. The first argument (a diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc index cdfd1ac..364401f 100644 --- a/webkit/glue/npruntime_util.cc +++ b/webkit/glue/npruntime_util.cc @@ -11,7 +11,7 @@ #include "webkit/port/bindings/v8/np_v8object.h" #elif USE(JAVASCRIPTCORE_BINDINGS) #include "bridge/c/c_utility.h" -using KJS::Bindings::PrivateIdentifier; +using JSC::Bindings::PrivateIdentifier; #endif #include "base/pickle.h" diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 8875057..eb1d1b4 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -715,14 +715,14 @@ void WebFrameImpl::BindToWindowObject(const std::wstring& name, #endif #if USE(JSC) - KJS::JSGlobalObject* window = frame_->script()->globalObject(); - KJS::ExecState* exec = window->globalExec(); - KJS::Bindings::RootObject* root = frame_->script()->bindingRootObject(); + JSC::JSGlobalObject* window = frame_->script()->globalObject(); + JSC::ExecState* exec = window->globalExec(); + JSC::Bindings::RootObject* root = frame_->script()->bindingRootObject(); ASSERT(exec); - KJS::RuntimeObjectImp* instance = KJS::Bindings::Instance::createRuntimeObject( - exec, KJS::Bindings::CInstance::create(object, root)); - KJS::Identifier id(exec, key.latin1().data()); - KJS::PutPropertySlot slot; + JSC::RuntimeObjectImp* instance = JSC::Bindings::Instance::createRuntimeObject( + exec, JSC::Bindings::CInstance::create(object, root)); + JSC::Identifier id(exec, key.latin1().data()); + JSC::PutPropertySlot slot; window->put(exec, id, instance, slot); #endif } |