~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/server/compositor/buffer_stream_factory.h

Committer: Daniel van Vugt
Date: 2017-05-08 03:04:26 UTC
mfrom: (4164 development-branch)
mto: This revision was merged to the branch mainline in revision 4171.
Revision ID: daniel.van.vugt@canonical.com-20170508030426-wy8yiyggdu8ym3mr

Merge latest trunk

files removed:
src/include/server/mir/compositor/frame_dropping_policy.h

src/include/server/mir/compositor/frame_dropping_policy_factory.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

src/server/compositor/timeout_frame_dropping_policy_factory.h

tests/include/mir/test/doubles/mock_frame_dropping_policy_factory.h

tests/include/mir/test/doubles/stub_frame_dropping_policy_factory.h

tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp

tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp

files modified:
include/client/mir_toolkit/mir_window.h

src/client/buffer_stream.cpp

src/include/server/mir/default_server_configuration.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/server/kms/display.cpp

src/platforms/mesa/server/kms/kms_page_flipper.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/symbols.map

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/mock_libinput.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/platforms/nested/test_host_buffer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

src/server/compositor/buffer_stream_factory.h

#define MIR_COMPOSITOR_BUFFER_STREAM_FACTORY_H_

#include "mir/scene/buffer_stream_factory.h"

#include "mir/compositor/frame_dropping_policy_factory.h"

#include <memory>

class BufferStreamFactory : public scene::BufferStreamFactory

{

public:

BufferStreamFactory(std::shared_ptr<FrameDroppingPolicyFactory> const& policy_factory);

BufferStreamFactory();

virtual ~BufferStreamFactory() {}

graphics::BufferProperties const&) override;

virtual std::shared_ptr<frontend::ClientBuffers> create_buffer_map(

std::shared_ptr<frontend::BufferSink> const& sink) override;

private:

std::shared_ptr<FrameDroppingPolicyFactory> const policy_factory;

};

}

Older »