WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/bindings/js/ScriptController.h

 /*
  *  Copyright (C) 1999 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
  *  Copyright (C) 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
@@ skipping 109 matching lines @@
 
     PassRefPtr<JSC::Bindings::RootObject> createRootObject(void* nativeHandle);
 
 #if PLATFORM(MAC)
 #if ENABLE(MAC_JAVA_BRIDGE)
     static void initJavaJSBindings();
 #endif
     WebScriptObject* windowScriptObject();
 #endif
 
+    JSC::JSObject* jsObjectForPluginElement(HTMLPlugInElement*);
+    
 #if ENABLE(NETSCAPE_PLUGIN_API)
     NPObject* createScriptObjectForPluginElement(HTMLPlugInElement*);
     NPObject* windowScriptNPObject();
 #endif
 
 private:
     void initScriptIfNeeded()
     {
         if (!m_windowShell)
             initScript();
@@ skipping 21 matching lines @@
     NPObject* m_windowScriptNPObject;
 #endif
 #if PLATFORM(MAC)
     RetainPtr<WebScriptObject> m_windowScriptObject;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // ScriptController_h