diff options
author | Balazs Kelemen <kbalazs@webkit.org> | 2013-01-14 11:02:35 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 19:07:18 +0200 |
commit | 91020e66481a874f911d145c0a665c16828d7e7b (patch) | |
tree | 70b305b92c04d3c140ce93bf08b9a309428be6b2 /Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp | |
parent | 09a0901b4be63e5f74cd0f5337e073890caebbdd (diff) | |
download | qtwebkit-91020e66481a874f911d145c0a665c16828d7e7b.tar.gz |
[Qt][WK2] plugin tests assert in debug
https://bugs.webkit.org/show_bug.cgi?id=106659
Reviewed by Benjamin Poulain.
Fixed the misuse of String::split.
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::truncateToSingleLine):
Add an assert to make sure this function works well. I just walked there
while debugging the bug, and although it was innocent, adding this assertion
is logical.
* UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
The ASSERT was wrong. We have three lines, each ends in a newline, so split
with allowEmptyEntries=true will devide it to 4 substrings.
Change-Id: I8b5f5775efe76391ac1f781620e120cd03dacdc1
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp b/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp index 8b4e3596f..cb4884d4c 100644 --- a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp +++ b/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp @@ -208,7 +208,7 @@ bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& String output(reinterpret_cast<const UChar*>(outputBytes.constData()), outputBytes.size() / sizeof(UChar)); Vector<String> lines; output.split(UChar('\n'), true, lines); - ASSERT(lines.size() == 3); + ASSERT(lines.size() == 4 && lines.last().isEmpty()); result.name.swap(lines[0]); result.description.swap(lines[1]); |