| 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 <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 void RenderWidgetHostViewAura::Show() { | 523 void RenderWidgetHostViewAura::Show() { |
| 524 window_->Show(); | 524 window_->Show(); |
| 525 | 525 |
| 526 if (!host_->is_hidden()) | 526 if (!host_->is_hidden()) |
| 527 return; | 527 return; |
| 528 | 528 |
| 529 bool has_saved_frame = | 529 bool has_saved_frame = |
| 530 delegated_frame_host_ ? delegated_frame_host_->HasSavedFrame() : false; | 530 delegated_frame_host_ ? delegated_frame_host_->HasSavedFrame() : false; |
| 531 ui::LatencyInfo renderer_latency_info, browser_latency_info; | 531 ui::LatencyInfo renderer_latency_info, browser_latency_info; |
| 532 if (has_saved_frame) { | 532 if (has_saved_frame) { |
| 533 browser_latency_info.AddLatencyNumber( | 533 browser_latency_info.AddLatencyNumber(ui::TAB_SHOW_COMPONENT, |
| 534 ui::TAB_SHOW_COMPONENT, host_->GetLatencyComponentId(), 0); | 534 host_->GetLatencyComponentId()); |
| 535 } else { | 535 } else { |
| 536 renderer_latency_info.AddLatencyNumber( | 536 renderer_latency_info.AddLatencyNumber(ui::TAB_SHOW_COMPONENT, |
| 537 ui::TAB_SHOW_COMPONENT, host_->GetLatencyComponentId(), 0); | 537 host_->GetLatencyComponentId()); |
| 538 } | 538 } |
| 539 host_->WasShown(renderer_latency_info); | 539 host_->WasShown(renderer_latency_info); |
| 540 | 540 |
| 541 aura::Window* root = window_->GetRootWindow(); | 541 aura::Window* root = window_->GetRootWindow(); |
| 542 if (root) { | 542 if (root) { |
| 543 aura::client::CursorClient* cursor_client = | 543 aura::client::CursorClient* cursor_client = |
| 544 aura::client::GetCursorClient(root); | 544 aura::client::GetCursorClient(root); |
| 545 if (cursor_client) | 545 if (cursor_client) |
| 546 NotifyRendererOfCursorVisibilityState(cursor_client->IsCursorVisible()); | 546 NotifyRendererOfCursorVisibilityState(cursor_client->IsCursorVisible()); |
| 547 } | 547 } |
| (...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2421 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2421 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2422 } | 2422 } |
| 2423 | 2423 |
| 2424 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2424 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
| 2425 if (!delegated_frame_host_) | 2425 if (!delegated_frame_host_) |
| 2426 return; | 2426 return; |
| 2427 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_); | 2427 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_); |
| 2428 } | 2428 } |
| 2429 | 2429 |
| 2430 } // namespace content | 2430 } // namespace content |
| OLD | NEW |