yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge SurfaceInterfacePrivate::commit() and SurfaceInterfacePrivate::surface_commit()

Browse source 
This removes an unnecessary layer of indirection.
This commit is contained in:
Vlad Zahorodnii 2021-07-20 10:44:38 +03:00
parent c2f0db4a92
commit ce92ac7451
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/wayland/surface_interface.cpp
View file

@ -317,7 +317,11 @@ void SurfaceInterfacePrivate::surface_set_input_region(Resource *resource, struc
void SurfaceInterfacePrivate::surface_commit(Resource *resource) void SurfaceInterfacePrivate::surface_commit(Resource *resource)
{ {
Q_UNUSED(resource) Q_UNUSED(resource)
commit(); if (subSurface) {
commitSubSurface();
} else {
applyState(&pending);
}
} }
void SurfaceInterfacePrivate::surface_set_buffer_transform(Resource *resource, int32_t transform) void SurfaceInterfacePrivate::surface_set_buffer_transform(Resource *resource, int32_t transform)
@ -667,15 +671,6 @@ void SurfaceInterfacePrivate::applyState(SurfaceState *next)
Q_EMIT q->committed(); Q_EMIT q->committed();
} }
void SurfaceInterfacePrivate::commit()
{
if (subSurface) {
commitSubSurface();
} else {
applyState(&pending);
}
}
void SurfaceInterfacePrivate::commitSubSurface() void SurfaceInterfacePrivate::commitSubSurface()
{ {
if (subSurface->isSynchronized()) { if (subSurface->isSynchronized()) {

1
src/wayland/surface_interface_p.h
View file

@ -99,7 +99,6 @@ public:
void commitToCache(); void commitToCache();
void commitFromCache(); void commitFromCache();
void commit();
void commitSubSurface(); void commitSubSurface();
QMatrix4x4 buildSurfaceToBufferMatrix(const SurfaceState *state); QMatrix4x4 buildSurfaceToBufferMatrix(const SurfaceState *state);
void applyState(SurfaceState *next); void applyState(SurfaceState *next);