Changeset 143132 in webkit

Timestamp:

Feb 17, 2013 10:59:45 AM (11 years ago)

Author:

Christophe Dumez

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-17  Christophe Dumez  <ch.dumez@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.dumez@sisa.samsung.com>
 

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -496 +496 @@
 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 ]

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-17  Christophe Dumez  <ch.dumez@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  <akling@apple.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -91 +91 @@
     addFromVector(uniquePluginPaths, individualPluginPaths());
 
+    m_plugins.clear();
+
     PathHashSet::const_iterator end = uniquePluginPaths.end();
     for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)