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

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

Issue 2720993002: Disable RenderWidgetHostViewChildFrameTest.SwapCompositorFrame on Windows. (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
index d920818fb31ecce2044013b9efc34a2c894ad00a..ea75cfde1d2cbf15f9cbdcfad737442670f64e9c 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
@@ -158,9 +158,16 @@ TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) {
ASSERT_FALSE(view_->IsShowing());
}
+// http://crbug.com/696919
+#if defined(OS_WIN)
+#define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame
+#else
+#define MAYBE_SwapCompositorFrame SwapCompositorFrame
+#endif
+
// Verify that OnSwapCompositorFrame behavior is correct when a delegated
// frame is received from a renderer process.
-TEST_F(RenderWidgetHostViewChildFrameTest, SwapCompositorFrame) {
+TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
gfx::Size view_size(100, 100);
gfx::Rect view_rect(view_size);
float scale_factor = 1.f;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698