<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164081] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164081">164081</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-13 17:44:07 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/164073">r164073</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/164080">r164080</a>.
http://trac.webkit.org/changeset/164073
http://trac.webkit.org/changeset/164080
https://bugs.webkit.org/show_bug.cgi?id=128781
Broke Mac builds (Requested by rniwa on #webkit).
Patch by Commit Queue <commit-queue@webkit.org> on 2014-02-13
Tools:
* DumpRenderTree/mac/EventSendingController.mm:
(+[EventSendingController isSelectorExcludedFromWebScript:]):
(+[EventSendingController webScriptNameForSelector:]):
* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
* WebKitTestRunner/InjectedBundle/EventSendingController.h:
* WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::didReceiveMessageFromInjectedBundle):
(WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
* WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
* WebKitTestRunner/mac/EventSenderProxy.mm:
LayoutTests:
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-div.html: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-select.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEventSendingControllermm">trunk/Tools/DumpRenderTree/mac/EventSendingController.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerEventSenderProxyh">trunk/Tools/WebKitTestRunner/EventSenderProxy.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsEventSendingControlleridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllerh">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosEventSenderProxyIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnereflEventSenderProxyEflcpp">trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkEventSenderProxyGtkcpp">trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacEventSenderProxymm">trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/mac/fast/scrolling/</li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivwithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivwithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectwithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectwithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselecthtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/ChangeLog 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2014-02-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r164073 and r164080.
+ http://trac.webkit.org/changeset/164073
+ http://trac.webkit.org/changeset/164080
+ https://bugs.webkit.org/show_bug.cgi?id=128781
+
+ Broke Mac builds (Requested by rniwa on #webkit).
+
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html: Removed.
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html: Removed.
+ * platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-div-latched-div.html: Removed.
+ * platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-div-latched-mainframe.html: Removed.
+ * platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html: Removed.
+ * platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html: Removed.
+ * platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-select-latched-mainframe.html: Removed.
+ * platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt: Removed.
+ * platform/mac/fast/scrolling/scroll-select-latched-select.html: Removed.
+
</ins><span class="cx"> 2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> text-decoration-skip: ink skips randomly when using SVG fonts
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Region
-
-Count DATA Rev Count
-TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
-1 0.1100 40
-2 0.1155 39
-3 0.2200 38
-4 0.2255 37
-5 0.3300 36
-6 0.3355 35
-7 0.4400 34
-8 0.4455 33
-9 0.5500 32
-10 0.5555 31
-11 0.6600 30
-12 0.6655 29
-13 0.7700 28
-14 0.7755 27
-15 0.8800 26
-16 0.8855 25
-17 0.9900 24
-18 0.9955 23
-19 0.9999 22
-20 1.0000 21
-21 1.0000 20
-22 0.9999 19
-23 0.9955 18
-24 0.9900 17
-25 0.8855 16
-26 0.8800 15
-27 0.7755 14
-28 0.7700 13
-29 0.6655 12
-30 0.6600 11
-31 0.5555 10
-32 0.5500 9
-33 0.4455 8
-34 0.4400 7
-35 0.3355 6
-36 0.3300 5
-37 0.2255 4
-38 0.2200 3
-39 0.1155 2
-40 0.1100 1
-END END END END END END END END END END END END END END END
-Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 485
-Mouse moved to (28, 610)
-Page before: 0, div before: 451
-Page after: 0, div after: 451
-PASS Page did not receive wheel events.
-(GraphicsLayer
- (bounds 2008.00 2326.00)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivwithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Region
-
-Count DATA Rev Count
-TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
-1 0.1100 40
-2 0.1155 39
-3 0.2200 38
-4 0.2255 37
-5 0.3300 36
-6 0.3355 35
-7 0.4400 34
-8 0.4455 33
-9 0.5500 32
-10 0.5555 31
-11 0.6600 30
-12 0.6655 29
-13 0.7700 28
-14 0.7755 27
-15 0.8800 26
-16 0.8855 25
-17 0.9900 24
-18 0.9955 23
-19 0.9999 22
-20 1.0000 21
-21 1.0000 20
-22 0.9999 19
-23 0.9955 18
-24 0.9900 17
-25 0.8855 16
-26 0.8800 15
-27 0.7755 14
-28 0.7700 13
-29 0.6655 12
-30 0.6600 11
-31 0.5555 10
-32 0.5500 9
-33 0.4455 8
-34 0.4400 7
-35 0.3355 6
-36 0.3300 5
-37 0.2255 4
-38 0.2200 3
-39 0.1155 2
-40 0.1100 1
-END END END END END END END END END END END END END END END
-Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 485
-Mouse moved to (28, 610)
-Page before: 0, div before: 451
-Page after: 0, div after: 451
-PASS Page did not receive wheel events.
-Document was initial target for 0 of the wheel events.
-(GraphicsLayer
- (bounds 2008.00 2341.00)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2341.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivwithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,182 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The div should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var divScrollPositionAfter = divTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- divTarget = document.getElementById('target');
- divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
-
- divScrollPositionBefore = divTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = divTarget.offsetLeft + 20;
- debug("div display height = " + divTarget.clientHeight);
- var startPosY = divTarget.offsetTop + divTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the div.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Region</h3>
- <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
- <table class="table" style='width: 99%'>
- <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
- <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
- <tr><td>1</td><td>0.1100</td><td>40</td></tr>
- <tr><td>2</td><td>0.1155</td><td>39</td></tr>
- <tr><td>3</td><td>0.2200</td><td>38</td></tr>
- <tr><td>4</td><td>0.2255</td><td>37</td></tr>
- <tr><td>5</td><td>0.3300</td><td>36</td></tr>
- <tr><td>6</td><td>0.3355</td><td>35</td></tr>
- <tr><td>7</td><td>0.4400</td><td>34</td></tr>
- <tr><td>8</td><td>0.4455</td><td>33</td></tr>
- <tr><td>9</td><td>0.5500</td><td>32</td></tr>
- <tr><td>10</td><td>0.5555</td><td>31</td></tr>
- <tr><td>11</td><td>0.6600</td><td>30</td></tr>
- <tr><td>12</td><td>0.6655</td><td>29</td></tr>
- <tr><td>13</td><td>0.7700</td><td>28</td></tr>
- <tr><td>14</td><td>0.7755</td><td>27</td></tr>
- <tr><td>15</td><td>0.8800</td><td>26</td></tr>
- <tr><td>16</td><td>0.8855</td><td>25</td></tr>
- <tr><td>17</td><td>0.9900</td><td>24</td></tr>
- <tr><td>18</td><td>0.9955</td><td>23</td></tr>
- <tr><td>19</td><td>0.9999</td><td>22</td></tr>
- <tr><td>20</td><td>1.0000</td><td>21</td></tr>
- <tr><td>21</td><td>1.0000</td><td>20</td></tr>
- <tr><td>22</td><td>0.9999</td><td>19</td></tr>
- <tr><td>23</td><td>0.9955</td><td>18</td></tr>
- <tr><td>24</td><td>0.9900</td><td>17</td></tr>
- <tr><td>25</td><td>0.8855</td><td>16</td></tr>
- <tr><td>26</td><td>0.8800</td><td>15</td></tr>
- <tr><td>27</td><td>0.7755</td><td>14</td></tr>
- <tr><td>28</td><td>0.7700</td><td>13</td></tr>
- <tr><td>29</td><td>0.6655</td><td>12</td></tr>
- <tr><td>30</td><td>0.6600</td><td>11</td></tr>
- <tr><td>31</td><td>0.5555</td><td>10</td></tr>
- <tr><td>32</td><td>0.5500</td><td>9</td></tr>
- <tr><td>33</td><td>0.4455</td><td>8</td></tr>
- <tr><td>34</td><td>0.4400</td><td>7</td></tr>
- <tr><td>35</td><td>0.3355</td><td>6</td></tr>
- <tr><td>36</td><td>0.3300</td><td>5</td></tr>
- <tr><td>37</td><td>0.2255</td><td>4</td></tr>
- <tr><td>38</td><td>0.2200</td><td>3</td></tr>
- <tr><td>39</td><td>0.1155</td><td>2</td></tr>
- <tr><td>40</td><td>0.1100</td><td>1</td></tr>
- <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
- </table>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatcheddivhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,174 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The div should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var divScrollPositionAfter = divTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- divTarget = document.getElementById('target');
- divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
-
- divScrollPositionBefore = divTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = divTarget.offsetLeft + 20;
- debug("div display height = " + divTarget.clientHeight);
- var startPosY = divTarget.offsetTop + divTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the div.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Region</h3>
- <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
- <table class="table" style='width: 99%'>
- <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
- <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
- <tr><td>1</td><td>0.1100</td><td>40</td></tr>
- <tr><td>2</td><td>0.1155</td><td>39</td></tr>
- <tr><td>3</td><td>0.2200</td><td>38</td></tr>
- <tr><td>4</td><td>0.2255</td><td>37</td></tr>
- <tr><td>5</td><td>0.3300</td><td>36</td></tr>
- <tr><td>6</td><td>0.3355</td><td>35</td></tr>
- <tr><td>7</td><td>0.4400</td><td>34</td></tr>
- <tr><td>8</td><td>0.4455</td><td>33</td></tr>
- <tr><td>9</td><td>0.5500</td><td>32</td></tr>
- <tr><td>10</td><td>0.5555</td><td>31</td></tr>
- <tr><td>11</td><td>0.6600</td><td>30</td></tr>
- <tr><td>12</td><td>0.6655</td><td>29</td></tr>
- <tr><td>13</td><td>0.7700</td><td>28</td></tr>
- <tr><td>14</td><td>0.7755</td><td>27</td></tr>
- <tr><td>15</td><td>0.8800</td><td>26</td></tr>
- <tr><td>16</td><td>0.8855</td><td>25</td></tr>
- <tr><td>17</td><td>0.9900</td><td>24</td></tr>
- <tr><td>18</td><td>0.9955</td><td>23</td></tr>
- <tr><td>19</td><td>0.9999</td><td>22</td></tr>
- <tr><td>20</td><td>1.0000</td><td>21</td></tr>
- <tr><td>21</td><td>1.0000</td><td>20</td></tr>
- <tr><td>22</td><td>0.9999</td><td>19</td></tr>
- <tr><td>23</td><td>0.9955</td><td>18</td></tr>
- <tr><td>24</td><td>0.9900</td><td>17</td></tr>
- <tr><td>25</td><td>0.8855</td><td>16</td></tr>
- <tr><td>26</td><td>0.8800</td><td>15</td></tr>
- <tr><td>27</td><td>0.7755</td><td>14</td></tr>
- <tr><td>28</td><td>0.7700</td><td>13</td></tr>
- <tr><td>29</td><td>0.6655</td><td>12</td></tr>
- <tr><td>30</td><td>0.6600</td><td>11</td></tr>
- <tr><td>31</td><td>0.5555</td><td>10</td></tr>
- <tr><td>32</td><td>0.5500</td><td>9</td></tr>
- <tr><td>33</td><td>0.4455</td><td>8</td></tr>
- <tr><td>34</td><td>0.4400</td><td>7</td></tr>
- <tr><td>35</td><td>0.3355</td><td>6</td></tr>
- <tr><td>36</td><td>0.3300</td><td>5</td></tr>
- <tr><td>37</td><td>0.2255</td><td>4</td></tr>
- <tr><td>38</td><td>0.2200</td><td>3</td></tr>
- <tr><td>39</td><td>0.1155</td><td>2</td></tr>
- <tr><td>40</td><td>0.1100</td><td>1</td></tr>
- <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
- </table>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Region
-
-Count DATA Rev Count
-TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
-1 0.1100 40
-2 0.1155 39
-3 0.2200 38
-4 0.2255 37
-5 0.3300 36
-6 0.3355 35
-7 0.4400 34
-8 0.4455 33
-9 0.5500 32
-10 0.5555 31
-11 0.6600 30
-12 0.6655 29
-13 0.7700 28
-14 0.7755 27
-15 0.8800 26
-16 0.8855 25
-17 0.9900 24
-18 0.9955 23
-19 0.9999 22
-20 1.0000 21
-21 1.0000 20
-22 0.9999 19
-23 0.9955 18
-24 0.9900 17
-25 0.8855 16
-26 0.8800 15
-27 0.7755 14
-28 0.7700 13
-29 0.6655 12
-30 0.6600 11
-31 0.5555 10
-32 0.5500 9
-33 0.4455 8
-34 0.4400 7
-35 0.3355 6
-36 0.3300 5
-37 0.2255 4
-38 0.2200 3
-39 0.1155 2
-40 0.1100 1
-END END END END END END END END END END END END END END END
-Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after: 280, div after: 0
-PASS Scrollable div did not receive wheel events.
-(GraphicsLayer
- (bounds 2008.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2311.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframewithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Region
-
-Count DATA Rev Count
-TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
-1 0.1100 40
-2 0.1155 39
-3 0.2200 38
-4 0.2255 37
-5 0.3300 36
-6 0.3355 35
-7 0.4400 34
-8 0.4455 33
-9 0.5500 32
-10 0.5555 31
-11 0.6600 30
-12 0.6655 29
-13 0.7700 28
-14 0.7755 27
-15 0.8800 26
-16 0.8855 25
-17 0.9900 24
-18 0.9955 23
-19 0.9999 22
-20 1.0000 21
-21 1.0000 20
-22 0.9999 19
-23 0.9955 18
-24 0.9900 17
-25 0.8855 16
-26 0.8800 15
-27 0.7755 14
-28 0.7700 13
-29 0.6655 12
-30 0.6600 11
-31 0.5555 10
-32 0.5500 9
-33 0.4455 8
-34 0.4400 7
-35 0.3355 6
-36 0.3300 5
-37 0.2255 4
-38 0.2200 3
-39 0.1155 2
-40 0.1100 1
-END END END END END END END END END END END END END END END
-Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after: 280, div after: 0
-PASS Scrollable div did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
- (bounds 2008.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframewithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,180 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The div should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var divScrollPositionAfter = divTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
- if (divScrollPositionBefore != divScrollPositionAfter)
- testFailed("Scrollable div consumed wheel events.");
- else
- testPassed("Scrollable div did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- divTarget = document.getElementById('target');
-
- divScrollPositionBefore = divTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the div.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Region</h3>
- <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
- <table class="table" style='width: 99%'>
- <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
- <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
- <tr><td>1</td><td>0.1100</td><td>40</td></tr>
- <tr><td>2</td><td>0.1155</td><td>39</td></tr>
- <tr><td>3</td><td>0.2200</td><td>38</td></tr>
- <tr><td>4</td><td>0.2255</td><td>37</td></tr>
- <tr><td>5</td><td>0.3300</td><td>36</td></tr>
- <tr><td>6</td><td>0.3355</td><td>35</td></tr>
- <tr><td>7</td><td>0.4400</td><td>34</td></tr>
- <tr><td>8</td><td>0.4455</td><td>33</td></tr>
- <tr><td>9</td><td>0.5500</td><td>32</td></tr>
- <tr><td>10</td><td>0.5555</td><td>31</td></tr>
- <tr><td>11</td><td>0.6600</td><td>30</td></tr>
- <tr><td>12</td><td>0.6655</td><td>29</td></tr>
- <tr><td>13</td><td>0.7700</td><td>28</td></tr>
- <tr><td>14</td><td>0.7755</td><td>27</td></tr>
- <tr><td>15</td><td>0.8800</td><td>26</td></tr>
- <tr><td>16</td><td>0.8855</td><td>25</td></tr>
- <tr><td>17</td><td>0.9900</td><td>24</td></tr>
- <tr><td>18</td><td>0.9955</td><td>23</td></tr>
- <tr><td>19</td><td>0.9999</td><td>22</td></tr>
- <tr><td>20</td><td>1.0000</td><td>21</td></tr>
- <tr><td>21</td><td>1.0000</td><td>20</td></tr>
- <tr><td>22</td><td>0.9999</td><td>19</td></tr>
- <tr><td>23</td><td>0.9955</td><td>18</td></tr>
- <tr><td>24</td><td>0.9900</td><td>17</td></tr>
- <tr><td>25</td><td>0.8855</td><td>16</td></tr>
- <tr><td>26</td><td>0.8800</td><td>15</td></tr>
- <tr><td>27</td><td>0.7755</td><td>14</td></tr>
- <tr><td>28</td><td>0.7700</td><td>13</td></tr>
- <tr><td>29</td><td>0.6655</td><td>12</td></tr>
- <tr><td>30</td><td>0.6600</td><td>11</td></tr>
- <tr><td>31</td><td>0.5555</td><td>10</td></tr>
- <tr><td>32</td><td>0.5500</td><td>9</td></tr>
- <tr><td>33</td><td>0.4455</td><td>8</td></tr>
- <tr><td>34</td><td>0.4400</td><td>7</td></tr>
- <tr><td>35</td><td>0.3355</td><td>6</td></tr>
- <tr><td>36</td><td>0.3300</td><td>5</td></tr>
- <tr><td>37</td><td>0.2255</td><td>4</td></tr>
- <tr><td>38</td><td>0.2200</td><td>3</td></tr>
- <tr><td>39</td><td>0.1155</td><td>2</td></tr>
- <tr><td>40</td><td>0.1100</td><td>1</td></tr>
- <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
- </table>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolldivlatchedmainframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,172 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The div should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var divScrollPositionAfter = divTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
- if (divScrollPositionBefore != divScrollPositionAfter)
- testFailed("Scrollable div consumed wheel events.");
- else
- testPassed("Scrollable div did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- divTarget = document.getElementById('target');
-
- divScrollPositionBefore = divTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the div.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Region</h3>
- <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
- <table class="table" style='width: 99%'>
- <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
- <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
- <tr><td>1</td><td>0.1100</td><td>40</td></tr>
- <tr><td>2</td><td>0.1155</td><td>39</td></tr>
- <tr><td>3</td><td>0.2200</td><td>38</td></tr>
- <tr><td>4</td><td>0.2255</td><td>37</td></tr>
- <tr><td>5</td><td>0.3300</td><td>36</td></tr>
- <tr><td>6</td><td>0.3355</td><td>35</td></tr>
- <tr><td>7</td><td>0.4400</td><td>34</td></tr>
- <tr><td>8</td><td>0.4455</td><td>33</td></tr>
- <tr><td>9</td><td>0.5500</td><td>32</td></tr>
- <tr><td>10</td><td>0.5555</td><td>31</td></tr>
- <tr><td>11</td><td>0.6600</td><td>30</td></tr>
- <tr><td>12</td><td>0.6655</td><td>29</td></tr>
- <tr><td>13</td><td>0.7700</td><td>28</td></tr>
- <tr><td>14</td><td>0.7755</td><td>27</td></tr>
- <tr><td>15</td><td>0.8800</td><td>26</td></tr>
- <tr><td>16</td><td>0.8855</td><td>25</td></tr>
- <tr><td>17</td><td>0.9900</td><td>24</td></tr>
- <tr><td>18</td><td>0.9955</td><td>23</td></tr>
- <tr><td>19</td><td>0.9999</td><td>22</td></tr>
- <tr><td>20</td><td>1.0000</td><td>21</td></tr>
- <tr><td>21</td><td>1.0000</td><td>20</td></tr>
- <tr><td>22</td><td>0.9999</td><td>19</td></tr>
- <tr><td>23</td><td>0.9955</td><td>18</td></tr>
- <tr><td>24</td><td>0.9900</td><td>17</td></tr>
- <tr><td>25</td><td>0.8855</td><td>16</td></tr>
- <tr><td>26</td><td>0.8800</td><td>15</td></tr>
- <tr><td>27</td><td>0.7755</td><td>14</td></tr>
- <tr><td>28</td><td>0.7700</td><td>13</td></tr>
- <tr><td>29</td><td>0.6655</td><td>12</td></tr>
- <tr><td>30</td><td>0.6600</td><td>11</td></tr>
- <tr><td>31</td><td>0.5555</td><td>10</td></tr>
- <tr><td>32</td><td>0.5500</td><td>9</td></tr>
- <tr><td>33</td><td>0.4455</td><td>8</td></tr>
- <tr><td>34</td><td>0.4400</td><td>7</td></tr>
- <tr><td>35</td><td>0.3355</td><td>6</td></tr>
- <tr><td>36</td><td>0.3300</td><td>5</td></tr>
- <tr><td>37</td><td>0.2255</td><td>4</td></tr>
- <tr><td>38</td><td>0.2200</td><td>3</td></tr>
- <tr><td>39</td><td>0.1155</td><td>2</td></tr>
- <tr><td>40</td><td>0.1100</td><td>1</td></tr>
- <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
- </table>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-Put mouse here and flick downwards
-
-Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 531
-PASS Page did not receive wheel events.
-(GraphicsLayer
- (bounds 785.00 2326.00)
- (visible rect 0.00, 0.00 785.00 x 600.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 600.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 785 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframewithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-Put mouse here and flick downwards
-
-Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 531
-PASS Page did not receive wheel events.
-Document was initial target for 0 of the wheel events.
-(GraphicsLayer
- (bounds 785.00 2341.00)
- (visible rect 0.00, 0.00 785.00 x 600.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 2341.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 600.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 785 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframewithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,126 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The IFrame should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- iframeTarget = document.getElementById('target');
-
- var iFrameBody = window.frames['target'].document.body;
- iFrameBody.scrollTop = iFrameBody.scrollHeight - iframeTarget.clientHeight - 100;
-
- iFrameScrollPositionBefore = iFrameBody.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = iframeTarget.offsetLeft + 20;
- debug("IFrame display height = " + iframeTarget.clientHeight);
- var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "inside the IFrame, then use the mouse wheel or a two-finger swipe to scroll the IFrame to the bottom (and beyond).<br/>"
- + "<br/><br/>"
- + "The test passes if you scroll far enough to see the row of END labels but the main page does not scroll.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
- <div id="source" style="height: 100px">
- Put mouse here and flick downwards
- </div>
- <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;"
- src= "data:text/html,
- <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
- TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
- This should still be visible inside the frame after you scroll down
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- This should NOT be visible inside the frame after you scroll down<br/>
- <br/>
- END END END END END END END END END END END END END
- </div>
- "
- onload="setupTopLevel();"
- >
- </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchediframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,114 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The IFrame should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- iframeTarget = document.getElementById('target');
-
- var iFrameBody = window.frames['target'].document.body;
- iFrameBody.scrollTop = iFrameBody.scrollHeight - iframeTarget.clientHeight - 100;
-
- iFrameScrollPositionBefore = iFrameBody.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = iframeTarget.offsetLeft + 20;
- debug("IFrame display height = " + iframeTarget.clientHeight);
- var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "inside the IFrame, then use the mouse wheel or a two-finger swipe to scroll the IFrame to the bottom (and beyond).<br/>"
- + "<br/><br/>"
- + "The test passes if you scroll far enough to see the row of END labels but the main page does not scroll.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
- <div id="source" style="height: 100px">
- Put mouse here and flick downwards
- </div>
- <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;"
- src= "data:text/html,
- <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
- TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
- This should still be visible inside the frame after you scroll down
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- This should NOT be visible inside the frame after you scroll down<br/>
- <br/>
- END END END END END END END END END END END END END
- </div>
- "
- onload="setupTopLevel();"
- >
- </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-Put mouse here and flick downwards
-
-Tests that iframe doesn't consume wheel events when scroll
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after: 280, IFrame after: 0
-PASS IFrame did not receive wheel events.
-(GraphicsLayer
- (bounds 785.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 600.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 2311.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 600.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 785 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframewithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-Put mouse here and flick downwards
-
-Tests that iframe doesn't consume wheel events when scroll
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after: 280, IFrame after: 0
-PASS IFrame did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
- (bounds 785.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 600.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 600.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 785 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframewithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,121 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The IFrame should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
- if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
- testFailed("IFrame consumed wheel events.");
- else
- testPassed("IFrame did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
- iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
-
- iframeTarget = document.getElementById('target');
-
- // Scroll the #source until we reach the #target.
- var startPosX = iframeTarget.offsetLeft + 20;
- var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the IFrame.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
- <div id="source" style="height: 100px">
- Put mouse here and flick downwards
- </div>
- <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;"
- src= "data:text/html,
- <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
- TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
- This should still be visible inside the frame after you scroll down
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- This should NOT be visible inside the frame after you scroll down<br/>
- <br/>
- END END END END END END END END END END END END END
- </div>
- "
- onload="setupTopLevel();"
- >
- </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't consume wheel events when scroll ");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrolliframelatchedmainframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,109 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The IFrame should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
- if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
- testFailed("IFrame consumed wheel events.");
- else
- testPassed("IFrame did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
- iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
-
- iframeTarget = document.getElementById('target');
-
- // Scroll the #source until we reach the #target.
- var startPosX = iframeTarget.offsetLeft + 20;
- var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
- + "down past the IFrame.<br/><br/>"
- + "You should not see the row of END labels if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
- <div id="source" style="height: 100px">
- Put mouse here and flick downwards
- </div>
- <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;"
- src= "data:text/html,
- <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
- TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
- This should still be visible inside the frame after you scroll down
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
- This should NOT be visible inside the frame after you scroll down<br/>
- <br/>
- END END END END END END END END END END END END END
- </div>
- "
- onload="setupTopLevel();"
- >
- </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't consume wheel events when scroll ");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after: 280, select after: 0
-PASS Select did not receive wheel events.
-(GraphicsLayer
- (bounds 2008.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2311.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframewithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after: 280, select after: 0
-PASS Select did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
- (bounds 2008.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframewithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,157 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The select should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var selectScrollPositionAfter = selectTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
- if (selectScrollPositionBefore != selectScrollPositionAfter)
- testFailed("Select consumed wheel events.");
- else
- testPassed("Select did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- selectTarget = document.getElementById('target');
-
- selectScrollPositionBefore = selectTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = selectTarget.offsetLeft + 20;
- var startPosY = selectTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll down<br/>"
- + "past the selectTarget.<br/><br/>"
- + "You should not see the 'content21' label if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Select</h3>
- <select id="target" class="scrollable_select" size="8">
- <option>content1</option>
- <option>content2</option>
- <option>content3</option>
- <option>content4</option>
- <option>content5</option>
- <option>content6</option>
- <option>content7</option>
- <option>content8</option>
- <option>content9</option>
- <option>content10</option>
- <option>content11</option>
- <option>content12</option>
- <option>content13</option>
- <option>content14</option>
- <option>content15</option>
- <option>content16</option>
- <option>content17</option>
- <option>content18</option>
- <option>content19</option>
- <option>content20</option>
- <option>content21</option>
- </select>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedmainframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,149 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The select should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var selectScrollPositionAfter = selectTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
- if (selectScrollPositionBefore != selectScrollPositionAfter)
- testFailed("Select consumed wheel events.");
- else
- testPassed("Select did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- selectTarget = document.getElementById('target');
-
- selectScrollPositionBefore = selectTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = selectTarget.offsetLeft + 20;
- var startPosY = selectTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll down<br/>"
- + "past the selectTarget.<br/><br/>"
- + "You should not see the 'content21' label if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Select</h3>
- <select id="target" class="scrollable_select" size="8">
- <option>content1</option>
- <option>content2</option>
- <option>content3</option>
- <option>content4</option>
- <option>content5</option>
- <option>content6</option>
- <option>content7</option>
- <option>content8</option>
- <option>content9</option>
- <option>content10</option>
- <option>content11</option>
- <option>content12</option>
- <option>content13</option>
- <option>content14</option>
- <option>content15</option>
- <option>content16</option>
- <option>content17</option>
- <option>content18</option>
- <option>content19</option>
- <option>content20</option>
- <option>content21</option>
- </select>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 111
-Mouse moved to (30, 238)
-Page before: 0, select before: 70
-Page after: 0, select after: 182
-PASS Page did not receive wheel events.
-(GraphicsLayer
- (bounds 2008.00 2326.00)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2326.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectwithhandlerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 111
-Mouse moved to (30, 238)
-Page before: 0, select before: 70
-Page after: 0, select after: 182
-PASS Page did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
- (bounds 2008.00 2341.00)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (children 1
- (GraphicsLayer
- (bounds 2008.00 2341.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (contentsScale 1.00)
- (tile cache coverage 0, 0 2008 x 2048)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 4 x 4)
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselectwithhandlerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,159 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
- wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
- document.addEventListener("mousewheel", onScrollWheel);
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The page should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var selectScrollPositionAfter = selectTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- selectTarget = document.getElementById('target');
- selectTarget.scrollTop = selectTarget.scrollHeight - selectTarget.clientHeight - 100;
-
- selectScrollPositionBefore = selectTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = selectTarget.offsetLeft + 20;
- debug("div display height = " + selectTarget.clientHeight);
- var startPosY = selectTarget.offsetTop + selectTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "inside the select box, and scroll near (but not AT) the bottom of the range. Use the mouse wheel or a two-finger<br/>"
- + "swipe to scroll through the rest of the select options.<br/><br/>"
- + "You should not see the page position change if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Select</h3>
- <select id="target" class="scrollable_select" size="8">
- <option>content1</option>
- <option>content2</option>
- <option>content3</option>
- <option>content4</option>
- <option>content5</option>
- <option>content6</option>
- <option>content7</option>
- <option>content8</option>
- <option>content9</option>
- <option>content10</option>
- <option>content11</option>
- <option>content12</option>
- <option>content13</option>
- <option>content14</option>
- <option>content15</option>
- <option>content16</option>
- <option>content17</option>
- <option>content18</option>
- <option>content19</option>
- <option>content20</option>
- <option>content21</option>
- </select>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfastscrollselectlatchedselecthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,151 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
- width: 680px;
-}
-
-.table td, .table th {
- padding: 2px;
-}
-
-.table th {
- height: 20px;
- text-align: left;
- font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
- background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
- background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
- setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
- // The page should not have scrolled at all.
- var pageScrollPositionAfter = document.body.scrollTop;
- var selectScrollPositionAfter = selectTarget.scrollTop;
-
- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
- if (pageScrollPositionBefore != pageScrollPositionAfter)
- testFailed("Page received wheel events.");
- else
- testPassed("Page did not receive wheel events.");
-
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- testRunner.notifyDone();
-}
-
-function scrollTest() {
- // See where our IFrame lives:
- pageScrollPositionBefore = document.body.scrollTop;
-
- selectTarget = document.getElementById('target');
- selectTarget.scrollTop = selectTarget.scrollHeight - selectTarget.clientHeight - 100;
-
- selectScrollPositionBefore = selectTarget.scrollTop;
-
- // Scroll the #source until we reach the #target.
- var startPosX = selectTarget.offsetLeft + 20;
- debug("div display height = " + selectTarget.clientHeight);
- var startPosY = selectTarget.offsetTop + selectTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
- setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
- if (window.eventSender) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
-
- setTimeout(scrollTest, 1000);
- } else {
- var messageLocation = document.getElementById('parent');
- var message = document.createElement('div');
- message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
- + "inside the select box, and scroll near (but not AT) the bottom of the range. Use the mouse wheel or a two-finger<br/>"
- + "swipe to scroll through the rest of the select options.<br/><br/>"
- + "You should not see the page position change if this test is successful.</p>";
- messageLocation.appendChild(message);
- }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
- <div id="source" style="height: 100px; width: 500px;">
- Put mouse here and flick downwards
- </div>
- <div class="scrollable_region">
- <h3>Scrollable Select</h3>
- <select id="target" class="scrollable_select" size="8">
- <option>content1</option>
- <option>content2</option>
- <option>content3</option>
- <option>content4</option>
- <option>content5</option>
- <option>content6</option>
- <option>content7</option>
- <option>content8</option>
- <option>content9</option>
- <option>content10</option>
- <option>content11</option>
- <option>content12</option>
- <option>content13</option>
- <option>content14</option>
- <option>content15</option>
- <option>content16</option>
- <option>content17</option>
- <option>content18</option>
- <option>content19</option>
- <option>content20</option>
- <option>content21</option>
- </select>
- </div>
- </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/ChangeLog 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r164073 and r164080.
+ http://trac.webkit.org/changeset/164073
+ http://trac.webkit.org/changeset/164080
+ https://bugs.webkit.org/show_bug.cgi?id=128781
+
+ Broke Mac builds (Requested by rniwa on #webkit).
+
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (+[EventSendingController isSelectorExcludedFromWebScript:]):
+ (+[EventSendingController webScriptNameForSelector:]):
+ * WebKitTestRunner/EventSenderProxy.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+ * WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::didReceiveMessageFromInjectedBundle):
+ (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
+ * WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
+ * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+
</ins><span class="cx"> 2014-02-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for Mountain Lion.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEventSendingControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2006 Jonas Witt <jonas.witt@gmail.com>
</span><span class="cx"> * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
</span><span class="cx"> * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> NoMouseButton = -1
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
</del><span class="cx"> struct KeyMappingEntry {
</span><span class="cx"> int macKeyCode;
</span><span class="cx"> int macNumpadKeyCode;
</span><span class="lines">@@ -203,7 +202,6 @@
</span><span class="cx"> || aSelector == @selector(zoomPageOut)
</span><span class="cx"> || aSelector == @selector(scalePageBy:atX:andY:)
</span><span class="cx"> || aSelector == @selector(mouseScrollByX:andY:)
</span><del>- || aSelector == @selector(mouseScrollByX:andY:withWheel:andMomentumPhases:)
</del><span class="cx"> || aSelector == @selector(continuousMouseScrollByX:andY:)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> || aSelector == @selector(addTouchAtX:y:)
</span><span class="lines">@@ -256,8 +254,6 @@
</span><span class="cx"> return @"setDragMode";
</span><span class="cx"> if (aSelector == @selector(mouseScrollByX:andY:))
</span><span class="cx"> return @"mouseScrollBy";
</span><del>- if (aSelector == @selector(mouseScrollByX:andY:withWheel:andMomentumPhases:))
- return @"mouseScrollByWithWheelAndMomentumPhases";
</del><span class="cx"> if (aSelector == @selector(continuousMouseScrollByX:andY:))
</span><span class="cx"> return @"continuousMouseScrollBy";
</span><span class="cx"> if (aSelector == @selector(scalePageBy:atX:andY:))
</span><span class="lines">@@ -703,56 +699,6 @@
</span><span class="cx"> [self mouseScrollByX:x andY:y continuously:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-const uint32_t kCGScrollWheelEventMomentumPhase = 123;
-#endif
-
-- (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)phaseName andMomentumPhases:(NSString*)momentumName
-{
-#if !PLATFORM(IOS)
- uint32_t phase = 0;
- if ([phaseName isEqualToString: @"none"])
- phase = 0;
- else if ([phaseName isEqualToString: @"began"])
- phase = 1; // kCGScrollPhaseBegan
- else if ([phaseName isEqualToString: @"changed"])
- phase = 2; // kCGScrollPhaseChanged;
- else if ([phaseName isEqualToString: @"ended"])
- phase = 4; // kCGScrollPhaseEnded;
- else if ([phaseName isEqualToString: @"cancelled"])
- phase = 8; // kCGScrollPhaseCancelled;
- else if ([phaseName isEqualToString: @"maybegin"])
- phase = 128; // kCGScrollPhaseMayBegin;
-
- uint32_t momentum = 0;
- if ([momentumName isEqualToString: @"none"])
- momentum = 0; // kCGMomentumScrollPhaseNone;
- else if ([momentumName isEqualToString:@"begin"])
- momentum = 1; // kCGMomentumScrollPhaseBegin;
- else if ([momentumName isEqualToString:@"continue"])
- momentum = 2; // kCGMomentumScrollPhaseContinue;
- else if ([momentumName isEqualToString:@"end"])
- momentum = 3; // kCGMomentumScrollPhaseEnd;
-
- CGEventRef cgScrollEvent = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitLine, 2, y, x);
-
- // CGEvent locations are in global display coordinates.
- CGPoint lastGlobalMousePosition = CGPointMake(lastMousePosition.x, [[NSScreen mainScreen] frame].size.height - lastMousePosition.y);
- CGEventSetLocation(cgScrollEvent, lastGlobalMousePosition);
- CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventScrollPhase, phase);
- CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventMomentumPhase, momentum);
-
- NSEvent* scrollEvent = [NSEvent eventWithCGEvent:cgScrollEvent];
- CFRelease(cgScrollEvent);
-
- if (NSView* targetView = [[mainFrame webView] hitTest:[scrollEvent locationInWindow]]) {
- [NSApp _setCurrentEvent:scrollEvent];
- [targetView scrollWheel:scrollEvent];
- [NSApp _setCurrentEvent:nil];
- }
-#endif
-}
-
</del><span class="cx"> - (NSArray *)contextClick
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerEventSenderProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> void mouseUp(unsigned button, WKEventModifiers);
</span><span class="cx"> void mouseMoveTo(double x, double y);
</span><span class="cx"> void mouseScrollBy(int x, int y);
</span><del>- void mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum);
</del><span class="cx"> void continuousMouseScrollBy(int x, int y, bool paged);
</span><span class="cx">
</span><span class="cx"> void leapForward(int milliseconds);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsEventSendingControlleridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> void mouseUp(long buttonNumber, object modifierArray);
</span><span class="cx"> void mouseMoveTo(long x, long y);
</span><span class="cx"> void mouseScrollBy(long x, long y);
</span><del>- void mouseScrollByWithWheelAndMomentumPhases(long x, long y, DOMString phase, DOMString momentum, optional boolean asyncScrolling);
</del><span class="cx"> void continuousMouseScrollBy(long x, long y, optional boolean paged);
</span><span class="cx"> object contextClick();
</span><span class="cx"> void scheduleAsynchronousClick();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -347,61 +347,6 @@
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSendingController::mouseScrollByWithWheelAndMomentumPhases(int x, int y, JSStringRef phaseStr, JSStringRef momentumStr, bool asyncScrolling)
-{
- WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
- WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, WKMutableDictionaryCreate());
-
- WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
- WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseScrollByWithWheelAndMomentumPhases"));
- WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
-
- WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
- WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
- WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
-
- WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
- WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
- WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
-
- uint64_t phase = 0;
- if (JSStringIsEqualToUTF8CString(phaseStr, "none"))
- phase = 0;
- else if (JSStringIsEqualToUTF8CString(phaseStr, "began"))
- phase = 1; // kCGScrollPhaseBegan
- else if (JSStringIsEqualToUTF8CString(phaseStr, "changed"))
- phase = 2; // kCGScrollPhaseChanged
- else if (JSStringIsEqualToUTF8CString(phaseStr, "ended"))
- phase = 4; // kCGScrollPhaseEnded
- else if (JSStringIsEqualToUTF8CString(phaseStr, "cancelled"))
- phase = 8; // kCGScrollPhaseCancelled
- else if (JSStringIsEqualToUTF8CString(phaseStr, "maybegin"))
- phase = 128; // kCGScrollPhaseMayBegin
-
- WKRetainPtr<WKStringRef> phaseKey(AdoptWK, WKStringCreateWithUTF8CString("Phase"));
- WKRetainPtr<WKUInt64Ref> phaseRef(AdoptWK, WKUInt64Create(phase));
- WKDictionarySetItem(EventSenderMessageBody.get(), phaseKey.get(), phaseRef.get());
-
- uint64_t momentum = 0;
- if (JSStringIsEqualToUTF8CString(momentumStr, "none"))
- momentum = 0; // kCGMomentumScrollPhaseNone
- else if (JSStringIsEqualToUTF8CString(momentumStr, "begin"))
- momentum = 1; // kCGMomentumScrollPhaseBegin
- else if (JSStringIsEqualToUTF8CString(momentumStr, "continue"))
- momentum = 2; // kCGMomentumScrollPhaseContinue
- else if (JSStringIsEqualToUTF8CString(momentumStr, "end"))
- momentum = 3; // kCGMomentumScrollPhaseEnd
-
- WKRetainPtr<WKStringRef> momentumKey(AdoptWK, WKStringCreateWithUTF8CString("Momentum"));
- WKRetainPtr<WKUInt64Ref> momentumRef(AdoptWK, WKUInt64Create(momentum));
- WKDictionarySetItem(EventSenderMessageBody.get(), momentumKey.get(), momentumRef.get());
-
- if (asyncScrolling)
- WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get());
- else
- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
-}
-
</del><span class="cx"> void EventSendingController::continuousMouseScrollBy(int x, int y, bool paged)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> void mouseUp(int button, JSValueRef modifierArray);
</span><span class="cx"> void mouseMoveTo(int x, int y);
</span><span class="cx"> void mouseScrollBy(int x, int y);
</span><del>- void mouseScrollByWithWheelAndMomentumPhases(int x, int y, JSStringRef phase, JSStringRef momentum, bool asyncScrolling);
</del><span class="cx"> void continuousMouseScrollBy(int x, int y, bool paged);
</span><span class="cx"> JSValueRef contextClick();
</span><span class="cx"> void leapForward(int milliseconds);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosEventSenderProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -98,11 +98,6 @@
</span><span class="cx"> // Write me.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum)
-{
- // Write me.
-}
-
</del><span class="cx"> void EventSenderProxy::continuousMouseScrollBy(int x, int y, bool paged)
</span><span class="cx"> {
</span><span class="cx"> // Write me.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -856,25 +856,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (WKStringIsEqualToUTF8CString(subMessageName, "MouseScrollByWithWheelAndMomentumPhases")) {
- WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
- double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
-
- WKRetainPtr<WKStringRef> yKey = adoptWK(WKStringCreateWithUTF8CString("Y"));
- double y = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, yKey.get())));
-
- WKRetainPtr<WKStringRef> phaseKey = adoptWK(WKStringCreateWithUTF8CString("Phase"));
- int phase = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, phaseKey.get()))));
- WKRetainPtr<WKStringRef> momentumKey = adoptWK(WKStringCreateWithUTF8CString("Momentum"));
- int momentum = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, momentumKey.get()))));
-
- // Forward to WebProcess
- WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), false);
- m_eventSenderProxy->mouseScrollByWithWheelAndMomentumPhases(x, y, phase, momentum);
-
- return;
- }
-
</del><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -944,25 +925,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (WKStringIsEqualToUTF8CString(subMessageName, "MouseScrollByWithWheelAndMomentumPhases")) {
- WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
- double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
-
- WKRetainPtr<WKStringRef> yKey = adoptWK(WKStringCreateWithUTF8CString("Y"));
- double y = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, yKey.get())));
-
- WKRetainPtr<WKStringRef> phaseKey = adoptWK(WKStringCreateWithUTF8CString("Phase"));
- int phase = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, phaseKey.get()))));
- WKRetainPtr<WKStringRef> momentumKey = adoptWK(WKStringCreateWithUTF8CString("Momentum"));
- int momentum = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, momentumKey.get()))));
-
- // Forward to WebProcess
- WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), true);
- m_eventSenderProxy->mouseScrollByWithWheelAndMomentumPhases(x, y, phase, momentum);
- WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), false);
- return 0;
- }
-
</del><span class="cx"> if (WKStringIsEqualToUTF8CString(subMessageName, "ContinuousMouseScrollBy")) {
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnereflEventSenderProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -392,13 +392,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int /*phase*/, int /*momentum*/)
-{
- // EFL does not have the concept of wheel gesture phases or momentum. Just relay to
- // the mouse wheel handler.
- mouseScrollBy(x, y);
-}
-
</del><span class="cx"> void EventSenderProxy::leapForward(int milliseconds)
</span><span class="cx"> {
</span><span class="cx"> if (m_eventQueue.isEmpty())
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkEventSenderProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -433,13 +433,6 @@
</span><span class="cx"> sendOrQueueEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int /*phase*/, int /*momentum*/)
-{
- // Gtk+ does not have the concept of wheel gesture phases or momentum. Just relay to
- // the mouse wheel handler.
- mouseScrollBy(x, y);
-}
-
</del><span class="cx"> void EventSenderProxy::leapForward(int milliseconds)
</span><span class="cx"> {
</span><span class="cx"> if (m_eventQueue.isEmpty())
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (164080 => 164081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2014-02-14 01:30:10 UTC (rev 164080)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2014-02-14 01:44:07 UTC (rev 164081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -461,25 +461,4 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum)
-{
- RetainPtr<CGEventRef> cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent(0, kCGScrollEventUnitLine, 2, y, x));
-
- // CGEvent locations are in global display coordinates.
- CGPoint lastGlobalMousePosition = CGPointMake(m_position.x, [[NSScreen mainScreen] frame].size.height - m_position.y);
- CGEventSetLocation(cgScrollEvent.get(), lastGlobalMousePosition);
-
- CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventScrollPhase, phase);
- CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventMomentumPhase, momentum);
-
- NSEvent* event = [NSEvent eventWithCGEvent: cgScrollEvent.get()];
-
- // Our event should have the correct settings:
- if (NSView *targetView = [m_testController->mainWebView()->platformView() hitTest: [event locationInWindow]]) {
- [NSApp _setCurrentEvent: event];
- [targetView scrollWheel: event];
- [NSApp _setCurrentEvent: nil];
- }
-}
-
</del><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>
</body>
</html>