[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:22:40 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 985399f98e508ddfe4eb07d21895081657086bf4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 04:07:07 2010 +0000

    2010-01-20  Michael Nordman  <michaeln at google.com>
    
            Reviewed by Alexey Proskuryakov.
    
            Remove an assertion that is not valid in some detached iframes cases.
            https://bugs.webkit.org/show_bug.cgi?id=33827
    
            * http/tests/appcache/detached-iframe-expected.txt: Added.
            * http/tests/appcache/detached-iframe.html: Added.
    2010-01-20  Michael Nordman  <michaeln at google.com>
    
            Reviewed by Alexey Proskuryakov.
    
            Remove an assertion that is not valid in some detached iframes cases.
            https://bugs.webkit.org/show_bug.cgi?id=33827
    
            Test: http/tests/appcache/detached-iframe.html
    
            * loader/appcache/DOMApplicationCache.cpp:
            (WebCore::DOMApplicationCache::DOMApplicationCache):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f230799..733b5b1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-20  Michael Nordman  <michaeln at google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove an assertion that is not valid in some detached iframes cases.
+        https://bugs.webkit.org/show_bug.cgi?id=33827
+
+        * http/tests/appcache/detached-iframe-expected.txt: Added.
+        * http/tests/appcache/detached-iframe.html: Added.
+
 2010-01-20  Daniel Bates  <dbates at webkit.org>
 
         Unreviewed. Add failing test fast/css/button-height.html
diff --git a/LayoutTests/http/tests/appcache/detached-iframe-expected.txt b/LayoutTests/http/tests/appcache/detached-iframe-expected.txt
new file mode 100644
index 0000000..1290b75
--- /dev/null
+++ b/LayoutTests/http/tests/appcache/detached-iframe-expected.txt
@@ -0,0 +1,3 @@
+Test that accessing a detached iframe's applicationCache window property doesn't assert. If you don't see an assert, it passed.
+
+
diff --git a/LayoutTests/http/tests/appcache/detached-iframe.html b/LayoutTests/http/tests/appcache/detached-iframe.html
new file mode 100644
index 0000000..ce6aecf
--- /dev/null
+++ b/LayoutTests/http/tests/appcache/detached-iframe.html
@@ -0,0 +1,15 @@
+<body onload = "test()">
+<p>Test that accessing a detached iframe's applicationCache window property doesn't assert. If you don't see an assert, it passed.</p>
+<iframe src="about:blank"></iframe>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function test()
+{
+    var ifr = frames[0];
+    document.body.removeChild(document.getElementsByTagName("iframe")[0]);
+    ifr.applicationCache;
+}
+</script>
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 71e05b8..f1b56de 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-20  Michael Nordman  <michaeln at google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove an assertion that is not valid in some detached iframes cases.
+        https://bugs.webkit.org/show_bug.cgi?id=33827
+
+        Test: http/tests/appcache/detached-iframe.html
+
+        * loader/appcache/DOMApplicationCache.cpp:
+        (WebCore::DOMApplicationCache::DOMApplicationCache):
+
 2010-01-20  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/loader/appcache/DOMApplicationCache.cpp b/WebCore/loader/appcache/DOMApplicationCache.cpp
index f51402c..b9297b1 100644
--- a/WebCore/loader/appcache/DOMApplicationCache.cpp
+++ b/WebCore/loader/appcache/DOMApplicationCache.cpp
@@ -42,7 +42,6 @@ namespace WebCore {
 DOMApplicationCache::DOMApplicationCache(Frame* frame)
     : m_frame(frame)
 {
-    ASSERT(!m_frame || applicationCacheHost());
     ApplicationCacheHost* cacheHost = applicationCacheHost();
     if (cacheHost)
         cacheHost->setDOMApplicationCache(this);

-- 
WebKit Debian packaging

