| 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 &delegate_, process_host_, MSG_ROUTING_NONE, false); | 226 &delegate_, process_host_, MSG_ROUTING_NONE, false); |
| 227 parent_view_ = new RenderWidgetHostViewAura(parent_host_); | 227 parent_view_ = new RenderWidgetHostViewAura(parent_host_); |
| 228 parent_view_->InitAsChild(NULL); | 228 parent_view_->InitAsChild(NULL); |
| 229 aura::client::ParentWindowWithContext(parent_view_->GetNativeView(), | 229 aura::client::ParentWindowWithContext(parent_view_->GetNativeView(), |
| 230 aura_test_helper_->root_window(), | 230 aura_test_helper_->root_window(), |
| 231 gfx::Rect()); | 231 gfx::Rect()); |
| 232 | 232 |
| 233 widget_host_ = new RenderWidgetHostImpl( | 233 widget_host_ = new RenderWidgetHostImpl( |
| 234 &delegate_, process_host_, MSG_ROUTING_NONE, false); | 234 &delegate_, process_host_, MSG_ROUTING_NONE, false); |
| 235 widget_host_->Init(); | 235 widget_host_->Init(); |
| 236 widget_host_->OnMessageReceived( | |
| 237 ViewHostMsg_DidActivateAcceleratedCompositing(0, true)); | |
| 238 view_ = new FakeRenderWidgetHostViewAura(widget_host_); | 236 view_ = new FakeRenderWidgetHostViewAura(widget_host_); |
| 239 } | 237 } |
| 240 | 238 |
| 241 void TearDownEnvironment() { | 239 void TearDownEnvironment() { |
| 242 sink_ = NULL; | 240 sink_ = NULL; |
| 243 process_host_ = NULL; | 241 process_host_ = NULL; |
| 244 if (view_) | 242 if (view_) |
| 245 view_->Destroy(); | 243 view_->Destroy(); |
| 246 delete widget_host_; | 244 delete widget_host_; |
| 247 | 245 |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1086 scoped_ptr<RenderWidgetHostImpl * []> hosts( | 1084 scoped_ptr<RenderWidgetHostImpl * []> hosts( |
| 1087 new RenderWidgetHostImpl* [renderer_count]); | 1085 new RenderWidgetHostImpl* [renderer_count]); |
| 1088 scoped_ptr<FakeRenderWidgetHostViewAura * []> views( | 1086 scoped_ptr<FakeRenderWidgetHostViewAura * []> views( |
| 1089 new FakeRenderWidgetHostViewAura* [renderer_count]); | 1087 new FakeRenderWidgetHostViewAura* [renderer_count]); |
| 1090 | 1088 |
| 1091 // Create a bunch of renderers. | 1089 // Create a bunch of renderers. |
| 1092 for (size_t i = 0; i < renderer_count; ++i) { | 1090 for (size_t i = 0; i < renderer_count; ++i) { |
| 1093 hosts[i] = new RenderWidgetHostImpl( | 1091 hosts[i] = new RenderWidgetHostImpl( |
| 1094 &delegate_, process_host_, MSG_ROUTING_NONE, false); | 1092 &delegate_, process_host_, MSG_ROUTING_NONE, false); |
| 1095 hosts[i]->Init(); | 1093 hosts[i]->Init(); |
| 1096 hosts[i]->OnMessageReceived( | |
| 1097 ViewHostMsg_DidActivateAcceleratedCompositing(0, true)); | |
| 1098 views[i] = new FakeRenderWidgetHostViewAura(hosts[i]); | 1094 views[i] = new FakeRenderWidgetHostViewAura(hosts[i]); |
| 1099 views[i]->InitAsChild(NULL); | 1095 views[i]->InitAsChild(NULL); |
| 1100 aura::client::ParentWindowWithContext( | 1096 aura::client::ParentWindowWithContext( |
| 1101 views[i]->GetNativeView(), | 1097 views[i]->GetNativeView(), |
| 1102 parent_view_->GetNativeView()->GetRootWindow(), | 1098 parent_view_->GetNativeView()->GetRootWindow(), |
| 1103 gfx::Rect()); | 1099 gfx::Rect()); |
| 1104 views[i]->SetSize(view_rect.size()); | 1100 views[i]->SetSize(view_rect.size()); |
| 1105 } | 1101 } |
| 1106 | 1102 |
| 1107 // Make each renderer visible, and swap a frame on it, then make it invisible. | 1103 // Make each renderer visible, and swap a frame on it, then make it invisible. |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1215 scoped_ptr<RenderWidgetHostImpl * []> hosts( | 1211 scoped_ptr<RenderWidgetHostImpl * []> hosts( |
| 1216 new RenderWidgetHostImpl* [renderer_count]); | 1212 new RenderWidgetHostImpl* [renderer_count]); |
| 1217 scoped_ptr<FakeRenderWidgetHostViewAura * []> views( | 1213 scoped_ptr<FakeRenderWidgetHostViewAura * []> views( |
| 1218 new FakeRenderWidgetHostViewAura* [renderer_count]); | 1214 new FakeRenderWidgetHostViewAura* [renderer_count]); |
| 1219 | 1215 |
| 1220 // Create a bunch of renderers. | 1216 // Create a bunch of renderers. |
| 1221 for (size_t i = 0; i < renderer_count; ++i) { | 1217 for (size_t i = 0; i < renderer_count; ++i) { |
| 1222 hosts[i] = new RenderWidgetHostImpl( | 1218 hosts[i] = new RenderWidgetHostImpl( |
| 1223 &delegate_, process_host_, MSG_ROUTING_NONE, false); | 1219 &delegate_, process_host_, MSG_ROUTING_NONE, false); |
| 1224 hosts[i]->Init(); | 1220 hosts[i]->Init(); |
| 1225 hosts[i]->OnMessageReceived( | |
| 1226 ViewHostMsg_DidActivateAcceleratedCompositing(0, true)); | |
| 1227 views[i] = new FakeRenderWidgetHostViewAura(hosts[i]); | 1221 views[i] = new FakeRenderWidgetHostViewAura(hosts[i]); |
| 1228 views[i]->InitAsChild(NULL); | 1222 views[i]->InitAsChild(NULL); |
| 1229 aura::client::ParentWindowWithContext( | 1223 aura::client::ParentWindowWithContext( |
| 1230 views[i]->GetNativeView(), | 1224 views[i]->GetNativeView(), |
| 1231 parent_view_->GetNativeView()->GetRootWindow(), | 1225 parent_view_->GetNativeView()->GetRootWindow(), |
| 1232 gfx::Rect()); | 1226 gfx::Rect()); |
| 1233 views[i]->SetSize(view_rect.size()); | 1227 views[i]->SetSize(view_rect.size()); |
| 1234 } | 1228 } |
| 1235 | 1229 |
| 1236 // Make each renderer visible and swap a frame on it. No eviction should | 1230 // Make each renderer visible and swap a frame on it. No eviction should |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1420 const IPC::Message *message = sink_->GetFirstMessageMatching( | 1414 const IPC::Message *message = sink_->GetFirstMessageMatching( |
| 1421 ViewMsg_Resize::ID); | 1415 ViewMsg_Resize::ID); |
| 1422 ASSERT_TRUE(message != NULL); | 1416 ASSERT_TRUE(message != NULL); |
| 1423 | 1417 |
| 1424 ViewMsg_Resize::Param params; | 1418 ViewMsg_Resize::Param params; |
| 1425 ViewMsg_Resize::Read(message, ¶ms); | 1419 ViewMsg_Resize::Read(message, ¶ms); |
| 1426 EXPECT_EQ(60, params.a.visible_viewport_size.height()); | 1420 EXPECT_EQ(60, params.a.visible_viewport_size.height()); |
| 1427 } | 1421 } |
| 1428 | 1422 |
| 1429 } // namespace content | 1423 } // namespace content |
| OLD | NEW |