Changeset 117212 in webkit


Ignore:
Timestamp:
May 15, 2012 8:55:58 PM (12 years ago)
Author:
aestes@apple.com
Message:

Guard Netscape plug-in code with ENABLE(NETSCAPE_PLUGIN_API)
​https://bugs.webkit.org/show_bug.cgi?id=86496

Reviewed by Sam Weinig.

Ensure that WebKit2 can compile with ENABLE_NETSCAPE_PLUGIN_API disabled.

  • Shared/Plugins/Netscape/NetscapePluginModule.cpp:
  • Shared/Plugins/Netscape/NetscapePluginModule.h:
  • Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
  • Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp:
  • Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
  • UIProcess/Plugins/mac/PluginInfoStoreMac.mm:

(WebKit::PluginInfoStore::getPluginInfo):

  • WebProcess/Plugins/Netscape/JSNPMethod.cpp:
  • WebProcess/Plugins/Netscape/JSNPMethod.h:
  • WebProcess/Plugins/Netscape/JSNPObject.cpp:
  • WebProcess/Plugins/Netscape/JSNPObject.h:
  • WebProcess/Plugins/Netscape/NPJSObject.cpp:
  • WebProcess/Plugins/Netscape/NPJSObject.h:
  • WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
  • WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h:
  • WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp:
  • WebProcess/Plugins/Netscape/NPRuntimeUtilities.h:
  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_GetValue):

  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h:
  • WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
  • WebProcess/Plugins/Netscape/NetscapePlugin.h:
  • WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
  • WebProcess/Plugins/Netscape/NetscapePluginStream.h:
  • WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
  • WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h:
  • WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm:
  • WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
  • WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp:
  • WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
  • WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
  • WebProcess/Plugins/PluginController.h:

(PluginController):

  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::Stream::didFinishLoading):
(WebKit::PluginView::PluginView):
(WebKit::PluginView::~PluginView):
(WebKit::PluginView::scriptObject):
(WebKit):

  • WebProcess/Plugins/PluginView.h:

(PluginView):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::createPlugin):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::getSitesWithPluginData):
(WebKit::WebProcess::clearPluginSiteData):

