Bug 190021 - Fix IOSMAC build
Summary: Fix IOSMAC build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Sihui Liu
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-09-26 18:03 PDT by Sihui Liu
Modified: 2018-09-27 14:03 PDT (History)
7 users (show)

See Also:


Attachments
Patch (2.31 KB, patch)
2018-09-26 18:08 PDT, Sihui Liu
no flags Details | Formatted Diff | Diff
Patch (2.48 KB, patch)
2018-09-26 22:29 PDT, Sihui Liu
no flags Details | Formatted Diff | Diff
Patch (1.23 KB, patch)
2018-09-27 13:16 PDT, Sihui Liu
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sihui Liu 2018-09-26 18:03:39 PDT
NetworkProcess::parentProcessHasServiceWorkerEntitlement() not exists in PLATFORM(IOSMAC)
Comment 1 Sihui Liu 2018-09-26 18:08:25 PDT
Created attachment 350931 [details]
Patch
Comment 2 Sihui Liu 2018-09-26 22:29:20 PDT
Created attachment 350942 [details]
Patch
Comment 3 Alex Christensen 2018-09-27 08:56:05 PDT
Comment on attachment 350942 [details]
Patch

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

Did you verify this fixes the build?  If so, is there a way to just include NetworkProcessIOS in that build instead?

> Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm:275
> +#if !PLATFORM(IOSMAC)

With things like this, we usually have the positive form first:
#if PLATFORM(IOSMAC)
Comment 4 Sihui Liu 2018-09-27 09:19:14 PDT
(In reply to Alex Christensen from comment #3)
> Comment on attachment 350942 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=350942&action=review
> 
> Did you verify this fixes the build?  If so, is there a way to just include
> NetworkProcessIOS in that build instead?
> 
I am trying to build now. This patch would most likely fix the build because we have #if PLATFORM(IOS) && !PLATFORM(IOSMAC) in NetworkProcessIOS.mm.

I will also try remove #if PLATFORM(IOS) && !PLATFORM(IOSMAC) from NetworkProcessIOS.mm.

> > Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm:275
> > +#if !PLATFORM(IOSMAC)
> 
> With things like this, we usually have the positive form first:
> #if PLATFORM(IOSMAC)
Gotta
Comment 5 Sihui Liu 2018-09-27 13:16:22 PDT
Created attachment 350990 [details]
Patch
Comment 6 WebKit Commit Bot 2018-09-27 14:01:28 PDT
Comment on attachment 350990 [details]
Patch

Clearing flags on attachment: 350990

Committed r236568: <https://trac.webkit.org/changeset/236568>
Comment 7 WebKit Commit Bot 2018-09-27 14:01:30 PDT
All reviewed patches have been landed.  Closing bug.
Comment 8 Radar WebKit Bug Importer 2018-09-27 14:03:30 PDT
<rdar://problem/44842952>