summaryrefslogtreecommitdiffstats
path: root/content/browser/android/in_process/synchronous_compositor_impl.cc
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 23:50:12 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 23:50:12 +0000
commit7a46143ee4f3dcc09618bbb9e836c7f54d1819d2 (patch)
tree143126afe8a92538259bfab69c498d9ec79251e2 /content/browser/android/in_process/synchronous_compositor_impl.cc
parentfe03d587b3669de9d9437ad22156ccf698cb9d1c (diff)
downloadchromium_src-7a46143ee4f3dcc09618bbb9e836c7f54d1819d2.zip
chromium_src-7a46143ee4f3dcc09618bbb9e836c7f54d1819d2.tar.gz
chromium_src-7a46143ee4f3dcc09618bbb9e836c7f54d1819d2.tar.bz2
aw: Remove legacy rendering path
Remove locks, post tasks, and complexity used to support legacy rendering path. BUG=344087 Review URL: https://codereview.chromium.org/331103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/in_process/synchronous_compositor_impl.cc')
-rw-r--r--content/browser/android/in_process/synchronous_compositor_impl.cc21
1 files changed, 5 insertions, 16 deletions
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc
index 0a0be1c..d7b3eb7 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -89,13 +89,12 @@ void SynchronousCompositor::SetGpuService(
g_factory.Get().SetDeferredGpuService(service);
}
-bool SynchronousCompositorImpl::InitializeHwDraw(
- scoped_refptr<gfx::GLSurface> surface) {
+bool SynchronousCompositorImpl::InitializeHwDraw() {
DCHECK(CalledOnValidThread());
DCHECK(output_surface_);
scoped_refptr<cc::ContextProvider> onscreen_context =
- g_factory.Get().CreateOnscreenContextProviderForCompositorThread(surface);
+ g_factory.Get().CreateOnscreenContextProviderForCompositorThread();
bool success = output_surface_->InitializeHwDraw(onscreen_context);
@@ -120,13 +119,12 @@ scoped_ptr<cc::CompositorFrame> SynchronousCompositorImpl::DemandDrawHw(
gfx::Size surface_size,
const gfx::Transform& transform,
gfx::Rect viewport,
- gfx::Rect clip,
- bool stencil_enabled) {
+ gfx::Rect clip) {
DCHECK(CalledOnValidThread());
DCHECK(output_surface_);
- scoped_ptr<cc::CompositorFrame> frame = output_surface_->DemandDrawHw(
- surface_size, transform, viewport, clip, stencil_enabled);
+ scoped_ptr<cc::CompositorFrame> frame =
+ output_surface_->DemandDrawHw(surface_size, transform, viewport, clip);
if (frame.get())
UpdateFrameMetaData(frame->metadata);
return frame.Pass();
@@ -150,15 +148,6 @@ bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas) {
void SynchronousCompositorImpl::UpdateFrameMetaData(
const cc::CompositorFrameMetadata& frame_metadata) {
- if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
- BrowserThread::PostTask(
- BrowserThread::UI,
- FROM_HERE,
- base::Bind(&SynchronousCompositorImpl::UpdateFrameMetaData,
- weak_ptr_factory_.GetWeakPtr(),
- frame_metadata));
- return;
- }
RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
contents_->GetRenderWidgetHostView());
if (rwhv)