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

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

Issue 1230203007: Re-land: cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and use best_resource_format for now 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/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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 651
652 cc::SurfaceManager* manager = GetSurfaceManager(); 652 cc::SurfaceManager* manager = GetSurfaceManager();
653 if (manager) { 653 if (manager) {
654 display_client_.reset(new cc::OnscreenDisplayClient( 654 display_client_.reset(new cc::OnscreenDisplayClient(
655 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), 655 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(),
656 BrowserGpuMemoryBufferManager::current(), 656 BrowserGpuMemoryBufferManager::current(),
657 host_->settings().renderer_settings, 657 host_->settings().renderer_settings,
658 base::ThreadTaskRunnerHandle::Get())); 658 base::ThreadTaskRunnerHandle::Get()));
659 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( 659 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
660 new cc::SurfaceDisplayOutputSurface( 660 new cc::SurfaceDisplayOutputSurface(
661 manager, surface_id_allocator_.get(), context_provider)); 661 manager, surface_id_allocator_.get(), context_provider, nullptr));
662 662
663 display_client_->set_surface_output_surface(surface_output_surface.get()); 663 display_client_->set_surface_output_surface(surface_output_surface.get());
664 surface_output_surface->set_display_client(display_client_.get()); 664 surface_output_surface->set_display_client(display_client_.get());
665 display_client_->display()->Resize(size_); 665 display_client_->display()->Resize(size_);
666 host_->SetOutputSurface(surface_output_surface.Pass()); 666 host_->SetOutputSurface(surface_output_surface.Pass());
667 } else { 667 } else {
668 host_->SetOutputSurface(real_output_surface.Pass()); 668 host_->SetOutputSurface(real_output_surface.Pass());
669 } 669 }
670 } 670 }
671 671
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 void CompositorImpl::SetNeedsAnimate() { 760 void CompositorImpl::SetNeedsAnimate() {
761 needs_animate_ = true; 761 needs_animate_ = true;
762 if (!host_) 762 if (!host_)
763 return; 763 return;
764 764
765 host_->SetNeedsAnimate(); 765 host_->SetNeedsAnimate();
766 } 766 }
767 767
768 } // namespace content 768 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698