Revert 79703 - 2011-02-15 Brett Wilson <brettw@chromium.org>

Source/WebKit/chromium/src/WebViewImpl.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 1130 matching lines @@
     // we're done.
     if (m_doingDragAndDrop)
         return true;
 
     if (m_ignoreInputEvents)
         return true;
 
     m_currentInputEvent = &inputEvent;
 
     if (m_mouseCaptureNode.get() && WebInputEvent::isMouseEventType(inputEvent.type)) {
-        const int mouseButtonModifierMask = WebInputEvent::LeftButtonDown | WebInputEvent::MiddleButtonDown | WebInputEvent::RightButtonDown;
-        if (inputEvent.type == WebInputEvent::MouseDown ||
-            (inputEvent.modifiers & mouseButtonModifierMask) == 0) {
-            // It's possible the mouse was released and we didn't get the "up"
-            // message. This can happen if a dialog pops up while the mouse is
-            // held, for example. This will leave us "stuck" in capture mode.
-            // If we get a new mouse down message or any other mouse message
-            // where no "down" flags are set, we know the user is no longer
-            // dragging and we can release the capture and fall through to the
-            // regular event processing.
+        // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
+        RefPtr<Node> node = m_mouseCaptureNode;
+
+        // Not all platforms call mouseCaptureLost() directly.
+        if (inputEvent.type == WebInputEvent::MouseUp)
             mouseCaptureLost();
-        } else {
-            // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
-            RefPtr<Node> node = m_mouseCaptureNode;
 
-            // Not all platforms call mouseCaptureLost() directly.
-            if (inputEvent.type == WebInputEvent::MouseUp)
-                mouseCaptureLost();
+        AtomicString eventType;
+        switch (inputEvent.type) {
+        case WebInputEvent::MouseMove:
+            eventType = eventNames().mousemoveEvent;
+            break;
+        case WebInputEvent::MouseLeave:
+            eventType = eventNames().mouseoutEvent;
+            break;
+        case WebInputEvent::MouseDown:
+            eventType = eventNames().mousedownEvent;
+            break;
+        case WebInputEvent::MouseUp:
+            eventType = eventNames().mouseupEvent;
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+        }
 
-            AtomicString eventType;
-            switch (inputEvent.type) {
-            case WebInputEvent::MouseMove:
-                eventType = eventNames().mousemoveEvent;
-                break;
-            case WebInputEvent::MouseLeave:
-                eventType = eventNames().mouseoutEvent;
-                break;
-            case WebInputEvent::MouseDown:
-                eventType = eventNames().mousedownEvent;
-                break;
-            case WebInputEvent::MouseUp:
-                eventType = eventNames().mouseupEvent;
-                break;
-            default:
-                ASSERT_NOT_REACHED();
-            }
-
-            node->dispatchMouseEvent(
-                  PlatformMouseEventBuilder(mainFrameImpl()->frameView(), *static_cast<const WebMouseEvent*>(&inputEvent)),
-                  eventType, static_cast<const WebMouseEvent*>(&inputEvent)->clickCount);
-            m_currentInputEvent = 0;
-            return true;
-        }
+        node->dispatchMouseEvent(
+              PlatformMouseEventBuilder(mainFrameImpl()->frameView(), *static_cast<const WebMouseEvent*>(&inputEvent)),
+              eventType, static_cast<const WebMouseEvent*>(&inputEvent)->clickCount);
+        m_currentInputEvent = 0;
+        return true;
     }
 
     bool handled = true;
 
     // FIXME: WebKit seems to always return false on mouse events processing
     // methods. For now we'll assume it has processed them (as we are only
     // interested in whether keyboard events are processed).
     switch (inputEvent.type) {
     case WebInputEvent::MouseMove:
         mouseMove(*static_cast<const WebMouseEvent*>(&inputEvent));
@@ skipping 1303 matching lines @@
         m_temporaryOnscreenGraphicsContext3D = GraphicsContext3D::create(getCompositorContextAttributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow);
         if (m_temporaryOnscreenGraphicsContext3D)
             m_temporaryOnscreenGraphicsContext3D->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
         return GraphicsContext3DInternal::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get());
     }
 #endif
     return 0;
 }
 
 } // namespace WebKit