[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-60-g76add97

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 4f943c3c458344480482e92937c0525ee8828eb7
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 23:18:08 2010 +0000

    2010-08-12  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dumitru Daniliuc.
    
            Clear PluginData's page pointer on page refresh
            https://bugs.webkit.org/show_bug.cgi?id=43888
    
            Test: plugins/access-after-page-destroyed.html
    
            * page/Page.cpp:
            (WebCore::Page::refreshPlugins):
    2010-08-12  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dumitru Daniliuc.
    
            Clear PluginData's page pointer on page refresh
            https://bugs.webkit.org/show_bug.cgi?id=43888
    
            * plugins/access-after-page-destroyed.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e510824..891bfb6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-12  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        Clear PluginData's page pointer on page refresh
+        https://bugs.webkit.org/show_bug.cgi?id=43888
+
+        * plugins/access-after-page-destroyed.html:
+
 2010-07-28  Justin Schuh  <jschuh at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/LayoutTests/plugins/access-after-page-destroyed.html b/LayoutTests/plugins/access-after-page-destroyed.html
index 447461d..59245b1 100644
--- a/LayoutTests/plugins/access-after-page-destroyed.html
+++ b/LayoutTests/plugins/access-after-page-destroyed.html
@@ -10,6 +10,10 @@ if (window.layoutTestController) {
 var w = open();
 var p = w.navigator.mimeTypes.item(0);
 w.close();
+w = open();
+p = w.navigator.mimeTypes.item(0);
+w.navigator.plugins.refresh();
+w.close();
 w = null;
 
 setTimeout(function(){
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07996bd..a01dd1e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-12  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        Clear PluginData's page pointer on page refresh
+        https://bugs.webkit.org/show_bug.cgi?id=43888
+
+        Test: plugins/access-after-page-destroyed.html
+
+        * page/Page.cpp:
+        (WebCore::Page::refreshPlugins):
+
 2010-07-28  Justin Schuh  <jschuh at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 228e1de..438fb37 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -373,13 +373,20 @@ void Page::refreshPlugins(bool reload)
 
     HashSet<Page*>::iterator end = allPages->end();
     for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) {
-        (*it)->m_pluginData = 0;
+        Page* page = *it;
+        
+        // Clear out the page's plug-in data.
+        if (page->m_pluginData) {
+            page->m_pluginData->disconnectPage();
+            page->m_pluginData = 0;
+        }
+
+        if (!reload)
+            continue;
 
-        if (reload) {
-            for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-                if (frame->loader()->containsPlugins())
-                    framesNeedingReload.append(frame);
-            }
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+            if (frame->loader()->containsPlugins())
+                framesNeedingReload.append(frame);
         }
     }
 

-- 
WebKit Debian packaging