Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Corrections after the WebKit patch Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview.test; 5 package org.chromium.android_webview.test;
6 6
7 import android.webkit.ConsoleMessage; 7 import android.webkit.ConsoleMessage;
8 import android.webkit.ValueCallback; 8 import android.webkit.ValueCallback;
9 9
10 import org.chromium.content.browser.test.util.CallbackHelper; 10 import org.chromium.content.browser.test.util.CallbackHelper;
11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage StartedHelper; 11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage StartedHelper;
12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper; 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper;
13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece ivedErrorHelper; 13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece ivedErrorHelper;
14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval uateJavaScriptResultHelper; 14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval uateJavaScriptResultHelper;
15 15
16 class TestAwContentsClient extends NullContentsClient { 16 class TestAwContentsClient extends NullContentsClient {
17 private String mUpdatedTitle; 17 private String mUpdatedTitle;
18 private OnPageStartedHelper mOnPageStartedHelper; 18 private OnPageStartedHelper mOnPageStartedHelper;
19 private OnPageFinishedHelper mOnPageFinishedHelper; 19 private OnPageFinishedHelper mOnPageFinishedHelper;
20 private OnReceivedErrorHelper mOnReceivedErrorHelper; 20 private OnReceivedErrorHelper mOnReceivedErrorHelper;
21 private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper; 21 private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
22 private AddMessageToConsoleHelper mAddMessageToConsoleHelper; 22 private AddMessageToConsoleHelper mAddMessageToConsoleHelper;
23 private OnScaleChangedHelper mOnScaleChangedHelper;
23 24
24 public TestAwContentsClient() { 25 public TestAwContentsClient() {
25 mOnPageStartedHelper = new OnPageStartedHelper(); 26 mOnPageStartedHelper = new OnPageStartedHelper();
26 mOnPageFinishedHelper = new OnPageFinishedHelper(); 27 mOnPageFinishedHelper = new OnPageFinishedHelper();
27 mOnReceivedErrorHelper = new OnReceivedErrorHelper(); 28 mOnReceivedErrorHelper = new OnReceivedErrorHelper();
28 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper (); 29 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper ();
29 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper(); 30 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
31 mOnScaleChangedHelper = new OnScaleChangedHelper();
30 } 32 }
31 33
32 public OnPageStartedHelper getOnPageStartedHelper() { 34 public OnPageStartedHelper getOnPageStartedHelper() {
33 return mOnPageStartedHelper; 35 return mOnPageStartedHelper;
34 } 36 }
35 37
36 public OnPageFinishedHelper getOnPageFinishedHelper() { 38 public OnPageFinishedHelper getOnPageFinishedHelper() {
37 return mOnPageFinishedHelper; 39 return mOnPageFinishedHelper;
38 } 40 }
39 41
40 public OnReceivedErrorHelper getOnReceivedErrorHelper() { 42 public OnReceivedErrorHelper getOnReceivedErrorHelper() {
41 return mOnReceivedErrorHelper; 43 return mOnReceivedErrorHelper;
42 } 44 }
43 45
44 public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper( ) { 46 public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper( ) {
45 return mOnEvaluateJavaScriptResultHelper; 47 return mOnEvaluateJavaScriptResultHelper;
46 } 48 }
47 49
48 public AddMessageToConsoleHelper getAddMessageToConsoleHelper() { 50 public AddMessageToConsoleHelper getAddMessageToConsoleHelper() {
49 return mAddMessageToConsoleHelper; 51 return mAddMessageToConsoleHelper;
50 } 52 }
51 53
54 public static class OnScaleChangedHelper extends CallbackHelper {
55 private final Object mLock = new Object();
56 private float mPreviousScale;
57 private float mCurrentScale;
58 public void notifyCalled(float oldScale, float newScale) {
59 synchronized(mLock) {
60 mPreviousScale = oldScale;
61 mCurrentScale = newScale;
62 }
63 super.notifyCalled();
64 }
65 public float getLastScaleRatio() {
66 assert getCallCount() > 0;
67 synchronized(mLock) {
68 return mCurrentScale / mPreviousScale;
69 }
70 }
71 }
72
73 public OnScaleChangedHelper getOnScaleChangedHelper() {
74 return mOnScaleChangedHelper;
75 }
76
52 @Override 77 @Override
53 public void onUpdateTitle(String title) { 78 public void onUpdateTitle(String title) {
54 mUpdatedTitle = title; 79 mUpdatedTitle = title;
55 } 80 }
56 81
57 public String getUpdatedTitle() { 82 public String getUpdatedTitle() {
58 return mUpdatedTitle; 83 return mUpdatedTitle;
59 } 84 }
60 85
61 @Override 86 @Override
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 String mLastAutoLoginRealm; 192 String mLastAutoLoginRealm;
168 String mLastAutoLoginAccount; 193 String mLastAutoLoginAccount;
169 String mLastAutoLoginArgs; 194 String mLastAutoLoginArgs;
170 195
171 @Override 196 @Override
172 public void onReceivedLoginRequest(String realm, String account, String args ) { 197 public void onReceivedLoginRequest(String realm, String account, String args ) {
173 mLastAutoLoginRealm = realm; 198 mLastAutoLoginRealm = realm;
174 mLastAutoLoginAccount = account; 199 mLastAutoLoginAccount = account;
175 mLastAutoLoginArgs = args; 200 mLastAutoLoginArgs = args;
176 } 201 }
202
203 @Override
204 public void onScaleChanged(float oldScale, float newScale) {
205 mOnScaleChangedHelper.notifyCalled(oldScale, newScale);
206 }
177 } 207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698