Don't force layout for mouse event hit tests

Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 286 matching lines @@
     bindMethod("gestureTap", &EventSender::gestureTap);
     bindMethod("gestureTapDown", &EventSender::gestureTapDown);
     bindMethod("gestureTapCancel", &EventSender::gestureTapCancel);
     bindMethod("gestureLongPress", &EventSender::gestureLongPress);
     bindMethod("gestureLongTap", &EventSender::gestureLongTap);
     bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap);
     bindMethod("zoomPageIn", &EventSender::zoomPageIn);
     bindMethod("zoomPageOut", &EventSender::zoomPageOut);
     bindMethod("scalePageBy", &EventSender::scalePageBy);
 
+    bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents);
+
     // When set to true (the default value), we batch mouse move and mouse up
     // events so we can simulate drag & drop.
     bindProperty("dragMode", &dragMode);
 #ifdef WIN32
     bindProperty("WM_KEYDOWN", &wmKeyDown);
     bindProperty("WM_KEYUP", &wmKeyUp);
     bindProperty("WM_CHAR", &wmChar);
     bindProperty("WM_DEADCHAR", &wmDeadChar);
     bindProperty("WM_SYSKEYDOWN", &wmSysKeyDown);
     bindProperty("WM_SYSKEYUP", &wmSysKeyUp);
