diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 18:22:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 19:03:09 +0100 |
| commit | 3d0d0afe573d1c568f1f5c0eba647eff993dcb81 (patch) | |
| tree | 4c05b09f478233f3156c7f4c1a5cb0fb5ee2a597 /src/core/delegated_frame_node.h | |
| parent | 30aa9c7bf0f1eceda8516fd5de87dc8e2cff1758 (diff) | |
| parent | 399d77a38ff52d33dc871a5b221db253308b7436 (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/core/core_module.pro
src/core/delegated_frame_node.cpp
src/core/surface_factory_qt.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
Diffstat (limited to 'src/core/delegated_frame_node.h')
| -rw-r--r-- | src/core/delegated_frame_node.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h index b83f4682a..c627cdf95 100644 --- a/src/core/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h @@ -126,6 +126,8 @@ private: static void fenceAndUnlockQt(DelegatedFrameNode *frameNode); ResourceHolder *findAndHoldResource(unsigned resourceId, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates); + void holdResources(const cc::DrawQuad *quad, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates); + void holdResources(const cc::RenderPass *pass, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates); QSGTexture *initAndHoldTexture(ResourceHolder *resource, bool quadIsAllOpaque, RenderWidgetHostViewQtDelegate *apiDelegate = 0); QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData; @@ -143,6 +145,7 @@ private: bool m_contextShared; QScopedPointer<QOffscreenSurface> m_offsurface; #endif + QSize m_previousViewportSize; }; } // namespace QtWebEngineCore |