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

Wed Dec 22 14:27:08 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 3ee7307ada05b2e13def5d96b870902e947ddc12
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 23:12:42 2010 +0000

    2010-10-08  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed, rolling out r69360.
            http://trac.webkit.org/changeset/69360
            https://bugs.webkit.org/show_bug.cgi?id=46921
    
            Test still crashing on chromium test_shell
    
            * html/HTMLObjectElement.cpp:
            (WebCore::HTMLObjectElement::renderFallbackContent):
    2010-10-08  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed, rolling out r69360.
            http://trac.webkit.org/changeset/69360
            https://bugs.webkit.org/show_bug.cgi?id=46921
    
            Testcase still crashing on chromium test_shell
    
            * fast/html/object-image-nested-fallback-expected.txt: Removed.
            * fast/html/object-image-nested-fallback.html: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1fae294..54c2bf4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-08  Abhishek Arya  <inferno at chromium.org>
+
+        Unreviewed, rolling out r69360.
+        http://trac.webkit.org/changeset/69360
+        https://bugs.webkit.org/show_bug.cgi?id=46921
+
+        Testcase still crashing on chromium test_shell
+
+        * fast/html/object-image-nested-fallback-expected.txt: Removed.
+        * fast/html/object-image-nested-fallback.html: Removed.
+
 2010-10-08  Albert J. Wong  <ajwong at chromium.org>
 
         [Unreviewed] Chromium build fix.
diff --git a/LayoutTests/fast/html/object-image-nested-fallback-expected.txt b/LayoutTests/fast/html/object-image-nested-fallback-expected.txt
deleted file mode 100644
index c5735f2..0000000
--- a/LayoutTests/fast/html/object-image-nested-fallback-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-PASS when no crash occurs.
diff --git a/LayoutTests/fast/html/object-image-nested-fallback.html b/LayoutTests/fast/html/object-image-nested-fallback.html
deleted file mode 100644
index 78f0225..0000000
--- a/LayoutTests/fast/html/object-image-nested-fallback.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-    <script>
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
-    </script>
-    <body> 
-        <object type="image/png" data="this.object.does.not.exist.dtd">
-            <object type="image/png" data="this.object.does.not.exist.dtd">
-                <object type="image/png" data="this.object.does.not.exist.dtd">PASS when no crash occurs.</object>
-            </object>
-        </object>
-    </body>
-</html>
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 1442740..bfaa810 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -4210,9 +4210,6 @@ fast/text/international/bidi-menulist.html
 fast/text/international/wrap-CJK-001.html
 fast/xpath/string-value.html
 
-# http://bugs.webkit.org/show_bug.cgi?id=47388
-fast/html/object-image-nested-fallback.html
-
 # ============================================================================= #
 # failing fonts tests
 # ============================================================================= #
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bfae7f8..996fb18 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-08  Abhishek Arya  <inferno at chromium.org>
+
+        Unreviewed, rolling out r69360.
+        http://trac.webkit.org/changeset/69360
+        https://bugs.webkit.org/show_bug.cgi?id=46921
+
+        Test still crashing on chromium test_shell
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::renderFallbackContent):
+
 2010-10-08  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r68574.
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index 6c1d8e8..e303b52 100644
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -363,11 +363,10 @@ void HTMLObjectElement::renderFallbackContent()
     if (m_imageLoader && m_imageLoader->image()) {
         m_serviceType = m_imageLoader->image()->response().mimeType();
         if (!isImageType()) {
+            // If we don't think we have an image type anymore, then ditch the image loader.
+            m_imageLoader.clear();        
             detach();
             attach();
-
-            // If we don't think we have an image type anymore, then ditch the image loader.
-            m_imageLoader.clear();
             return;
         }
     }

-- 
WebKit Debian packaging

