~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/server/report/lttng/compositor_report.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
public:
36
36
    CompositorReport() = default;
37
37
    virtual ~CompositorReport() = default;
38
 
    void added_display(int width, int height, int x, int y, SubCompositorId id = 0) override;
39
 
    void began_frame(SubCompositorId id = 0) override;
40
 
    void rendered_frame(SubCompositorId id = 0) override;
41
 
    void finished_frame(SubCompositorId id = 0) override;
 
38
    void added_display(int width, int height, int x, int y, SubCompositorId id) override;
 
39
    void began_frame(SubCompositorId id) override;
 
40
    void renderables_in_frame(SubCompositorId id, graphics::RenderableList const& renderables) override;
 
41
    void rendered_frame(SubCompositorId id) override;
 
42
    void finished_frame(SubCompositorId id) override;
42
43
    void started() override;
43
44
    void stopped() override;
44
45
    void scheduled() override;