[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

hyatt at apple.com hyatt at apple.com
Thu Oct 29 20:41:56 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 5d3f3b02516f86b144399123e5339090a00f49a5
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 20:03:37 2009 +0000

    Fix failing media layout tests.  Don't make beforeload block loads of objects that aren't in the
    document, since video/audio (and images eventually too) can load when not in the document yet.
    
    Reviewed by Oliver Hunt.
    
    * dom/ContainerNode.cpp:
    (WebCore::ContainerNode::dispatchBeforeLoadEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7e5f383..15d551c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-08  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Fix failing media layout tests.  Don't make beforeload block loads of objects that aren't in the
+        document, since video/audio (and images eventually too) can load when not in the document yet.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::dispatchBeforeLoadEvent):
+
 2009-10-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/dom/ContainerNode.cpp b/WebCore/dom/ContainerNode.cpp
index 99b2c4f..9d0b0c3 100644
--- a/WebCore/dom/ContainerNode.cpp
+++ b/WebCore/dom/ContainerNode.cpp
@@ -915,7 +915,7 @@ bool ContainerNode::dispatchBeforeLoadEvent(const String& sourceURL)
     RefPtr<ContainerNode> protector(this);
     RefPtr<BeforeLoadEvent> beforeLoadEvent = BeforeLoadEvent::create(sourceURL);
     dispatchEvent(beforeLoadEvent.get());
-    return inDocument() && !beforeLoadEvent->defaultPrevented();
+    return !beforeLoadEvent->defaultPrevented();
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list