Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

Issue 2746973005: Reenable WebRtcCaptureFromElementBrowserTest.VerifyCanvasCaptureOffscreenCanvasCommitFrames (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/test/data/media/canvas_capture.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // This test causes GL related issues on Win and Mac: https://crbug.com/695452. 91 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
92 IN_PROC_BROWSER_TEST_F( 92 VerifyCanvasCaptureOffscreenCanvasCommitFrames) {
93 WebRtcCaptureFromElementBrowserTest,
94 DISABLED_VerifyCanvasCaptureOffscreenCanvasCommitFrames) {
95 MakeTypicalCall("testCanvasCapture(drawOffscreenCanvasCommit);", 93 MakeTypicalCall("testCanvasCapture(drawOffscreenCanvasCommit);",
96 kCanvasCaptureTestHtmlFile); 94 kCanvasCaptureTestHtmlFile);
97 } 95 }
98 96
99 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, 97 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
100 VerifyCanvasCaptureBitmapRendererFrames) { 98 VerifyCanvasCaptureBitmapRendererFrames) {
101 MakeTypicalCall("testCanvasCapture(drawBitmapRenderer);", 99 MakeTypicalCall("testCanvasCapture(drawBitmapRenderer);",
102 kCanvasCaptureTestHtmlFile); 100 kCanvasCaptureTestHtmlFile);
103 } 101 }
104 102
(...skipping 15 matching lines...) Expand all
120 GetParam().has_video, 118 GetParam().has_video,
121 GetParam().has_audio, 119 GetParam().has_audio,
122 GetParam().use_audio_tag), 120 GetParam().use_audio_tag),
123 kVideoAudioHtmlFile); 121 kVideoAudioHtmlFile);
124 } 122 }
125 123
126 INSTANTIATE_TEST_CASE_P(, 124 INSTANTIATE_TEST_CASE_P(,
127 WebRtcCaptureFromElementBrowserTest, 125 WebRtcCaptureFromElementBrowserTest,
128 testing::ValuesIn(kFileAndTypeParameters)); 126 testing::ValuesIn(kFileAndTypeParameters));
129 } // namespace content 127 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/media/canvas_capture.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698