Revert of Remove default args to several PageWidgetDelegate members, try 2.

Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 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 305 matching lines @@
 
 WebSize WebPagePopupImpl::size()
 {
     return m_popupClient->contentSize();
 }
 
 void WebPagePopupImpl::beginFrame(const WebBeginFrameArgs& frameTime)
 {
     // FIXME: This should use frameTime.lastFrameTimeMonotonic but doing so
     // breaks tests.
-    PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime(), m_page->deprecatedLocalMainFrame());
+    PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime());
 }
 
 void WebPagePopupImpl::willCloseLayerTreeView()
 {
     setIsAcceleratedCompositingActive(false);
     m_layerTreeView = 0;
 }
 
 void WebPagePopupImpl::layout()
 {
-    PageWidgetDelegate::layout(m_page.get(), m_page->deprecatedLocalMainFrame());
+    PageWidgetDelegate::layout(m_page.get());
 }
 
 void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     if (!m_closing)
-        PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque, m_page->deprecatedLocalMainFrame());
+        PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque);
 }
 
 void WebPagePopupImpl::resize(const WebSize& newSize)
 {
     m_windowRectInScreen = WebRect(m_windowRectInScreen.x, m_windowRectInScreen.y, newSize.width, newSize.height);
     m_widgetClient->setWindowRect(m_windowRectInScreen);
 
     if (m_page)
         toLocalFrame(m_page->mainFrame())->view()->resize(newSize);
     m_widgetClient->didInvalidateRect(WebRect(0, 0, newSize.width, newSize.height));
@@ skipping 18 matching lines @@
     if (m_closing || !m_page || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
         return false;
     LocalFrame& frame = *toLocalFrame(m_page->mainFrame());
     return frame.eventHandler().handleGestureEvent(PlatformGestureEventBuilder(frame.view(), event));
 }
 
 bool WebPagePopupImpl::handleInputEvent(const WebInputEvent& event)
 {
     if (m_closing)
         return false;
-    return PageWidgetDelegate::handleInputEvent(m_page.get(), *this, event, m_page->deprecatedLocalMainFrame());
+    return PageWidgetDelegate::handleInputEvent(m_page.get(), *this, event);
 }
 
 bool WebPagePopupImpl::handleKeyEvent(const PlatformKeyboardEvent& event)
 {
     if (m_closing || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
         return false;
     return toLocalFrame(m_page->mainFrame())->eventHandler().keyEvent(event);
 }
 
 void WebPagePopupImpl::setFocus(bool enable)
@@ skipping 54 matching lines @@
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink