Modified: trunk/Source/WebKit/win/ChangeLog (203402 => 203403)
--- 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)
@@ -1,3 +1,12 @@
+2016-07-19 Per Arne Vollan <[email protected]>
+
+ [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.
+
2016-07-17 Sam Weinig <[email protected]>
[WebKit API] Add SPI to track multiple navigations caused by a single user gesture
Modified: trunk/Source/WebKit/win/WebFrame.h (203402 => 203403)
--- 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)
@@ -74,7 +74,7 @@
interface IWebHistoryItemPrivate;
WebFrame* kit(WebCore::Frame*);
-WebCore::Frame* core(WebFrame*);
+WEBKIT_API WebCore::Frame* core(WebFrame*);
class DECLSPEC_UUID("{A3676398-4485-4a9d-87DC-CB5A40E6351D}") WebFrame : public IWebFrame2, IWebFramePrivate, IWebDocumentText
{
Modified: trunk/Tools/ChangeLog (203402 => 203403)
--- trunk/Tools/ChangeLog 2016-07-19 07:59:05 UTC (rev 203402)
+++ trunk/Tools/ChangeLog 2016-07-19 10:56:09 UTC (rev 203403)
@@ -1,3 +1,17 @@
+2016-07-19 Per Arne Vollan <[email protected]>
+
+ [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.
+
2016-07-19 Youenn Fablet <[email protected]>
Add new aliases to http test server
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (203402 => 203403)
--- 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)
@@ -75,6 +75,8 @@
TestNetscapePlugin/Tests
TestNetscapePlugin/win
TestNetscapePlugin/Tests/win
+ ${WEBKIT_DIR}/win
+ ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
)
list(APPEND DumpRenderTree_LIBRARIES
Modified: trunk/Tools/DumpRenderTree/win/EventSender.cpp (203402 => 203403)
--- 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)
@@ -34,6 +34,8 @@
#include "DRTDropSource.h"
#include "DraggingInfo.h"
#include "DumpRenderTree.h"
+#include "WebCoreTestSupport.h"
+#include "WebFrame.h"
#include <_javascript_Core/_javascript_Core.h>
#include <WebCore/COMPtr.h>
@@ -849,6 +851,42 @@
return JSValueMakeUndefined(context);
}
+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);
+}
+
static JSStaticFunction staticFunctions[] = {
{ "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
@@ -866,6 +904,8 @@
{ "mouseScrollBy", mouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "mouseScrollByWithWheelAndMomentumPhases", mouseScrollByWithWheelAndMomentumPhasesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "continuousMouseScrollBy", continuousMouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "monitorWheelEvents", monitorWheelEvents, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "callAfterScrollingCompletes", callAfterScrollingCompletes, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0 }
};
