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

Side by Side 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, 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/browser/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 151 }
152 152
153 TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) { 153 TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) {
154 view_->Show(); 154 view_->Show();
155 ASSERT_TRUE(view_->IsShowing()); 155 ASSERT_TRUE(view_->IsShowing());
156 156
157 view_->Hide(); 157 view_->Hide();
158 ASSERT_FALSE(view_->IsShowing()); 158 ASSERT_FALSE(view_->IsShowing());
159 } 159 }
160 160
161 // http://crbug.com/696919
162 #if defined(OS_WIN)
163 #define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame
164 #else
165 #define MAYBE_SwapCompositorFrame SwapCompositorFrame
166 #endif
167
161 // Verify that OnSwapCompositorFrame behavior is correct when a delegated 168 // Verify that OnSwapCompositorFrame behavior is correct when a delegated
162 // frame is received from a renderer process. 169 // frame is received from a renderer process.
163 TEST_F(RenderWidgetHostViewChildFrameTest, SwapCompositorFrame) { 170 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
164 gfx::Size view_size(100, 100); 171 gfx::Size view_size(100, 100);
165 gfx::Rect view_rect(view_size); 172 gfx::Rect view_rect(view_size);
166 float scale_factor = 1.f; 173 float scale_factor = 1.f;
167 174
168 view_->SetSize(view_size); 175 view_->SetSize(view_size);
169 view_->Show(); 176 view_->Show();
170 177
171 view_->OnSwapCompositorFrame( 178 view_->OnSwapCompositorFrame(
172 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); 179 0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
173 180
(...skipping 10 matching lines...) Expand all
184 #endif 191 #endif
185 192
186 // Surface ID should have been passed to CrossProcessFrameConnector to 193 // Surface ID should have been passed to CrossProcessFrameConnector to
187 // be sent to the embedding renderer. 194 // be sent to the embedding renderer.
188 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size), 195 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
189 test_frame_connector_->last_surface_info_); 196 test_frame_connector_->last_surface_info_);
190 } 197 }
191 } 198 }
192 199
193 } // namespace content 200 } // namespace content
OLDNEW
« 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