Bug 128513 - Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but not iOS”
Summary: Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: mitz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-09 20:34 PST by mitz
Modified: 2014-02-10 22:16 PST (History)
2 users (show)

See Also:

Attachments
Change PLATFORM(MAC), do some moves and renames (24.23 KB, patch)
2014-02-09 20:41 PST, mitz 		dino: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description mitz 2014-02-09 20:34:20 PST 
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.
Comment 1 mitz 2014-02-09 20:41:35 PST 
Created attachment 223670 [details]
Change PLATFORM(MAC), do some moves and renames
Comment 2 Dean Jackson 2014-02-09 21:16:22 PST 
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!
Comment 3 mitz 2014-02-09 21:21:02 PST 
(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.
Comment 4 Anders Carlsson 2014-02-10 13:20:00 PST 
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.
Comment 5 mitz 2014-02-10 22:16:55 PST 
Committed <http://trac.webkit.org/r163862>.