| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/shared_memory.h" | 9 #include "base/memory/shared_memory.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); | 1152 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); |
| 1153 | 1153 |
| 1154 scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); | 1154 scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
| 1155 pass->SetNew( | 1155 pass->SetNew( |
| 1156 cc::RenderPass::Id(1, 1), gfx::Rect(size), damage, gfx::Transform()); | 1156 cc::RenderPass::Id(1, 1), gfx::Rect(size), damage, gfx::Transform()); |
| 1157 frame->delegated_frame_data->render_pass_list.push_back(pass.Pass()); | 1157 frame->delegated_frame_data->render_pass_list.push_back(pass.Pass()); |
| 1158 return frame.Pass(); | 1158 return frame.Pass(); |
| 1159 } | 1159 } |
| 1160 | 1160 |
| 1161 // Resizing in fullscreen mode should send the up-to-date screen info. | 1161 // Resizing in fullscreen mode should send the up-to-date screen info. |
| 1162 TEST_F(RenderWidgetHostViewAuraTest, FullscreenResize) { | 1162 // http://crbug.com/324350 |
| 1163 TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) { |
| 1163 aura::Window* root_window = aura_test_helper_->root_window(); | 1164 aura::Window* root_window = aura_test_helper_->root_window(); |
| 1164 root_window->SetLayoutManager(new FullscreenLayoutManager(root_window)); | 1165 root_window->SetLayoutManager(new FullscreenLayoutManager(root_window)); |
| 1165 view_->InitAsFullscreen(parent_view_); | 1166 view_->InitAsFullscreen(parent_view_); |
| 1166 view_->WasShown(); | 1167 view_->WasShown(); |
| 1167 widget_host_->ResetSizeAndRepaintPendingFlags(); | 1168 widget_host_->ResetSizeAndRepaintPendingFlags(); |
| 1168 sink_->ClearMessages(); | 1169 sink_->ClearMessages(); |
| 1169 | 1170 |
| 1170 // Call WasResized to flush the old screen info. | 1171 // Call WasResized to flush the old screen info. |
| 1171 view_->GetRenderWidgetHost()->WasResized(); | 1172 view_->GetRenderWidgetHost()->WasResized(); |
| 1172 { | 1173 { |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2717 EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->completed_mode()); | 2718 EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->completed_mode()); |
| 2718 | 2719 |
| 2719 SimulateGestureEvent(WebInputEvent::GestureScrollEnd, | 2720 SimulateGestureEvent(WebInputEvent::GestureScrollEnd, |
| 2720 blink::WebGestureDeviceTouchscreen); | 2721 blink::WebGestureDeviceTouchscreen); |
| 2721 EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode()); | 2722 EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode()); |
| 2722 EXPECT_EQ(OVERSCROLL_EAST, overscroll_delegate()->completed_mode()); | 2723 EXPECT_EQ(OVERSCROLL_EAST, overscroll_delegate()->completed_mode()); |
| 2723 EXPECT_EQ(3U, sink_->message_count()); | 2724 EXPECT_EQ(3U, sink_->message_count()); |
| 2724 } | 2725 } |
| 2725 | 2726 |
| 2726 } // namespace content | 2727 } // namespace content |
| OLD | NEW |