[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2229da06c7cfa48a8cf8d606b574889a6734bd6e
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 d9c52b3..d52626e 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-08-12  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Dimitri Glazkov.
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 2e38ac5..977e9ee 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-08-12  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 434d295..5f461e0 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -427,7 +427,10 @@ void Page::refreshPlugins(bool reload)
         Page* page = *it;
         
         // Clear out the page's plug-in data.
-        page->m_pluginData = 0;
+        if (page->m_pluginData) {
+            page->m_pluginData->disconnectPage();
+            page->m_pluginData = 0;
+        }
 
         if (!reload)
             continue;

-- 
WebKit Debian packaging