Attachment #34525 for bug #28166

View Details Raw Unified Return to Bug 28166

| Differences between



2009-08-10  Brian Weinstein  <bweinstein@apple.com>

        Reviewed by NOBODY (OOPS!).

        Added support for DRT to support arguments for eventSender.mouseDown and eventSender.mouseUp.
        https://bugs.webkit.org/show_bug.cgi?id=28166.
        
        This is a step towards fixing fast/events/mouse-click-events.html.

        * DumpRenderTree/win/EventSender.cpp:
        (mouseDownCallback):
        (mouseUpCallback):
        (replaySavedEvents):

2009-08-07  Darin Adler  <darin@apple.com>

        * Scripts/commit-log-editor: Fix unchecked access to environment



        framePrivate->layout();

    down = true;
    int mouseType = WM_LBUTTONDOWN;
    if (argumentCount == 1) {
        int mouseNumber = JSValueToNumber(context, arguments[0], exception);
        switch (mouseNumber) {
        case 0:
            mouseType = WM_LBUTTONDOWN;
            break;
        case 1:
            mouseType = WM_MBUTTONDOWN;
            break;
        case 2:
            mouseType = WM_RBUTTONDOWN;
            break;
        case 3:
            // fast/events/mouse-click-events expects the 4th button has event.button = 1, so send an WM_BUTTONDOWN
            mouseType = WM_MBUTTONDOWN;
            break;
        default:
            mouseType = WM_LBUTTONDOWN;
            break;
        }
    }
        
    MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
    if (!msgQueue[endOfQueue].delay)
        dispatchMessage(&msg);
    else {


static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
    int mouseType = WM_LBUTTONUP;
    if (argumentCount == 1) {
        int mouseNumber = JSValueToNumber(context, arguments[0], exception);
        switch (mouseNumber) {
        case 0:
            mouseType = WM_LBUTTONUP;
            break;
        case 1:
            mouseType = WM_MBUTTONUP;
            break;
        case 2:
            mouseType = WM_RBUTTONUP;
            break;
        case 3:
            // fast/events/mouse-click-events expects the 4th button has event.button = 1, so send an WM_MBUTTONUP
            mouseType = WM_MBUTTONUP;
            break;
        default:
            mouseType = WM_LBUTTONUP;
            break;
        }
    }

    MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));

    if ((dragMode && !replayingSavedEvents) || msgQueue[endOfQueue].delay) {
        msgQueue[endOfQueue++].msg = msg;

        msg = msgQueue[startOfQueue++].msg;
        switch (msg.message) {
            case WM_LBUTTONUP:
            case WM_RBUTTONUP:
            case WM_MBUTTONUP:
                doMouseUp(msg);
                break;
            case WM_MOUSEMOVE:
                doMouseMove(msg);
                break;
            case WM_LBUTTONDOWN:
            case WM_RBUTTONDOWN:
            case WM_MBUTTONDOWN:
                dispatchMessage(&msg);
                break;
            default:

        msg = msgQueue[startOfQueue++].msg;
        switch (msg.message) {
            case WM_LBUTTONUP:
            case WM_RBUTTONUP:
            case WM_MBUTTONUP:
                doMouseUp(msg);
                break;
            case WM_MOUSEMOVE:
                doMouseMove(msg);
                break;
            case WM_LBUTTONDOWN:
            case WM_RBUTTONDOWN:
            case WM_MBUTTONDOWN:
                dispatchMessage(&msg);
                break;
            default:
- 

Return to Bug 28166

Lines 151-157 static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, a/WebKitTools/DumpRenderTree/win/EventSender.cpp_sec1
- a/WebKitTools/DumpRenderTree/win/EventSender.cpp -3 / +56 lines
151	framePrivate->layout();	151	framePrivate->layout();
152		152
153	down = true;	153	down = true;
154	MSG msg = makeMsg(webViewWindow, WM_LBUTTONDOWN, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));	154	int mouseType = WM_LBUTTONDOWN;
		155	if (argumentCount == 1) {
		156	int mouseNumber = JSValueToNumber(context, arguments[0], exception);
		157	switch (mouseNumber) {
		158	case 0:
		159	mouseType = WM_LBUTTONDOWN;
		160	break;
		161	case 1:
		162	mouseType = WM_MBUTTONDOWN;
		163	break;
		164	case 2:
		165	mouseType = WM_RBUTTONDOWN;
		166	break;
		167	case 3:
		168	// fast/events/mouse-click-events expects the 4th button has event.button = 1, so send an WM_BUTTONDOWN
		169	mouseType = WM_MBUTTONDOWN;
		170	break;
		171	default:
		172	mouseType = WM_LBUTTONDOWN;
		173	break;
		174	}
		175	}
		176
		177	MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
155	if (!msgQueue[endOfQueue].delay)	178	if (!msgQueue[endOfQueue].delay)
156	dispatchMessage(&msg);	179	dispatchMessage(&msg);
157	else {	180	else {
Lines 207-213 static void doMouseUp(MSG msg) a/WebKitTools/DumpRenderTree/win/EventSender.cpp_sec2
207		230
208	static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)	231	static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
209	{	232	{
210	MSG msg = makeMsg(webViewWindow, WM_LBUTTONUP, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));	233	int mouseType = WM_LBUTTONUP;
		234	if (argumentCount == 1) {
		235	int mouseNumber = JSValueToNumber(context, arguments[0], exception);
		236	switch (mouseNumber) {
		237	case 0:
		238	mouseType = WM_LBUTTONUP;
		239	break;
		240	case 1:
		241	mouseType = WM_MBUTTONUP;
		242	break;
		243	case 2:
		244	mouseType = WM_RBUTTONUP;
		245	break;
		246	case 3:
		247	// fast/events/mouse-click-events expects the 4th button has event.button = 1, so send an WM_MBUTTONUP
		248	mouseType = WM_MBUTTONUP;
		249	break;
		250	default:
		251	mouseType = WM_LBUTTONUP;
		252	break;
		253	}
		254	}
		255
		256	MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
211		257
212	if ((dragMode && !replayingSavedEvents) \|\| msgQueue[endOfQueue].delay) {	258	if ((dragMode && !replayingSavedEvents) \|\| msgQueue[endOfQueue].delay) {
213	msgQueue[endOfQueue++].msg = msg;	259	msgQueue[endOfQueue++].msg = msg;
Lines 277-288 void replaySavedEvents() a/WebKitTools/DumpRenderTree/win/EventSender.cpp_sec3
277	msg = msgQueue[startOfQueue++].msg;	323	msg = msgQueue[startOfQueue++].msg;
278	switch (msg.message) {	324	switch (msg.message) {
279	case WM_LBUTTONUP:	325	case WM_LBUTTONUP:
		326	case WM_RBUTTONUP:
		327	case WM_MBUTTONUP:
280	doMouseUp(msg);	328	doMouseUp(msg);
281	break;	329	break;
282	case WM_MOUSEMOVE:	330	case WM_MOUSEMOVE:
283	doMouseMove(msg);	331	doMouseMove(msg);
284	break;	332	break;
285	case WM_LBUTTONDOWN:	333	case WM_LBUTTONDOWN:
		334	case WM_RBUTTONDOWN:
		335	case WM_MBUTTONDOWN:
286	dispatchMessage(&msg);	336	dispatchMessage(&msg);
287	break;	337	break;
288	default:	338	default:
Lines 317-328 void replaySavedEvents() a/WebKitTools/DumpRenderTree/win/EventSender.cpp_sec4
317	msg = msgQueue[startOfQueue++].msg;	367	msg = msgQueue[startOfQueue++].msg;
318	switch (msg.message) {	368	switch (msg.message) {
319	case WM_LBUTTONUP:	369	case WM_LBUTTONUP:
		370	case WM_RBUTTONUP:
		371	case WM_MBUTTONUP:
320	doMouseUp(msg);	372	doMouseUp(msg);
321	break;	373	break;
322	case WM_MOUSEMOVE:	374	case WM_MOUSEMOVE:
323	doMouseMove(msg);	375	doMouseMove(msg);
324	break;	376	break;
325	case WM_LBUTTONDOWN:	377	case WM_LBUTTONDOWN:
		378	case WM_RBUTTONDOWN:
		379	case WM_MBUTTONDOWN:
326	dispatchMessage(&msg);	380	dispatchMessage(&msg);
327	break;	381	break;
328	default:	382	default:
329	-

Lines 1-3 a/WebKitTools/ChangeLog_sec1
- a/WebKitTools/ChangeLog +14 lines
		1	2009-08-10 Brian Weinstein <bweinstein@apple.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Added support for DRT to support arguments for eventSender.mouseDown and eventSender.mouseUp.
		6	https://bugs.webkit.org/show_bug.cgi?id=28166.
		7
		8	This is a step towards fixing fast/events/mouse-click-events.html.
		9
		10	* DumpRenderTree/win/EventSender.cpp:
		11	(mouseDownCallback):
		12	(mouseUpCallback):
		13	(replaySavedEvents):
		14
1	2009-08-07 Darin Adler <darin@apple.com>	15	2009-08-07 Darin Adler <darin@apple.com>
2		16
3	* Scripts/commit-log-editor: Fix unchecked access to environment	17	* Scripts/commit-log-editor: Fix unchecked access to environment