diff options
Diffstat (limited to 'Tools/DumpRenderTree/gtk/EventSender.cpp')
| -rw-r--r-- | Tools/DumpRenderTree/gtk/EventSender.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Tools/DumpRenderTree/gtk/EventSender.cpp b/Tools/DumpRenderTree/gtk/EventSender.cpp index 8f281b239..8fd693564 100644 --- a/Tools/DumpRenderTree/gtk/EventSender.cpp +++ b/Tools/DumpRenderTree/gtk/EventSender.cpp @@ -437,6 +437,10 @@ static JSValueRef mouseScrollByCallback(JSContextRef context, JSObjectRef functi int vertical = (int)JSValueToNumber(context, arguments[1], exception); g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context)); + // Copy behaviour of Qt and EFL - just return in case of (0,0) mouse scroll + if (!horizontal && !vertical) + return JSValueMakeUndefined(context); + GdkEvent* event = gdk_event_new(GDK_SCROLL); event->scroll.x = lastMousePositionX; event->scroll.y = lastMousePositionY; @@ -489,8 +493,10 @@ static JSValueRef continuousMouseScrollByCallback(JSContextRef context, JSObject int vertical = JSValueToNumber(context, arguments[1], exception); g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context)); - g_return_val_if_fail(argumentCount < 3 || !JSValueToBoolean(context, arguments[2]), JSValueMakeUndefined(context)); - + // We do not yet support continuous scrolling by page. + if (argumentCount >= 3 && JSValueToBoolean(context, arguments[2])) + return JSValueMakeUndefined(context); + GdkEvent* event = gdk_event_new(GDK_SCROLL); event->scroll.x = lastMousePositionX; event->scroll.y = lastMousePositionY; @@ -539,7 +545,7 @@ static JSValueRef beginDragWithFilesCallback(JSContextRef context, JSObjectRef f GOwnPtr<gchar> scheme(g_file_get_uri_scheme(parentDirectory.get())); if (g_str_equal(scheme.get(), "http") || g_str_equal(scheme.get(), "https")) { GOwnPtr<gchar> currentDirectory(g_get_current_dir()); - parentDirectory = g_file_new_for_path(currentDirectory.get()); + parentDirectory = adoptGRef(g_file_new_for_path(currentDirectory.get())); } JSStringRef lengthProperty = JSStringCreateWithUTF8CString("length"); |