Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,3 +1,17 @@
+2012-02-20 Martin Robinson <mrobin...@igalia.com>
+
+ [UNIX] Plugin information fields are not interpreted as UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=78635
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Update expectations to match the fact that TestNetscapePlugin is now
+ returning a Unicode character in the description field.
+
+ * platform/chromium-linux/plugins/plugin-_javascript_-access-expected.txt:
+ * platform/gtk/plugins/plugin-_javascript_-access-expected.txt:
+ * platform/qt/plugins/plugin-_javascript_-access-expected.txt:
+
2012-02-20 Vsevolod Vlasov <vse...@chromium.org>
Unreviewed manual rollout of r107970 which breaks table column widths
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium-linux/plugins/plugin-_javascript_-access-expected.txt (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium-linux/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium-linux/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,6 +1,6 @@
Name: WebKit Test PlugIn
-Description: Simple Netscape plug-in that handles test content for WebKit
+Description: Simple Netscape® plug-in that handles test content for WebKit
Filename: libTestNetscapePlugIn.so
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/plugins/plugin-_javascript_-access-expected.txt (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,6 +1,6 @@
Name: WebKit Test PlugIn
-Description: Simple Netscape plug-in that handles test content for WebKit
+Description: Simple Netscape® plug-in that handles test content for WebKit
Filename: libtestnetscapeplugin.so
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/qt/plugins/plugin-_javascript_-access-expected.txt (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/qt/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/qt/plugins/plugin-_javascript_-access-expected.txt 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,6 +1,6 @@
Name: WebKit Test PlugIn
-Description: Simple Netscape plug-in that handles test content for WebKit
+Description: Simple Netscape® plug-in that handles test content for WebKit
Filename: libTestNetscapePlugIn.so
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,3 +1,22 @@
+2012-02-20 Martin Robinson <mrobin...@igalia.com>
+
+ [UNIX] Plugin information fields are not interpreted as UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=78635
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Interpret plugin metadata as UTF8 aways. This matches the behavior
+ of Chromium and the Totem plugin.
+
+ This is tested by a change to TestNetscapePlugin and expectations updates.
+
+ * plugins/efl/PluginPackageEfl.cpp:
+ (WebCore::PluginPackage::fetchInfo): Use String::fromUTF8.
+ * plugins/gtk/PluginPackageGtk.cpp:
+ (WebCore::PluginPackage::fetchInfo): Use String::fromUTF8.
+ * plugins/qt/PluginPackageQt.cpp:
+ (WebCore::PluginPackage::fetchInfo): Use String::fromUTF8.
+
2012-02-20 Anders Carlsson <ander...@apple.com>
Stop the committer timer when the page is destroyed
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/efl/PluginPackageEfl.cpp (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/efl/PluginPackageEfl.cpp 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/efl/PluginPackageEfl.cpp 2012-02-21 02:45:18 UTC (rev 108285)
@@ -69,16 +69,16 @@
NPError err = getValue(0, NPPVpluginNameString, static_cast<void*>(&buffer));
if (err != NPERR_NO_ERROR)
return false;
- m_name = buffer;
+ m_name = String::fromUTF8(buffer);
buffer = 0;
err = getValue(0, NPPVpluginDescriptionString, static_cast<void*>(&buffer));
if (err != NPERR_NO_ERROR)
return false;
- m_description = buffer;
+ m_description = String::fromUTF8(buffer);
determineModuleVersionFromDescription();
- String description = getMIMEDescription();
+ String description = String::fromUTF8(getMIMEDescription());
Vector<String> types;
description.split(UChar(';'), false, types);
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp 2012-02-21 02:45:18 UTC (rev 108285)
@@ -58,12 +58,12 @@
char* buffer = 0;
NPError err = NPP_GetValue(0, NPPVpluginNameString, &buffer);
if (err == NPERR_NO_ERROR)
- m_name = buffer;
+ m_name = String::fromUTF8(buffer);
buffer = 0;
err = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
if (err == NPERR_NO_ERROR) {
- m_description = buffer;
+ m_description = String::fromUTF8(buffer);
determineModuleVersionFromDescription();
}
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/qt/PluginPackageQt.cpp (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-02-21 02:45:18 UTC (rev 108285)
@@ -51,16 +51,15 @@
if (err != NPERR_NO_ERROR)
return false;
- m_name = buf;
+ m_name = String::fromUTF8(buf);
err = gv(0, NPPVpluginDescriptionString, (void*) &buf);
if (err != NPERR_NO_ERROR)
return false;
- m_description = buf;
+ m_description = String::fromUTF8(buf);
determineModuleVersionFromDescription();
- String mimeDescription = gm();
- setMIMEDescription(mimeDescription);
+ setMIMEDescription(String::fromUTF8(gm()));
m_infoIsFromCache = false;
return true;
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,3 +1,16 @@
+2012-02-20 Martin Robinson <mrobin...@igalia.com>
+
+ [UNIX] Plugin information fields are not interpreted as UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=78635
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Interpret plugin metadata as UTF8 aways. This matches the behavior
+ of Chromium and the Totem plugin.
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ (WebKit::NetscapePluginModule::getPluginInfoForLoadedPlugin): Use String::fromUTF8.
+
2012-02-20 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Adding SOUP_TYPE_PROXY_RESOLVER_DEFAULT feature to soup session makes WebProcess to hang
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-02-21 02:45:18 UTC (rev 108285)
@@ -137,14 +137,14 @@
char* buffer;
NPError error = NPP_GetValue(0, NPPVpluginNameString, &buffer);
if (error == NPERR_NO_ERROR)
- plugin.info.name = buffer;
+ plugin.info.name = String::fromUTF8(buffer);
error = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
if (error == NPERR_NO_ERROR)
- plugin.info.desc = buffer;
+ plugin.info.desc = String::fromUTF8(buffer);
- const char* mimeDescription = NP_GetMIMEDescription();
- if (!mimeDescription)
+ String mimeDescription = String::fromUTF8(NP_GetMIMEDescription());
+ if (mimeDescription.isNull())
return false;
setMIMEDescription(mimeDescription, plugin);
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-02-21 02:45:18 UTC (rev 108285)
@@ -1,5 +1,18 @@
2012-02-20 Martin Robinson <mrobin...@igalia.com>
+ [UNIX] Plugin information fields are not interpreted as UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=78635
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Interpret plugin metadata as UTF8 aways. This matches the behavior
+ of Chromium and the Totem plugin.
+
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (NPP_GetValue): Include a UTF-8 character in the description string for testing purposes.
+
+2012-02-20 Martin Robinson <mrobin...@igalia.com>
+
Fix WebKit2GTK+ for 'make distcheck'.
Instead of conditionally including WebKit2 GNUmakefiles, always
Modified: releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (108284 => 108285)
--- releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2012-02-21 02:39:15 UTC (rev 108284)
+++ releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2012-02-21 02:45:18 UTC (rev 108285)
@@ -773,7 +773,7 @@
return NPERR_NO_ERROR;
}
if (variable == NPPVpluginDescriptionString) {
- *((char **)value) = const_cast<char*>("Simple Netscape plug-in that handles test content for WebKit");
+ *((char **)value) = const_cast<char*>("Simple Netscape® plug-in that handles test content for WebKit");
return NPERR_NO_ERROR;
}
if (variable == NPPVpluginNeedsXEmbed) {
