Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1125)

Unified Diff: cc/layers/layer_impl.h

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index d1cf0530586d65e6566df624062c474671ff5626..f52b5de77ce21807418f2b26e0d19c41b6f03449 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -7,6 +7,7 @@
#include <set>
#include <string>
+#include <vector>
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
@@ -18,6 +19,7 @@
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
#include "cc/base/scoped_ptr_vector.h"
+#include "cc/debug/frame_timing_request.h"
#include "cc/input/input_handler.h"
#include "cc/input/scrollbar.h"
#include "cc/layers/draw_properties.h"
@@ -566,6 +568,12 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
void Set3dSortingContextId(int id);
int sorting_context_id() { return sorting_context_id_; }
+ void PassFrameTimingRequests(
+ std::vector<FrameTimingRequest>* frame_timing_requests);
+ const std::vector<FrameTimingRequest>& frame_timing_requests() const {
+ return frame_timing_requests_;
+ }
+
protected:
LayerImpl(LayerTreeImpl* layer_impl, int id);
@@ -720,6 +728,10 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
scoped_ptr<RenderSurfaceImpl> render_surface_;
+
+ std::vector<FrameTimingRequest> frame_timing_requests_;
+ bool frame_timing_requests_dirty_;
+
DISALLOW_COPY_AND_ASSIGN(LayerImpl);
};
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698