2009-03-26 Darin Adler <darin@apple.com>

[WebKit-https.git] / WebCore / bindings / js / ScriptController.cpp

diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp
index 1c0b19b..9841c80 100644 (file)
--- a/WebCore/bindings/js/ScriptController.cpp
+++ b/WebCore/bindings/js/ScriptController.cpp
@@ -21,32 +21,24 @@
 #include "config.h"
 #include "ScriptController.h"
 
 #include "config.h"
 #include "ScriptController.h"
 

-#include "Console.h"
-#include "DOMWindow.h"
-#include "Document.h"

 #include "Event.h"
 #include "EventNames.h"
 #include "Frame.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "Frame.h"

-#include "FrameLoader.h"

 #include "GCController.h"
 #include "GCController.h"

-#include "JSDOMWindow.h"
+#include "HTMLPlugInElement.h"

 #include "JSDocument.h"
 #include "JSDocument.h"

-#include "JSEventListener.h"
-#include "npruntime_impl.h"
+#include "JSLazyEventListener.h"

 #include "NP_jsobject.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "NP_jsobject.h"
 #include "Page.h"
 #include "PageGroup.h"

-#include "runtime_root.h"

 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "Settings.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "Settings.h"

-
-#include <runtime/Completion.h>
+#include "npruntime_impl.h"
+#include "runtime_root.h"

 #include <debugger/Debugger.h>
 #include <runtime/JSLock.h>
 
 #include <debugger/Debugger.h>
 #include <runtime/JSLock.h>
 

-#include "HTMLPlugInElement.h"
-

 using namespace JSC;
 
 namespace WebCore {
 using namespace JSC;
 
 namespace WebCore {


@@ -150,12 +142,14 @@ PassRefPtr<EventListener> ScriptController::createInlineEventListener(const Stri
 }
 
 #if ENABLE(SVG)
 }
 
 #if ENABLE(SVG)

+

 PassRefPtr<EventListener> ScriptController::createSVGEventHandler(const String& functionName, const String& code, Node* node)
 {
     initScriptIfNeeded();
     JSLock lock(false);
     return JSLazyEventListener::create(JSLazyEventListener::SVGLazyEventListener, functionName, code, m_windowShell->window(), node, m_handlerLineno);
 }
 PassRefPtr<EventListener> ScriptController::createSVGEventHandler(const String& functionName, const String& code, Node* node)
 {
     initScriptIfNeeded();
     JSLock lock(false);
     return JSLazyEventListener::create(JSLazyEventListener::SVGLazyEventListener, functionName, code, m_windowShell->window(), node, m_handlerLineno);
 }

+

 #endif
 
 void ScriptController::initScript()
 #endif
 
 void ScriptController::initScript()


@@ -293,6 +287,7 @@ PassRefPtr<Bindings::RootObject> ScriptController::createRootObject(void* native
 }
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 }
 
 #if ENABLE(NETSCAPE_PLUGIN_API)

+

 NPObject* ScriptController::windowScriptNPObject()
 {
     if (!m_windowScriptNPObject) {
 NPObject* ScriptController::windowScriptNPObject()
 {
     if (!m_windowScriptNPObject) {


@@ -323,6 +318,7 @@ NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement
     // Wrap the JSObject in an NPObject
     return _NPN_CreateScriptObject(0, object, bindingRootObject());
 }
     // Wrap the JSObject in an NPObject
     return _NPN_CreateScriptObject(0, object, bindingRootObject());
 }

+

 #endif
 
 JSObject* ScriptController::jsObjectForPluginElement(HTMLPlugInElement* plugin)
 #endif
 
 JSObject* ScriptController::jsObjectForPluginElement(HTMLPlugInElement* plugin)


@@ -342,6 +338,7 @@ JSObject* ScriptController::jsObjectForPluginElement(HTMLPlugInElement* plugin)
 }
 
 #if !PLATFORM(MAC)
 }
 
 #if !PLATFORM(MAC)

+

 void ScriptController::updatePlatformScriptObjects()
 {
 }
 void ScriptController::updatePlatformScriptObjects()
 {
 }


@@ -349,6 +346,7 @@ void ScriptController::updatePlatformScriptObjects()
 void ScriptController::disconnectPlatformScriptObjects()
 {
 }
 void ScriptController::disconnectPlatformScriptObjects()
 {
 }

+

 #endif
 
 void ScriptController::cleanupScriptObjectsForPlugin(void* nativeHandle)
 #endif
 
 void ScriptController::cleanupScriptObjectsForPlugin(void* nativeHandle)