third_party/WebKit/Source/core/layout/LayoutObject.cpp - Issue 1381023002: NOCOMMIT: Blink tracing now uses base

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/LayoutObject.cpp

Issue 1381023002: NOCOMMIT: Blink tracing now uses base Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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/layout/LayoutAnalyzer.cpp ('k') | third_party/WebKit/Source/core/layout/TracedLayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp

index 6b16e5a11a8659c4bceacf1ed27419fd3037410a..078c08515a51a0ff2b76734582442ea2795da711 100644

--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp

@@ -1150,9 +1150,9 @@ void addJsonObjectForPoint(TracedValue* value, const char* name, const T& point)

value->endDictionary();

}

-static PassRefPtr<TraceEvent::ConvertableToTraceFormat> jsonObjectForPaintInvalidationInfo(const LayoutRect& rect, const String& invalidationReason)

+static scoped_refptr<base::trace_event::ConvertableToTraceFormat> jsonObjectForPaintInvalidationInfo(const LayoutRect& rect, const String& invalidationReason)

{

- RefPtr<TracedValue> value = TracedValue::create();

+ scoped_refptr<TracedValue> value = TracedValue::create();

addJsonObjectForRect(value.get(), "rect", rect);

value->setString("invalidation_reason", invalidationReason);

return value;

@@ -1270,9 +1270,9 @@ void LayoutObject::invalidatePaintOfSubtreesIfNeeded(PaintInvalidationState& chi

}

-static PassRefPtr<TraceEvent::ConvertableToTraceFormat> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutPoint& oldLocation, const LayoutRect& newRect, const LayoutPoint& newLocation)

+static scoped_refptr<base::trace_event::ConvertableToTraceFormat> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutPoint& oldLocation, const LayoutRect& newRect, const LayoutPoint& newLocation)

{

- RefPtr<TracedValue> value = TracedValue::create();

+ scoped_refptr<TracedValue> value = TracedValue::create();

addJsonObjectForRect(value.get(), "oldRect", oldRect);

addJsonObjectForPoint(value.get(), "oldLocation", oldLocation);

addJsonObjectForRect(value.get(), "newRect", newRect);