[WebView] Add unique visual state request ids.

android_webview/native/aw_contents.cc

 // Copyright 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 <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 1019 matching lines @@
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   browser_view_renderer_.EnableOnNewPicture(enabled);
 }
 
 namespace {
 void FlushVisualStateCallback(const JavaObjectWeakGlobalRef& java_ref,
                               ScopedJavaGlobalRef<jobject>* callback,
+                              int64 request_id,
                               bool result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref.get(env);
   if (obj.is_null())
      return;
   Java_AwContents_flushVisualStateCallback(
-      env, obj.obj(), callback->obj(), result);
+      env, obj.obj(), callback->obj(), request_id, result);
 }
 }  // namespace
 
-void AwContents::FlushVisualState(JNIEnv* env, jobject obj, jobject callback) {
+void AwContents::FlushVisualState(
+    JNIEnv* env, jobject obj, jobject callback, int64 request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
   web_contents_->GetMainFrame()->FlushVisualState(base::Bind(
-      &FlushVisualStateCallback, java_ref_, base::Owned(j_callback)));
+      &FlushVisualStateCallback, java_ref_, base::Owned(j_callback),
+      request_id));

[boliu, 2015/02/06 02:05:13]

uber-nit: clang-format this? somehow doesn't look right

[Ignacio Solla, 2015/02/09 11:35:26]

Done.

 }
 
 void AwContents::ClearView(JNIEnv* env, jobject obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   browser_view_renderer_.ClearView();
 }
 
 void AwContents::SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
                                        jstring url, jstring jextra_headers) {
   std::string extra_headers;
@@ skipping 67 matching lines @@
 
   AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, callback,
       GetMessagePortMessageFilter());
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview