Merge 145453

Source/WebCore/platform/chromium/PopupContainer.cpp

 /*
  * Copyright (c) 2011, 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 253 matching lines @@
 
     // Compute the starting x-axis for a normal RTL or right-aligned LTR dropdown. For those,
     // the right edge of dropdown box should be aligned with the right edge of <select>/<input> element box,
     // and the dropdown box should be expanded to the left if more space is needed.
     // m_originalFrameRect.width() is the width of the target <select>/<input> element.
     return m_originalFrameRect.width() - (m_listBox->width() + kBorderSize * 2);
 }
 
 bool PopupContainer::handleMouseDownEvent(const PlatformMouseEvent& event)
 {
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleMouseDownEvent(
         constructRelativeMouseEvent(event, this, m_listBox.get()));
 }
 
 bool PopupContainer::handleMouseMoveEvent(const PlatformMouseEvent& event)
 {
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleMouseMoveEvent(
         constructRelativeMouseEvent(event, this, m_listBox.get()));
 }
 
 bool PopupContainer::handleMouseReleaseEvent(const PlatformMouseEvent& event)
 {
     RefPtr<PopupContainer> protect(this);
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleMouseReleaseEvent(
         constructRelativeMouseEvent(event, this, m_listBox.get()));
 }
 
 bool PopupContainer::handleWheelEvent(const PlatformWheelEvent& event)
 {
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleWheelEvent(
         constructRelativeWheelEvent(event, this, m_listBox.get()));
 }
 
 #if ENABLE(TOUCH_EVENTS)
 bool PopupContainer::handleTouchEvent(const PlatformTouchEvent&)
 {
     return false;
 }
 #endif
@@ skipping 26 matching lines @@
         break;
     default:
         ASSERT_NOT_REACHED();
     }
     return false;
 }
 #endif
 
 bool PopupContainer::handleKeyEvent(const PlatformKeyboardEvent& event)
 {
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleKeyEvent(event);
 }
 
 void PopupContainer::hide()
 {
     m_listBox->abandon();
 }
 
 void PopupContainer::paint(GraphicsContext* gc, const IntRect& rect)
 {
@@ skipping 118 matching lines @@
 }
 
 String PopupContainer::getSelectedItemToolTip()
 {
     // We cannot use m_popupClient->selectedIndex() to choose tooltip message,
     // because the selectedIndex() might return final selected index, not hovering selection.
     return listBox()->m_popupClient->itemToolTip(listBox()->m_selectedIndex);
 }
 
 } // namespace WebCore