Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "cc/test/begin_frame_source_test.h" | 5 #include "cc/test/begin_frame_source_test.h" |
| 6 | 6 |
| 7 #include "cc/test/begin_frame_args_test.h" | 7 #include "cc/test/begin_frame_args_test.h" |
| 8 #include "testing/gmock/include/gmock/gmock.h" | 8 #include "testing/gmock/include/gmock/gmock.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 MockBeginFrameObserver::~MockBeginFrameObserver() {} | 28 MockBeginFrameObserver::~MockBeginFrameObserver() {} |
| 29 | 29 |
| 30 const BeginFrameArgs MockBeginFrameObserver::kDefaultBeginFrameArgs = | 30 const BeginFrameArgs MockBeginFrameObserver::kDefaultBeginFrameArgs = |
| 31 CreateBeginFrameArgsForTesting( | 31 CreateBeginFrameArgsForTesting( |
| 32 #ifdef NDEBUG | 32 #ifdef NDEBUG |
| 33 nullptr, | 33 nullptr, |
| 34 #else | 34 #else |
| 35 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 35 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 36 "MockBeginFrameObserver::kDefaultBeginFrameArgs"), | 36 "MockBeginFrameObserver::kDefaultBeginFrameArgs"), |
| 37 #endif | 37 #endif |
| 38 0, | |
| 39 BeginFrameArgs::kStartingFrameNumber, | |
|
brianderson
2016/12/15 22:10:33
Should this be "Invalid" since the rest of the val
Eric Seckler
2016/12/16 17:25:58
I added a DCHECK to the BeginFrameArgs constructor
brianderson
2016/12/16 17:53:38
This is okay as is then. Thanks for the explanatio
| |
| 38 -1, | 40 -1, |
| 39 -1, | 41 -1, |
| 40 -1); | 42 -1); |
| 41 | 43 |
| 42 } // namespace cc | 44 } // namespace cc |
| OLD | NEW |