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

pfeldman at chromium.org pfeldman at chromium.org
Thu Oct 29 20:49:26 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 8a6f79afbf25ceefb314cc044916c96e5b97190d
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 03:37:02 2009 +0000

    2009-10-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: simple console tests do not require testing harness.
    
            https://bugs.webkit.org/show_bug.cgi?id=30478
    
            * inspector/uncaught-dom1-exception-expected.txt:
            * inspector/uncaught-dom1-exception.html:
            * inspector/uncaught-dom3-exception-expected.txt:
            * inspector/uncaught-dom3-exception.html:
            * inspector/uncaught-dom8-exception-expected.txt:
            * inspector/uncaught-dom8-exception.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 35138fb..3edb34c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-20  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: simple console tests do not require testing harness.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30478
+
+        * inspector/uncaught-dom1-exception-expected.txt:
+        * inspector/uncaught-dom1-exception.html:
+        * inspector/uncaught-dom3-exception-expected.txt:
+        * inspector/uncaught-dom3-exception.html:
+        * inspector/uncaught-dom8-exception-expected.txt:
+        * inspector/uncaught-dom8-exception.html:
+
 2009-10-20  Xan Lopez  <xlopez at igalia.com>
 
         Another batch of skipped tests with links to their bugs.
diff --git a/LayoutTests/inspector/uncaught-dom1-exception-expected.txt b/LayoutTests/inspector/uncaught-dom1-exception-expected.txt
index fb58b3d..fe8a56d 100644
--- a/LayoutTests/inspector/uncaught-dom1-exception-expected.txt
+++ b/LayoutTests/inspector/uncaught-dom1-exception-expected.txt
@@ -1,5 +1,2 @@
-CONSOLE MESSAGE: line 19: INDEX_SIZE_ERR: DOM Exception 1: Index or size was negative, or greater than the allowed value.
-ALERT: Exception timeout exceeded.
+CONSOLE MESSAGE: line 13: INDEX_SIZE_ERR: DOM Exception 1: Index or size was negative, or greater than the allowed value.
 This tests that we are getting the correct message for DOM Exception 1: INDEX_SIZE_ERR.
