| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.content.browser; | 5 package org.chromium.content.browser; |
| 6 | 6 |
| 7 import android.test.suitebuilder.annotation.SmallTest; | 7 import android.test.suitebuilder.annotation.SmallTest; |
| 8 import android.text.TextUtils; | 8 import android.text.TextUtils; |
| 9 import android.util.Pair; | 9 import android.util.Pair; |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 return mHandleDefer; | 60 return mHandleDefer; |
| 61 } | 61 } |
| 62 | 62 |
| 63 @Override | 63 @Override |
| 64 public void addEnteringStylesheetToTransition(String stylesheet) { | 64 public void addEnteringStylesheetToTransition(String stylesheet) { |
| 65 mDidCallAddStylesheet = true; | 65 mDidCallAddStylesheet = true; |
| 66 mTransitionStylesheets.add(stylesheet); | 66 mTransitionStylesheets.add(stylesheet); |
| 67 } | 67 } |
| 68 | 68 |
| 69 @Override | 69 @Override |
| 70 public void didStartNavigationTransitionForFrame(long frameId) { | 70 public void didStartNavigationTransitionForFrame(long frameId, String cs
sSelector) { |
| 71 } |
| 72 |
| 73 @Override |
| 74 public void addNavigationTransitionElements( |
| 75 String name, int x, int y, int width, int height) { |
| 71 } | 76 } |
| 72 | 77 |
| 73 public boolean getDidCallDefer() { | 78 public boolean getDidCallDefer() { |
| 74 return mDidCallDefer; | 79 return mDidCallDefer; |
| 75 } | 80 } |
| 76 | 81 |
| 77 public boolean getDidCallWillHandlerDefer() { | 82 public boolean getDidCallWillHandlerDefer() { |
| 78 return mDidCallWillHandleDefer; | 83 return mDidCallWillHandleDefer; |
| 79 } | 84 } |
| 80 | 85 |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 | 334 |
| 330 assertTrue("X-Transition-Entering-Color parsed correctly.", | 335 assertTrue("X-Transition-Entering-Color parsed correctly.", |
| 331 TextUtils.equals( | 336 TextUtils.equals( |
| 332 delegate.getTransitionEnteringColor(), | 337 delegate.getTransitionEnteringColor(), |
| 333 transitionEnteringColor)); | 338 transitionEnteringColor)); |
| 334 } finally { | 339 } finally { |
| 335 webServer.shutdown(); | 340 webServer.shutdown(); |
| 336 } | 341 } |
| 337 } | 342 } |
| 338 } | 343 } |
| OLD | NEW |