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

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

Issue 2626723003: Revert "Introduce ViewRoot forwarding input/view events to native" (Closed)
Patch Set: Created 3 years, 11 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 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( 1250 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
1251 web_contents_->GetRenderProcessHost()->GetID(), url::kFileScheme); 1251 web_contents_->GetRenderProcessHost()->GetID(), url::kFileScheme);
1252 } 1252 }
1253 1253
1254 void AwContents::ResumeLoadingCreatedPopupWebContents( 1254 void AwContents::ResumeLoadingCreatedPopupWebContents(
1255 JNIEnv* env, 1255 JNIEnv* env,
1256 const JavaParamRef<jobject>& obj) { 1256 const JavaParamRef<jobject>& obj) {
1257 web_contents_->ResumeLoadingCreatedWebContents(); 1257 web_contents_->ResumeLoadingCreatedWebContents();
1258 } 1258 }
1259 1259
1260 ScopedJavaLocalRef<jobject> AwContents::GetViewRoot(
1261 JNIEnv* env,
1262 const JavaParamRef<jobject>& obj) {
1263 return web_contents_->GetNativeView()->GetViewRoot();
1264 }
1265
1266 void SetShouldDownloadFavicons(JNIEnv* env, 1260 void SetShouldDownloadFavicons(JNIEnv* env,
1267 const JavaParamRef<jclass>& jclazz) { 1261 const JavaParamRef<jclass>& jclazz) {
1268 g_should_download_favicons = true; 1262 g_should_download_favicons = true;
1269 } 1263 }
1270 1264
1271 void AwContents::RenderViewHostChanged(content::RenderViewHost* old_host, 1265 void AwContents::RenderViewHostChanged(content::RenderViewHost* old_host,
1272 content::RenderViewHost* new_host) { 1266 content::RenderViewHost* new_host) {
1273 DCHECK(new_host); 1267 DCHECK(new_host);
1274 1268
1275 int process_id = new_host->GetProcess()->GetID(); 1269 int process_id = new_host->GetProcess()->GetID();
(...skipping 22 matching lines...) Expand all
1298 compositor_id.process_id = web_contents_->GetRenderProcessHost()->GetID(); 1292 compositor_id.process_id = web_contents_->GetRenderProcessHost()->GetID();
1299 compositor_id.routing_id = 1293 compositor_id.routing_id =
1300 web_contents_->GetRenderViewHost()->GetRoutingID(); 1294 web_contents_->GetRenderViewHost()->GetRoutingID();
1301 } else { 1295 } else {
1302 LOG(WARNING) << "failed setting the compositor on detaching interstitital"; 1296 LOG(WARNING) << "failed setting the compositor on detaching interstitital";
1303 } 1297 }
1304 browser_view_renderer_.SetActiveCompositorID(compositor_id); 1298 browser_view_renderer_.SetActiveCompositorID(compositor_id);
1305 } 1299 }
1306 1300
1307 } // namespace android_webview 1301 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | blimp/client/core/contents/blimp_contents_view_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698