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

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

Issue 1229413003: DelegatedFrameHost should handle satisfied sequences in frame metadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment stating that |satifies_sequences| is cleared on call to SwapDelegatedFrame. Created 5 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 (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_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 uint32 output_surface_id, 1169 uint32 output_surface_id,
1170 scoped_ptr<cc::CompositorFrame> frame) { 1170 scoped_ptr<cc::CompositorFrame> frame) {
1171 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame"); 1171 TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame");
1172 1172
1173 last_scroll_offset_ = frame->metadata.root_scroll_offset; 1173 last_scroll_offset_ = frame->metadata.root_scroll_offset;
1174 if (frame->delegated_frame_data) { 1174 if (frame->delegated_frame_data) {
1175 delegated_frame_host_->SwapDelegatedFrame( 1175 delegated_frame_host_->SwapDelegatedFrame(
1176 output_surface_id, 1176 output_surface_id,
1177 frame->delegated_frame_data.Pass(), 1177 frame->delegated_frame_data.Pass(),
1178 frame->metadata.device_scale_factor, 1178 frame->metadata.device_scale_factor,
1179 frame->metadata.latency_info); 1179 frame->metadata.latency_info,
1180 &frame->metadata.satisfies_sequences);
1180 return; 1181 return;
1181 } 1182 }
1182 1183
1183 if (frame->software_frame_data) { 1184 if (frame->software_frame_data) {
1184 DLOG(ERROR) << "Unable to use software frame in aura"; 1185 DLOG(ERROR) << "Unable to use software frame in aura";
1185 bad_message::ReceivedBadMessage(host_->GetProcess(), 1186 bad_message::ReceivedBadMessage(host_->GetProcess(),
1186 bad_message::RWHVA_SHARED_MEMORY); 1187 bad_message::RWHVA_SHARED_MEMORY);
1187 return; 1188 return;
1188 } 1189 }
1189 } 1190 }
(...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after
2792 2793
2793 //////////////////////////////////////////////////////////////////////////////// 2794 ////////////////////////////////////////////////////////////////////////////////
2794 // RenderWidgetHostViewBase, public: 2795 // RenderWidgetHostViewBase, public:
2795 2796
2796 // static 2797 // static
2797 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2798 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2798 GetScreenInfoForWindow(results, NULL); 2799 GetScreenInfoForWindow(results, NULL);
2799 } 2800 }
2800 2801
2801 } // namespace content 2802 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/compositor/delegated_frame_host.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698