webkit/webkit.gyp - Issue 126148: Webkit merge from 44668 to 44682.

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/webkit.gyp

Issue 126148: Webkit merge from 44668 to 44682. (Closed)

Patch Set: passes lint Created 11 years, 6 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: webkit/webkit.gyp

diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp

index 7c54e1ec982ac11a5c176f7f86d16a1b2004aa04..7b13201bfe62af2d646cf6a54d1aea752b59f59c 100644

--- a/webkit/webkit.gyp

+++ b/webkit/webkit.gyp

@@ -1839,6 +1839,8 @@

'../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.h',

'../third_party/WebKit/WebCore/inspector/InspectorFrontend.cpp',

'../third_party/WebKit/WebCore/inspector/InspectorFrontend.h',

+ '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.cpp',

+ '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.h',

'../third_party/WebKit/WebCore/inspector/InspectorResource.cpp',

'../third_party/WebKit/WebCore/inspector/InspectorResource.h',

'../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.cpp',

@@ -1850,8 +1852,6 @@

'../third_party/WebKit/WebCore/inspector/JavaScriptProfile.h',

'../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.cpp',

'../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.h',

- '../third_party/WebKit/WebCore/inspector/JSONObject.cpp',

- '../third_party/WebKit/WebCore/inspector/JSONObject.h',

'../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.cpp',

'../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.h',

'../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheGroup.cpp',

« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »