third_party/WebKit/Source/platform/graphics/GraphicsLayer.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/platform/graphics/GraphicsLayer.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:

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

index dcb5611f20c864ae55b4eb8ff798bc5331bfa424..8a2c6373479e8a36b015d161bf2923e2cf6b83e3 100644

--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

@@ -202,7 +202,7 @@ public:

// pointers for the layers and timing data will be included in the returned string.

String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const;

- PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;

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

void setTracksPaintInvalidations(bool);

bool isTrackingOrCheckingPaintInvalidations() const

@@ -296,7 +296,7 @@ private:

WebLayer* contentsLayerIfRegistered();

typedef HashMap<int, int> RenderingContextMap;

- PassRefPtr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const;

+ std::unique_ptr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const;

#if DCHECK_IS_ON()

PassRefPtr<SkPicture> capturePicture();