Clamp scroll offset to min/max in PopupListBox::updateScrollbars.

This was previously done in ScrollView::setScrollOffsetFromUpdateScrollbars but
got lost with http://crrev.com/598093008.

BUG=424042

Review URL: https://codereview.chromium.org/662733002

git-svn-id: svn://svn.chromium.org/blink/trunk@183870 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/web/PopupListBox.cpp

@@ -966,7 +966,7 @@ IntRect PopupListBox::visibleContentRect(IncludeScrollbarsInRect scrollbarInclus
     return IntRect(m_scrollOffset, size);
 }
 
-void PopupListBox::updateScrollbars(const IntPoint& desiredOffset)
+void PopupListBox::updateScrollbars(IntPoint desiredOffset)
 {
     IntSize oldVisibleSize = visibleContentRect().size();
     adjustScrollbarExistence();
@@ -979,6 +979,10 @@ void PopupListBox::updateScrollbars(const IntPoint& desiredOffset)
         else
             invalidateRect(IntRect(oldVisibleSize.width(), 0, newVisibleSize.width() - oldVisibleSize.width(), newVisibleSize.height()));
     }
+
+    desiredOffset = desiredOffset.shrunkTo(maximumScrollPosition());
+    desiredOffset = desiredOffset.expandedTo(minimumScrollPosition());
+
     if (desiredOffset != scrollPosition())
         ScrollableArea::scrollToOffsetWithoutAnimation(desiredOffset);
 }

third_party/WebKit/Source/web/PopupListBox.h

@@ -243,7 +243,7 @@ private:
 
     int scrollX() const { return scrollPosition().x(); }
     int scrollY() const { return scrollPosition().y(); }
-    void updateScrollbars(const IntPoint& desiredOffset);
+    void updateScrollbars(IntPoint desiredOffset);
     void setHasVerticalScrollbar(bool);
     Scrollbar* scrollbarAtWindowPoint(const IntPoint& windowPoint);
     IntRect contentsToWindow(const IntRect&) const;