| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stdint.h> | 5 #include <stdint.h> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/barrier_closure.h" | 8 #include "base/barrier_closure.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 *storage = media::VideoFrame::CreateBlackFrame(gfx::Size(100, 100)); | 269 *storage = media::VideoFrame::CreateBlackFrame(gfx::Size(100, 100)); |
| 270 *callback = callback_; | 270 *callback = callback_; |
| 271 callback_.Reset(); | 271 callback_.Reset(); |
| 272 return true; | 272 return true; |
| 273 } | 273 } |
| 274 | 274 |
| 275 private: | 275 private: |
| 276 DeliverFrameCallback callback_; | 276 DeliverFrameCallback callback_; |
| 277 }; | 277 }; |
| 278 | 278 |
| 279 // Disable tests for Android and IOS as these platforms have incomplete | 279 // Disable tests for Android as it has an incomplete implementation. |
| 280 // implementation. | 280 #if !defined(OS_ANDROID) |
| 281 #if !defined(OS_ANDROID) && !defined(OS_IOS) | |
| 282 | 281 |
| 283 // The CopyFromBackingStore() API should work on all platforms when compositing | 282 // The CopyFromBackingStore() API should work on all platforms when compositing |
| 284 // is enabled. | 283 // is enabled. |
| 285 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest, | 284 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest, |
| 286 CopyFromBackingStore) { | 285 CopyFromBackingStore) { |
| 287 RunBasicCopyFromBackingStoreTest(); | 286 RunBasicCopyFromBackingStoreTest(); |
| 288 } | 287 } |
| 289 | 288 |
| 290 // Tests that the callback passed to CopyFromBackingStore is always called, | 289 // Tests that the callback passed to CopyFromBackingStore is always called, |
| 291 // even when the RenderWidgetHost is deleting in the middle of an async copy. | 290 // even when the RenderWidgetHost is deleting in the middle of an async copy. |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 CompositingRenderWidgetHostViewBrowserTest, | 997 CompositingRenderWidgetHostViewBrowserTest, |
| 999 kTestCompositingModes); | 998 kTestCompositingModes); |
| 1000 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, | 999 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, |
| 1001 CompositingRenderWidgetHostViewBrowserTestTabCapture, | 1000 CompositingRenderWidgetHostViewBrowserTestTabCapture, |
| 1002 kTestCompositingModes); | 1001 kTestCompositingModes); |
| 1003 INSTANTIATE_TEST_CASE_P( | 1002 INSTANTIATE_TEST_CASE_P( |
| 1004 GLAndSoftwareCompositing, | 1003 GLAndSoftwareCompositing, |
| 1005 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI, | 1004 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI, |
| 1006 kTestCompositingModes); | 1005 kTestCompositingModes); |
| 1007 | 1006 |
| 1008 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 1007 #endif // !defined(OS_ANDROID) |
| 1009 | 1008 |
| 1010 } // namespace | 1009 } // namespace |
| 1011 } // namespace content | 1010 } // namespace content |
| OLD | NEW |