summaryrefslogtreecommitdiffstats
path: root/chrome/android/shell
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 23:40:32 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 23:40:32 +0000
commitf22e4584788e38f3b4b8b03981ac308f83cb3fc0 (patch)
treed970d3b1ea42a4feaec5e5e50eb7ba71c5763ef5 /chrome/android/shell
parent6daa739b3beaed1686d73da9d55ec8e8d54b9d49 (diff)
downloadchromium_src-f22e4584788e38f3b4b8b03981ac308f83cb3fc0.zip
chromium_src-f22e4584788e38f3b4b8b03981ac308f83cb3fc0.tar.gz
chromium_src-f22e4584788e38f3b4b8b03981ac308f83cb3fc0.tar.bz2
Android: Consolidate and simplify VSync logic
This moves handling of VSync over to WindowAndroid. It can have one client to receive vsync signals for the main browser-side scheduling logic. It also forwards the vsync to the WindowAndroidObservers, i.e. RenderWidgetHostView where it's used for sending BeginFrame signals to the renderer. This prepares for consolidating the scheduling logic in a single place upstream. Which will then further allow us to use the cc scheduler (with SingleThreadProxy) and unblock the landing of https://codereview.chromium.org/134623005/. BUG=234173,363479 NOTRY=True Review URL: https://codereview.chromium.org/236193013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android/shell')
-rw-r--r--chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
index a7be42a..c133ec7 100644
--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
@@ -10,6 +10,7 @@ import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.ContentViewRenderView;
+import org.chromium.ui.base.WindowAndroid;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -95,14 +96,17 @@ public class ChromeShellUrlTest extends ChromeShellTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
+ WindowAndroid windowAndroid = new WindowAndroid(
+ getInstrumentation().getTargetContext().getApplicationContext());
ContentViewRenderView contentViewRenderView =
new ContentViewRenderView(getInstrumentation().getTargetContext(),
- activity.getWindowAndroid());
+ windowAndroid);
contentViewRenderView.setCurrentContentViewCore(
activity.getActiveContentViewCore());
}
});
} catch (Throwable e) {
+ e.printStackTrace();
fail("Could not create a ContentViewRenderView: " + e);
}
}