← Back to branch summary

~rpadovani/oxide/type-info

« back to all changes in this revision

Viewing changes to shared/browser/compositor/oxide_compositor.h

  • Committer: Riccardo Padovani
  • Date: 2015-10-19 07:56:29 UTC
  • mfrom: (1088.1.131 oxide)
  • Revision ID: riccardo@rpadovani.com-20151019075629-z0mlhwlb9xflkovw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/compositor/oxide_compositor.h
39
39
namespace oxide {
40
40
 
41
41
class CompositorClient;
 
42
class CompositorFrameData;
42
43
class CompositorFrameHandle;
43
44
class CompositorLock;
44
45
class CompositorThreadProxy;
67
68
 
68
69
  Compositor(CompositorClient* client);
69
70
 
70
 
  void SendSwapCompositorFrameToClient(uint32 surface_id,
71
 
                                       CompositorFrameHandle* frame);
 
71
  void SendSwapCompositorFrameToClient(scoped_ptr<CompositorFrameData> frame);
72
72
 
73
73
  void LockCompositor();
74
74
  void UnlockCompositor();