Source/platform/blink_platform.gypi - Issue 892293002: First version of new merge algorithm (not enabled yet)

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/platform/blink_platform.gypi

Issue 892293002: First version of new merge algorithm (not enabled yet) (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Remove scope-related code (accidentally mixed in this CL) Created 5 years, 10 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/platform/blink_platform.gypi

diff --git a/Source/platform/blink_platform.gypi b/Source/platform/blink_platform.gypi

index 7d74684064f1ebcac1af5ee7106ae9be334a8cf5..69c5f43e74b654383872d69320d38f4a24f79aa4 100644

--- a/Source/platform/blink_platform.gypi

+++ b/Source/platform/blink_platform.gypi

@@ -656,6 +656,7 @@

'graphics/paint/FloatClipDisplayItem.h',

'graphics/paint/ScrollDisplayItem.cpp',

'graphics/paint/ScrollDisplayItem.h',

+ 'graphics/paint/SubtreeDisplayItem.h',

'graphics/paint/Transform3DDisplayItem.cpp',

'graphics/paint/Transform3DDisplayItem.h',

'graphics/paint/TransformDisplayItem.cpp',