OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 | 527 |
528 void CCLayerTreeHostTest::doBeginTest() | 528 void CCLayerTreeHostTest::doBeginTest() |
529 { | 529 { |
530 ASSERT(isMainThread()); | 530 ASSERT(isMainThread()); |
531 m_client = MockLayerTreeHostClient::create(this); | 531 m_client = MockLayerTreeHostClient::create(this); |
532 | 532 |
533 RefPtr<LayerChromium> rootLayer = LayerChromium::create(); | 533 RefPtr<LayerChromium> rootLayer = LayerChromium::create(); |
534 m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer,
m_settings); | 534 m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer,
m_settings); |
535 ASSERT_TRUE(m_layerTreeHost); | 535 ASSERT_TRUE(m_layerTreeHost); |
536 rootLayer->setLayerTreeHost(m_layerTreeHost.get()); | 536 rootLayer->setLayerTreeHost(m_layerTreeHost.get()); |
| 537 m_layerTreeHost->setSurfaceReady(); |
537 | 538 |
538 m_beginning = true; | 539 m_beginning = true; |
539 beginTest(); | 540 beginTest(); |
540 m_beginning = false; | 541 m_beginning = false; |
541 if (m_endWhenBeginReturns) | 542 if (m_endWhenBeginReturns) |
542 onEndTest(static_cast<void*>(this)); | 543 onEndTest(static_cast<void*>(this)); |
543 } | 544 } |
544 | 545 |
545 void CCLayerTreeHostTest::endTest() | 546 void CCLayerTreeHostTest::endTest() |
546 { | 547 { |
(...skipping 1730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2277 private: | 2278 private: |
2278 FloatSize m_scrollAmount; | 2279 FloatSize m_scrollAmount; |
2279 }; | 2280 }; |
2280 | 2281 |
2281 TEST_F(CCLayerTreeHostTestFractionalScroll, runMultiThread) | 2282 TEST_F(CCLayerTreeHostTestFractionalScroll, runMultiThread) |
2282 { | 2283 { |
2283 runTestThreaded(); | 2284 runTestThreaded(); |
2284 } | 2285 } |
2285 | 2286 |
2286 } // namespace | 2287 } // namespace |
OLD | NEW |