Chrome::client() should return a ChromeClient reference.

Source/web/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 @@
 
     // Compute the y-axis offset between the bottom left and bottom right
     // points. If the <select>/<input> is transformed, they are not the same.
     int verticalOffset = - m_controlPosition.p4().y() + m_controlPosition.p3().y();
     int verticalForRTLOffset = isRTL ? verticalOffset : 0;
 
     // Assume m_listBox size is already calculated.
     IntSize targetSize(m_listBox->width() + borderSize * 2, m_listBox->height() + borderSize * 2);
 
     IntRect widgetRectInScreen;
-    if (ChromeClient* client = chromeClient()) {
-        // If the popup would extend past the bottom of the screen, open upwards
-        // instead.
-        FloatRect screen = screenAvailableRect(m_frameView.get());
-        // Use popupInitialCoordinate.x() + rightOffset because RTL position
-        // needs to be considered.
-        widgetRectInScreen = client->rootViewToScreen(IntRect(popupInitialCoordinate.x() + rightOffset, popupInitialCoordinate.y() + verticalForRTLOffset, targetSize.width(), targetSize.height()));
+    // If the popup would extend past the bottom of the screen, open upwards
+    // instead.
+    FloatRect screen = screenAvailableRect(m_frameView.get());
+    // Use popupInitialCoordinate.x() + rightOffset because RTL position
+    // needs to be considered.
+    widgetRectInScreen = chromeClient().rootViewToScreen(IntRect(popupInitialCoordinate.x() + rightOffset, popupInitialCoordinate.y() + verticalForRTLOffset, targetSize.width(), targetSize.height()));
 
-        // If we have multiple screens and the browser rect is in one screen, we
-        // have to clip the window width to the screen width.
-        // When clipping, we also need to set a maximum width for the list box.
-        FloatRect windowRect = client->windowRect();
+    // If we have multiple screens and the browser rect is in one screen, we
+    // have to clip the window width to the screen width.
+    // When clipping, we also need to set a maximum width for the list box.
+    FloatRect windowRect = chromeClient().windowRect();
 
-        bool needToResizeView = false;
-        widgetRectInScreen = layoutAndCalculateWidgetRectInternal(widgetRectInScreen, targetControlHeight, windowRect, screen, isRTL, rtlOffset, verticalOffset, transformOffset, m_listBox.get(), needToResizeView);
-        if (needToResizeView)
-            fitToListBox();
-    }
+    bool needToResizeView = false;
+    widgetRectInScreen = layoutAndCalculateWidgetRectInternal(widgetRectInScreen, targetControlHeight, windowRect, screen, isRTL, rtlOffset, verticalOffset, transformOffset, m_listBox.get(), needToResizeView);
+    if (needToResizeView)
+        fitToListBox();
 
     return widgetRectInScreen;
 }
 
 void PopupContainer::showPopup(FrameView* view)
 {
     m_frameView = view;
     listBox()->m_focusedElement = m_frameView->frame()->document()->focusedElement();
 
-    if (ChromeClient* client = chromeClient()) {
-        IntSize transformOffset(m_controlPosition.p4().x() - m_controlPosition.p1().x(), m_controlPosition.p4().y() - m_controlPosition.p1().y() - m_controlSize.height());
-        client->popupOpened(this, layoutAndCalculateWidgetRect(m_controlSize.height(), transformOffset, roundedIntPoint(m_controlPosition.p4())), false);
-        m_popupOpen = true;
-    }
+    IntSize transformOffset(m_controlPosition.p4().x() - m_controlPosition.p1().x(), m_controlPosition.p4().y() - m_controlPosition.p1().y() - m_controlSize.height());
+    chromeClient().popupOpened(this, layoutAndCalculateWidgetRect(m_controlSize.height(), transformOffset, roundedIntPoint(m_controlPosition.p4())), false);
+    m_popupOpen = true;
 
     if (!m_listBox->parent())
         addChild(m_listBox.get());
 
     // Enable scrollbars after the listbox is inserted into the hierarchy,
     // so it has a proper WidgetClient.
     m_listBox->setVerticalScrollbarMode(ScrollbarAuto);
 
     m_listBox->scrollToRevealSelection();
 
     invalidate();
 }
 
 void PopupContainer::hidePopup()
 {
     listBox()->hidePopup();
 }
 
 void PopupContainer::notifyPopupHidden()
 {
     if (!m_popupOpen)
         return;
     m_popupOpen = false;
-    chromeClient()->popupClosed(this);
+    chromeClient().popupClosed(this);
 }
 
 void PopupContainer::fitToListBox()
 {
     // Place the listbox within our border.
     m_listBox->move(borderSize, borderSize);
 
     // Size ourselves to contain listbox + border.
     resize(m_listBox->width() + borderSize * 2, m_listBox->height() + borderSize * 2);
     invalidate();
@@ skipping 106 matching lines @@
     gc->drawRect(IntRect(tx, ty, borderSize, height()));
     gc->drawRect(IntRect(tx, ty + height() - borderSize, width(), borderSize));
     gc->drawRect(IntRect(tx + width() - borderSize, ty, borderSize, height()));
 }
 
 bool PopupContainer::isInterestedInEventForKey(int keyCode)
 {
     return m_listBox->isInterestedInEventForKey(keyCode);
 }
 
-ChromeClient* PopupContainer::chromeClient()
+ChromeClient& PopupContainer::chromeClient()
 {
     return m_frameView->frame()->page()->chrome().client();
 }
 
 void PopupContainer::showInRect(const FloatQuad& controlPosition, const IntSize& controlSize, FrameView* v, int index)
 {
     // The controlSize is the size of the select box. It's usually larger than
     // we need. Subtract border size so that usually the container will be
     // displayed exactly the same width as the select box.
     listBox()->setBaseWidth(max(controlSize.width() - borderSize * 2, 0));
@@ skipping 75 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