webkit/compositor_bindings/web_layer_tree_view_impl.h - Issue 11364221: Fixing RenderingStats vs WebRenderingStats mess

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: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 11364221: Fixing RenderingStats vs WebRenderingStats mess (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/compositor_bindings/web_layer_tree_view_impl.h

diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h

index 33c6eef4c5a2a6bdbed9746291d9fc84b0d7798e..f0441ab532e49ca0d0570fdeb5038582eb0ea8c0 100644

--- a/webkit/compositor_bindings/web_layer_tree_view_impl.h

+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h

@@ -8,6 +8,7 @@

#include "base/memory/scoped_ptr.h"

#include "cc/layer_tree_host_client.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"

namespace cc {

class LayerTreeHost;

@@ -49,7 +50,11 @@ public:

virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;

virtual void finishAllRendering() OVERRIDE;

virtual void setDeferCommits(bool deferCommits) OVERRIDE;

+#ifdef NOT_USING_WEB_RENDERING_STATS

+ virtual void renderingStats(void*) const OVERRIDE;

+#else

virtual void renderingStats(WebRenderingStats&) const OVERRIDE;

+#endif // NOT_USING_WEB_RENDERING_STATS

virtual void setShowFPSCounter(bool show);

virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight);

virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight);