Skip to content

LayerTreeHost construction race condition fix #1517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: wpe-2.38
Choose a base branch
from
Open

LayerTreeHost construction race condition fix #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ LayerTreeHost::LayerTreeHost(WebPage& webPage)
m_layerTreeContext.contextID = m_surface->surfaceID();

didChangeViewport();

initialized.store(true);
}

LayerTreeHost::~LayerTreeHost()
Expand Down Expand Up @@ -394,7 +396,9 @@ void LayerTreeHost::updateScene()

void LayerTreeHost::frameComplete()
{
m_compositor->frameComplete();
if (initialized.load()) {
m_compositor->frameComplete();
}
}

uint64_t LayerTreeHost::nativeSurfaceHandleForCompositing()
Expand Down
2 changes: 2 additions & 0 deletions Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <wtf/Forward.h>
#include <wtf/OptionSet.h>
#include <wtf/RunLoop.h>
#include <atomic>

#if USE(GRAPHICS_LAYER_TEXTURE_MAPPER)

Expand Down Expand Up @@ -220,6 +221,7 @@ class LayerTreeHost
double m_transientZoomScale { 1 };
WebCore::FloatPoint m_transientZoomOrigin;
#endif
std::atomic_bool initialized { false };
};

#if !USE(COORDINATED_GRAPHICS)
Expand Down