Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions

content/renderer/render_view_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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 6705 matching lines @@
       ClientRectToPhysicalWindowRect(gfx::RectF(zoom_rect)));
   Send(new ViewHostMsg_ShowDisambiguationPopup(routing_id_,
                                                physical_window_zoom_rect,
                                                canvas_size,
                                                transport_dib->id()));
 
   return true;
 }
 
 skia::RefPtr<SkPicture> RenderViewImpl::CapturePicture() {
-  return compositor_ ? compositor_->layer_tree_host()->capturePicture() :
+  return compositor_ ? compositor_->CapturePicture() :
       skia::RefPtr<SkPicture>();
 }
 #endif
 
 unsigned RenderViewImpl::GetLocalSessionHistoryLengthForTesting() const {
   return history_list_length_;
 }
 
 void RenderViewImpl::SetFocusAndActivateForTesting(bool enable) {
   if (enable) {
@@ skipping 14 matching lines @@
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 void RenderViewImpl::DidCommitCompositorFrame() {
   RenderWidget::DidCommitCompositorFrame();
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
 }
 
 }  // namespace content