Revert 182106

android_webview/renderer/aw_render_view_ext.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 "android_webview/renderer/aw_render_view_ext.h"
 
 #include <string>
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/renderer_picture_map.h"
 #include "base/bind.h"
 #include "base/string_piece.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/android_content_detection_prefixes.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_view.h"
-#include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "third_party/skia/include/core/SkPicture.h"
 
 namespace android_webview {
 
 namespace {
 
 GURL GetAbsoluteUrl(const WebKit::WebNode& node, const string16& url_fragment) {
   return GURL(node.document().completeURL(url_fragment));
 }
 
 string16 GetHref(const WebKit::WebElement& element) {
@@ skipping 80 matching lines @@
     data->type = AwHitTestData::EDIT_TEXT_TYPE;
     DCHECK(data->extra_data_for_type.length() == 0);
   }
 }
 
 }  // namespace
 
 AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view)
     : content::RenderViewObserver(render_view) {
   render_view->GetWebView()->setPermissionClient(this);
+  // TODO(leandrogracia): enable once the feature is available in RenderView.
   // TODO(leandrogracia): remove when SW rendering uses Ubercompositor.
   // Until then we need the callback enabled for SW mode invalidation.
   // http://crbug.com/170086.
-  capture_picture_enabled_ = true;
+  //render_view->SetCapturePictureCallback(
+  //    base::Bind(&AwRenderViewExt::OnPictureUpdate, AsWeakPtr()));
 }
 
 AwRenderViewExt::~AwRenderViewExt() {
+  // TODO(leandrogracia): enable once the feature is available in RenderView.
+  //render_view()->SetCapturePictureCallback(
+  //    content::RenderView::CapturePictureCallback());
   RendererPictureMap::GetInstance()->ClearRendererPicture(routing_id());
 }
 
 // static
 void AwRenderViewExt::RenderViewCreated(content::RenderView* render_view) {
   new AwRenderViewExt(render_view);  // |render_view| takes ownership.
 }
 
 bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 70 matching lines @@
         GetAbsoluteSrcUrl(child_img.toConst<WebKit::WebElement>());
   }
 
   PopulateHitTestData(absolute_link_url,
                       absolute_image_url,
                       render_view()->IsEditableNode(node),
                       &data);
   Send(new AwViewHostMsg_UpdateHitTestData(routing_id(), data));
 }
 
-void AwRenderViewExt::DidCommitCompositorFrame() {
-  if (!capture_picture_enabled_)
-    return;
-
-  skia::RefPtr<SkPicture> picture = render_view()->CapturePicture();
-  RendererPictureMap::GetInstance()->SetRendererPicture(routing_id(), picture);
-  Send(new AwViewHostMsg_PictureUpdated(routing_id()));
-}
-
 void AwRenderViewExt::OnDoHitTest(int view_x, int view_y) {
   if (!render_view() || !render_view()->GetWebView())
     return;
 
   const WebKit::WebHitTestResult result =
       render_view()->GetWebView()->hitTestResultAt(
           WebKit::WebPoint(view_x, view_y));
   AwHitTestData data;
 
   if (!result.urlElement().isNull()) {
     data.anchor_text = result.urlElement().innerText();
     data.href = GetHref(result.urlElement());
   }
 
   PopulateHitTestData(result.absoluteLinkURL(),
                       result.absoluteImageURL(),
                       result.isContentEditable(),
                       &data);
   Send(new AwViewHostMsg_UpdateHitTestData(routing_id(), data));
 }
 
 void AwRenderViewExt::OnEnableCapturePictureCallback(bool enable) {
-  capture_picture_enabled_ = enable;
+  // TODO(leandrogracia): enable once the feature is available in RenderView.
+  //render_view()->SetCapturePictureCallback(enable ?
+  //    base::Bind(&AwRenderViewExt::OnPictureUpdate, AsWeakPtr()) :
+  //    content::RenderView::CapturePictureCallback());
+}
+
+void AwRenderViewExt::OnPictureUpdate(skia::RefPtr<SkPicture> picture) {
+  RendererPictureMap::GetInstance()->SetRendererPicture(routing_id(), picture);
+  Send(new AwViewHostMsg_PictureUpdated(routing_id()));
 }
 
 void AwRenderViewExt::OnCapturePictureSync() {
-  RendererPictureMap::GetInstance()->SetRendererPicture(
-      routing_id(), render_view()->CapturePicture());
+  // TODO(leandrogracia): enable once the feature is available in RenderView.
+  //RendererPictureMap::GetInstance()->SetRendererPicture(
+  //    routing_id(), render_view()->CapturePicture());
 }
 
 }  // namespace android_webview