Merge config.h.in with webkit's config.h (Step 1)

Chromium today has its own config.h (over here 
http://src.chromium.org/svn/trunk/src/webkit/config.h.in), which was forked 
a while back from webkit's config.h. I'm preparing the ground for the webkit 
port, I'm depreciating chromium's config.h and moving its chromium-specific
defines into the ifdef PLATFORM(CHROMIUM) section of webkit's config.h.

Due the complexity of this step, it is broken into three steps:
Step 1: Merge in changes from webkit's config.h into chromium's config.h.in. 
Step 2: Copy config.h.in into webkit as the new config.h.
Step 3: Delete chromiums config.h.in and make it use webkit's config.h.

THIS PATCH IS FOR STEP 1.

Closed by mark on 2009-10-24.  As far as I'm aware, all of this stuff has been checked in.

[yaar, 2009-09-08 23:19:50]

Some inline comments about my various changes.

http://codereview.chromium.org/201056/diff/1/2
File webkit/config.h.in (left):

http://codereview.chromium.org/201056/diff/1/2#oldcode75
Line 75: #define WTF_CHANGES 1
PLATFORM(WX) section was recently moved down this file (see below).
!PLATFORM(SYMBIAN) was removed from upstream config.h in
http://trac.webkit.org/browser/trunk/WebCore/config.h?rev=38183

http://codereview.chromium.org/201056/diff/1/2#oldcode121
Line 121: #include <snprintf.h>
Removed from upstream config.h a long time ago.

http://codereview.chromium.org/201056/diff/1/2#oldcode156
Line 156: 
These defines moved into webkit.gyp (perpetual todo won't do in webkit)

http://codereview.chromium.org/201056/diff/1/2#oldcode161
Line 161: #define WTF_PLATFORM_SKIA 1
Skia define copied (see above)

http://codereview.chromium.org/201056/diff/1/2#oldcode164
Line 164: 
CG & CF actually properly set only on MAC (see wtf's platform.h), so removed
them.

http://codereview.chromium.org/201056/diff/1/2#oldcode211
Line 211: #endif // ifndef WEBCORE_NAVIGATOR_VENDOR
Moved to webkit.gyp where more appropriate.

http://codereview.chromium.org/201056/diff/1/2
File webkit/config.h.in (right):

http://codereview.chromium.org/201056/diff/1/2#newcode41
Line 41: #endif
Changes from upstream config.h

http://codereview.chromium.org/201056/diff/1/2#newcode118
Line 118: #else
Copied from upstream config.h

http://codereview.chromium.org/201056/diff/1/2#newcode123
Line 123: #endif
Copied from upstream config.h

http://codereview.chromium.org/201056/diff/1/2#newcode142
Line 142: 
Copied from upstream config.h

http://codereview.chromium.org/201056/diff/1/2#newcode182
Line 182: // TODO(yaar): clean this up once config.h.in is upstreamed back to
webkit.
Took ownership of this.

http://codereview.chromium.org/201056/diff/1/3
File webkit/webkit.gyp (right):

http://codereview.chromium.org/201056/diff/1/3#newcode34
Line 34: 'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
Used to be in config.h.in but moved here, since config.h.in will be upstreamed.

http://codereview.chromium.org/201056/diff/1/3#newcode123
Line 123: 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
Moved this perpetual todo from config.h.in into this file, since don't want to
commit this into webkit's config.h.

[dglazkov, 2009-09-09 03:16:07]

LGTM, defer to Magic Mark for ObjC-related changes.

[Mark Mentovai, 2009-09-09 14:03:32]

http://codereview.chromium.org/201056/diff/1/3
File webkit/webkit.gyp (right):

http://codereview.chromium.org/201056/diff/1/3#newcode106
Line 106: # Chromium's version of WebCore includes the following Objective-C
classes.
Watch the 80-column limit here.

http://codereview.chromium.org/201056/diff/1/3#newcode115
Line 115: # This list will hopefully shrink but may also grow. Periodically
The original comment said TODO(mark), this should retain the TODO so that
someone (like me) can periodically maintain the list.

http://codereview.chromium.org/201056/diff/1/3#newcode121
Line 121: 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
I really don't like defining these on the command line.  Our command lines are
already terrible as they stand right now.  I had asked that these be added to
config.h when it's built from config.h.in.

Are we still going to be building config.h from config.h.in?

[yaar, 2009-09-09 16:40:31]

Mark, thanks for the feedback. See my comments below.

http://codereview.chromium.org/201056/diff/1/3
File webkit/webkit.gyp (right):

http://codereview.chromium.org/201056/diff/1/3#newcode106
Line 106: # Chromium's version of WebCore includes the following Objective-C
classes.
On 2009/09/09 14:03:32, Mark Mentovai wrote:
> Watch the 80-column limit here.
Will fix.

http://codereview.chromium.org/201056/diff/1/3#newcode115
Line 115: # This list will hopefully shrink but may also grow. Periodically
On 2009/09/09 14:03:32, Mark Mentovai wrote:
> The original comment said TODO(mark), this should retain the TODO so that
> someone (like me) can periodically maintain the list.

Will fix.

http://codereview.chromium.org/201056/diff/1/3#newcode121
Line 121: 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
On 2009/09/09 14:03:32, Mark Mentovai wrote:
> I really don't like defining these on the command line.  Our command lines are
> already terrible as they stand right now.  I had asked that these be added to
> config.h when it's built from config.h.in.


I agree with you, but I'm doing this one step at a time, since the process is
delicate enough and this whole target is going to change quite a bit (see
below). I will add a TODO(yaar) here to move out of command line. I haven't
figured out yet where they will go instead. Will discuss this with you once I
get there.

 > Are we still going to be building config.h from config.h.in?

The plan is to move back to using webkit's config.h. But I'm in step 1, of
making config.h.in as similar as possible to config.h. Step 2 will be to merge
config.h.in into webkit's config.h, and step 3 will be to point webkit.gyp at
webkit's config.h. When that is done, I'll start refactoring the build system as
I described in the "Webkit Chromium Port" email I sent yesterday.

[yaar, 2009-09-09 17:22:20]

http://codereview.chromium.org/201056/diff/2003/2005
File webkit/webkit.gyp (right):

http://codereview.chromium.org/201056/diff/2003/2005#newcode125
Line 125:
'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
Could not shorten/break this line.