| 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.graphics.Picture; |
| 7 import android.webkit.ConsoleMessage; | 8 import android.webkit.ConsoleMessage; |
| 8 | 9 |
| 9 import org.chromium.content.browser.test.util.CallbackHelper; | 10 import org.chromium.content.browser.test.util.CallbackHelper; |
| 10 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval
uateJavaScriptResultHelper; | 11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEval
uateJavaScriptResultHelper; |
| 11 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
FinishedHelper; | 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
FinishedHelper; |
| 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
StartedHelper; | 13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage
StartedHelper; |
| 13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece
ivedErrorHelper; | 14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece
ivedErrorHelper; |
| 14 | 15 |
| 15 class TestAwContentsClient extends NullContentsClient { | 16 class TestAwContentsClient extends NullContentsClient { |
| 16 private String mUpdatedTitle; | 17 private String mUpdatedTitle; |
| 17 private final OnPageStartedHelper mOnPageStartedHelper; | 18 private final OnPageStartedHelper mOnPageStartedHelper; |
| 18 private final OnPageFinishedHelper mOnPageFinishedHelper; | 19 private final OnPageFinishedHelper mOnPageFinishedHelper; |
| 19 private final OnReceivedErrorHelper mOnReceivedErrorHelper; | 20 private final OnReceivedErrorHelper mOnReceivedErrorHelper; |
| 20 private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHe
lper; | 21 private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHe
lper; |
| 21 private final AddMessageToConsoleHelper mAddMessageToConsoleHelper; | 22 private final AddMessageToConsoleHelper mAddMessageToConsoleHelper; |
| 22 private final OnScaleChangedHelper mOnScaleChangedHelper; | 23 private final OnScaleChangedHelper mOnScaleChangedHelper; |
| 24 private final PictureListenerHelper mPictureListenerHelper; |
| 23 | 25 |
| 24 public TestAwContentsClient() { | 26 public TestAwContentsClient() { |
| 25 mOnPageStartedHelper = new OnPageStartedHelper(); | 27 mOnPageStartedHelper = new OnPageStartedHelper(); |
| 26 mOnPageFinishedHelper = new OnPageFinishedHelper(); | 28 mOnPageFinishedHelper = new OnPageFinishedHelper(); |
| 27 mOnReceivedErrorHelper = new OnReceivedErrorHelper(); | 29 mOnReceivedErrorHelper = new OnReceivedErrorHelper(); |
| 28 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper
(); | 30 mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper
(); |
| 29 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper(); | 31 mAddMessageToConsoleHelper = new AddMessageToConsoleHelper(); |
| 30 mOnScaleChangedHelper = new OnScaleChangedHelper(); | 32 mOnScaleChangedHelper = new OnScaleChangedHelper(); |
| 33 mPictureListenerHelper = new PictureListenerHelper(); |
| 31 } | 34 } |
| 32 | 35 |
| 33 public OnPageStartedHelper getOnPageStartedHelper() { | 36 public OnPageStartedHelper getOnPageStartedHelper() { |
| 34 return mOnPageStartedHelper; | 37 return mOnPageStartedHelper; |
| 35 } | 38 } |
| 36 | 39 |
| 37 public OnPageFinishedHelper getOnPageFinishedHelper() { | 40 public OnPageFinishedHelper getOnPageFinishedHelper() { |
| 38 return mOnPageFinishedHelper; | 41 return mOnPageFinishedHelper; |
| 39 } | 42 } |
| 40 | 43 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 61 public float getLastScaleRatio() { | 64 public float getLastScaleRatio() { |
| 62 assert getCallCount() > 0; | 65 assert getCallCount() > 0; |
| 63 return mCurrentScale / mPreviousScale; | 66 return mCurrentScale / mPreviousScale; |
| 64 } | 67 } |
| 65 } | 68 } |
| 66 | 69 |
| 67 public OnScaleChangedHelper getOnScaleChangedHelper() { | 70 public OnScaleChangedHelper getOnScaleChangedHelper() { |
| 68 return mOnScaleChangedHelper; | 71 return mOnScaleChangedHelper; |
| 69 } | 72 } |
| 70 | 73 |
| 74 public PictureListenerHelper getPictureListenerHelper() { |
| 75 return mPictureListenerHelper; |
| 76 } |
| 77 |
| 71 @Override | 78 @Override |
| 72 public void onReceivedTitle(String title) { | 79 public void onReceivedTitle(String title) { |
| 73 mUpdatedTitle = title; | 80 mUpdatedTitle = title; |
| 74 } | 81 } |
| 75 | 82 |
| 76 public String getUpdatedTitle() { | 83 public String getUpdatedTitle() { |
| 77 return mUpdatedTitle; | 84 return mUpdatedTitle; |
| 78 } | 85 } |
| 79 | 86 |
| 80 @Override | 87 @Override |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 mLineNumber = lineNumer; | 138 mLineNumber = lineNumer; |
| 132 mSourceId = sourceId; | 139 mSourceId = sourceId; |
| 133 notifyCalled(); | 140 notifyCalled(); |
| 134 } | 141 } |
| 135 } | 142 } |
| 136 | 143 |
| 137 @Override | 144 @Override |
| 138 public void onScaleChangedScaled(float oldScale, float newScale) { | 145 public void onScaleChangedScaled(float oldScale, float newScale) { |
| 139 mOnScaleChangedHelper.notifyCalled(oldScale, newScale); | 146 mOnScaleChangedHelper.notifyCalled(oldScale, newScale); |
| 140 } | 147 } |
| 148 |
| 149 public static class PictureListenerHelper extends CallbackHelper { |
| 150 // Generally null, depending on |invalidationOnly| in enableOnNewPicture
() |
| 151 private Picture mPicture; |
| 152 |
| 153 void notifyCalled(Picture picture) { |
| 154 mPicture = picture; |
| 155 notifyCalled(); |
| 156 } |
| 157 } |
| 158 |
| 159 @Override |
| 160 public void onNewPicture(Picture picture) { |
| 161 mPictureListenerHelper.notifyCalled(picture); |
| 162 } |
| 141 } | 163 } |
| OLD | NEW |