Unreviewed, rolling out r94536.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Sep 2011 10:32:16 +0000 (10:32 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Sep 2011 10:32:16 +0000 (10:32 +0000)
http://trac.webkit.org/changeset/94536
https://bugs.webkit.org/show_bug.cgi?id=67836

breaks absoluteLocation() of RelatedMouseEvent (Requested by
jknotten on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-09

Source/WebCore:

* dom/MouseRelatedEvent.cpp:
(WebCore::MouseRelatedEvent::MouseRelatedEvent):

LayoutTests:

* fast/events/page-scaled-mouse-click-expected.txt: Removed.
* fast/events/page-scaled-mouse-click.html: Removed.
* fast/events/script-tests/page-scaled-mouse-click.js: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/events/page-scaled-mouse-click-expected.txt [deleted file]
LayoutTests/fast/events/page-scaled-mouse-click.html [deleted file]
LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/dom/MouseRelatedEvent.cpp

index 9d4c119..27fda42 100644 (file)
@@ -1,3 +1,16 @@
+2011-09-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94536.
+        http://trac.webkit.org/changeset/94536
+        https://bugs.webkit.org/show_bug.cgi?id=67836
+
+        breaks absoluteLocation() of RelatedMouseEvent (Requested by
+        jknotten on #webkit).
+
+        * fast/events/page-scaled-mouse-click-expected.txt: Removed.
+        * fast/events/page-scaled-mouse-click.html: Removed.
+        * fast/events/script-tests/page-scaled-mouse-click.js: Removed.
+
 2011-09-08  Alexander Pavlov  <apavlov@chromium.org>
 
         Web Inspector: live edit both for JS and CSS is not discoverable.
diff --git a/LayoutTests/fast/events/page-scaled-mouse-click-expected.txt b/LayoutTests/fast/events/page-scaled-mouse-click-expected.txt
deleted file mode 100644 (file)
index e3f1b7a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-This tests that page scaling does not affect mouse event pageX and pageY coordinates.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS eventLog is "click(10, 10)"
-PASS eventLog is "click(20, 20)"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/page-scaled-mouse-click.html b/LayoutTests/fast/events/page-scaled-mouse-click.html
deleted file mode 100644 (file)
index 0228f1b..0000000
+++ /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/page-scaled-mouse-click.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js b/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
deleted file mode 100644 (file)
index e01e516..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-description("This tests that page scaling does not affect mouse event pageX and pageY coordinates.");
-
-var div = document.createElement("div");
-div.style.width = "100px";
-div.style.height = "100px";
-div.style.backgroundColor = "blue";
-
-var eventLog = "";
-
-function appendEventLog() {
-    var msg = event.type + "(" + event.pageX + ", " + event.pageY + ")";
-
-    if (window.eventSender) {
-        eventLog += msg;
-    } else {
-        debug(msg);
-    }
-}
-
-function clearEventLog() {
-    eventLog = "";
-}
-
-div.addEventListener("click", appendEventLog, false);
-document.body.insertBefore(div, document.body.firstChild);
-
-function sendEvents(button) {
-    if (!window.eventSender) {
-        debug("This test requires DumpRenderTree.  Click on the blue rect with the left mouse button to log the mouse coordinates.")
-        return;
-    }
-    eventSender.mouseDown(button);
-    eventSender.mouseUp(button);
-}
-
-function testEvents(button, expectedString) {
-    sendEvents(button);
-    shouldBeEqualToString("eventLog", expectedString);
-    clearEventLog();
-}
-
-if (window.eventSender) {
-    eventSender.mouseMoveTo(10, 10);
-    testEvents(0, "click(10, 10)");
-
-    eventSender.scalePageBy(0.5, 0, 0);
-
-    // We are clicking in the same position on screen, but we have scaled the page out by 50%,
-    // we therefore expect the page-relative coordinates of the mouse event (pageX, pageY)
-    // to be doubled.
-    testEvents(0, "click(20, 20)");
-}
-
-var successfullyParsed = true;
index 8361b41..dc23109 100644 (file)
@@ -1,3 +1,15 @@
+2011-09-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94536.
+        http://trac.webkit.org/changeset/94536
+        https://bugs.webkit.org/show_bug.cgi?id=67836
+
+        breaks absoluteLocation() of RelatedMouseEvent (Requested by
+        jknotten on #webkit).
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::MouseRelatedEvent):
+
 2011-09-08  Alexander Pavlov  <apavlov@chromium.org>
 
         Web Inspector: live edit both for JS and CSS is not discoverable.
index 2d81935..216fe28 100644 (file)
@@ -67,7 +67,7 @@ MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubb
         if (FrameView* frameView = frame->view()) {
             scrollPosition = frameView->scrollPosition();
             adjustedPageLocation = frameView->windowToContents(windowLocation);
-            float pageZoom = frame->pageZoomFactor() * frame->pageScaleFactor();
+            float pageZoom = frame->pageZoomFactor();
             if (pageZoom != 1.0f) {
                 // Adjust our pageX and pageY to account for the page zoom.
                 adjustedPageLocation.scale(1 / pageZoom, 1 / pageZoom);