← Back to branch summary

~kgunn72/mir/dont-crash-when-shooting-invalid-surface

« back to all changes in this revision

Viewing changes to include/test/mir_test_doubles/stub_display_builder.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths, Alexandros Frantzis, Daniel van Vugt, Kevin DuBois, Christopher James Halse Rogers, chris.gagnon, Mathieu Trudel-Lapierre, Robert Carr, Automatic PS uploader, Kevin Gunn, Daniel d'Andrada, Christopher James Halse Rogers, Michael Terry, Brandon Schaefer, Timo Jyrinki, Mir Team, Andreas Pokorny
  • Date: 2013-12-20 11:11:22 UTC
  • mfrom: (1169.1.1 version-0.1.3)
  • Revision ID: tarmac-20131220111122-h503fd1fnq7pn9za
Latest upstream release: Mir 0.1.3 (r1298).

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/test/mir_test_doubles/stub_display_builder.h
19
19
#ifndef MIR_TEST_DOUBLES_STUB_DISPLAY_BUILDER_H_
20
20
#define MIR_TEST_DOUBLES_STUB_DISPLAY_BUILDER_H_
21
21
 
22
 
#include "src/server/graphics/android/display_builder.h"
 
22
#include "src/platform/graphics/android/display_builder.h"
23
23
#include "stub_display_buffer.h"
24
24
#include "stub_display_device.h"
25
25
#include <gmock/gmock.h>
52
52
    {
53
53
    }
54
54
 
55
 
    geometry::PixelFormat display_format()
 
55
    MirPixelFormat display_format()
56
56
    {
57
 
        return geometry::PixelFormat::abgr_8888;
 
57
        return mir_pixel_format_abgr_8888;
58
58
    }
59
59
 
60
60
    std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
64
64
        return std::unique_ptr<graphics::DisplayBuffer>(
65
65
                new StubDisplayBuffer(geometry::Rectangle{{0,0},sz}));
66
66
    }
67
 
    
 
67
 
68
68
    std::shared_ptr<graphics::android::DisplayDevice> create_display_device()
69
69
    {
70
70
        return stub_dev;