Bug 152950 – [Cocoa] Add SPI to opt out a URL scheme from the memory cache

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Andy Estes]

[Cocoa] Add SPI to opt out a URL scheme from the memory cache

[Andy Estes]

rdar://problem/24066652

[Andy Estes]

Created attachment 268632 [details]
Patch

[Andy Estes]

Created attachment 268641 [details]
Patch

[Tim Horton]

Comment on attachment 268641 [details]
Patch

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

> Source/WebKit2/Shared/WebProcessCreationParameters.h:99
>      Vector<String> urlSchemesRegisteredAsCORSEnabled;
> +    Vector<String> urlSchemesToRegisterAsAlwaysRevalidated;

"RegisteredAs" vs. "ToRegisterAs"?

> Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:38
> +@property (nonatomic, copy) WK_ARRAY(NSString *) *alwaysRevalidatedURLSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);

Do we still need to do the WK_ARRAY dance?

[Andy Estes]

(In reply to comment #4)
> Comment on attachment 268641 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=268641&action=review
> 
> > Source/WebKit2/Shared/WebProcessCreationParameters.h:99
> >      Vector<String> urlSchemesRegisteredAsCORSEnabled;
> > +    Vector<String> urlSchemesToRegisterAsAlwaysRevalidated;
> 
> "RegisteredAs" vs. "ToRegisterAs"?

Ah, yeah. I'll fix this in a follow-up.

> 
> > Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:38
> > +@property (nonatomic, copy) WK_ARRAY(NSString *) *alwaysRevalidatedURLSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
> 
> Do we still need to do the WK_ARRAY dance?

Not sure. I think it's ok to use it now. Presumably we'll remove the macros when the time is right.

Thanks for the review!

[WebKit Commit Bot]

Comment on attachment 268641 [details]
Patch

Clearing flags on attachment: 268641

Committed r194866: <http://trac.webkit.org/changeset/194866>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[WebKit Commit Bot]

Re-opened since this is blocked by bug 152986

[Ryan Haddad]

/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:31:20: error: expected parameter declarator
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:31:20: error: expected ')'
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:32:1: error: expected function body after function declarator
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:35:1: error: unexpected '@' in program
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:36:1: error: unexpected '@' in program
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:37:1: error: unexpected '@' in program
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:38:1: error: unexpected '@' in program
/Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.framework/PrivateHeaders/_WKProcessPoolConfiguration.h:40:1: error: '@end' must appear in an Objective-C context
/Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/AppDelegate.m:78:73: error: receiver '_WKProcessPoolConfiguration' is a forward class and corresponding @interface may not exist [-Werror,-Wreceiver-forward-class]
/Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/AppDelegate.m:78:108: error: 'init' is deprecated: first deprecated in OS X 10.11 - Use -initWithConcurrencyType: instead [-Werror,-Wdeprecated-declarations]
/Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/AppDelegate.m:79:40: error: property 'maximumProcessCount' cannot be found in forward class object '_WKProcessPoolConfiguration'

<https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20%28Build%29/builds/2571>

[Andy Estes]

(In reply to comment #9)
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:31:20: error:
> expected parameter declarator
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:31:20: error:
> expected ')'
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:32:1: error: expected
> function body after function declarator
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:35:1: error:
> unexpected '@' in program
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:36:1: error:
> unexpected '@' in program
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:37:1: error:
> unexpected '@' in program
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:38:1: error:
> unexpected '@' in program
> /Volumes/Data/slave/elcapitan-release/build/WebKitBuild/Release/WebKit.
> framework/PrivateHeaders/_WKProcessPoolConfiguration.h:40:1: error: '@end'
> must appear in an Objective-C context
> /Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/
> AppDelegate.m:78:73: error: receiver '_WKProcessPoolConfiguration' is a
> forward class and corresponding @interface may not exist
> [-Werror,-Wreceiver-forward-class]
> /Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/
> AppDelegate.m:78:108: error: 'init' is deprecated: first deprecated in OS X
> 10.11 - Use -initWithConcurrencyType: instead
> [-Werror,-Wdeprecated-declarations]
> /Volumes/Data/slave/elcapitan-release/build/Tools/MiniBrowser/mac/
> AppDelegate.m:79:40: error: property 'maximumProcessCount' cannot be found
> in forward class object '_WKProcessPoolConfiguration'
> 
> <https://build.webkit.org/builders/
> Apple%20El%20Capitan%20Release%20%28Build%29/builds/2571>

Ah, this is strange. The WKFoundation.h in WebKitBuild/Release/WebKit.framework/Headers/ was created before header post-processing was disabled on El Capitan, so the macros that should replace WK_CLASS_AVAILABLE, WK_AVAILABLE, and WK_ARRAY in _WKProcessPoolConfiguration.h were removed by the "Postprocess WKFoundation.h" build phase. With the header post-processing build phase now disabled, but no changes made to WKFoundation.h that would cause it to be re-postprocessed, there is nothing to handle the WK_* macros in _WKProcessPoolPrivate.h.

This could be fixed by a clean build on the bots, or a whitespace-only change to WKFoundation.h, or possibly by an even more robust solution that I'm not aware of.

[Andy Estes]

(In reply to comment #10)
> 
> ... there is nothing to handle the WK_* macros in _WKProcessPoolPrivate.h.
> 

_WKProcessPoolConfiguration.h, that is.

[Andy Estes]

Committed r194880: <http://trac.webkit.org/changeset/194880>