<!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>[203403] 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/203403">203403</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 03:56:09 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] The test fast/scrolling/overflow-scroll-past-max.html is timing out.
https://bugs.webkit.org/show_bug.cgi?id=159342
Reviewed by Darin Adler.
Source/WebKit/win:
* WebFrame.h: Link fix.
Tools:
Implement required functions in event sender.
* DumpRenderTree/PlatformWin.cmake:
* DumpRenderTree/win/EventSender.cpp:
(monitorWheelEvents): Added.
(callAfterScrollingCompletes): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebFrameh">trunk/Source/WebKit/win/WebFrame.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsDumpRenderTreewinEventSendercpp">trunk/Tools/DumpRenderTree/win/EventSender.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (203402 => 203403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Source/WebKit/win/ChangeLog 2016-07-19 10:56:09 UTC (rev 203403)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-19 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] The test fast/scrolling/overflow-scroll-past-max.html is timing out.
+ https://bugs.webkit.org/show_bug.cgi?id=159342
+
+ Reviewed by Darin Adler.
+
+ * WebFrame.h: Link fix.
+
</ins><span class="cx"> 2016-07-17 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit API] Add SPI to track multiple navigations caused by a single user gesture
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.h (203402 => 203403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.h 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Source/WebKit/win/WebFrame.h 2016-07-19 10:56:09 UTC (rev 203403)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> interface IWebHistoryItemPrivate;
</span><span class="cx">
</span><span class="cx"> WebFrame* kit(WebCore::Frame*);
</span><del>-WebCore::Frame* core(WebFrame*);
</del><ins>+WEBKIT_API WebCore::Frame* core(WebFrame*);
</ins><span class="cx">
</span><span class="cx"> class DECLSPEC_UUID("{A3676398-4485-4a9d-87DC-CB5A40E6351D}") WebFrame : public IWebFrame2, IWebFramePrivate, IWebDocumentText
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203402 => 203403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Tools/ChangeLog 2016-07-19 10:56:09 UTC (rev 203403)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-19 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] The test fast/scrolling/overflow-scroll-past-max.html is timing out.
+ https://bugs.webkit.org/show_bug.cgi?id=159342
+
+ Reviewed by Darin Adler.
+
+ Implement required functions in event sender.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * DumpRenderTree/win/EventSender.cpp:
+ (monitorWheelEvents): Added.
+ (callAfterScrollingCompletes): Added.
+
</ins><span class="cx"> 2016-07-19 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Add new aliases to http test server
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (203402 => 203403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-07-19 10:56:09 UTC (rev 203403)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> TestNetscapePlugin/Tests
</span><span class="cx"> TestNetscapePlugin/win
</span><span class="cx"> TestNetscapePlugin/Tests/win
</span><ins>+ ${WEBKIT_DIR}/win
+ ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinEventSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/EventSender.cpp (203402 => 203403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/EventSender.cpp 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Tools/DumpRenderTree/win/EventSender.cpp 2016-07-19 10:56:09 UTC (rev 203403)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> #include "DRTDropSource.h"
</span><span class="cx"> #include "DraggingInfo.h"
</span><span class="cx"> #include "DumpRenderTree.h"
</span><ins>+#include "WebCoreTestSupport.h"
+#include "WebFrame.h"
</ins><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScriptCore.h>
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="lines">@@ -849,6 +851,42 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef monitorWheelEvents(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ COMPtr<IWebFrame2> frame2;
+ if (FAILED(frame->QueryInterface(&frame2)))
+ return JSValueMakeUndefined(context);
+
+ WebCore::Frame* coreFrame = core(static_cast<WebFrame*>(frame2.get()));
+ WebCoreTestSupport::monitorWheelEvents(*coreFrame);
+
+ return JSValueMakeUndefined(context);
+}
+
+static JSValueRef callAfterScrollingCompletes(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ JSObjectRef jsCallbackFunction = JSValueToObject(context, arguments[0], exception);
+ if (!jsCallbackFunction)
+ return JSValueMakeUndefined(context);
+
+ if (!frame)
+ return JSValueMakeUndefined(context);
+
+ JSGlobalContextRef globalContext = frame->globalContext();
+
+ COMPtr<IWebFrame2> frame2;
+ if (FAILED(frame->QueryInterface(&frame2)))
+ return JSValueMakeUndefined(context);
+
+ WebCore::Frame* coreFrame = core(static_cast<WebFrame*>(frame2.get()));
+ WebCoreTestSupport::setTestCallbackAndStartNotificationTimer(*coreFrame, globalContext, jsCallbackFunction);
+
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static JSStaticFunction staticFunctions[] = {
</span><span class="cx"> { "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="lines">@@ -866,6 +904,8 @@
</span><span class="cx"> { "mouseScrollBy", mouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseScrollByWithWheelAndMomentumPhases", mouseScrollByWithWheelAndMomentumPhasesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "continuousMouseScrollBy", continuousMouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "monitorWheelEvents", monitorWheelEvents, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "callAfterScrollingCompletes", callAfterScrollingCompletes, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>