Title: [143132] trunk
- Revision
- 143132
- Author
- ch.du...@sisa.samsung.com
- Date
- 2013-02-17 10:59:45 -0800 (Sun, 17 Feb 2013)
Log Message
Regression(r143124): Caused plugins/plugin-_javascript_-access.html to fail
https://bugs.webkit.org/show_bug.cgi?id=110053
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
Clear m_plugins in loadPluginsIfNecessary() before populating the
vector again. We get duplicates otherwise.
* UIProcess/Plugins/PluginInfoStore.cpp:
(WebKit::PluginInfoStore::loadPluginsIfNecessary):
LayoutTests:
Unskip plugins/plugin-_javascript_-access.html for WK2 EFL now that the
Test is passing again.
* platform/efl-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (143131 => 143132)
--- trunk/LayoutTests/ChangeLog 2013-02-17 18:53:04 UTC (rev 143131)
+++ trunk/LayoutTests/ChangeLog 2013-02-17 18:59:45 UTC (rev 143132)
@@ -1,5 +1,17 @@
2013-02-17 Christophe Dumez <ch.du...@sisa.samsung.com>
+ Regression(r143124): Caused plugins/plugin-_javascript_-access.html to fail
+ https://bugs.webkit.org/show_bug.cgi?id=110053
+
+ Reviewed by Alexey Proskuryakov.
+
+ Unskip plugins/plugin-_javascript_-access.html for WK2 EFL now that the
+ Test is passing again.
+
+ * platform/efl-wk2/TestExpectations:
+
+2013-02-17 Christophe Dumez <ch.du...@sisa.samsung.com>
+
Unreviewed. Remove duplicates from EFL port's TestExpectations.
* platform/efl-wk2/TestExpectations:
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (143131 => 143132)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-02-17 18:53:04 UTC (rev 143131)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-02-17 18:59:45 UTC (rev 143132)
@@ -495,9 +495,6 @@
webkit.org/b/106407 http/tests/xmlhttprequest/failed-auth.html [ Failure ]
webkit.org/b/106407 http/tests/xmlhttprequest/remember-bad-password.html [ Failure ]
-# Regression(r143124): Caused plugins/plugin-_javascript_-access.html to fail.
-webkit.org/b/110053 plugins/plugin-_javascript_-access.html [ Failure ]
-
# Most probably failures are result of delay in scrolling caused by 'delegated scrolling' usage.
webkit.org/b/107286 fast/css/sticky/sticky-margins.html [ ImageOnlyFailure ]
webkit.org/b/107286 fast/css/sticky/sticky-writing-mode-vertical-lr.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebKit2/ChangeLog (143131 => 143132)
--- trunk/Source/WebKit2/ChangeLog 2013-02-17 18:53:04 UTC (rev 143131)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-17 18:59:45 UTC (rev 143132)
@@ -1,3 +1,16 @@
+2013-02-17 Christophe Dumez <ch.du...@sisa.samsung.com>
+
+ Regression(r143124): Caused plugins/plugin-_javascript_-access.html to fail
+ https://bugs.webkit.org/show_bug.cgi?id=110053
+
+ Reviewed by Alexey Proskuryakov.
+
+ Clear m_plugins in loadPluginsIfNecessary() before populating the
+ vector again. We get duplicates otherwise.
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::loadPluginsIfNecessary):
+
2013-02-16 Andreas Kling <akl...@apple.com>
Remove multi-threading gunk from PluginInfoStore.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (143131 => 143132)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-02-17 18:53:04 UTC (rev 143131)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-02-17 18:59:45 UTC (rev 143132)
@@ -90,6 +90,8 @@
// Then load plug-ins that are not in the standard plug-ins directories.
addFromVector(uniquePluginPaths, individualPluginPaths());
+ m_plugins.clear();
+
PathHashSet::const_iterator end = uniquePluginPaths.end();
for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)
loadPlugin(m_plugins, *it);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
