| 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 view_ = new FakeRenderWidgetHostViewAura(widget_host_, is_guest_view_hack_); | 405 view_ = new FakeRenderWidgetHostViewAura(widget_host_, is_guest_view_hack_); |
| 406 } | 406 } |
| 407 | 407 |
| 408 void TearDownEnvironment() { | 408 void TearDownEnvironment() { |
| 409 sink_ = NULL; | 409 sink_ = NULL; |
| 410 process_host_ = NULL; | 410 process_host_ = NULL; |
| 411 if (view_) | 411 if (view_) |
| 412 view_->Destroy(); | 412 view_->Destroy(); |
| 413 | 413 |
| 414 if (widget_host_uses_shutdown_to_destroy_) | 414 if (widget_host_uses_shutdown_to_destroy_) |
| 415 widget_host_->Shutdown(); | 415 widget_host_->ShutdownAndDestroyWidget(true); |
| 416 else | 416 else |
| 417 delete widget_host_; | 417 delete widget_host_; |
| 418 | 418 |
| 419 parent_view_->Destroy(); | 419 parent_view_->Destroy(); |
| 420 delete parent_host_; | 420 delete parent_host_; |
| 421 | 421 |
| 422 browser_context_.reset(); | 422 browser_context_.reset(); |
| 423 aura_test_helper_->TearDown(); | 423 aura_test_helper_->TearDown(); |
| 424 | 424 |
| 425 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); | 425 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); |
| (...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3603 ViewMsg_SetSurfaceIdNamespace::Read(msg, ¶ms); | 3603 ViewMsg_SetSurfaceIdNamespace::Read(msg, ¶ms); |
| 3604 view_->InitAsChild(NULL); | 3604 view_->InitAsChild(NULL); |
| 3605 view_->Show(); | 3605 view_->Show(); |
| 3606 view_->SetSize(size); | 3606 view_->SetSize(size); |
| 3607 view_->OnSwapCompositorFrame(0, | 3607 view_->OnSwapCompositorFrame(0, |
| 3608 MakeDelegatedFrame(1.f, size, gfx::Rect(size))); | 3608 MakeDelegatedFrame(1.f, size, gfx::Rect(size))); |
| 3609 EXPECT_EQ(view_->GetSurfaceIdNamespace(), base::get<0>(params)); | 3609 EXPECT_EQ(view_->GetSurfaceIdNamespace(), base::get<0>(params)); |
| 3610 } | 3610 } |
| 3611 | 3611 |
| 3612 } // namespace content | 3612 } // namespace content |
| OLD | NEW |