Consolidate UpdateFrameInfo and SwapCompositorFrame.

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1589 matching lines @@
 
 bool RenderWidgetHostImpl::OnSwapCompositorFrame(
     const IPC::Message& message) {
   ViewHostMsg_SwapCompositorFrame::Param param;
   if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
     return false;
   scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   param.a.AssignTo(frame.get());
 
   if (view_) {
-#if defined(OS_ANDROID)
-    view_->UpdateFrameInfo(
-        frame->metadata.root_scroll_offset,
-        frame->metadata.page_scale_factor,
-        gfx::Vector2dF(
-            frame->metadata.min_page_scale_factor,
-            frame->metadata.max_page_scale_factor),
-        frame->metadata.root_layer_size,
-        frame->metadata.viewport_size,
-        frame->metadata.location_bar_offset,
-        frame->metadata.location_bar_content_translation,
-        frame->metadata.overdraw_bottom_height);
-#endif
     view_->OnSwapCompositorFrame(frame.Pass());
   } else {
     cc::CompositorFrameAck ack;
     if (frame->gl_frame_data) {
       ack.gl_frame_data = frame->gl_frame_data.Pass();
       ack.gl_frame_data->sync_point = 0;
     } else if (frame->delegated_frame_data) {
       ack.resources.swap(frame->delegated_frame_data->resource_list);
     } else if (frame->software_frame_data) {
       ack.last_dib_id = frame->software_frame_data->dib_id;
@@ skipping 847 matching lines @@
     return;
 
   OnRenderAutoResized(new_size);
 }
 
 void RenderWidgetHostImpl::DetachDelegate() {
   delegate_ = NULL;
 }
 
 }  // namespace content