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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Folded sync_point into sync_tokens Created 5 years, 1 month 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 (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_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 if (touch_emulator_) 1557 if (touch_emulator_)
1558 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized); 1558 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
1559 1559
1560 if (view_) { 1560 if (view_) {
1561 view_->OnSwapCompositorFrame(output_surface_id, frame.Pass()); 1561 view_->OnSwapCompositorFrame(output_surface_id, frame.Pass());
1562 view_->DidReceiveRendererFrame(); 1562 view_->DidReceiveRendererFrame();
1563 } else { 1563 } else {
1564 cc::CompositorFrameAck ack; 1564 cc::CompositorFrameAck ack;
1565 if (frame->gl_frame_data) { 1565 if (frame->gl_frame_data) {
1566 ack.gl_frame_data = frame->gl_frame_data.Pass(); 1566 ack.gl_frame_data = frame->gl_frame_data.Pass();
1567 ack.gl_frame_data->sync_point = 0; 1567 ack.gl_frame_data->sync_token.Clear();
1568 } else if (frame->delegated_frame_data) { 1568 } else if (frame->delegated_frame_data) {
1569 cc::TransferableResource::ReturnResources( 1569 cc::TransferableResource::ReturnResources(
1570 frame->delegated_frame_data->resource_list, 1570 frame->delegated_frame_data->resource_list,
1571 &ack.resources); 1571 &ack.resources);
1572 } 1572 }
1573 SendSwapCompositorFrameAck(routing_id_, output_surface_id, 1573 SendSwapCompositorFrameAck(routing_id_, output_surface_id,
1574 process_->GetID(), ack); 1574 process_->GetID(), ack);
1575 } 1575 }
1576 1576
1577 RenderProcessHost* rph = GetProcess(); 1577 RenderProcessHost* rph = GetProcess();
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 } 2196 }
2197 2197
2198 #if defined(OS_WIN) 2198 #if defined(OS_WIN)
2199 gfx::NativeViewAccessible 2199 gfx::NativeViewAccessible
2200 RenderWidgetHostImpl::GetParentNativeViewAccessible() { 2200 RenderWidgetHostImpl::GetParentNativeViewAccessible() {
2201 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; 2201 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
2202 } 2202 }
2203 #endif 2203 #endif
2204 2204
2205 } // namespace content 2205 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698