Move Get/SetScrollOffset methods from WebFrame to WebLocalFrame.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 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 1276 matching lines @@
   return WebRect();
 }
 
 WebRect WebViewImpl::WidenRectWithinPageBounds(const WebRect& source,
                                                int target_margin,
                                                int minimum_margin) {
   WebSize max_size;
   if (MainFrame())
     max_size = MainFrame()->ContentsSize();
   IntSize scroll_offset;
-  if (MainFrame())
-    scroll_offset = MainFrame()->GetScrollOffset();
+  if (MainFrame()) {
+    // TODO(lukasza): https://crbug.com/734209: The DCHECK below holds now, but
+    // only because all of the callers don't support OOPIFs and exit early if
+    // the main frame is not local.
+    DCHECK(MainFrame()->IsWebLocalFrame());
+    scroll_offset = MainFrame()->ToWebLocalFrame()->GetScrollOffset();
+  }
   int left_margin = target_margin;
   int right_margin = target_margin;
 
   const int absolute_source_x = source.x + scroll_offset.Width();
   if (left_margin > absolute_source_x) {
     left_margin = absolute_source_x;
     right_margin = std::max(left_margin, minimum_margin);
   }
 
   const int maximum_right_margin =
@@ skipping 199 matching lines @@
     if (!highlight_color.Alpha())
       continue;
 
     link_highlights_.push_back(LinkHighlightImpl::Create(node, this));
   }
 
   UpdateAllLifecyclePhases();
 }
 
 void WebViewImpl::AnimateDoubleTapZoom(const IntPoint& point_in_root_frame) {
+  // TODO(lukasza): https://crbug.com/734209: Add OOPIF support.
   if (!MainFrameImpl())
     return;
 
   WebRect block_bounds = ComputeBlockBound(point_in_root_frame, false);
   float scale;
   WebPoint scroll;
 
   ComputeScaleAndScrollForBlockRect(
       point_in_root_frame, block_bounds, touchPointPadding,
       MinimumPageScaleFactor() * doubleTapZoomAlreadyLegibleRatio, scale,
@@ skipping 26 matching lines @@
   // checking for m_layerTreeView->hasPendingPageScaleAnimation() is because of
   // fake page scale animation plumbing for testing, which doesn't actually
   // initiate a page scale animation.
   if (is_animating) {
     double_tap_zoom_page_scale_factor_ = scale;
     double_tap_zoom_pending_ = true;
   }
 }
 
 void WebViewImpl::ZoomToFindInPageRect(const WebRect& rect_in_root_frame) {
+  // TODO(lukasza): https://crbug.com/734209: Add OOPIF support.
   if (!MainFrameImpl())
     return;
 
   WebRect block_bounds = ComputeBlockBound(
       WebPoint(rect_in_root_frame.x + rect_in_root_frame.width / 2,
                rect_in_root_frame.y + rect_in_root_frame.height / 2),
       true);
 
   if (block_bounds.IsEmpty()) {
     // Keep current scale (no need to scroll as x,y will normally already
     // be visible). FIXME: Revisit this if it isn't always true.
     return;
   }
 
   float scale;
   WebPoint scroll;
 
   ComputeScaleAndScrollForBlockRect(
       WebPoint(rect_in_root_frame.x, rect_in_root_frame.y), block_bounds,
       nonUserInitiatedPointPadding, MinimumPageScaleFactor(), scale, scroll);
 
   StartPageScaleAnimation(scroll, false, scale,
                           findInPageAnimationDurationInSeconds);
 }
 
 bool WebViewImpl::ZoomToMultipleTargetsRect(const WebRect& rect_in_root_frame) {
+  // TODO(lukasza): https://crbug.com/734209: Add OOPIF support.
   if (!MainFrameImpl())
     return false;
 
   float scale;
   WebPoint scroll;
 
   ComputeScaleAndScrollForBlockRect(
       WebPoint(rect_in_root_frame.x, rect_in_root_frame.y), rect_in_root_frame,
       nonUserInitiatedPointPadding, MinimumPageScaleFactor(), scale, scroll);
 
@@ skipping 2520 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink