third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h - Issue 2218533002: Backporting JSONValues from protocol::Values

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: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h

Issue 2218533002: Backporting JSONValues from protocol::Values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Switch back to partition allocator Created 4 years, 4 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 | « third_party/WebKit/Source/core/html/parser/XSSAuditorDelegate.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h

diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h

index 95cf7561a60ea90e1bca722432ec0f74133ff826..fbe3af31fe120941880ea97fa1b543c2c864fc25 100644

--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h

+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h

@@ -148,7 +148,7 @@ public:

bool scrollingLayerDidChange(PaintLayer*);

- PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;

+ std::unique_ptr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;

GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); }

GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }