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

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

Issue 2889193004: [WebView] Replace AwContentsIoThreadClient, InputStream and AwWebResourceResponse (Closed)
Patch Set: fix test crash Created 3 years, 7 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/browser/aw_contents.h" 5 #include "android_webview/browser/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_autofill_client.h" 10 #include "android_webview/browser/aw_autofill_client.h"
11 #include "android_webview/browser/aw_browser_context.h" 11 #include "android_webview/browser/aw_browser_context.h"
12 #include "android_webview/browser/aw_browser_main_parts.h" 12 #include "android_webview/browser/aw_browser_main_parts.h"
13 #include "android_webview/browser/aw_contents_client_bridge.h" 13 #include "android_webview/browser/aw_contents_client_bridge.h"
14 #include "android_webview/browser/aw_contents_io_thread_client_impl.h" 14 #include "android_webview/browser/aw_contents_io_thread_client.h"
15 #include "android_webview/browser/aw_contents_lifecycle_notifier.h" 15 #include "android_webview/browser/aw_contents_lifecycle_notifier.h"
16 #include "android_webview/browser/aw_gl_functor.h" 16 #include "android_webview/browser/aw_gl_functor.h"
17 #include "android_webview/browser/aw_pdf_exporter.h" 17 #include "android_webview/browser/aw_pdf_exporter.h"
18 #include "android_webview/browser/aw_picture.h" 18 #include "android_webview/browser/aw_picture.h"
19 #include "android_webview/browser/aw_renderer_priority_manager.h" 19 #include "android_webview/browser/aw_renderer_priority_manager.h"
20 #include "android_webview/browser/aw_resource_context.h" 20 #include "android_webview/browser/aw_resource_context.h"
21 #include "android_webview/browser/aw_web_contents_delegate.h" 21 #include "android_webview/browser/aw_web_contents_delegate.h"
22 #include "android_webview/browser/browser_view_renderer.h" 22 #include "android_webview/browser/browser_view_renderer.h"
23 #include "android_webview/browser/child_frame.h" 23 #include "android_webview/browser/child_frame.h"
24 #include "android_webview/browser/deferred_gpu_command_service.h" 24 #include "android_webview/browser/deferred_gpu_command_service.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 256
257 web_contents_delegate_.reset( 257 web_contents_delegate_.reset(
258 new AwWebContentsDelegate(env, web_contents_delegate)); 258 new AwWebContentsDelegate(env, web_contents_delegate));
259 web_contents_->SetDelegate(web_contents_delegate_.get()); 259 web_contents_->SetDelegate(web_contents_delegate_.get());
260 260
261 contents_client_bridge_.reset( 261 contents_client_bridge_.reset(
262 new AwContentsClientBridge(env, contents_client_bridge)); 262 new AwContentsClientBridge(env, contents_client_bridge));
263 AwContentsClientBridge::Associate(web_contents_.get(), 263 AwContentsClientBridge::Associate(web_contents_.get(),
264 contents_client_bridge_.get()); 264 contents_client_bridge_.get());
265 265
266 AwContentsIoThreadClientImpl::Associate(web_contents_.get(), 266 AwContentsIoThreadClient::Associate(web_contents_.get(), io_thread_client);
267 io_thread_client);
268 267
269 InterceptNavigationDelegate::Associate( 268 InterceptNavigationDelegate::Associate(
270 web_contents_.get(), base::MakeUnique<InterceptNavigationDelegate>( 269 web_contents_.get(), base::MakeUnique<InterceptNavigationDelegate>(
271 env, intercept_navigation_delegate)); 270 env, intercept_navigation_delegate));
272 271
273 // Finally, having setup the associations, release any deferred requests 272 // Finally, having setup the associations, release any deferred requests
274 for (content::RenderFrameHost* rfh : web_contents_->GetAllFrames()) { 273 for (content::RenderFrameHost* rfh : web_contents_->GetAllFrames()) {
275 int render_process_id = rfh->GetProcess()->GetID(); 274 int render_process_id = rfh->GetProcess()->GetID();
276 int render_frame_id = rfh->GetRoutingID(); 275 int render_frame_id = rfh->GetRoutingID();
277 AwResourceDispatcherHostDelegate::OnIoThreadClientReady(render_process_id, 276 AwResourceDispatcherHostDelegate::OnIoThreadClientReady(render_process_id,
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 1430
1432 return Java_AwContents_onRenderProcessGoneDetail(env, obj, child_process_id, 1431 return Java_AwContents_onRenderProcessGoneDetail(env, obj, child_process_id,
1433 crashed); 1432 crashed);
1434 } 1433 }
1435 1434
1436 void AwContents::RenderProcessReady(content::RenderProcessHost* host) { 1435 void AwContents::RenderProcessReady(content::RenderProcessHost* host) {
1437 UpdateRendererPriority(); 1436 UpdateRendererPriority();
1438 } 1437 }
1439 1438
1440 } // namespace android_webview 1439 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698