cc/trees/thread_proxy.h - Issue 397443002: [not for review] Add Draw entries to window Performance Timeline

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/trees/thread_proxy.h

Issue 397443002: [not for review] Add Draw entries to window Performance Timeline Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git pull of third_party/WebKit Created 6 years, 5 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

« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_unittest_no_message_loop.cc ('k') | cc/trees/thread_proxy.cc » ('j') | content/renderer/compositor_bindings/web_layer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/thread_proxy.h

diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h

index a28068e6a1e7aae0f33e281ef3d9238c859ce2ce..ee22a1ba5f4f011b0f591cb723bb4cd90ab95c98 100644

--- a/cc/trees/thread_proxy.h

+++ b/cc/trees/thread_proxy.h

@@ -5,8 +5,10 @@

#ifndef CC_TREES_THREAD_PROXY_H_

#define CC_TREES_THREAD_PROXY_H_

+#include <set>

#include <string>

+#include "base/containers/hash_tables.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

@@ -21,6 +23,7 @@

namespace base {

class SingleThreadTaskRunner;

+typedef hash_map<int, std::set<base::TimeTicks> > TimeTickMap;

}

namespace cc {

@@ -51,6 +54,8 @@ class CC_EXPORT ThreadProxy : public Proxy,

unsigned int begin_frame_id;

base::TimeTicks monotonic_frame_begin_time;

scoped_ptr<ScrollAndScaleSet> scroll_info;

+ scoped_ptr<DrawTimingSet> draw_info;

+ base::TimeTickMap draw_timing;

size_t memory_allocation_limit_bytes;

int memory_allocation_priority_cutoff;

bool evicted_ui_resources;