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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1566 ack.last_software_frame_id = software_frame_id; | 1566 ack.last_software_frame_id = software_frame_id; |
1567 RenderWidgetHostImpl::SendSwapCompositorFrameAck( | 1567 RenderWidgetHostImpl::SendSwapCompositorFrameAck( |
1568 host_->GetRoutingID(), output_surface_id, | 1568 host_->GetRoutingID(), output_surface_id, |
1569 host_->GetProcess()->GetID(), ack); | 1569 host_->GetProcess()->GetID(), ack); |
1570 } | 1570 } |
1571 | 1571 |
1572 void RenderWidgetHostViewAura::OnSwapCompositorFrame( | 1572 void RenderWidgetHostViewAura::OnSwapCompositorFrame( |
1573 uint32 output_surface_id, | 1573 uint32 output_surface_id, |
1574 scoped_ptr<cc::CompositorFrame> frame) { | 1574 scoped_ptr<cc::CompositorFrame> frame) { |
1575 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame"); | 1575 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame"); |
| 1576 RenderWidgetHostViewBase::OnSwapCompositorFrame(output_surface_id, frame); |
| 1577 |
1576 if (frame->delegated_frame_data) { | 1578 if (frame->delegated_frame_data) { |
1577 SwapDelegatedFrame(output_surface_id, | 1579 SwapDelegatedFrame(output_surface_id, |
1578 frame->delegated_frame_data.Pass(), | 1580 frame->delegated_frame_data.Pass(), |
1579 frame->metadata.device_scale_factor, | 1581 frame->metadata.device_scale_factor, |
1580 frame->metadata.latency_info); | 1582 frame->metadata.latency_info); |
1581 return; | 1583 return; |
1582 } | 1584 } |
1583 | 1585 |
1584 if (frame->software_frame_data) { | 1586 if (frame->software_frame_data) { |
1585 SwapSoftwareFrame(output_surface_id, | 1587 SwapSoftwareFrame(output_surface_id, |
(...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3258 RenderWidgetHost* widget) { | 3260 RenderWidgetHost* widget) { |
3259 return new RenderWidgetHostViewAura(widget); | 3261 return new RenderWidgetHostViewAura(widget); |
3260 } | 3262 } |
3261 | 3263 |
3262 // static | 3264 // static |
3263 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3265 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3264 GetScreenInfoForWindow(results, NULL); | 3266 GetScreenInfoForWindow(results, NULL); |
3265 } | 3267 } |
3266 | 3268 |
3267 } // namespace content | 3269 } // namespace content |
OLD | NEW |