| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "media/base/test_data_util.h" | 9 #include "media/base/test_data_util.h" |
| 10 | 10 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, | 81 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, |
| 82 VerifyCanvasCapture2DFrames) { | 82 VerifyCanvasCapture2DFrames) { |
| 83 MakeTypicalCall("testCanvasCapture(draw2d);", kCanvasCaptureTestHtmlFile); | 83 MakeTypicalCall("testCanvasCapture(draw2d);", kCanvasCaptureTestHtmlFile); |
| 84 } | 84 } |
| 85 | 85 |
| 86 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, | 86 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, |
| 87 VerifyCanvasCaptureWebGLFrames) { | 87 VerifyCanvasCaptureWebGLFrames) { |
| 88 MakeTypicalCall("testCanvasCapture(drawWebGL);", kCanvasCaptureTestHtmlFile); | 88 MakeTypicalCall("testCanvasCapture(drawWebGL);", kCanvasCaptureTestHtmlFile); |
| 89 } | 89 } |
| 90 | 90 |
| 91 #if defined(OS_MACOSX) | 91 // This test causes GL related issues on Win and Mac: https://crbug.com/695452. |
| 92 // This test causes GL related issues in Mac: https://crbug.com/695452. | 92 IN_PROC_BROWSER_TEST_F( |
| 93 #define MAYBE_VerifyCanvasCaptureOffscreenCanvasCommitFrames \ | 93 WebRtcCaptureFromElementBrowserTest, |
| 94 DISABLED_VerifyCanvasCaptureOffscreenCanvasCommitFrames | 94 DISABLED_VerifyCanvasCaptureOffscreenCanvasCommitFrames) { |
| 95 #else | |
| 96 #define MAYBE_VerifyCanvasCaptureOffscreenCanvasCommitFrames \ | |
| 97 VerifyCanvasCaptureOffscreenCanvasCommitFrames | |
| 98 #endif | |
| 99 | |
| 100 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, | |
| 101 MAYBE_VerifyCanvasCaptureOffscreenCanvasCommitFrames) { | |
| 102 MakeTypicalCall("testCanvasCapture(drawOffscreenCanvasCommit);", | 95 MakeTypicalCall("testCanvasCapture(drawOffscreenCanvasCommit);", |
| 103 kCanvasCaptureTestHtmlFile); | 96 kCanvasCaptureTestHtmlFile); |
| 104 } | 97 } |
| 105 | 98 |
| 106 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, | 99 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, |
| 107 VerifyCanvasCaptureBitmapRendererFrames) { | 100 VerifyCanvasCaptureBitmapRendererFrames) { |
| 108 MakeTypicalCall("testCanvasCapture(drawBitmapRenderer);", | 101 MakeTypicalCall("testCanvasCapture(drawBitmapRenderer);", |
| 109 kCanvasCaptureTestHtmlFile); | 102 kCanvasCaptureTestHtmlFile); |
| 110 } | 103 } |
| 111 | 104 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 127 GetParam().has_video, | 120 GetParam().has_video, |
| 128 GetParam().has_audio, | 121 GetParam().has_audio, |
| 129 GetParam().use_audio_tag), | 122 GetParam().use_audio_tag), |
| 130 kVideoAudioHtmlFile); | 123 kVideoAudioHtmlFile); |
| 131 } | 124 } |
| 132 | 125 |
| 133 INSTANTIATE_TEST_CASE_P(, | 126 INSTANTIATE_TEST_CASE_P(, |
| 134 WebRtcCaptureFromElementBrowserTest, | 127 WebRtcCaptureFromElementBrowserTest, |
| 135 testing::ValuesIn(kFileAndTypeParameters)); | 128 testing::ValuesIn(kFileAndTypeParameters)); |
| 136 } // namespace content | 129 } // namespace content |
| OLD | NEW |