Chromium Code Reviews| 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/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 578 } | 578 } |
| 579 | 579 |
| 580 delegated_frame_host_->WasShown(browser_latency_info); | 580 delegated_frame_host_->WasShown(browser_latency_info); |
| 581 | 581 |
| 582 #if defined(OS_WIN) | 582 #if defined(OS_WIN) |
| 583 if (legacy_render_widget_host_HWND_) { | 583 if (legacy_render_widget_host_HWND_) { |
| 584 // Reparent the legacy Chrome_RenderWidgetHostHWND window to the parent | 584 // Reparent the legacy Chrome_RenderWidgetHostHWND window to the parent |
| 585 // window before reparenting any plugins. This ensures that the plugin | 585 // window before reparenting any plugins. This ensures that the plugin |
| 586 // windows stay on top of the child Zorder in the parent and receive | 586 // windows stay on top of the child Zorder in the parent and receive |
| 587 // mouse events, etc. | 587 // mouse events, etc. |
| 588 legacy_render_widget_host_HWND_->UpdateParent( | 588 if (GetNativeView()->GetHost()) { |
|
sky
2014/09/22 14:57:36
If this isn't true, when does the parent get updat
ananta
2014/09/22 15:12:18
4On 2014/09/22 14:57:36, sky wrote:
| |
| 589 GetNativeView()->GetHost()->GetAcceleratedWidget()); | 589 legacy_render_widget_host_HWND_->UpdateParent( |
| 590 GetNativeView()->GetHost()->GetAcceleratedWidget()); | |
| 591 } | |
| 590 legacy_render_widget_host_HWND_->SetBounds( | 592 legacy_render_widget_host_HWND_->SetBounds( |
| 591 window_->GetBoundsInRootWindow()); | 593 window_->GetBoundsInRootWindow()); |
| 592 } | 594 } |
| 593 LPARAM lparam = reinterpret_cast<LPARAM>(this); | 595 LPARAM lparam = reinterpret_cast<LPARAM>(this); |
| 594 EnumChildWindows(ui::GetHiddenWindow(), ShowWindowsCallback, lparam); | 596 EnumChildWindows(ui::GetHiddenWindow(), ShowWindowsCallback, lparam); |
| 595 #endif | 597 #endif |
| 596 } | 598 } |
| 597 | 599 |
| 598 void RenderWidgetHostViewAura::WasHidden() { | 600 void RenderWidgetHostViewAura::WasHidden() { |
| 599 if (!host_ || host_->is_hidden()) | 601 if (!host_ || host_->is_hidden()) |
| (...skipping 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2503 | 2505 |
| 2504 //////////////////////////////////////////////////////////////////////////////// | 2506 //////////////////////////////////////////////////////////////////////////////// |
| 2505 // RenderWidgetHostViewBase, public: | 2507 // RenderWidgetHostViewBase, public: |
| 2506 | 2508 |
| 2507 // static | 2509 // static |
| 2508 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2510 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2509 GetScreenInfoForWindow(results, NULL); | 2511 GetScreenInfoForWindow(results, NULL); |
| 2510 } | 2512 } |
| 2511 | 2513 |
| 2512 } // namespace content | 2514 } // namespace content |
| OLD | NEW |