Add a utility method to receive an AwContents

android_webview/native/aw_contents.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/native/aw_contents.h"
 
 #include <sys/system_properties.h>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 17 matching lines @@
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/supports_user_data.h"
 #include "cc/layer.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/x509_certificate.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/android/java_bitmap.h"
@@ skipping 60 matching lines @@
   AwContents* contents_;
 };
 
 }  // namespace
 
 // static
 AwContents* AwContents::FromWebContents(WebContents* web_contents) {
   return AwContentsUserData::GetContents(web_contents);
 }
 
+// static
+AwContents* AwContents::FromID(int render_process_id, int render_view_id) {
+  const content::RenderViewHost* rvh =

[Kristian Monsen, 2013/02/07 03:30:55]

Should this only be used on the UI thread? In that case it should be DCHECK'ed.

[sgurun-gerrit only, 2013/02/07 03:37:32]

One of the methods that the FromID calls already checks for it but let me put
another one here from better visibility.

On 2013/02/07 03:30:55, Kristian Monsen wrote:

+      content::RenderViewHost::FromID(render_process_id, render_view_id);
+  if (!rvh) return NULL;
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderViewHost(rvh);
+  if (!web_contents) return NULL;
+  return FromWebContents(web_contents);
+}
+
 AwContents::AwContents(JNIEnv* env,
                        jobject obj,
                        jobject web_contents_delegate)
     : java_ref_(env, obj),
       web_contents_delegate_(
           new AwWebContentsDelegate(env, web_contents_delegate)),
       view_visible_(false),
       compositor_visible_(false),
       is_composite_pending_(false),
       last_frame_context_(NULL) {
@@ skipping 783 matching lines @@
   CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id);
   if (render_view_id != web_contents_->GetRoutingID())
     return;
 
   // TODO(leandrogracia): delete when sw rendering uses Ubercompositor.
   // Invalidation should be provided by the compositor only.
   Invalidate();
 }
 
 }  // namespace android_webview