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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java

Issue 435833002: Navigation transitions: Plumb data from the outgoing renderer to the incoming renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Testfix Created 6 years, 4 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 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 28 matching lines...) Expand all
39 private ContentViewCore mContentViewCore; 39 private ContentViewCore mContentViewCore;
40 private String mTransitionEnteringColor; 40 private String mTransitionEnteringColor;
41 41
42 TestNavigationTransitionDelegate(ContentViewCore contentViewCore, boolea n handleDefer) { 42 TestNavigationTransitionDelegate(ContentViewCore contentViewCore, boolea n handleDefer) {
43 mContentViewCore = contentViewCore; 43 mContentViewCore = contentViewCore;
44 mHandleDefer = handleDefer; 44 mHandleDefer = handleDefer;
45 mTransitionStylesheets = new ArrayList<String>(); 45 mTransitionStylesheets = new ArrayList<String>();
46 } 46 }
47 47
48 @Override 48 @Override
49 public void didDeferAfterResponseStarted(String enteringColor) { 49 public void didDeferAfterResponseStarted(String markup, String cssSelect or,
50 String enteringColor) {
50 mDidCallDefer = true; 51 mDidCallDefer = true;
51 mContentViewCore.resumeResponseDeferredAtStart(); 52 mContentViewCore.resumeResponseDeferredAtStart();
52 mTransitionEnteringColor = enteringColor; 53 mTransitionEnteringColor = enteringColor;
53 } 54 }
54 55
55 @Override 56 @Override
56 public boolean willHandleDeferAfterResponseStarted() { 57 public boolean willHandleDeferAfterResponseStarted() {
57 return mHandleDefer; 58 return mHandleDefer;
58 } 59 }
59 60
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 303
303 assertTrue("X-Transition-Entering-Color parsed correctly.", 304 assertTrue("X-Transition-Entering-Color parsed correctly.",
304 TextUtils.equals( 305 TextUtils.equals(
305 delegate.getTransitionEnteringColor(), 306 delegate.getTransitionEnteringColor(),
306 transitionEnteringColor)); 307 transitionEnteringColor));
307 } finally { 308 } finally {
308 if (webServer != null) webServer.shutdown(); 309 if (webServer != null) webServer.shutdown();
309 } 310 }
310 } 311 }
311 } 312 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698