| 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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 void RenderWidgetHostViewAura::Show() { | 524 void RenderWidgetHostViewAura::Show() { |
| 525 window_->Show(); | 525 window_->Show(); |
| 526 | 526 |
| 527 if (!host_->is_hidden()) | 527 if (!host_->is_hidden()) |
| 528 return; | 528 return; |
| 529 | 529 |
| 530 bool has_saved_frame = | 530 bool has_saved_frame = |
| 531 delegated_frame_host_ ? delegated_frame_host_->HasSavedFrame() : false; | 531 delegated_frame_host_ ? delegated_frame_host_->HasSavedFrame() : false; |
| 532 ui::LatencyInfo renderer_latency_info, browser_latency_info; | 532 ui::LatencyInfo renderer_latency_info, browser_latency_info; |
| 533 if (has_saved_frame) { | 533 if (has_saved_frame) { |
| 534 browser_latency_info.AddLatencyNumber( | 534 browser_latency_info.AddLatencyNumber(ui::TAB_SHOW_COMPONENT, |
| 535 ui::TAB_SHOW_COMPONENT, host_->GetLatencyComponentId(), 0); | 535 host_->GetLatencyComponentId()); |
| 536 } else { | 536 } else { |
| 537 renderer_latency_info.AddLatencyNumber( | 537 renderer_latency_info.AddLatencyNumber(ui::TAB_SHOW_COMPONENT, |
| 538 ui::TAB_SHOW_COMPONENT, host_->GetLatencyComponentId(), 0); | 538 host_->GetLatencyComponentId()); |
| 539 } | 539 } |
| 540 host_->WasShown(renderer_latency_info); | 540 host_->WasShown(renderer_latency_info); |
| 541 | 541 |
| 542 aura::Window* root = window_->GetRootWindow(); | 542 aura::Window* root = window_->GetRootWindow(); |
| 543 if (root) { | 543 if (root) { |
| 544 aura::client::CursorClient* cursor_client = | 544 aura::client::CursorClient* cursor_client = |
| 545 aura::client::GetCursorClient(root); | 545 aura::client::GetCursorClient(root); |
| 546 if (cursor_client) | 546 if (cursor_client) |
| 547 NotifyRendererOfCursorVisibilityState(cursor_client->IsCursorVisible()); | 547 NotifyRendererOfCursorVisibilityState(cursor_client->IsCursorVisible()); |
| 548 } | 548 } |
| (...skipping 1880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2429 } | 2429 } |
| 2430 | 2430 |
| 2431 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2431 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
| 2432 if (!delegated_frame_host_) | 2432 if (!delegated_frame_host_) |
| 2433 return; | 2433 return; |
| 2434 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2434 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
| 2435 needs_flush_input_); | 2435 needs_flush_input_); |
| 2436 } | 2436 } |
| 2437 | 2437 |
| 2438 } // namespace content | 2438 } // namespace content |
| OLD | NEW |