WebKit merge 41447:41498 [third_party/WebKit]

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

 /*
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
  *  Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  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 27 matching lines @@
 #include "PageGroup.h"
 #include "runtime_root.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "Settings.h"
 
 #include <runtime/Completion.h>
 #include <debugger/Debugger.h>
 #include <runtime/JSLock.h>
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
 #include "HTMLPlugInElement.h"
-#endif
 
 using namespace JSC;
 
 namespace WebCore {
 
 ScriptController::ScriptController(Frame* frame)
     : m_frame(frame)
     , m_handlerLineno(0)
     , m_sourceURL(0)
     , m_processingTimerCallback(false)
@@ skipping 323 matching lines @@
         // Call _NPN_DeallocateObject() instead of _NPN_ReleaseObject() so that we don't leak if a plugin fails to release the window
         // script object properly.
         // This shouldn't cause any problems for plugins since they should have already been stopped and destroyed at this point.
         _NPN_DeallocateObject(m_windowScriptNPObject);
         m_windowScriptNPObject = 0;
     }
 #endif
 }
 
 } // namespace WebCore