Changeset 56585 in webkit


Ignore:
Timestamp:
Mar 25, 2010 6:04:04 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-25 Laszlo Gombos <Laszlo Gombos>

Reviewed by Darin Adler.

Fix build if NPAPI support is disabled
​https://bugs.webkit.org/show_bug.cgi?id=36621

No new tests, this is a build fix.

  • plugins/PluginView.cpp: Guard getValueStatic() with NETSCAPE_PLUGIN_API (WebCore::PluginView::getValue):
  • plugins/PluginView.h: Guard getValue() with NETSCAPE_PLUGIN_API
  • plugins/PluginViewNone.cpp: Guard platformGetValue() and platformGetValueStatic with NETSCAPE_PLUGIN_API; Guard privateBrowsingStateChanged() and setJavaScriptPaused() with PLATFORM(MAC)
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56580 r56585  
     12010-03-25  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Fix build if NPAPI support is disabled
     6        https://bugs.webkit.org/show_bug.cgi?id=36621
     7
     8        No new tests, this is a build fix.
     9
     10        * plugins/PluginView.cpp: Guard getValueStatic() with
     11        NETSCAPE_PLUGIN_API
     12        (WebCore::PluginView::getValue):
     13        * plugins/PluginView.h: Guard getValue() with NETSCAPE_PLUGIN_API
     14        * plugins/PluginViewNone.cpp: Guard platformGetValue() and
     15        platformGetValueStatic with NETSCAPE_PLUGIN_API;
     16        Guard privateBrowsingStateChanged() and setJavaScriptPaused() with
     17        PLATFORM(MAC)
     18
    1192010-03-25  Drew Wilson  <atwilson@chromium.org>
    220

  • trunk/WebCore/plugins/PluginView.cpp

    r56064 r56585  
    12971297    view->keepAlive();
    12981298}
    1299 #endif
    13001299
    13011300NPError PluginView::getValueStatic(NPNVariable variable, void* value)
    … …  
    13221321
    13231322    switch (variable) {
    1324 #if ENABLE(NETSCAPE_PLUGIN_API)
    13251323    case NPNVWindowNPObject: {
    13261324        if (m_isJavaScriptPaused)
    … …  
    13571355        return NPERR_NO_ERROR;
    13581356    }
    1359 #endif
    13601357
    13611358    case NPNVprivateModeBool: {
    … …  
    13711368    }
    13721369}
     1370#endif
    13731371
    13741372void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)

  • trunk/WebCore/plugins/PluginView.h

    r55433 r56585  
    140140#endif
    141141        void status(const char* message);
     142       
     143#if ENABLE(NETSCAPE_PLUGIN_API)
    142144        NPError getValue(NPNVariable variable, void* value);
    143 #if ENABLE(NETSCAPE_PLUGIN_API)
    144145        static NPError getValueStatic(NPNVariable variable, void* value);
    145146#endif

  • trunk/WebCore/plugins/PluginViewNone.cpp

    r55441 r56585  
    6868}
    6969
     70#if ENABLE(NETSCAPE_PLUGIN_API)
    7071bool PluginView::platformGetValue(NPNVariable, void*, NPError*)
    7172{
    … …  
    7374}
    7475
    75 #if ENABLE(NETSCAPE_PLUGIN_API)
    7676bool PluginView::platformGetValueStatic(NPNVariable, void*, NPError*)
    7777{
    … …  
    127127#endif
    128128
     129#if PLATFORM(MAC)
    129130void PluginView::privateBrowsingStateChanged(bool)
    130131{
    … …  
    134135{
    135136}
     137#endif
    136138
    137139} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.