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

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 1846653003: android webview: Keep zoom methods synchronous (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test compile Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/native/aw_contents.h" 5 #include "android_webview/native/aw_contents.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/browser/aw_browser_context.h" 10 #include "android_webview/browser/aw_browser_context.h"
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 web_contents_->FocusThroughTabTraversal(false); 1008 web_contents_->FocusThroughTabTraversal(false);
1009 } 1009 }
1010 1010
1011 void AwContents::SetBackgroundColor(JNIEnv* env, 1011 void AwContents::SetBackgroundColor(JNIEnv* env,
1012 const JavaParamRef<jobject>& obj, 1012 const JavaParamRef<jobject>& obj,
1013 jint color) { 1013 jint color) {
1014 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1014 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1015 render_view_host_ext_->SetBackgroundColor(color); 1015 render_view_host_ext_->SetBackgroundColor(color);
1016 } 1016 }
1017 1017
1018 void AwContents::SynchronizeRendererScroll(
1019 JNIEnv* env,
1020 const base::android::JavaParamRef<jobject>& obj) {
1021 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1022 browser_view_renderer_.SynchronizeRendererScroll();
1023 }
1024
1018 void AwContents::OnComputeScroll(JNIEnv* env, 1025 void AwContents::OnComputeScroll(JNIEnv* env,
1019 const JavaParamRef<jobject>& obj, 1026 const JavaParamRef<jobject>& obj,
1020 jlong animation_time_millis) { 1027 jlong animation_time_millis) {
1021 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1028 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1022 browser_view_renderer_.OnComputeScroll( 1029 browser_view_renderer_.OnComputeScroll(
1023 base::TimeTicks() + 1030 base::TimeTicks() +
1024 base::TimeDelta::FromMilliseconds(animation_time_millis)); 1031 base::TimeDelta::FromMilliseconds(animation_time_millis));
1025 } 1032 }
1026 1033
1027 jlong AwContents::ReleasePopupAwContents(JNIEnv* env, 1034 jlong AwContents::ReleasePopupAwContents(JNIEnv* env,
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1304 const JavaParamRef<jobject>& obj) { 1311 const JavaParamRef<jobject>& obj) {
1305 web_contents_->ResumeLoadingCreatedWebContents(); 1312 web_contents_->ResumeLoadingCreatedWebContents();
1306 } 1313 }
1307 1314
1308 void SetShouldDownloadFavicons(JNIEnv* env, 1315 void SetShouldDownloadFavicons(JNIEnv* env,
1309 const JavaParamRef<jclass>& jclazz) { 1316 const JavaParamRef<jclass>& jclazz) {
1310 g_should_download_favicons = true; 1317 g_should_download_favicons = true;
1311 } 1318 }
1312 1319
1313 } // namespace android_webview 1320 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698