Location:
trunk/Source/WebKit2
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r117141 r117212  
     12012-05-15  Andy Estes  <aestes@apple.com>
     2
     3        Guard Netscape plug-in code with ENABLE(NETSCAPE_PLUGIN_API)
     4        https://bugs.webkit.org/show_bug.cgi?id=86496
     5
     6        Reviewed by Sam Weinig.
     7
     8        Ensure that WebKit2 can compile with ENABLE_NETSCAPE_PLUGIN_API disabled.
     9
     10        * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
     11        * Shared/Plugins/Netscape/NetscapePluginModule.h:
     12        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
     13        * Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp:
     14        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
     15        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
     16        (WebKit::PluginInfoStore::getPluginInfo):
     17        * WebProcess/Plugins/Netscape/JSNPMethod.cpp:
     18        * WebProcess/Plugins/Netscape/JSNPMethod.h:
     19        * WebProcess/Plugins/Netscape/JSNPObject.cpp:
     20        * WebProcess/Plugins/Netscape/JSNPObject.h:
     21        * WebProcess/Plugins/Netscape/NPJSObject.cpp:
     22        * WebProcess/Plugins/Netscape/NPJSObject.h:
     23        * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
     24        * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h:
     25        * WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp:
     26        * WebProcess/Plugins/Netscape/NPRuntimeUtilities.h:
     27        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
     28        (WebKit::NPN_GetValue):
     29        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h:
     30        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
     31        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
     32        * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
     33        * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
     34        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
     35        * WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h:
     36        * WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm:
     37        * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
     38        * WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp:
     39        * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
     40        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
     41        * WebProcess/Plugins/PluginController.h:
     42        (PluginController):
     43        * WebProcess/Plugins/PluginView.cpp:
     44        (WebKit::PluginView::Stream::didFinishLoading):
     45        (WebKit::PluginView::PluginView):
     46        (WebKit::PluginView::~PluginView):
     47        (WebKit::PluginView::scriptObject):
     48        (WebKit):
     49        * WebProcess/Plugins/PluginView.h:
     50        (PluginView):
     51        * WebProcess/WebPage/WebPage.cpp:
     52        (WebKit::WebPage::createPlugin):
     53        * WebProcess/WebProcess.cpp:
     54        (WebKit::WebProcess::getSitesWithPluginData):
     55        (WebKit::WebProcess::clearPluginSiteData):
     56
    1572012-05-15  Michael Brüning  <michael.bruning@nokia.com>
    258

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp

    r117125 r117212  
    2727#include "NetscapePluginModule.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "Module.h"
    3032#include "NPRuntimeUtilities.h"
    … …  
    270272} // namespace WebKit
    271273
     274#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h

    r117125 r117212  
    2626#ifndef NetscapePluginModule_h
    2727#define NetscapePluginModule_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include "Module.h"
    … …  
    100102} // namespace WebKit
    101103
     104#endif // ENABLE(NETSCAPE_PLUGIN_API)
     105
    102106#endif // NetscapePluginModule_h

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

    r117125 r117212  
    2727#import "NetscapePluginModule.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#import "PluginProcessProxy.h"
    3032#import <WebCore/WebCoreNSStringExtras.h>
    … …  
    527529
    528530} // namespace WebKit
     531
     532#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp

    r117125 r117212  
    2626#include "config.h"
    2727#include "NetscapePluginModule.h"
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <WebCore/FileSystem.h>
    … …  
    140142} // namespace WebKit
    141143
     144#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

    r117125 r117212  
    2525
    2626#include "config.h"
    27 #if PLUGIN_ARCHITECTURE(X11)
     27#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
    2828
    2929#include "NetscapePluginModule.h"
    … …  
    226226} // namespace WebKit
    227227
    228 #endif // PLUGIN_ARCHITECTURE(X11)
     228#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

    r117125 r117212  
    7474bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
    7575{
     76#if ENABLE(NETSCAPE_PLUGIN_API)
    7677    return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
     78#else
     79    UNUSED_PARAM(pluginPath);
     80    UNUSED_PARAM(plugin);
     81    return false;
     82#endif
    7783}
    7884

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp

    r117125 r117212  
    2626#include "config.h"
    2727#include "JSNPMethod.h"
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include "JSNPObject.h"
    … …  
    8789
    8890} // namespace WebKit
     91
     92#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h

    r117125 r117212  
    2626#ifndef JSNPMethod_h
    2727#define JSNPMethod_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <JavaScriptCore/FunctionPrototype.h>
    … …  
    7173} // namespace WebKit
    7274
     75#endif // ENABLE(NETSCAPE_PLUGIN_API)
     76
    7377#endif // JSNPMethod_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp

    r117125 r117212  
    2727#include "JSNPObject.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "JSNPMethod.h"
    3032#include "NPJSObject.h"
    … …  
    491493
    492494} // namespace WebKit
     495
     496#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h

    r117125 r117212  
    2626#ifndef JSNPObject_h
    2727#define JSNPObject_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <JavaScriptCore/JSGlobalObject.h>
    … …  
    105107} // namespace WebKit
    106108
     109#endif // ENABLE(NETSCAPE_PLUGIN_API)
     110
    107111#endif // JSNPObject_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp

    r117125 r117212  
    2727#include "NPJSObject.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "JSNPObject.h"
    3032#include "NPRuntimeObjectMap.h"
    … …  
    382384   
    383385} // namespace WebKit
     386
     387#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h

    r117125 r117212  
    2626#ifndef NPJSObject_h
    2727#define NPJSObject_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <JavaScriptCore/Strong.h>
    … …  
    9698} // namespace WebKit
    9799
     100#endif // ENABLE(NETSCAPE_PLUGIN_API)
     101
    98102#endif // NPJSObject_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp

    r117125 r117212  
    2727#include "NPRuntimeObjectMap.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "JSNPObject.h"
    3032#include "NPJSObject.h"
    … …  
    302304
    303305} // namespace WebKit
     306
     307#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h

    r117125 r117212  
    2626#ifndef NPJSObjectWrapperMap_h
    2727#define NPJSObjectWrapperMap_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <WebCore/RunLoop.h>
    … …  
    102104} // namespace WebKit
    103105
     106#endif // ENABLE(NETSCAPE_PLUGIN_API)
     107
    104108#endif // NPJSObjectWrapperMap_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp

    r117125 r117212  
    2626#include "config.h"
    2727#include "NPRuntimeUtilities.h"
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <wtf/text/CString.h>
    … …  
    151153
    152154} // namespace WebKit
     155
     156#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h

    r117125 r117212  
    2626#ifndef NPRuntimeUtilities_h
    2727#define NPRuntimeUtilities_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <WebCore/npruntime_internal.h>
    … …  
    6870}
    6971
     72#endif // ENABLE(NETSCAPE_PLUGIN_API)
     73
    7074#endif // NPRuntimeUtilities_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

    r117125 r117212  
    2727#include "NetscapeBrowserFuncs.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "NPRuntimeUtilities.h"
    3032#include "NetscapePlugin.h"
    … …  
    506508            break;
    507509
    508 #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     510#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && ENABLE(PLUGIN_PROCESS)
    509511        case WKNVSandboxFunctions:
    510512        {
    … …  
    10611063
    10621064} // namespace WebKit
     1065
     1066#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h

    r117125 r117212  
    2727#define NetscapeBrowserFuncs_h
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include <WebCore/npfunctions.h>
    3032
    … …  
    3840} // namespace WebKit
    3941
     42#endif // ENABLE(NETSCAPE_PLUGIN_API)
    4043
    4144#endif // NetscapeBrowserFuncs_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

    r117125 r117212  
    2727#include "NetscapePlugin.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "NPRuntimeObjectMap.h"
    3032#include "NPRuntimeUtilities.h"
    … …  
    971973
    972974} // namespace WebKit
     975
     976#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

    r117125 r117212  
    2626#ifndef NetscapePlugin_h
    2727#define NetscapePlugin_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include "NetscapePluginModule.h"
    … …  
    361363} // namespace WebKit
    362364
     365#endif // ENABLE(NETSCAPE_PLUGIN_API)
     366
    363367#endif // NetscapePlugin_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp

    r117125 r117212  
    2727#include "NetscapePluginStream.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "NetscapePlugin.h"
    3032#include <utility>
    … …  
    362364
    363365} // namespace WebKit
     366
     367#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h

    r117125 r117212  
    2626#ifndef NetscapePluginStream_h
    2727#define NetscapePluginStream_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API)
    2830
    2931#include <WebCore/FileSystem.h>
    … …  
    111113} // namespace WebKit
    112114
     115#endif // ENABLE(NETSCAPE_PLUGIN_API)
     116
    113117#endif // NetscapePluginStream_h

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

    r117125 r117212  
    2727#import "NetscapePlugin.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#import "NetscapeBrowserFuncs.h"
    3032#import "PluginController.h"
    … …  
    11071109
    11081110} // namespace WebKit
     1111
     1112#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h

    r117125 r117212  
    2626#ifndef NetscapeSandboxFunctions_h
    2727#define NetscapeSandboxFunctions_h
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)
    2830
    2931#include <WebCore/npapi.h>
    … …  
    5658#endif
    5759
     60#endif // ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)
     61
    5862#endif

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm

    r113800 r117212  
    2626#import "config.h"
    2727#import "NetscapeSandboxFunctions.h"
     28
     29#if ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)
    2830
    2931#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    … …  
    189191}
    190192
    191 #endif
     193#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     194
     195#endif // ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm

    r117125 r117212  
    2727#import "PluginProxy.h"
    2828
    29 #if ENABLE(PLUGIN_PROCESS)
     29#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
    3030
    3131#import "PluginController.h"
    … …  
    8989} // namespace WebKit
    9090
    91 #endif // ENABLE(PLUGIN_PROCESS)
     91#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp

    r117125 r117212  
    2727#include "PluginProxy.h"
    2828
    29 #if ENABLE(PLUGIN_PROCESS)
     29#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
    3030
    3131#include <WebCore/NotImplemented.h>
    … …  
    4141} // namespace WebKit
    4242
    43 #endif // ENABLE(PLUGIN_PROCESS)
     43#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp

    r117125 r117212  
    2727#include "NetscapePlugin.h"
    2828
     29#if ENABLE(NETSCAPE_PLUGIN_API)
     30
    2931#include "PluginController.h"
    3032#include "WebEvent.h"
    … …  
    397399
    398400} // namespace WebKit
     401
     402#endif // ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

    r117125 r117212  
    2626
    2727#include "config.h"
    28 #if PLUGIN_ARCHITECTURE(X11)
     28#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
    2929
    3030#include "NetscapePlugin.h"
    … …  
    623623} // namespace WebKit
    624624
    625 #endif // PLUGIN_ARCHITECTURE(X11)
     625#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h

    r115300 r117212  
    7777    virtual void cancelManualStreamLoad() = 0;
    7878
     79#if ENABLE(NETSCAPE_PLUGIN_API)
    7980    // Get the NPObject that corresponds to the window JavaScript object. Returns a retained object.
    8081    virtual NPObject* windowScriptNPObject() = 0;
    … …  
    8586    // Evaluates the given script string in the context of the given NPObject.
    8687    virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) = 0;
     88#endif
    8789
    8890    // Set the statusbar text.

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r116720 r117212  
    228228    RefPtr<Stream> protectStream(this);
    229229
     230#if ENABLE(NETSCAPE_PLUGIN_API)
    230231    // Protect the plug-in while we're calling into it.
    231232    NPRuntimeObjectMap::PluginProtector pluginProtector(&m_pluginView->m_npRuntimeObjectMap);
     233#endif
    232234    m_pluginView->m_plugin->streamDidFinishLoading(m_streamID);
    233235
    … …  
    262264    , m_isBeingDestroyed(false)
    263265    , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
     266#if ENABLE(NETSCAPE_PLUGIN_API)
    264267    , m_npRuntimeObjectMap(this)
     268#endif
    265269    , m_manualStreamState(StreamStateInitial)
    266270{
    … …  
    294298    }
    295299
     300#if ENABLE(NETSCAPE_PLUGIN_API)
    296301    // Invalidate the object map.
    297302    m_npRuntimeObjectMap.invalidate();
     303#endif
    298304
    299305    cancelAllStreams();
    … …  
    530536        return 0;
    531537
     538#if ENABLE(NETSCAPE_PLUGIN_API)
    532539    NPObject* scriptableNPObject = m_plugin->pluginScriptableNPObject();
    533540    if (!scriptableNPObject)
    … …  
    538545
    539546    return jsObject;
     547#else
     548    UNUSED_PARAM(globalObject);
     549    return 0;
     550#endif
    540551}
    541552
    … …  
    10551066}
    10561067
     1068#if ENABLE(NETSCAPE_PLUGIN_API)
    10571069NPObject* PluginView::windowScriptNPObject()
    10581070{
    … …  
    10911103    return m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
    10921104}
     1105#endif
    10931106
    10941107void PluginView::setStatusbarText(const String& statusbarText)

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h

    r116720 r117212  
    138138    virtual void cancelStreamLoad(uint64_t streamID);
    139139    virtual void cancelManualStreamLoad();
     140#if ENABLE(NETSCAPE_PLUGIN_API)
    140141    virtual NPObject* windowScriptNPObject();
    141142    virtual NPObject* pluginElementNPObject();
    142143    virtual bool evaluate(NPObject*, const String&scriptString, NPVariant* result, bool allowPopups);
     144#endif
    143145    virtual void setStatusbarText(const String&);
    144146    virtual bool isAcceleratedCompositingEnabled();
    … …  
    191193    HashMap<uint64_t, RefPtr<Stream> > m_streams;
    192194
     195#if ENABLE(NETSCAPE_PLUGIN_API)
    193196    // A map of all related NPObjects for this plug-in view.
    194197    NPRuntimeObjectMap m_npRuntimeObjectMap;
     198#endif
    195199
    196200    // The manual stream state. This is used so we can deliver a manual stream to a plug-in

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r117124 r117212  
    419419#if ENABLE(PLUGIN_PROCESS)
    420420    return PluginProxy::create(pluginPath);
    421 #else
     421#elif ENABLE(NETSCAPE_PLUGIN_API)
    422422    NetscapePlugin::setSetExceptionFunction(NPRuntimeObjectMap::setGlobalException);
    423423    return NetscapePlugin::create(NetscapePluginModule::getOrCreate(pluginPath));
     424#else
     425    return 0;
    424426#endif
    425427}

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r117015 r117212  
    811811    HashSet<String> sitesSet;
    812812
     813#if ENABLE(NETSCAPE_PLUGIN_API)
    813814    for (size_t i = 0; i < pluginPaths.size(); ++i) {
    814815        RefPtr<NetscapePluginModule> netscapePluginModule = NetscapePluginModule::getOrCreate(pluginPaths[i]);
    … …  
    820821            sitesSet.add(sites[i]);
    821822    }
     823#endif
    822824
    823825    Vector<String> sites;
    … …  
    831833    LocalTerminationDisabler terminationDisabler(*this);
    832834
     835#if ENABLE(NETSCAPE_PLUGIN_API)
    833836    for (size_t i = 0; i < pluginPaths.size(); ++i) {
    834837        RefPtr<NetscapePluginModule> netscapePluginModule = NetscapePluginModule::getOrCreate(pluginPaths[i]);
    … …  
    845848            netscapePluginModule->clearSiteData(sites[i], flags, maxAgeInSeconds);
    846849    }
     850#endif
    847851
    848852    connection()->send(Messages::WebContext::DidClearPluginSiteData(callbackID), 0);
Note: See TracChangeset for help on using the changeset viewer.