Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 2720803002: Pass returned resources to DidReceiveCompositorFrameAck (Closed)
Patch Set: c Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // always forwarded and handled according to current scroll state in the 340 // always forwarded and handled according to current scroll state in the
341 // RenderWidgetHostInputEventRouter. 341 // RenderWidgetHostInputEventRouter.
342 if (!frame_connector_) 342 if (!frame_connector_)
343 return; 343 return;
344 if ((event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && 344 if ((event.GetType() == blink::WebInputEvent::kGestureScrollUpdate &&
345 not_consumed) || 345 not_consumed) ||
346 event.GetType() == blink::WebInputEvent::kGestureScrollEnd) 346 event.GetType() == blink::WebInputEvent::kGestureScrollEnd)
347 frame_connector_->BubbleScrollEvent(event); 347 frame_connector_->BubbleScrollEvent(event);
348 } 348 }
349 349
350 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck() { 350 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck(
351 const cc::ReturnedResourceArray& resources) {
351 if (!host_) 352 if (!host_)
352 return; 353 return;
353 host_->SendReclaimCompositorResources(true /* is_swap_ack */, 354 host_->SendReclaimCompositorResources(true /* is_swap_ack */, resources);
354 cc::ReturnedResourceArray());
355 } 355 }
356 356
357 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() { 357 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() {
358 ResetCompositorFrameSinkSupport(); 358 ResetCompositorFrameSinkSupport();
359 CreateCompositorFrameSinkSupport(); 359 CreateCompositorFrameSinkSupport();
360 has_frame_ = false; 360 has_frame_ = false;
361 } 361 }
362 362
363 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame( 363 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame(
364 const cc::LocalSurfaceId& local_surface_id, 364 const cc::LocalSurfaceId& local_surface_id,
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 frame_sink_id_); 709 frame_sink_id_);
710 } 710 }
711 support_.reset(); 711 support_.reset();
712 } 712 }
713 713
714 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { 714 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() {
715 return false; 715 return false;
716 } 716 }
717 717
718 } // namespace content 718 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698