| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 const cc::LocalSurfaceId& local_surface_id, | 402 const cc::LocalSurfaceId& local_surface_id, |
| 403 cc::CompositorFrame frame) { | 403 cc::CompositorFrame frame) { |
| 404 TRACE_EVENT0("content", | 404 TRACE_EVENT0("content", |
| 405 "RenderWidgetHostViewChildFrame::OnSwapCompositorFrame"); | 405 "RenderWidgetHostViewChildFrame::OnSwapCompositorFrame"); |
| 406 last_scroll_offset_ = frame.metadata.root_scroll_offset; | 406 last_scroll_offset_ = frame.metadata.root_scroll_offset; |
| 407 if (!frame_connector_) | 407 if (!frame_connector_) |
| 408 return; | 408 return; |
| 409 ProcessCompositorFrame(local_surface_id, std::move(frame)); | 409 ProcessCompositorFrame(local_surface_id, std::move(frame)); |
| 410 } | 410 } |
| 411 | 411 |
| 412 void RenderWidgetHostViewChildFrame::OnBeginFrameDidNotSwap( | 412 void RenderWidgetHostViewChildFrame::OnBeginFrameDidNotProduceFrame( |
| 413 const cc::BeginFrameAck& ack) { | 413 const cc::BeginFrameAck& ack) { |
| 414 support_->BeginFrameDidNotSwap(ack); | 414 support_->BeginFrameDidNotProduceFrame(ack); |
| 415 } | 415 } |
| 416 | 416 |
| 417 void RenderWidgetHostViewChildFrame::OnSurfaceChanged( | 417 void RenderWidgetHostViewChildFrame::OnSurfaceChanged( |
| 418 const cc::SurfaceInfo& surface_info) { | 418 const cc::SurfaceInfo& surface_info) { |
| 419 cc::SurfaceSequence sequence(frame_sink_id_, next_surface_sequence_++); | 419 cc::SurfaceSequence sequence(frame_sink_id_, next_surface_sequence_++); |
| 420 SendSurfaceInfoToEmbedderImpl(surface_info, sequence); | 420 SendSurfaceInfoToEmbedderImpl(surface_info, sequence); |
| 421 } | 421 } |
| 422 | 422 |
| 423 void RenderWidgetHostViewChildFrame::ProcessFrameSwappedCallbacks() { | 423 void RenderWidgetHostViewChildFrame::ProcessFrameSwappedCallbacks() { |
| 424 // We only use callbacks once, therefore we make a new list for registration | 424 // We only use callbacks once, therefore we make a new list for registration |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 frame_sink_id_); | 720 frame_sink_id_); |
| 721 } | 721 } |
| 722 support_.reset(); | 722 support_.reset(); |
| 723 } | 723 } |
| 724 | 724 |
| 725 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { | 725 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { |
| 726 return false; | 726 return false; |
| 727 } | 727 } |
| 728 | 728 |
| 729 } // namespace content | 729 } // namespace content |
| OLD | NEW |