[Android] Support the feature of proxy in Crosswalk

.gitignore

@@ -361,6 +361,8 @@ vs-chromium-project.txt
 /third_party/libjpeg_turbo
 /third_party/liblouis/src
 /third_party/libphonenumber/dist
+/third_party/libpxc
+/third_party/libpxc
 /third_party/libsrtp
 /third_party/libupnp
 /third_party/libvpx/source/libvpx
@@ -476,3 +478,4 @@ vs-chromium-project.txt
 /win8/metro_driver/metro_driver_version_resources.xml
 /x86-generic_out/
 /xcodebuild
+/xwalk

AUTHORS

@@ -397,6 +397,7 @@ Martijn Croonen <[email protected]>
 Martin Bednorz <[email protected]>
 Martina Kollarova <[email protected]>
 Masahiro Yado <[email protected]>
+Masaru Nishida <[email protected]>
 Matheus Bratfisch <[email protected]>
 Mathias Bynens <[email protected]>
 Mathieu Meisser <[email protected]>

DEPS

@@ -35,7 +35,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling sfntly
   # and whatever else without interference from each other.
-  'sfntly_revision': '130f832eddf98467e6578b548cb74ce17d04a26d',
+  'sfntly_revision': '468cad540fa1b0027cad60456f53feabecdce2bc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
@@ -114,7 +114,7 @@ allowed_hosts = [
 
 deps = {
   'src/breakpad/src':
-   Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '33a43757f6dadf49cb2240d22f1d0d827bfeae8f',
+   Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '5aac5eabb0fd7cbd3bf7805fb922fe2f90e80155',
 
   'src/buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

@@ -118,10 +118,11 @@ private void initialize(WebViewDelegate webViewDelegate) {
 
         // WebView needs to make sure to always use the wrapped application context.
         ContextUtils.initApplicationContext(
-                ResourcesContextWrapperFactory.get(mWebViewDelegate.getApplication()));
+                ResourcesContextWrapperFactory.get(
+                        mWebViewDelegate.getApplication().getApplicationContext()));
 
         if (isBuildDebuggable()) {
-            // Suppress the StrictMode violation as this codepath is only hit on debugglable builds.
+            // Suppress the StrictMode violation as this codepath is only hit on debuggable builds.
             StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
             CommandLine.initFromFile(COMMAND_LINE_FILE);
             StrictMode.setThreadPolicy(oldPolicy);
@@ -131,22 +132,22 @@ private void initialize(WebViewDelegate webViewDelegate) {
 
         ThreadUtils.setWillOverrideUiThread();
         // Load chromium library.
-        AwBrowserProcess.loadLibrary(ContextUtils.getApplicationContext());
+        AwBrowserProcess.loadLibrary();
 
         final PackageInfo packageInfo = WebViewFactory.getLoadedPackageInfo();
 
         // Load glue-layer support library.
         System.loadLibrary("webviewchromium_plat_support");
 
         // Use shared preference to check for package downgrade.
-        mWebViewPrefs = mWebViewDelegate.getApplication().getSharedPreferences(
+        mWebViewPrefs = ContextUtils.getApplicationContext().getSharedPreferences(
                 CHROMIUM_PREFS_NAME, Context.MODE_PRIVATE);
         int lastVersion = mWebViewPrefs.getInt(VERSION_CODE_PREF, 0);
         int currentVersion = packageInfo.versionCode;
         if (!versionCodeGE(currentVersion, lastVersion)) {
             // The WebView package has been downgraded since we last ran in this application.
             // Delete the WebView data directory's contents.
-            String dataDir = PathUtils.getDataDirectory(mWebViewDelegate.getApplication());
+            String dataDir = PathUtils.getDataDirectory(ContextUtils.getApplicationContext());
             Log.i(TAG, "WebView package downgraded from " + lastVersion + " to " + currentVersion
                             + "; deleting contents of " + dataDir);
             deleteContents(new File(dataDir));
@@ -286,7 +287,7 @@ private void startChromiumLocked() {
         initNetworkChangeNotifier(context);
         final int extraBindFlags = 0;
         AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, extraBindFlags);
-        AwBrowserProcess.start(context);
+        AwBrowserProcess.start();
 
         if (isBuildDebuggable()) {
             setWebContentsDebuggingEnabled(true);
@@ -313,7 +314,7 @@ public void onTraceEnabledChange(boolean enabled) {
 
         // Start listening for data reduction proxy setting changes.
         mProxyManager = new AwDataReductionProxyManager();
-        mProxyManager.start(mWebViewDelegate.getApplication());
+        mProxyManager.start(ContextUtils.getApplicationContext());
     }
 
     boolean hasStarted() {

android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java

@@ -17,7 +17,7 @@
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.BrowserStartupController;
-import org.chromium.content.browser.ChildProcessLauncher;
+import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.policy.CombinedPolicyProvider;
 
 import java.io.File;
@@ -40,12 +40,12 @@ public abstract class AwBrowserProcess {
      * to run webview in this process. Does not create threads; safe to call from zygote.
      * Note: it is up to the caller to ensure this is only called once.
      */
-    public static void loadLibrary(Context context) {
-        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, context);
-        ContextUtils.initApplicationContext(context.getApplicationContext());
+    public static void loadLibrary() {
+        Context appContext = ContextUtils.getApplicationContext();
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, appContext);
         try {
             LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW);
-            libraryLoader.loadNow(context);
+            libraryLoader.loadNow(appContext);
             // Switch the command line implementation from Java to native.
             // It's okay for the WebView to do this before initialization because we have
             // setup the JNI bindings by this point.
@@ -60,32 +60,32 @@ public static void loadLibrary(Context context) {
      * WebView.
      */
     public static void configureChildProcessLauncher(String packageName, int extraBindFlags) {
-        ChildProcessLauncher.setChildProcessCreationParams(
-                new ChildProcessLauncher.ChildProcessCreationParams(packageName, extraBindFlags,
+        ChildProcessCreationParams.set(
+                new ChildProcessCreationParams(packageName, extraBindFlags,
                         LibraryProcessType.PROCESS_WEBVIEW_CHILD));
     }
 
     /**
      * Starts the chromium browser process running within this process. Creates threads
      * and performs other per-app resource allocations; must not be called from zygote.
      * Note: it is up to the caller to ensure this is only called once.
-     * @param context The Android application context
      */
-    public static void start(final Context context) {
-        tryObtainingDataDirLockOrDie(context);
+    public static void start() {
+        tryObtainingDataDirLockOrDie();
         // We must post to the UI thread to cover the case that the user
         // has invoked Chromium startup by using the (thread-safe)
         // CookieManager rather than creating a WebView.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
+                Context appContext = ContextUtils.getApplicationContext();
                 // The policies are used by browser startup, so we need to register the policy
                 // providers before starting the browser process. This only registers java objects
                 // and doesn't need the native library.
-                CombinedPolicyProvider.get().registerProvider(new AwPolicyProvider(context));
+                CombinedPolicyProvider.get().registerProvider(new AwPolicyProvider(appContext));
 
                 try {
-                    BrowserStartupController.get(context, LibraryProcessType.PROCESS_WEBVIEW)
+                    BrowserStartupController.get(appContext, LibraryProcessType.PROCESS_WEBVIEW)
                             .startBrowserProcessesSync(!CommandLine.getInstance().hasSwitch(
                                             AwSwitches.WEBVIEW_SANDBOXED_RENDERER));
                 } catch (ProcessInitException e) {
@@ -95,11 +95,11 @@ public void run() {
         });
     }
 
-    private static void tryObtainingDataDirLockOrDie(Context context) {
+    private static void tryObtainingDataDirLockOrDie() {
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         StrictMode.allowThreadDiskWrites();
         try {
-            String dataPath = PathUtils.getDataDirectory(context);
+            String dataPath = PathUtils.getDataDirectory(ContextUtils.getApplicationContext());
             File lockFile = new File(dataPath, EXCLUSIVE_LOCK_FILE);
             boolean success = false;
             try {

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -1158,6 +1158,7 @@ public void destroy() {
         // hardware resources.
         if (mIsAttachedToWindow) {
             Log.w(TAG, "WebView.destroy() called while WebView is still attached to window.");
+            mCurrentFunctor.onDetachedFromWindow();
             nativeOnDetachedFromWindow(mNativeAwContents);
         }
         mIsDestroyed = true;
@@ -1488,6 +1489,7 @@ private static boolean isBase64Encoded(String encoding) {
      */
     public void loadData(String data, String mimeType, String encoding) {
         if (TRACE) Log.d(TAG, "loadData");
+        if (isDestroyed(WARN)) return;
         loadUrl(LoadUrlParams.createLoadDataParams(
                 fixupData(data), fixupMimeType(mimeType), isBase64Encoded(encoding)));
     }
@@ -1577,6 +1579,10 @@ public void loadUrl(LoadUrlParams params) {
             }
         }
 
+        // Temporary to generate a Java stack for crbug.com/618807.
+        if (mNativeAwContents == 0) {
+            throw new RuntimeException("Calling load on destroyed webview " + mIsDestroyed);
+        }
         nativeSetExtraHeadersForUrl(
                 mNativeAwContents, params.getUrl(), params.getExtraHttpRequestHeadersString());
         params.setExtraHeaders(new HashMap<String, String>());

android_webview/java/src/org/chromium/android_webview/AwSettings.java

@@ -87,7 +87,7 @@ public class AwSettings {
     private boolean mSpatialNavigationEnabled;  // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures = false;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
-    private boolean mVideoOverlayForEmbeddedVideoEnabled = false;
+
     private boolean mForceVideoOverlayForTests = false;
     private boolean mOffscreenPreRaster = false;
     private int mDisabledMenuItems = MENU_ITEM_NONE;
@@ -1701,35 +1701,22 @@ public void setDisabledActionModeMenuItems(int menuItems) {
      * @param flag whether to enable the video overlay for the embedded video.
      */
     public void setVideoOverlayForEmbeddedVideoEnabled(final boolean enabled) {
-        synchronized (mAwSettingsLock) {
-            if (mVideoOverlayForEmbeddedVideoEnabled != enabled) {
-                mVideoOverlayForEmbeddedVideoEnabled = enabled;
-                mEventHandler.runOnUiThreadBlockingAndLocked(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (mNativeAwSettings != 0) {
-                            nativeUpdateRendererPreferencesLocked(mNativeAwSettings);
-                        }
-                    }
-                });
-            }
-        }
+        // No-op, see http://crbug.com/616583
     }
 
     /**
      * Gets whether to use the video overlay for the embedded video.
      * @return true if the WebView enables the video overlay for the embedded video.
      */
     public boolean getVideoOverlayForEmbeddedVideoEnabled() {
-        synchronized (mAwSettingsLock) {
-            return getVideoOverlayForEmbeddedVideoEnabledLocked();
-        }
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @CalledByNative
     private boolean getVideoOverlayForEmbeddedVideoEnabledLocked() {
-        assert Thread.holdsLock(mAwSettingsLock);
-        return mVideoOverlayForEmbeddedVideoEnabled;
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @VisibleForTesting

android_webview/javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java

@@ -117,14 +117,15 @@ public Boolean call() throws Exception {
     }
 
     private boolean tryStartingBrowserProcess() {
-        final Context context = getActivity();
         final Boolean success[] = new Boolean[1];
+        // The activity must be launched in order for proper webview statics to be setup.
+        getActivity();
         // runOnMainSync does not catch RuntimeExceptions, they just terminate the test.
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 try {
-                    AwBrowserProcess.start(context);
+                    AwBrowserProcess.start();
                     success[0] = true;
                 } catch (RuntimeException e) {
                     success[0] = false;

android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

@@ -90,11 +90,12 @@ protected void setUp() throws Exception {
     }
 
     protected void startBrowserProcess() throws Exception {
-        final Context context = getActivity();
+        // The activity must be launched in order for proper webview statics to be setup.
+        getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                AwBrowserProcess.start(context);
+                AwBrowserProcess.start();
             }
         });
     }

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java

@@ -14,6 +14,7 @@
 import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.CookieUtils;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.test.util.TestWebServer;
 
@@ -29,10 +30,11 @@ public class CookieManagerStartupTest extends AwTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        // CookeManager assumes that native is loaded, but webview browser should not be loaded for
+        // CookieManager assumes that native is loaded, but webview browser should not be loaded for
         // these tests as webview is not necessarily loaded when CookieManager is called.
-        AwBrowserProcess.loadLibrary(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        Context appContext = getInstrumentation().getTargetContext().getApplicationContext();
+        ContextUtils.initApplicationContext(appContext);
+        AwBrowserProcess.loadLibrary();
     }
 
     @Override
@@ -45,11 +47,12 @@ private void startChromium() throws Exception {
     }
 
     private void startChromiumWithClient(TestAwContentsClient contentsClient) throws Exception {
-        final Context context = getActivity();
+        // The activity must be launched in order for proper webview statics to be setup.
+        getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                AwBrowserProcess.start(context);
+                AwBrowserProcess.start();
             }
         });
 

android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

@@ -70,11 +70,10 @@ private void deleteDirectory(File dir) throws Exception {
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testLegacyHttpCacheDirIsRemovedOnStartup() throws Exception {
-        Context targetContext = getInstrumentation().getTargetContext();
+        Context appContext = getInstrumentation().getTargetContext().getApplicationContext();
         PathUtils.setPrivateDataDirectorySuffix(
-                AwBrowserProcess.PRIVATE_DATA_DIRECTORY_SUFFIX, targetContext);
-        File webViewLegacyCacheDir = new File(
-                PathUtils.getDataDirectory(targetContext), "Cache");
+                AwBrowserProcess.PRIVATE_DATA_DIRECTORY_SUFFIX, appContext);
+        File webViewLegacyCacheDir = new File(PathUtils.getDataDirectory(appContext), "Cache");
         if (!webViewLegacyCacheDir.isDirectory()) {
             assertTrue(webViewLegacyCacheDir.mkdir());
             assertTrue(webViewLegacyCacheDir.isDirectory());
@@ -83,8 +82,8 @@ public void testLegacyHttpCacheDirIsRemovedOnStartup() throws Exception {
         assertTrue(dummyCacheFile.exists());
 
         // Set up JNI bindings.
-        ContextUtils.initApplicationContext(targetContext.getApplicationContext());
-        AwBrowserProcess.loadLibrary(targetContext);
+        ContextUtils.initApplicationContext(appContext);
+        AwBrowserProcess.loadLibrary();
         // No delay before removing the legacy cache files.
         AwContentsStatics.setLegacyCacheRemovalDelayForTest(0);
 

android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

@@ -40,6 +40,7 @@
 import org.chromium.android_webview.test.NullContentsClient;
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.content.app.ContentApplication;
@@ -79,7 +80,8 @@ public void onCreate(Bundle savedInstanceState) {
         ContentApplication.initCommandLine(this);
         waitForDebuggerIfNeeded();
 
-        AwBrowserProcess.loadLibrary(this);
+        ContextUtils.initApplicationContext(getApplicationContext());
+        AwBrowserProcess.loadLibrary();
 
         if (CommandLine.getInstance().hasSwitch(AwShellSwitches.ENABLE_ATRACE)) {
             Log.e(TAG, "Enabling Android trace.");
@@ -129,7 +131,7 @@ public void onDestroy() {
     }
 
     private AwTestContainerView createAwTestContainerView() {
-        AwBrowserProcess.start(this);
+        AwBrowserProcess.start();
         AwTestContainerView testContainerView = new AwTestContainerView(this, true);
         AwContentsClient awContentsClient = new NullContentsClient() {
             private View mCustomView;

android_webview/test/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java

@@ -30,7 +30,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         AwShellResourceProvider.registerResources(this);
         ContextUtils.initApplicationContext(getApplicationContext());
-        AwBrowserProcess.loadLibrary(this);
+        AwBrowserProcess.loadLibrary();
 
         mLinearLayout = new LinearLayout(this);
         mLinearLayout.setOrientation(LinearLayout.VERTICAL);