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 2890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2901 gfx::Size desired_size = window_->bounds().size(); | 2901 gfx::Size desired_size = window_->bounds().size(); |
2902 return std::unique_ptr<ResizeLock>(new CompositorResizeLock( | 2902 return std::unique_ptr<ResizeLock>(new CompositorResizeLock( |
2903 window_->GetHost(), desired_size, defer_compositor_lock, | 2903 window_->GetHost(), desired_size, defer_compositor_lock, |
2904 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); | 2904 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); |
2905 } | 2905 } |
2906 | 2906 |
2907 void RenderWidgetHostViewAura::DelegatedFrameHostResizeLockWasReleased() { | 2907 void RenderWidgetHostViewAura::DelegatedFrameHostResizeLockWasReleased() { |
2908 host_->WasResized(); | 2908 host_->WasResized(); |
2909 } | 2909 } |
2910 | 2910 |
2911 void RenderWidgetHostViewAura::DelegatedFrameHostSendCompositorSwapAck( | |
2912 int output_surface_id, | |
2913 const cc::CompositorFrameAck& ack) { | |
2914 host_->Send(new ViewMsg_SwapCompositorFrameAck(host_->GetRoutingID(), | |
2915 output_surface_id, ack)); | |
2916 } | |
2917 | |
2918 void RenderWidgetHostViewAura::DelegatedFrameHostSendReclaimCompositorResources( | 2911 void RenderWidgetHostViewAura::DelegatedFrameHostSendReclaimCompositorResources( |
2919 int output_surface_id, | 2912 int output_surface_id, |
2920 const cc::CompositorFrameAck& ack) { | 2913 bool is_swap_ack, |
2921 host_->Send(new ViewMsg_ReclaimCompositorResources(host_->GetRoutingID(), | 2914 const cc::ReturnedResourceArray& resources) { |
2922 output_surface_id, ack)); | 2915 host_->Send(new ViewMsg_ReclaimCompositorResources( |
| 2916 host_->GetRoutingID(), output_surface_id, is_swap_ack, resources)); |
2923 } | 2917 } |
2924 | 2918 |
2925 void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() { | 2919 void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() { |
2926 host_->ScheduleComposite(); | 2920 host_->ScheduleComposite(); |
2927 } | 2921 } |
2928 | 2922 |
2929 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters( | 2923 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters( |
2930 const base::TimeTicks& timebase, | 2924 const base::TimeTicks& timebase, |
2931 const base::TimeDelta& interval) { | 2925 const base::TimeDelta& interval) { |
2932 host_->UpdateVSyncParameters(timebase, interval); | 2926 host_->UpdateVSyncParameters(timebase, interval); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3005 | 2999 |
3006 //////////////////////////////////////////////////////////////////////////////// | 3000 //////////////////////////////////////////////////////////////////////////////// |
3007 // RenderWidgetHostViewBase, public: | 3001 // RenderWidgetHostViewBase, public: |
3008 | 3002 |
3009 // static | 3003 // static |
3010 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3004 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
3011 GetScreenInfoForWindow(results, NULL); | 3005 GetScreenInfoForWindow(results, NULL); |
3012 } | 3006 } |
3013 | 3007 |
3014 } // namespace content | 3008 } // namespace content |
OLD | NEW |