Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
| 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" | 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" |
| 10 #include "android_webview/browser/in_process_view_renderer.h" | 10 #include "android_webview/browser/in_process_view_renderer.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 web_contents_->SetUserData(kAwContentsUserDataKey, | 140 web_contents_->SetUserData(kAwContentsUserDataKey, |
| 141 new AwContentsUserData(this)); | 141 new AwContentsUserData(this)); |
| 142 render_view_host_ext_.reset( | 142 render_view_host_ext_.reset( |
| 143 new AwRenderViewHostExt(this, web_contents_.get())); | 143 new AwRenderViewHostExt(this, web_contents_.get())); |
| 144 | 144 |
| 145 AwAutofillManagerDelegate* autofill_manager_delegate = | 145 AwAutofillManagerDelegate* autofill_manager_delegate = |
| 146 AwAutofillManagerDelegate::FromWebContents(web_contents_.get()); | 146 AwAutofillManagerDelegate::FromWebContents(web_contents_.get()); |
| 147 if (autofill_manager_delegate) | 147 if (autofill_manager_delegate) |
| 148 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); | 148 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); |
| 149 | 149 |
| 150 web_contents_->GetMutableRendererPrefs()->tap_multiple_targets_strategy = | 150 SetAndroidWebViewRendererPrefs(); |
| 151 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; | |
| 152 } | 151 } |
| 153 | 152 |
| 154 void AwContents::SetJavaPeers(JNIEnv* env, | 153 void AwContents::SetJavaPeers(JNIEnv* env, |
| 155 jobject obj, | 154 jobject obj, |
| 156 jobject aw_contents, | 155 jobject aw_contents, |
| 157 jobject web_contents_delegate, | 156 jobject web_contents_delegate, |
| 158 jobject contents_client_bridge, | 157 jobject contents_client_bridge, |
| 159 jobject io_thread_client, | 158 jobject io_thread_client, |
| 160 jobject intercept_navigation_delegate) { | 159 jobject intercept_navigation_delegate) { |
| 161 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 160 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 AwBrowserContext::FromWebContents(web_contents)-> | 206 AwBrowserContext::FromWebContents(web_contents)-> |
| 208 CreateUserPrefServiceIfNecessary(); | 207 CreateUserPrefServiceIfNecessary(); |
| 209 AwAutofillManagerDelegate::CreateForWebContents(web_contents); | 208 AwAutofillManagerDelegate::CreateForWebContents(web_contents); |
| 210 AutofillDriverImpl::CreateForWebContentsAndDelegate( | 209 AutofillDriverImpl::CreateForWebContentsAndDelegate( |
| 211 web_contents, | 210 web_contents, |
| 212 AwAutofillManagerDelegate::FromWebContents(web_contents), | 211 AwAutofillManagerDelegate::FromWebContents(web_contents), |
| 213 l10n_util::GetDefaultLocale(), | 212 l10n_util::GetDefaultLocale(), |
| 214 AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER); | 213 AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER); |
| 215 } | 214 } |
| 216 | 215 |
| 216 void AwContents::SetAndroidWebViewRendererPrefs() { | |
| 217 content::RendererPreferences* prefs = | |
| 218 web_contents_->GetMutableRendererPrefs(); | |
| 219 prefs->tap_multiple_targets_strategy = | |
| 220 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; | |
| 221 prefs->hinting = content::RENDERER_PREFERENCES_HINTING_SLIGHT; | |
| 222 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); | |
|
boliu
2013/08/29 16:48:31
Hmm, I think we do have a RVH at this point, but n
benm (inactive)
2013/08/29 16:53:36
Yes, that's correct AFAIU. This doesn't crash, any
joth
2013/08/29 18:19:40
Sounds like AwRVHExt OnRVHCreated would be the pla
boliu
2013/08/29 18:26:08
Not really. When render view is created, the exist
benm (inactive)
2013/08/30 13:47:43
We could move to AWRHExt::OnRVCreated, - this is a
| |
| 223 } | |
| 224 | |
| 217 void AwContents::SetAwAutofillManagerDelegate(jobject delegate) { | 225 void AwContents::SetAwAutofillManagerDelegate(jobject delegate) { |
| 218 JNIEnv* env = AttachCurrentThread(); | 226 JNIEnv* env = AttachCurrentThread(); |
| 219 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 227 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
| 220 if (obj.is_null()) | 228 if (obj.is_null()) |
| 221 return; | 229 return; |
| 222 Java_AwContents_setAwAutofillManagerDelegate(env, obj.obj(), delegate); | 230 Java_AwContents_setAwAutofillManagerDelegate(env, obj.obj(), delegate); |
| 223 } | 231 } |
| 224 | 232 |
| 225 AwContents::~AwContents() { | 233 AwContents::~AwContents() { |
| 226 DCHECK(AwContents::FromWebContents(web_contents_.get()) == this); | 234 DCHECK(AwContents::FromWebContents(web_contents_.get()) == this); |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 785 browser_view_renderer_->EnableOnNewPicture(enabled); | 793 browser_view_renderer_->EnableOnNewPicture(enabled); |
| 786 } | 794 } |
| 787 | 795 |
| 788 void AwContents::SetJsOnlineProperty(JNIEnv* env, | 796 void AwContents::SetJsOnlineProperty(JNIEnv* env, |
| 789 jobject obj, | 797 jobject obj, |
| 790 jboolean network_up) { | 798 jboolean network_up) { |
| 791 render_view_host_ext_->SetJsOnlineProperty(network_up); | 799 render_view_host_ext_->SetJsOnlineProperty(network_up); |
| 792 } | 800 } |
| 793 | 801 |
| 794 } // namespace android_webview | 802 } // namespace android_webview |
| OLD | NEW |