Merge 118768 - [Chromium] [Regression] SELECT popup misplaced when there is not enough vertical spa…

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 167 matching lines @@
             } else {
                 // Figure whether upwards or downwards has more room and set the
                 // maximum number of items.
                 int spaceAbove = widgetRectInScreen.y() - targetControlHeight;
                 int spaceBelow = screen.maxY() - widgetRectInScreen.y();
                 if (spaceAbove > spaceBelow)
                     m_listBox->setMaxHeight(spaceAbove);
                 else
                     m_listBox->setMaxHeight(spaceBelow);
                 layoutAndGetRTLOffset();
-                // Our height has changed, so recompute only Y axis of widgetRect.
-                // We don't have to recompute X axis, so we only replace Y axis
-                // in widgetRect.
-                IntRect frameInScreen = chromeClient->rootViewToScreen(frameRect());
-                widgetRectInScreen.setY(frameInScreen.y());
-                widgetRectInScreen.setHeight(frameInScreen.height());
-                // And move upwards if necessary.
+                // Container height may have changed in layoutAndGetRTLOffset(),
+                // so set the WebWidget height to the container height.
+                widgetRectInScreen.setHeight(height());
+                // Move WebWidget upwards if necessary.
                 if (spaceAbove > spaceBelow)
                     widgetRectInScreen.move(0, -(widgetRectInScreen.height() + targetControlHeight));
             }
         }
     }
 
     return widgetRectInScreen;
 }
 
 void PopupContainer::showPopup(FrameView* view)
@@ skipping 254 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