diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 01:20:52 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 01:20:52 +0000 |
| commit | cb89c95b2a6d49b3d3261f86afb7c7ccdfd758fd (patch) | |
| tree | 5cb3452f812d788e1c5f88db84f82f23f72f98ff /cc/test/layer_tree_test_common.cc | |
| parent | 0a5e1b5a340a83c9559b5ea0ebc6171c272cac30 (diff) | |
| download | chromium_src-cb89c95b2a6d49b3d3261f86afb7c7ccdfd758fd.zip chromium_src-cb89c95b2a6d49b3d3261f86afb7c7ccdfd758fd.tar.gz chromium_src-cb89c95b2a6d49b3d3261f86afb7c7ccdfd758fd.tar.bz2 | |
Try deflake tests, and re-enable a was-flaky test.
BUG=164309
R=jamesr
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11450014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_test_common.cc')
| -rw-r--r-- | cc/test/layer_tree_test_common.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index ab8d901..35bdab7 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -338,11 +338,6 @@ void ThreadedTest::postSetNeedsRedrawToMainThread() m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetNeedsRedraw, base::Unretained(this))); } -void ThreadedTest::postSetNeedsAnimateAndCommitToMainThread() -{ - m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetNeedsAnimateAndCommit, base::Unretained(this))); -} - void ThreadedTest::postSetVisibleToMainThread(bool visible) { m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetVisible, base::Unretained(this), visible)); @@ -431,19 +426,6 @@ void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation) addOpacityTransitionToLayer(*layerToReceiveAnimation, 10, 0, 0.5, true); } -void ThreadedTest::dispatchSetNeedsAnimateAndCommit() -{ - DCHECK(!proxy() || proxy()->isMainThread()); - - if (m_finished) - return; - - if (m_layerTreeHost.get()) { - m_layerTreeHost->setNeedsAnimate(); - m_layerTreeHost->setNeedsCommit(); - } -} - void ThreadedTest::dispatchSetNeedsCommit() { DCHECK(!proxy() || proxy()->isMainThread()); |