diff options
176 files changed, 3487 insertions, 917 deletions
@@ -14,17 +14,5 @@ # limitations under the License. # -# This package provides a layer of abstraction that allows the WebView -# implementation to be replaced in the dependency graph. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := webview -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := webviewchromium - -include $(BUILD_PHONY_PACKAGE) - # Include all the makefiles for subdirectories. -include $(call all-makefiles-under,$(LOCAL_PATH)) +include $(call all-subdir-makefiles) diff --git a/chromium/Android.mk b/chromium/Android.mk index ac2abf8..edcfdb2 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -17,73 +17,7 @@ # This package provides the 'glue' layer between Chromium and WebView. LOCAL_PATH := $(call my-dir) - CHROMIUM_PATH := external/chromium_org -ifneq ($(wildcard $(CHROMIUM_PATH)/src),) -CHROMIUM_PATH := external/chromium_org/src -endif - -# Java glue layer JAR, calls directly into the chromium AwContents Java API. -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := webviewchromium - -LOCAL_MANIFEST_FILE := AndroidManifest.xml - -LOCAL_MODULE_TAGS := optional - -LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources - -LOCAL_SRC_FILES := $(call all-java-files-under, java) - -LOCAL_JARJAR_RULES := $(CHROMIUM_PATH)/android_webview/build/jarjar-rules.txt - -LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium - -LOCAL_MULTILIB := both - -include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - $(android_webview_resources_dirs) -LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags) -LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium - -# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES. -LOCAL_REQUIRED_MODULES := \ - libwebviewchromium \ - libwebviewchromium_plat_support - -LOCAL_PROGUARD_ENABLED := full -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -LOCAL_JAVACFLAGS := -Xlint:unchecked -Werror - -include $(BUILD_PACKAGE) - -$(LOCAL_BUILT_MODULE): $(android_webview_intermediates_pak_additional_deps) -$(LOCAL_BUILT_MODULE): PRIVATE_ASSET_DIR += $(android_webview_asset_dirs) -# This is needed to force the grd->string.xml conversion to run before we -# attempt to generate the R.java file. -$(R_file_stamp): $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp - -ifneq ($(strip $(LOCAL_JARJAR_RULES)),) -# Add build rules to check that the jarjar'ed jar only contains whitelisted -# packages. Only enable this when we are running jarjar. -LOCAL_JAR_CHECK_WHITELIST := $(LOCAL_PATH)/jar_package_whitelist.txt - -jar_check_ok := $(intermediates.COMMON)/jar_check_ok -$(jar_check_ok): PRIVATE_JAR_CHECK := $(LOCAL_PATH)/tools/jar_check.py -$(jar_check_ok): PRIVATE_JAR_CHECK_WHITELIST := $(LOCAL_JAR_CHECK_WHITELIST) -$(jar_check_ok): $(full_classes_jarjar_jar) $(LOCAL_PATH)/tools/jar_check.py $(LOCAL_JAR_CHECK_WHITELIST) - @echo Jar check: $@ - $(hide) $(PRIVATE_JAR_CHECK) $< $(PRIVATE_JAR_CHECK_WHITELIST) - $(hide) touch $@ - -$(LOCAL_BUILT_MODULE): $(jar_check_ok) -endif - - # Native support library (libwebviewchromium_plat_support.so) - does NOT link # any native chromium code. @@ -118,5 +52,33 @@ LOCAL_CFLAGS := -Wno-unused-parameter include $(BUILD_SHARED_LIBRARY) + +# Loader library which handles address space reservation and relro sharing. +# Does NOT link any native chromium code. +include $(CLEAR_VARS) + +LOCAL_MODULE:= libwebviewchromium_loader + +LOCAL_SRC_FILES := \ + loader/loader.cpp \ + +LOCAL_CFLAGS := \ + -Werror \ + +LOCAL_SHARED_LIBRARIES += \ + libdl \ + liblog \ + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) + + +# Include the makefile for the main package unless we are using a prebuilt. +ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) +extra_java_files := +include $(LOCAL_PATH)/package.mk +endif + # Build other stuff include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/chromium/AndroidManifest.xml b/chromium/AndroidManifest.xml index ca4da4c..2d587d0 100644 --- a/chromium/AndroidManifest.xml +++ b/chromium/AndroidManifest.xml @@ -16,6 +16,15 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.webview"> - <application android:label="WebView Library"> + <uses-sdk android:minSdkVersion="21" + android:targetSdkVersion="21"> + </uses-sdk> + + <uses-feature android:name="android.hardware.touchscreen" + android:required="false"/> + + <application android:label="Android System WebView" + android:icon="@drawable/icon_webview" + android:multiArch="true"> </application> </manifest> diff --git a/chromium/CleanSpec.mk b/chromium/CleanSpec.mk index f76a96a..6e87126 100644 --- a/chromium/CleanSpec.mk +++ b/chromium/CleanSpec.mk @@ -44,6 +44,9 @@ #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/webviewchromium.*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/webview) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/webviewchromium.jar) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/webviewchromium) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/webview) # ****************************************************************** diff --git a/chromium/LICENSE b/chromium/LICENSE new file mode 100644 index 0000000..972bb2e --- /dev/null +++ b/chromium/LICENSE @@ -0,0 +1,27 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java b/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java index d34cc88..5f623e4 100644 --- a/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java +++ b/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java @@ -17,7 +17,6 @@ package com.android.webview.chromium; import android.util.Log; -import android.webkit.DebugFlags; import android.webkit.WebSettings.LayoutAlgorithm; import android.webkit.WebSettings.PluginState; import android.webkit.WebSettings.RenderPriority; @@ -29,6 +28,7 @@ import org.chromium.android_webview.AwSettings; public class ContentSettingsAdapter extends android.webkit.WebSettings { private static final String LOGTAG = ContentSettingsAdapter.class.getSimpleName(); + private static final boolean TRACE = false; private AwSettings mAwSettings; @@ -55,7 +55,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setSupportZoom(boolean support) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSupportZoom=" + support); + if (TRACE) Log.d(LOGTAG, "setSupportZoom=" + support); mAwSettings.setSupportZoom(support); } @@ -66,7 +66,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setBuiltInZoomControls(boolean enabled) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBuiltInZoomControls=" + enabled); + if (TRACE) Log.d(LOGTAG, "setBuiltInZoomControls=" + enabled); mAwSettings.setBuiltInZoomControls(enabled); } @@ -77,7 +77,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setDisplayZoomControls(boolean enabled) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDisplayZoomControls=" + enabled); + if (TRACE) Log.d(LOGTAG, "setDisplayZoomControls=" + enabled); mAwSettings.setDisplayZoomControls(enabled); } @@ -88,7 +88,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setAllowFileAccess(boolean allow) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowFileAccess=" + allow); + if (TRACE) Log.d(LOGTAG, "setAllowFileAccess=" + allow); mAwSettings.setAllowFileAccess(allow); } @@ -99,7 +99,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setAllowContentAccess(boolean allow) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowContentAccess=" + allow); + if (TRACE) Log.d(LOGTAG, "setAllowContentAccess=" + allow); mAwSettings.setAllowContentAccess(allow); } @@ -110,7 +110,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setLoadWithOverviewMode(boolean overview) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setLoadWithOverviewMode=" + overview); + if (TRACE) Log.d(LOGTAG, "setLoadWithOverviewMode=" + overview); mAwSettings.setLoadWithOverviewMode(overview); } @@ -120,6 +120,17 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { } @Override + public void setAcceptThirdPartyCookies(boolean accept) { + if (TRACE) Log.d(LOGTAG, "setAcceptThirdPartyCookies=" + accept); + mAwSettings.setAcceptThirdPartyCookies(accept); + } + + @Override + public boolean getAcceptThirdPartyCookies() { + return mAwSettings.getAcceptThirdPartyCookies(); + } + + @Override public void setEnableSmoothTransition(boolean enable) { // Intentional no-op. } @@ -143,7 +154,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setSaveFormData(boolean save) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSaveFormData=" + save); + if (TRACE) Log.d(LOGTAG, "setSaveFormData=" + save); mAwSettings.setSaveFormData(save); } @@ -165,7 +176,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setTextZoom(int textZoom) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setTextZoom=" + textZoom); + if (TRACE) Log.d(LOGTAG, "setTextZoom=" + textZoom); mAwSettings.setTextZoom(textZoom); } @@ -216,7 +227,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setUseWideViewPort(boolean use) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setUseWideViewPort=" + use); + if (TRACE) Log.d(LOGTAG, "setUseWideViewPort=" + use); mAwSettings.setUseWideViewPort(use); } @@ -227,7 +238,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setSupportMultipleWindows(boolean support) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSupportMultipleWindows=" + support); + if (TRACE) Log.d(LOGTAG, "setSupportMultipleWindows=" + support); mAwSettings.setSupportMultipleWindows(support); } @@ -262,7 +273,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setStandardFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setStandardFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setStandardFontFamily=" + font); mAwSettings.setStandardFontFamily(font); } @@ -273,7 +284,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setFixedFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setFixedFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setFixedFontFamily=" + font); mAwSettings.setFixedFontFamily(font); } @@ -284,7 +295,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setSansSerifFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSansSerifFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setSansSerifFontFamily=" + font); mAwSettings.setSansSerifFontFamily(font); } @@ -295,7 +306,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setSerifFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSerifFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setSerifFontFamily=" + font); mAwSettings.setSerifFontFamily(font); } @@ -306,7 +317,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setCursiveFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setCursiveFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setCursiveFontFamily=" + font); mAwSettings.setCursiveFontFamily(font); } @@ -317,7 +328,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setFantasyFontFamily(String font) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setFantasyFontFamily=" + font); + if (TRACE) Log.d(LOGTAG, "setFantasyFontFamily=" + font); mAwSettings.setFantasyFontFamily(font); } @@ -328,7 +339,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setMinimumFontSize(int size) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMinimumFontSize=" + size); + if (TRACE) Log.d(LOGTAG, "setMinimumFontSize=" + size); mAwSettings.setMinimumFontSize(size); } @@ -339,7 +350,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setMinimumLogicalFontSize(int size) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMinimumLogicalFontSize=" + size); + if (TRACE) Log.d(LOGTAG, "setMinimumLogicalFontSize=" + size); mAwSettings.setMinimumLogicalFontSize(size); } @@ -350,7 +361,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setDefaultFontSize(int size) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultFontSize=" + size); + if (TRACE) Log.d(LOGTAG, "setDefaultFontSize=" + size); mAwSettings.setDefaultFontSize(size); } @@ -361,7 +372,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setDefaultFixedFontSize(int size) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultFixedFontSize=" + size); + if (TRACE) Log.d(LOGTAG, "setDefaultFixedFontSize=" + size); mAwSettings.setDefaultFixedFontSize(size); } @@ -372,7 +383,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setLoadsImagesAutomatically(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setLoadsImagesAutomatically=" + flag); + if (TRACE) Log.d(LOGTAG, "setLoadsImagesAutomatically=" + flag); mAwSettings.setLoadsImagesAutomatically(flag); } @@ -383,7 +394,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setBlockNetworkImage(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBlockNetworkImage=" + flag); + if (TRACE) Log.d(LOGTAG, "setBlockNetworkImage=" + flag); mAwSettings.setImagesEnabled(!flag); } @@ -394,7 +405,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setBlockNetworkLoads(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBlockNetworkLoads=" + flag); + if (TRACE) Log.d(LOGTAG, "setBlockNetworkLoads=" + flag); mAwSettings.setBlockNetworkLoads(flag); } @@ -405,31 +416,31 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setJavaScriptEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setJavaScriptEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setJavaScriptEnabled=" + flag); mAwSettings.setJavaScriptEnabled(flag); } @Override public void setAllowUniversalAccessFromFileURLs(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowUniversalAccessFromFileURLs=" + flag); + if (TRACE) Log.d(LOGTAG, "setAllowUniversalAccessFromFileURLs=" + flag); mAwSettings.setAllowUniversalAccessFromFileURLs(flag); } @Override public void setAllowFileAccessFromFileURLs(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowFileAccessFromFileURLs=" + flag); + if (TRACE) Log.d(LOGTAG, "setAllowFileAccessFromFileURLs=" + flag); mAwSettings.setAllowFileAccessFromFileURLs(flag); } @Override public synchronized void setPluginsEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setPluginsEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setPluginsEnabled=" + flag); mAwSettings.setPluginsEnabled(flag); } @Override public synchronized void setPluginState(PluginState state) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setPluginState=" + state); + if (TRACE) Log.d(LOGTAG, "setPluginState=" + state); mAwSettings.setPluginState(state); } @@ -445,13 +456,13 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setAppCacheEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAppCacheEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setAppCacheEnabled=" + flag); mAwSettings.setAppCacheEnabled(flag); } @Override public synchronized void setAppCachePath(String appCachePath) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAppCachePath=" + appCachePath); + if (TRACE) Log.d(LOGTAG, "setAppCachePath=" + appCachePath); mAwSettings.setAppCachePath(appCachePath); } @@ -462,13 +473,13 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setDatabaseEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDatabaseEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setDatabaseEnabled=" + flag); mAwSettings.setDatabaseEnabled(flag); } @Override public synchronized void setDomStorageEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDomStorageEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setDomStorageEnabled=" + flag); mAwSettings.setDomStorageEnabled(flag); } @@ -490,7 +501,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setGeolocationEnabled(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setGeolocationEnabled=" + flag); + if (TRACE) Log.d(LOGTAG, "setGeolocationEnabled=" + flag); mAwSettings.setGeolocationEnabled(flag); } @@ -521,7 +532,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setJavaScriptCanOpenWindowsAutomatically=" + flag); + if (TRACE) Log.d(LOGTAG, "setJavaScriptCanOpenWindowsAutomatically=" + flag); mAwSettings.setJavaScriptCanOpenWindowsAutomatically(flag); } @@ -532,7 +543,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setDefaultTextEncodingName(String encoding) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultTextEncodingName=" + encoding); + if (TRACE) Log.d(LOGTAG, "setDefaultTextEncodingName=" + encoding); mAwSettings.setDefaultTextEncodingName(encoding); } @@ -543,7 +554,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public synchronized void setUserAgentString(String ua) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setUserAgentString=" + ua); + if (TRACE) Log.d(LOGTAG, "setUserAgentString=" + ua); mAwSettings.setUserAgentString(ua); } @@ -554,7 +565,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setNeedInitialFocus(boolean flag) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setNeedInitialFocus=" + flag); + if (TRACE) Log.d(LOGTAG, "setNeedInitialFocus=" + flag); mAwSettings.setShouldFocusFirstNode(flag); } @@ -565,7 +576,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setCacheMode(int mode) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setCacheMode=" + mode); + if (TRACE) Log.d(LOGTAG, "setCacheMode=" + mode); mAwSettings.setCacheMode(mode); } @@ -576,7 +587,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { @Override public void setMediaPlaybackRequiresUserGesture(boolean require) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMediaPlaybackRequiresUserGesture=" + require); + if (TRACE) Log.d(LOGTAG, "setMediaPlaybackRequiresUserGesture=" + require); mAwSettings.setMediaPlaybackRequiresUserGesture(require); } @@ -584,4 +595,24 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { public boolean getMediaPlaybackRequiresUserGesture() { return mAwSettings.getMediaPlaybackRequiresUserGesture(); } + +// @Override + public void setMixedContentMode(int mode) { + mAwSettings.setMixedContentMode(mode); + } + +// @Override + public int getMixedContentMode() { + return mAwSettings.getMixedContentMode(); + } + +// @Override + public void setVideoOverlayForEmbeddedEncryptedVideoEnabled(boolean flag) { + mAwSettings.setVideoOverlayForEmbeddedVideoEnabled(flag); + } + +// @Override + public boolean getVideoOverlayForEmbeddedEncryptedVideoEnabled() { + return mAwSettings.getVideoOverlayForEmbeddedVideoEnabled(); + } } diff --git a/chromium/java/com/android/webview/chromium/CookieManagerAdapter.java b/chromium/java/com/android/webview/chromium/CookieManagerAdapter.java index f6e1360..44c2258 100644 --- a/chromium/java/com/android/webview/chromium/CookieManagerAdapter.java +++ b/chromium/java/com/android/webview/chromium/CookieManagerAdapter.java @@ -20,6 +20,8 @@ import android.net.ParseException; import android.net.WebAddress; import android.util.Log; import android.webkit.CookieManager; +import android.webkit.ValueCallback; +import android.webkit.WebView; import org.chromium.android_webview.AwCookieManager; @@ -44,6 +46,16 @@ public class CookieManagerAdapter extends CookieManager { } @Override + public synchronized void setAcceptThirdPartyCookies(WebView webView, boolean accept) { + webView.getSettings().setAcceptThirdPartyCookies(accept); + } + + @Override + public synchronized boolean acceptThirdPartyCookies(WebView webView) { + return webView.getSettings().getAcceptThirdPartyCookies(); + } + + @Override public void setCookie(String url, String value) { try { mChromeCookieManager.setCookie(fixupUrl(url), value); @@ -53,6 +65,15 @@ public class CookieManagerAdapter extends CookieManager { } @Override + public void setCookie(String url, String value, ValueCallback<Boolean> callback) { + try { + mChromeCookieManager.setCookie(fixupUrl(url), value, callback); + } catch (ParseException e) { + Log.e(LOGTAG, "Not setting cookie due to error parsing URL: " + url, e); + } + } + + @Override public String getCookie(String url) { try { return mChromeCookieManager.getCookie(fixupUrl(url)); @@ -74,12 +95,22 @@ public class CookieManagerAdapter extends CookieManager { @Override public void removeSessionCookie() { - mChromeCookieManager.removeSessionCookie(); + mChromeCookieManager.removeSessionCookies(); + } + + @Override + public void removeSessionCookies(ValueCallback<Boolean> callback) { + mChromeCookieManager.removeSessionCookies(callback); } @Override public void removeAllCookie() { - mChromeCookieManager.removeAllCookie(); + mChromeCookieManager.removeAllCookies(); + } + + @Override + public void removeAllCookies(ValueCallback<Boolean> callback) { + mChromeCookieManager.removeAllCookies(callback); } @Override @@ -98,10 +129,14 @@ public class CookieManagerAdapter extends CookieManager { } @Override - protected void flushCookieStore() { + public void flush() { mChromeCookieManager.flushCookieStore(); } + protected void flushCookieStore() { + flush(); + } + @Override protected boolean allowFileSchemeCookiesImpl() { return mChromeCookieManager.allowFileSchemeCookies(); diff --git a/chromium/java/com/android/webview/chromium/DrawGLFunctor.java b/chromium/java/com/android/webview/chromium/DrawGLFunctor.java index 4fb0e26..7f7adeb 100644 --- a/chromium/java/com/android/webview/chromium/DrawGLFunctor.java +++ b/chromium/java/com/android/webview/chromium/DrawGLFunctor.java @@ -16,7 +16,6 @@ package com.android.webview.chromium; -import android.view.DisplayList; import android.view.HardwareCanvas; import android.view.ViewRootImpl; import android.util.Log; @@ -42,6 +41,7 @@ class DrawGLFunctor { } public void destroy() { + detach(); if (mCleanupReference != null) { mCleanupReference.cleanupNow(); mCleanupReference = null; @@ -53,19 +53,26 @@ class DrawGLFunctor { mDestroyRunnable.detachNativeFunctor(); } - public boolean requestDrawGL(HardwareCanvas canvas, ViewRootImpl viewRootImpl) { + public boolean requestDrawGL(HardwareCanvas canvas, ViewRootImpl viewRootImpl, + boolean waitForCompletion) { if (mDestroyRunnable.mNativeDrawGLFunctor == 0) { throw new RuntimeException("requested DrawGL on already destroyed DrawGLFunctor"); } + if (viewRootImpl == null) { + // Can happen during teardown when window is leaked. + return false; + } + mDestroyRunnable.mViewRootImpl = viewRootImpl; - if (canvas != null) { - int ret = canvas.callDrawGLFunction(mDestroyRunnable.mNativeDrawGLFunctor); - if (ret != DisplayList.STATUS_DONE) { - Log.e(TAG, "callDrawGLFunction error: " + ret); - return false; - } - } else { - viewRootImpl.attachFunctor(mDestroyRunnable.mNativeDrawGLFunctor); + if (canvas == null) { + viewRootImpl.invokeFunctor(mDestroyRunnable.mNativeDrawGLFunctor, waitForCompletion); + return true; + } + + canvas.callDrawGLFunction(mDestroyRunnable.mNativeDrawGLFunctor); + if (waitForCompletion) { + viewRootImpl.invokeFunctor(mDestroyRunnable.mNativeDrawGLFunctor, + waitForCompletion); } return true; } diff --git a/chromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java b/chromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java new file mode 100644 index 0000000..07222f2 --- /dev/null +++ b/chromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.chromium; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.webkit.WebChromeClient.FileChooserParams; + +import org.chromium.android_webview.AwContentsClient; + +public class FileChooserParamsAdapter extends FileChooserParams { + private AwContentsClient.FileChooserParams mParams; + + public static Uri[] parseFileChooserResult(int resultCode, Intent intent) { + if (resultCode == Activity.RESULT_CANCELED) { + return null; + } + Uri result = intent == null || resultCode != Activity.RESULT_OK ? null + : intent.getData(); + + Uri[] uris = null; + if (result != null) { + uris = new Uri[1]; + uris[0] = result; + } + return uris; + } + + FileChooserParamsAdapter(AwContentsClient.FileChooserParams params, Context context) { + mParams = params; + } + + @Override + public int getMode() { + return mParams.mode; + } + + @Override + public String[] getAcceptTypes() { + if (mParams.acceptTypes == null) + return new String[0]; + return mParams.acceptTypes.split(";"); + } + + @Override + public boolean isCaptureEnabled() { + return mParams.capture; + } + + @Override + public CharSequence getTitle() { + return mParams.title; + } + + @Override + public String getFilenameHint() { + return mParams.defaultFilename; + } + + @Override + public Intent createIntent() { + // TODO: Move this code to Aw. Once code is moved + // and merged to M37 get rid of this. + String mimeType = "*/*"; + if (mParams.acceptTypes != null && !mParams.acceptTypes.trim().isEmpty()) + mimeType = mParams.acceptTypes.split(";")[0]; + + Intent i = new Intent(Intent.ACTION_GET_CONTENT); + i.addCategory(Intent.CATEGORY_OPENABLE); + i.setType(mimeType); + return i; + } +} diff --git a/chromium/java/com/android/webview/chromium/ResourceRewriter.java b/chromium/java/com/android/webview/chromium/ResourceRewriter.java new file mode 100644 index 0000000..683277a --- /dev/null +++ b/chromium/java/com/android/webview/chromium/ResourceRewriter.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.chromium; + +import android.content.Context; +import android.util.SparseArray; + +/** + * Helper class used to fix up resource ids. + * This is mostly a copy of the code in frameworks/base/core/java/android/app/LoadedApk.java. + * TODO: Remove if a cleaner mechanism is provided (either public API or AAPT is changed to generate + * this code). + */ +class ResourceRewriter { + + public static void rewriteRValues(Context ctx) { + // Rewrite the R 'constants' for the WebView library apk. + SparseArray<String> packageIdentifiers = ctx.getResources().getAssets() + .getAssignedPackageIdentifiers(); + + final int N = packageIdentifiers.size(); + for (int i = 0; i < N; i++) { + final String name = packageIdentifiers.valueAt(i); + + // The resources are always called com.android.webview even if the manifest has had the + // package renamed. + if ("com.android.webview".equals(name)) { + final int id = packageIdentifiers.keyAt(i); + + // TODO: We should use jarjar to remove the redundant R classes here, but due + // to a bug in jarjar it's not possible to rename classes with '$' in their name. + // See b/15684775. + com.android.webview.chromium.R.onResourcesLoaded(id); + org.chromium.ui.R.onResourcesLoaded(id); + org.chromium.content.R.onResourcesLoaded(id); + + break; + } + } + } +} diff --git a/chromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java b/chromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java deleted file mode 100644 index 667259e..0000000 --- a/chromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.webview.chromium; - -import android.content.ComponentCallbacks; -import android.content.Context; -import android.content.ContextWrapper; -import android.content.res.AssetManager; -import android.content.res.Resources; -import android.view.LayoutInflater; - -import java.util.WeakHashMap; - -/** - * This class allows us to wrap the application context so we can use resources from the WebView - * apk. We keep a weak map from contexts to wrapped contexts to avoid constantly re-wrapping - * or doubly wrapping contexts. - */ -public class ResourcesContextWrapperFactory { - private static WeakHashMap<Context,ContextWrapper> sCtxToWrapper - = new WeakHashMap<Context,ContextWrapper>(); - private static Object sLock = new Object(); - - private ResourcesContextWrapperFactory() { - } - - public static Context get(Context ctx) { - ContextWrapper wrappedCtx; - synchronized (sLock) { - wrappedCtx = sCtxToWrapper.get(ctx); - if (wrappedCtx == null) { - wrappedCtx = createWrapper(ctx); - sCtxToWrapper.put(ctx, wrappedCtx); - } - } - return wrappedCtx; - } - - // Wrap Context so that we can use resources from the webview resource apk. - private static ContextWrapper createWrapper(final Context ctx) { - final Resources resources = WebViewChromiumFactoryProvider.getWebViewPackageResources(ctx); - final Resources.Theme theme = resources.newTheme(); - - return new ContextWrapper(ctx) { - @Override - public ClassLoader getClassLoader() { - final ClassLoader appCl = getBaseContext().getClassLoader(); - final ClassLoader webViewCl = this.getClass().getClassLoader(); - return new ClassLoader() { - @Override - protected Class<?> findClass(String name) throws ClassNotFoundException { - // First look in the WebViewProvider class loader. - try { - return webViewCl.loadClass(name); - } catch (ClassNotFoundException e) { - // Look in the app class loader; allowing it to throw - // ClassNotFoundException. - return appCl.loadClass(name); - } - } - }; - } - - @Override - public Context getApplicationContext() { - return get(ctx.getApplicationContext()); - } - - @Override - public void registerComponentCallbacks(ComponentCallbacks callback) { - // We have to override registerComponentCallbacks and unregisterComponentCallbacks - // since they call getApplicationContext().[un]registerComponentCallbacks() - // which causes us to go into a loop. - ctx.registerComponentCallbacks(callback); - } - - @Override - public void unregisterComponentCallbacks(ComponentCallbacks callback) { - ctx.unregisterComponentCallbacks(callback); - } - - @Override - public Object getSystemService(String name) { - if (name.equals(Context.LAYOUT_INFLATER_SERVICE)) { - LayoutInflater i = (LayoutInflater) getBaseContext().getSystemService(name); - return i.cloneInContext(this); - } else { - return getBaseContext().getSystemService(name); - } - } - - @Override - public AssetManager getAssets() { - return resources.getAssets(); - } - - @Override - public Resources getResources() { - return resources; - } - - @Override - public Resources.Theme getTheme() { - return theme; - } - }; - } -} diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index 23d34d7..c08eb41 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -17,14 +17,17 @@ package com.android.webview.chromium; import android.content.Context; +import android.content.ContextWrapper; import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Picture; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.net.Uri; import android.net.http.SslCertificate; import android.os.Build; import android.os.Bundle; @@ -36,6 +39,7 @@ import android.util.Base64; import android.util.Log; import android.view.HardwareCanvas; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.View.MeasureSpec; @@ -54,11 +58,14 @@ import android.webkit.WebChromeClient; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.webkit.WebViewFactory; import android.webkit.WebViewProvider; +import android.webkit.WebChromeClient.CustomViewCallback; import android.widget.TextView; import org.chromium.android_webview.AwBrowserContext; import org.chromium.android_webview.AwContents; +import org.chromium.android_webview.AwContentsStatics; import org.chromium.android_webview.AwLayoutSizer; import org.chromium.android_webview.AwSettings; import org.chromium.android_webview.AwPrintDocumentAdapter; @@ -144,6 +151,11 @@ class WebViewChromium implements WebViewProvider, private WebViewChromiumFactoryProvider mFactory; + private static boolean sRecordWholeDocumentEnabledByApi = false; + static void enableSlowWholeDocumentDraw() { + sRecordWholeDocumentEnabledByApi = true; + } + // This does not touch any global / non-threadsafe state, but note that // init is ofter called right after and is NOT threadsafe. public WebViewChromium(WebViewChromiumFactoryProvider factory, WebView webView, @@ -154,6 +166,8 @@ class WebViewChromium implements WebViewProvider, mAppTargetSdkVersion = mWebView.getContext().getApplicationInfo().targetSdkVersion; mFactory = factory; mRunQueue = new WebViewChromiumRunQueue(); + String webViewAssetPath = WebViewFactory.getLoadedPackageInfo().applicationInfo.sourceDir; + mWebView.getContext().getAssets().addAssetPath(webViewAssetPath); } static void completeWindowCreation(WebView parent, WebView child) { @@ -235,6 +249,13 @@ class WebViewChromium implements WebViewProvider, mWebView.getContext(), isAccessFromFileURLsGrantedByDefault, areLegacyQuirksEnabled)); + if (mAppTargetSdkVersion <= Build.VERSION_CODES.KITKAT) { + mWebSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + // On KK and older versions we always allowed third party cookies. + mWebSettings.setAcceptThirdPartyCookies(true); + mWebSettings.getAwSettings().setZeroLayoutHeightDisablesViewportQuirk(true); + } + mRunQueue.addTask(new Runnable() { @Override public void run() { @@ -250,8 +271,42 @@ class WebViewChromium implements WebViewProvider, }); } + // Wrap Context so that we can use resources from the webview resource apk. + private static Context resourcesContextWrapper(final Context ctx) { + return new ContextWrapper(ctx) { + @Override + public ClassLoader getClassLoader() { + final ClassLoader appCl = getBaseContext().getClassLoader(); + final ClassLoader webViewCl = this.getClass().getClassLoader(); + return new ClassLoader() { + @Override + protected Class<?> findClass(String name) throws ClassNotFoundException { + // First look in the WebViewProvider class loader. + try { + return webViewCl.loadClass(name); + } catch (ClassNotFoundException e) { + // Look in the app class loader; allowing it to throw ClassNotFoundException. + return appCl.loadClass(name); + } + } + }; + } + + @Override + public Object getSystemService(String name) { + if (name.equals(Context.LAYOUT_INFLATER_SERVICE)) { + LayoutInflater i = (LayoutInflater) getBaseContext().getSystemService(name); + return i.cloneInContext(this); + } else { + return getBaseContext().getSystemService(name); + } + } + + }; + } + private void initForReal() { - Context ctx = ResourcesContextWrapperFactory.get(mWebView.getContext()); + Context ctx = resourcesContextWrapper(mWebView.getContext()); mAwContents = new AwContents(mFactory.getBrowserContext(), mWebView, ctx, new InternalAccessAdapter(), new WebViewNativeGLDelegate(), mContentsClientAdapter, mWebSettings.getAwSettings()); @@ -262,6 +317,15 @@ class WebViewChromium implements WebViewProvider, AwContents.setShouldDownloadFavicons(); } + AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi || + mAppTargetSdkVersion < Build.VERSION_CODES.L); + + if (mAppTargetSdkVersion <= Build.VERSION_CODES.KITKAT) { + // On KK and older versions, JavaScript objects injected via addJavascriptInterface + // were not inspectable. + mAwContents.disableJavascriptInterfacesInspection(); + } + // TODO: This assumes AwContents ignores second Paint param. mAwContents.setLayerType(mWebView.getLayerType(), null); } @@ -1269,9 +1333,43 @@ class WebViewChromium implements WebViewProvider, @Override public void setWebChromeClient(WebChromeClient client) { + mWebSettings.getAwSettings().setFullscreenSupported(doesSupportFullscreen(client)); mContentsClientAdapter.setWebChromeClient(client); } + /** + * Returns true if the supplied {@link WebChromeClient} supports fullscreen. + * + * <p>For fullscreen support, implementations of {@link WebChromeClient#onShowCustomView} + * and {@link WebChromeClient#onHideCustomView()} are required. + */ + private boolean doesSupportFullscreen(WebChromeClient client) { + if (client == null) { + return false; + } + Class<?> clientClass = client.getClass(); + boolean foundShowMethod = false; + boolean foundHideMethod = false; + while (clientClass != WebChromeClient.class && (!foundShowMethod || !foundHideMethod)) { + if (!foundShowMethod) { + try { + clientClass.getDeclaredMethod("onShowCustomView", View.class, + CustomViewCallback.class); + foundShowMethod = true; + } catch (NoSuchMethodException e) { } + } + + if (!foundHideMethod) { + try { + clientClass.getDeclaredMethod("onHideCustomView"); + foundHideMethod = true; + } catch (NoSuchMethodException e) { } + } + clientClass = clientClass.getSuperclass(); + } + return foundShowMethod && foundHideMethod; + } + @Override public void setPictureListener(final WebView.PictureListener listener) { if (checkNeedsPost()) { @@ -1404,6 +1502,14 @@ class WebViewChromium implements WebViewProvider, } @Override + public boolean zoomBy(float factor) { + mFactory.startYourEngines(true); + // This is an L API and therefore we can enforce stricter threading constraints. + checkThread(); + return mAwContents.zoomBy(factor); + } + + @Override public void dumpViewHierarchyWithProperties(BufferedWriter out, int level) { // Intentional no-op } @@ -1931,10 +2037,12 @@ class WebViewChromium implements WebViewProvider, // we won't need it again. } - @Override - public PrintDocumentAdapter createPrintDocumentAdapter() { - checkThread(); - return new AwPrintDocumentAdapter(mAwContents.getPdfExporter()); + public void onStartTemporaryDetach() { + mAwContents.onStartTemporaryDetach(); + } + + public void onFinishTemporaryDetach() { + mAwContents.onFinishTemporaryDetach(); } // WebViewProvider.ScrollDelegate implementation ---------------------------------------------- @@ -2029,34 +2137,27 @@ class WebViewChromium implements WebViewProvider, mAwContents.computeScroll(); } + // TODO(sgurun) this is only to have master-gpl compiling. + public PrintDocumentAdapter createPrintDocumentAdapter() { + return createPrintDocumentAdapter("default"); + } + + //@Override TODO(sgurun) commenting this out to have master-gpl compiling. + public PrintDocumentAdapter createPrintDocumentAdapter(String documentName) { + checkThread(); + return new AwPrintDocumentAdapter(mAwContents.getPdfExporter(), documentName); + } + // AwContents.NativeGLDelegate implementation -------------------------------------- private class WebViewNativeGLDelegate implements AwContents.NativeGLDelegate { - public boolean requestDrawGL(Canvas canvas) { - return requestDrawGL(canvas, false, mWebView); - } - - // @Override + @Override public boolean requestDrawGL(Canvas canvas, boolean waitForCompletion, View containerView) { if (mGLfunctor == null) { mGLfunctor = new DrawGLFunctor(mAwContents.getAwDrawGLViewContext()); } - boolean result = mGLfunctor.requestDrawGL((HardwareCanvas)canvas, - containerView.getViewRootImpl()); - if (result && waitForCompletion) { - Runnable r = new Runnable() { - @Override - public void run() { - } - }; - result = containerView.executeHardwareAction(r); - } - return result; - } - - // @Override - public boolean executeHardwareAction(Runnable action) { - return mWebView.executeHardwareAction(action); + return mGLfunctor.requestDrawGL( + (HardwareCanvas) canvas, containerView.getViewRootImpl(), waitForCompletion); } @Override @@ -2147,5 +2248,10 @@ class WebViewChromium implements WebViewProvider, public void setMeasuredDimension(int measuredWidth, int measuredHeight) { mWebViewPrivate.setMeasuredDimension(measuredWidth, measuredHeight); } + + // @Override + public boolean super_onHoverEvent(MotionEvent event) { + return mWebViewPrivate.super_onHoverEvent(event); + } } } diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 16a9f81..8043ad8 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -22,11 +22,14 @@ import android.app.ActivityManager; import android.app.ActivityThread; import android.content.ComponentCallbacks2; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; -import android.content.res.Resources; +import android.net.Uri; import android.os.Build; import android.os.Looper; +import android.os.StrictMode; +import android.os.SystemProperties; +import android.os.Trace; import android.util.Log; import android.webkit.CookieManager; import android.webkit.GeolocationPermissions; @@ -41,6 +44,7 @@ import android.webkit.WebViewProvider; import org.chromium.android_webview.AwBrowserContext; import org.chromium.android_webview.AwBrowserProcess; import org.chromium.android_webview.AwContents; +import org.chromium.android_webview.AwContentsStatics; import org.chromium.android_webview.AwCookieManager; import org.chromium.android_webview.AwDevToolsServer; import org.chromium.android_webview.AwFormDatabase; @@ -51,21 +55,25 @@ import org.chromium.android_webview.AwSettings; import org.chromium.base.CommandLine; import org.chromium.base.MemoryPressureListener; import org.chromium.base.PathService; +import org.chromium.base.PathUtils; import org.chromium.base.ResourceExtractor; import org.chromium.base.ThreadUtils; +import org.chromium.base.TraceEvent; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.app.ContentMain; import org.chromium.content.browser.ContentViewStatics; +import java.io.File; import java.lang.ref.WeakReference; import java.util.ArrayList; public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { - private final String TAG = "WebViewChromiumFactoryProvider"; + private static final String TAG = "WebViewChromiumFactoryProvider"; private static final String CHROMIUM_PREFS_NAME = "WebViewChromiumPrefs"; + private static final String VERSION_CODE_PREF = "lastVersionCodeUsed"; private static final String COMMAND_LINE_FILE = "/data/local/tmp/webview-command-line"; // Guards accees to the other members, and is notifyAll() signalled on the UI thread @@ -88,31 +96,68 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // Read/write protected by mLock. private boolean mStarted; + private SharedPreferences mWebViewPrefs; + public WebViewChromiumFactoryProvider() { - if (Build.IS_DEBUGGABLE) { + if (isBuildDebuggable()) { + // Suppress the StrictMode violation as this codepath is only hit on debugglable builds. + StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); CommandLine.initFromFile(COMMAND_LINE_FILE); + StrictMode.setThreadPolicy(oldPolicy); } else { CommandLine.init(null); } CommandLine cl = CommandLine.getInstance(); - - // Hardware acceleration in chromium m37+ no longer works with android Kitkat, so force - // disable hardware acceleration. This is for AOSP only until L is open sourced. - cl.appendSwitch("force-auxiliary-bitmap"); - // TODO: currently in a relase build the DCHECKs only log. We either need to insall // a report handler with SetLogReportHandler to make them assert, or else compile // them out of the build altogether (b/8284203). Either way, so long they're // compiled in, we may as unconditionally enable them here. cl.appendSwitch("enable-dcheck"); - + ThreadUtils.setWillOverrideUiThread(); // Load chromium library. + Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "AwBrowserProcess.loadLibrary()"); AwBrowserProcess.loadLibrary(); + Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); // Load glue-layer support library. System.loadLibrary("webviewchromium_plat_support"); - ThreadUtils.setWillOverrideUiThread(); + + // Use shared preference to check for package downgrade. + mWebViewPrefs = ActivityThread.currentApplication().getSharedPreferences( + CHROMIUM_PREFS_NAME, Context.MODE_PRIVATE); + int lastVersion = mWebViewPrefs.getInt(VERSION_CODE_PREF, 0); + int currentVersion = WebViewFactory.getLoadedPackageInfo().versionCode; + if (lastVersion > currentVersion) { + // The WebView package has been downgraded since we last ran in this application. + // Delete the WebView data directory's contents. + String dataDir = PathUtils.getDataDirectory(ActivityThread.currentApplication()); + Log.i(TAG, "WebView package downgraded from " + lastVersion + " to " + currentVersion + + "; deleting contents of " + dataDir); + deleteContents(new File(dataDir)); + } + if (lastVersion != currentVersion) { + mWebViewPrefs.edit().putInt(VERSION_CODE_PREF, currentVersion).apply(); + } + // Now safe to use WebView data directory. + } + + private static boolean isBuildDebuggable() { + return !Build.TYPE.equals("user"); + } + + private static void deleteContents(File dir) { + File[] files = dir.listFiles(); + if (files != null) { + for (File file : files) { + if (file.isDirectory()) { + deleteContents(file); + } + if (!file.delete()) { + Log.w(TAG, "Failed to delete " + file); + } + } + } } private void initPlatSupportLibrary() { @@ -121,6 +166,21 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { AwContents.setAwDrawGLFunctionTable(GraphicsUtils.getDrawGLFunctionTable()); } + private static void initTraceEvent() { + syncATraceState(); + SystemProperties.addChangeCallback(new Runnable() { + @Override + public void run() { + syncATraceState(); + } + }); + } + + private static void syncATraceState() { + long enabledFlags = SystemProperties.getLong("debug.atrace.tags.enableflags", 0); + TraceEvent.setATraceEnabled((enabledFlags & Trace.TRACE_TAG_WEBVIEW) != 0); + } + private void ensureChromiumStartedLocked(boolean onMainThread) { assert Thread.holdsLock(mLock); @@ -151,7 +211,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { }); while (!mStarted) { try { - // Important: wait() releases |mLock| so the UI thread can take it :-) + // Important: wait() releases |mLock| the UI thread can take it :-) mLock.wait(); } catch (InterruptedException e) { // Keep trying... eventually the UI thread will process the task we sent it. @@ -191,12 +251,14 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // Make sure that ResourceProvider is initialized before starting the browser process. setUpResources(ActivityThread.currentApplication()); - AwBrowserProcess.start(getWrappedCurrentApplicationContext()); initPlatSupportLibrary(); + AwBrowserProcess.start(ActivityThread.currentApplication()); if (Build.IS_DEBUGGABLE) { setWebContentsDebuggingEnabled(true); } + + initTraceEvent(); mStarted = true; for (WeakReference<WebViewChromium> wvc : mWebViewsToStart) { @@ -220,10 +282,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } - private Context getWrappedCurrentApplicationContext() { - return ResourcesContextWrapperFactory.get(ActivityThread.currentApplication()); - } - AwBrowserContext getBrowserContext() { synchronized (mLock) { return getBrowserContextLocked(); @@ -234,9 +292,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { assert Thread.holdsLock(mLock); assert mStarted; if (mBrowserContext == null) { - mBrowserContext = new AwBrowserContext( - ActivityThread.currentApplication().getSharedPreferences( - CHROMIUM_PREFS_NAME, Context.MODE_PRIVATE)); + mBrowserContext = new AwBrowserContext(mWebViewPrefs); } return mBrowserContext; } @@ -253,21 +309,14 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { mDevToolsServer.setRemoteDebuggingEnabled(enable); } - public static Resources getWebViewPackageResources(Context ctx) { - try { - return ctx.getPackageManager().getResourcesForApplication( - WebViewFactory.getWebViewPackageName()); - } catch (PackageManager.NameNotFoundException e) { - throw new RuntimeException("Could not load webview resources apk.", e); - } - } - private void setUpResources(Context ctx) { - AwResource.setResources(getWebViewPackageResources(ctx)); - AwResource.setErrorPageResources(R.raw.webviewchromium_loaderror, - R.raw.webviewchromium_nodomain); + ResourceRewriter.rewriteRValues(ctx); + + AwResource.setResources(ctx.getResources()); + AwResource.setErrorPageResources(android.R.raw.loaderror, + android.R.raw.nodomain); AwResource.setConfigKeySystemUuidMapping( - R.array.config_keySystemUuidMapping); + android.R.array.config_keySystemUuidMapping); } @Override @@ -285,11 +334,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } @Override - public void setPlatformNotificationsEnabled(boolean enable) { - // noop - } - - @Override public String getDefaultUserAgent(Context context) { return AwSettings.getDefaultUserAgent(); } @@ -303,12 +347,29 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } + // TODO enable after L release to AOSP + //@Override + public void clearClientCertPreferences(Runnable onCleared) { + AwContentsStatics.clearClientCertPreferences(onCleared); + } + + @Override public void freeMemoryForTests() { if (ActivityManager.isRunningInTestHarness()) { MemoryPressureListener.maybeNotifyMemoryPresure( ComponentCallbacks2.TRIM_MEMORY_COMPLETE); } } + + // TODO: Add @Override. + public void enableSlowWholeDocumentDraw() { + WebViewChromium.enableSlowWholeDocumentDraw(); + } + + @Override + public Uri[] parseFileChooserResult(int resultCode, Intent intent) { + return FileChooserParamsAdapter.parseFileChooserResult(resultCode, intent); + } }; } } @@ -324,6 +385,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { mWebViewsToStart.add(new WeakReference<WebViewChromium>(wvc)); } } + return wvc; } @@ -348,7 +410,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // will bring up just the parts it needs to make this work on a temporary // basis until Chromium is started for real. The temporary cookie manager // needs the application context to have been set. - ContentMain.initApplicationContext(getWrappedCurrentApplicationContext()); + ContentMain.initApplicationContext(ActivityThread.currentApplication()); } mCookieManager = new CookieManagerAdapter(new AwCookieManager()); } diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java index c973d55..24c0ebc 100644 --- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java +++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java @@ -35,33 +35,44 @@ import android.provider.Browser; import android.util.Log; import android.view.KeyEvent; import android.view.View; +import android.webkit.ClientCertRequest; import android.webkit.ConsoleMessage; import android.webkit.DownloadListener; import android.webkit.GeolocationPermissions; import android.webkit.JsDialogHelper; import android.webkit.JsPromptResult; import android.webkit.JsResult; +import android.webkit.PermissionRequest; import android.webkit.SslErrorHandler; import android.webkit.ValueCallback; import android.webkit.WebChromeClient; import android.webkit.WebChromeClient.CustomViewCallback; import android.webkit.WebResourceResponse; +import android.webkit.WebResourceRequest; import android.webkit.WebView; import android.webkit.WebViewClient; import org.chromium.android_webview.AwContentsClient; +import org.chromium.android_webview.AwContentsClientBridge; import org.chromium.android_webview.AwHttpAuthHandler; import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.JsPromptResultReceiver; import org.chromium.android_webview.JsResultReceiver; +import org.chromium.android_webview.permission.AwPermissionRequest; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; import org.chromium.content.browser.ContentView; import org.chromium.content.browser.ContentViewClient; +import java.lang.ref.WeakReference; import java.net.URISyntaxException; -import java.util.concurrent.atomic.AtomicBoolean; - +import java.security.Principal; +import java.security.PrivateKey; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.WeakHashMap; /** * An adapter class that forwards the callbacks from {@link ContentViewClient} @@ -84,7 +95,7 @@ public class WebViewContentsClientAdapter extends AwContentsClient { // TAG is chosen for consistency with classic webview tracing. private static final String TAG = "WebViewCallback"; // Enables API callback tracing - private static final boolean TRACE = android.webkit.DebugFlags.TRACE_CALLBACK; + private static final boolean TRACE = false; // The WebView instance that this adapter is serving. private final WebView mWebView; // The WebViewClient instance that was passed to WebView.setWebViewClient(). @@ -102,6 +113,8 @@ public class WebViewContentsClientAdapter extends AwContentsClient { private static final int NEW_WEBVIEW_CREATED = 100; + private WeakHashMap<AwPermissionRequest, WeakReference<PermissionRequestAdapter>> + mOngoingPermissionRequests; /** * Adapter constructor. * @@ -154,25 +167,9 @@ public class WebViewContentsClientAdapter extends AwContentsClient { @Override public boolean shouldOverrideKeyEvent(WebView view, KeyEvent event) { // TODO: Investigate more and add a test case. - // This is a copy of what Clank does. The WebViewCore key handling code and Clank key - // handling code differ enough that it's not trivial to figure out how keycodes are - // being filtered. + // This is reflecting Clank's behavior. int keyCode = event.getKeyCode(); - if (keyCode == KeyEvent.KEYCODE_MENU || - keyCode == KeyEvent.KEYCODE_HOME || - keyCode == KeyEvent.KEYCODE_BACK || - keyCode == KeyEvent.KEYCODE_CALL || - keyCode == KeyEvent.KEYCODE_ENDCALL || - keyCode == KeyEvent.KEYCODE_POWER || - keyCode == KeyEvent.KEYCODE_HEADSETHOOK || - keyCode == KeyEvent.KEYCODE_CAMERA || - keyCode == KeyEvent.KEYCODE_FOCUS || - keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || - keyCode == KeyEvent.KEYCODE_VOLUME_MUTE || - keyCode == KeyEvent.KEYCODE_VOLUME_UP) { - return true; - } - return false; + return !ContentViewClient.shouldPropagateKey(keyCode); } @Override @@ -189,6 +186,11 @@ public class WebViewContentsClientAdapter extends AwContentsClient { // security (only access to BROWSABLE activities). intent.addCategory(Intent.CATEGORY_BROWSABLE); intent.setComponent(null); + Intent selector = intent.getSelector(); + if (selector != null) { + selector.addCategory(Intent.CATEGORY_BROWSABLE); + selector.setComponent(null); + } // Pass the package name as application ID so that the intent from the // same application can be opened in the same tab. intent.putExtra(Browser.EXTRA_APPLICATION_ID, @@ -268,6 +270,39 @@ public class WebViewContentsClientAdapter extends AwContentsClient { TraceEvent.end(); } + private static class WebResourceRequestImpl implements WebResourceRequest { + private final ShouldInterceptRequestParams mParams; + + public WebResourceRequestImpl(ShouldInterceptRequestParams params) { + mParams = params; + } + + @Override + public Uri getUrl() { + return Uri.parse(mParams.url); + } + + @Override + public boolean isForMainFrame() { + return mParams.isMainFrame; + } + + @Override + public boolean hasGesture() { + return mParams.hasUserGesture; + } + + @Override + public String getMethod() { + return mParams.method; + } + + @Override + public Map<String, String> getRequestHeaders() { + return mParams.requestHeaders; + } + } + /** * @see AwContentsClient#shouldInterceptRequest(java.lang.String) */ @@ -275,13 +310,23 @@ public class WebViewContentsClientAdapter extends AwContentsClient { public AwWebResourceResponse shouldInterceptRequest(ShouldInterceptRequestParams params) { TraceEvent.begin(); if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + params.url); - WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView, params.url); + WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView, + new WebResourceRequestImpl(params)); TraceEvent.end(); if (response == null) return null; + + // AwWebResourceResponse should support null headers. b/16332774. + Map<String, String> responseHeaders = response.getResponseHeaders(); + if (responseHeaders == null) + responseHeaders = new HashMap<String, String>(); + return new AwWebResourceResponse( response.getMimeType(), response.getEncoding(), - response.getData()); + response.getData(), + response.getStatusCode(), + response.getReasonPhrase(), + responseHeaders); } /** @@ -513,12 +558,12 @@ public class WebViewContentsClientAdapter extends AwContentsClient { */ @Override public boolean shouldOverrideKeyEvent(KeyEvent event) { - // TODO(joth): The expression here is a workaround for http://b/7697782 :- - // 1. The check for system key should be made in AwContents or ContentViewCore, - // before shouldOverrideKeyEvent() is called at all. + // The check below is reflecting Clank's behavior and is a workaround for http://b/7697782. + // 1. The check for system key should be made in AwContents or ContentViewCore, before + // shouldOverrideKeyEvent() is called at all. // 2. shouldOverrideKeyEvent() should be called in onKeyDown/onKeyUp, not from // dispatchKeyEvent(). - if (event.isSystem()) return true; + if (!ContentViewClient.shouldPropagateKey(event.getKeyCode())) return true; TraceEvent.begin(); if (TRACE) Log.d(TAG, "shouldOverrideKeyEvent"); boolean result = mWebViewClient.shouldOverrideKeyEvent(mWebView, event); @@ -560,6 +605,44 @@ public class WebViewContentsClientAdapter extends AwContentsClient { TraceEvent.end(); } + @Override + public void onPermissionRequest(AwPermissionRequest permissionRequest) { + TraceEvent.begin(); + if (mWebChromeClient != null) { + if (TRACE) Log.d(TAG, "onPermissionRequest"); + if (mOngoingPermissionRequests == null) { + mOngoingPermissionRequests = + new WeakHashMap<AwPermissionRequest, WeakReference<PermissionRequestAdapter>>(); + } + PermissionRequestAdapter adapter = new PermissionRequestAdapter(permissionRequest); + mOngoingPermissionRequests.put( + permissionRequest, new WeakReference<PermissionRequestAdapter>(adapter)); + mWebChromeClient.onPermissionRequest(adapter); + } else { + // By default, we deny the permission. + permissionRequest.deny(); + } + TraceEvent.end(); + } + + @Override + public void onPermissionRequestCanceled(AwPermissionRequest permissionRequest) { + TraceEvent.begin(); + if (mWebChromeClient != null && mOngoingPermissionRequests != null) { + if (TRACE) Log.d(TAG, "onPermissionRequestCanceled"); + WeakReference<PermissionRequestAdapter> weakRef = + mOngoingPermissionRequests.get(permissionRequest); + // We don't hold strong reference to PermissionRequestAdpater and don't expect the + // user only holds weak reference to it either, if so, user has no way to call + // grant()/deny(), and no need to be notified the cancellation of request. + if (weakRef != null) { + PermissionRequestAdapter adapter = weakRef.get(); + if (adapter != null) mWebChromeClient.onPermissionRequestCanceled(adapter); + } + } + TraceEvent.end(); + } + private static class JsPromptResultReceiverAdapter implements JsResult.ResultReceiver { private JsPromptResultReceiver mChromePromptResultReceiver; private JsResultReceiver mChromeResultReceiver; @@ -680,19 +763,11 @@ public class WebViewContentsClientAdapter extends AwContentsClient { SslErrorHandler handler = new SslErrorHandler() { @Override public void proceed() { - postProceed(true); + callback.onReceiveValue(true); } @Override public void cancel() { - postProceed(false); - } - private void postProceed(final boolean proceed) { - post(new Runnable() { - @Override - public void run() { - callback.onReceiveValue(proceed); - } - }); + callback.onReceiveValue(false); } }; TraceEvent.begin(); @@ -701,6 +776,74 @@ public class WebViewContentsClientAdapter extends AwContentsClient { TraceEvent.end(); } + private static class ClientCertRequestImpl extends ClientCertRequest { + + final private AwContentsClientBridge.ClientCertificateRequestCallback mCallback; + final private String[] mKeyTypes; + final private Principal[] mPrincipals; + final private String mHost; + final private int mPort; + + public ClientCertRequestImpl( + AwContentsClientBridge.ClientCertificateRequestCallback callback, + String[] keyTypes, Principal[] principals, String host, int port) { + mCallback = callback; + mKeyTypes = keyTypes; + mPrincipals = principals; + mHost = host; + mPort = port; + } + + @Override + public String[] getKeyTypes() { + // This is already a copy of native argument, so return directly. + return mKeyTypes; + } + + @Override + public Principal[] getPrincipals() { + // This is already a copy of native argument, so return directly. + return mPrincipals; + } + + @Override + public String getHost() { + return mHost; + } + + @Override + public int getPort() { + return mPort; + } + + @Override + public void proceed(final PrivateKey privateKey, final X509Certificate[] chain) { + mCallback.proceed(privateKey, chain); + } + + @Override + public void ignore() { + mCallback.ignore(); + } + + @Override + public void cancel() { + mCallback.cancel(); + } + } + + @Override + public void onReceivedClientCertRequest( + AwContentsClientBridge.ClientCertificateRequestCallback callback, + String[] keyTypes, Principal[] principals, String host, int port) { + if (TRACE) Log.d(TAG, "onReceivedClientCertRequest"); + TraceEvent.begin(); + final ClientCertRequestImpl request = new ClientCertRequestImpl(callback, + keyTypes, principals, host, port); + mWebViewClient.onReceivedClientCertRequest(mWebView, request); + TraceEvent.end(); + } + @Override public void onReceivedLoginRequest(String realm, String account, String args) { TraceEvent.begin(); @@ -743,30 +886,43 @@ public class WebViewContentsClientAdapter extends AwContentsClient { return; } TraceEvent.begin(); - /* - // TODO: Call new API here when it's added in frameworks/base - see http://ag/335990 - WebChromeClient.FileChooserParams p = new WebChromeClient.FileChooserParams(); - p.mode = fileChooserParams.mode; - p.acceptTypes = fileChooserParams.acceptTypes; - p.title = fileChooserParams.title; - p.defaultFilename = fileChooserParams.defaultFilename; - p.capture = fileChooserParams.capture; + FileChooserParamsAdapter adapter = new FileChooserParamsAdapter( + fileChooserParams, mWebView.getContext()); if (TRACE) Log.d(TAG, "showFileChooser"); - if (Build.VERSION.SDK_INT > VERSION_CODES.KIT_KAT && - !mWebChromeClient.showFileChooser(mWebView, uploadFileCallback, p)) { + ValueCallback<Uri[]> callbackAdapter = new ValueCallback<Uri[]>() { + private boolean mCompleted; + @Override + public void onReceiveValue(Uri[] uriList) { + if (mCompleted) { + throw new IllegalStateException("showFileChooser result was already called"); + } + mCompleted = true; + String s[] = null; + if (uriList != null) { + s = new String[uriList.length]; + for(int i = 0; i < uriList.length; i++) { + s[i] = uriList[i].toString(); + } + } + uploadFileCallback.onReceiveValue(s); + } + }; + if (mWebChromeClient.onShowFileChooser(mWebView, callbackAdapter, adapter)) { return; } if (mWebView.getContext().getApplicationInfo().targetSdkVersion > - Build.VERSION_CODES.KIT_KAT) { + Build.VERSION_CODES.KITKAT) { uploadFileCallback.onReceiveValue(null); return; } - */ ValueCallback<Uri> innerCallback = new ValueCallback<Uri>() { - final AtomicBoolean completed = new AtomicBoolean(false); + private boolean mCompleted; @Override public void onReceiveValue(Uri uri) { - if (completed.getAndSet(true)) return; + if (mCompleted) { + throw new IllegalStateException("showFileChooser result was already called"); + } + mCompleted = true; uploadFileCallback.onReceiveValue( uri == null ? null : new String[] { uri.toString() }); } @@ -830,9 +986,8 @@ public class WebViewContentsClientAdapter extends AwContentsClient { if (result == null) { // The ic_media_video_poster icon is transparent so we need to draw it on a gray // background. - Context ctx = ResourcesContextWrapperFactory.get(mWebView.getContext()); Bitmap poster = BitmapFactory.decodeResource( - ctx.getResources(), + mWebView.getContext().getResources(), R.drawable.ic_media_video_poster); result = Bitmap.createBitmap(poster.getWidth(), poster.getHeight(), poster.getConfig()); result.eraseColor(Color.GRAY); @@ -843,6 +998,7 @@ public class WebViewContentsClientAdapter extends AwContentsClient { return result; } + // TODO: Move to upstream. private static class AwHttpAuthHandlerAdapter extends android.webkit.HttpAuthHandler { private AwHttpAuthHandler mAwHandler; @@ -872,4 +1028,75 @@ public class WebViewContentsClientAdapter extends AwContentsClient { return mAwHandler.isFirstAttempt(); } } + + // TODO: Move to the upstream once the PermissionRequest is part of SDK. + public static class PermissionRequestAdapter extends PermissionRequest { + // TODO: Move the below definitions to AwPermissionRequest. + private static long BITMASK_RESOURCE_VIDEO_CAPTURE = 1 << 1; + private static long BITMASK_RESOURCE_AUDIO_CAPTURE = 1 << 2; + private static long BITMASK_RESOURCE_PROTECTED_MEDIA_ID = 1 << 3; + + public static long toAwPermissionResources(String[] resources) { + long result = 0; + for (String resource : resources) { + if (resource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) + result |= BITMASK_RESOURCE_VIDEO_CAPTURE; + else if (resource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) + result |= BITMASK_RESOURCE_AUDIO_CAPTURE; + else if (resource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) + result |= BITMASK_RESOURCE_PROTECTED_MEDIA_ID; + } + return result; + } + + private static String[] toPermissionResources(long resources) { + ArrayList<String> result = new ArrayList<String>(); + if ((resources & BITMASK_RESOURCE_VIDEO_CAPTURE) != 0) + result.add(PermissionRequest.RESOURCE_VIDEO_CAPTURE); + if ((resources & BITMASK_RESOURCE_AUDIO_CAPTURE) != 0) + result.add(PermissionRequest.RESOURCE_AUDIO_CAPTURE); + if ((resources & BITMASK_RESOURCE_PROTECTED_MEDIA_ID) != 0) + result.add(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID); + String[] resource_array = new String[result.size()]; + return result.toArray(resource_array); + } + + private AwPermissionRequest mAwPermissionRequest; + private String[] mResources; + + public PermissionRequestAdapter(AwPermissionRequest awPermissionRequest) { + assert awPermissionRequest != null; + mAwPermissionRequest = awPermissionRequest; + } + + @Override + public Uri getOrigin() { + return mAwPermissionRequest.getOrigin(); + } + + @Override + public String[] getResources() { + synchronized (this) { + if (mResources == null) { + mResources = toPermissionResources(mAwPermissionRequest.getResources()); + } + return mResources; + } + } + + @Override + public void grant(String[] resources) { + long requestedResource = mAwPermissionRequest.getResources(); + if ((requestedResource & toAwPermissionResources(resources)) == requestedResource) + mAwPermissionRequest.grant(); + else + mAwPermissionRequest.deny(); + } + + @Override + public void deny() { + mAwPermissionRequest.deny(); + } + + } } diff --git a/chromium/listing/res/values-af/strings.xml b/chromium/listing/res/values-af/strings.xml new file mode 100644 index 0000000..4be8a39 --- /dev/null +++ b/chromium/listing/res/values-af/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android Stelselwebaansig"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webinhoud vir programme, aangedryf deur Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webaansig is \'n stelselkomponent wat deur Chrome aangedryf word wat Android-programme toelaat om webinhoud te wys. Hierdie komponent is vooraf in jou toestel geïnstalleer en behoort bygewerk gehou te word om te verseker dat jy die jongste sekuriteitopdaterings en ander foutoplossings het."</string> +</resources> diff --git a/chromium/listing/res/values-am/strings.xml b/chromium/listing/res/values-am/strings.xml new file mode 100644 index 0000000..4194a4d --- /dev/null +++ b/chromium/listing/res/values-am/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"የAndroid ስርዓት ድር እይታ"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"የድር ይዘት ለመተግበሪያዎች፣ በChrome የተጎላበተ"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android የድር እይታ የAndroid መተግበሪያዎች የድር ይዘትን እንዲያሳዩ የሚያስችል በChrome የተጎላበተ የስርዓት አካል ነው። ይህ አካል በመሣሪያዎ ላይ ቅድሚያ የተጫነ እና የቅርብ ጊዜዎቹን የደህንነት ዝማኔዎች እና የሳንካ ጥገናዎች እንዳሉዎት ለማረጋገጥ መዘመን አለበት።"</string> +</resources> diff --git a/chromium/listing/res/values-ar/strings.xml b/chromium/listing/res/values-ar/strings.xml new file mode 100644 index 0000000..f58c131 --- /dev/null +++ b/chromium/listing/res/values-ar/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"محتوى الويب للتطبيقات، بإدارة من Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"يعد Android Webview مكونًا من مكونات النظام التي يديرها Chrome ويتيح لتطبيقات Android عرض محتوى الويب. يتم تثبيت هذا المكوِّن مسبقًا على جهازك ويجب تحديثه أولاً بأول لضمان توفر آخر تحديثات الأمان وإصلاح الأخطاء الأخرى."</string> +</resources> diff --git a/chromium/listing/res/values-bg/strings.xml b/chromium/listing/res/values-bg/strings.xml new file mode 100644 index 0000000..3349fc1 --- /dev/null +++ b/chromium/listing/res/values-bg/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView за систем. на Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Предоставено от Chrome уеб съдържание за приложения"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Webview за Android е системен компонент, предоставен от Chrome, който разрешава на приложенията за Android да показват уеб съдържание. Той е предварително инсталиран на устройството и трябва да се поддържа актуален, за да се гарантира, че имате последните актуализации за сигурност и са отстранени други програмни грешки."</string> +</resources> diff --git a/chromium/listing/res/values-ca/strings.xml b/chromium/listing/res/values-ca/strings.xml new file mode 100644 index 0000000..20c02c6 --- /dev/null +++ b/chromium/listing/res/values-ca/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView del sistema Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Contingut web per a aplicacions, amb la tecnologia de Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"WebView per a Android és un component del sistema que incorpora la tecnologia de Chrome que permet que a les aplicacions Android es mostri contingut web. Aquest component està preinstal·lat al dispositiu i s\'ha de mantenir actualitzat per garantir que tinguis les darreres actualitzacions de seguretat i altres correccions d\'errors."</string> +</resources> diff --git a/chromium/listing/res/values-cs/strings.xml b/chromium/listing/res/values-cs/strings.xml new file mode 100644 index 0000000..55fcbea --- /dev/null +++ b/chromium/listing/res/values-cs/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webový obsah pro aplikace, využívá technologii Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview je součást systému využívající technologii Chrome, která aplikacím v systému Android umožňuje zobrazovat webový obsah. Tato součást je v zařízení předinstalována a měla by být pravidelně aktualizována, abyste měli nejnovější aktualizace zabezpečení a jiné opravy chyb."</string> +</resources> diff --git a/chromium/listing/res/values-da/strings.xml b/chromium/listing/res/values-da/strings.xml new file mode 100644 index 0000000..6c9d8ce --- /dev/null +++ b/chromium/listing/res/values-da/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView til Android-systemet"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webindhold til apps, leveret af Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView er en systemkomponent, der leveres af Chrome, som gør det muligt for Android-apps at vise webindhold. Denne komponent er forudinstalleret på enheden og bør holdes opdateret for at sikre, at du har de nyeste sikkerhedsopdateringer og andre fejlrettelser."</string> +</resources> diff --git a/chromium/listing/res/values-de/strings.xml b/chromium/listing/res/values-de/strings.xml new file mode 100644 index 0000000..7f1b91b --- /dev/null +++ b/chromium/listing/res/values-de/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webinhalte für Apps, von Chrome bereitgestellt"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView ist eine von Chrome bereitgestellte Systemkomponente, die Android-Apps die Anzeige von Webinhalten ermöglicht. Diese Komponente ist auf Ihrem Gerät vorinstalliert und sollte regelmäßig aktualisiert werden, damit Ihnen stets die neuesten Sicherheitsupdates und andere Fehlerbehebungen zur Verfügung stehen."</string> +</resources> diff --git a/chromium/listing/res/values-el/strings.xml b/chromium/listing/res/values-el/strings.xml new file mode 100644 index 0000000..bd5ffe7 --- /dev/null +++ b/chromium/listing/res/values-el/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Περιεχόμενο ιστού για εφαρμογές, με την υποστήριξη του Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Το Android WebView είναι ένα συστατικό συστήματος με την υποστήριξη του Chrome που επιτρέπει στις εφαρμογές Android να εμφανίζουν το περιεχόμενο ιστού. Αυτό το συστατικό είναι προ-εγκατεστημένο στη συσκευή σας και θα πρέπει να διατηρείται ενημερωμένο για να εξασφαλίσει ότι διαθέτετε τις πιο πρόσφατες ενημερώσεις ασφαλείας και άλλες επιδιορθώσεις σφαλμάτων."</string> +</resources> diff --git a/chromium/listing/res/values-en-rGB/strings.xml b/chromium/listing/res/values-en-rGB/strings.xml new file mode 100644 index 0000000..5a84206 --- /dev/null +++ b/chromium/listing/res/values-en-rGB/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content for apps, powered by Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure that you have the latest security updates and other bug fixes."</string> +</resources> diff --git a/chromium/listing/res/values-en-rIN/strings.xml b/chromium/listing/res/values-en-rIN/strings.xml new file mode 100644 index 0000000..5a84206 --- /dev/null +++ b/chromium/listing/res/values-en-rIN/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content for apps, powered by Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure that you have the latest security updates and other bug fixes."</string> +</resources> diff --git a/chromium/listing/res/values-es-rUS/strings.xml b/chromium/listing/res/values-es-rUS/strings.xml new file mode 100644 index 0000000..cf6de04 --- /dev/null +++ b/chromium/listing/res/values-es-rUS/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView del sistema Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Contenido web para aplicaciones, con tecnología de Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Webview de Android es un componente del sistema con tecnología de Chrome que permite a las aplicaciones de Android mostrar contenido web. Este componente está preinstalado en el dispositivo, y debes actualizarlo para asegurarte de tener las actualizaciones de seguridad y las correcciones de errores más recientes."</string> +</resources> diff --git a/chromium/listing/res/values-es/strings.xml b/chromium/listing/res/values-es/strings.xml new file mode 100644 index 0000000..066f552 --- /dev/null +++ b/chromium/listing/res/values-es/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView del sistema Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Contenido web para aplicaciones, con tecnología de Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Webview es un componente del sistema Android con tecnología de Chrome que permite que las aplicaciones de Android muestren contenido web. Este componente está preinstalado en el dispositivo y debes actualizarlo para asegurarte de tener las actualizaciones de seguridad y las correcciones de errores más recientes."</string> +</resources> diff --git a/chromium/listing/res/values-et-rEE/strings.xml b/chromium/listing/res/values-et-rEE/strings.xml new file mode 100644 index 0000000..4e7583b --- /dev/null +++ b/chromium/listing/res/values-et-rEE/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Androidi süsteemi WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Veebisisu rakendustele – töötab Chrome\'i jõul"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview on Chrome\'i jõul töötav süsteemikomponent, mis võimaldab Androidi rakendustel veebisisu kuvada. Komponent on seadmesse eelinstallitud ja see tuleks hoida ajakohasena tagamaks, et kasutate uusimaid turvavärskendusi ja muid veaparandusi."</string> +</resources> diff --git a/chromium/listing/res/values-fa/strings.xml b/chromium/listing/res/values-fa/strings.xml new file mode 100644 index 0000000..2ad7209 --- /dev/null +++ b/chromium/listing/res/values-fa/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"محتوای وب برای برنامهها، ارائه شده توسط Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview یک جزء سیستم طراحی شده توسط Chrome است که به برنامههای Android امکان میدهد محتوای وب را نمایش دهند. این جزء در دستگاه شما از پیش نصب شده است و باید آن را به روز نگه دارید تا این اطمینان حاصل شود که آخرین بهروزرسانیهای امنیتی و رفع اشکالات دیگر را در اختیار دارید."</string> +</resources> diff --git a/chromium/listing/res/values-fi/strings.xml b/chromium/listing/res/values-fi/strings.xml new file mode 100644 index 0000000..311e6e5 --- /dev/null +++ b/chromium/listing/res/values-fi/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android-järjestelmän WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Verkkosisältöä sovelluksissa Chromen avulla"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview on Chromea käyttävä järjestelmäkomponentti, jonka avulla Android-sovellukset voivat näyttää verkkosisältöä. Komponentti on esiasennettu laitteeseesi ja se on pidettävä ajan tasalla sen varmistamiseksi, että saat uusimmat tietoturvapäivitykset ja muut korjaukset."</string> +</resources> diff --git a/chromium/listing/res/values-fr-rCA/strings.xml b/chromium/listing/res/values-fr-rCA/strings.xml new file mode 100644 index 0000000..2d31f01 --- /dev/null +++ b/chromium/listing/res/values-fr-rCA/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Des contenus Web proposés par Chrome pour les applications"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview est un composant système proposé par Chrome qui permet aux applications Android d\'afficher des contenus Web. Ce composant est préinstallé sur votre appareil. Vous devez le tenir à jour afin de disposer des dernières mises à jour de sécurité et d\'autres corrections de bogues."</string> +</resources> diff --git a/chromium/listing/res/values-fr/strings.xml b/chromium/listing/res/values-fr/strings.xml new file mode 100644 index 0000000..ce870a3 --- /dev/null +++ b/chromium/listing/res/values-fr/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Des contenus Web proposés par Chrome pour les applications"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview est un composant système proposé par Chrome qui permet aux applications Android d\'afficher des contenus Web. Ce composant est préinstallé sur votre appareil. Vous devez le tenir à jour afin de disposer des dernières mises à jour de sécurité et d\'autres corrections de bugs."</string> +</resources> diff --git a/chromium/listing/res/values-hi/strings.xml b/chromium/listing/res/values-hi/strings.xml new file mode 100644 index 0000000..86f0130 --- /dev/null +++ b/chromium/listing/res/values-hi/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"ऐप्स की वेब सामग्री, Chrome द्वारा पावर्ड"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview, Chrome द्वारा पावर्ड ऐसा सिस्टम घटक है जो Android ऐप्स को वेब सामग्री दिखाने देता है. यह घटक आपके डिवाइस पर पहले से इंस्टॉल है और उसे अद्यतित रखा जाना चाहिए ताकि यह सुनिश्चित हो सके कि आपके पास नवीनतम सुरक्षा अपडेट और बग समाधान हैं."</string> +</resources> diff --git a/chromium/listing/res/values-hr/strings.xml b/chromium/listing/res/values-hr/strings.xml new file mode 100644 index 0000000..871a07c --- /dev/null +++ b/chromium/listing/res/values-hr/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web-sadržaj za aplikacije, omogućuje Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview komponenta je sustava koju omogućuje Chrome, a pomoću nje Androidove aplikacije prikazuju web-sadržaj. Ta je komponenta unaprijed instalirana na uređaju i trebala bi se redovito ažurirati kako biste dobivali najnovija sigurnosna ažuriranja i ostale popravke programskih pogrešaka."</string> +</resources> diff --git a/chromium/listing/res/values-hu/strings.xml b/chromium/listing/res/values-hu/strings.xml new file mode 100644 index 0000000..a2f0f98 --- /dev/null +++ b/chromium/listing/res/values-hu/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Internetes tartalom alkalmazásoknak, a Chrome erejével"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Az Android Webview egy rendszerösszetevő, amely a Chrome-ot használja, és segítségével az androidos alkalmazások megjeleníthetik az internetes tartalmakat. Ez az összetevő előzetesen telepítve van az eszközön, és mindig naprakészen kell tartani a legfrissebb biztonsági frissítések és egyéb programhiba-javítások beszerzése érdekében."</string> +</resources> diff --git a/chromium/listing/res/values-hy-rAM/strings.xml b/chromium/listing/res/values-hy-rAM/strings.xml new file mode 100644 index 0000000..c5269fc --- /dev/null +++ b/chromium/listing/res/values-hy-rAM/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Վեբ բովանդակություն հավելվածների համար՝ Chrome-ի կողմից"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview-ն համակարգի բաղադրիչ է Chrome-ի կողմից, որը թույլ է տալիս, որպեսզի Android հավելվածները ցուցադրեն վեբ բովանդակություն: Այս բաղադրիչը նախատեղադրված է ձեր սարքում և կթարմացվի ամենավերջին տարբերակով՝ համոզվելու համար, որ դուք ունեք անվտանգության վերջին թարմացումները և սխալների շտկումը:"</string> +</resources> diff --git a/chromium/listing/res/values-in/strings.xml b/chromium/listing/res/values-in/strings.xml new file mode 100644 index 0000000..615e046 --- /dev/null +++ b/chromium/listing/res/values-in/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"TampilanWeb Sistem Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Konten web untuk aplikasi, diberdayakan oleh Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Tampilan web Android adalah komponen sistem yang diberdayakan oleh Chrome agar aplikasi Andorid dapat menampilkan konten web. Komponen ini di-prapasang pada perangkat dan sebaiknya terus diperbarui untuk memastikan Anda memiliki pembaruan keamanan terbaru dan perbaikan bug lainnya."</string> +</resources> diff --git a/chromium/listing/res/values-it/strings.xml b/chromium/listing/res/values-it/strings.xml new file mode 100644 index 0000000..26a160a --- /dev/null +++ b/chromium/listing/res/values-it/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Contenuti web per le app, con tecnologia Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview è un componente di sistema con tecnologia Chrome che consente alle app Android di visualizzare contenuti web. Questo componente è preinstallato sul dispositivo e deve essere costantemente aggiornato per disporre degli aggiornamenti della sicurezza più recenti e altre correzioni di bug."</string> +</resources> diff --git a/chromium/listing/res/values-iw/strings.xml b/chromium/listing/res/values-iw/strings.xml new file mode 100644 index 0000000..6d7ee16 --- /dev/null +++ b/chromium/listing/res/values-iw/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView של מערכת Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"תוכן אינטרנט עבור אפליקציות, בהפעלת Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview הוא רכיב מערכת המופעל על ידי Chrome שמאפשר לאפליקציות Android להציג תוכן אינטרנט. רכיב זה מותקן-מראש במכשיר שלך ועליך לוודא שהוא מעודכן כדי להבטיח שיש לך את עדכוני האבטחה העדכניים ביותר ותיקוני באגים עדכניים אחרים."</string> +</resources> diff --git a/chromium/listing/res/values-ja/strings.xml b/chromium/listing/res/values-ja/strings.xml new file mode 100644 index 0000000..4ee0e7a --- /dev/null +++ b/chromium/listing/res/values-ja/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"AndroidシステムのWebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chromeが搭載されたアプリ用ウェブコンテンツ"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebviewはChromeを搭載したシステムコンポーネントで、Androidアプリをウェブコンテンツに表示することができます。このコンポーネントはお使いの端末にプリインストールされており、最新のセキュリティアップデートやその他のバグ修正を取得できるよう常に最新に維持する必要があります。"</string> +</resources> diff --git a/chromium/listing/res/values-ka-rGE/strings.xml b/chromium/listing/res/values-ka-rGE/strings.xml new file mode 100644 index 0000000..3b4f12d --- /dev/null +++ b/chromium/listing/res/values-ka-rGE/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"ვებ-ქონთენთი აპებისთვის, Chrome-ს მხარდაჭერით"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview სისტემური კომპონენტია, Chrome-ის მიერ მხარდაჭერილი, რომელიც Android-ის აპებს ვებ-ქონთენთის ჩვენების საშუალებას აძლევს. ეს კომპონენტი თქვენს მოწყობილობაზე წინასწარ არის დაყენებული და განახლებული უნდა იყოს, რათა მუდამ შეძლოთ უახლესი უსაფრთხოების განახლებებითა და ხარვეზების სხვა შესწორებებით სარგებლობა."</string> +</resources> diff --git a/chromium/listing/res/values-km-rKH/strings.xml b/chromium/listing/res/values-km-rKH/strings.xml new file mode 100644 index 0000000..dea2a4b --- /dev/null +++ b/chromium/listing/res/values-km-rKH/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView ប្រព័ន្ធ Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"មាតិកាបណ្ដាញសម្រាប់កម្មវិធី ដំណើរការដោយ Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview គឺជាសមាសភាគប្រព័ន្ធដំណើរការដោយ Chrome ដែលអនុញ្ញាតឲ្យកម្មវិធី Android បង្ហាញមាតិកាបណ្ដាញ។ សមាសភាគនេះត្រូវបានដំឡើងជាមុននៅលើឧបករណ៍របស់អ្នក ហើយវាគួរត្រូវបានធ្វើឲ្យទាន់សម័យជាបន្តបន្ទាប់ ដើម្បីធានាថាអ្នកមានបច្ចុប្បន្នភាពសុវត្ថិភាពចុងក្រោយបំផុត និងការកែកំហុសផ្សេងទៀត។"</string> +</resources> diff --git a/chromium/listing/res/values-ko/strings.xml b/chromium/listing/res/values-ko/strings.xml new file mode 100644 index 0000000..7beea07 --- /dev/null +++ b/chromium/listing/res/values-ko/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android 시스템 WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"앱을 위한 웹 콘텐츠(Chrome 제공)"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview는 Android 앱이 웹 콘텐츠를 표시할 수 있도록 Chrome에서 제공하는 시스템 구성요소입니다. 이 구성요소는 기기에 사전 설치되어 있으며, 최신 보안 업데이트 및 기타 버그 수정을 위해 최신 상태로 유지해야 합니다."</string> +</resources> diff --git a/chromium/listing/res/values-lo-rLA/strings.xml b/chromium/listing/res/values-lo-rLA/strings.xml new file mode 100644 index 0000000..2e638db --- /dev/null +++ b/chromium/listing/res/values-lo-rLA/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"ເນື້ອຫາເວັບສຳລັບແອັບຯ, ຂັບເຄື່ອນໂດຍ Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview ແມ່ນສ່ວນປະກອບຂອງລະບົບທີ່ຂັບເຄື່ອນໂດຍ Chrome ເຊິ່ງອະນຸຍາດໃຫ້ແອັບຯ Android ສະແດງເນື້ອຫາຈາກເວັບໄດ້. ສ່ວນປະກອບນີ້ແມ່ນຖືກຕິດຕັ້ງມາພ້ອມອຸປະກອນຂອງທ່ານ ແລະ ຄວນອັບເດດສະເໝີເພື່ອໝັ້ນໃຈວ່າທ່ານໄດ້ຮັບການອັບເດດດ້ານຄວາມປອດໄພ ແລະ ແກ້ໄຂຂໍ້ຜິດພາດຢູ່ເລື້ອຍໆ."</string> +</resources> diff --git a/chromium/listing/res/values-lt/strings.xml b/chromium/listing/res/values-lt/strings.xml new file mode 100644 index 0000000..91da6ca --- /dev/null +++ b/chromium/listing/res/values-lt/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"„Android“ sistema „WebView“"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Programoms, kurias teikia „Chrome“, skirtas žiniatinklio turinys"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"„Android Webview“ yra sistemos komponentas, kurį teikia „Chrome“. Jį naudojant „Android“ programose gali būti rodomas žiniatinklio turinys. Šis komponentas iš anksto įdiegiamas jūsų įrenginyje ir turi būti nuolat atnaujinamas, kad būtumėte tikri, jog turite naujausius saugos naujinius ir iš įrenginio pašalinamos kitos triktys."</string> +</resources> diff --git a/chromium/listing/res/values-lv/strings.xml b/chromium/listing/res/values-lv/strings.xml new file mode 100644 index 0000000..0d1a8f4 --- /dev/null +++ b/chromium/listing/res/values-lv/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Tīmekļa satura lietotnes, kuru darbību nodrošina pārlūkprogramma Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview ir sistēmas komponents, kura darbību nodrošina pārlūkprogramma Chrome un kurš ļauj Android lietotnēs rādīt tīmekļa saturu. Šis komponents ir jau sākotnēji instalēts jūsu ierīcē, un to ir regulāri jāatjaunina, lai nodrošinātu, ka darbojas pēdējie drošības atjauninājumi un ieviesti jaunākie kļūdu labojumi."</string> +</resources> diff --git a/chromium/listing/res/values-mn-rMN/strings.xml b/chromium/listing/res/values-mn-rMN/strings.xml new file mode 100644 index 0000000..1bbb550 --- /dev/null +++ b/chromium/listing/res/values-mn-rMN/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Апп-уудад зориулсан веб контент, Кром-р дэмжигдсэн"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview нь Андройд апп-уудад вебийн контентыг харуулах боломж олгодог Кром-н хөгжүүлсэн системийн хэсэг юм. Энэ хэсэг нь таны төхөөрөмж дээр урьдчилан суусан бөгөөд таны аюулгүй байдлын шинэчлэлт, согог засварыг хангахын тулд байнга шинэчлэгдэх шаардлагатай."</string> +</resources> diff --git a/chromium/listing/res/values-ms-rMY/strings.xml b/chromium/listing/res/values-ms-rMY/strings.xml new file mode 100644 index 0000000..2ad8d27 --- /dev/null +++ b/chromium/listing/res/values-ms-rMY/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView Sistem Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Kandungan web untuk apl, dikuasakan oleh Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Webview Android ialah satu komponen sistem yang dikuasakan oleh Chrome dan membenarkan apl Android memaparkan kandungan web. Komponen ini siap terpasang pada peranti anda dan hendaklah sentiasa terkini untuk memastikan anda mempunyai kemas kini keselamatan dan pembetulan pepijat lain yang terbaharu."</string> +</resources> diff --git a/chromium/listing/res/values-nb/strings.xml b/chromium/listing/res/values-nb/strings.xml new file mode 100644 index 0000000..5a29ae9 --- /dev/null +++ b/chromium/listing/res/values-nb/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webinnhold for apper, drevet av Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview er en systemkomponent drevet av Chrome som lar Android-apper se nettinnhold. Denne komponenten er forhåndsinstallert på enheten din, og bør holdes oppdatert for å sikre at du har de nyeste sikkerhetsoppdateringene og andre feilrettinger."</string> +</resources> diff --git a/chromium/listing/res/values-nl/strings.xml b/chromium/listing/res/values-nl/strings.xml new file mode 100644 index 0000000..d502d32 --- /dev/null +++ b/chromium/listing/res/values-nl/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView voor Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webcontent voor apps, mogelijk gemaakt door Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview is een systeemcomponent dat mogelijk wordt gemaakt door Chrome en waarmee Android-apps webcontent kunnen weergeven. Dit component is vooraf geïnstalleerd op uw apparaat en moet up-to-date blijven zodat u over de nieuwste beveiligingsupdates en andere bugfixes beschikt."</string> +</resources> diff --git a/chromium/listing/res/values-pl/strings.xml b/chromium/listing/res/values-pl/strings.xml new file mode 100644 index 0000000..e6af831 --- /dev/null +++ b/chromium/listing/res/values-pl/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Treści internetowe w aplikacjach – technologia Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView to składnik systemowy bazujący na Chrome, który umożliwia aplikacjom na Androida wyświetlanie treści internetowych. Jest on wstępnie zainstalowany na każdym urządzeniu i powinien być regularnie aktualizowany, by zapewnić dostęp do najnowszych aktualizacji zabezpieczeń i innych poprawek."</string> +</resources> diff --git a/chromium/listing/res/values-pt-rPT/strings.xml b/chromium/listing/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000..60b887f --- /dev/null +++ b/chromium/listing/res/values-pt-rPT/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Sistema Android WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Conteúdo Web para aplicações, com tecnologia Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"O Android Webview é um componente do sistema com tecnologia Chrome que permite às aplicações Android apresentarem conteúdo Web. Este componente está pré-instalado no seu dispositivo e deve ser mantido atualizado para garantir que tem as atualizações de segurança e outras correções de erros mais recentes."</string> +</resources> diff --git a/chromium/listing/res/values-pt/strings.xml b/chromium/listing/res/values-pt/strings.xml new file mode 100644 index 0000000..7f5d960 --- /dev/null +++ b/chromium/listing/res/values-pt/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Sistema Android WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Conteúdo da Web para apps, com tecnologia Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"O Android Webview é um componente do sistema com tecnologia Chrome que permite aos apps Android apresentarem conteúdo da Web. Este componente está pré-instalado em seu dispositivo e deve ser mantido atualizado para garantir que você tenha as atualizações de segurança mais recentes e outras correções de bugs."</string> +</resources> diff --git a/chromium/listing/res/values-ro/strings.xml b/chromium/listing/res/values-ro/strings.xml new file mode 100644 index 0000000..b11864b --- /dev/null +++ b/chromium/listing/res/values-ro/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Conținut web pentru aplicații, cu tehnologie Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView este o componentă de sistem cu tehnologie Chrome, care permite aplicațiilor Android să afișeze conținut web. Această componentă este preinstalată pe dispozitiv și trebuie actualizată pentru a vă asigura că beneficiați de cele mai recente actualizări de securitate și de remedierea unor erori."</string> +</resources> diff --git a/chromium/listing/res/values-ru/strings.xml b/chromium/listing/res/values-ru/strings.xml new file mode 100644 index 0000000..4637101 --- /dev/null +++ b/chromium/listing/res/values-ru/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Просмотр веб-контента в приложениях (технологии Chrome)"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Системный компонент Android WebView работает на базе технологий Chrome и позволяет просматривать веб-контент в приложениях Android. Он уже установлен на вашем устройстве. Чтобы обеспечить его безопасность и высокую производительность, не забывайте обновлять его."</string> +</resources> diff --git a/chromium/listing/res/values-sk/strings.xml b/chromium/listing/res/values-sk/strings.xml new file mode 100644 index 0000000..879cd9a --- /dev/null +++ b/chromium/listing/res/values-sk/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webový obsah pre aplikácie (využívajúci technológiu prehliadača Chrome)"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview je systémový komponent využívajúci technológiu prehliadača Chrome, ktorý umožňuje aplikáciám pre Android zobrazovať webový obsah. Tento komponent je predinštalovaný na vašom zariadení. Je potrebné ho aktualizovať, aby ste mali vždy k dispozícii najnovšie aktualizácie zabezpečenia a ďalšie opravy chýb."</string> +</resources> diff --git a/chromium/listing/res/values-sl/strings.xml b/chromium/listing/res/values-sl/strings.xml new file mode 100644 index 0000000..5ab7320 --- /dev/null +++ b/chromium/listing/res/values-sl/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView za sistem Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Spletna vsebina za aplikacije, ki uporabljajo Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview je sistemska komponenta, ki uporablja Chrome in aplikacijam za sistem Android omogoča prikaz spletne vsebine. Ta komponenta je v vaši napravi vnaprej nameščena in jo morate sproti posodabljati, če si želite zagotoviti najnovejše varnostne posodobitve in druge popravke napak."</string> +</resources> diff --git a/chromium/listing/res/values-sr/strings.xml b/chromium/listing/res/values-sr/strings.xml new file mode 100644 index 0000000..98c8402 --- /dev/null +++ b/chromium/listing/res/values-sr/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Веб-садржај за апликације, омогућава Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview је системска компонента коју омогућава Chrome и која Android апликацијама омогућава да приказују веб-садржај. Та компонента је унапред инсталирана на уређају и треба је редовно ажурирати да бисте били сигурни да ћете имати најновија безбедносна ажурирања и друге исправке грешака."</string> +</resources> diff --git a/chromium/listing/res/values-sv/strings.xml b/chromium/listing/res/values-sv/strings.xml new file mode 100644 index 0000000..fc3fd17 --- /dev/null +++ b/chromium/listing/res/values-sv/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView i Android-systemet"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Webbinnehåll för appar, drivs av Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview är en systemkomponent som använder teknik från Chrome. Med dess hjälp kan webbinnehåll visas i Android-appar. Komponenten är förinstallerad på enheten och bör hållas uppdaterad så att du alltid har de senaste säkerhetsuppdateringarna och andra felkorrigeringarna."</string> +</resources> diff --git a/chromium/listing/res/values-sw/strings.xml b/chromium/listing/res/values-sw/strings.xml new file mode 100644 index 0000000..ad62752 --- /dev/null +++ b/chromium/listing/res/values-sw/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Mfumo wa Android wa WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Maudhui ya wavuti kwa programu, yanayoendeshwa na Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview ni kijenzi cha mfumo kinachoendeshwa na Chrome kinachoruhusu programu za Android zionyeshe maudhui ya wavuti. Kijenzi hiki huwekwa awali kwenye kifaa chako na kinapaswa kusasishwa kila wakati ili kuhakikisha kina sasisho mpya za usalama na marekebisho mengine ya hitilafu."</string> +</resources> diff --git a/chromium/listing/res/values-th/strings.xml b/chromium/listing/res/values-th/strings.xml new file mode 100644 index 0000000..6361656 --- /dev/null +++ b/chromium/listing/res/values-th/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"WebView ของระบบ Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"เนื้อหาเว็บสำหรับแอป สนับสนุนโดย Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview เป็นคอมโพเนนต์ระบบที่ได้รับการสนับสนุนโดย Chrome เพื่อให้แอป Android แสดงเนื้อหาเว็บได้ คอมโพเนนต์นี้จะติดตั้งไว้ล่วงหน้าบนอุปกรณ์และควรอัปเดตให้ทันสมัยเพื่อให้มั่นใจว่าคุณได้รับการอัปเดตด้านความปลอดภัยล่าสุดและการแก้ไขข้อบกพร่องอื่นๆ"</string> +</resources> diff --git a/chromium/listing/res/values-tl/strings.xml b/chromium/listing/res/values-tl/strings.xml new file mode 100644 index 0000000..8b495e6 --- /dev/null +++ b/chromium/listing/res/values-tl/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Web content para sa mga app, pinapagana ng Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Ang Android Webview ay isang bahagi ng system na pinapagana ng Chrome na nagbibigay-daan sa mga Android app na magpakita ng web content. Ang bahaging ito ay paunang naka-install sa iyong device at dapat panatilihing napapanahon upang matiyak na mayroon ka ng mga pinakabagong update sa seguridad at iba pang mga pag-aayos ng bug."</string> +</resources> diff --git a/chromium/listing/res/values-tr/strings.xml b/chromium/listing/res/values-tr/strings.xml new file mode 100644 index 0000000..124f6ed --- /dev/null +++ b/chromium/listing/res/values-tr/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android Sistemi WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Chrome tarafından desteklenen, uygulamalar için web içeriği"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview, Chrome tarafından desteklenen ve Android uygulamalarının web içeriklerini görüntülemesini sağlayan bir sistem bileşenidir. Bu bileşen, cihazınıza önceden yüklenir ve en son güvenlik güncellemeleri ile diğer hata düzeltmelerine sahip olmanızı sağlamak için güncel tutulması gerekir."</string> +</resources> diff --git a/chromium/listing/res/values-uk/strings.xml b/chromium/listing/res/values-uk/strings.xml new file mode 100644 index 0000000..4f41fea --- /dev/null +++ b/chromium/listing/res/values-uk/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Компонент Android WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Веб-вміст для додатків на основі технологій Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView – це системний компонент, який працює на основі технології Chrome. Він дає додаткам Android змогу показувати веб-вміст. Цей компонент заздалегідь установлено на вашому пристрої, і його потрібно регулярно оновлювати, що мати найновіші оновлення системи безпеки та виправлення помилок."</string> +</resources> diff --git a/chromium/listing/res/values-vi/strings.xml b/chromium/listing/res/values-vi/strings.xml new file mode 100644 index 0000000..225b804 --- /dev/null +++ b/chromium/listing/res/values-vi/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Nội dung web cho ứng dụng, được Chrome hỗ trợ"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android WebView là một thành phần hệ thống được Chrome hỗ trợ cho phép các ứng dụng Android hiển thị nội dung web. Thành phần này được cài đặt sẵn trên thiết bị của bạn và cần được cập nhật để đảm bảo bạn có bản cập nhật bảo mật mới nhất và bản sửa lỗi khác."</string> +</resources> diff --git a/chromium/listing/res/values-zh-rCN/strings.xml b/chromium/listing/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000..87228e4 --- /dev/null +++ b/chromium/listing/res/values-zh-rCN/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"使应用能够显示网页内容，由 Chrome 提供支持"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview 是一项由 Chrome 提供支持的系统组件，使 Android 应用能够显示网页内容。该组件已经预装在您的设备上，您需要及时更新该组件，以确保系统拥有最新的安全更新，并修正其他错误。"</string> +</resources> diff --git a/chromium/listing/res/values-zh-rHK/strings.xml b/chromium/listing/res/values-zh-rHK/strings.xml new file mode 100644 index 0000000..2e249e3 --- /dev/null +++ b/chromium/listing/res/values-zh-rHK/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"讓應用程式顯示網頁內容，由 Chrome 提供技術支援"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview 是一個由 Chrome 提供技術支援的系統元件，讓 Android 應用程式能夠顯示網頁內容。這個元件已經預載到您的裝置上，並需要保持更新，以確保您擁有最新的安全更新，並修正其他錯誤。"</string> +</resources> diff --git a/chromium/listing/res/values-zh-rTW/strings.xml b/chromium/listing/res/values-zh-rTW/strings.xml new file mode 100644 index 0000000..a209497 --- /dev/null +++ b/chromium/listing/res/values-zh-rTW/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"Android System WebView"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"讓應用程式可以顯示網頁內容，由 Chrome 提供技術支援"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"Android Webview 是一個由 Chrome 提供技術支援的系統元件，讓 Android 應用程式可以顯示網頁內容。這個元件已經預先安裝在您的裝置中，請時時保持更新，以確保您取得最新的安全更新檔和其他的錯誤修正檔。"</string> +</resources> diff --git a/chromium/listing/res/values-zu/strings.xml b/chromium/listing/res/values-zu/strings.xml new file mode 100644 index 0000000..bfa4c89 --- /dev/null +++ b/chromium/listing/res/values-zu/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewgoogle_play_store_title" msgid="6227907912304696478">"I-WebView Yesistimu ye-Android"</string> + <string name="webviewgoogle_play_store_tagline" msgid="825305078705915422">"Okuqukethwe kwewebhu kwezinhlelo zokusebenza, okunikwe amandla yi-Chrome"</string> + <string name="webviewgoogle_play_store_description" msgid="3054088773113944489">"I-Android WebView yingxenye yesistimu enikwe amandla yi-Chrome evumela izinhlelo zokusebenza ze-Android ukuthi zibonise okuqukethwe kwewebhu. Le ngxenye ifakwa ngaphambili kudivayisi yakho futhi kuzomele igcinwe isesikhathini ukuze kuqinisekiswe ukuthi unezibuyekezo zokuvikela zakamuva nokunye ukulungiswa kweziphazamisi."</string> +</resources> diff --git a/chromium/listing/res/values/strings.xml b/chromium/listing/res/values/strings.xml new file mode 100644 index 0000000..599dd95 --- /dev/null +++ b/chromium/listing/res/values/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2014 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Play Store title text [CHAR-LIMIT=30] --> + <string name="webviewgoogle_play_store_title">Android System WebView</string> + + <!-- Play Store tagline text. [CHAR-LIMIT=80] --> + <string name="webviewgoogle_play_store_tagline">Web content for apps, powered by Chrome</string> + + <!-- Play Store description text. [CHAR-LIMIT=4000] --> + <string name="webviewgoogle_play_store_description">Android Webview is a system component powered by Chrome that allows Android apps to display web content. This component is pre-installed on your device and should be kept up to date to ensure you have the latest security updates and other bug fixes.</string> + +</resources> diff --git a/chromium/loader/loader.cpp b/chromium/loader/loader.cpp new file mode 100644 index 0000000..f5aff7a --- /dev/null +++ b/chromium/loader/loader.cpp @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Uncomment for verbose logging. +// #define LOG_NDEBUG 0 +#define LOG_TAG "webviewchromiumloader" + +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include <jni.h> +#include <android/dlext.h> +#include <utils/Log.h> + +#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0]))) + +namespace android { +namespace { + +void* gReservedAddress = NULL; +size_t gReservedSize = 0; + +jboolean DoReserveAddressSpace(jlong size) { + size_t vsize = static_cast<size_t>(size); + + void* addr = mmap(NULL, vsize, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (addr == MAP_FAILED) { + ALOGE("Failed to reserve %zd bytes of address space for future load of " + "libwebviewchromium.so: %s", + vsize, strerror(errno)); + return JNI_FALSE; + } + gReservedAddress = addr; + gReservedSize = vsize; + ALOGV("Reserved %zd bytes at %p", vsize, addr); + return JNI_TRUE; +} + +jboolean DoCreateRelroFile(const char* lib, const char* relro) { + // Try to unlink the old file, since if this is being called, the old one is + // obsolete. + if (unlink(relro) != 0 && errno != ENOENT) { + // If something went wrong other than the file not existing, log a warning + // but continue anyway in the hope that we can successfully overwrite the + // existing file with rename() later. + ALOGW("Failed to unlink old file %s: %s", relro, strerror(errno)); + } + static const char tmpsuffix[] = ".XXXXXX"; + char relro_tmp[strlen(relro) + sizeof(tmpsuffix)]; + strlcpy(relro_tmp, relro, sizeof(relro_tmp)); + strlcat(relro_tmp, tmpsuffix, sizeof(relro_tmp)); + int tmp_fd = TEMP_FAILURE_RETRY(mkstemp(relro_tmp)); + if (tmp_fd == -1) { + ALOGE("Failed to create temporary file %s: %s", relro_tmp, strerror(errno)); + return JNI_FALSE; + } + android_dlextinfo extinfo; + extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_WRITE_RELRO; + extinfo.reserved_addr = gReservedAddress; + extinfo.reserved_size = gReservedSize; + extinfo.relro_fd = tmp_fd; + void* handle = android_dlopen_ext(lib, RTLD_NOW, &extinfo); + int close_result = close(tmp_fd); + if (handle == NULL) { + ALOGE("Failed to load library %s: %s", lib, dlerror()); + unlink(relro_tmp); + return JNI_FALSE; + } + if (close_result != 0 || + chmod(relro_tmp, S_IRUSR | S_IRGRP | S_IROTH) != 0 || + rename(relro_tmp, relro) != 0) { + ALOGE("Failed to update relro file %s: %s", relro, strerror(errno)); + unlink(relro_tmp); + return JNI_FALSE; + } + ALOGV("Created relro file %s for library %s", relro, lib); + return JNI_TRUE; +} + +jboolean DoLoadWithRelroFile(const char* lib, const char* relro) { + int relro_fd = TEMP_FAILURE_RETRY(open(relro, O_RDONLY)); + if (relro_fd == -1) { + ALOGE("Failed to open relro file %s: %s", relro, strerror(errno)); + return JNI_FALSE; + } + android_dlextinfo extinfo; + extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_USE_RELRO; + extinfo.reserved_addr = gReservedAddress; + extinfo.reserved_size = gReservedSize; + extinfo.relro_fd = relro_fd; + void* handle = android_dlopen_ext(lib, RTLD_NOW, &extinfo); + close(relro_fd); + if (handle == NULL) { + ALOGE("Failed to load library %s: %s", lib, dlerror()); + return JNI_FALSE; + } + ALOGV("Loaded library %s with relro file %s", lib, relro); + return JNI_TRUE; +} + +/******************************************************************************/ +/* JNI wrappers - handle string lifetimes and 32/64 ABI choice */ +/******************************************************************************/ + +jboolean ReserveAddressSpace(JNIEnv*, jclass, jlong size) { + return DoReserveAddressSpace(size); +} + +jboolean CreateRelroFile(JNIEnv* env, jclass, jstring lib32, jstring lib64, + jstring relro32, jstring relro64) { +#ifdef __LP64__ + jstring lib = lib64; + jstring relro = relro64; + (void)lib32; (void)relro32; +#else + jstring lib = lib32; + jstring relro = relro32; + (void)lib64; (void)relro64; +#endif + jboolean ret = JNI_FALSE; + const char* lib_utf8 = env->GetStringUTFChars(lib, NULL); + if (lib_utf8 != NULL) { + const char* relro_utf8 = env->GetStringUTFChars(relro, NULL); + if (relro_utf8 != NULL) { + ret = DoCreateRelroFile(lib_utf8, relro_utf8); + env->ReleaseStringUTFChars(relro, relro_utf8); + } + env->ReleaseStringUTFChars(lib, lib_utf8); + } + return ret; +} + +jboolean LoadWithRelroFile(JNIEnv* env, jclass, jstring lib32, jstring lib64, + jstring relro32, jstring relro64) { +#ifdef __LP64__ + jstring lib = lib64; + jstring relro = relro64; + (void)lib32; (void)relro32; +#else + jstring lib = lib32; + jstring relro = relro32; + (void)lib64; (void)relro64; +#endif + jboolean ret = JNI_FALSE; + const char* lib_utf8 = env->GetStringUTFChars(lib, NULL); + if (lib_utf8 != NULL) { + const char* relro_utf8 = env->GetStringUTFChars(relro, NULL); + if (relro_utf8 != NULL) { + ret = DoLoadWithRelroFile(lib_utf8, relro_utf8); + env->ReleaseStringUTFChars(relro, relro_utf8); + } + env->ReleaseStringUTFChars(lib, lib_utf8); + } + return ret; +} + +const char kClassName[] = "android/webkit/WebViewFactory"; +const JNINativeMethod kJniMethods[] = { + { "nativeReserveAddressSpace", "(J)Z", + reinterpret_cast<void*>(ReserveAddressSpace) }, + { "nativeCreateRelroFile", + "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z", + reinterpret_cast<void*>(CreateRelroFile) }, + { "nativeLoadWithRelroFile", + "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z", + reinterpret_cast<void*>(LoadWithRelroFile) }, +}; + +} // namespace + +void RegisterWebViewFactory(JNIEnv* env) { + // If either of these fail, it will set an exception that will be thrown on + // return, so no need to handle errors here. + jclass clazz = env->FindClass(kClassName); + if (clazz) { + env->RegisterNatives(clazz, kJniMethods, NELEM(kJniMethods)); + } +} + +} // namespace android + +JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { + JNIEnv* env = NULL; + if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { + ALOGE("GetEnv failed"); + return JNI_ERR; + } + android::RegisterWebViewFactory(env); + return JNI_VERSION_1_6; +} diff --git a/chromium/package.mk b/chromium/package.mk new file mode 100644 index 0000000..4f87464 --- /dev/null +++ b/chromium/package.mk @@ -0,0 +1,100 @@ +# +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This package provides the 'glue' layer between Chromium and WebView. + +LOCAL_PATH := $(call my-dir) +CHROMIUM_PATH := external/chromium_org + +ifeq (,$(wildcard $(CHROMIUM_PATH))) +# Some branches don't have the chromium sources; they shouldn't depend on +# webview, but just in case this is a mistake, warn about it. +$(warning Chromium sources missing, skipping webview package build) +else +# Chromium sources exist, build the package. + +# Java glue layer JAR, calls directly into the chromium AwContents Java API. +include $(CLEAR_VARS) + +LOCAL_PACKAGE_NAME := webview + +LOCAL_MANIFEST_FILE := AndroidManifest.xml + +LOCAL_MODULE_TAGS := optional + +LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources + +LOCAL_SRC_FILES := $(call all-java-files-under, java) +LOCAL_SRC_FILES += $(extra_java_files) + +LOCAL_JARJAR_RULES := $(CHROMIUM_PATH)/android_webview/build/jarjar-rules.txt + +include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk +LOCAL_RESOURCE_DIR := \ + $(res_overrides) \ + $(LOCAL_PATH)/res \ + $(android_webview_resources_dirs) + +LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags) +LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium +LOCAL_AAPT_FLAGS += --shared-lib + +include $(LOCAL_PATH)/version.mk +LOCAL_AAPT_FLAGS += --version-code "$(version_code)" --version-name "$(version_name)" + +LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium + +LOCAL_MULTILIB := both + +# See Bug 17409149. +LOCAL_DEX_PREOPT := false + +# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES. +LOCAL_REQUIRED_MODULES := \ + libwebviewchromium \ + libwebviewchromium_loader \ + libwebviewchromium_plat_support + +LOCAL_PROGUARD_ENABLED := full +LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +LOCAL_JAVACFLAGS := -Xlint:unchecked -Werror + +include $(BUILD_PACKAGE) + +$(LOCAL_BUILT_MODULE): $(android_webview_intermediates_pak_additional_deps) +$(LOCAL_BUILT_MODULE): PRIVATE_ASSET_DIR += $(android_webview_asset_dirs) +# This is needed to force the grd->string.xml conversion to run before we +# attempt to generate the R.java file. +$(R_file_stamp): $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp + +ifneq ($(strip $(LOCAL_JARJAR_RULES)),) +# Add build rules to check that the jarjar'ed jar only contains whitelisted +# packages. Only enable this when we are running jarjar. +LOCAL_JAR_CHECK_WHITELIST := $(LOCAL_PATH)/jar_package_whitelist.txt + +jar_check_ok := $(intermediates.COMMON)/jar_check_ok +$(jar_check_ok): PRIVATE_JAR_CHECK := $(LOCAL_PATH)/tools/jar_check.py +$(jar_check_ok): PRIVATE_JAR_CHECK_WHITELIST := $(LOCAL_JAR_CHECK_WHITELIST) +$(jar_check_ok): $(full_classes_jarjar_jar) $(LOCAL_PATH)/tools/jar_check.py $(LOCAL_JAR_CHECK_WHITELIST) + @echo Jar check: $@ + $(hide) $(PRIVATE_JAR_CHECK) $< $(PRIVATE_JAR_CHECK_WHITELIST) + $(hide) touch $@ + +$(LOCAL_BUILT_MODULE): $(jar_check_ok) +endif + +endif # CHROMIUM_PATH existence test diff --git a/chromium/plat_support/draw_gl_functor.cpp b/chromium/plat_support/draw_gl_functor.cpp index ab8878c..03b6385 100644 --- a/chromium/plat_support/draw_gl_functor.cpp +++ b/chromium/plat_support/draw_gl_functor.cpp @@ -52,22 +52,39 @@ class DrawGLFunctor : public Functor { } AwDrawGLInfo aw_info; - aw_info.mode = (what == DrawGlInfo::kModeProcess) ? - AwDrawGLInfo::kModeProcess : AwDrawGLInfo::kModeDraw; - DrawGlInfo* gl_info = reinterpret_cast<DrawGlInfo*>(data); - - // Map across the input values. - aw_info.clip_left = gl_info->clipLeft; - aw_info.clip_top = gl_info->clipTop; - aw_info.clip_right = gl_info->clipRight; - aw_info.clip_bottom = gl_info->clipBottom; - aw_info.width = gl_info->width; - aw_info.height = gl_info->height; - aw_info.is_layer = gl_info->isLayer; - COMPILE_ASSERT(NELEM(aw_info.transform) == NELEM(gl_info->transform), - mismatched_transform_matrix_sizes); - for (int i = 0; i < NELEM(aw_info.transform); ++i) { - aw_info.transform[i] = gl_info->transform[i]; + aw_info.version = kAwDrawGLInfoVersion; + switch (what) { + case DrawGlInfo::kModeDraw: { + aw_info.mode = AwDrawGLInfo::kModeDraw; + DrawGlInfo* gl_info = reinterpret_cast<DrawGlInfo*>(data); + + // Map across the input values. + aw_info.clip_left = gl_info->clipLeft; + aw_info.clip_top = gl_info->clipTop; + aw_info.clip_right = gl_info->clipRight; + aw_info.clip_bottom = gl_info->clipBottom; + aw_info.width = gl_info->width; + aw_info.height = gl_info->height; + aw_info.is_layer = gl_info->isLayer; + COMPILE_ASSERT(NELEM(aw_info.transform) == NELEM(gl_info->transform), + mismatched_transform_matrix_sizes); + for (int i = 0; i < NELEM(aw_info.transform); ++i) { + aw_info.transform[i] = gl_info->transform[i]; + } + break; + } + case DrawGlInfo::kModeProcess: + aw_info.mode = AwDrawGLInfo::kModeProcess; + break; + case DrawGlInfo::kModeProcessNoContext: + aw_info.mode = AwDrawGLInfo::kModeProcessNoContext; + break; + case DrawGlInfo::kModeSync: + aw_info.mode = AwDrawGLInfo::kModeSync; + break; + default: + ALOGE("Unexpected DrawGLInfo type %d", what); + return DrawGlInfo::kStatusDone; } // Invoke the DrawGL method. diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp index 66acf50..320e419 100644 --- a/chromium/plat_support/graphics_utils.cpp +++ b/chromium/plat_support/graphics_utils.cpp @@ -63,7 +63,7 @@ AwPixelInfo* GetPixels(JNIEnv* env, jobject java_canvas) { // translate & scale transforms, and a simple rectangular clip. // (This also avoids significant wasted time in calling // SkCanvasStateUtils::CaptureCanvasState when the clip is complex). - if (!canvas->getTotalClip().isRect() || + if (!canvas->isClipRect() || (canvas->getTotalMatrix().getType() & ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask))) { return NULL; @@ -83,6 +83,7 @@ void ReleasePixels(AwPixelInfo* pixels) { jlong GetDrawSWFunctionTable(JNIEnv* env, jclass) { static AwDrawSWFunctionTable function_table; + function_table.version = kAwDrawSWFunctionTableVersion; function_table.access_pixels = &GetPixels; function_table.release_pixels = &ReleasePixels; return reinterpret_cast<intptr_t>(&function_table); @@ -90,6 +91,7 @@ jlong GetDrawSWFunctionTable(JNIEnv* env, jclass) { jlong GetDrawGLFunctionTable(JNIEnv* env, jclass) { static AwDrawGLFunctionTable function_table; + function_table.version = kAwDrawGLFunctionTableVersion; function_table.create_graphic_buffer = &GraphicBufferImpl::Create; function_table.release_graphic_buffer = &GraphicBufferImpl::Release; function_table.map = &GraphicBufferImpl::MapStatic; diff --git a/chromium/proguard.flags b/chromium/proguard.flags index a860d06..6401a8c 100644 --- a/chromium/proguard.flags +++ b/chromium/proguard.flags @@ -15,18 +15,6 @@ } # Keep everything related to the org.chromium JNI interface. --keepclasseswithmembers class org.chromium.** { - @**.AccessedByNative <fields>; -} --keepclasseswithmembers class org.chromium.** { - @**.CalledByNative <methods>; -} --keepclasseswithmembers class org.chromium.** { - @**.CalledByNativeUnchecked <methods>; -} --keepclasseswithmembers class org.chromium.** { - native <methods>; -} -keepclasseswithmembers class com.android.org.chromium.** { @**.AccessedByNative <fields>; } @@ -41,30 +29,31 @@ } # Keep methods which get bound to JS interfaces via reflection. --keepclasseswithmembers class org.chromium.** { - @**.JavascriptInterface <methods>; -} -keepclasseswithmembers class com.android.org.chromium.** { @**.JavascriptInterface <methods>; } # Silence notes caused by use of @VisibleForTesting inside guava. This doesn't # happen when using jarjar because @VisibleForTesting gets renamed as well. --dontnote com.google.common.cache.LocalCache$ReferenceEntry --dontnote com.google.common.collect.MapMakerInternalMap$ReferenceEntry +-dontnote com.google.common.annotations.VisibleForTesting # MediaPlayerBridge uses reflection to access internal metadata. --dontnote org.chromium.media.MediaPlayerBridge -dontnote com.android.org.chromium.media.MediaPlayerBridge # AndroidKeyStore uses reflection to access internal OpenSSL state. --dontnote org.chromium.net.AndroidKeyStore -dontnote com.android.org.chromium.net.AndroidKeyStore # TraceEvent uses reflection to access internal trace info. --dontnote org.chromium.content.common.TraceEvent -dontnote com.android.org.chromium.content.common.TraceEvent +# ProxyChangeListener$ProxyReceiver uses reflection to access internal +# android.net.ProxyProperties. +-dontnote com.android.org.chromium.net.ProxyChangeListener$ProxyReceiver + +# com.android.org.chromium.content.app.Linker dynamically casts to $TestRunner +# when running tests. We don't run these tests in WebView. +-dontnote com.android.org.chromium.content.app.Linker$TestRunner + # We need to keep these explicitly as they are parameters to methods which # are entry points via @calledByNative. -keep class com.android.org.chromium.ui.autofill.AutofillSuggestion @@ -78,13 +67,12 @@ -keep class com.android.org.chromium.android_webview.AwBrowserContext -keep class com.android.org.chromium.base.library_loader.Linker$LibInfo -# Keep finalizer stuff from google-common used via reflection --keepclassmembers class com.google.common.** { - *** finalizeReferent(); -} --keepclassmembers class com.google.common.** { - *** startFinalizer(java.lang.Class,java.lang.Object); +# Keep this class and members as accessed via reflection +-keep class com.android.webview.chromium.Drp { + public *; } + +# Keep finalizer stuff from google-common used via reflection -keepclassmembers class com.android.org.chromium.com.google.common.** { *** finalizeReferent(); } diff --git a/chromium/res/drawable-hdpi/icon_webview.png b/chromium/res/drawable-hdpi/icon_webview.png Binary files differnew file mode 100644 index 0000000..4f9377f --- /dev/null +++ b/chromium/res/drawable-hdpi/icon_webview.png diff --git a/chromium/res/drawable-mdpi/icon_webview.png b/chromium/res/drawable-mdpi/icon_webview.png Binary files differnew file mode 100644 index 0000000..9bc6817 --- /dev/null +++ b/chromium/res/drawable-mdpi/icon_webview.png diff --git a/chromium/res/drawable-xhdpi/icon_webview.png b/chromium/res/drawable-xhdpi/icon_webview.png Binary files differnew file mode 100644 index 0000000..9412fbe --- /dev/null +++ b/chromium/res/drawable-xhdpi/icon_webview.png diff --git a/chromium/res/drawable-xxhdpi/icon_webview.png b/chromium/res/drawable-xxhdpi/icon_webview.png Binary files differnew file mode 100644 index 0000000..bd8c447 --- /dev/null +++ b/chromium/res/drawable-xxhdpi/icon_webview.png diff --git a/chromium/res/raw/webviewchromium_loaderror.html b/chromium/res/raw/webviewchromium_loaderror.html deleted file mode 100644 index 565e8e9..0000000 --- a/chromium/res/raw/webviewchromium_loaderror.html +++ /dev/null @@ -1,19 +0,0 @@ -<html> - <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> - <title>Webpage not available</title> - <style type="text/css"> - body { margin-top: 0px; padding-top: 0px; } - h2 { margin-top: 5px; padding-top: 0px; } - </style> - - <body> - - <img src="file:///android_asset/webkit/android-weberror.png" align="top" /> - <h2>Webpage not available</h2> - <p>The webpage at <a href="%s">%s</a> could not be loaded because:</p> - <!-- The %e is replaced by a localized error string --> - <p>%e</p> - </body> - </head> -</html> diff --git a/chromium/res/raw/webviewchromium_nodomain.html b/chromium/res/raw/webviewchromium_nodomain.html deleted file mode 100644 index d757483..0000000 --- a/chromium/res/raw/webviewchromium_nodomain.html +++ /dev/null @@ -1,26 +0,0 @@ -<html> - <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> - <title>Webpage not available</title> - <style type="text/css"> - body { margin-top: 0px; padding-top: 0px; } - h2 { margin-top: 5px; padding-top: 0px; } - </style> - - <body> - - <img src="file:///android_asset/webkit/android-weberror.png" align="top" /> - <h2>Webpage not available</h2> - <p>The webpage at <a href="%s">%s</a> might be - temporarily down or it may have moved permanently to a new web - address.</p> - - <p><b>Suggestions:</b></p> - <ul> - <li>Make sure you have a data connection</li> - <li>Reload this webpage later</li> - <li>Check the address you entered</li> - </ul> - </body> - </head> -</html> diff --git a/chromium/res/values-af/strings.xml b/chromium/res/values-af/strings.xml index d44bf8e..5a9af53 100644 --- a/chromium/res/values-af/strings.xml +++ b/chromium/res/values-af/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Hierdie funksie word nie ondersteun in hierdie weergawe van Android nie."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Dié weergawe van Android steun nie díe funksie nie."</string> </resources> diff --git a/chromium/res/values-am/strings.xml b/chromium/res/values-am/strings.xml index d1f8671..944f0b5 100644 --- a/chromium/res/values-am/strings.xml +++ b/chromium/res/values-am/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"ይህ ተግባራዊነት በዚህ የAndroid ስሪት የተደገ አይደለም።"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"ይህ ተግባራዊ በዚህ የAndroid ስሪት ላይ የተደገ አይደለም።"</string> </resources> diff --git a/chromium/res/values-ar/strings.xml b/chromium/res/values-ar/strings.xml index 521e715..15f29db 100644 --- a/chromium/res/values-ar/strings.xml +++ b/chromium/res/values-ar/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"هذه الوظيفة غير متوافقة مع هذا الإصدار من Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"هذه الخدمة غير متوافقة مع هذا الإصدار من Android."</string> </resources> diff --git a/chromium/res/values-bg/strings.xml b/chromium/res/values-bg/strings.xml index dee8ef8..d57e8fd 100644 --- a/chromium/res/values-bg/strings.xml +++ b/chromium/res/values-bg/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Функционалността не се поддържа в тази версия на Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Функционалността не се поддържа в тази версия на Android."</string> </resources> diff --git a/chromium/res/values-bn-rBD/strings.xml b/chromium/res/values-bn-rBD/strings.xml new file mode 100644 index 0000000..9add0e9 --- /dev/null +++ b/chromium/res/values-bn-rBD/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"এই কার্যকারিতাটি Android এর এই সংস্করণে সমর্থিত নয়।"</string> +</resources> diff --git a/chromium/res/values-ca/strings.xml b/chromium/res/values-ca/strings.xml index 35dcf8b..a4c2a83 100644 --- a/chromium/res/values-ca/strings.xml +++ b/chromium/res/values-ca/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"No s\'admet aquesta funcionalitat en aquesta versió d\'Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Aquesta funció no és compatible amb aquesta versió d\'Android."</string> </resources> diff --git a/chromium/res/values-cs/strings.xml b/chromium/res/values-cs/strings.xml index 45b6edb..f0a8c29 100644 --- a/chromium/res/values-cs/strings.xml +++ b/chromium/res/values-cs/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Tuto funkci daná verze systému Android nepodporuje."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Tuto funkci daná verze systému Android nepodporuje."</string> </resources> diff --git a/chromium/res/values-da/strings.xml b/chromium/res/values-da/strings.xml index 83eb9f1..4284767 100644 --- a/chromium/res/values-da/strings.xml +++ b/chromium/res/values-da/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Denne funktion understøttes ikke i denne version af Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Denne funktion understøttes ikke i denne version af Android."</string> </resources> diff --git a/chromium/res/values-de/strings.xml b/chromium/res/values-de/strings.xml index a15d788..f714539 100644 --- a/chromium/res/values-de/strings.xml +++ b/chromium/res/values-de/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Die Funktion wird von dieser Android-Version nicht unterstützt."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Die Funktion wird von dieser Android-Version nicht unterstützt."</string> </resources> diff --git a/chromium/res/values-el/strings.xml b/chromium/res/values-el/strings.xml index 3cdfa7f..9e2d943 100644 --- a/chromium/res/values-el/strings.xml +++ b/chromium/res/values-el/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Αυτή η λειτουργία δεν υποστηρίζεται σε αυτήν την έκδοση Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Αυτή η λειτουργία δεν υποστηρίζεται σε αυτήν την έκδοση Android."</string> </resources> diff --git a/chromium/res/values-en-rGB/strings.xml b/chromium/res/values-en-rGB/strings.xml index 15aa20f..388e12c 100644 --- a/chromium/res/values-en-rGB/strings.xml +++ b/chromium/res/values-en-rGB/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"This functionality is not supported in this version of Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"This functionality is not supported in this version of Android."</string> </resources> diff --git a/chromium/res/values-en-rIN/strings.xml b/chromium/res/values-en-rIN/strings.xml index 15aa20f..388e12c 100644 --- a/chromium/res/values-en-rIN/strings.xml +++ b/chromium/res/values-en-rIN/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"This functionality is not supported in this version of Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"This functionality is not supported in this version of Android."</string> </resources> diff --git a/chromium/res/values-es-rUS/strings.xml b/chromium/res/values-es-rUS/strings.xml index d6633cc..1320a1c 100644 --- a/chromium/res/values-es-rUS/strings.xml +++ b/chromium/res/values-es-rUS/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"La función no es compatible con esta versión de Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Incompatible con versión"</string> </resources> diff --git a/chromium/res/values-es/strings.xml b/chromium/res/values-es/strings.xml index d6633cc..383c959 100644 --- a/chromium/res/values-es/strings.xml +++ b/chromium/res/values-es/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"La función no es compatible con esta versión de Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Incompatible con versión."</string> </resources> diff --git a/chromium/res/values-et-rEE/strings.xml b/chromium/res/values-et-rEE/strings.xml index f6daf20..4d9682d 100644 --- a/chromium/res/values-et-rEE/strings.xml +++ b/chromium/res/values-et-rEE/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"See funktsioon pole selles Androidi versioonis toetatud."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"See funktsioon pole selles Androidi versioonis toetatud."</string> </resources> diff --git a/chromium/res/values-eu-rES/strings.xml b/chromium/res/values-eu-rES/strings.xml new file mode 100644 index 0000000..ec152a0 --- /dev/null +++ b/chromium/res/values-eu-rES/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android bertsio honek ez du funtzio hori onartzen."</string> +</resources> diff --git a/chromium/res/values-fa/strings.xml b/chromium/res/values-fa/strings.xml index fed6ec6..4207c0b 100644 --- a/chromium/res/values-fa/strings.xml +++ b/chromium/res/values-fa/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"این عملکرد در این نسخه از Android پشتیبانی نمیشود."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"این عملکرد در این نسخه Android پشتیبانی نمیشود."</string> </resources> diff --git a/chromium/res/values-fi/strings.xml b/chromium/res/values-fi/strings.xml index 7246029..4350924 100644 --- a/chromium/res/values-fi/strings.xml +++ b/chromium/res/values-fi/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Toiminnallisuutta ei tueta tässä Android-versiossa."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Toiminnallisuutta ei tueta tässä Android-versiossa."</string> </resources> diff --git a/chromium/res/values-fr-rCA/strings.xml b/chromium/res/values-fr-rCA/strings.xml index 8b074e9..39caa21 100644 --- a/chromium/res/values-fr-rCA/strings.xml +++ b/chromium/res/values-fr-rCA/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Cette fonctionnalité n\'est pas compatible avec cette version d\'Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Cette fonctionnalité n\'est pas compatible avec cette version d\'Android."</string> </resources> diff --git a/chromium/res/values-fr/strings.xml b/chromium/res/values-fr/strings.xml index 8b074e9..d735e7d 100644 --- a/chromium/res/values-fr/strings.xml +++ b/chromium/res/values-fr/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Cette fonctionnalité n\'est pas compatible avec cette version d\'Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Fonctionnalité non compatible avec cette version d\'Android."</string> </resources> diff --git a/chromium/res/values-gl-rES/strings.xml b/chromium/res/values-gl-rES/strings.xml new file mode 100644 index 0000000..4246bfa --- /dev/null +++ b/chromium/res/values-gl-rES/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Esta funcionalidade non é compatible con esta versión de Android."</string> +</resources> diff --git a/chromium/res/values-hi/strings.xml b/chromium/res/values-hi/strings.xml index ab5af4a..6972fce 100644 --- a/chromium/res/values-hi/strings.xml +++ b/chromium/res/values-hi/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"यह कार्यात्मकता Android के इस संस्करण में समर्थित नहीं है."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"कार्यक्षमता, Android वर्शन में समर्थित नहीं."</string> </resources> diff --git a/chromium/res/values-hr/strings.xml b/chromium/res/values-hr/strings.xml index ac1ea59..e7e1d83 100644 --- a/chromium/res/values-hr/strings.xml +++ b/chromium/res/values-hr/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Ta funkcija nije podržana na ovoj verziji Androida."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Ver. Androida ne podrž. tu fun."</string> </resources> diff --git a/chromium/res/values-hu/strings.xml b/chromium/res/values-hu/strings.xml index 8ae6d8c..67b848c 100644 --- a/chromium/res/values-hu/strings.xml +++ b/chromium/res/values-hu/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Ez a funkció nem támogatott az Android ezen verzióján."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Ez a funkció nem támogatott az Android ezen verzióján."</string> </resources> diff --git a/chromium/res/values-hy-rAM/strings.xml b/chromium/res/values-hy-rAM/strings.xml index 8084d71..55dfcb1 100644 --- a/chromium/res/values-hy-rAM/strings.xml +++ b/chromium/res/values-hy-rAM/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Այս գործառույթը Android-ի այս տարբերակում չի աջակցվում:"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Այս գործառույթը Android-ի այս տարբերակում չի աջակցվում:"</string> </resources> diff --git a/chromium/res/values-in/strings.xml b/chromium/res/values-in/strings.xml index a1b7d54..d7b08bb 100644 --- a/chromium/res/values-in/strings.xml +++ b/chromium/res/values-in/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Fungsi ini tidak didukung oleh versi Android ini."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Fungsi ini tidak didukung oleh versi Android ini."</string> </resources> diff --git a/chromium/res/values-is-rIS/strings.xml b/chromium/res/values-is-rIS/strings.xml new file mode 100644 index 0000000..d6245e6 --- /dev/null +++ b/chromium/res/values-is-rIS/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Þessi eiginleiki er ekki studdur í þessari útgáfu af Android."</string> +</resources> diff --git a/chromium/res/values-it/strings.xml b/chromium/res/values-it/strings.xml index 433fec9..f407a4b 100644 --- a/chromium/res/values-it/strings.xml +++ b/chromium/res/values-it/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Questa funzionalità non è supportata in questa versione di Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Questa funzionalità non è supportata in questa versione di Android."</string> </resources> diff --git a/chromium/res/values-iw/strings.xml b/chromium/res/values-iw/strings.xml index 624e5ab..9be0ed5 100644 --- a/chromium/res/values-iw/strings.xml +++ b/chromium/res/values-iw/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"הפונקציונליות הזו אינה נתמכת בגרסה הזו של Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"פעולה לא נתמכת בגרסה זו."</string> </resources> diff --git a/chromium/res/values-ja/strings.xml b/chromium/res/values-ja/strings.xml index bacbb3b..44ca5a8 100644 --- a/chromium/res/values-ja/strings.xml +++ b/chromium/res/values-ja/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"この機能はこのバージョンのAndroidではサポートされていません。"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"この機能はこのバージョンのAndroidではサポートされていません。"</string> </resources> diff --git a/chromium/res/values-ka-rGE/strings.xml b/chromium/res/values-ka-rGE/strings.xml index ef5dee9..7735693 100644 --- a/chromium/res/values-ka-rGE/strings.xml +++ b/chromium/res/values-ka-rGE/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Android-ის ამ ვერსიაში ეს ფუნქცია მხარდაჭერილი არ არის."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"ამ ვერს. ფუნქც.მხარდაუჭ."</string> </resources> diff --git a/chromium/res/values-kk-rKZ/strings.xml b/chromium/res/values-kk-rKZ/strings.xml new file mode 100644 index 0000000..9248461 --- /dev/null +++ b/chromium/res/values-kk-rKZ/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Бұл фун. осы Android қолдам."</string> +</resources> diff --git a/chromium/res/values-km-rKH/strings.xml b/chromium/res/values-km-rKH/strings.xml index 3dc16cd..c2cbf48 100644 --- a/chromium/res/values-km-rKH/strings.xml +++ b/chromium/res/values-km-rKH/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"មុខងារនេះមិនត្រូវបានគាំទ្រនៅក្នុងកំណែរបស់ Android នេះទេ។"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"មុខងារនេះមិនត្រូវបានគាំទ្រនៅក្នុងកំណែ Android នេះទេ។"</string> </resources> diff --git a/chromium/res/values-kn-rIN/strings.xml b/chromium/res/values-kn-rIN/strings.xml new file mode 100644 index 0000000..8dbf6c9 --- /dev/null +++ b/chromium/res/values-kn-rIN/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android ನ ಈ ಆವೃತ್ತಿಯಲ್ಲಿ ಈ ಕಾರ್ಯಕ್ಷಮತೆಯು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string> +</resources> diff --git a/chromium/res/values-ko/strings.xml b/chromium/res/values-ko/strings.xml index f68e8d6..f097b7f 100644 --- a/chromium/res/values-ko/strings.xml +++ b/chromium/res/values-ko/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"사용 중인 Android 버전에서 지원되지 않는 기능입니다."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"사용 중인 Android 버전에서 지원되지 않는 기능입니다."</string> </resources> diff --git a/chromium/res/values-ky-rKG/strings.xml b/chromium/res/values-ky-rKG/strings.xml new file mode 100644 index 0000000..2262754 --- /dev/null +++ b/chromium/res/values-ky-rKG/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Бул функция ушул Android версиясында колдоого алынбайт."</string> +</resources> diff --git a/chromium/res/values-lo-rLA/strings.xml b/chromium/res/values-lo-rLA/strings.xml index 0551b30..1fa390b 100644 --- a/chromium/res/values-lo-rLA/strings.xml +++ b/chromium/res/values-lo-rLA/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"ຄວາມສາມາດນີ້ຍັງບໍ່ຖືກຮອງຮັບໃນ Android ເວີຊັນນີ້ເທື່ອ."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"ຄວາມສາມາດນີ້ຍັງບໍ່ຖືກຮອງຮັບໃນ Android ເວີຊັນນີ້ເທື່ອ."</string> </resources> diff --git a/chromium/res/values-lt/strings.xml b/chromium/res/values-lt/strings.xml index 5e74864..3eee6c6 100644 --- a/chromium/res/values-lt/strings.xml +++ b/chromium/res/values-lt/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Naudojant šią „Android“ versiją, šios funkcijos negalimos."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Šios v. „Android“ šios funkc. nepal."</string> </resources> diff --git a/chromium/res/values-lv/strings.xml b/chromium/res/values-lv/strings.xml index 5999b45..c6be5ba 100644 --- a/chromium/res/values-lv/strings.xml +++ b/chromium/res/values-lv/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Šajā Android versijā šī funkcija netiek atbalstīta."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Šajā Android versijā šī funkcija netiek atbalstīta."</string> </resources> diff --git a/chromium/res/values-mk-rMK/strings.xml b/chromium/res/values-mk-rMK/strings.xml new file mode 100644 index 0000000..8ca84e9 --- /dev/null +++ b/chromium/res/values-mk-rMK/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Функцијата не е поддржана во оваа верзија на Android."</string> +</resources> diff --git a/chromium/res/values-ml-rIN/strings.xml b/chromium/res/values-ml-rIN/strings.xml new file mode 100644 index 0000000..3713095 --- /dev/null +++ b/chromium/res/values-ml-rIN/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android-ന്റെ ഈ പതിപ്പിൽ ഈ പ്രവർത്തനത്തെ പിന്തുണയ്ക്കില്ല."</string> +</resources> diff --git a/chromium/res/values-mn-rMN/strings.xml b/chromium/res/values-mn-rMN/strings.xml index 7f3323c..31bc7ab 100644 --- a/chromium/res/values-mn-rMN/strings.xml +++ b/chromium/res/values-mn-rMN/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Андройдын энэ хувилбар дээр энэ функц дэмжигдээгүй."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Андройдын энэ хувилбар дээр энэ функц дэмжигдээгүй."</string> </resources> diff --git a/chromium/res/values-mr-rIN/strings.xml b/chromium/res/values-mr-rIN/strings.xml new file mode 100644 index 0000000..0ce6a26 --- /dev/null +++ b/chromium/res/values-mr-rIN/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android च्या या आवृत्तीत ही कार्यक्षमता समर्थित नाही."</string> +</resources> diff --git a/chromium/res/values-ms-rMY/strings.xml b/chromium/res/values-ms-rMY/strings.xml index 1582386..219a935 100644 --- a/chromium/res/values-ms-rMY/strings.xml +++ b/chromium/res/values-ms-rMY/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Fungsi ini tidak disokong dalam Android versi ini."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Fungsi ini tidak disokong dalam Android versi ini."</string> </resources> diff --git a/chromium/res/values-my-rMM/strings.xml b/chromium/res/values-my-rMM/strings.xml new file mode 100644 index 0000000..e819ed0 --- /dev/null +++ b/chromium/res/values-my-rMM/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"ဤဗားရှင်းတွင် သုံးမရပါ။"</string> +</resources> diff --git a/chromium/res/values-nb/strings.xml b/chromium/res/values-nb/strings.xml index fa7fabe..a07b17f 100644 --- a/chromium/res/values-nb/strings.xml +++ b/chromium/res/values-nb/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Denne funksjonaliteten støttes ikke i denne Android-versjonen."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Denne funksjonaliteten støttes ikke i denne Android-versjonen."</string> </resources> diff --git a/chromium/res/values-ne-rNP/strings.xml b/chromium/res/values-ne-rNP/strings.xml index fe693d3..ce13393 100644 --- a/chromium/res/values-ne-rNP/strings.xml +++ b/chromium/res/values-ne-rNP/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Android को यस संस्करणमा यो कार्य समर्थित छैन।"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android को यस संस्करणमा यो कार्य समर्थित छैन।"</string> </resources> diff --git a/chromium/res/values-nl/strings.xml b/chromium/res/values-nl/strings.xml index 77634b4..c8ef70a 100644 --- a/chromium/res/values-nl/strings.xml +++ b/chromium/res/values-nl/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Deze functionaliteit wordt niet ondersteund in deze versie van Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Deze functionaliteit wordt niet ondersteund in deze versie van Android."</string> </resources> diff --git a/chromium/res/values-pl/strings.xml b/chromium/res/values-pl/strings.xml index 1b079e5..d7524ac 100644 --- a/chromium/res/values-pl/strings.xml +++ b/chromium/res/values-pl/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"W tej wersji Androida ta funkcja jest niedostępna."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"W tej wersji Androida ta funkcja jest niedostępna."</string> </resources> diff --git a/chromium/res/values-pt-rPT/strings.xml b/chromium/res/values-pt-rPT/strings.xml index 1517a4a..460b29a 100644 --- a/chromium/res/values-pt-rPT/strings.xml +++ b/chromium/res/values-pt-rPT/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Esta funcionalidade não é suportada nesta versão do Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Esta funcionalidade não é compatível com esta versão do Android."</string> </resources> diff --git a/chromium/res/values-pt/strings.xml b/chromium/res/values-pt/strings.xml index 57f399c..b8db4b0 100644 --- a/chromium/res/values-pt/strings.xml +++ b/chromium/res/values-pt/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Funcionalidade não suportada nesta versão do Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Não ac. neste Android."</string> </resources> diff --git a/chromium/res/values-ro/strings.xml b/chromium/res/values-ro/strings.xml index 5c8d240..a45ff3a 100644 --- a/chromium/res/values-ro/strings.xml +++ b/chromium/res/values-ro/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Această funcție nu este acceptată în această versiune de Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Această funcție nu este acceptată în această versiune de Android."</string> </resources> diff --git a/chromium/res/values-ru/strings.xml b/chromium/res/values-ru/strings.xml index 2172f0e..fb5c12f 100644 --- a/chromium/res/values-ru/strings.xml +++ b/chromium/res/values-ru/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Эта функция не поддерживается в данной версии Android"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Эта функция не поддерживается в данной версии Android"</string> </resources> diff --git a/chromium/res/values-si-rLK/strings.xml b/chromium/res/values-si-rLK/strings.xml index b371c48..039f0e1 100644 --- a/chromium/res/values-si-rLK/strings.xml +++ b/chromium/res/values-si-rLK/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"මෙම ක්රියාකාරිත්වය මෙම Android අනුවාදයේ සහය නොදක්වයි."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"මෙම ක්රියාකාරිත්වය මෙම Android අනුවාදයේ සහය නොදක්වයි."</string> </resources> diff --git a/chromium/res/values-sk/strings.xml b/chromium/res/values-sk/strings.xml index ae78264..5989b27 100644 --- a/chromium/res/values-sk/strings.xml +++ b/chromium/res/values-sk/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Daná funkcia nie je v tejto verzii systému Android podporovaná."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Funkcia nie je v tejto verzii Androidu podporovaná."</string> </resources> diff --git a/chromium/res/values-sl/strings.xml b/chromium/res/values-sl/strings.xml index 08e62ff..501fb33 100644 --- a/chromium/res/values-sl/strings.xml +++ b/chromium/res/values-sl/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Ta funkcija ni podprta v tej različici Androida."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Ta funkcija ni podprta v tej različici Androida."</string> </resources> diff --git a/chromium/res/values-sr/strings.xml b/chromium/res/values-sr/strings.xml index 222d155..0ca5ec1 100644 --- a/chromium/res/values-sr/strings.xml +++ b/chromium/res/values-sr/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Ова функција није подржана у овој верзији Android-а."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Ова функција није подржана у овој верзији Android-а."</string> </resources> diff --git a/chromium/res/values-sv/strings.xml b/chromium/res/values-sv/strings.xml index 8803f6f..c97f584 100644 --- a/chromium/res/values-sv/strings.xml +++ b/chromium/res/values-sv/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Funktionen stöds inte i den här versionen av Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Funktionen stöds inte i den här versionen av Android."</string> </resources> diff --git a/chromium/res/values-sw/strings.xml b/chromium/res/values-sw/strings.xml index 57a685a..28afac3 100644 --- a/chromium/res/values-sw/strings.xml +++ b/chromium/res/values-sw/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Utendaji huu hauwezi kutumika katika toleo hili la Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Utendaji huu hauwezi kutumika katika toleo hili la Android."</string> </resources> diff --git a/chromium/res/values-ta-rIN/strings.xml b/chromium/res/values-ta-rIN/strings.xml new file mode 100644 index 0000000..66ed197 --- /dev/null +++ b/chromium/res/values-ta-rIN/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"இந்த Android பதிப்பில், செயல்பாடு ஆதரிக்கப்படவில்லை."</string> +</resources> diff --git a/chromium/res/values-te-rIN/strings.xml b/chromium/res/values-te-rIN/strings.xml new file mode 100644 index 0000000..cf369e8 --- /dev/null +++ b/chromium/res/values-te-rIN/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"ఈ కార్యాచరణకు ఈ Android సంస్కరణలో మద్దతు లేదు."</string> +</resources> diff --git a/chromium/res/values-th/strings.xml b/chromium/res/values-th/strings.xml index 53f31b9..c25d58f 100644 --- a/chromium/res/values-th/strings.xml +++ b/chromium/res/values-th/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"ฟังก์ชันการทำงานนี้ไม่ได้รับการสนับสนุนในแอนดรอยด์เวอร์ชันนี้"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Android ไม่รองรับ"</string> </resources> diff --git a/chromium/res/values-tl/strings.xml b/chromium/res/values-tl/strings.xml index 40cf23b..3aeb7fd 100644 --- a/chromium/res/values-tl/strings.xml +++ b/chromium/res/values-tl/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Hindi sinusuportahan ang pagpapaganang ito sa bersyong ito ng Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Hindi sinusuportahan functionality sa Android version na ito."</string> </resources> diff --git a/chromium/res/values-tr/strings.xml b/chromium/res/values-tr/strings.xml index 02d73dd..c6833c5 100644 --- a/chromium/res/values-tr/strings.xml +++ b/chromium/res/values-tr/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Bu işlev, Android\'in bu sürümünde desteklenmiyor."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Bu işlev, Android\'in bu sürümünde desteklenmiyor."</string> </resources> diff --git a/chromium/res/values-uk/strings.xml b/chromium/res/values-uk/strings.xml index bafe75c..0774531 100644 --- a/chromium/res/values-uk/strings.xml +++ b/chromium/res/values-uk/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Функція не підтримується в цій версії Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Функція не підтримується в цій версії Android."</string> </resources> diff --git a/chromium/res/values-ur-rPK/strings.xml b/chromium/res/values-ur-rPK/strings.xml new file mode 100644 index 0000000..0926aeb --- /dev/null +++ b/chromium/res/values-ur-rPK/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"یہ فعالیت Android کے اس ورژن میں تعاون یافتہ نہیں ہے۔"</string> +</resources> diff --git a/chromium/res/values-uz-rUZ/strings.xml b/chromium/res/values-uz-rUZ/strings.xml new file mode 100644 index 0000000..53c31b2 --- /dev/null +++ b/chromium/res/values-uz-rUZ/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. + + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Bu xususiyat Androidning ushbu versiyasida ishlamaydi."</string> +</resources> diff --git a/chromium/res/values-vi/strings.xml b/chromium/res/values-vi/strings.xml index 7f591e7..29c7ee8 100644 --- a/chromium/res/values-vi/strings.xml +++ b/chromium/res/values-vi/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Chức năng này không được hỗ trợ trong phiên bản này của Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Chức năng này không được hỗ trợ trong phiên bản này của Android."</string> </resources> diff --git a/chromium/res/values-zh-rCN/strings.xml b/chromium/res/values-zh-rCN/strings.xml index 4fc2d08..fcaa983 100644 --- a/chromium/res/values-zh-rCN/strings.xml +++ b/chromium/res/values-zh-rCN/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"此版本的 Android 系统不支持该功能。"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"此版本的Android系统不支持该功能。"</string> </resources> diff --git a/chromium/res/values-zh-rHK/strings.xml b/chromium/res/values-zh-rHK/strings.xml index 2ff5160..5a37ee7 100644 --- a/chromium/res/values-zh-rHK/strings.xml +++ b/chromium/res/values-zh-rHK/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"這個 Android 版本不支援這項功能。"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"這個 Android 版本不支援這項功能。"</string> </resources> diff --git a/chromium/res/values-zh-rTW/strings.xml b/chromium/res/values-zh-rTW/strings.xml index 2ff5160..5a37ee7 100644 --- a/chromium/res/values-zh-rTW/strings.xml +++ b/chromium/res/values-zh-rTW/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"這個 Android 版本不支援這項功能。"</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"這個 Android 版本不支援這項功能。"</string> </resources> diff --git a/chromium/res/values-zu/strings.xml b/chromium/res/values-zu/strings.xml index f0c7f51..484b4c4 100644 --- a/chromium/res/values-zu/strings.xml +++ b/chromium/res/values-zu/strings.xml @@ -7,5 +7,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="webviewchromium_private_browsing_warning" msgid="5444325116504635857">"Lokhu kusebenza akusekelwe kule nguqulo ye-Android."</string> + <string name="webviewchromium_private_browsing_warning" msgid="4489411236472600535">"Lokhu kusebenza akusekelwe kule nguqulo ye-Android."</string> </resources> diff --git a/chromium/res/values/config.xml b/chromium/res/values/config.xml deleted file mode 100644 index ebbaeb4..0000000 --- a/chromium/res/values/config.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2014 The Chromium Authors. All rights reserved. - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. ---> - -<resources> - <!-- Array of "[keySystemName],[UuidOfMediaDrm]" --> - <string-array name="config_keySystemUuidMapping" translatable="false"> - <!-- Use Widevine's UUID to pass the availability-test of MediaDRM plugin --> - <item>"com.oem.test-keysystem,EDEF8BA9-79D6-4ACE-A3C8-27DCD51D21ED"</item> - </string-array> -</resources> diff --git a/chromium/res/values/strings.xml b/chromium/res/values/strings.xml index bb42490..ef71152 100644 --- a/chromium/res/values/strings.xml +++ b/chromium/res/values/strings.xml @@ -7,6 +7,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Contextual action bar item for sharing a block of text via email, or - other method. [CHAR-LIMIT=24] --> + other method. [CHAR-LIMIT=128] --> <string name="webviewchromium_private_browsing_warning">This functionality is not supported in this version of Android.</string> </resources> diff --git a/chromium/tests/UbWebViewJankTests/Android.mk b/chromium/tests/UbWebViewJankTests/Android.mk new file mode 100644 index 0000000..0c2d128 --- /dev/null +++ b/chromium/tests/UbWebViewJankTests/Android.mk @@ -0,0 +1,26 @@ +# Copyright 2014 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_PACKAGE_NAME := UbWebViewJankTests +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_MODULE_TAGS := tests + +LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper + +LOCAK_SDK_VERSION := current + +include $(BUILD_PACKAGE) diff --git a/chromium/tests/UbWebViewJankTests/AndroidManifest.xml b/chromium/tests/UbWebViewJankTests/AndroidManifest.xml new file mode 100644 index 0000000..cf1adb6 --- /dev/null +++ b/chromium/tests/UbWebViewJankTests/AndroidManifest.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.webview.chromium.tests.jank"> + + <application> + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation + android:name="android.test.InstrumentationTestRunner" + android:targetPackage="com.android.webview.chromium.tests.jank" + android:label="Chromium Jank Tests" /> + +</manifest> diff --git a/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java b/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java new file mode 100644 index 0000000..efd9f27 --- /dev/null +++ b/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.chromium.tests.jank; + +import android.content.Intent; +import android.net.Uri; +import android.os.SystemClock; +import android.support.test.jank.JankTest; +import android.support.test.jank.JankTestBase; +import android.support.test.jank.JankType; +import android.support.test.uiautomator.UiDevice; +import android.support.test.uiautomator.UiObjectNotFoundException; +import android.support.test.uiautomator.UiScrollable; +import android.support.test.uiautomator.UiSelector; + +import java.io.File; +import java.io.IOException; + +/** + * Jank test for Android Webview. + * + * To run + * 1) Install the test application (com.android.webview.chromium.shell) + * 2) Place a directories containing the test pages on the test device in + * $EXTERNAL_STORAGE/AwJankPages. Each directory should contain an index.html + * file as the main file of the test page. + * 3) Build this test and install the resulting apk file + * 4) Run the test using the command: + * adb shell am instrument -e Url URL -w \ + * com.android.webview.chromium.tests.jank/android.test.InstrumentationTestRunner + * + */ +public class WebViewFlingTest extends JankTestBase { + + private static final long TEST_DELAY_TIME_MS = 2 * 1000; // 2 seconds + private static final long PAGE_LOAD_DELAY_TIMEOUT_MS = 10 * 1000; // 10 seconds + private static final long PAGE_LOAD_DELAY_TIME_MS = 20 * 1000; // 20 seconds + private static final int MIN_DATA_SIZE = 50; + private static final long DEFAULT_ANIMATION_TIME = 2 * 1000; + private static final String CHROMIUM_SHELL_APP = "com.android.webview.chromium.shell"; + private static final String CHROMIUM_SHELL_ACTIVITY = CHROMIUM_SHELL_APP + ".JankActivity"; + private static final String AW_CONTAINER = "com.android.webview.chromium.shell:id/container"; + + private UiDevice mDevice; + private UiScrollable mWebPageDisplay = null; + + + /** + * {@inheritDoc} + */ + @Override + protected void setUp() throws Exception { + super.setUp(); + + mDevice = UiDevice.getInstance(getInstrumentation()); + mDevice.setOrientationNatural(); + + // Get the URL argument + String url = getArguments().getString("Url"); + File webpage = new File(url); + assertNotNull("No test pages", webpage); + + // Launch the chromium shell + Intent intent = new Intent(Intent.ACTION_DEFAULT, + Uri.parse("file://" + webpage.getAbsolutePath())); + intent.setClassName(CHROMIUM_SHELL_APP, CHROMIUM_SHELL_ACTIVITY); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + getInstrumentation().getContext().startActivity(intent); + SystemClock.sleep(PAGE_LOAD_DELAY_TIME_MS); + } + + @Override + public void beforeLoop() throws UiObjectNotFoundException { + getContainer().flingToBeginning(20); + SystemClock.sleep(TEST_DELAY_TIME_MS); + } + + @JankTest(type=JankType.CONTENT_FRAMES, expectedFrames=MIN_DATA_SIZE) + public void testBrowserPageFling() throws UiObjectNotFoundException, IOException { + getContainer().flingForward(); + SystemClock.sleep(DEFAULT_ANIMATION_TIME); + } + + /** + * {@inheritDoc} + */ + @Override + protected void tearDown() throws Exception { + mDevice.unfreezeRotation(); + super.tearDown(); + } + + private UiScrollable getContainer() { + if (mWebPageDisplay == null) { + mWebPageDisplay = + new UiScrollable(new UiSelector().resourceId(AW_CONTAINER).instance(0)); + assertTrue("Failed to get web container", + mWebPageDisplay.waitForExists(PAGE_LOAD_DELAY_TIMEOUT_MS)); + } + return mWebPageDisplay; + } +} diff --git a/chromium/tests/data/heavy/index.html b/chromium/tests/data/heavy/index.html new file mode 100755 index 0000000..6c47600 --- /dev/null +++ b/chromium/tests/data/heavy/index.html @@ -0,0 +1,114 @@ +<html> + <head> + <style> +@-webkit-keyframes transformations { + 0% {-webkit-transform: translate3d(0px,0,0);} + 50% {-webkit-transform: translate3d(30px,0,0);} +100% {-webkit-transform: translate3d(00px,0,0);} +} + + #fixed {background-color: red; position: fixed; width: 200px; height: 400px; z-index: -1;} + #layer {color: white; background-color: blue; -webkit-transform: translate3d(0,0,0); position: absolute; top: 40; left: 30; width: 500px; height: 15000px; +-webkit-animation-direction: normal; +-webkit-animation-duration: 1s; +-webkit-animation-iteration-count: infinite; +-webkit-animation-name: transformations; +-webkit-animation-timing-function: ease; +} + + #layer2 {color: white; background-color: green; -webkit-transform: translate3d(0,0,0) rotate3d(0,0,1,1deg); position: absolute; top: 40; left: 120; width: 1000px; height: 15000px;} + #layer3 {color: white; background-color: red; -webkit-transform: translate3d(0,0,0) rotate3d(0,0,1,181deg); position: absolute; top: 40; left: 150; width: 750px; height: 15000px;} + #layer4 {color: white; background-color: black; -webkit-transform: translate3d(0,0,0); position: absolute; top: 40; left: 200; width: 750px; height: 15000px; opacity: 0.5;} + </style> + </head> + + <body bgcolor=gray> + <div id="fixed"> fixed layer </div> + <div> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + <div id="layer"> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + <div id="layer2"> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + + <div id="layer3"> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + <div id="layer4"> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + </body> +</html> diff --git a/chromium/tests/data/light/index.html b/chromium/tests/data/light/index.html new file mode 100755 index 0000000..128950a --- /dev/null +++ b/chromium/tests/data/light/index.html @@ -0,0 +1,26 @@ +<html> + <body bgcolor=gray> + <div> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + 1lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 2lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 3lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 4lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 5lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> 6lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> lorem</br> + </div> + </body> +</html> diff --git a/chromium/tests/java/Android.mk b/chromium/tests/java/Android.mk new file mode 100644 index 0000000..36f94e7 --- /dev/null +++ b/chromium/tests/java/Android.mk @@ -0,0 +1,32 @@ +# Copyright 2014 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +local_target_dir := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_MODULE := WebViewJankTests + +LOCAL_JAVA_LIBRARIES := uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := webview-janktesthelper +LOCAL_MODULE_TAGS := tests +include $(BUILD_JAVA_LIBRARY) + +#### +# TODO: remove our copy of JTH prebuilt (b/13743200) +include $(CLEAR_VARS) +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := webview-janktesthelper:../prebuilts/android-janktesthelper.jar + +include $(BUILD_MULTI_PREBUILT) diff --git a/chromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java b/chromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java new file mode 100644 index 0000000..42303aa --- /dev/null +++ b/chromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package com.android.uiautomator.platform; + +import com.android.uiautomator.core.UiObjectNotFoundException; +import com.android.uiautomator.core.UiScrollable; +import com.android.uiautomator.core.UiSelector; +import com.android.uiautomator.janktesthelper.JankTestBase; +import java.io.File; +import java.io.IOException; + +/** + * Jank test for Android Webview. + * + * To run + * 1) Install the test application (com.android.webview.chromium.shell) + * 2) Place a directories containing the test pages on the test device in + * $EXTERNAL_STORAGE/AwJankPages. Each directory should contain an index.html + * file as the main file of the test page. + * 3) Build this test and push the resulting Jar file to /data/local/tmp/WebViewJankTests.jar + * 4) Run the test using the command: + * adb shell uiautomator runtest WebViewJankTests.jar + * + * The test will run for each of the test pages. The results will be saved on the device in + * /data/local/tmp/jankoutput.txt. + */ +public class WebViewFlingTest extends JankTestBase { + + private static final long TEST_DELAY_TIME_MS = 2 * 1000; // 2 seconds + private static final long PAGE_LOAD_DELAY_TIMEOUT_MS = 10 * 1000; // 10 seconds + private static final long PAGE_LOAD_DELAY_TIME_MS = 20 * 1000; // 20 seconds + private static final int MIN_DATA_SIZE = 50; + private static final String AW_WINDOW_NAME = + "com.android.webview.chromium.shell/com.android.webview.chromium.shell.JankActivity"; + private static final String AW_CONTAINER = "com.android.webview.chromium.shell:id/container"; + private static final String START_CMD = + "am start -n com.android.webview.chromium.shell/.JankActivity -d "; + private UiScrollable mWebPageDisplay = null; + + public void testBrowserPageFling() throws UiObjectNotFoundException, IOException { + String url = mParams.getString("Url"); + File webpage = new File(url); + assertNotNull("No test pages", webpage); + runBrowserPageFling(webpage); + } + + private void resetFlingTest() throws UiObjectNotFoundException { + getContainer().flingToBeginning(20); + } + + private void loadUrl(String url) throws IOException { + Runtime.getRuntime().exec(START_CMD + url); + // Need to find a good way of detecting when the page is loaded + sleep(PAGE_LOAD_DELAY_TIME_MS); + } + + private void flingForward() throws UiObjectNotFoundException { + getContainer().flingForward(); + } + + private UiScrollable getContainer() { + if (mWebPageDisplay == null) { + mWebPageDisplay = + new UiScrollable(new UiSelector().resourceId(AW_CONTAINER).instance(0)); + assertTrue("Failed to get web container", + mWebPageDisplay.waitForExists(PAGE_LOAD_DELAY_TIMEOUT_MS)); + } + return mWebPageDisplay; + } + + /** + * {@inheritDoc} + */ + @Override + protected void setUp() throws Exception { + super.setUp(); + getUiDevice().setOrientationNatural(); + } + + /** + * {@inheritDoc} + */ + @Override + protected void tearDown() throws Exception { + getUiDevice().unfreezeRotation(); + super.tearDown(); + } + + private void runBrowserPageFling(File testFile) throws UiObjectNotFoundException, IOException { + loadUrl("file://" + testFile.getAbsolutePath()); + for (int i = 0; i < getIteration(); i++) { + resetFlingTest(); + sleep(TEST_DELAY_TIME_MS); + startTrace(mTestCaseName, i); + getSurfaceFlingerHelper().clearBuffer(AW_WINDOW_NAME); + flingForward(); + sleep(DEFAULT_ANIMATION_TIME); + boolean result = + getSurfaceFlingerHelper().dumpFrameLatency(AW_WINDOW_NAME, true); + assertTrue("dump frame latency failed", result); + + waitForTrace(); + assertTrue(String.format("Sample size is less than expected: %d", MIN_DATA_SIZE), + validateResults(MIN_DATA_SIZE)); + // record the result in an array + recordResults(mTestCaseName, i); + } + // calculate average and save the results + saveResults(mTestCaseName); + } +} diff --git a/chromium/tests/prebuilts/android-janktesthelper.jar b/chromium/tests/prebuilts/android-janktesthelper.jar Binary files differnew file mode 100644 index 0000000..44e3af9 --- /dev/null +++ b/chromium/tests/prebuilts/android-janktesthelper.jar diff --git a/chromium/tools/WebViewShell/AndroidManifest.xml b/chromium/tools/WebViewShell/AndroidManifest.xml index 834bc58..77997cd 100644 --- a/chromium/tools/WebViewShell/AndroidManifest.xml +++ b/chromium/tools/WebViewShell/AndroidManifest.xml @@ -20,11 +20,12 @@ android:versionName="1.0" > <uses-sdk android:minSdkVersion="17" - android:targetSdkVersion="17" /> + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> - <application + <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@android:style/Theme.Light" > @@ -36,5 +37,23 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + <activity + android:name=".JankActivity" + android:label="@string/title_activity_jank" + android:noHistory="true"> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + <activity + android:name=".StartupTimeActivity" + android:label="@string/title_activity_startup_time" + android:noHistory="true"> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> </application> </manifest> diff --git a/chromium/tools/WebViewShell/res/values/strings.xml b/chromium/tools/WebViewShell/res/values/strings.xml index 4669508..f5df5b9 100644 --- a/chromium/tools/WebViewShell/res/values/strings.xml +++ b/chromium/tools/WebViewShell/res/values/strings.xml @@ -17,4 +17,6 @@ <resources> <string name="app_name">WebView Telemetry</string> <string name="title_activity_telemetry">WebView Telemetry</string> + <string name="title_activity_jank">WebView Jank Tester</string> + <string name="title_activity_startup_time">WebView Startup Time Tester</string> </resources> diff --git a/chromium/tools/WebViewShell/run_startup_time_test.sh b/chromium/tools/WebViewShell/run_startup_time_test.sh new file mode 100644 index 0000000..7ddf83a --- /dev/null +++ b/chromium/tools/WebViewShell/run_startup_time_test.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +if ! which adb &> /dev/null; then + echo "adb is not in your path, did you run envsetup.sh?" + exit -1 +fi + +TMPFILE=$(tempfile) +echo '<body><div>just some text</div></body>' > $TMPFILE +adb push $TMPFILE /data/local/tmp/file.html +rm $TMPFILE +adb shell am start -n com.android.htmlviewer/.HTMLViewerActivity -d "file:///data/local/tmp/file.html" -a VIEW -t "text/html" + +sleep 3 + +echo 'Running test, you should run `adb logcat | grep WebViewStartupTimeMillis=` in another shell to see results.' +# Launch webview test shell 100 times +for i in $(seq 1 100); do + if [[ $(($i % 10)) -eq 0 ]]; then + echo -n "..$i.." + fi + adb shell kill -9 `adb shell ps | grep com.android.webview.chromium.shell | tr -s " " " " | cut -d" " -f2` + adb shell am start -n com.android.webview.chromium.shell/.StartupTimeActivity -a VIEW > /dev/null + sleep 0.5 +done +echo + +adb shell rm /data/local/tmp/file.html diff --git a/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/JankActivity.java b/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/JankActivity.java new file mode 100644 index 0000000..3694ce9 --- /dev/null +++ b/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/JankActivity.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.chromium.shell; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.webkit.CookieManager; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +/** + * This activity is designed for Android Jank testing of WebView. It takes a URL as an argument, and + * displays the page ready for the Jank tester to test scrolling etc. + */ +public class JankActivity extends Activity { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().setTitle( + getResources().getString(R.string.title_activity_jank)); + setContentView(R.layout.activity_telemetry); + + WebView webView = (WebView) findViewById(R.id.webview); + CookieManager.setAcceptFileSchemeCookies(true); + + webView.setWebViewClient(new WebViewClient() { + @Override + public boolean shouldOverrideUrlLoading(WebView webView, String url) { + return false; + } + }); + + String url = getUrlFromIntent(getIntent()); + webView.loadUrl(url); + } + + private static String getUrlFromIntent(Intent intent) { + return intent != null ? intent.getDataString() : null; + } + +} diff --git a/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/StartupTimeActivity.java b/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/StartupTimeActivity.java new file mode 100644 index 0000000..aa805e6 --- /dev/null +++ b/chromium/tools/WebViewShell/src/com/android/webview/chromium/shell/StartupTimeActivity.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.chromium.shell; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.os.SystemClock; +import android.webkit.WebView; + +/** + * This activity is designed for startup time testing of the WebView. + */ +public class StartupTimeActivity extends Activity { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().setTitle( + getResources().getString(R.string.title_activity_startup_time)); + + long t1 = SystemClock.elapsedRealtime(); + WebView webView = new WebView(this); + setContentView(webView); + long t2 = SystemClock.elapsedRealtime(); + android.util.Log.i("WebViewShell", "WebViewStartupTimeMillis=" + (t2 - t1)); + } + +} + diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index c38df88..634e19c 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -37,22 +37,29 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'sdch/open-vcdiff', 'testing/gtest', 'third_party/angle', + 'third_party/boringssl/src', + 'third_party/brotli/src', 'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille', 'third_party/freetype', 'third_party/icu', 'third_party/leveldatabase/src', + 'third_party/libaddressinput/src', 'third_party/libjingle/source/talk', + 'third_party/libjpeg_turbo', 'third_party/libphonenumber/src/phonenumbers', 'third_party/libphonenumber/src/resources', + 'third_party/libsrtp', + 'third_party/libvpx', + 'third_party/libyuv', 'third_party/mesa/src', - 'third_party/openssl', + 'third_party/openmax_dl', 'third_party/opus/src', 'third_party/ots', 'third_party/sfntly/cpp/src', - 'third_party/skia/include', - 'third_party/skia/gyp', - 'third_party/skia/src', + 'third_party/skia', 'third_party/smhasher/src', + 'third_party/usrsctp/usrsctplib', + 'third_party/webrtc', 'third_party/yasm/source/patched-yasm', 'tools/grit', 'tools/gyp', @@ -66,7 +73,8 @@ THIRD_PARTY_PROJECTS = (THIRD_PARTY_PROJECTS_WITH_FLAT_HISTORY + THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY) ALL_PROJECTS = ['.'] + THIRD_PARTY_PROJECTS - +assert(set(ALL_PROJECTS) == + set(PROJECTS_WITH_FLAT_HISTORY + PROJECTS_WITH_FULL_HISTORY)) # Directories to be removed when flattening history. PRUNE_WHEN_FLATTENING = { @@ -105,6 +113,11 @@ class TemporaryMergeError(MergeError): """A merge error that can potentially be resolved by trying again later.""" +def Abbrev(commitish): + """Returns the abbrev commitish for a given Git SHA.""" + return commitish[:12] + + def GetCommandStdout(args, cwd=REPOSITORY_ROOT, ignore_errors=False): """Gets stdout from runnng the specified shell command. @@ -116,15 +129,16 @@ def GetCommandStdout(args, cwd=REPOSITORY_ROOT, ignore_errors=False): cwd: The working directory to use. Defaults to REPOSITORY_ROOT. ignore_errors: Ignore the command's return code and stderr. Returns: - stdout from running the command. + A concatenation of stdout + stderr from running the command. Raises: CommandError: if the command exited with a nonzero status. """ p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() + output = stdout + ('\n===STDERR===\n' if stderr and stdout else '') + stderr if p.returncode == 0 or ignore_errors: - return stdout + return output else: raise CommandError(p.returncode, ' '.join(args), cwd, stdout, stderr) diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index 812af1b..3145387 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -16,14 +16,11 @@ """Merge Chromium into the Android tree.""" -import contextlib import logging import optparse import os import re -import shutil import sys -import urllib2 import merge_common @@ -54,12 +51,12 @@ def _ReadGitFile(sha1, path, git_url=None, git_branch=None): def _ParseDEPS(deps_content): - """Parses the .DEPS.git file from Chromium and returns its contents. + """Parses the DEPS file from Chromium and returns its contents. Args: - deps_content: The contents of the .DEPS.git file as text. + deps_content: The contents of the DEPS file as text. Returns: - A dictionary of the contents of .DEPS.git at the specified revision + A dictionary of the contents of DEPS at the specified revision """ class FromImpl(object): @@ -72,6 +69,7 @@ def _ParseDEPS(deps_content): return 'From("%s")' % self.module_name class _VarImpl(object): + def __init__(self, custom_vars, local_scope): self._custom_vars = custom_vars self._local_scope = local_scope @@ -87,20 +85,20 @@ def _ParseDEPS(deps_content): tmp_locals = {} var = _VarImpl({}, tmp_locals) tmp_globals = {'From': FromImpl, 'Var': var.Lookup, 'deps_os': {}} - exec(deps_content) in tmp_globals, tmp_locals + exec(deps_content) in tmp_globals, tmp_locals # pylint: disable=W0122 return tmp_locals def _GetProjectMergeInfo(projects, deps_vars): - """Gets the git URL and SHA1 for each project based on .DEPS.git. + """Gets the git URL and SHA1 for each project based on DEPS. Args: projects: The list of projects to consider. - deps_vars: The dictionary of dependencies from .DEPS.git. + deps_vars: The dictionary of dependencies from DEPS. Returns: A dictionary from project to git URL and SHA1 - 'path: (url, sha1)' Raises: - TemporaryMergeError: if a project to be merged is not found in .DEPS.git. + TemporaryMergeError: if a project to be merged is not found in DEPS. """ deps_fallback_order = [ deps_vars['deps'], @@ -110,7 +108,7 @@ def _GetProjectMergeInfo(projects, deps_vars): result = {} for path in projects: for deps in deps_fallback_order: - if len(path) > 0: + if path: upstream_path = os.path.join('src', path) else: upstream_path = 'src' @@ -119,7 +117,7 @@ def _GetProjectMergeInfo(projects, deps_vars): break else: raise merge_common.TemporaryMergeError( - 'Could not find .DEPS.git entry for project %s. This probably ' + 'Could not find DEPS entry for project %s. This probably ' 'means that the project list in merge_from_chromium.py needs to be ' 'updated.' % path) match = re.match('(.*?)@(.*)', url_plus_sha1) @@ -133,7 +131,7 @@ def _GetProjectMergeInfo(projects, deps_vars): def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): """Merges each required Chromium project into the Android repository. - .DEPS.git is consulted to determine which revision each project must be merged + DEPS is consulted to determine which revision each project must be merged at. Only a whitelist of required projects are merged. Args: @@ -142,6 +140,9 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): target: The target branch to merge to. unattended: Run in unattended mode. buildspec_url: URL for buildspec repository, when merging a branch. + Returns: + The abbrev sha1 merged. It will be either |root_sha1| itself (when merging + chromium trunk) or the upstream sha1 of the release. Raises: TemporaryMergeError: If incompatibly licensed code is left after pruning. """ @@ -156,10 +157,14 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): logging.debug('Parsing DEPS ...') if root_sha1: - deps_content = _ReadGitFile(root_sha1, '.DEPS.git') + deps_content = _ReadGitFile(root_sha1, 'DEPS') else: - deps_content = _ReadGitFile('FETCH_HEAD', version + '/DEPS', - buildspec_url, 'master') + # TODO(primiano): At some point the release branches will use DEPS as well, + # instead of .DEPS.git. Rename below when that day will come. + deps_content = _ReadGitFile('FETCH_HEAD', + 'releases/' + version + '/.DEPS.git', + buildspec_url, + 'master') deps_vars = _ParseDEPS(deps_content) @@ -182,12 +187,7 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): cwd=dest_dir) if not local_mirrored or not root_sha1: logging.debug('Fetching project %s at %s ...', path, sha1) - fetch_args = ['git', 'fetch', url] - if not root_sha1: - # Only try to fetch the specific SHA1 when merging a branch. - # Older versions of git cannot fetch SHA1s directly, and trunk merges - # should be using versions that are available on the default branch. - fetch_args.append(sha1) + fetch_args = ['git', 'fetch', url, sha1] merge_common.GetCommandStdout(fetch_args, cwd=dest_dir) if merge_common.GetCommandStdout(['git', 'rev-list', '-1', 'HEAD..' + sha1], cwd=dest_dir): @@ -208,15 +208,21 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): if not root_sha1: merge_info = _GetProjectMergeInfo([''], deps_vars) url = merge_info['']['url'] - root_sha1 = merge_info['']['sha1'] - merge_common.GetCommandStdout(['git', 'fetch', url, root_sha1]) - logging.debug('Merging Chromium at %s ...', root_sha1) + merged_sha1 = merge_info['']['sha1'] + merge_common.GetCommandStdout(['git', 'fetch', url, merged_sha1]) + merged_sha1 = merge_common.Abbrev(merged_sha1) + merge_msg_version = '%s (%s)' % (version, merged_sha1) + else: + merge_msg_version = root_sha1 + merged_sha1 = root_sha1 + + logging.debug('Merging Chromium at %s ...', merged_sha1) # Merge conflicts make git merge return 1, so ignore errors - merge_common.GetCommandStdout(['git', 'merge', '--no-commit', root_sha1], + merge_common.GetCommandStdout(['git', 'merge', '--no-commit', merged_sha1], ignore_errors=True) merge_common.CheckNoConflictsAndCommitMerge( - 'Merge Chromium at %s (%s)\n\n%s' - % (version, root_sha1, AUTOGEN_MESSAGE), unattended=unattended) + 'Merge Chromium at %s\n\n%s' + % (merge_msg_version, AUTOGEN_MESSAGE), unattended=unattended) logging.debug('Getting directories to exclude ...') @@ -226,9 +232,9 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): sys.path.append(os.path.join(merge_common.REPOSITORY_ROOT, 'android_webview', 'tools')) sys.dont_write_bytecode = True - global webview_licenses - import webview_licenses - import known_issues + global webview_licenses # pylint: disable=W0602 + import webview_licenses # pylint: disable=W0621,W0612,C6204 + import known_issues # pylint: disable=C6204 for path, exclude_list in known_issues.KNOWN_INCOMPATIBLE.iteritems(): logging.debug(' %s', '\n '.join(os.path.join(path, x) for x in @@ -240,6 +246,8 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): merge_common.GetCommandStdout(['git', 'commit', '-m', 'Exclude unwanted directories'], cwd=dest_dir) + assert(root_sha1 is None or root_sha1 == merged_sha1) + return merged_sha1 def _CheckLicenses(): @@ -261,15 +269,6 @@ def _GenerateMakefiles(version, unattended): logging.debug('Generating makefiles ...') # TODO(torne): come up with a way to deal with hooks from DEPS properly - # Download linux GN from google storage as per hook in DEPS. - merge_common.GetCommandStdout(['download_from_google_storage', - '--no_resume', - '--platform=linux*', - '--no_auth', - '--bucket', - 'chromium-gn', - '-s', - 'tools/gn/bin/linux/gn.sha1']) # TODO(torne): The .tmp files are generated by # third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp into the source @@ -294,13 +293,6 @@ def _GenerateMakefiles(version, unattended): raise merge_common.TemporaryMergeError('Makefile generation failed: ' + str(e)) - # Copy ARM makefile to ARM64 to allow multiarch builds - for host in ['linux', 'darwin']: - shutil.copy(os.path.join(merge_common.REPOSITORY_ROOT, - 'GypAndroid.%s-arm.mk' % host), - os.path.join(merge_common.REPOSITORY_ROOT, - 'GypAndroid.%s-arm64.mk' % host)) - for path in merge_common.ALL_PROJECTS: dest_dir = os.path.join(merge_common.REPOSITORY_ROOT, path) # git add doesn't have an --ignore-unmatch so we have to do this instead: @@ -351,19 +343,19 @@ def _GenerateNoticeFile(version): % (version, AUTOGEN_MESSAGE)]) -def _GenerateLastChange(version): +def _GenerateLastChange(version, root_sha1): """Write a build/util/LASTCHANGE file containing the current revision. The revision number is compiled into the binary at build time from this file. Args: version: The version to mention in generated commit messages. + root_sha1: The SHA1 of the main project (before the merge). """ logging.debug('Updating LASTCHANGE ...') - svn_revision, sha1 = _GetSVNRevisionAndSHA1('HEAD', 'HEAD') with open(os.path.join(merge_common.REPOSITORY_ROOT, 'build/util/LASTCHANGE'), 'w') as f: - f.write('LASTCHANGE=%s\n' % svn_revision) + f.write('LASTCHANGE=%s\n' % merge_common.Abbrev(root_sha1)) merge_common.GetCommandStdout(['git', 'add', '-f', 'build/util/LASTCHANGE']) logging.debug('Updating LASTCHANGE.blink ...') with open(os.path.join(merge_common.REPOSITORY_ROOT, @@ -378,27 +370,13 @@ def _GenerateLastChange(version): % (version, AUTOGEN_MESSAGE)]) -def GetLKGR(): - """Fetch the last known good release from Chromium's dashboard. - - Returns: - The last known good SVN revision. - """ - with contextlib.closing( - urllib2.urlopen('https://chromium-status.appspot.com/lkgr')) as lkgr: - return int(lkgr.read()) - - def GetHEAD(): - """Fetch the latest HEAD revision from the git mirror of the Chromium svn - repo. + """Fetch the latest HEAD revision from the Chromium Git mirror. Returns: - The latest HEAD SVN revision. + The latest HEAD revision (A Git abbrev SHA1). """ - (svn_revision, root_sha1) = _GetSVNRevisionAndSHA1(SRC_GIT_BRANCH, - 'HEAD') - return int(svn_revision) + return _GetGitAbbrevSHA1(SRC_GIT_BRANCH, 'HEAD') def _ParseSvnRevisionFromGitCommitMessage(commit_message): @@ -406,60 +384,53 @@ def _ParseSvnRevisionFromGitCommitMessage(commit_message): flags=re.MULTILINE).group(1) -def _GetSVNRevisionFromSha(sha1): - commit = merge_common.GetCommandStdout([ - 'git', 'show', '--format=%H%n%b', sha1]) - return _ParseSvnRevisionFromGitCommitMessage(commit) +def _GetGitAbbrevSHA1(git_branch, revision): + """Returns an abbrev. SHA for the given revision (or branch, if HEAD).""" + assert revision + logging.debug('Getting Git revision for %s ...', revision) + + upstream = git_branch if revision == 'HEAD' else revision + + # Make sure the remote and the branch exist locally. + try: + merge_common.GetCommandStdout([ + 'git', 'show-ref', '--verify', '--quiet', git_branch]) + except merge_common.CommandError: + raise merge_common.TemporaryMergeError( + 'Cannot find the branch %s. Have you sync\'d master-chromium in this ' + 'checkout?' % git_branch) + # Make sure the |upstream| Git object has been mirrored. + try: + merge_common.GetCommandStdout([ + 'git', 'merge-base', '--is-ancestor', upstream, git_branch]) + except merge_common.CommandError: + raise merge_common.TemporaryMergeError( + 'Upstream object (%s) not reachable from %s' % (upstream, git_branch)) -def _GetSVNRevisionAndSHA1(git_branch, svn_revision): - logging.debug('Getting SVN revision and SHA1 ...') - - if svn_revision == 'HEAD': - # Just use the latest commit. - commit = merge_common.GetCommandStdout([ - 'git', 'log', '-n1', '--grep=git-svn-id:', '--format=%H%n%b', - git_branch]) - sha1 = commit.split()[0] - svn_revision = _ParseSvnRevisionFromGitCommitMessage(commit) - return (svn_revision, sha1) - - if svn_revision is None: - # Fetch LKGR from upstream. - svn_revision = GetLKGR() - output = merge_common.GetCommandStdout([ - 'git', 'log', '--grep=git-svn-id: .*@%s' % svn_revision, - '--format=%H', git_branch]) - if not output: - raise merge_common.TemporaryMergeError('Revision %s not found in git repo.' - % svn_revision) - # The log grep will sometimes match reverts/reapplies of commits. We take the - # oldest (last) match because the first time it appears in history is - # overwhelmingly likely to be the correct commit. - sha1 = output.split()[-1] - return (svn_revision, sha1) + abbrev_sha = merge_common.Abbrev(merge_common.GetCommandStdout( + ['git', 'rev-list', '--max-count=1', upstream]).split()[0]) + return abbrev_sha def _GetBlinkRevision(): - commit = merge_common.GetCommandStdout([ - 'git', 'log', '-n1', '--grep=git-svn-id:', '--format=%H%n%b'], + # TODO(primiano): Switch to Git as soon as Blink gets migrated as well. + commit = merge_common.GetCommandStdout( + ['git', 'log', '-n1', '--grep=git-svn-id:', '--format=%H%n%b'], cwd=os.path.join(merge_common.REPOSITORY_ROOT, 'third_party', 'WebKit')) return _ParseSvnRevisionFromGitCommitMessage(commit) -def Snapshot(svn_revision, root_sha1, release, target, unattended, - buildspec_url): +def Snapshot(root_sha1, release, target, unattended, buildspec_url): """Takes a snapshot of the Chromium tree and merges it into Android. Android makefiles and a top-level NOTICE file are generated and committed after the merge. Args: - svn_revision: The SVN revision in the Chromium repository to merge from. - root_sha1: The sha1 in the Chromium git mirror to merge from. + root_sha1: The abbrev sha1 in the Chromium git mirror to merge from. release: The Chromium release version to merge from (e.g. "30.0.1599.20"). - Only one of svn_revision, root_sha1 and release should be - specified. + Only one of root_sha1 and release should be specified. target: The target branch to merge to. unattended: Run in unattended mode. buildspec_url: URL for buildspec repository, used when merging a release. @@ -467,29 +438,25 @@ def Snapshot(svn_revision, root_sha1, release, target, unattended, Returns: True if new commits were merged; False if no new commits were present. """ - if svn_revision: - svn_revision, root_sha1 = _GetSVNRevisionAndSHA1(SRC_GIT_BRANCH, - svn_revision) - elif root_sha1: - svn_revision = _GetSVNRevisionFromSha(root_sha1) - - if svn_revision and root_sha1: - version = svn_revision - if not merge_common.GetCommandStdout(['git', 'rev-list', '-1', - 'HEAD..' + root_sha1]): - logging.info('No new commits to merge at %s (%s)', - svn_revision, root_sha1) - return False - elif release: - version = release + if release: root_sha1 = None + version = release else: - raise merge_common.MergeError('No merge source specified') + root_sha1 = _GetGitAbbrevSHA1(SRC_GIT_BRANCH, root_sha1) + version = root_sha1 + + assert (root_sha1 is not None and len(root_sha1) > 6) or version == release + + if root_sha1 and not merge_common.GetCommandStdout( + ['git', 'rev-list', '-1', 'HEAD..' + root_sha1]): + logging.info('No new commits to merge at %s (%s)', version, root_sha1) + return False logging.info('Snapshotting Chromium at %s (%s)', version, root_sha1) # 1. Merge, accounting for excluded directories - _MergeProjects(version, root_sha1, target, unattended, buildspec_url) + merged_sha1 = _MergeProjects(version, root_sha1, target, unattended, + buildspec_url) # 2. Generate Android makefiles _GenerateMakefiles(version, unattended) @@ -501,7 +468,7 @@ def Snapshot(svn_revision, root_sha1, release, target, unattended, _GenerateNoticeFile(version) # 5. Generate LASTCHANGE file - _GenerateLastChange(version) + _GenerateLastChange(version, merged_sha1) return True @@ -518,7 +485,7 @@ def Push(version, target): if target == 'master-chromium': refspecs.insert(0, '+%s:master-chromium-merge' % src) for refspec in refspecs: - logging.debug('Pushing to server (%s) ...' % refspec) + logging.debug('Pushing to server (%s) ...', refspec) for path in merge_common.ALL_PROJECTS: if path in merge_common.PROJECTS_WITH_FLAT_HISTORY: remote = 'history' @@ -533,29 +500,21 @@ def Push(version, target): def main(): parser = optparse.OptionParser(usage='%prog [options]') parser.epilog = ('Takes a snapshot of the Chromium tree at the specified ' - 'Chromium SVN revision and merges it into this repository. ' + 'Chromium Git revision and merges it into this repository. ' 'Paths marked as excluded for license reasons are removed ' 'as part of the merge. Also generates Android makefiles and ' 'generates a top-level NOTICE file suitable for use in the ' 'Android build.') parser.add_option( - '', '--svn_revision', - default=None, - help=('Merge to the specified chromium SVN revision, rather than using ' - 'the current LKGR. Can also pass HEAD to merge from tip of tree. ' - 'Only one of svn_revision, sha1 and release should be specified')) - parser.add_option( '', '--sha1', - default=None, - help=('Merge to the specified chromium sha1 revision from ' + SRC_GIT_BRANCH - + ' branch, rather than using the current LKGR. Only one of' - 'svn_revision, sha1 and release should be specified.')) + default='HEAD', + help=('Merge to the specified chromium sha1 revision from ' + + SRC_GIT_BRANCH + ' branch. Default is HEAD, to merge from ToT.')) parser.add_option( '', '--release', default=None, - help=('Merge to the specified chromium release buildspec (e.g. ' - '"30.0.1599.20"). Only one of svn_revision, sha1 and release ' - 'should be specified.')) + help=('Merge to the specified chromium release buildspec (e.g., "30.0.' + '1599.20"). Only one of --sha1 and --release should be specified')) parser.add_option( '', '--buildspec_url', default=None, @@ -568,11 +527,7 @@ def main(): '', '--push', default=False, action='store_true', help=('Push the result of a previous merge to the server. Note ' - 'svn_revision must be given.')) - parser.add_option( - '', '--get_lkgr', - default=False, action='store_true', - help=('Just print the current LKGR on stdout and exit.')) + '--sha1 must be given.')) parser.add_option( '', '--get_head', default=False, action='store_true', @@ -594,25 +549,30 @@ def main(): print >>sys.stderr, 'You need to run the Android envsetup.sh and lunch.' return 1 + if os.environ.get('GYP_DEFINES'): + print >>sys.stderr, ( + 'The environment is defining GYP_DEFINES (=%s). It will affect the ' + ' generated makefiles.' % os.environ['GYP_DEFINES']) + if not options.unattended and raw_input('Continue? [y/N]') != 'y': + return 1 + logging.basicConfig(format='%(message)s', level=logging.DEBUG, stream=sys.stdout) - if options.get_lkgr: - print GetLKGR() - elif options.get_head: + if options.get_head: logging.disable(logging.CRITICAL) # Prevent log messages print GetHEAD() elif options.push: if options.release: Push(options.release, options.target) - elif options.svn_revision: - Push(options.svn_revision, options.target) + elif options.sha1: + Push(options.sha1, options.target) else: print >>sys.stderr, 'You need to pass the version to push.' return 1 else: - if not Snapshot(options.svn_revision, options.sha1, options.release, - options.target, options.unattended, options.buildspec_url): + if not Snapshot(options.sha1, options.release, options.target, + options.unattended, options.buildspec_url): return options.no_changes_exit return 0 diff --git a/chromium/tools/merge_to_android.py b/chromium/tools/merge_to_android.py new file mode 100755 index 0000000..9a2e78d --- /dev/null +++ b/chromium/tools/merge_to_android.py @@ -0,0 +1,394 @@ +#!/usr/bin/python +# +# Copyright (C) 2012 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Merge master-chromium to master within the Android tree.""" + +import logging +import optparse +import os +import re +import shutil +import subprocess +import sys + +import merge_common + + +AUTOGEN_MESSAGE = 'This commit was generated by merge_to_master.py.' +WEBVIEW_PROJECT = 'frameworks/webview' + + +def _GetAbsPath(project): + """Returns the full path to a given project (either Chromium or Android).""" + if project in merge_common.ALL_PROJECTS: + abs_path = os.path.join(merge_common.REPOSITORY_ROOT, project) + else: + abs_path = os.path.join(os.environ['ANDROID_BUILD_TOP'], project) + if not os.path.exists(abs_path): + raise merge_common.MergeError('Cannot find path ' + abs_path) + return abs_path + + +def _CheckoutSingleProject(project, target_branch): + """Checks out the tip of the target_branch into a local branch (merge-to-XXX). + + Args: + project: a Chromium project (., third_party/foo) or frameworks/webview. + target_branch: name of the target branch (in the goog remote). + """ + dest_dir = _GetAbsPath(project) + tracking_branch = 'goog/' + target_branch + logging.debug('Check out %-45s at %-16s', project, tracking_branch) + merge_common.GetCommandStdout(['git', 'remote', 'update', 'goog'], + cwd=dest_dir) + merge_common.GetCommandStdout(['git', 'checkout', + '-b', 'merge-to-' + target_branch, + '-t', tracking_branch], cwd=dest_dir) + + +def _FetchSingleProject(project, remote, remote_ref): + """Fetches a remote ref for the given project and returns the fetched SHA. + + Args: + project: a Chromium project (., third_party/foo) or frameworks/webview. + remote: Git remote name (goog for most projects, history for squashed ones). + remote_ref: the remote ref to fetch (e.g., refs/archive/chromium-XXX). + + Returns: + The SHA1 of the FETCH_HEAD. + """ + dest_dir = _GetAbsPath(project) + logging.debug('Fetch %-45s %s:%s', project, remote, remote_ref) + merge_common.GetCommandStdout(['git', 'fetch', remote, remote_ref], + cwd=dest_dir) + return merge_common.GetCommandStdout(['git', 'rev-parse', 'FETCH_HEAD'], + cwd=dest_dir).strip() + + +def _MergeSingleProject(project, merge_sha, revision, target_branch, flatten): + """Merges a single project at a given SHA. + + Args: + project: a Chromium project (., third_party/foo) or frameworks/webview. + merge_sha: the SHA to merge. + revision: Abbrev. commitish in the main Chromium repository. + target_branch: name of the target branch. + flatten: True: squash history while merging; False: perform a normal merge. + """ + dest_dir = _GetAbsPath(project) + if flatten: + # Make the previous merges into grafts so we can do a correct merge. + old_sha = merge_common.GetCommandStdout(['git', 'rev-parse', 'HEAD'], + cwd=dest_dir).strip() + merge_log = os.path.join(dest_dir, '.merged-revisions') + if os.path.exists(merge_log): + shutil.copyfile(merge_log, + os.path.join(dest_dir, '.git', 'info', 'grafts')) + + # Early out if there is nothing to merge. + if not merge_common.GetCommandStdout(['git', 'rev-list', '-1', + 'HEAD..' + merge_sha], cwd=dest_dir): + logging.debug('No new commits to merge in project %s', project) + return + + logging.debug('Merging project %s (flatten: %s)...', project, flatten) + merge_cmd = ['git', 'merge', '--no-commit'] + merge_cmd += ['--squash'] if flatten else ['--no-ff'] + merge_cmd += [merge_sha] + # Merge conflicts cause 'git merge' to return 1, so ignore errors + merge_common.GetCommandStdout(merge_cmd, cwd=dest_dir, ignore_errors=True) + + if flatten: + dirs_to_prune = merge_common.PRUNE_WHEN_FLATTENING.get(project, []) + if dirs_to_prune: + merge_common.GetCommandStdout(['git', 'rm', '--ignore-unmatch', '-rf'] + + dirs_to_prune, cwd=dest_dir) + + if project in merge_common.ALL_PROJECTS: + commit_msg = 'Merge from Chromium at DEPS revision %s' % revision + else: + commit_msg = 'Merge master-chromium into %s at %s' % (target_branch, + revision) + commit_msg += '\n\n' + AUTOGEN_MESSAGE + merge_common.CheckNoConflictsAndCommitMerge(commit_msg, cwd=dest_dir) + + if flatten: + # Generate the new grafts file and commit it on top of the merge. + new_sha = merge_common.GetCommandStdout(['git', 'rev-parse', 'HEAD'], + cwd=dest_dir).strip() + with open(merge_log, 'a+') as f: + f.write('%s %s %s\n' % (new_sha, old_sha, merge_sha)) + merge_common.GetCommandStdout(['git', 'add', '.merged-revisions'], + cwd=dest_dir) + merge_common.GetCommandStdout( + ['git', 'commit', '-m', + 'Record Chromium merge at DEPS revision %s\n\n%s' % + (revision, AUTOGEN_MESSAGE)], cwd=dest_dir) + + +def _IsAncestor(ref1, ref2, cwd): + """Checks whether ref1 is a ancestor of ref2 in the given Git repo.""" + cmd = ['git', 'merge-base', '--is-ancestor', ref1, ref2] + ret = subprocess.call(cmd, cwd=cwd) + if ret == 0: + return True + elif ret == 1: + return False + else: + raise merge_common.CommandError(ret, ' '.join(cmd), cwd, 'N/A', 'N/A') + + +def _MergeChromiumProjects(revision, target_branch, repo_shas=None, + force=False): + """Merges the Chromium projects from master-chromium to target_branch. + + The larger projects' histories are flattened in the process. + When repo_shas != None, it checks that the SHAs of the projects in the + archive match exactly the SHAs of the projects in repo.prop. + + Args: + revision: Abbrev. commitish in the main Chromium repository. + target_branch: target branch name to merge and push to. + repo_shas: optional dict. of expected revisions (only for --repo-prop). + force: True: merge anyways using the SHAs from repo.prop; False: bail out if + projects mismatch (archive vs repo.prop). + """ + # Sync and checkout ToT for all projects (creating the merge-to-XXX branch) + # and fetch the archive snapshot. + fetched_shas = {} + remote_ref = 'refs/archive/chromium-%s' % revision + for project in merge_common.PROJECTS_WITH_FLAT_HISTORY: + _CheckoutSingleProject(project, target_branch) + fetched_shas[project] = _FetchSingleProject(project, 'history', remote_ref) + for project in merge_common.PROJECTS_WITH_FULL_HISTORY: + _CheckoutSingleProject(project, target_branch) + fetched_shas[project] = _FetchSingleProject(project, 'goog', remote_ref) + + if repo_shas: + project_shas_mismatch = False + for project, merge_sha in fetched_shas.items(): # the dict can be modified. + expected_sha = repo_shas.get(project) + if expected_sha != merge_sha: + logging.warn('The SHA for project %s specified in the repo.prop (%s) ' + 'and the one in the archive (%s) differ.', + project, expected_sha, merge_sha) + dest_dir = _GetAbsPath(project) + if expected_sha is None: + reason = 'cannot find a SHA in the repo.pro for %s' % project + elif _IsAncestor(merge_sha, expected_sha, cwd=dest_dir): + reason = 'the SHA in repo.prop is ahead of the SHA in the archive. ' + log_cmd = ['git', 'log', '--oneline', '--graph', '--max-count=10', + '%s..%s' % (merge_sha, expected_sha)] + log_cmd_output = merge_common.GetCommandStdout(log_cmd, cwd=dest_dir) + reason += 'showing partial log (%s): \n %s' % (' '.join(log_cmd), + log_cmd_output) + elif _IsAncestor(expected_sha, merge_sha, cwd=dest_dir): + reason = 'The SHA is already merged in the archive' + else: + reason = 'The project history diverged. Consult your Git historian.' + + project_shas_mismatch = True + if force: + logging.debug('Merging the SHA in repo.prop anyways (due to --force)') + fetched_shas[project] = expected_sha + else: + logging.debug('Reason: %s', reason) + if not force and project_shas_mismatch: + raise merge_common.MergeError( + 'The revision of some projects in the archive is different from the ' + 'one provided in build.prop. See the log for more details. Re-run ' + 'with --force to continue.') + + for project in merge_common.PROJECTS_WITH_FLAT_HISTORY: + _MergeSingleProject(project, fetched_shas[project], revision, target_branch, + flatten=True) + for project in merge_common.PROJECTS_WITH_FULL_HISTORY: + _MergeSingleProject(project, fetched_shas[project], revision, target_branch, + flatten=False) + + +def _GetNearestUpstreamAbbrevSHA(reference='history/master-chromium'): + """Returns the abbrev. upstream SHA which closest to the given reference.""" + logging.debug('Getting upstream SHA for %s...', reference) + merge_common.GetCommandStdout(['git', 'remote', 'update', 'history']) + upstream_commit = merge_common.Abbrev(merge_common.GetCommandStdout([ + 'git', 'merge-base', 'history/upstream-master', reference])) + + # Pedantic check: look for the existence of a merge commit which contains the + # |upstream_commit| in its message and is its children. + merge_parents = merge_common.GetCommandStdout([ + 'git', 'rev-list', reference, '--grep', upstream_commit, '--merges', + '--parents', '-1']) + if upstream_commit not in merge_parents: + raise merge_common.MergeError( + 'Found upstream commit %s, but the merge child (%s) could not be found ' + 'or is not a parent of the upstream SHA') + logging.debug('Found nearest Chromium revision %s', upstream_commit) + return upstream_commit + + +def _MergeWithRepoProp(repo_prop_file, target_branch, force): + """Performs a merge using a repo.prop file (from Android build waterfall). + + This does NOT merge (unless forced with force=True) the pinned + revisions in repo.prop, as a repo.prop can snapshot an intermediate state + (between two automerger cycles). Instead, this looks up the archived snapshot + (generated by the chromium->master-chromium auto-merger) which is closest to + the given repo.prop (following the main Chromium project) and merges that one. + If the projects revisions don't match, it fails with detailed error messages. + + Args: + repo_prop_file: Path to a downloaded repo.prop file. + target_branch: name of the target branch to merget to. + force: ignores the aforementioned check and merged anyways. + """ + chromium_sha = None + webview_sha = None + repo_shas = {} # 'project/path' -> 'sha' + with open(repo_prop_file) as prop: + for line in prop: + repo, sha = line.split() + # Translate the Android repo paths into the relative project paths used in + # merge_common (e.g., platform/external/chromium_org/foo -> foo). + m = ( + re.match(r'^platform/(frameworks/.+)$', repo) or + re.match(r'^platform/external/chromium_org/?(.*?)(-history)?$', repo)) + if m: + project = m.group(1) if m.group(1) else '.' # '.' = Main project. + repo_shas[project] = sha + + chromium_sha = repo_shas.get('.') + webview_sha = repo_shas.get(WEBVIEW_PROJECT) + if not chromium_sha or not webview_sha: + raise merge_common.MergeError('SHAs for projects not found; ' + 'invalid build.prop?') + + # Check that the revisions in repo.prop and the on in the archive match. + archived_chromium_revision = _GetNearestUpstreamAbbrevSHA(chromium_sha) + logging.info('Merging Chromium at %s and WebView at %s', + archived_chromium_revision, webview_sha) + _MergeChromiumProjects(archived_chromium_revision, target_branch, repo_shas, + force) + + _CheckoutSingleProject(WEBVIEW_PROJECT, target_branch) + _MergeSingleProject(WEBVIEW_PROJECT, webview_sha, + archived_chromium_revision, target_branch, flatten=False) + + +def Push(target_branch): + """Push the finished snapshot to the Android repository. + + Creates first a CL for frameworks/webview (if the merge-to-XXX branch exists) + then wait for user confirmation and pushes the Chromium merges. This is to + give an opportunity to get a +2 for frameworks/webview and then push both + frameworks/webview and the Chromium projects atomically(ish). + + Args: + target_branch: name of the target branch (in the goog remote). + """ + merge_branch = 'merge-to-%s' % target_branch + + # Create a Gerrit CL for the frameworks/webview project (if needed). + dest_dir = _GetAbsPath(WEBVIEW_PROJECT) + did_upload_webview_cl = False + if merge_common.GetCommandStdout(['git', 'branch', '--list', merge_branch], + cwd=dest_dir): + # Check that there was actually something to merge. + merge_range = 'goog/%s..%s' % (target_branch, merge_branch) + if merge_common.GetCommandStdout(['git', 'rev-list', '-1', merge_range], + cwd=dest_dir): + logging.info('Uploading a merge CL for %s...', WEBVIEW_PROJECT) + refspec = '%s:refs/for/%s' % (merge_branch, target_branch) + upload = merge_common.GetCommandStdout(['git', 'push', 'goog', refspec], + cwd=dest_dir) + logging.info(upload) + did_upload_webview_cl = True + + prompt_msg = 'About push the Chromium projects merge. ' + if not did_upload_webview_cl: + logging.info('No merge CL needed for %s.', WEBVIEW_PROJECT) + else: + prompt_msg += ('At this point you should have the CL +2-ed and merge it ' + 'together with this push.') + prompt_msg += '\nPress "y" to continue: ' + if raw_input(prompt_msg) != 'y': + logging.warn('Push aborted by the user!') + return + + logging.debug('Pushing Chromium projects to %s ...', target_branch) + refspec = '%s:%s' % (merge_branch, target_branch) + for path in merge_common.ALL_PROJECTS: + logging.debug('Pushing %s', path) + dest_dir = _GetAbsPath(path) + # Delete the graft before pushing otherwise git will attempt to push all the + # grafted-in objects to the server as well as the ones we want. + graftfile = os.path.join(dest_dir, '.git', 'info', 'grafts') + if os.path.exists(graftfile): + os.remove(graftfile) + merge_common.GetCommandStdout(['git', 'push', 'goog', refspec], + cwd=dest_dir) + + +def main(): + parser = optparse.OptionParser(usage='%prog [options]') + parser.epilog = ('Takes the current master-chromium branch of the Chromium ' + 'projects in Android and merges them into master to publish ' + 'them.') + parser.add_option( + '', '--revision', + default=None, + help=('Merge to the specified archived master-chromium revision (abbrev. ' + 'SHA or release version) rather than using HEAD. e.g., ' + '--revision=a1b2c3d4e5f6 or --revision=38.0.2125.24')) + parser.add_option( + '', '--repo-prop', + default=None, metavar='FILE', + help=('Merge to the revisions specified in this repo.prop file.')) + parser.add_option( + '', '--force', + default=False, action='store_true', + help=('Skip history checks and merged anyways (only for --repo-prop).')) + parser.add_option( + '', '--push', + default=False, action='store_true', + help=('Push the result of a previous merge to the server.')) + parser.add_option( + '', '--target', + default='master', metavar='BRANCH', + help=('Target branch to push to. Defaults to master.')) + (options, args) = parser.parse_args() + if args: + parser.print_help() + return 1 + + logging.basicConfig(format='%(message)s', level=logging.DEBUG, + stream=sys.stdout) + + if options.push: + Push(options.target) + elif options.repo_prop: + _MergeWithRepoProp(os.path.expanduser(options.repo_prop), + options.target, options.force) + elif options.revision: + _MergeChromiumProjects(options.revision, options.target) + else: + first_upstream_sha = _GetNearestUpstreamAbbrevSHA() + _MergeChromiumProjects(first_upstream_sha, options.target) + + return 0 + +if __name__ == '__main__': + sys.exit(main()) diff --git a/chromium/tools/merge_to_master.py b/chromium/tools/merge_to_master.py deleted file mode 100755 index 9f8e07a..0000000 --- a/chromium/tools/merge_to_master.py +++ /dev/null @@ -1,225 +0,0 @@ -#!/usr/bin/python -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Merge master-chromium to master within the Android tree.""" - -import logging -import optparse -import os -import re -import shutil -import sys - -import merge_common - - -AUTOGEN_MESSAGE = 'This commit was generated by merge_to_master.py.' - - -def _MergeProjects(svn_revision, target): - """Merges the Chromium projects from master-chromium to target. - - The larger projects' histories are flattened in the process. - - Args: - svn_revision: The SVN revision for the main Chromium repository - """ - for path in merge_common.PROJECTS_WITH_FLAT_HISTORY: - dest_dir = os.path.join(merge_common.REPOSITORY_ROOT, path) - merge_common.GetCommandStdout(['git', 'remote', 'update', - 'goog', 'history'], cwd=dest_dir) - merge_common.GetCommandStdout(['git', 'checkout', - '-b', 'merge-to-' + target, - '-t', 'goog/' + target], cwd=dest_dir) - merge_common.GetCommandStdout(['git', 'fetch', 'history', - 'refs/archive/chromium-%s' % svn_revision], - cwd=dest_dir) - merge_sha1 = merge_common.GetCommandStdout(['git', 'rev-parse', - 'FETCH_HEAD'], - cwd=dest_dir).strip() - old_sha1 = merge_common.GetCommandStdout(['git', 'rev-parse', 'HEAD'], - cwd=dest_dir).strip() - # Make the previous merges into grafts so we can do a correct merge. - merge_log = os.path.join(dest_dir, '.merged-revisions') - if os.path.exists(merge_log): - shutil.copyfile(merge_log, - os.path.join(dest_dir, '.git', 'info', 'grafts')) - if merge_common.GetCommandStdout(['git', 'rev-list', '-1', - 'HEAD..' + merge_sha1], cwd=dest_dir): - logging.debug('Merging project %s ...', path) - # Merge conflicts cause 'git merge' to return 1, so ignore errors - merge_common.GetCommandStdout(['git', 'merge', '--no-commit', '--squash', - merge_sha1], - cwd=dest_dir, ignore_errors=True) - dirs_to_prune = merge_common.PRUNE_WHEN_FLATTENING.get(path, []) - if dirs_to_prune: - merge_common.GetCommandStdout(['git', 'rm', '--ignore-unmatch', '-rf'] + - dirs_to_prune, cwd=dest_dir) - merge_common.CheckNoConflictsAndCommitMerge( - 'Merge from Chromium at DEPS revision %s\n\n%s' % - (svn_revision, AUTOGEN_MESSAGE), cwd=dest_dir) - new_sha1 = merge_common.GetCommandStdout(['git', 'rev-parse', 'HEAD'], - cwd=dest_dir).strip() - with open(merge_log, 'a+') as f: - f.write('%s %s %s\n' % (new_sha1, old_sha1, merge_sha1)) - merge_common.GetCommandStdout(['git', 'add', '.merged-revisions'], - cwd=dest_dir) - merge_common.GetCommandStdout( - ['git', 'commit', '-m', - 'Record Chromium merge at DEPS revision %s\n\n%s' % - (svn_revision, AUTOGEN_MESSAGE)], cwd=dest_dir) - else: - logging.debug('No new commits to merge in project %s', path) - - for path in merge_common.PROJECTS_WITH_FULL_HISTORY: - dest_dir = os.path.join(merge_common.REPOSITORY_ROOT, path) - merge_common.GetCommandStdout(['git', 'remote', 'update', 'goog'], - cwd=dest_dir) - merge_common.GetCommandStdout(['git', 'checkout', - '-b', 'merge-to-' + target, - '-t', 'goog/' + target], cwd=dest_dir) - merge_common.GetCommandStdout(['git', 'fetch', 'goog', - 'refs/archive/chromium-%s' % svn_revision], - cwd=dest_dir) - if merge_common.GetCommandStdout(['git', 'rev-list', '-1', - 'HEAD..FETCH_HEAD'], - cwd=dest_dir): - logging.debug('Merging project %s ...', path) - # Merge conflicts cause 'git merge' to return 1, so ignore errors - merge_common.GetCommandStdout(['git', 'merge', '--no-commit', '--no-ff', - 'FETCH_HEAD'], - cwd=dest_dir, ignore_errors=True) - merge_common.CheckNoConflictsAndCommitMerge( - 'Merge from Chromium at DEPS revision %s\n\n%s' % - (svn_revision, AUTOGEN_MESSAGE), cwd=dest_dir) - else: - logging.debug('No new commits to merge in project %s', path) - - -def _GetSVNRevision(commitish='history/master-chromium'): - logging.debug('Getting SVN revision ...') - commit = merge_common.GetCommandStdout([ - 'git', 'log', '-n1', '--grep=git-svn-id:', '--format=%H%n%b', commitish]) - svn_revision = re.search(r'^git-svn-id: .*@([0-9]+)', commit, - flags=re.MULTILINE).group(1) - return svn_revision - - -def _MergeWithRepoProp(repo_prop_file, target): - chromium_sha = None - webview_sha = None - with open(repo_prop_file) as prop: - for line in prop: - project, sha = line.split() - if project == 'platform/external/chromium_org-history': - chromium_sha = sha - elif project == 'platform/frameworks/webview': - webview_sha = sha - if not chromium_sha or not webview_sha: - logging.error('SHA1s for projects not found; invalid build.prop?') - return 1 - chromium_revision = _GetSVNRevision(chromium_sha) - logging.info('Merging Chromium at r%s and WebView at %s', chromium_revision, - webview_sha) - _MergeProjects(chromium_revision, target) - - dest_dir = os.path.join(os.environ['ANDROID_BUILD_TOP'], 'frameworks/webview') - merge_common.GetCommandStdout(['git', 'remote', 'update', 'goog'], - cwd=dest_dir) - merge_common.GetCommandStdout(['git', 'checkout', - '-b', 'merge-to-' + target, - '-t', 'goog/' + target], cwd=dest_dir) - if merge_common.GetCommandStdout(['git', 'rev-list', '-1', - 'HEAD..' + webview_sha], cwd=dest_dir): - logging.debug('Creating merge for framework...') - # Merge conflicts cause 'git merge' to return 1, so ignore errors - merge_common.GetCommandStdout(['git', 'merge', '--no-commit', '--no-ff', - webview_sha], cwd=dest_dir, - ignore_errors=True) - merge_common.CheckNoConflictsAndCommitMerge( - 'Merge master-chromium into %s at r%s\n\n%s' % - (target, chromium_revision, AUTOGEN_MESSAGE), cwd=dest_dir) - upload = merge_common.GetCommandStdout(['git', 'push', 'goog', - 'HEAD:refs/for/' + target], - cwd=dest_dir) - logging.info(upload) - else: - logging.debug('No new commits to merge in framework') - return 0 - - -def Push(target): - """Push the finished snapshot to the Android repository.""" - logging.debug('Pushing to server ...') - refspec = 'merge-to-%s:%s' % (target, target) - for path in merge_common.ALL_PROJECTS: - logging.debug('Pushing %s', path) - dest_dir = os.path.join(merge_common.REPOSITORY_ROOT, path) - # Delete the graft before pushing otherwise git will attempt to push all the - # grafted-in objects to the server as well as the ones we want. - graftfile = os.path.join(dest_dir, '.git', 'info', 'grafts') - if os.path.exists(graftfile): - os.remove(graftfile) - merge_common.GetCommandStdout(['git', 'push', 'goog', refspec], - cwd=dest_dir) - - - -def main(): - parser = optparse.OptionParser(usage='%prog [options]') - parser.epilog = ('Takes the current master-chromium branch of the Chromium ' - 'projects in Android and merges them into master to publish ' - 'them.') - parser.add_option( - '', '--svn_revision', '--release', - default=None, - help=('Merge to the specified archived master-chromium SVN revision,' - 'rather than using HEAD.')) - parser.add_option( - '', '--repo-prop', - default=None, metavar='FILE', - help=('Merge to the revisions specified in this repo.prop file.')) - parser.add_option( - '', '--push', - default=False, action='store_true', - help=('Push the result of a previous merge to the server.')) - parser.add_option( - '', '--target', - default='master', metavar='BRANCH', - help=('Target branch to push to. Defaults to master.')) - (options, args) = parser.parse_args() - if args: - parser.print_help() - return 1 - - logging.basicConfig(format='%(message)s', level=logging.DEBUG, - stream=sys.stdout) - - if options.push: - Push(options.target) - elif options.repo_prop: - return _MergeWithRepoProp(os.path.expanduser(options.repo_prop), - options.target) - elif options.svn_revision: - _MergeProjects(options.svn_revision, options.target) - else: - svn_revision = _GetSVNRevision() - _MergeProjects(svn_revision, options.target) - - return 0 - -if __name__ == '__main__': - sys.exit(main()) diff --git a/chromium/version.mk b/chromium/version.mk new file mode 100644 index 0000000..8737b0f --- /dev/null +++ b/chromium/version.mk @@ -0,0 +1,79 @@ +# +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# The current version code scheme for the package apk is: +# Mbbbba +# where +# M - Chromium milestone number minus 36. (1 or more digits). This is to +# ensure that our version codes are lower than the ones currently used by +# Chrome for Android, so that we can adopt their scheme in future. +# bbbb - manually specified build number (exactly 4 digits). This defaults to +# 0000, or 9999 in local builds. +# a - device architecture (exactly 1 digit). Current valid values are: +# 1 : armv7-a +# 2 : armv8-a (arm64) +# 4 : mips +# 7 : x86 +# 8 : x86_64 +# 64-bit architectures must be higher than their corresponding 32-bit +# architectures to ensure that 64-bit devices receive the multiarch APK. +# x86 must be higher than ARM to avoid x86 devices receiving ARM APKs +# and running them in emulation. + +# TODO(torne): get this from Chromium automatically. +version_milestone := 39 +version_offset_milestone := $(shell echo $(version_milestone) \ + | awk '{print $$1 - 36}') + +ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" + version_build_number := 9999 + # BUILD_NUMBER has a timestamp in it, which means that + # it will change every time. Pick a stable value. + version_name_tag := eng.$(USER) +else + ifeq "$(version_build_number)" "" + version_build_number := 0000 + endif + version_name_tag := $(BUILD_NUMBER) +endif + +ifeq "$(TARGET_ARCH)" "x86_64" + version_arch := 8 +else ifeq "$(TARGET_ARCH)" "x86" + version_arch := 7 +else ifeq "$(TARGET_ARCH)" "mips" + version_arch := 4 +else ifeq "$(TARGET_ARCH)" "arm64" + version_arch := 2 +else ifeq "$(TARGET_ARCH)" "arm" + version_arch := 1 +else + version_arch := 0 + $(warning Could not determine target architecture for versioning) +endif + +version_code := $(version_offset_milestone)$(version_build_number)$(version_arch) + +# Use the milestone, build number and architecture to construct a version +# name like "37 (1424323-arm64)". +# TODO(torne): get the full version number from Chromium. +version_name := $(version_milestone) ($(version_name_tag)-$(TARGET_ARCH)) + +# Clean up locals +version_milestone := +version_build_number := +version_name_tag := +version_arch := diff --git a/chromium/chromium.mk b/nullwebview/Android.mk index be1c40a..a6f195e 100644 --- a/chromium/chromium.mk +++ b/nullwebview/Android.mk @@ -1,4 +1,5 @@ -# Copyright (C) 2013 The Android Open Source Project +# +# Copyright (C) 2014 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -11,6 +12,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := nullwebview + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, java) + +LOCAL_PROGUARD_ENABLED := full +LOCAL_PROGUARD_FLAG_FILES := proguard.flags -# Warning: this is actually a product definition, to be inherited from +include $(BUILD_JAVA_LIBRARY) diff --git a/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java new file mode 100644 index 0000000..2f993cc --- /dev/null +++ b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.webview.nullwebview; + +import android.content.Context; +import android.webkit.CookieManager; +import android.webkit.GeolocationPermissions; +import android.webkit.WebIconDatabase; +import android.webkit.WebStorage; +import android.webkit.WebView; +import android.webkit.WebViewDatabase; +import android.webkit.WebViewFactoryProvider; +import android.webkit.WebViewProvider; + +public class NullWebViewFactoryProvider implements WebViewFactoryProvider { + + public NullWebViewFactoryProvider() { + } + + @Override + public WebViewFactoryProvider.Statics getStatics() { + throw new UnsupportedOperationException(); + } + + @Override + public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) { + throw new UnsupportedOperationException(); + } + + @Override + public GeolocationPermissions getGeolocationPermissions() { + throw new UnsupportedOperationException(); + } + + @Override + public CookieManager getCookieManager() { + throw new UnsupportedOperationException(); + } + + @Override + public WebIconDatabase getWebIconDatabase() { + throw new UnsupportedOperationException(); + } + + @Override + public WebStorage getWebStorage() { + throw new UnsupportedOperationException(); + } + + @Override + public WebViewDatabase getWebViewDatabase(Context context) { + throw new UnsupportedOperationException(); + } +} diff --git a/nullwebview/proguard.flags b/nullwebview/proguard.flags new file mode 100644 index 0000000..a4021a6 --- /dev/null +++ b/nullwebview/proguard.flags @@ -0,0 +1,11 @@ +# Most of the flags in this file are duplicated to refer to both the pre- and +# post-jarjar remapping versions of the class names. This enables the same +# config file to be used whether jarjar is enabled or not. + + +# Keep the factory and its public members; it's the main entry point used by the +# framework. +-keep class com.android.webview.nullwebview.NullWebViewFactoryProvider { + public *; +} + |
