Revert of Implement PopupMenu::updateFromElement() for ExternalPopupMenu.

third_party/WebKit/Source/web/ExternalPopupMenu.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/ExternalPopupMenu.h"
 
-#include "core/dom/ExecutionContextTask.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
-#include "core/layout/LayoutBox.h"
 #include "core/page/Page.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/text/TextDirection.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebExternalPopupMenu.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebMenuItemInfo.h"
 #include "public/web/WebPopupMenuInfo.h"
@@ skipping 15 matching lines @@
 {
 }
 
 DEFINE_TRACE(ExternalPopupMenu)
 {
     visitor->trace(m_ownerElement);
     visitor->trace(m_localFrame);
     PopupMenu::trace(visitor);
 }
 
-bool ExternalPopupMenu::showInternal()
+void ExternalPopupMenu::show(const FloatQuad& controlPosition, const IntSize&, int index)
 {
-    // Blink core reuses the PopupMenu of an element.  For simplicity, we do
-    // recreate the actual external popup everytime.
+    IntRect rect(controlPosition.enclosingBoundingBox());
+    // WebCore reuses the PopupMenu of an element.
+    // For simplicity, we do recreate the actual external popup everytime.
     if (m_webExternalPopupMenu) {
         m_webExternalPopupMenu->close();
         m_webExternalPopupMenu = 0;
     }
 
     WebPopupMenuInfo info;
     getPopupMenuInfo(info, *m_ownerElement);
     if (info.items.isEmpty())
-        return false;
+        return;
     WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(m_localFrame.get());
     m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, this);
     if (m_webExternalPopupMenu) {
-        LayoutObject* layoutObject = m_ownerElement->layoutObject();
-        if (!layoutObject || !layoutObject->isBox())
-            return false;
-        FloatQuad quad(toLayoutBox(layoutObject)->localToAbsoluteQuad(FloatQuad(toLayoutBox(layoutObject)->borderBoundingBox())));
-        IntRect rect(quad.enclosingBoundingBox());
         IntRect rectInViewport = m_localFrame->view()->soonToBeRemovedContentsToUnscaledViewport(rect);
-        // TODO(tkent): If the anchor rectangle is not visible, we should not
-        // show a popup.
         m_webExternalPopupMenu->show(rectInViewport);
-        return true;
+#if OS(MACOSX)
+        const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent();
+        if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) {
+            m_syntheticEvent = adoptPtr(new WebMouseEvent);
+            *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent);
+            m_syntheticEvent->type = WebInputEvent::MouseUp;
+            m_dispatchEventTimer.startOneShot(0, BLINK_FROM_HERE);
+            // FIXME: show() is asynchronous. If preparing a popup is slow and
+            // a user released the mouse button before showing the popup,
+            // mouseup and click events are correctly dispatched. Dispatching
+            // the synthetic mouseup event is redundant in this case.
+        }
+#endif
     } else {
         // The client might refuse to create a popup (when there is already one pending to be shown for example).
         didCancel();
-        return false;
     }
 }
 
-void ExternalPopupMenu::show(const FloatQuad&, const IntSize&, int)
-{
-    if (!showInternal())
-        return;
-#if OS(MACOSX)
-    const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent();
-    if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) {
-        m_syntheticEvent = adoptPtr(new WebMouseEvent);
-        *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent);
-        m_syntheticEvent->type = WebInputEvent::MouseUp;
-        m_dispatchEventTimer.startOneShot(0, BLINK_FROM_HERE);
-        // FIXME: show() is asynchronous. If preparing a popup is slow and a
-        // user released the mouse button before showing the popup, mouseup and
-        // click events are correctly dispatched. Dispatching the synthetic
-        // mouseup event is redundant in this case.
-    }
-#endif
-}
-
 void ExternalPopupMenu::dispatchEvent(Timer<ExternalPopupMenu>*)
 {
     m_webView.handleInputEvent(*m_syntheticEvent);
     m_syntheticEvent.clear();
 }
 
 void ExternalPopupMenu::hide()
 {
     if (m_ownerElement)
         m_ownerElement->popupDidHide();
     if (!m_webExternalPopupMenu)
         return;
     m_webExternalPopupMenu->close();
     m_webExternalPopupMenu = 0;
 }
 
 void ExternalPopupMenu::updateFromElement()
 {
-    if (m_needsUpdate)
-        return;
-    m_needsUpdate = true;
-    m_ownerElement->document().postTask(BLINK_FROM_HERE, createSameThreadTask(&ExternalPopupMenu::update, PassRefPtrWillBeRawPtr<ExternalPopupMenu>(this)));
-}
-
-void ExternalPopupMenu::update()
-{
-    if (!m_webExternalPopupMenu || !m_ownerElement)
-        return;
-    m_ownerElement->document().updateLayoutTreeIfNeeded();
-    // disconnectClient() might have been called.
-    if (!m_ownerElement)
-        return;
-    m_needsUpdate = false;
-
-    if (showInternal())
-        return;
-    // We failed to show a popup.  Notify it to the owner.
-    hide();
 }
 
 void ExternalPopupMenu::disconnectClient()
 {
     hide();
     m_ownerElement = nullptr;
 }
 
 void ExternalPopupMenu::didChangeSelection(int index)
 {
@@ skipping 116 matching lines @@
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (popupMenuItemIndex == i)
             return indexTracker;
         ++indexTracker;
     }
     return -1;
 }
 
 } // namespace blink