Commit 8d3a6461 authored by vestbo@webkit.org's avatar vestbo@webkit.org

2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

        Reviewed by Simon Hausmann.

        Rename the plugin logging channel to plural form 'Plugins'

        This matches both the other logging channel names, as well as the
        WebKit logging channel used by Safari/Mac for plugins.

        * platform/Logging.cpp:
        * platform/Logging.h:
        * platform/gtk/LoggingGtk.cpp:
        * platform/mac/LoggingMac.mm:
        * platform/qt/LoggingQt.cpp:
        * platform/win/LoggingWin.cpp:
        * plugins/PluginDebug.h:
        * plugins/gtk/PluginPackageGtk.cpp:
        * plugins/mac/PluginPackageMac.cpp:
        * plugins/mac/PluginViewMac.cpp:
        * plugins/qt/PluginPackageQt.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44988 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c0b3f83a
2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Simon Hausmann.
Rename the plugin logging channel to plural form 'Plugins'
This matches both the other logging channel names, as well as the
WebKit logging channel used by Safari/Mac for plugins.
* platform/Logging.cpp:
* platform/Logging.h:
* platform/gtk/LoggingGtk.cpp:
* platform/mac/LoggingMac.mm:
* platform/qt/LoggingQt.cpp:
* platform/win/LoggingWin.cpp:
* plugins/PluginDebug.h:
* plugins/gtk/PluginPackageGtk.cpp:
* plugins/mac/PluginPackageMac.cpp:
* plugins/mac/PluginViewMac.cpp:
* plugins/qt/PluginPackageQt.cpp:
2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Simon Hausmann.
......
......@@ -57,7 +57,7 @@ WTFLogChannel LogStorageAPI = { 0x00800000, "WebCoreLogLevel", WTFLogChan
WTFLogChannel LogMedia = { 0x01000000, "WebCoreLogLevel", WTFLogChannelOff };
WTFLogChannel LogPlugin = { 0x02000000, "WebCoreLogLevel", WTFLogChannelOff };
WTFLogChannel LogPlugins = { 0x02000000, "WebCoreLogLevel", WTFLogChannelOff };
WTFLogChannel LogArchives = { 0x04000000, "WebCoreLogLevel", WTFLogChannelOff };
WTFLogChannel* getChannelFromName(const String& channelName)
......@@ -78,7 +78,7 @@ WTFLogChannel* getChannelFromName(const String& channelName)
if (channelName == String("NotYetImplemented")) return &LogNotYetImplemented;
if (channelName == String("PageCache")) return &LogPageCache;
if (channelName == String("PlatformLeaks")) return &LogPlatformLeaks;
if (channelName == String("Plugin")) return &LogPlugin;
if (channelName == String("Plugins")) return &LogPlugins;
if (channelName == String("PopupBlocking")) return &LogPopupBlocking;
if (channelName == String("SpellingAndGrammar")) return &LogSpellingAndGrammar;
if (channelName == String("SQLDatabase")) return &LogSQLDatabase;
......
......@@ -55,7 +55,7 @@ namespace WebCore {
extern WTFLogChannel LogThreading;
extern WTFLogChannel LogStorageAPI;
extern WTFLogChannel LogMedia;
extern WTFLogChannel LogPlugin;
extern WTFLogChannel LogPlugins;
extern WTFLogChannel LogArchives;
void InitializeLoggingChannelsIfNecessary();
......
......@@ -59,8 +59,8 @@ static WTFLogChannel* getChannelFromName(const char* channelName)
return &LogPageCache;
if (!g_ascii_strcasecmp(channelName, "PlatformLeaks"))
return &LogPlatformLeaks;
if (!g_ascii_strcasecmp(channelName, "Plugin"))
return &LogPlugin;
if (!g_ascii_strcasecmp(channelName, "Plugins"))
return &LogPlugins;
if (!g_ascii_strcasecmp(channelName, "PopupBlocking"))
return &LogPopupBlocking;
if (!g_ascii_strcasecmp(channelName, "SpellingAndGrammar"))
......
......@@ -67,7 +67,7 @@ void InitializeLoggingChannelsIfNecessary()
initializeWithUserDefault(LogThreading);
initializeWithUserDefault(LogStorageAPI);
initializeWithUserDefault(LogMedia);
initializeWithUserDefault(LogPlugin);
initializeWithUserDefault(LogPlugins);
initializeWithUserDefault(LogArchives);
}
......
......@@ -44,7 +44,7 @@ static WTFLogChannel* getChannelFromName(const QString& channelName)
if (channelName == QLatin1String("NotYetImplemented")) return &LogNotYetImplemented;
if (channelName == QLatin1String("PageCache")) return &LogPageCache;
if (channelName == QLatin1String("PlatformLeaks")) return &LogPlatformLeaks;
if (channelName == QLatin1String("Plugin")) return &LogPlugin;
if (channelName == QLatin1String("Plugins")) return &LogPlugins;
if (channelName == QLatin1String("PopupBlocking")) return &LogPopupBlocking;
if (channelName == QLatin1String("SpellingAndGrammar")) return &LogSpellingAndGrammar;
if (channelName == QLatin1String("SQLDatabase")) return &LogSQLDatabase;
......
......@@ -93,7 +93,7 @@ void InitializeLoggingChannelsIfNecessary()
initializeWithUserDefault(LogThreading);
initializeWithUserDefault(LogStorageAPI);
initializeWithUserDefault(LogMedia);
initializeWithUserDefault(LogPlugin);
initializeWithUserDefault(LogPlugins);
initializeWithUserDefault(LogArchives);
}
......
......@@ -51,7 +51,7 @@ static const char* const errorStrings[] = {
#endif
#define LOG_NPERROR(err) if (err != NPERR_NO_ERROR) LOG_VERBOSE(Plugin, "%s\n", errorStrings[err])
#define LOG_PLUGIN_NET_ERROR() LOG_VERBOSE(Plugin, "Stream failed due to problems with network, disk I/O, lack of memory, or other problems.\n")
#define LOG_NPERROR(err) if (err != NPERR_NO_ERROR) LOG_VERBOSE(Plugins, "%s\n", errorStrings[err])
#define LOG_PLUGIN_NET_ERROR() LOG_VERBOSE(Plugins, "Stream failed due to problems with network, disk I/O, lack of memory, or other problems.\n")
#endif
......@@ -151,7 +151,7 @@ bool PluginPackage::load()
m_module = g_module_open((m_path.utf8()).data(), G_MODULE_BIND_LOCAL);
if (!m_module) {
LOG(Plugin,"Module Load Failed :%s, Error:%s\n", (m_path.utf8()).data(), g_module_error());
LOG(Plugins,"Module Load Failed :%s, Error:%s\n", (m_path.utf8()).data(), g_module_error());
return false;
}
......
......@@ -50,7 +50,7 @@ void PluginPackage::determineQuirks(const String& mimeType)
{
if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
// Because a single process cannot create multiple VMs, and we cannot reliably unload a
// Java VM, we cannot unload the Java plugin, or we'll lose reference to our only VM
// Java VM, we cannot unload the Java Plugin, or we'll lose reference to our only VM
m_quirks.add(PluginQuirkDontUnloadPlugin);
// Setting the window region to an empty region causes bad scrolling repaint problems
......@@ -235,9 +235,9 @@ bool PluginPackage::fetchInfo()
CFBundleCloseBundleResourceMap(m_module, resFile);
}
LOG(Plugin, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
if (isPluginBlacklisted()) {
LOG(Plugin, "\tPlug-in is blacklisted!");
LOG(Plugins, "\tPlug-in is blacklisted!");
return false;
}
......@@ -264,7 +264,7 @@ bool PluginPackage::load()
kCFURLPOSIXPathStyle, false));
m_module = CFBundleCreate(NULL, url.get());
if (!m_module || !CFBundleLoadExecutable(m_module)) {
LOG(Plugin, "%s not loaded", m_path.utf8().data());
LOG(Plugins, "%s not loaded", m_path.utf8().data());
return false;
}
......
......@@ -220,7 +220,7 @@ void PluginView::stop()
NPError PluginView::getValueStatic(NPNVariable variable, void* value)
{
LOG(Plugin, "PluginView::getValueStatic(%d)", variable);
LOG(Plugins, "PluginView::getValueStatic(%d)", variable);
switch (variable) {
case NPNVToolkit:
......@@ -238,7 +238,7 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value)
NPError PluginView::getValue(NPNVariable variable, void* value)
{
LOG(Plugin, "PluginView::getValue(%d)", variable);
LOG(Plugins, "PluginView::getValue(%d)", variable);
switch (variable) {
case NPNVWindowNPObject: {
......@@ -299,7 +299,7 @@ void PluginView::setParent(ScrollView* parent)
void PluginView::show()
{
LOG(Plugin, "PluginView::show()");
LOG(Plugins, "PluginView::show()");
setSelfVisible(true);
......@@ -308,7 +308,7 @@ void PluginView::show()
void PluginView::hide()
{
LOG(Plugin, "PluginView::hide()");
LOG(Plugins, "PluginView::hide()");
setSelfVisible(false);
......@@ -317,7 +317,7 @@ void PluginView::hide()
void PluginView::setFocus()
{
LOG(Plugin, "PluginView::setFocus()");
LOG(Plugins, "PluginView::setFocus()");
if (platformPluginWidget())
platformPluginWidget()->setFocus(Qt::OtherFocusReason);
......@@ -510,9 +510,9 @@ void PluginView::handleMouseEvent(MouseEvent* event)
void PluginView::handleKeyboardEvent(KeyboardEvent* event)
{
LOG(Plugin, "PluginView::handleKeyboardEvent() ----------------- ");
LOG(Plugins, "PluginView::handleKeyboardEvent() ----------------- ");
LOG(Plugin, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d",
LOG(Plugins, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d",
event->keyCode(), event->charCode());
EventRecord record;
......@@ -548,7 +548,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
WTF::RetainPtr<CFStringRef> cfText(WTF::AdoptCF, text.createCFString());
LOG(Plugin, "PV::hKE(): PKE.text: %s, PKE.unmodifiedText: %s, PKE.keyIdentifier: %s",
LOG(Plugins, "PV::hKE(): PKE.text: %s, PKE.unmodifiedText: %s, PKE.keyIdentifier: %s",
text.ascii().data(), platformEvent->unmodifiedText().ascii().data(),
platformEvent->keyIdentifier().ascii().data());
......@@ -564,9 +564,9 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
record.message = ((keyCode & 0xFF) << 8) | (charCodes[0] & 0xFF);
record.when = TickCount();
LOG(Plugin, "PV::hKE(): record.modifiers: %d", record.modifiers);
LOG(Plugins, "PV::hKE(): record.modifiers: %d", record.modifiers);
LOG(Plugin, "PV::hKE(): PKE.qtEvent()->nativeVirtualKey: 0x%02X, charCode: %d",
LOG(Plugins, "PV::hKE(): PKE.qtEvent()->nativeVirtualKey: 0x%02X, charCode: %d",
keyCode, int(uchar(charCodes[0])));
if (!dispatchNPEvent(record))
......
......@@ -90,7 +90,7 @@ bool PluginPackage::load()
m_module = new QLibrary((QString)m_path);
m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint);
if (!m_module->load()) {
LOG(Plugin, "%s not loaded (%s)", m_path.utf8().data(),
LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(),
m_module->errorString().toLatin1().constData());
return false;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment