diff options
author | Jonathan Dixon <joth@google.com> | 2012-02-28 18:45:06 +0000 |
---|---|---|
committer | Jonathan Dixon <joth@google.com> | 2012-03-02 11:17:47 +0000 |
commit | 3c90952036a5ff7ddb2946c643f1a0bf1c31d53a (patch) | |
tree | 974ef2a94c60a2c72b8fbd804613792480a9c3e5 /core/tests | |
parent | 0dc0da67d9775b2364a38d015e0610492708a02e (diff) | |
download | frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.zip frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.tar.gz frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.tar.bz2 |
Refactor WebView to be a thin proxy class
Splits interface and implementation; all client calls are forwarded
to an abstract WebViewProvider interface, and the existing implementation
moved into the WebViewClassic implementor of this interface.
Originally taken from a snapshot from the development branch, by:
git diff HEAD 9a4c328a54cc05e5 | git apply
- but then rebased to keep up to date with master
Interdepends on webkit and Browser changes:
https://android-git.corp.google.com/g/158979
https://android-git.corp.google.com/g/167911
Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
Diffstat (limited to 'core/tests')
-rw-r--r-- | core/tests/coretests/src/android/webkit/ZoomManagerTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/webkit/ZoomManagerTest.java b/core/tests/coretests/src/android/webkit/ZoomManagerTest.java index 1c9defe..7e0e0b2 100644 --- a/core/tests/coretests/src/android/webkit/ZoomManagerTest.java +++ b/core/tests/coretests/src/android/webkit/ZoomManagerTest.java @@ -24,8 +24,9 @@ public class ZoomManagerTest extends AndroidTestCase { @Override public void setUp() { WebView webView = new WebView(this.getContext()); - CallbackProxy callbackProxy = new CallbackProxy(this.getContext(), webView); - zoomManager = new ZoomManager(webView, callbackProxy); + WebViewClassic webViewClassic = WebViewClassic.fromWebView(webView); + CallbackProxy callbackProxy = new CallbackProxy(this.getContext(), webViewClassic); + zoomManager = new ZoomManager(webViewClassic, callbackProxy); zoomManager.init(1.00f); } |