android_webview/native/aw_settings.cc - Issue 16932006: [Android WebView] Fix LoadsImagesAutomatically tests after crbug.com/224317

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/native/aw_settings.cc

Issue 16932006: [Android WebView] Fix LoadsImagesAutomatically tests after crbug.com/224317 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restored WebPermissionClient inheritance Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java ('k') | android_webview/renderer/aw_render_view_ext.h » ('j') | android_webview/renderer/aw_render_view_ext.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_settings.cc

diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc

index 8d44487e691c35500b4f12f3057754d12b7b4350..2d351ead1b7b94b6717ef81c3baefc936c1918c9 100644

--- a/android_webview/native/aw_settings.cc

+++ b/android_webview/native/aw_settings.cc

@@ -156,11 +156,14 @@ void AwSettings::UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj) {

prefs.default_fixed_font_size =

Java_AwSettings_getDefaultFixedFontSizeLocked(env, obj);

+ // Blink's LoadsImagesAutomatically and ImagesEnabled should be

joth 2013/06/13 17:27:14 nit: should -> must. (coupled with a bug link, I t

mnaganov (inactive) 2013/06/17 08:56:54 Done.

+ // set cris-cross to Android's. See

+ // https://code.google.com/p/chromium/issues/detail?id=224317#c26

prefs.loads_images_automatically =

+ Java_AwSettings_getImagesEnabledLocked(env, obj);

+ prefs.images_enabled =

Java_AwSettings_getLoadsImagesAutomaticallyLocked(env, obj);

- prefs.images_enabled = Java_AwSettings_getImagesEnabledLocked(env, obj);

prefs.javascript_enabled =

Java_AwSettings_getJavaScriptEnabledLocked(env, obj);