diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:47:40 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:47:40 +0000 |
| commit | 211a0e6fedd1bdca4f79d47d08a357a6bc1ace3b (patch) | |
| tree | f0a13e5110b07501ab2e3f69d095c58581e12edb | |
| parent | c90cde38a5c790f9dce9843d9fe30a5a5461ef73 (diff) | |
| download | chromium_src-211a0e6fedd1bdca4f79d47d08a357a6bc1ace3b.zip chromium_src-211a0e6fedd1bdca4f79d47d08a357a6bc1ace3b.tar.gz chromium_src-211a0e6fedd1bdca4f79d47d08a357a6bc1ace3b.tar.bz2 | |
Merge 220710 "[Android WebView] Wire up Blink's UseLegacyBackgro..."
> [Android WebView] Wire up Blink's UseLegacyBackgroundSizeShorthandBehavior setting
>
> R=benm@chromium.org
> BUG=277157
> TEST=AwSettingsTest#testUseLegacyBackgroundSizeShorthandBehavior
>
> Review URL: https://chromiumcodereview.appspot.com/23483005
TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/23550006
git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@221481 0039d316-1c4b-4281-b951-d872f2087c98
6 files changed, 40 insertions, 6 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index 0247ed4..deee0a597 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -82,7 +82,7 @@ public class AwSettings { private String mDefaultVideoPosterURL; private float mInitialPageScalePercent = 0; - private final boolean mSupportDeprecatedTargetDensityDPI; + private final boolean mSupportLegacyQuirks; private final boolean mPasswordEchoEnabled; @@ -197,7 +197,7 @@ public class AwSettings { mPasswordEchoEnabled = Settings.System.getInt(context.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, 1) == 1; - mSupportDeprecatedTargetDensityDPI = supportsLegacyQuirks; + mSupportLegacyQuirks = supportsLegacyQuirks; } // Defer initializing the native side until a native WebContents instance is set. } @@ -1036,8 +1036,8 @@ public class AwSettings { } @CalledByNative - private boolean getSupportDeprecatedTargetDensityDPILocked() { - return mSupportDeprecatedTargetDensityDPI; + private boolean getSupportLegacyQuirksLocked() { + return mSupportLegacyQuirks; } /** diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index ace591c..4eccd5c 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -2493,6 +2493,36 @@ public class AwSettingsTest extends AwTestBase { } } + @SmallTest + @Feature({"AndroidWebView", "Preferences"}) + // background shorthand property must not override background-size when + // it's already set. + public void testUseLegacyBackgroundSizeShorthandBehavior() throws Throwable { + final TestAwContentsClient contentClient = new TestAwContentsClient(); + final AwTestContainerView testContainerView = + createAwTestContainerViewOnMainSync(contentClient); + final AwContents awContents = testContainerView.getAwContents(); + AwSettings settings = getAwSettingsOnUiThread(awContents); + CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper(); + final String expectedBackgroundSize = "cover"; + final String page = "<html><head>" + + "<script>" + + "function getBackgroundSize() {" + + " var e = document.getElementById('test'); " + + " e.style.backgroundSize = '" + expectedBackgroundSize + "';" + + " e.style.background = 'center red url(dummy://test.png) no-repeat border-box'; " + + " return e.style.backgroundSize; " + + "}" + + "</script></head>" + + "<body onload='document.title=getBackgroundSize()'>" + + " <div id='test'> </div>" + + "</body></html>"; + settings.setJavaScriptEnabled(true); + loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false); + String actualBackgroundSize = getTitleOnUiThread(awContents); + assertEquals(expectedBackgroundSize, actualBackgroundSize); + } + static class ViewPair { private final AwContents contents0; private final TestAwContentsClient client0; diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index f47b20b..408eca0 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -203,8 +203,9 @@ void AwSettings::UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj) { prefs.default_video_poster_url = url.obj() ? GURL(ConvertJavaStringToUTF8(url)) : GURL(); - prefs.support_deprecated_target_density_dpi = - Java_AwSettings_getSupportDeprecatedTargetDensityDPILocked(env, obj); + bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); + prefs.support_deprecated_target_density_dpi = support_quirks; + prefs.use_legacy_background_size_shorthand_behavior = support_quirks; prefs.password_echo_enabled = Java_AwSettings_getPasswordEchoEnabled(env, obj); diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index a77c4c4..6841cde 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -201,6 +201,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences) IPC_STRUCT_TRAITS_MEMBER(user_gesture_required_for_media_playback) IPC_STRUCT_TRAITS_MEMBER(default_video_poster_url) IPC_STRUCT_TRAITS_MEMBER(support_deprecated_target_density_dpi) + IPC_STRUCT_TRAITS_MEMBER(use_legacy_background_size_shorthand_behavior) IPC_STRUCT_TRAITS_MEMBER(use_wide_viewport) #endif IPC_STRUCT_TRAITS_END() diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index 9ae6118..54caae8 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -126,6 +126,7 @@ WebPreferences::WebPreferences() double_tap_to_zoom_enabled(true), user_gesture_required_for_media_playback(true), support_deprecated_target_density_dpi(false), + use_legacy_background_size_shorthand_behavior(false), use_wide_viewport(true) #endif { diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h index 5f697d1..dced0ba 100644 --- a/webkit/common/webpreferences.h +++ b/webkit/common/webpreferences.h @@ -169,6 +169,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool user_gesture_required_for_media_playback; GURL default_video_poster_url; bool support_deprecated_target_density_dpi; + bool use_legacy_background_size_shorthand_behavior; bool use_wide_viewport; #endif |