diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
| commit | b04131f375a64204be962e7b92c88a3ecaf892c5 (patch) | |
| tree | ad3cac0a277791692eb4374af8b647cec5706cb1 /src/core/delegated_frame_node.h | |
| parent | 001ee1d6da4bf6769d702810f8ebcb05978663cc (diff) | |
| parent | 0e5553a1626cb707499d82c96e136ceb79dfb54d (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/core/delegated_frame_node.h
src/webengine/api/qquickwebenginecontextmenudata.cpp
Change-Id: I163488d0d32cd981351608b2886f12e547e24672
Diffstat (limited to 'src/core/delegated_frame_node.h')
| -rw-r--r-- | src/core/delegated_frame_node.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h index e2a3804e3..36ec20f1d 100644 --- a/src/core/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h @@ -49,6 +49,7 @@ #include <QSharedData> #include <QSharedPointer> #include <QWaitCondition> +#include <QtGui/QOffscreenSurface> #include "chromium_gpu_helper.h" #include "render_widget_host_view_qt_delegate.h" @@ -104,6 +105,10 @@ private: QMutex m_mutex; QList<gl::TransferableFence> m_textureFences; std::unique_ptr<gpu::SyncPointClient> m_syncPointClient; +#if defined(USE_X11) + bool m_contextShared; + QScopedPointer<QOffscreenSurface> m_offsurface; +#endif }; } // namespace QtWebEngineCore |