diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-31 01:09:56 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-31 01:09:56 +0000 |
| commit | d8b3bb420d803158b4020a9b88189decf60c3497 (patch) | |
| tree | 52e99c896f3ce26acce1a5bc54e141f95f78ebcc /android_webview | |
| parent | 0784e881de49244307172fe579c6702c75ff7af5 (diff) | |
| download | chromium_src-d8b3bb420d803158b4020a9b88189decf60c3497.zip chromium_src-d8b3bb420d803158b4020a9b88189decf60c3497.tar.gz chromium_src-d8b3bb420d803158b4020a9b88189decf60c3497.tar.bz2 | |
[Android WebView] Wire up Blink's UseLegacyBackgroundSizeShorthandBehavior setting
R=benm@chromium.org
BUG=277157
TEST=AwSettingsTest#testUseLegacyBackgroundSizeShorthandBehavior
Review URL: https://chromiumcodereview.appspot.com/23483005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
3 files changed, 37 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 d82af60..10acd47 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 @@ -2504,6 +2504,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); |