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

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

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 664
665 cc::SurfaceManager* manager = GetSurfaceManager(); 665 cc::SurfaceManager* manager = GetSurfaceManager();
666 if (manager) { 666 if (manager) {
667 display_client_.reset(new cc::OnscreenDisplayClient( 667 display_client_.reset(new cc::OnscreenDisplayClient(
668 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), 668 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(),
669 BrowserGpuMemoryBufferManager::current(), 669 BrowserGpuMemoryBufferManager::current(),
670 host_->settings().renderer_settings, 670 host_->settings().renderer_settings,
671 base::ThreadTaskRunnerHandle::Get())); 671 base::ThreadTaskRunnerHandle::Get()));
672 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( 672 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
673 new cc::SurfaceDisplayOutputSurface( 673 new cc::SurfaceDisplayOutputSurface(
674 manager, surface_id_allocator_.get(), context_provider, nullptr)); 674 manager, surface_id_allocator_.get(), context_provider));
675 675
676 display_client_->set_surface_output_surface(surface_output_surface.get()); 676 display_client_->set_surface_output_surface(surface_output_surface.get());
677 surface_output_surface->set_display_client(display_client_.get()); 677 surface_output_surface->set_display_client(display_client_.get());
678 display_client_->display()->Resize(size_); 678 display_client_->display()->Resize(size_);
679 host_->SetOutputSurface(surface_output_surface.Pass()); 679 host_->SetOutputSurface(surface_output_surface.Pass());
680 } else { 680 } else {
681 host_->SetOutputSurface(real_output_surface.Pass()); 681 host_->SetOutputSurface(real_output_surface.Pass());
682 } 682 }
683 } 683 }
684 684
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 783
784 void CompositorImpl::SetNeedsAnimate() { 784 void CompositorImpl::SetNeedsAnimate() {
785 needs_animate_ = true; 785 needs_animate_ = true;
786 if (!host_) 786 if (!host_)
787 return; 787 return;
788 788
789 host_->SetNeedsAnimate(); 789 host_->SetNeedsAnimate();
790 } 790 }
791 791
792 } // namespace content 792 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/compositor_util.cc ('k') | content/common/gpu/client/command_buffer_metrics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698