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

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4e184684d8c05e3015b6d71a30e809831916e54f
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 06:48:15 2010 +0000

    2010-08-26  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Needs DRT queueLoadHTMLString and setDeferMainResourceLoad-implementations
            https://bugs.webkit.org/show_bug.cgi?id=42152
    
            * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
            (LoadHTMLStringItem::invoke): Implementation using
            webkit_web_frame_load_string().
    
    LayoutTests:
    
            Reviewed by Martin Robinson.
    
            [GTK] Needs DRT queueLoadHTMLString and setDeferMainResourceLoad-implementations
            https://bugs.webkit.org/show_bug.cgi?id=42152
    
            * platform/gtk/Skipped: Unskip now passing test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66184 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c24e573..c3c4f6e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-26  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Needs DRT queueLoadHTMLString and setDeferMainResourceLoad-implementations
+        https://bugs.webkit.org/show_bug.cgi?id=42152
+
+        * platform/gtk/Skipped: Unskip now passing test.
+
 2010-08-26  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, Chromium expectations update.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 47c63e0..7746841 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5205,10 +5205,6 @@ fast/forms/textarea-appearance-wrap.html
 # https://bugs.webkit.org/show_bug.cgi?id=30584
 svg/custom/font-face-not-in-document.svg
 
-# Needs DRT queueLoadHTMLString and setDeferMainResourceLoad-implementations
-# https://bugs.webkit.org/show_bug.cgi?id=42152
-fast/loader/non-deferred-substitute-load.html
-
 # Probably related to https://bugs.webkit.org/show_bug.cgi?id=27637
 http/tests/security/mixedContent/insecure-plugin-in-iframe.html
 http/tests/loading/basic-auth-resend-wrong-credentials.html 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 54af0b5..a183ff4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-26  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Needs DRT queueLoadHTMLString and setDeferMainResourceLoad-implementations
+        https://bugs.webkit.org/show_bug.cgi?id=42152
+
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
+        (LoadHTMLStringItem::invoke): Implementation using
+        webkit_web_frame_load_string().
+
 2010-08-25  Jon Honeycutt  <jhoneycutt at apple.com>
 
         <rdar://problem/8334338> run-webkit-tests sometimes hangs when using
diff --git a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
index afe81be..0f44f54 100644
--- a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
@@ -22,6 +22,7 @@
 
 #include "DumpRenderTree.h"
 
+#include <GOwnPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <webkit/webkit.h>
 #include <string.h>
@@ -58,7 +59,10 @@ bool LoadItem::invoke() const
 
 bool LoadHTMLStringItem::invoke() const
 {
-    return false;
+    GOwnPtr<gchar> content(JSStringCopyUTF8CString(m_content.get()));
+    GOwnPtr<gchar> baseURL(JSStringCopyUTF8CString(m_baseURL.get()));
+    webkit_web_frame_load_string(mainFrame, content.get(), 0, 0, baseURL.get());
+    return true;
 }
 
 bool ReloadItem::invoke() const

-- 
WebKit Debian packaging