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

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

Issue 2116663002: Test for BrowserPlugin-based WebView Focus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revise surface waiting. Created 4 years, 5 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // forward GestureScrollUpdate. 345 // forward GestureScrollUpdate.
346 if (frame_connector_ && 346 if (frame_connector_ &&
347 event.type == blink::WebInputEvent::GestureScrollUpdate && not_consumed) 347 event.type == blink::WebInputEvent::GestureScrollUpdate && not_consumed)
348 frame_connector_->BubbleScrollEvent(event); 348 frame_connector_->BubbleScrollEvent(event);
349 } 349 }
350 350
351 void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32_t output_surface_id, 351 void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32_t output_surface_id,
352 cc::SurfaceDrawStatus drawn) { 352 cc::SurfaceDrawStatus drawn) {
353 cc::CompositorFrameAck ack; 353 cc::CompositorFrameAck ack;
354 DCHECK_GT(ack_pending_count_, 0U); 354 DCHECK_GT(ack_pending_count_, 0U);
355
Charlie Reis 2016/07/07 17:22:09 nit: No need to change this file now.
355 if (!surface_returned_resources_.empty()) 356 if (!surface_returned_resources_.empty())
356 ack.resources.swap(surface_returned_resources_); 357 ack.resources.swap(surface_returned_resources_);
357 if (host_) { 358 if (host_) {
358 host_->Send(new ViewMsg_SwapCompositorFrameAck(host_->GetRoutingID(), 359 host_->Send(new ViewMsg_SwapCompositorFrameAck(host_->GetRoutingID(),
359 output_surface_id, ack)); 360 output_surface_id, ack));
360 } 361 }
361 ack_pending_count_--; 362 ack_pending_count_--;
362 } 363 }
363 364
364 void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame( 365 void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame(
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 689
689 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { 690 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const {
690 return true; 691 return true;
691 } 692 }
692 693
693 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { 694 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
694 return surface_id_; 695 return surface_id_;
695 }; 696 };
696 697
697 } // namespace content 698 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698