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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 13a85a7e663b60a5cbc3adbaf520d5f0840c5b0d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 19:58:29 2010 +0000

    Plug-in views should not assume that plugins are RenderEmbeddedObjects
    https://bugs.webkit.org/show_bug.cgi?id=49196
    <rdar://problem/8638467>
    
    Reviewed by Dan Bernstein.
    
    WebKit/mac:
    
    * Plugins/Hosted/WebHostedNetscapePluginView.mm:
    (-[WebHostedNetscapePluginView pluginHostDied]):
    
    WebKit2:
    
    * WebProcess/Plugins/PluginView.cpp:
    (WebKit::PluginView::pluginProcessCrashed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b7149db..8d54870 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-08  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Plug-in views should not assume that plugins are RenderEmbeddedObjects
+        https://bugs.webkit.org/show_bug.cgi?id=49196
+        <rdar://problem/8638467>
+
+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+        (-[WebHostedNetscapePluginView pluginHostDied]):
+
 2010-11-08  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
index 63a7b6a..362dd97 100644
--- a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
@@ -380,9 +380,11 @@ extern "C" {
 
 - (void)pluginHostDied
 {
-    RenderEmbeddedObject* renderer = toRenderEmbeddedObject(_element->renderer());
-    if (renderer)
+    if (_element->renderer() && _element->renderer()->isEmbeddedObject()) {
+        // FIXME: The renderer could also be a RenderApplet, we should handle that.
+        RenderEmbeddedObject* renderer = toRenderEmbeddedObject(_element->renderer());
         renderer->setShowsCrashedPluginIndicator();
+    }
 
     _pluginLayer = nil;
     _proxy = 0;
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4d1b9ec..0c2fa36 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-11-08  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Dan Bernstein.
+
+        Plug-in views should not assume that plugins are RenderEmbeddedObjects
+        https://bugs.webkit.org/show_bug.cgi?id=49196
+        <rdar://problem/8638467>
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::pluginProcessCrashed):
+
+2010-11-08  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Adam Roben.
 
         NPN_Evaluate doesn't work with out-of-process plugins in WebKit2
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index ac3f344..0219c73 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -836,8 +836,15 @@ bool PluginView::isAcceleratedCompositingEnabled()
 
 void PluginView::pluginProcessCrashed()
 {
-    if (RenderEmbeddedObject* renderer = toRenderEmbeddedObject(m_pluginElement->renderer()))
-        renderer->setShowsCrashedPluginIndicator();
+    if (!m_pluginElement->renderer())
+        return;
+
+    // FIXME: The renderer could also be a RenderApplet, we should handle that.
+    if (!m_pluginElement->renderer()->isEmbeddedObject())
+        return;
+        
+    RenderEmbeddedObject* renderer = toRenderEmbeddedObject(m_pluginElement->renderer());
+    renderer->setShowsCrashedPluginIndicator();
     
     invalidateRect(frameRect());
 }

-- 
WebKit Debian packaging