diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 00:04:45 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 00:04:45 +0000 |
| commit | 1fd6be4518f3620e7c41dfe91235121cddd62a8b (patch) | |
| tree | 9ea45a23ba7aa9aba3984a1ac0f79b2f228f76de /webkit/pending | |
| parent | 7e39f11ef94e7270cfdaefe71b9604161aa4f390 (diff) | |
| download | chromium_src-1fd6be4518f3620e7c41dfe91235121cddd62a8b.zip chromium_src-1fd6be4518f3620e7c41dfe91235121cddd62a8b.tar.gz chromium_src-1fd6be4518f3620e7c41dfe91235121cddd62a8b.tar.bz2 | |
Fix some types in ScriptController.h to be a bit less wonky. This was mbelshe's proposed method and I think it's sane and clsoer to upstream than what we have now, but I admit that I haven't thought carefully through all the fine points.
Review URL: http://codereview.chromium.org/7288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
| -rw-r--r-- | webkit/pending/ScriptController.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/pending/ScriptController.h b/webkit/pending/ScriptController.h index ecfe418..9b90e75 100644 --- a/webkit/pending/ScriptController.h +++ b/webkit/pending/ScriptController.h @@ -147,8 +147,8 @@ 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 PassRefPtr<KJS::Bindings::Instance> JSInstanceHandle; +typedef RefPtr<KJS::Bindings::Instance> JSPersistentInstance; typedef KJS::JSValue* JSException; typedef KJS::JSValue* JSResult; #endif @@ -156,7 +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::Local<v8::Object> JSInstanceHandle; typedef v8::Persistent<v8::Object> JSPersistentInstance; typedef v8::Local<v8::Value> JSException; typedef v8::Persistent<v8::Value> JSResult; @@ -199,7 +199,7 @@ public: NPRuntimeFunctions* functions(); - JSInstanceReturnValue createScriptInstanceForWidget(Widget*); + JSInstanceHandle createScriptInstanceForWidget(Widget*); void clearPluginObjects(); void clearDocumentWrapper(); @@ -311,7 +311,7 @@ private: class JSInstanceHolder { public: JSInstanceHolder(); - JSInstanceHolder(JSInstance); + JSInstanceHolder(JSInstanceHandle); ~JSInstanceHolder(); // Returns true if the holder is empty. bool IsEmpty(); @@ -319,7 +319,7 @@ public: JSInstance Get(); // Clear the contained JSInstance. void Clear(); - JSInstanceHolder& operator=(JSInstance); + JSInstanceHolder& operator=(JSInstanceHandle); static JSInstance EmptyInstance(); private: |