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

Side by Side Diff: ui/compositor/layer.h

Issue 719573003: Explicitly specify contents scale for SurfaceLayer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 unified diff | Download patch
« no previous file with comments | « content/browser/compositor/delegated_frame_host.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_COMPOSITOR_LAYER_H_ 5 #ifndef UI_COMPOSITOR_LAYER_H_
6 #define UI_COMPOSITOR_LAYER_H_ 6 #define UI_COMPOSITOR_LAYER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 // Begins showing delegated frames from the |frame_provider|. 278 // Begins showing delegated frames from the |frame_provider|.
279 void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider, 279 void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
280 gfx::Size frame_size_in_dip); 280 gfx::Size frame_size_in_dip);
281 281
282 // Begins showing content from a surface with a particular id. 282 // Begins showing content from a surface with a particular id.
283 void SetShowSurface(cc::SurfaceId surface_id, 283 void SetShowSurface(cc::SurfaceId surface_id,
284 const cc::SurfaceLayer::SatisfyCallback& satisfy_callback, 284 const cc::SurfaceLayer::SatisfyCallback& satisfy_callback,
285 const cc::SurfaceLayer::RequireCallback& require_callback, 285 const cc::SurfaceLayer::RequireCallback& require_callback,
286 gfx::Size surface_size, 286 gfx::Size surface_size,
287 float scale,
287 gfx::Size frame_size_in_dip); 288 gfx::Size frame_size_in_dip);
288 289
289 bool has_external_content() { 290 bool has_external_content() {
290 return texture_layer_.get() || delegated_renderer_layer_.get() || 291 return texture_layer_.get() || delegated_renderer_layer_.get() ||
291 surface_layer_.get(); 292 surface_layer_.get();
292 } 293 }
293 294
294 // Show a solid color instead of delegated or surface contents. 295 // Show a solid color instead of delegated or surface contents.
295 void SetShowSolidColorContent(); 296 void SetShowSolidColorContent();
296 297
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // The size of the frame or texture in DIP, set when SetShowDelegatedContent 517 // The size of the frame or texture in DIP, set when SetShowDelegatedContent
517 // or SetTextureMailbox was called. 518 // or SetTextureMailbox was called.
518 gfx::Size frame_size_in_dip_; 519 gfx::Size frame_size_in_dip_;
519 520
520 DISALLOW_COPY_AND_ASSIGN(Layer); 521 DISALLOW_COPY_AND_ASSIGN(Layer);
521 }; 522 };
522 523
523 } // namespace ui 524 } // namespace ui
524 525
525 #endif // UI_COMPOSITOR_LAYER_H_ 526 #endif // UI_COMPOSITOR_LAYER_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/delegated_frame_host.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698