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

[japhet at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 687aec5081bba79822c15305f809bbdfdda83cde
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 17:02:13 2009 +0000

    2009-10-14  Victor Wang  <victorw at chromium.org>
    
            Reviewed by Darin Adler.
    
            Add paste-xml test back for Win.
            The result difference between Mac and Win is due to the
            platform dependent implementation. The diff is expected
            with current implementation.
            See bug for more deails:
    
            https://bugs.webkit.org/show_bug.cgi?id=30267
    
            * platform/win/Skipped:
            * platform/win/editing/pasteboard/paste-xml-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4fa3b41..299a4dc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-14  Victor Wang  <victorw at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add paste-xml test back for Win.
+        The result difference between Mac and Win is due to the
+        platform dependent implementation. The diff is expected
+        with current implementation.
+        See bug for more deails:
+
+        https://bugs.webkit.org/show_bug.cgi?id=30267
+
+        * platform/win/Skipped:
+        * platform/win/editing/pasteboard/paste-xml-expected.txt: Added.
+
 2009-10-14  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index cdfd8c2..6c09bea 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -95,9 +95,6 @@ svg/hixie/viewbox/preserveAspectRatio/002.xml
 # ASSERT in ClipboardWin::setData <rdar://problem/5015941>
 editing/execCommand/copy-without-selection.html
 
-# <rdar://problem/6794880> editing/pasteboard/paste-xml.xhtml results didn't change on Windows after r42549
-editing/pasteboard/paste-xml.xhtml
-
 # Drag & Drop doesn't work correctly in DRT <rdar://5621244>
 editing/pasteboard/drag-image-in-about-blank-frame.html
 editing/pasteboard/get-data-text-plain-drop.html

-- 
WebKit Debian packaging