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

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

Issue 266353003: aw: Ubercomp mega patch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: r272176 Created 6 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | cc/trees/blocking_task_runner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_io_thread_client_impl.h" 5 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/common/devtools_instrumentation.h" 10 #include "android_webview/common/devtools_instrumentation.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 // static 169 // static
170 void AwContentsIoThreadClient::SubFrameCreated(int render_process_id, 170 void AwContentsIoThreadClient::SubFrameCreated(int render_process_id,
171 int parent_render_frame_id, 171 int parent_render_frame_id,
172 int child_render_frame_id) { 172 int child_render_frame_id) {
173 pair<int, int> parent_rfh_id(render_process_id, parent_render_frame_id); 173 pair<int, int> parent_rfh_id(render_process_id, parent_render_frame_id);
174 pair<int, int> child_rfh_id(render_process_id, child_render_frame_id); 174 pair<int, int> child_rfh_id(render_process_id, child_render_frame_id);
175 IoThreadClientData client_data; 175 IoThreadClientData client_data;
176 if (!RfhToIoThreadClientMap::GetInstance()->Get(parent_rfh_id, 176 if (!RfhToIoThreadClientMap::GetInstance()->Get(parent_rfh_id,
177 &client_data)) { 177 &client_data)) {
178 NOTREACHED(); 178 // NOTREACHED();
179 return; 179 return;
180 } 180 }
181 181
182 RfhToIoThreadClientMap::GetInstance()->Set(child_rfh_id, client_data); 182 RfhToIoThreadClientMap::GetInstance()->Set(child_rfh_id, client_data);
183 } 183 }
184 184
185 // static 185 // static
186 void AwContentsIoThreadClientImpl::RegisterPendingContents( 186 void AwContentsIoThreadClientImpl::RegisterPendingContents(
187 WebContents* web_contents) { 187 WebContents* web_contents) {
188 IoThreadClientData client_data; 188 IoThreadClientData client_data;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 Java_AwContentsIoThreadClient_newLoginRequest( 331 Java_AwContentsIoThreadClient_newLoginRequest(
332 env, java_object_.obj(), jrealm.obj(), jaccount.obj(), jargs.obj()); 332 env, java_object_.obj(), jrealm.obj(), jaccount.obj(), jargs.obj());
333 } 333 }
334 334
335 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) { 335 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) {
336 return RegisterNativesImpl(env); 336 return RegisterNativesImpl(env);
337 } 337 }
338 338
339 } // namespace android_webview 339 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | cc/trees/blocking_task_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698