cc/stubs/config.h - Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: cc/stubs/config.h

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CC_STUBS_CONFIG_H_	5 #ifndef CC_STUBS_CONFIG_H_

6 #define CC_STUBS_CONFIG_H_	6 #define CC_STUBS_CONFIG_H_

7	7

8 // Chromium's LOG() macro collides with one from WTF.	8 // Chromium's LOG() macro collides with one from WTF.

9	9

	10 #if 0

10 #if INSIDE_WEBKIT_BUILD	11 #if INSIDE_WEBKIT_BUILD
	jamesr 2012/11/10 01:12:18 just delete this file just delete this file piman 2012/11/10 01:28:36 Doh, I meant to. Done. Show quoted text On 2012/11/10 01:12:18, jamesr wrote: > just delete this file Doh, I meant to. Done.
11 #include "Source/WTF/config.h"	12 #include "Source/WTF/config.h"

12 #else	13 #else

13 #include "third_party/WebKit/Source/WTF/config.h"	14 #include "third_party/WebKit/Source/WTF/config.h"

14 #endif	15 #endif

15	16

16 #include <wtf/Assertions.h>	17 #include <wtf/Assertions.h>

17 #ifdef LOG	18 #ifdef LOG

18 #undef LOG	19 #undef LOG

19 #endif	20 #endif

	21 #endif

20	22

21 #endif // CC_STUBS_CONFIG_H_	23 #endif // CC_STUBS_CONFIG_H_

OLD	NEW