Revert of Remove default args to several PageWidgetDelegate members.

Source/web/PageWidgetDelegate.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 29 matching lines @@
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "platform/Logging.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "public/web/WebInputEvent.h"
 #include "web/PageOverlayList.h"
 #include "web/WebInputEventConversion.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
-void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime, LocalFrame* root)
+static inline FrameView* rootFrameView(Page* page, LocalFrame* rootFrame)
 {
-    RefPtr<FrameView> view = root->view();
+    if (rootFrame)
+        return rootFrame->view();
+    if (!page)
+        return 0;
+    if (!page->mainFrame()->isLocalFrame())
+        return 0;
+    return toLocalFrame(page->mainFrame())->view();
+}
+
+void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime, LocalFrame* rootFrame)
+{
+    RefPtr<FrameView> view = rootFrameView(page, rootFrame);
     if (!view)
         return;
     page->autoscrollController().animate(monotonicFrameBeginTime);
     page->animator().serviceScriptedAnimations(monotonicFrameBeginTime);
 }
 
-void PageWidgetDelegate::layout(Page* page, LocalFrame* root)
+void PageWidgetDelegate::layout(Page* page, LocalFrame* rootFrame)
 {
     if (!page)
         return;
 
-    page->animator().updateLayoutAndStyleForPainting(root);
+    if (!rootFrame) {
+        if (!page->mainFrame() || !page->mainFrame()->isLocalFrame())
+            return;
+        rootFrame = toLocalFrame(page->mainFrame());
+    }
+
+    page->animator().updateLayoutAndStyleForPainting(rootFrame);
 }
 
-void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background, LocalFrame* root)
+void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background, LocalFrame* rootFrame)
 {
     if (rect.isEmpty())
         return;
     GraphicsContext gc(canvas);
     gc.setCertainlyOpaque(background == Opaque);
     gc.applyDeviceScaleFactor(page->deviceScaleFactor());
     gc.setDeviceScaleFactor(page->deviceScaleFactor());
     IntRect dirtyRect(rect);
     gc.save(); // Needed to save the canvas, not the GraphicsContext.
-    FrameView* view = root->view();
+    FrameView* view = rootFrameView(page, rootFrame);
     if (view) {
         gc.clip(dirtyRect);
         view->paint(&gc, dirtyRect);
         if (overlays)
             overlays->paintWebFrame(gc);
     } else {
         gc.fillRect(dirtyRect, Color::white);
     }
     gc.restore();
 }
 
-bool PageWidgetDelegate::handleInputEvent(Page* page, PageWidgetEventHandler& handler, const WebInputEvent& event, LocalFrame* root)
+bool PageWidgetDelegate::handleInputEvent(Page* page, PageWidgetEventHandler& handler, const WebInputEvent& event, LocalFrame* rootFrame)
 {
+    LocalFrame* frame = rootFrame;
+    if (!frame)
+        frame = page && page->mainFrame()->isLocalFrame() ? toLocalFrame(page->mainFrame()) : 0;
     switch (event.type) {
 
     // FIXME: WebKit seems to always return false on mouse events processing
     // methods. For now we'll assume it has processed them (as we are only
     // interested in whether keyboard events are processed).
-    // FIXME: Why do we return true when there is no root or the root is
-    // detached?
     case WebInputEvent::MouseMove:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return true;
-        handler.handleMouseMove(*root, static_cast<const WebMouseEvent&>(event));
+        handler.handleMouseMove(*frame, static_cast<const WebMouseEvent&>(event));
         return true;
     case WebInputEvent::MouseLeave:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return true;
-        handler.handleMouseLeave(*root, static_cast<const WebMouseEvent&>(event));
+        handler.handleMouseLeave(*frame, static_cast<const WebMouseEvent&>(event));
         return true;
     case WebInputEvent::MouseDown:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return true;
-        handler.handleMouseDown(*root, static_cast<const WebMouseEvent&>(event));
+        handler.handleMouseDown(*frame, static_cast<const WebMouseEvent&>(event));
         return true;
     case WebInputEvent::MouseUp:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return true;
-        handler.handleMouseUp(*root, static_cast<const WebMouseEvent&>(event));
+        handler.handleMouseUp(*frame, static_cast<const WebMouseEvent&>(event));
         return true;
 
     case WebInputEvent::MouseWheel:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return false;
-        return handler.handleMouseWheel(*root, static_cast<const WebMouseWheelEvent&>(event));
+        return handler.handleMouseWheel(*frame, static_cast<const WebMouseWheelEvent&>(event));
 
     case WebInputEvent::RawKeyDown:
     case WebInputEvent::KeyDown:
     case WebInputEvent::KeyUp:
         return handler.handleKeyEvent(static_cast<const WebKeyboardEvent&>(event));
 
     case WebInputEvent::Char:
         return handler.handleCharEvent(static_cast<const WebKeyboardEvent&>(event));
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
     case WebInputEvent::GestureFlingStart:
     case WebInputEvent::GestureFlingCancel:
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureShowPress:
     case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GestureDoubleTap:
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureLongPress:
     case WebInputEvent::GestureLongTap:
         return handler.handleGestureEvent(static_cast<const WebGestureEvent&>(event));
 
     case WebInputEvent::TouchStart:
     case WebInputEvent::TouchMove:
     case WebInputEvent::TouchEnd:
     case WebInputEvent::TouchCancel:
-        if (!root || !root->view())
+        if (!frame || !frame->view())
             return false;
-        return handler.handleTouchEvent(*root, static_cast<const WebTouchEvent&>(event));
+        return handler.handleTouchEvent(*frame, static_cast<const WebTouchEvent&>(event));
 
     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate:
         // FIXME: Once PlatformGestureEvent is updated to support pinch, this
         // should call handleGestureEvent, just like it currently does for
         // gesture scroll.
         return false;
 
     default:
@@ skipping 28 matching lines @@
 {
     return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(mainFrame.view(), event));
 }
 
 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent& event)
 {
     return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(mainFrame.view(), event));
 }
 
 } // namespace blink