Changeset 117222 in webkit


Ignore:
Timestamp:
May 15, 2012 11:24:25 PM (12 years ago)
Author:
caio.oliveira@openbossa.org
Message:

Fix Qt5/Mac build after r117212 by adding missing NETSCAPE_PLUGIN_API guards
https://bugs.webkit.org/show_bug.cgi?id=86577

Reviewed by Andy Estes.

  • Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp:
  • UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:

(WebKit::PluginInfoStore::getPluginInfo):

  • WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r117221 r117222  
     12012-05-15  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
     2
     3        Fix Qt5/Mac build after r117212 by adding missing NETSCAPE_PLUGIN_API guards
     4        https://bugs.webkit.org/show_bug.cgi?id=86577
     5
     6        Reviewed by Andy Estes.
     7
     8        * Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp:
     9        * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
     10        (WebKit::PluginInfoStore::getPluginInfo):
     11        * WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:
     12
    1132012-05-15  Andy Estes  <aestes@apple.com>
    214
  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp

    r95901 r117222  
    2626
    2727#include "config.h"
    28 #if PLUGIN_ARCHITECTURE(UNSUPPORTED)
     28#if ENABLE(NETSCAPE_PLUGIN_API) && PLUGIN_ARCHITECTURE(UNSUPPORTED)
    2929
    3030#include "NetscapePluginModule.h"
  • trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp

    r99872 r117222  
    9696bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
    9797{
     98#if ENABLE(NETSCAPE_PLUGIN_API)
    9899    return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
     100#else
     101    UNUSED_PARAM(pluginPath);
     102    UNUSED_PARAM(plugin);
     103    return false;
     104#endif
    99105}
    100106
  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp

    r117125 r117222  
    2626
    2727#include "config.h"
    28 #if PLUGIN_ARCHITECTURE(UNSUPPORTED)
     28#if ENABLE(NETSCAPE_PLUGIN_API) && PLUGIN_ARCHITECTURE(UNSUPPORTED)
    2929
    3030#include "NetscapePlugin.h"
     
    9696} // namespace WebKit
    9797
    98 #endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)
     98#endif // ENABLE(NETSCAPE_PLUGIN_API) && PLUGIN_ARCHITECTURE(UNSUPPORTED)
Note: See TracChangeset for help on using the changeset viewer.