Bug 139695

Summary: [iOS] WTF fails to build with public SDK due to missing header CPAggregateDictionary.h
Product: WebKit Reporter: Daniel Bates <dbates>
Component: Tools / TestsAssignee: Daniel Bates <dbates>
Status: RESOLVED FIXED    
Severity: Normal CC: barraclough, benjamin, cdumez, cmarcelo, commit-queue, ddkilzer
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: iPhone / iPad   
OS: iOS 8.1   
Attachments:
Description Flags
Patch
none
Patch
none
Patch none

Description Daniel Bates 2014-12-16 12:34:49 PST 
Following the patch for bug #139652, WTF failed to build with the public iOS SDK since the patch depends on the existence of header AppSupport/CPAggregateDictionary.h, which does not exist in the public iOS SDK. We should create a SPI wrapper header for CPAggregateDictionary.h that includes AppSupport/CPAggregateDictionary.h and forward declares the applicable SPI functions when building with the Apple Internal SDK and public iOS SDK, respectively.
Comment 1 Daniel Bates 2014-12-16 12:38:19 PST 
Created attachment 243377 [details]
Patch
Comment 2 Chris Dumez 2014-12-16 13:14:17 PST 
Comment on attachment 243377 [details]
Patch

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

> Source/WTF/wtf/ios/FeatureCounter.mm:29
>  #if PLATFORM(IOS)

Why cannot we just and "&& USE(APPLE_INTERNAL_SDK)" here?
Comment 3 Daniel Bates 2014-12-16 13:22:47 PST 
(In reply to comment #2)
> Comment on attachment 243377 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=243377&action=review
> 
> > Source/WTF/wtf/ios/FeatureCounter.mm:29
> >  #if PLATFORM(IOS)
> 
> Why cannot we just and "&& USE(APPLE_INTERNAL_SDK)" here?

We can. I assumed we wanted to count features in WebKit built with the public SDK.
Comment 4 Chris Dumez 2014-12-16 13:24:15 PST 
Comment on attachment 243377 [details]
Patch

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

>>> Source/WTF/wtf/ios/FeatureCounter.mm:29
>>>  #if PLATFORM(IOS)
>> 
>> Why cannot we just and "&& USE(APPLE_INTERNAL_SDK)" here?
> 
> We can. I assumed we wanted to count features in WebKit built with the public SDK.

I don't believe we want to do feature counting for anything else than Safari / MobileSafari at the moment.
Comment 5 Daniel Bates 2014-12-16 13:26:35 PST 
Created attachment 243384 [details]
Patch
Comment 6 Daniel Bates 2014-12-16 13:27:50 PST 
Comment on attachment 243384 [details]
Patch

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

> Source/WTF/ChangeLog:9
> +        as we only interested in counting features in builds of iOS WebKit that were built

we only => we are only
Comment 7 Chris Dumez 2014-12-16 13:28:12 PST 
Comment on attachment 243384 [details]
Patch

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

> Source/WTF/wtf/ios/FeatureCounter.mm:29
> +#if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)

The #endif comment should be updated.

We should also update the #if check in FeatureCounter.cpp otherwise we are going to get linking errors with the public SDK on iOS
Comment 8 Daniel Bates 2014-12-16 13:41:46 PST 
Created attachment 243387 [details]
Patch
Comment 9 Chris Dumez 2014-12-16 13:44:00 PST 
Comment on attachment 243387 [details]
Patch

r=me, thanks.
Comment 10 Daniel Bates 2014-12-16 13:46:49 PST 
Comment on attachment 243387 [details]
Patch

Clearing flags on attachment: 243387

Committed r177394: <http://trac.webkit.org/changeset/177394>
Comment 11 Daniel Bates 2014-12-16 13:46:55 PST 
All reviewed patches have been landed.  Closing bug.