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

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: format 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 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 if (touch_emulator_) 1544 if (touch_emulator_)
1545 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized); 1545 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
1546 1546
1547 if (view_) { 1547 if (view_) {
1548 view_->OnSwapCompositorFrame(output_surface_id, frame.Pass()); 1548 view_->OnSwapCompositorFrame(output_surface_id, frame.Pass());
1549 view_->DidReceiveRendererFrame(); 1549 view_->DidReceiveRendererFrame();
1550 } else { 1550 } else {
1551 cc::CompositorFrameAck ack; 1551 cc::CompositorFrameAck ack;
1552 if (frame->gl_frame_data) { 1552 if (frame->gl_frame_data) {
1553 ack.gl_frame_data = frame->gl_frame_data.Pass(); 1553 ack.gl_frame_data = frame->gl_frame_data.Pass();
1554 ack.gl_frame_data->sync_point = 0; 1554 ack.gl_frame_data->sync_token.Clear();
1555 } else if (frame->delegated_frame_data) { 1555 } else if (frame->delegated_frame_data) {
1556 cc::TransferableResource::ReturnResources( 1556 cc::TransferableResource::ReturnResources(
1557 frame->delegated_frame_data->resource_list, 1557 frame->delegated_frame_data->resource_list,
1558 &ack.resources); 1558 &ack.resources);
1559 } 1559 }
1560 SendSwapCompositorFrameAck(routing_id_, output_surface_id, 1560 SendSwapCompositorFrameAck(routing_id_, output_surface_id,
1561 process_->GetID(), ack); 1561 process_->GetID(), ack);
1562 } 1562 }
1563 1563
1564 RenderProcessHost* rph = GetProcess(); 1564 RenderProcessHost* rph = GetProcess();
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 } 2191 }
2192 2192
2193 #if defined(OS_WIN) 2193 #if defined(OS_WIN)
2194 gfx::NativeViewAccessible 2194 gfx::NativeViewAccessible
2195 RenderWidgetHostImpl::GetParentNativeViewAccessible() { 2195 RenderWidgetHostImpl::GetParentNativeViewAccessible() {
2196 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; 2196 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
2197 } 2197 }
2198 #endif 2198 #endif
2199 2199
2200 } // namespace content 2200 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698