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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
636 aura::client::GetScreenPositionClient(root); | 636 aura::client::GetScreenPositionClient(root); |
637 if (screen_position_client) { | 637 if (screen_position_client) { |
638 screen_position_client->ConvertPointFromScreen( | 638 screen_position_client->ConvertPointFromScreen( |
639 window_->parent(), &relative_origin); | 639 window_->parent(), &relative_origin); |
640 } | 640 } |
641 } | 641 } |
642 | 642 |
643 InternalSetBounds(gfx::Rect(relative_origin, rect.size())); | 643 InternalSetBounds(gfx::Rect(relative_origin, rect.size())); |
644 } | 644 } |
645 | 645 |
| 646 gfx::Vector2dF RenderWidgetHostViewAura::GetLastScrollOffset() const { |
| 647 return last_scroll_offset_; |
| 648 } |
| 649 |
646 gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const { | 650 gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const { |
647 return window_; | 651 return window_; |
648 } | 652 } |
649 | 653 |
650 gfx::NativeViewId RenderWidgetHostViewAura::GetNativeViewId() const { | 654 gfx::NativeViewId RenderWidgetHostViewAura::GetNativeViewId() const { |
651 #if defined(OS_WIN) | 655 #if defined(OS_WIN) |
652 aura::WindowTreeHost* host = window_->GetHost(); | 656 aura::WindowTreeHost* host = window_->GetHost(); |
653 if (host) | 657 if (host) |
654 return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); | 658 return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); |
655 #endif | 659 #endif |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped( | 1019 void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped( |
1016 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, | 1020 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, |
1017 int gpu_host_id) { | 1021 int gpu_host_id) { |
1018 // Oldschool composited mode is no longer supported. | 1022 // Oldschool composited mode is no longer supported. |
1019 } | 1023 } |
1020 | 1024 |
1021 void RenderWidgetHostViewAura::OnSwapCompositorFrame( | 1025 void RenderWidgetHostViewAura::OnSwapCompositorFrame( |
1022 uint32 output_surface_id, | 1026 uint32 output_surface_id, |
1023 scoped_ptr<cc::CompositorFrame> frame) { | 1027 scoped_ptr<cc::CompositorFrame> frame) { |
1024 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame"); | 1028 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame"); |
| 1029 |
| 1030 last_scroll_offset_ = frame->metadata.root_scroll_offset; |
1025 if (frame->delegated_frame_data) { | 1031 if (frame->delegated_frame_data) { |
1026 delegated_frame_host_->SwapDelegatedFrame( | 1032 delegated_frame_host_->SwapDelegatedFrame( |
1027 output_surface_id, | 1033 output_surface_id, |
1028 frame->delegated_frame_data.Pass(), | 1034 frame->delegated_frame_data.Pass(), |
1029 frame->metadata.device_scale_factor, | 1035 frame->metadata.device_scale_factor, |
1030 frame->metadata.latency_info); | 1036 frame->metadata.latency_info); |
1031 return; | 1037 return; |
1032 } | 1038 } |
1033 | 1039 |
1034 if (frame->software_frame_data) { | 1040 if (frame->software_frame_data) { |
(...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2488 | 2494 |
2489 //////////////////////////////////////////////////////////////////////////////// | 2495 //////////////////////////////////////////////////////////////////////////////// |
2490 // RenderWidgetHostViewBase, public: | 2496 // RenderWidgetHostViewBase, public: |
2491 | 2497 |
2492 // static | 2498 // static |
2493 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2499 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2494 GetScreenInfoForWindow(results, NULL); | 2500 GetScreenInfoForWindow(results, NULL); |
2495 } | 2501 } |
2496 | 2502 |
2497 } // namespace content | 2503 } // namespace content |
OLD | NEW |