2 files changed, 20 insertions, 16 deletions

diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
index 4140d898b..b9c1656b9 100644
--- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
@@ -44,19 +44,19 @@ bool PluginPackage::fetchInfo()
     typedef char *(*NPP_GetMIMEDescriptionProcPtr)();
     NPP_GetMIMEDescriptionProcPtr gm =
         (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription");
-    if (!gm || !gv) {
+    if (!gm || !gv)
         return false;
-    }
+
     char *buf = 0;
-    NPError err = gv(0, NPPVpluginNameString, (void *)&buf);
-    if (err != NPERR_NO_ERROR) {
+    NPError err = gv(0, NPPVpluginNameString, (void*) &buf);
+    if (err != NPERR_NO_ERROR)
         return false;
-    }
+
     m_name = buf;
-    err = gv(0, NPPVpluginDescriptionString, (void *)&buf);
-    if (err != NPERR_NO_ERROR) {
+    err = gv(0, NPPVpluginDescriptionString, (void*) &buf);
+    if (err != NPERR_NO_ERROR)
         return false;
-    }
+
     m_description = buf;
     determineModuleVersionFromDescription();
 
@@ -65,7 +65,7 @@ bool PluginPackage::fetchInfo()
     s.split(UChar(';'), false, types);
     for (int i = 0; i < types.size(); ++i) {
         Vector<String> mime;
-        types[i].split(UChar(':'), true, mime); 
+        types[i].split(UChar(':'), true, mime);
         if (mime.size() > 0) {
             Vector<String> exts;
             if (mime.size() > 1)
diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp
index 25d61f989..883c9aa97 100644
--- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp
@@ -209,7 +209,7 @@ void PluginView::setNPWindowIfNeeded()
     m_npWindow.clipRect.bottom = m_clipRect.height();
 
     PluginView::setCurrentPluginView(this);
-    JSC::JSLock::DropAllLocks dropAllLocks(false);
+    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
     setCallingPlugin(true);
     m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
     setCallingPlugin(false);
@@ -243,7 +243,7 @@ void PluginView::stop()
 
     m_isStarted = false;
 
-    JSC::JSLock::DropAllLocks dropAllLocks(false);
+    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
 
     PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance);
 
@@ -287,7 +287,7 @@ const char* PluginView::userAgent()
 
 const char* PluginView::userAgentStatic()
 {
-    //FIXME - Just say we are Mozilla
+    // FIXME - Just say we are Mozilla
     return MozillaUserAgent;
 }
 
@@ -301,10 +301,10 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
     if (!fileExists(filename))
         return NPERR_FILE_NOT_FOUND;
 
-    //FIXME - read the file data into buffer
+    // FIXME - read the file data into buffer
     FILE* fileHandle = fopen((filename.utf8()).data(), "r");
 
-    if (fileHandle == 0)
+    if (!fileHandle)
         return NPERR_FILE_NOT_FOUND;
 
     //buffer.resize();
@@ -321,6 +321,8 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
 
 NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 {
+    LOG(Plugins, "PluginView::getValueStatic(%s)", prettyNameForNPNVariable(variable).data());
+
     switch (variable) {
     case NPNVToolkit:
         *static_cast<uint32*>(value) = 0;
@@ -341,6 +343,8 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 
 NPError PluginView::getValue(NPNVariable variable, void* value)
 {
+    LOG(Plugins, "PluginView::getValue(%s)", prettyNameForNPNVariable(variable).data());
+
     switch (variable) {
     case NPNVxDisplay:
         if (platformPluginWidget())
@@ -474,7 +478,7 @@ void PluginView::init()
 
     if (m_plugin->pluginFuncs()->getvalue) {
         PluginView::setCurrentPluginView(this);
-        JSC::JSLock::DropAllLocks dropAllLocks(false);
+        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
         setCallingPlugin(true);
         m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
         setCallingPlugin(false);
@@ -488,7 +492,7 @@ void PluginView::init()
         m_status = PluginStatusCanNotLoadPlugin;
         return;
     }
-    show ();
+    show();
 
     NPSetWindowCallbackStruct *wsi = new NPSetWindowCallbackStruct();