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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9f616a8b648442e85bb60be6b18ac0146f93f79d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 05:54:45 2010 +0000

    2010-01-07  Afonso R. Costa Jr.  <afonso.costa at openbossa.org>
    
            Reviewed by Darin Adler.
    
            As the bug https://bugs.webkit.org/show_bug.cgi?id=30034 is fixed,
            the zoomOrNot argument is unnecessary.
    
            * fast/dom/elementFromPoint-relative-to-viewport.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8ef549f..ae3fc81 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-07  Afonso R. Costa Jr.  <afonso.costa at openbossa.org>
+
+        Reviewed by Darin Adler.
+
+        As the bug https://bugs.webkit.org/show_bug.cgi?id=30034 is fixed,
+        the zoomOrNot argument is unnecessary.
+
+        * fast/dom/elementFromPoint-relative-to-viewport.html:
+
 2010-01-07  Stephanie Lewis  <slewis at apple.com>
 
         Rollout http://trac.webkit.org/changeset/52756 due to a large performance regression.
diff --git a/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html b/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html
index bb61725..46d53bf 100644
--- a/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html
+++ b/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html
@@ -39,7 +39,7 @@
 
     description('This test document.elementFromPoint is evaluated in with respect to the viewport, not the document.');
 
-    function testElement(element, label, offsetX, offsetY, zoomOrNot) {
+    function testElement(element, label, offsetX, offsetY) {
         for (var i = 0; i < 25; ++i) {
             var item = document.createElement("div");
             item.className = "testItem";
@@ -81,25 +81,19 @@
 
         shouldBe(unscrolledBox, "'0'");
         shouldBe(scrolledDownBox, "'5'");
-        if (zoomOrNot == "zoom") {
-            shouldBe(scrolledRightBox, "'3'");
-            shouldBe(scrolledDownAndRightBox, "'8'");
-        } else {
-            shouldBe(scrolledRightBox, "'3'");
-            shouldBe(scrolledDownAndRightBox, "'8'");
-        }
+        shouldBe(scrolledRightBox, "'3'");
+        shouldBe(scrolledDownAndRightBox, "'8'");
     }
 
     var elementInitial = document.getElementById('test-initial');
     var elementOffscreen = document.getElementById('test-offscreen');
     var offset = elementInitial.getBoundingClientRect();
-    testElement(elementInitial, "Initial", offset.left, offset.top, "none");
-    testElement(elementOffscreen, "Offscreen", offset.left, offset.top + 1100, "none");
-    
+    testElement(elementInitial, "Initial", offset.left, offset.top);
+    testElement(elementOffscreen, "Offscreen", offset.left, offset.top + 1100);
+
     eventSender.zoomPageOut();
-    testElement(elementInitial, "Initial", offset.left, offset.top, "zoom");
-    
-    
+    testElement(elementInitial, "Initial", offset.left, offset.top);
+
     if (window.layoutTestController) {
         var area = document.getElementById('testArea');
         area.parentNode.removeChild(area);

-- 
WebKit Debian packaging