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/pending | |
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/pending')
-rw-r--r-- | webkit/pending/ExceptionContext.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/pending/ExceptionContext.h b/webkit/pending/ExceptionContext.h index 529b8f3..f9914dc 100644 --- a/webkit/pending/ExceptionContext.h +++ b/webkit/pending/ExceptionContext.h @@ -36,7 +36,7 @@ #include "ScriptController.h" #if USE(JSC) -namespace KJS { +namespace JSC { class ExecState; } #endif @@ -58,8 +58,8 @@ public: #if USE(V8) ExceptionContext(); #elif USE(JSC) - ExceptionContext(KJS::ExecState* exec) : m_exec(exec) {} - KJS::ExecState* exec() const { return m_exec; } + ExceptionContext(JSC::ExecState* exec) : m_exec(exec) {} + JSC::ExecState* exec() const { return m_exec; } #endif ~ExceptionContext() {} @@ -77,7 +77,7 @@ private: JSException m_exception; ExceptionCatcher* m_exceptionCatcher; #elif USE(JSC) - KJS::ExecState* m_exec; + JSC::ExecState* m_exec; #endif }; |