From ae42346bb571a281ed3ff7289ce4bbb73c16d46e Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 11 Sep 2015 09:02:20 -0700
Subject: [PATCH] Fix build after recent compositor changes

---
 services/sky/document_view.cc | 5 +++--
 services/sky/document_view.h  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/sky/document_view.cc b/services/sky/document_view.cc
index 0ee38f36d..ed3f7f191 100644
--- a/services/sky/document_view.cc
+++ b/services/sky/document_view.cc
@@ -224,8 +224,9 @@ void DocumentView::OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) {
 
 void DocumentView::PaintContents(SkCanvas* canvas, const gfx::Rect& clip) {
   if (current_layer_tree_) {
-    compositor::PaintContext context(picture_rasterizer_, nullptr, canvas); 
-    current_layer_tree_->root_layer()->Paint(context);
+    compositor::PaintContext::ScopedFrame frame =
+        paint_context_.AcquireFrame(*canvas, nullptr);
+    current_layer_tree_->root_layer()->Paint(frame);
   }
 }
 
diff --git a/services/sky/document_view.h b/services/sky/document_view.h
index 550a20750..7c101fc04 100644
--- a/services/sky/document_view.h
+++ b/services/sky/document_view.h
@@ -131,7 +131,7 @@ class DocumentView : public blink::ServiceProvider,
   scoped_ptr<LayerHost> layer_host_;
   scoped_refptr<TextureLayer> root_layer_;
   std::unique_ptr<compositor::LayerTree> current_layer_tree_;  // TODO(abarth): Integrate //sky/compositor and //services/sky/compositor.
-  compositor::PictureRasterzier picture_rasterizer_;
+  compositor::PaintContext paint_context_;
   RasterizerBitmap* bitmap_rasterizer_;  // Used for pixel tests.
   mojo::ServiceRegistryPtr service_registry_;
   scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>>