Index: ui/android/delegated_frame_host_android.cc |
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc |
index e0886ba848b6338464c115ba9e1878a8b51cdd3a..436fefe9147d912a15b91f9f61ca29ce482a495a 100644 |
--- a/ui/android/delegated_frame_host_android.cc |
+++ b/ui/android/delegated_frame_host_android.cc |
@@ -51,17 +51,16 @@ void CopyOutputRequestCallback( |
} // namespace |
-DelegatedFrameHostAndroid::DelegatedFrameHostAndroid( |
- ui::ViewAndroid* view, |
- SkColor background_color, |
- ReturnResourcesCallback return_resources_callback) |
+DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(ui::ViewAndroid* view, |
+ SkColor background_color, |
+ Client* client) |
: frame_sink_id_( |
ui::ContextProviderFactory::GetInstance()->AllocateFrameSinkId()), |
view_(view), |
- return_resources_callback_(return_resources_callback), |
+ client_(client), |
background_layer_(cc::SolidColorLayer::Create()) { |
DCHECK(view_); |
- DCHECK(!return_resources_callback_.is_null()); |
+ DCHECK(client_); |
surface_manager_ = |
ui::ContextProviderFactory::GetInstance()->GetSurfaceManager(); |
@@ -223,13 +222,12 @@ void DelegatedFrameHostAndroid::UnregisterFrameSinkHierarchy() { |
void DelegatedFrameHostAndroid::ReturnResources( |
const cc::ReturnedResourceArray& resources) { |
- return_resources_callback_.Run(resources); |
+ client_->ReturnResources(resources); |
} |
void DelegatedFrameHostAndroid::SetBeginFrameSource( |
cc::BeginFrameSource* begin_frame_source) { |
- // TODO(enne): hook this up instead of making RWHVAndroid a |
- // WindowAndroidObserver. |
+ client_->SetBeginFrameSource(begin_frame_source); |
} |
void DelegatedFrameHostAndroid::UpdateBackgroundLayer() { |