diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:52:17 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:52:17 +0000 |
| commit | 599c07abb917aa5710c40f66c0a97d165300a808 (patch) | |
| tree | 8a35c796a47e1b4b3aa7f788d33da9933159533e | |
| parent | 21eb7665bb5702575e0977442608fc6052109799 (diff) | |
| download | chromium_src-599c07abb917aa5710c40f66c0a97d165300a808.zip chromium_src-599c07abb917aa5710c40f66c0a97d165300a808.tar.gz chromium_src-599c07abb917aa5710c40f66c0a97d165300a808.tar.bz2 | |
Change JSC build to use ScriptControllerKJS.cpp.
I'm not a huge fan of this, but it's what's in the tree
now and we should either get that working or
change our uses of ScriptController to restrict to
the public API of ScriptController.h.
Also fixes one compile error in the header.
I'm hoping we can ask the V8 team to help out
fixing ScriptController issues since they understand
this code better.
Review URL: http://codereview.chromium.org/7203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3164 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/build/KJSBindings/KJSBindings.vcproj | 2 | ||||
| -rw-r--r-- | webkit/pending/ScriptController.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index 1f39194..c1f5a21 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -1914,7 +1914,7 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\ScriptController.cpp" + RelativePath="..\..\port\bridge\ScriptControllerKJS.cpp" > </File> <File diff --git a/webkit/pending/ScriptController.h b/webkit/pending/ScriptController.h index bdfa696..ecfe418 100644 --- a/webkit/pending/ScriptController.h +++ b/webkit/pending/ScriptController.h @@ -147,6 +147,7 @@ class Widget; typedef HashMap<void*, RefPtr<KJS::Bindings::RootObject> > RootObjectMap; typedef KJS::UString JSString; typedef KJS::Bindings::Instance* JSInstance; +typedef PassRefPtr<KJS::Bindings::Instance> JSInstanceReturnValue; typedef KJS::Bindings::Instance* JSPersistentInstance; typedef KJS::JSValue* JSException; typedef KJS::JSValue* JSResult; @@ -155,6 +156,7 @@ typedef KJS::JSValue* JSResult; #if USE(V8) typedef String JSString; typedef v8::Local<v8::Object> JSInstance; +typedef v8::Local<v8::Object> JSInstanceReturnValue; typedef v8::Persistent<v8::Object> JSPersistentInstance; typedef v8::Local<v8::Value> JSException; typedef v8::Persistent<v8::Value> JSResult; @@ -197,7 +199,7 @@ public: NPRuntimeFunctions* functions(); - JSInstance createScriptInstanceForWidget(Widget*); + JSInstanceReturnValue createScriptInstanceForWidget(Widget*); void clearPluginObjects(); void clearDocumentWrapper(); |