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

Side by Side Diff: content/browser/compositor/delegated_frame_host.cc

Issue 1304063014: cc: Plumbing for BeginFrameSource based on Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NOTREACHED for WebView; NOTIMPLEMENTED elsewhere Created 5 years, 2 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/compositor/delegated_frame_host.h" 5 #include "content/browser/compositor/delegated_frame_host.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 const cc::ReturnedResourceArray& resources) { 529 const cc::ReturnedResourceArray& resources) {
530 if (resources.empty()) 530 if (resources.empty())
531 return; 531 return;
532 std::copy(resources.begin(), 532 std::copy(resources.begin(),
533 resources.end(), 533 resources.end(),
534 std::back_inserter(surface_returned_resources_)); 534 std::back_inserter(surface_returned_resources_));
535 if (!pending_delegated_ack_count_) 535 if (!pending_delegated_ack_count_)
536 SendReturnedDelegatedResources(last_output_surface_id_); 536 SendReturnedDelegatedResources(last_output_surface_id_);
537 } 537 }
538 538
539 void DelegatedFrameHost::SetBeginFrameSource(
540 cc::BeginFrameSource* begin_frame_source) {
541 // TODO(tansell): Hook this up.
542 NOTIMPLEMENTED();
543 }
544
539 void DelegatedFrameHost::EvictDelegatedFrame() { 545 void DelegatedFrameHost::EvictDelegatedFrame() {
540 client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent(); 546 client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
541 frame_provider_ = NULL; 547 frame_provider_ = NULL;
542 if (!surface_id_.is_null()) { 548 if (!surface_id_.is_null()) {
543 surface_factory_->Destroy(surface_id_); 549 surface_factory_->Destroy(surface_id_);
544 surface_id_ = cc::SurfaceId(); 550 surface_id_ = cc::SurfaceId();
545 } 551 }
546 delegated_frame_evictor_->DiscardedFrame(); 552 delegated_frame_evictor_->DiscardedFrame();
547 } 553 }
548 554
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 cc::SurfaceManager* manager = factory->GetSurfaceManager(); 1044 cc::SurfaceManager* manager = factory->GetSurfaceManager();
1039 new_layer->SetShowSurface( 1045 new_layer->SetShowSurface(
1040 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)), 1046 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)),
1041 base::Bind(&RequireCallback, base::Unretained(manager)), 1047 base::Bind(&RequireCallback, base::Unretained(manager)),
1042 current_surface_size_, current_scale_factor_, 1048 current_surface_size_, current_scale_factor_,
1043 current_frame_size_in_dip_); 1049 current_frame_size_in_dip_);
1044 } 1050 }
1045 } 1051 }
1046 1052
1047 } // namespace content 1053 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698