-
-
diff --git a/LayoutTests/inspector/uncaught-dom1-exception.html b/LayoutTests/inspector/uncaught-dom1-exception.html
index cd21b3e..05e8c9b 100644
--- a/LayoutTests/inspector/uncaught-dom1-exception.html
+++ b/LayoutTests/inspector/uncaught-dom1-exception.html
@@ -1,37 +1,25 @@
-<html>
-<head>
-<script src="evaluate-in-frontend.js"></script>
-<script>
-
-function doit()
-{
-    // Since the exception will kill execution, make a short timeout.
-    setTimeout(function() {
-        alert("Exception timeout exceeded.")
-        if (window.layoutTestController) {
-            layoutTestController.closeWebInspector();
-            layoutTestController.notifyDone();
-        }
-    }, 500);
-
-    var p = document.createTextNode();
-    p.textContent = "foo";
-    p.splitText(10000);
-}
-
-</script>
-</head>
-
-<body onload="onload()">
-<p>
-This tests that we are getting the correct message for DOM Exception 1: INDEX_SIZE_ERR.
-</p>
-
-<div id="frontend-script" style="display:none">
-</div>
-
-<div id="output">
-</div>
-
-</body>
-</html>
+<html>
+<head>
+<script>
+
+function onload()
+{
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    // Following code generates an exception.
+    var p = document.createTextNode();
+    p.textContent = "foo";
+    p.splitText(10000);
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+This tests that we are getting the correct message for DOM Exception 1: INDEX_SIZE_ERR.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/inspector/uncaught-dom3-exception-expected.txt b/LayoutTests/inspector/uncaught-dom3-exception-expected.txt
index d3a3809..287f93d 100644
--- a/LayoutTests/inspector/uncaught-dom3-exception-expected.txt
+++ b/LayoutTests/inspector/uncaught-dom3-exception-expected.txt
@@ -1,5 +1,2 @@
-CONSOLE MESSAGE: line 17: HIERARCHY_REQUEST_ERR: DOM Exception 3: A Node was inserted somewhere it doesn't belong.
-ALERT: Exception timeout exceeded.
+CONSOLE MESSAGE: line 9: HIERARCHY_REQUEST_ERR: DOM Exception 3: A Node was inserted somewhere it doesn't belong.
 This tests that we are getting the correct message for DOM Exception 3: HIERARCHY_REQUEST_ERR.
-
-
diff --git a/LayoutTests/inspector/uncaught-dom3-exception.html b/LayoutTests/inspector/uncaught-dom3-exception.html
index 3b434ea..ad4451a 100644
--- a/LayoutTests/inspector/uncaught-dom3-exception.html
+++ b/LayoutTests/inspector/uncaught-dom3-exception.html
@@ -1,35 +1,21 @@
-<html>
-<head>
-<script src="evaluate-in-frontend.js"></script>
-<script>
-
-function doit()
-{
-    // Since the exception will kill execution, make a short timeout.
-    setTimeout(function() {
-        alert("Exception timeout exceeded.")
-        if (window.layoutTestController) {
-            layoutTestController.closeWebInspector();
-            layoutTestController.notifyDone();
-        }
-    }, 500);
-
-    document.appendChild(document.createElement());
-}
-
-</script>
-</head>
-
-<body onload="onload()">
-<p>
-This tests that we are getting the correct message for DOM Exception 3: HIERARCHY_REQUEST_ERR.
-</p>
-
-<div id="frontend-script" style="display:none">
-</div>
-
-<div id="output">
-</div>
-
-</body>
-</html>
+<html>
+<head>
+<script>
+
+function onload()
+{
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+    document.appendChild(document.createElement());
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+This tests that we are getting the correct message for DOM Exception 3: HIERARCHY_REQUEST_ERR.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/inspector/uncaught-dom8-exception-expected.txt b/LayoutTests/inspector/uncaught-dom8-exception-expected.txt
index bf185ac..7f793a1 100644
--- a/LayoutTests/inspector/uncaught-dom8-exception-expected.txt
+++ b/LayoutTests/inspector/uncaught-dom8-exception-expected.txt
@@ -1,5 +1,2 @@
-CONSOLE MESSAGE: line 17: NOT_FOUND_ERR: DOM Exception 8: An attempt was made to reference a Node in a context where it does not exist.
-ALERT: Exception timeout exceeded.
+CONSOLE MESSAGE: line 9: NOT_FOUND_ERR: DOM Exception 8: An attempt was made to reference a Node in a context where it does not exist.
 This tests that we are getting the correct message for DOM Exception 8: NOT_FOUND_ERR.
-
-
diff --git a/LayoutTests/inspector/uncaught-dom8-exception.html b/LayoutTests/inspector/uncaught-dom8-exception.html
index 02046aa..dd392ad 100644
--- a/LayoutTests/inspector/uncaught-dom8-exception.html
+++ b/LayoutTests/inspector/uncaught-dom8-exception.html
@@ -1,35 +1,21 @@
-<html>
-<head>
-<script src="evaluate-in-frontend.js"></script>
-<script>
-
-function doit()
-{
-    // Since the exception will kill execution, make a short timeout.
-    setTimeout(function() {
-        alert("Exception timeout exceeded.")
-        if (window.layoutTestController) {
-            layoutTestController.closeWebInspector();
-            layoutTestController.notifyDone();
-        }
-    }, 500);
-
-    document.appendChild();
-}
-
-</script>
-</head>
-
-<body onload="onload()">
-<p>
-This tests that we are getting the correct message for DOM Exception 8: NOT_FOUND_ERR.
-</p>
-
-<div id="frontend-script" style="display:none">
-</div>
-
-<div id="output">
-</div>
-
-</body>
-</html>
+<html>
+<head>
+<script>
+
+function onload()
+{
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+    document.appendChild();
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+This tests that we are getting the correct message for DOM Exception 8: NOT_FOUND_ERR.
+</p>
+
+</body>
+</html>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list