[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 00:32:47 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit bf2acdbfaef2752d672440e6edb63d1da1f65361
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 17:19:53 2009 +0000

    Rubber-stamped by Simon Hausmann.
    
    [Qt] TouchEvent related tests have platform dependent results until all platform implement it.
    
    * platform/qt/fast/dom/Window/window-properties-expected.txt: TouchEvent related output added.
    * platform/qt/fast/dom/prototype-inheritance-expected.txt: TouchEvent related output added.
    * platform/qt/fast/dom/prototype-inheritance.html: Removed. (added by mistake previously)
    * platform/qt/fast/js/global-constructors-expected.txt: TouchEvent related output added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bd4f68b..218b9d8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-11  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        [Qt] TouchEvent related tests have platform dependent results until all platform implement it.
+
+        * platform/qt/fast/dom/Window/window-properties-expected.txt: TouchEvent related output added.
+        * platform/qt/fast/dom/prototype-inheritance-expected.txt: TouchEvent related output added.
+        * platform/qt/fast/dom/prototype-inheritance.html: Removed. (added by mistake previously)
+        * platform/qt/fast/js/global-constructors-expected.txt: TouchEvent related output added.
+
 2009-12-11  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Fixed typo in test result.
diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
index 3bc67c9..43c597f 100644
--- a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
@@ -1557,6 +1557,8 @@ window.TextEvent [object TextEventConstructor]
 window.TextEvent.prototype [printed above as window.Event.prototype]
 window.TextMetrics [object TextMetricsConstructor]
 window.TextMetrics.prototype [object TextMetricsPrototype]
+window.TouchEvent [object TouchEventConstructor]
+window.TouchEvent.prototype [printed above as window.Event.prototype]
 window.TypeError [function]
 window.UIEvent [object UIEventConstructor]
 window.UIEvent.prototype [printed above as window.Event.prototype]
diff --git a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-expected.txt b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-expected.txt
index 916cd7f..854fcfb 100644
--- a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-expected.txt
@@ -335,6 +335,8 @@ PASS inner.TextEvent.isInner is true
 PASS inner.TextEvent.constructor.isInner is true
 PASS inner.TextMetrics.isInner is true
 PASS inner.TextMetrics.constructor.isInner is true
+PASS inner.TouchEvent.isInner is true
+PASS inner.TouchEvent.constructor.isInner is true
 PASS inner.TypeError.isInner is true
 PASS inner.TypeError.constructor.isInner is true
 PASS inner.UIEvent.isInner is true
diff --git a/LayoutTests/platform/qt/fast/dom/prototype-inheritance.html b/LayoutTests/platform/qt/fast/dom/prototype-inheritance.html
deleted file mode 100644
index d8650df..0000000
--- a/LayoutTests/platform/qt/fast/dom/prototype-inheritance.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/prototype-inheritance.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
index c043492..d2cbdf8 100644
--- a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
@@ -164,6 +164,7 @@ PASS StyleSheetList.toString() is '[object StyleSheetListConstructor]'
 PASS Text.toString() is '[object TextConstructor]'
 PASS TextEvent.toString() is '[object TextEventConstructor]'
 PASS TextMetrics.toString() is '[object TextMetricsConstructor]'
+PASS TouchEvent.toString() is '[object TouchEventConstructor]'
 PASS UIEvent.toString() is '[object UIEventConstructor]'
 PASS WebKitAnimationEvent.toString() is '[object WebKitAnimationEventConstructor]'
 PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'

-- 
WebKit Debian packaging

