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

andersca at apple.com andersca at apple.com
Wed Dec 22 18:08:10 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ac7f4d6994f0893ec3a4928df609fe925620f358
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 22:05:29 2010 +0000

    fast/loader/empty-embed-src-attribute.html asserts in debug builds
    https://bugs.webkit.org/show_bug.cgi?id=50643
    
    Reviewed by Sam Weinig.
    
    Just always ignore attempts to load requests with empty URLs.
    
    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d756c27..913e819 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-07  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        fast/loader/empty-embed-src-attribute.html asserts in debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=50643
+
+        Just always ignore attempts to load requests with empty URLs.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
 2010-12-07  Jessie Berlin  <jberlin at apple.com>
 
         Build fix. Unreviewed.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index b882d0e..97c5a04 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -619,6 +619,12 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFu
         return;
     }
 
+    // Always ignore requests with empty URLs.
+    if (request.isEmpty()) {
+        (m_frame->coreFrame()->loader()->policyChecker()->*function)(PolicyIgnore);
+        return;
+    }
+    
     WebPage* webPage = m_frame->page();
     if (!webPage)
         return;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list