[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 01d6fadc48f83e2fbfaf459d1607b58eccec5430
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 29 17:44:32 2009 +0000

    2009-12-29  Robert Hogan  <robert at roberthogan.net>
    
            Reviewed by Eric Seidel.
    
            [Qt] Fix crash on LayoutTests/fast/loader/empty-embed-src-attribute.html
    
            Related to https://bugs.webkit.org/show_bug.cgi?id=23806
    
            If an embedded document is loaded within a page and it has an empty
            URL, use a blank URL for the load request.
    
            https://bugs.webkit.org/show_bug.cgi?id=33017
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::createFrame):
    2009-12-29  Robert Hogan  <robert at roberthogan.net>
    
            Reviewed by Eric Seidel.
    
            [Qt] Fix crash on LayoutTests/fast/loader/empty-embed-src-attribute.html
    
            Related to https://bugs.webkit.org/show_bug.cgi?id=23806
    
            If an embedded document is loaded within a page and it has an empty
            URL, use a blank URL for the load request.
    
            https://bugs.webkit.org/show_bug.cgi?id=33017
    
            * platform/qt/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 004f97a..0159ab9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-29  Robert Hogan  <robert at roberthogan.net>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Fix crash on LayoutTests/fast/loader/empty-embed-src-attribute.html
+        
+        Related to https://bugs.webkit.org/show_bug.cgi?id=23806
+        
+        If an embedded document is loaded within a page and it has an empty
+        URL, use a blank URL for the load request.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=33017
+
+        * platform/qt/Skipped:
+
 2009-12-29  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index e6fb7b6..f3bf9dd 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -124,7 +124,6 @@ svg/custom/glyph-setting-d-attribute.svg
 fast/canvas/canvas-getImageData.html
 
 # ------- crashes
-fast/loader/empty-embed-src-attribute.html
 fast/text/find-hidden-text.html
 
 # ========================================================================= #
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2584445..7699218 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-29  Robert Hogan  <robert at roberthogan.net>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Fix crash on LayoutTests/fast/loader/empty-embed-src-attribute.html
+        
+        Related to https://bugs.webkit.org/show_bug.cgi?id=23806
+        
+        If an embedded document is loaded within a page and it has an empty
+        URL, use a blank URL for the load request.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=33017
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createFrame):
+
 2009-12-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Rubber-stamped by Simon Hausmann and Holger Freyther.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 1685325..760e37e 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1028,7 +1028,12 @@ PassRefPtr<Frame> FrameLoaderClientQt::createFrame(const KURL& url, const String
         return 0;
 
     QWebFrameData frameData(m_frame->page(), m_frame, ownerElement, name);
-    frameData.url = url;
+
+    if (url.isEmpty())
+        frameData.url = blankURL();
+    else
+        frameData.url = url;
+
     frameData.referrer = referrer;
     frameData.allowsScrolling = allowsScrolling;
     frameData.marginWidth = marginWidth;

-- 
WebKit Debian packaging