[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 f685c6d765054fe82c5aa38edf28ff111dce91a3
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 21:29:27 2010 +0000

    REGRESSION (r66711): Plug-in replacement text is never shown
    https://bugs.webkit.org/show_bug.cgi?id=45997
    <rdar://problem/8446766>
    
    Reviewed by Sam Weinig.
    
    Don't return when the plug-in has replacement text.
    
    * rendering/RenderEmbeddedObject.cpp:
    (WebCore::RenderEmbeddedObject::paintReplaced):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ec7fa2..118737d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-17  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        REGRESSION (r66711): Plug-in replacement text is never shown
+        https://bugs.webkit.org/show_bug.cgi?id=45997
+        <rdar://problem/8446766>
+
+        Don't return when the plug-in has replacement text.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::paintReplaced):
+
 2010-09-17  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         Unreviewed, build fix. Add files missed in r67704.
diff --git a/WebCore/rendering/RenderEmbeddedObject.cpp b/WebCore/rendering/RenderEmbeddedObject.cpp
index d08174d..86fdae8 100644
--- a/WebCore/rendering/RenderEmbeddedObject.cpp
+++ b/WebCore/rendering/RenderEmbeddedObject.cpp
@@ -141,7 +141,7 @@ void RenderEmbeddedObject::paint(PaintInfo& paintInfo, int tx, int ty)
 
 void RenderEmbeddedObject::paintReplaced(PaintInfo& paintInfo, int tx, int ty)
 {
-    if (pluginCrashedOrWasMissing())
+    if (!pluginCrashedOrWasMissing())
         return;
 
     if (paintInfo.phase == PaintPhaseSelection)

-- 
WebKit Debian packaging