Bug 128513 – Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but not iOS”

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

So that we can make PLATFORM(MAC) false when building for iOS, we need to replace all uses of it that don’t take iOS into account. Most such uses are about building for Cocoa, using Core Foundation, or using Foundation.

Created attachment 223670 [details]
Change PLATFORM(MAC), do some moves and renames

[Dean Jackson]

Comment on attachment 223670 [details]
Change PLATFORM(MAC), do some moves and renames

View in context: https://bugs.webkit.org/attachment.cgi?id=223670&action=review

> Source/WebKit2/ChangeLog:3
> +        Stop using PLATFORM(MAC) in WebKit2/platform except where it means âOS X but not iOSâ

I assume your smart quotes were just munged by the review tool.

> Source/WebKit2/Platform/cf/ModuleCF.cpp:27
> +#import "config.h"
> +#import "Module.h"

Did you mean #include?

> Source/WebKit2/Platform/cf/ModuleCF.cpp:27
> -#import "config.h"
> -#import "Module.h"
> +#include "config.h"
> +#include "Module.h"

I'm confused by this patch. It seems ModuleCF.cpp has two separate patch entries!

(In reply to comment #2)
> (From update of attachment 223670 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=223670&action=review
> 
> > Source/WebKit2/ChangeLog:3
> > +        Stop using PLATFORM(MAC) in WebKit2/platform except where it means âOS X but not iOSâ
> 
> I assume your smart quotes were just munged by the review tool.

See bug 75394.

> 
> > Source/WebKit2/Platform/cf/ModuleCF.cpp:27
> > +#import "config.h"
> > +#import "Module.h"
> 
> Did you mean #include?
> 
> > Source/WebKit2/Platform/cf/ModuleCF.cpp:27
> > -#import "config.h"
> > -#import "Module.h"
> > +#include "config.h"
> > +#include "Module.h"
> 
> I'm confused by this patch. It seems ModuleCF.cpp has two separate patch entries!

This is how svn-create-patch represents a rename and an edit in the renamed file.

[Anders Carlsson]

Comment on attachment 223670 [details]
Change PLATFORM(MAC), do some moves and renames

View in context: https://bugs.webkit.org/attachment.cgi?id=223670&action=review

> Source/WebKit2/Platform/Logging.cpp:70
> -#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
> +#if !USE(FOUNDATION) && !PLATFORM(GTK) && !PLATFORM(EFL)
>  String logLevelString()

How about we just get rid of this logLevelString() since nobody includes it anyway.

Committed <http://trac.webkit.org/r163862>.