diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 14:40:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:48:32 +0100 |
| commit | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (patch) | |
| tree | ef5984369eb0fac54704725aa8c976e8c1b059ac /src/core/compositor/compositor.h | |
| parent | d82ff4e1d1a93bf0a31745a5454346ac54959cf8 (diff) | |
| parent | de428e1a79708967f97aa8ffcbb2403d3b7d1e7f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/core/compositor/compositor.h')
| -rw-r--r-- | src/core/compositor/compositor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h index 6d88dc054..36e62c17a 100644 --- a/src/core/compositor/compositor.h +++ b/src/core/compositor/compositor.h @@ -41,9 +41,9 @@ #define COMPOSITOR_H #include "base/memory/weak_ptr.h" +#include "components/viz/common/frame_timing_details.h" #include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/quads/compositor_frame.h" -#include "ui/gfx/presentation_feedback.h" #include <QtCore/qglobal.h> #include <QtCore/qshareddata.h> @@ -115,7 +115,7 @@ private: std::unique_ptr<CompositorResourceTracker> m_resourceTracker; content::RenderWidgetHost *m_host; std::unique_ptr<viz::SyntheticBeginFrameSource> m_beginFrameSource; - base::flat_map<uint32_t, gfx::PresentationFeedback> m_presentations; + base::flat_map<uint32_t, viz::FrameTimingDetails> m_presentations; viz::mojom::CompositorFrameSinkClient *m_frameSinkClient = nullptr; bool m_updatePaintNodeShouldCommit = false; bool m_needsBeginFrames = false; |