From b4ee37a63c38b206793e610b4873ffde965e9b33 Mon Sep 17 00:00:00 2001 From: Eurogiciel-BOT Date: Tue, 5 Aug 2014 07:59:50 +0000 Subject: [PATCH] Upstream version 8.37.187.0 Upstream commit-id c6d34caa9f4221c428a430c0868e422881f92e94 Change-Id: Id9ae942df4d42c0b8b6dba374e86396f0bb59d67 Signed-off-by: Eurogiciel-BOT --- packaging/crosswalk.spec | 2 +- src/xwalk/VERSION | 2 +- .../application/browser/application_system.cc | 2 +- src/xwalk/application/common/application_data.cc | 2 +- .../build/android/generate_xwalk_core_library.py | 3 +- src/xwalk/packaging/crosswalk.spec | 2 +- .../core/internal/AndroidProtocolHandler.java | 3 +- .../xwalk/core/internal/XWalkContentsClient.java | 4 ++ .../core/internal/XWalkContentsClientBridge.java | 15 +++- .../renderer_host/xwalk_render_view_host_ext.cc | 10 +++ .../renderer_host/xwalk_render_view_host_ext.h | 1 + .../android/xwalk_contents_client_bridge.cc | 11 +++ .../browser/android/xwalk_contents_client_bridge.h | 3 + .../android/xwalk_contents_client_bridge_base.h | 1 + .../test/ShouldInterceptLoadRequestTest.java | 7 -- .../xwalk/core/xwview/test/XWalkViewTestBase.java | 81 ---------------------- .../internal}/xwview/test/HandleActionUriTest.java | 8 +-- .../xwalk/core/internal/xwview/test/LoadTest.java | 9 +++ .../xwview/test/SetDatabaseEnabledTest.java | 12 ++-- .../xwview/test/SetDomStorageEnabledTest.java | 28 ++++---- .../xwview/test/SetNetworkAvailableTest.java | 12 ++-- .../core/internal}/xwview/test/UserAgentTest.java | 8 +-- src/xwalk/xwalk_android_tests.gypi | 4 +- 23 files changed, 97 insertions(+), 133 deletions(-) rename src/xwalk/test/android/{core/javatests/src/org/xwalk/core => core_internal/javatests/src/org/xwalk/core/internal}/xwview/test/HandleActionUriTest.java (94%) rename src/xwalk/test/android/{core/javatests/src/org/xwalk/core => core_internal/javatests/src/org/xwalk/core/internal}/xwview/test/SetDatabaseEnabledTest.java (92%) rename src/xwalk/test/android/{core/javatests/src/org/xwalk/core => core_internal/javatests/src/org/xwalk/core/internal}/xwview/test/SetDomStorageEnabledTest.java (86%) rename src/xwalk/test/android/{core/javatests/src/org/xwalk/core => core_internal/javatests/src/org/xwalk/core/internal}/xwview/test/SetNetworkAvailableTest.java (90%) rename src/xwalk/test/android/{core/javatests/src/org/xwalk/core => core_internal/javatests/src/org/xwalk/core/internal}/xwview/test/UserAgentTest.java (93%) diff --git a/packaging/crosswalk.spec b/packaging/crosswalk.spec index 9301faa..8e47581 100644 --- a/packaging/crosswalk.spec +++ b/packaging/crosswalk.spec @@ -16,7 +16,7 @@ %endif Name: crosswalk -Version: 8.37.186.0 +Version: 8.37.187.0 Release: 0 Summary: Crosswalk is an app runtime based on Chromium License: (BSD-3-Clause and LGPL-2.1+) diff --git a/src/xwalk/VERSION b/src/xwalk/VERSION index f23c0fe..d589d87 100644 --- a/src/xwalk/VERSION +++ b/src/xwalk/VERSION @@ -1,4 +1,4 @@ MAJOR=8 MINOR=37 -BUILD=186 +BUILD=187 PATCH=0 diff --git a/src/xwalk/application/browser/application_system.cc b/src/xwalk/application/browser/application_system.cc index 841ac02..ab30ddc 100644 --- a/src/xwalk/application/browser/application_system.cc +++ b/src/xwalk/application/browser/application_system.cc @@ -74,7 +74,7 @@ bool ApplicationSystem::LaunchWithCommandLineParam( Application::LaunchParams launch_params; launch_params.force_fullscreen = cmd_line.HasSwitch(switches::kFullscreen); - launch_params.entry_points = Application::URLKey; + launch_params.entry_points = Application::StartURLKey; return !!application_service_->Launch(application_data, launch_params); } diff --git a/src/xwalk/application/common/application_data.cc b/src/xwalk/application/common/application_data.cc index 8a03083..f8de616 100644 --- a/src/xwalk/application/common/application_data.cc +++ b/src/xwalk/application/common/application_data.cc @@ -263,7 +263,7 @@ bool ApplicationData::LoadVersion(base::string16* error) { bool ok = manifest_->GetString(widget_keys::kVersionKey, &version_str); if (!ok) { *error = base::ASCIIToUTF16(errors::kInvalidVersion); - return false; + return true; } version_.reset(new base::Version(version_str)); diff --git a/src/xwalk/build/android/generate_xwalk_core_library.py b/src/xwalk/build/android/generate_xwalk_core_library.py index f927310..e9dd1e2 100755 --- a/src/xwalk/build/android/generate_xwalk_core_library.py +++ b/src/xwalk/build/android/generate_xwalk_core_library.py @@ -74,7 +74,8 @@ def CopyJSBindingFiles(project_source, out_dir): jsfiles_to_copy = [ 'xwalk/experimental/launch_screen/launch_screen_api.js', 'xwalk/experimental/presentation/presentation_api.js', - 'xwalk/sysapps/device_capabilities/device_capabilities_api.js' + 'xwalk/runtime/android/core_internal/src/org/xwalk/core/' + + 'internal/extension/api/device_capabilities/device_capabilities_api.js' ] # Copy JS binding file to assets/jsapi folder. diff --git a/src/xwalk/packaging/crosswalk.spec b/src/xwalk/packaging/crosswalk.spec index 9301faa..8e47581 100644 --- a/src/xwalk/packaging/crosswalk.spec +++ b/src/xwalk/packaging/crosswalk.spec @@ -16,7 +16,7 @@ %endif Name: crosswalk -Version: 8.37.186.0 +Version: 8.37.187.0 Release: 0 Summary: Crosswalk is an app runtime based on Chromium License: (BSD-3-Clause and LGPL-2.1+) diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/AndroidProtocolHandler.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/AndroidProtocolHandler.java index 681dc5b..8ce7a8f 100644 --- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/AndroidProtocolHandler.java +++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/AndroidProtocolHandler.java @@ -188,10 +188,9 @@ class AndroidProtocolHandler { assert uri.getScheme().equals(FILE_SCHEME); assert uri.getPath() != null; assert uri.getPath().startsWith(nativeGetAndroidAssetPath()); - String path = uri.getPath().replaceFirst(nativeGetAndroidAssetPath(), ""); try { AssetManager assets = context.getAssets(); - return assets.open(path, AssetManager.ACCESS_STREAMING); + return assets.open(getAssetPath(uri), AssetManager.ACCESS_STREAMING); } catch (IOException e) { Log.e(TAG, "Unable to open asset URL: " + uri); return null; diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClient.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClient.java index 3fcfb89..3b185ad 100644 --- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClient.java +++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClient.java @@ -109,6 +109,10 @@ abstract class XWalkContentsClient extends ContentViewClient { mDIPScale = dipScale; } + public double getDIPScale() { + return mDIPScale; + } + final XWalkContentsClientCallbackHelper getCallbackHelper() { return mCallbackHelper; } diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java index d679249..06d5060 100644 --- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java +++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContentsClientBridge.java @@ -38,7 +38,7 @@ import org.xwalk.core.internal.XWalkUIClientInternal.LoadStatusInternal; @JNINamespace("xwalk") class XWalkContentsClientBridge extends XWalkContentsClient implements ContentViewDownloadDelegate { - private static final String TAG = XWalkContentsClientBridge.class.getName(); + private static final String TAG = XWalkContentsClientBridge.class.getName(); private XWalkViewInternal mXWalkView; private XWalkUIClientInternal mXWalkUIClient; @@ -62,6 +62,8 @@ class XWalkContentsClientBridge extends XWalkContentsClient // The native peer of the object private long mNativeContentsClientBridge; + private float mPageScaleFactor; + private class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate { private XWalkContentsClient mContentsClient; @@ -660,6 +662,17 @@ class XWalkContentsClientBridge extends XWalkContentsClient public void onDangerousDownload(String filename, int downloadId) { } + @CalledByNative + public void onWebLayoutPageScaleFactorChanged(float pageScaleFactor) { + if (mPageScaleFactor == pageScaleFactor) return; + + float oldPageScaleFactor = mPageScaleFactor; + double dipScale = getDIPScale(); + mPageScaleFactor = pageScaleFactor; + onScaleChanged((float)(oldPageScaleFactor * dipScale), + (float)(mPageScaleFactor * dipScale)); + } + //-------------------------------------------------------------------------------------------- // Native methods //-------------------------------------------------------------------------------------------- diff --git a/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.cc b/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.cc index 7b88f02..e983880 100644 --- a/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.cc +++ b/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.cc @@ -12,6 +12,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/common/frame_navigate_params.h" +#include "xwalk/runtime/browser/android/xwalk_contents_client_bridge.h" #include "xwalk/runtime/browser/runtime_context.h" #include "xwalk/runtime/common/android/xwalk_render_view_messages.h" @@ -120,6 +121,8 @@ bool XWalkRenderViewHostExt::OnMessageReceived(const IPC::Message& message) { OnDocumentHasImagesResponse) IPC_MESSAGE_HANDLER(XWalkViewHostMsg_UpdateHitTestData, OnUpdateHitTestData) + IPC_MESSAGE_HANDLER(XWalkViewHostMsg_PageScaleFactorChanged, + OnPageScaleFactorChanged) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -159,4 +162,11 @@ void XWalkRenderViewHostExt::SetOriginAccessWhitelist( } } +void XWalkRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) { + XWalkContentsClientBridgeBase* client_bridge = + XWalkContentsClientBridgeBase::FromWebContents(web_contents()); + if (client_bridge != NULL) + client_bridge->OnWebLayoutPageScaleFactorChanged(page_scale_factor); +} + } // namespace xwalk diff --git a/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.h b/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.h index a4b5285..2b110ee 100644 --- a/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.h +++ b/src/xwalk/runtime/browser/android/renderer_host/xwalk_render_view_host_ext.h @@ -80,6 +80,7 @@ class XWalkRenderViewHostExt : public content::WebContentsObserver, void OnDocumentHasImagesResponse(int msg_id, bool has_images); void OnUpdateHitTestData(const XWalkHitTestData& hit_test_data); void OnPictureUpdated(); + void OnPageScaleFactorChanged(float page_scale_factor); bool IsRenderViewReady() const; diff --git a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc index c8da571..3998cc0 100644 --- a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc +++ b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.cc @@ -309,6 +309,17 @@ void XWalkContentsClientBridge::ShowNotification( } } +void XWalkContentsClientBridge::OnWebLayoutPageScaleFactorChanged( + float page_scale_factor) { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + JNIEnv* env = AttachCurrentThread(); + ScopedJavaLocalRef obj = java_ref_.get(env); + if (obj.is_null()) + return; + Java_XWalkContentsClientBridge_onWebLayoutPageScaleFactorChanged( + env, obj.obj(), page_scale_factor); +} + void XWalkContentsClientBridge::ConfirmJsResult(JNIEnv* env, jobject, int id, diff --git a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.h b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.h index d4fd479..0ab5083 100644 --- a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.h +++ b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge.h @@ -71,6 +71,9 @@ class XWalkContentsClientBridge : public XWalkContentsClientBridgeBase { int notification_id, const SkBitmap& icon) OVERRIDE; + virtual void OnWebLayoutPageScaleFactorChanged( + float page_scale_factor) + OVERRIDE; bool OnReceivedHttpAuthRequest(const base::android::JavaRef& handler, const std::string& host, diff --git a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.h b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.h index deec851..8042ae3 100644 --- a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.h +++ b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.h @@ -74,6 +74,7 @@ class XWalkContentsClientBridgeBase { int notification_id, const SkBitmap& icon) = 0; + virtual void OnWebLayoutPageScaleFactorChanged(float page_scale_factor) = 0; }; } // namespace xwalk diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldInterceptLoadRequestTest.java b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldInterceptLoadRequestTest.java index f973dc0..97530d5 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldInterceptLoadRequestTest.java +++ b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldInterceptLoadRequestTest.java @@ -234,13 +234,6 @@ public class ShouldInterceptLoadRequestTest extends XWalkViewTestBase { " return xhr.status;" + "})();"; - getInstrumentation().runOnMainSync(new Runnable() { - @Override - public void run() { - getXWalkView().getSettings().setJavaScriptEnabled(true); - } - }); - final String aboutPageUrl = addAboutPageToTestServer(mWebServer); loadUrlSync(aboutPageUrl); diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/XWalkViewTestBase.java b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/XWalkViewTestBase.java index 8be4a33..5ad26a0 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/XWalkViewTestBase.java +++ b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/XWalkViewTestBase.java @@ -30,7 +30,6 @@ import org.xwalk.core.XWalkNavigationItem; import org.xwalk.core.XWalkResourceClient; import org.xwalk.core.XWalkUIClient; import org.xwalk.core.XWalkView; -import org.xwalk.core.internal.XWalkSettings; public class XWalkViewTestBase extends ActivityInstrumentationTestCase2 { @@ -126,37 +125,6 @@ public class XWalkViewTestBase }); } - static class ViewPair { - private final XWalkView content0; - private final TestHelperBridge client0; - private final XWalkView content1; - private final TestHelperBridge client1; - - ViewPair(XWalkView content0, TestHelperBridge client0, - XWalkView content1, TestHelperBridge client1) { - this.content0 = content0; - this.client0 = client0; - this.content1 = content1; - this.client1 = client1; - } - - XWalkView getContent0() { - return content0; - } - - TestHelperBridge getClient0() { - return client0; - } - - XWalkView getContent1() { - return content1; - } - - TestHelperBridge getClient1() { - return client1; - } - } - public XWalkViewTestBase() { super(XWalkViewTestRunnerActivity.class); } @@ -301,16 +269,6 @@ public class XWalkViewTestBase }); } - protected XWalkSettings getXWalkSettingsOnUiThreadByContent( - final XWalkView xwalkContent) throws Exception { - return runTestOnUiThreadAndGetResult(new Callable() { - @Override - public XWalkSettings call() throws Exception { - return xwalkContent.getSettings(); - } - }); - } - protected XWalkView createXWalkViewContainerOnMainSync( final Context context, final XWalkUIClient uiClient, @@ -330,29 +288,6 @@ public class XWalkViewTestBase return xWalkViewContainer.get(); } - protected ViewPair createViewsOnMainSync(final TestHelperBridge helperBridge0, - final TestHelperBridge helperBridge1, - final XWalkUIClient uiClient0, - final XWalkUIClient uiClient1, - final XWalkResourceClient resourceClient0, - final XWalkResourceClient resourceClient1, - final Context context) throws Throwable { - final XWalkView walkView0 = createXWalkViewContainerOnMainSync(context, - uiClient0, resourceClient0); - final XWalkView walkView1 = createXWalkViewContainerOnMainSync(context, - uiClient1, resourceClient1); - final AtomicReference viewPair = new AtomicReference(); - - getInstrumentation().runOnMainSync(new Runnable() { - @Override - public void run() { - viewPair.set(new ViewPair(walkView0, helperBridge0, walkView1, helperBridge1)); - } - }); - - return viewPair.get(); - } - protected void loadAssetFile(String fileName) throws Exception { String fileContent = getFileContent(fileName); loadDataSync(fileName, fileContent, "text/html", false); @@ -503,22 +438,6 @@ public class XWalkViewTestBase return helper.getJsonResultAndClear(); } - protected ViewPair createViews() throws Throwable { - TestHelperBridge helperBridge0 = new TestHelperBridge(); - TestHelperBridge helperBridge1 = new TestHelperBridge(); - TestXWalkUIClientBase uiClient0 = new TestXWalkUIClientBase(helperBridge0); - TestXWalkUIClientBase uiClient1 = new TestXWalkUIClientBase(helperBridge1); - TestXWalkResourceClientBase resourceClient0 = - new TestXWalkResourceClientBase(helperBridge0); - TestXWalkResourceClientBase resourceClient1 = - new TestXWalkResourceClientBase(helperBridge1); - ViewPair viewPair = - createViewsOnMainSync(helperBridge0, helperBridge1, uiClient0, uiClient1, - resourceClient0, resourceClient1, getActivity()); - - return viewPair; - } - protected String getUrlOnUiThread() throws Exception { return runTestOnUiThreadAndGetResult(new Callable() { @Override diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/HandleActionUriTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/HandleActionUriTest.java similarity index 94% rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/HandleActionUriTest.java rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/HandleActionUriTest.java index 5df0f54..e8ca994 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/HandleActionUriTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/HandleActionUriTest.java @@ -1,9 +1,9 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Copyright (c) 2013 Intel Corporation. All rights reserved. +// Copyright (c) 2013-2014 Intel Corporation. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.xwalk.core.xwview.test; +package org.xwalk.core.internal.xwview.test; import android.content.ActivityNotFoundException; import android.content.Context; @@ -12,14 +12,14 @@ import android.graphics.Bitmap; import android.test.suitebuilder.annotation.SmallTest; import org.chromium.base.test.util.Feature; -import org.xwalk.core.XWalkView; import org.xwalk.core.internal.XWalkClient; import org.xwalk.core.internal.XWalkNavigationHandlerImpl; +import org.xwalk.core.internal.XWalkViewInternal; /** * Test suite for handling ActionUri. */ -public class HandleActionUriTest extends XWalkViewTestBase { +public class HandleActionUriTest extends XWalkViewInternalTestBase { class TestXWalkNavigationHandler extends XWalkNavigationHandlerImpl { private Intent intentToStart; diff --git a/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/LoadTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/LoadTest.java index b3aa268..a3e432b 100644 --- a/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/LoadTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/LoadTest.java @@ -55,6 +55,15 @@ public class LoadTest extends XWalkViewInternalTestBase { } @SmallTest + @Feature({"LoadUnnormalized"}) + public void testAndroidAssetUrlUnnormalized() throws Throwable { + final String url = "file:///android_asset/www//index.html"; + + loadUrlSync(url); + assertEquals(expectedLocalTitle, getTitleOnUiThread()); + } + + @SmallTest @Feature({"LoadWithData"}) public void testWithData() throws Throwable { final String name = "index.html"; diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDatabaseEnabledTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDatabaseEnabledTest.java similarity index 92% rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDatabaseEnabledTest.java rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDatabaseEnabledTest.java index 5bbe42c..65e9c40 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDatabaseEnabledTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDatabaseEnabledTest.java @@ -1,9 +1,9 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Copyright (c) 2013 Intel Corporation. All rights reserved. +// Copyright (c) 2013-2014 Intel Corporation. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.xwalk.core.xwview.test; +package org.xwalk.core.internal.xwview.test; import android.graphics.Bitmap; import android.test.suitebuilder.annotation.SmallTest; @@ -12,13 +12,13 @@ import android.webkit.WebResourceResponse; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.UrlUtils; -import org.xwalk.core.XWalkView; import org.xwalk.core.internal.XWalkClient; +import org.xwalk.core.internal.XWalkViewInternal; /** * Test suite for setDatabaseEnabled(). */ -public class SetDatabaseEnabledTest extends XWalkViewTestBase { +public class SetDatabaseEnabledTest extends XWalkViewInternalTestBase { private static final boolean ENABLED = true; private static final boolean DISABLED = false; @@ -125,7 +125,7 @@ public class SetDatabaseEnabledTest extends XWalkViewTestBase { } @SmallTest - @Feature({"XWalkView", "Preferences"}) + @Feature({"XWalkViewInternal", "Preferences"}) public void testDatabaseEnabled() throws Throwable { XWalkViewSettingsDatabaseTestHelper helper = new XWalkViewSettingsDatabaseTestHelper(); helper.setAlteredSettingValue(); @@ -133,7 +133,7 @@ public class SetDatabaseEnabledTest extends XWalkViewTestBase { } @SmallTest - @Feature({"XWalkView", "Preferences"}) + @Feature({"XWalkViewInternal", "Preferences"}) public void testDatabaseDisabled() throws Throwable { XWalkViewSettingsDatabaseTestHelper helper = new XWalkViewSettingsDatabaseTestHelper(); helper.setInitialSettingValue(); diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDomStorageEnabledTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDomStorageEnabledTest.java similarity index 86% rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDomStorageEnabledTest.java rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDomStorageEnabledTest.java index 30fd2fd..009e923 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetDomStorageEnabledTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetDomStorageEnabledTest.java @@ -1,9 +1,9 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Copyright (c) 2013 Intel Corporation. All rights reserved. +// Copyright (c) 2013-2014 Intel Corporation. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.xwalk.core.xwview.test; +package org.xwalk.core.internal.xwview.test; import android.graphics.Bitmap; import android.test.suitebuilder.annotation.SmallTest; @@ -13,25 +13,25 @@ import java.util.concurrent.atomic.AtomicReference; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.UrlUtils; -import org.xwalk.core.XWalkView; import org.xwalk.core.internal.XWalkClient; import org.xwalk.core.internal.XWalkSettings; +import org.xwalk.core.internal.XWalkViewInternal; import org.xwalk.core.internal.XWalkWebChromeClient; /** * Test suite for setDomStorageEnabled(). */ -public class SetDomStorageEnabledTest extends XWalkViewTestBase { +public class SetDomStorageEnabledTest extends XWalkViewInternalTestBase { private static final boolean ENABLED = true; private static final boolean DISABLED = false; abstract class XWalkViewSettingsTestHelper { - protected final XWalkView mXWalkView; + protected final XWalkViewInternal mXWalkViewInternal; protected final XWalkSettings mXWalkSettings; - XWalkViewSettingsTestHelper(XWalkView xWalkContent, + XWalkViewSettingsTestHelper(XWalkViewInternal xWalkContent, boolean requiresJsEnabled) throws Throwable { - mXWalkView = xWalkContent; + mXWalkViewInternal = xWalkContent; mXWalkSettings = getXWalkSettingsOnUiThreadByContent(xWalkContent); mXWalkSettings.setDomStorageEnabled(false); if (requiresJsEnabled) { @@ -77,7 +77,7 @@ public class SetDomStorageEnabledTest extends XWalkViewTestBase { TestHelperBridge mHelperBridge; XWalkViewSettingsDomStorageEnabledTestHelper( - XWalkView xWalkContent, + XWalkViewInternal xWalkContent, final TestHelperBridge helperBridge) throws Throwable { super(xWalkContent, true); mHelperBridge = helperBridge; @@ -107,7 +107,7 @@ public class SetDomStorageEnabledTest extends XWalkViewTestBase { protected void doEnsureSettingHasValue(Boolean value) throws Throwable { // It is not permitted to access localStorage from data URLs in WebKit, // that is why a standalone page must be used. - loadUrlSyncByContent(mXWalkView, mHelperBridge, + loadUrlSyncByContent(mXWalkViewInternal, mHelperBridge, UrlUtils.getTestFileUrl("xwalkview/localStorage.html")); assertEquals( value == ENABLED ? HAS_LOCAL_STORAGE : NO_LOCAL_STORAGE, @@ -119,8 +119,8 @@ public class SetDomStorageEnabledTest extends XWalkViewTestBase { * Verifies the following statements about a setting: * - initially, the setting has a default value; * - the setting can be switched to an alternate value and back; - * - switching a setting in the first XWalkView doesn't affect the setting - * state in the second XWalkView and vice versa. + * - switching a setting in the first XWalkViewInternal doesn't affect the setting + * state in the second XWalkViewInternal and vice versa. * * @param helper0 Test helper for the first ContentView * @param helper1 Test helper for the second ContentView @@ -165,13 +165,13 @@ public class SetDomStorageEnabledTest extends XWalkViewTestBase { } @SmallTest - @Feature({"XWalkView", "Preferences"}) + @Feature({"XWalkViewInternal", "Preferences"}) public void testDomStorageEnabledWithTwoViews() throws Throwable { ViewPair views = createViews(); runPerViewSettingsTest( new XWalkViewSettingsDomStorageEnabledTestHelper( - views.getContent0(), views.getClient0()), + views.getView0(), views.getClient0()), new XWalkViewSettingsDomStorageEnabledTestHelper( - views.getContent1(), views.getClient1())); + views.getView1(), views.getClient1())); } } diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetNetworkAvailableTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetNetworkAvailableTest.java similarity index 90% rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetNetworkAvailableTest.java rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetNetworkAvailableTest.java index dc8d8ce..60320cd 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetNetworkAvailableTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetNetworkAvailableTest.java @@ -1,9 +1,9 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Copyright (c) 2013 Intel Corporation. All rights reserved. +// Copyright (c) 2013-2014 Intel Corporation. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.xwalk.core.xwview.test; +package org.xwalk.core.internal.xwview.test; import android.graphics.Bitmap; import android.test.suitebuilder.annotation.SmallTest; @@ -11,17 +11,17 @@ import android.util.Log; import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; -import org.xwalk.core.XWalkView; import org.xwalk.core.internal.XWalkClient; +import org.xwalk.core.internal.XWalkViewInternal; /** - * Test case for XWalkView.setNetworkAvailable method + * Test case for XWalkViewInternal.setNetworkAvailable method * * Once setNetworkAvailable is called, the navigator.onLine property will be * set, and window.ononline/onoffline event will be fired if the property is * changed. */ -public class SetNetworkAvailableTest extends XWalkViewTestBase { +public class SetNetworkAvailableTest extends XWalkViewInternalTestBase { @Override public void setUp() throws Exception { super.setUp(); @@ -34,7 +34,7 @@ public class SetNetworkAvailableTest extends XWalkViewTestBase { loadAssetFile("navigator.online.html"); String title = getTitleOnUiThread(); - final XWalkView xwView = getXWalkView(); + final XWalkViewInternal xwView = getXWalkView(); if ("true".equals(title)) { getInstrumentation().runOnMainSync(new Runnable() { diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/UserAgentTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java similarity index 93% rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/UserAgentTest.java rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java index 7b5a455..1368831 100644 --- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/UserAgentTest.java +++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java @@ -1,9 +1,9 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Copyright (c) 2013 Intel Corporation. All rights reserved. +// Copyright (c) 2013-2014 Intel Corporation. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.xwalk.core.xwview.test; +package org.xwalk.core.internal.xwview.test; import android.graphics.Bitmap; import android.content.Context; @@ -16,14 +16,14 @@ import org.apache.http.Header; import org.apache.http.HttpRequest; import org.chromium.base.test.util.Feature; import org.chromium.net.test.util.TestWebServer; -import org.xwalk.core.XWalkView; import org.xwalk.core.internal.XWalkClient; import org.xwalk.core.internal.XWalkSettings; +import org.xwalk.core.internal.XWalkViewInternal; /** * Test suite for setUserAgentString() and getUserAgentString(). */ -public class UserAgentTest extends XWalkViewTestBase { +public class UserAgentTest extends XWalkViewInternalTestBase { @Override public void setUp() throws Exception { super.setUp(); diff --git a/src/xwalk/xwalk_android_tests.gypi b/src/xwalk/xwalk_android_tests.gypi index b4a2e5a..1d71f59 100644 --- a/src/xwalk/xwalk_android_tests.gypi +++ b/src/xwalk/xwalk_android_tests.gypi @@ -115,7 +115,6 @@ '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/echoSync.html', '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/framesEcho.html', '<(PRODUCT_DIR)/xwalk_xwview_test/assets/index.html', - '<(PRODUCT_DIR)/xwalk_xwview_test/assets/navigator.online.html', '<(PRODUCT_DIR)/xwalk_xwview_test/assets/window.close.html', ], 'asset_location': '<(PRODUCT_DIR)/xwalk_xwview_test/assets', @@ -129,7 +128,6 @@ 'test/android/data/echoSync.html', 'test/android/data/framesEcho.html', 'test/android/data/index.html', - 'test/android/data/navigator.online.html', 'test/android/data/window.close.html', ], }, @@ -675,6 +673,7 @@ '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/framesEcho.html', '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/geolocation.html', '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/index.html', + '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/navigator.online.html', '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/notification.html', '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/renderHung.html', ], @@ -690,6 +689,7 @@ 'test/android/data/framesEcho.html', 'test/android/data/geolocation.html', 'test/android/data/index.html', + 'test/android/data/navigator.online.html', 'test/android/data/notification.html', 'test/android/data/renderHung.html', ], -- 2.7.4