| OLD | NEW |
| 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 | 8 |
| 9 import org.chromium.content.browser.test.util.CallbackHelper; | 9 import org.chromium.content.browser.test.util.CallbackHelper; |
| 10 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
StartedHelper; | 10 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
StartedHelper; |
| 11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
FinishedHelper; | 11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
FinishedHelper; |
| 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece
ivedErrorHelper; | 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece
ivedErrorHelper; |
| 13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval
uateJavaScriptResultHelper; | 13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval
uateJavaScriptResultHelper; |
| 14 | 14 |
| 15 class TestAwContentsClient extends NullContentsClient { | 15 class TestAwContentsClient extends NullContentsClient { |
| 16 private String mUpdatedTitle; | 16 private String mUpdatedTitle; |
| 17 private OnPageStartedHelper mOnPageStartedHelper; | 17 private OnPageStartedHelper mOnPageStartedHelper; |
| 18 private OnPageFinishedHelper mOnPageFinishedHelper; | 18 private OnPageFinishedHelper mOnPageFinishedHelper; |
| 19 private OnReceivedErrorHelper mOnReceivedErrorHelper; | 19 private OnReceivedErrorHelper mOnReceivedErrorHelper; |
| 20 private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper; | 20 private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper; |
| 21 private AddMessageToConsoleHelper mAddMessageToConsoleHelper; | 21 private AddMessageToConsoleHelper mAddMessageToConsoleHelper; |
| 22 private OnScaleChangedHelper mOnScaleChangedHelper; |
| 22 | 23 |
| 23 public TestAwContentsClient() { | 24 public TestAwContentsClient() { |
| 24 mOnPageStartedHelper = new OnPageStartedHelper(); | 25 mOnPageStartedHelper = new OnPageStartedHelper(); |
| 25 mOnPageFinishedHelper = new OnPageFinishedHelper(); | 26 mOnPageFinishedHelper = new OnPageFinishedHelper(); |
| 26 mOnReceivedErrorHelper = new OnReceivedErrorHelper(); | 27 mOnReceivedErrorHelper = new OnReceivedErrorHelper(); |
| 27 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper
(); | 28 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper
(); |
| 28 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper(); | 29 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper(); |
| 30 mOnScaleChangedHelper = new OnScaleChangedHelper(); |
| 29 } | 31 } |
| 30 | 32 |
| 31 public OnPageStartedHelper getOnPageStartedHelper() { | 33 public OnPageStartedHelper getOnPageStartedHelper() { |
| 32 return mOnPageStartedHelper; | 34 return mOnPageStartedHelper; |
| 33 } | 35 } |
| 34 | 36 |
| 35 public OnPageFinishedHelper getOnPageFinishedHelper() { | 37 public OnPageFinishedHelper getOnPageFinishedHelper() { |
| 36 return mOnPageFinishedHelper; | 38 return mOnPageFinishedHelper; |
| 37 } | 39 } |
| 38 | 40 |
| 39 public OnReceivedErrorHelper getOnReceivedErrorHelper() { | 41 public OnReceivedErrorHelper getOnReceivedErrorHelper() { |
| 40 return mOnReceivedErrorHelper; | 42 return mOnReceivedErrorHelper; |
| 41 } | 43 } |
| 42 | 44 |
| 43 public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper(
) { | 45 public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper(
) { |
| 44 return mOnEvaluateJavaScriptResultHelper; | 46 return mOnEvaluateJavaScriptResultHelper; |
| 45 } | 47 } |
| 46 | 48 |
| 47 public AddMessageToConsoleHelper getAddMessageToConsoleHelper() { | 49 public AddMessageToConsoleHelper getAddMessageToConsoleHelper() { |
| 48 return mAddMessageToConsoleHelper; | 50 return mAddMessageToConsoleHelper; |
| 49 } | 51 } |
| 50 | 52 |
| 53 public static class OnScaleChangedHelper extends CallbackHelper { |
| 54 private float mPreviousScale; |
| 55 private float mCurrentScale; |
| 56 public void notifyCalled(float oldScale, float newScale) { |
| 57 mPreviousScale = oldScale; |
| 58 mCurrentScale = newScale; |
| 59 super.notifyCalled(); |
| 60 } |
| 61 public float getLastScaleRatio() { |
| 62 assert getCallCount() > 0; |
| 63 return mCurrentScale / mPreviousScale; |
| 64 } |
| 65 } |
| 66 |
| 67 public OnScaleChangedHelper getOnScaleChangedHelper() { |
| 68 return mOnScaleChangedHelper; |
| 69 } |
| 70 |
| 51 @Override | 71 @Override |
| 52 public void onUpdateTitle(String title) { | 72 public void onUpdateTitle(String title) { |
| 53 mUpdatedTitle = title; | 73 mUpdatedTitle = title; |
| 54 } | 74 } |
| 55 | 75 |
| 56 public String getUpdatedTitle() { | 76 public String getUpdatedTitle() { |
| 57 return mUpdatedTitle; | 77 return mUpdatedTitle; |
| 58 } | 78 } |
| 59 | 79 |
| 60 @Override | 80 @Override |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 126 } |
| 107 | 127 |
| 108 void notifyCalled(int level, String message, int lineNumer, String sourc
eId) { | 128 void notifyCalled(int level, String message, int lineNumer, String sourc
eId) { |
| 109 mLevel = level; | 129 mLevel = level; |
| 110 mMessage = message; | 130 mMessage = message; |
| 111 mLineNumber = lineNumer; | 131 mLineNumber = lineNumer; |
| 112 mSourceId = sourceId; | 132 mSourceId = sourceId; |
| 113 notifyCalled(); | 133 notifyCalled(); |
| 114 } | 134 } |
| 115 } | 135 } |
| 136 |
| 137 @Override |
| 138 public void onScaleChanged(float oldScale, float newScale) { |
| 139 mOnScaleChangedHelper.notifyCalled(oldScale, newScale); |
| 140 } |
| 116 } | 141 } |
| OLD | NEW |