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

Unified Diff: sky/viewer/document_view.cc

Issue 762723002: Remove ENABLE(COMPOSITOR). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/viewer/document_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/document_view.cc
diff --git a/sky/viewer/document_view.cc b/sky/viewer/document_view.cc
index 78b9b4f4d35bcd57f50448ccd36baa929412267f..5a4a6f7a4fd212d8dbe074056ab85fdec6327027 100644
--- a/sky/viewer/document_view.cc
+++ b/sky/viewer/document_view.cc
@@ -132,11 +132,10 @@ void DocumentView::Load(mojo::URLResponsePtr response) {
web_view_->mainFrame()->load(GURL(response->url), response->body.Pass());
}
-blink::WebLayerTreeView* DocumentView::initializeLayerTreeView() {
+void DocumentView::initializeLayerTreeView() {
layer_host_.reset(new LayerHost(this));
root_layer_ = make_scoped_refptr(new Layer(this));
layer_host_->SetRootLayer(root_layer_);
- return nullptr;
}
mojo::Shell* DocumentView::GetShell() {
« no previous file with comments | « sky/viewer/document_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698