Remove ScriptObject

Source/bindings/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 337 matching lines @@
 {
     const V8Extensions& extensions = registeredExtensions();
     for (size_t i = 0; i < extensions.size(); ++i) {
         if (extensions[i] == extension)
             return;
     }
     v8::RegisterExtension(extension);
     registeredExtensions().append(extension);
 }
 
-static NPObject* createNoScriptObject()
+static NPObject* createNoScriptValue()
 {
     notImplemented();
     return 0;
 }
 
-static NPObject* createScriptObject(LocalFrame* frame, v8::Isolate* isolate)
+static NPObject* createScriptValue(LocalFrame* frame, v8::Isolate* isolate)
 {
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Context> v8Context = toV8Context(isolate, frame, DOMWrapperWorld::mainWorld());
     if (v8Context.IsEmpty())
-        return createNoScriptObject();
+        return createNoScriptValue();
 
     v8::Context::Scope scope(v8Context);
     DOMWindow* window = frame->domWindow();
     v8::Handle<v8::Value> global = toV8(window, v8::Handle<v8::Object>(), v8Context->GetIsolate());
     ASSERT(global->IsObject());
 
-    return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(global), window, isolate);
+    return npCreateV8ScriptValue(0, v8::Handle<v8::Object>::Cast(global), window, isolate);
 }
 
 NPObject* ScriptController::windowScriptNPObject()
 {
     if (m_windowScriptNPObject)
         return m_windowScriptNPObject;
 
     if (canExecuteScripts(NotAboutToExecuteScript)) {
         // JavaScript is enabled, so there is a JavaScript window object.
         // Return an NPObject bound to the window object.
-        m_windowScriptNPObject = createScriptObject(m_frame, m_isolate);
+        m_windowScriptNPObject = createScriptValue(m_frame, m_isolate);
         _NPN_RegisterObject(m_windowScriptNPObject, 0);
     } else {
         // JavaScript is not enabled, so we cannot bind the NPObject to the
         // JavaScript window object. Instead, we create an NPObject of a
         // different class, one which is not bound to a JavaScript object.
-        m_windowScriptNPObject = createNoScriptObject();
+        m_windowScriptNPObject = createNoScriptValue();
     }
     return m_windowScriptNPObject;
 }
 
 NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement* plugin)
 {
     // Can't create NPObjects when JavaScript is disabled.
     if (!canExecuteScripts(NotAboutToExecuteScript))
-        return createNoScriptObject();
+        return createNoScriptValue();
 
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> v8Context = toV8Context(m_isolate, m_frame, DOMWrapperWorld::mainWorld());
     if (v8Context.IsEmpty())
-        return createNoScriptObject();
+        return createNoScriptValue();
     v8::Context::Scope scope(v8Context);
 
     DOMWindow* window = m_frame->domWindow();
     v8::Handle<v8::Value> v8plugin = toV8(plugin, v8::Handle<v8::Object>(), v8Context->GetIsolate());
     if (!v8plugin->IsObject())
-        return createNoScriptObject();
+        return createNoScriptValue();
 
-    return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(v8plugin), window, v8Context->GetIsolate());
+    return npCreateV8ScriptValue(0, v8::Handle<v8::Object>::Cast(v8plugin), window, v8Context->GetIsolate());
 }
 
 void ScriptController::clearWindowShell()
 {
     double start = currentTime();
     // V8 binding expects ScriptController::clearWindowShell only be called
     // when a frame is loading a new page. This creates a new context for the new page.
     m_windowShell->clearForNavigation();
     for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin(); iter != m_isolatedWorlds.end(); ++iter)
         iter->value->clearForNavigation();
@@ skipping 190 matching lines @@
         resultArray->Set(i, evaluationResult);
     }
 
     if (results) {
         for (size_t i = 0; i < resultArray->Length(); ++i)
             results->append(ScriptValue(ScriptState::from(context), resultArray->Get(i)));
     }
 }
 
 } // namespace WebCore