Source/WebCore/inspector/front-end/CPUProfileView.js - Issue 12626002: Merge 143438

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: Source/WebCore/inspector/front-end/CPUProfileView.js

Issue 12626002: Merge 143438 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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: Source/WebCore/inspector/front-end/CPUProfileView.js

===================================================================

--- Source/WebCore/inspector/front-end/CPUProfileView.js (revision 145087)

+++ Source/WebCore/inspector/front-end/CPUProfileView.js (working copy)

@@ -295,7 +295,7 @@

profileDataGridNode._searchMatchedCallsColumn = true;

}

- if (profileDataGridNode.functionName.match(matcher) || profileDataGridNode.url.match(matcher))

+ if (profileDataGridNode.functionName.match(matcher) || (profileDataGridNode.url && profileDataGridNode.url.match(matcher)))

profileDataGridNode._searchMatchedFunctionColumn = true;

if (profileDataGridNode._searchMatchedSelfColumn ||

« no previous file with comments | « no previous file | no next file » | no next file with comments »