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

Unified Diff: ui/compositor/layer.cc

Issue 706203003: Update from https://crrev.com/303153 (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 | « ui/compositor/layer.h ('k') | ui/gl/gl_context_egl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 7a2caf41302ef533a4c9f4c82a41f844dac51e48..abf7e02e2a3a18d82a63f57ddb0b4f865abe2e8d 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -569,10 +569,15 @@ void Layer::SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
RecomputeDrawsContentAndUVRect();
}
-void Layer::SetShowSurface(cc::SurfaceId id, gfx::Size frame_size_in_dip) {
+void Layer::SetShowSurface(
+ cc::SurfaceId id,
+ const cc::SurfaceLayer::SatisfyCallback& satisfy_callback,
+ const cc::SurfaceLayer::RequireCallback& require_callback,
+ gfx::Size frame_size_in_dip) {
DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR);
- scoped_refptr<cc::SurfaceLayer> new_layer = cc::SurfaceLayer::Create();
+ scoped_refptr<cc::SurfaceLayer> new_layer =
+ cc::SurfaceLayer::Create(satisfy_callback, require_callback);
new_layer->SetSurfaceId(id);
SwitchToLayer(new_layer);
surface_layer_ = new_layer;
« no previous file with comments | « ui/compositor/layer.h ('k') | ui/gl/gl_context_egl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698