diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-07-31 13:38:05 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-01 13:06:48 (GMT) |
| commit | dfba507339b68ffc7d9c10a82f427b49692aa503 (patch) | |
| tree | 779ad1045f2eb782b08c9f330567f58a8ce17ed6 | |
| parent | ea6ec4c781d5e94425b70f9f4e45d3e50eb12299 (diff) | |
| download | Qt-dfba507339b68ffc7d9c10a82f427b49692aa503.zip Qt-dfba507339b68ffc7d9c10a82f427b49692aa503.tar.gz Qt-dfba507339b68ffc7d9c10a82f427b49692aa503.tar.bz2 | |
[Qt][WK1] navigator.plugins shows too few entries.
Backport r153517 from webkit trunk and Qt 5 to Qt 4.8.
https://bugs.webkit.org/show_bug.cgi?id=119332
Reviewed by Jocelyn Turcotte.
Based on input by Choon Sik Cho.
WebPlatformStrategies::getPluginInfo was using the
WTF::Vector::resize method wrongly.
This patch removes the call to Vector::resize as
Vector::append will take care of increasing capacity
if needed.
* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::getPluginInfo):
Task-Number: QTBUG-30141
Change-Id: Ief250ee98c4c5d2cb5165d6da3d7b43c54cbd7c8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp index 182fe38..32e6277 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp @@ -117,8 +117,6 @@ void WebPlatformStrategies::getPluginInfo(const WebCore::Page* page, Vector<WebC PluginDatabase* db = PluginDatabase::installedPlugins(); const Vector<PluginPackage*> &plugins = db->plugins(); - outPlugins.resize(plugins.size()); - for (unsigned int i = 0; i < plugins.size(); ++i) { PluginInfo info; PluginPackage* package = plugins[i]; |