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

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

Issue 422013003: [Android] Use UIResource for overscroll glow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary layer disabling code Created 6 years, 4 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/compositor_impl_android.h" 5 #include "content/browser/renderer_host/compositor_impl_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 } 333 }
334 334
335 void CompositorImpl::OnGpuChannelEstablished() { 335 void CompositorImpl::OnGpuChannelEstablished() {
336 ScheduleComposite(); 336 ScheduleComposite();
337 } 337 }
338 338
339 UIResourceProvider& CompositorImpl::GetUIResourceProvider() { 339 UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
340 return ui_resource_provider_; 340 return ui_resource_provider_;
341 } 341 }
342 342
343 ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {
344 return ui_resource_provider_.GetSystemUIResourceManager();
345 }
346
343 void CompositorImpl::SetRootLayer(scoped_refptr<cc::Layer> root_layer) { 347 void CompositorImpl::SetRootLayer(scoped_refptr<cc::Layer> root_layer) {
344 if (subroot_layer_) { 348 if (subroot_layer_) {
345 subroot_layer_->RemoveFromParent(); 349 subroot_layer_->RemoveFromParent();
346 subroot_layer_ = NULL; 350 subroot_layer_ = NULL;
347 } 351 }
348 if (root_layer) { 352 if (root_layer) {
349 subroot_layer_ = root_layer; 353 subroot_layer_ = root_layer;
350 root_layer_->AddChild(root_layer); 354 root_layer_->AddChild(root_layer);
351 } 355 }
352 } 356 }
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 } 645 }
642 646
643 void CompositorImpl::SetNeedsAnimate() { 647 void CompositorImpl::SetNeedsAnimate() {
644 if (!host_) 648 if (!host_)
645 return; 649 return;
646 650
647 host_->SetNeedsAnimate(); 651 host_->SetNeedsAnimate();
648 } 652 }
649 653
650 } // namespace content 654 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698