@@ skipping 13 matching lines @@
 
 void EventSender::reset()
 {
     // The test should have finished a drag and the mouse button state.
     WEBKIT_ASSERT(currentDragData.isNull());
     currentDragData.reset();
     currentDragEffect = WebKit::WebDragOperationNone;
     currentDragEffectsAllowed = WebKit::WebDragOperationNone;
     pressedButton = WebMouseEvent::ButtonNone;
     dragMode.set(true);
+    forceLayoutOnEvents.set(false);
 #ifdef WIN32
     wmKeyDown.set(WM_KEYDOWN);
     wmKeyUp.set(WM_KEYUP);
     wmChar.set(WM_CHAR);
     wmDeadChar.set(WM_DEADCHAR);
     wmSysKeyDown.set(WM_SYSKEYDOWN);
     wmSysKeyUp.set(WM_SYSKEYUP);
     wmSysChar.set(WM_SYSCHAR);
     wmSysDeadChar.set(WM_SYSDEADCHAR);
 #endif
@@ skipping 67 matching lines @@
 
 //
 // Implemented javascript methods.
 //
 
 void EventSender::mouseDown(const CppArgumentList& arguments, CppVariant* result)
 {
     if (result) // Could be 0 if invoked asynchronously.
         result->setNull();
 
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();

[ojan, 2013/05/21 02:12:38]

Nit: Could move this into a helper function, EventSender::layoutWebview() or
something to avoid code duplication and make it more likely that new events also
respect this bool. Not a big deal.

+
     int buttonNumber = getButtonNumberFromSingleArg(arguments);
     WEBKIT_ASSERT(buttonNumber != -1);
 
     WebMouseEvent::Button buttonType = getButtonTypeFromButtonNumber(buttonNumber);
 
     updateClickCountForButton(buttonType);
 
     WebMouseEvent event;
     pressedButton = buttonType;
     initMouseEvent(WebInputEvent::MouseDown, buttonType, lastMousePos, &event, getCurrentEventTimeSec(m_delegate));
     if (arguments.size() >= 2 && (arguments[1].isObject() || arguments[1].isString()))
         applyKeyModifiers(&(arguments[1]), &event);
     webview()->handleInputEvent(event);
 }
 
 void EventSender::mouseUp(const CppArgumentList& arguments, CppVariant* result)
 {
     if (result) // Could be 0 if invoked asynchronously.
         result->setNull();
 
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
+
     int buttonNumber = getButtonNumberFromSingleArg(arguments);
     WEBKIT_ASSERT(buttonNumber != -1);
 
     WebMouseEvent::Button buttonType = getButtonTypeFromButtonNumber(buttonNumber);
 
     if (isDragMode() && !replayingSavedEvents) {
         SavedEvent savedEvent;
         savedEvent.type = SavedEvent::MouseUp;
         savedEvent.buttonType = buttonType;
         mouseEventQueue.push_back(savedEvent);
@@ skipping 38 matching lines @@
 
     currentDragData.reset();
 }
 
 void EventSender::mouseMoveTo(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
 
     if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
         return;
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
 
     WebPoint mousePos(arguments[0].toInt32(), arguments[1].toInt32());
 
     if (isDragMode() && pressedButton == WebMouseEvent::ButtonLeft && !replayingSavedEvents) {
         SavedEvent savedEvent;
         savedEvent.type = SavedEvent::MouseMove;
         savedEvent.pos = mousePos;
         mouseEventQueue.push_back(savedEvent);
     } else {
         WebMouseEvent event;
@@ skipping 132 matching lines @@
     if (arguments.size() >= 3 && arguments[2].isNumber()) {
         int location = arguments[2].toInt32();
         if (location == DOMKeyLocationNumpad)
             eventDown.modifiers |= WebInputEvent::IsKeyPad;
     }
 
     eventChar = eventUp = eventDown;
     eventUp.type = WebInputEvent::KeyUp;
     // EventSender.m forces a layout here, with at least one
     // test (fast/forms/focus-control-to-page.html) relying on this.
-    webview()->layout();
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
 
     // In the browser, if a keyboard event corresponds to an editor command,
     // the command will be dispatched to the renderer just before dispatching
     // the keyboard event, and then it will be executed in the
     // RenderView::handleCurrentKeyboardEvent() method, which is called from
     // third_party/WebKit/Source/WebKit/chromium/src/EditorClientImpl.cpp.
     // We just simulate the same behavior here.
     string editCommand;
     if (getEditCommand(eventDown, &editCommand))
         m_delegate->setEditCommand(editCommand, "");
@@ skipping 25 matching lines @@
     if (arguments.size() == 3) {
         // Grab the message id to see if we need to dispatch it.
         int msg = arguments[0].toInt32();
 
         // WebKit's version of this function stuffs a MSG struct and uses
         // TranslateMessage and DispatchMessage. We use a WebKeyboardEvent, which
         // doesn't need to receive the DeadChar and SysDeadChar messages.
         if (msg == WM_DEADCHAR || msg == WM_SYSDEADCHAR)
             return;
 
-        webview()->layout();
+        if (shouldForceLayoutOnEvents())
+            webview()->layout();
 
         unsigned long lparam = static_cast<unsigned long>(arguments[2].toDouble());
         webview()->handleInputEvent(WebInputEventFactory::keyboardEvent(0, msg, arguments[1].toInt32(), lparam));
     } else
         WEBKIT_ASSERT_NOT_REACHED();
 #endif
 }
 
 bool EventSender::needsShiftModifier(int keyCode)
 {
@@ skipping 133 matching lines @@
     } else {
         for (const char** item = nonEditableMenuStrings; *item; ++item) 
             strings.push_back(WebString::fromUTF8(*item));
     }
 
     return strings;
 }
 
 void EventSender::contextClick(const CppArgumentList& arguments, CppVariant* result)
 {
-    webview()->layout();
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
 
     updateClickCountForButton(WebMouseEvent::ButtonRight);
 
     // Clears last context menu data because we need to know if the context menu be requested 
     // after following mouse events.
     m_lastContextMenuData.reset();
 
     // Generate right mouse down and up.
     WebMouseEvent event;
     // This is a hack to work around only allowing a single pressed button since we want to
@@ skipping 160 matching lines @@
     const unsigned index = arguments[0].toInt32();
     WEBKIT_ASSERT(index < touchPoints.size());
 
     WebTouchPoint* touchPoint = &touchPoints[index];
     touchPoint->state = WebTouchPoint::StateCancelled;
 }
 
 void EventSender::sendCurrentTouchEvent(const WebInputEvent::Type type)
 {
     WEBKIT_ASSERT(static_cast<unsigned>(WebTouchEvent::touchesLengthCap) > touchPoints.size());
-    webview()->layout();
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
 
     WebTouchEvent touchEvent;
     touchEvent.type = type;
     touchEvent.modifiers = touchModifiers;
     touchEvent.timeStampSeconds = getCurrentEventTimeSec(m_delegate);
     touchEvent.touchesLength = touchPoints.size();
     for (unsigned i = 0; i < touchPoints.size(); ++i)
         touchEvent.touches[i] = touchPoints[i];
     webview()->handleInputEvent(touchEvent);
 
@@ skipping 16 matching lines @@
     webview()->handleInputEvent(event);
 }
 
 void EventSender::handleMouseWheel(const CppArgumentList& arguments, CppVariant* result, bool continuous)
 {
     result->setNull();
 
     if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
         return;
 
+    // Force a layout here just to make sure every position has been
+    // determined before we send events (as well as all the other methods
+    // that send an event do).
+    if (shouldForceLayoutOnEvents())
+        webview()->layout();
+
     int horizontal = arguments[0].toInt32();
     int vertical = arguments[1].toInt32();
     int paged = false;
     int hasPreciseScrollingDeltas = false;
 
     if (arguments.size() > 2 && arguments[2].isBool())
         paged = arguments[2].toBoolean();
 
     if (arguments.size() > 3 && arguments[3].isBool())
         hasPreciseScrollingDeltas = arguments[3].toBoolean();
@@ skipping 257 matching lines @@
 {
     result->setNull();
 }
 
 void EventSender::clearKillRing(const CppArgumentList&, CppVariant* result)
 {
     result->setNull();
 }
 
 }