Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: android_webview/native/aw_contents.cc

Issue 907723004: Revert of [WebView] Add unique visual state request ids. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 5c2b319e6caa02180a5aaf0e34bb1d68af42539c..6c468f6458606260d2c6c41870a541b021727f04 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -1037,27 +1037,22 @@
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(),
- request_id, result);
+ Java_AwContents_flushVisualStateCallback(
+ env, obj.obj(), callback->obj(), result);
}
} // namespace
-void AwContents::FlushVisualState(JNIEnv* env,
- jobject obj,
- jobject callback,
- int64 request_id) {
+void AwContents::FlushVisualState(JNIEnv* env, jobject obj, jobject callback) {
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),
- request_id));
+ web_contents_->GetMainFrame()->FlushVisualState(base::Bind(
+ &FlushVisualStateCallback, java_ref_, base::Owned(j_callback)));
}
void AwContents::ClearView(JNIEnv* env, jobject obj) {
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698