Source/WebCore/WebCore.gyp/WebCore.gyp - Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

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

Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/WebCore.gyp/WebCore.gyp

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

--- Source/WebCore/WebCore.gyp/WebCore.gyp (revision 88458)

+++ Source/WebCore/WebCore.gyp/WebCore.gyp (working copy)

@@ -1148,6 +1148,10 @@

'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',

'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',

'WebFontCache=ChromiumWebCoreObjCWebFontCache',

+ 'ScrollAnimationHelperDelegate=ChromiumWebCoreObjCScrollAnimationHelperDelegate',

+ 'ScrollbarPainterControllerDelegate=ChromiumWebCoreObjCScrollbarPainterControllerDelegate',

+ 'ScrollbarPainterDelegate=ChromiumWebCoreObjCScrollbarPainterDelegate',

+ 'ScrollbarPartAnimation=ChromiumWebCoreObjCScrollbarPartAnimation',

'include_dirs': [

'../../../WebKitLibraries',

@@ -1366,6 +1370,7 @@

['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],

['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],

['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],

+ ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],

['include', 'platform/graphics/mac/IntRectMac\\.mm$'],

['include', 'platform/mac/BlockExceptions\\.mm$'],

['include', 'platform/mac/KillRingMac\\.mm$'],

« no previous file with comments | « Source/WebCore/WebCore.gypi ('k') | Source/WebCore/platform/ScrollAnimator.cpp » ('j') | no next file with comments »