Title: [135845] trunk/Source/WebKit2
- Revision
- 135845
- Author
- [email protected]
- Date
- 2012-11-27 03:41:46 -0800 (Tue, 27 Nov 2012)
Log Message
[X11] Allow empty plugin name and description during scan plugin
https://bugs.webkit.org/show_bug.cgi?id=103234
Patch by KwangYong Choi <[email protected]> on 2012-11-27
Reviewed by Simon Hausmann.
Empty entries should be allowed when split the output string of scan plugin
because the plugin name and the description can be empty string.
* UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135844 => 135845)
--- trunk/Source/WebKit2/ChangeLog 2012-11-27 11:31:45 UTC (rev 135844)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-27 11:41:46 UTC (rev 135845)
@@ -1,3 +1,18 @@
+2012-11-27 KwangYong Choi <[email protected]>
+
+ [X11] Allow empty plugin name and description during scan plugin
+ https://bugs.webkit.org/show_bug.cgi?id=103234
+
+ Reviewed by Simon Hausmann.
+
+ Empty entries should be allowed when split the output string of scan plugin
+ because the plugin name and the description can be empty string.
+
+ * UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+
2012-11-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r135819.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp (135844 => 135845)
--- trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2012-11-27 11:31:45 UTC (rev 135844)
+++ trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2012-11-27 11:41:46 UTC (rev 135845)
@@ -207,7 +207,7 @@
String output(reinterpret_cast<const UChar*>(outputBytes.constData()), outputBytes.size() / sizeof(UChar));
Vector<String> lines;
- output.split(UChar('\n'), lines);
+ output.split(UChar('\n'), true, lines);
ASSERT(lines.size() == 3);
result.name.swap(lines[0]);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (135844 => 135845)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-11-27 11:31:45 UTC (rev 135844)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-11-27 11:41:46 UTC (rev 135845)
@@ -96,7 +96,7 @@
free(stdOut);
Vector<String> lines;
- stdOutString.split(UChar('\n'), lines);
+ stdOutString.split(UChar('\n'), true, lines);
if (lines.size() < 3)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
