encounter/engine
0
0
Fork 0
mirror of https://github.com/encounter/engine.git synced 2026-03-30 11:09:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix build after recent compositor changes

Browse Source
This commit is contained in:
Adam Barth
2015-09-11 09:02:20 -07:00
parent 244de91699
commit ae42346bb5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/sky/document_view.cc
+3 -2
View File
@@ -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);
}
}
services/sky/document_view.h
+1 -1
View File
@@ -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>>