Bug 174430 – Add iOS 11 SPI

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Jonathan Bedard]

Add iOS 11 SPI required to build WebKit with the iOS 11 SDK.

[Radar WebKit Bug Importer]

<rdar://problem/33269288>

[Jonathan Bedard]

Created attachment 315266 [details]
Patch

[Build Bot]

Attachment 315266 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:110:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:111:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:118:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:53:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:54:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:60:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:51:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:52:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 8 in 21 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Jonathan Bedard]

Created attachment 315462 [details]
Patch

[Jonathan Bedard]

(In reply to Jonathan Bedard from comment #4)
> Created attachment 315462 [details]
> Patch

Needed to rebase the patch due to the WebKit2->WebKit, WebKit->WebKitLegacy move.

[Build Bot]

Attachment 315462 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:110:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:111:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:118:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:53:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:54:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:60:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:51:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:52:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 8 in 21 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Tim Horton]

Comment on attachment 315462 [details]
Patch

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

> Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp:46
> -#include <MacErrors.h>
> +static const int fnfErr = -43;

I still see this header in my SDK, but w/e.

> Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h:41
>  

Shouldn't we just make it (PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) above instead? Not sure.

> Source/WebCore/platform/spi/ios/UIKitSPI.h:98
> +#ifndef _WEBKIT_UIKITSPI_UIITEMPROVIDER

What

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:971
> -void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);
> +void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void * contextInfo);

Star's still on the wrong side.

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:992
> +@interface UITapGestureRecognizer ()
> +- (void)setDelegate:(id)delegate;
> +@end

This seems wrong; setDelegate is API on UIGestureRecognizer (which UITapGestureRecognizer inherits from)

> Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:49
> ++ (UIItemProvider*) itemProviderWithURL:(NSURL *)url title:(NSString *)title;

space before star, no space after )

> Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:63
> +@interface NSAttributedString (UIItemProvederReadingWriting) <UIItemProviderReading, UIItemProviderWriting>

Proveder!

[Jonathan Bedard]

Comment on attachment 315462 [details]
Patch

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

>> Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h:41
>>  
> 
> Shouldn't we just make it (PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) above instead? Not sure.

Good point, need to test this

>> Source/WebCore/platform/spi/ios/UIKitSPI.h:98
>> +#ifndef _WEBKIT_UIKITSPI_UIITEMPROVIDER
> 
> What

DumpRenderTree can include WebCore headers but WebKitTestRunner can't.  We do the same thing with _WEBKIT_UIKITSPI_UIKEYBOARD.  Its unfortunate.  That's why there's a bug.

[Jonathan Bedard]

Created attachment 315485 [details]
Patch

[Build Bot]

Attachment 315485 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:110:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:111:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/spi/ios/UIKitSPI.h:118:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:53:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:54:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:60:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:51:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:52:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 8 in 21 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Wenson Hsieh]

Comment on attachment 315485 [details]
Patch

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

> Source/WebCore/platform/sql/SQLiteFileSystem.cpp:40
> +#include "sqlite3SPI.h"

"SQLiteSPI.h" would follow our WebCore header conventions better. I assume you're using sqliteSPI.h here to match the style of the platform header, but there are other places (e.g. XPCSPI.h) where even though the original platform header is lowercase (xpc.h), we still uppercase it for our private header.

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:878
> +#ifndef _WEBKIT_UIKITSPI_UIITEMPROVIDER

As we discussed in person, let's see if we can avoid having to add this :P

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:885
> +#endif

We can rename the ENABLE(DATA_INTERACTION) above to ENABLE(DRAG_SUPPRT) and remove the #endif here and the #if ENABLE_DRAG_SUPPORT) right below.

[Build Bot]

Comment on attachment 315485 [details]
Patch

Attachment 315485 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.webkit.org/results/4121517

New failing tests:
security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html

[Build Bot]

Created attachment 315493 [details]
Archive of layout-test-results from ews101 for mac-elcapitan

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: ews101  Port: mac-elcapitan  Platform: Mac OS X 10.11.6

[Jonathan Bedard]

Created attachment 315497 [details]
Patch

[Tim Horton]

Comment on attachment 315497 [details]
Patch

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

> Source/WTF/Configurations/WTF.xcconfig:33
> +EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator11*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(USE_INTERNAL_SDK))

This should be inverted so that it remains true in future.

> Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h:44
> +// iOS 11 has this value defined.

I don't think we need the comment.

> Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h:135
> ++ (CATransactionPhase) currentPhase;

No space after the ). Also this is available on Mac too!

> Source/WebCore/platform/spi/ios/UIKitSPI.h:88
> +@interface NSURL (UIKit_Private)

Leave all the category names blank (make them class extensions or whatever)

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:310
> +#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100

I can't imagine we still need this

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:332
> +@property (nonatomic, setter=_setContentInsetAdjustmentBehavior:, getter=_contentInsetAdjustmentBehavior) UIScrollViewContentInsetAdjustmentBehavior _contentInsetAdjustmentBehavior;

Shoudn't need this. If anybody's calling it, they should be using the one without the underscore.

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:341
> +@interface UITapGestureRecognizer (UITapGestureRecognizer)

Blank

> Source/WebKit/Platform/spi/ios/UIKitSPI.h:915
> ++ (UITextEffectsWindow *) sharedTextEffectsWindow;

No space after )

> Source/WebKitLegacy/Storage/StorageTracker.cpp:44
> -#include <sqlite3_private.h>
> +#define SQLITE_TRUNCATE_DATABASE 101

You should be able to use your nice SPI header if you just make it private (like some of the other WebCore ones are!).

> Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:49
> ++ (UIItemProvider *) itemProviderWithURL:(NSURL *)url title:(NSString *)title;

Spaces after ) again

> Tools/TestWebKitAPI/ios/DataInteractionSimulator.h:40
> +@interface NSURL (UIKit_Private)

Drop all the category names.

[Jonathan Bedard]

Created attachment 315506 [details]
Patch

[Build Bot]

Comment on attachment 315506 [details]
Patch

Attachment 315506 [details] did not pass mac-debug-ews (mac):
Output: http://webkit-queues.webkit.org/results/4122680

New failing tests:
security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html

[Build Bot]

Created attachment 315520 [details]
Archive of layout-test-results from ews116 for mac-elcapitan

The attached test failures were seen while running run-webkit-tests on the mac-debug-ews.
Bot: ews116  Port: mac-elcapitan  Platform: Mac OS X 10.11.6

[Build Bot]

Comment on attachment 315506 [details]
Patch

Attachment 315506 [details] did not pass ios-sim-ews (ios-simulator-wk2):
Output: http://webkit-queues.webkit.org/results/4122913

New failing tests:
imported/w3c/IndexedDB-private-browsing/idbfactory_open12.html

[Build Bot]

Created attachment 315525 [details]
Archive of layout-test-results from ews124 for ios-simulator-wk2

The attached test failures were seen while running run-webkit-tests on the ios-sim-ews.
Bot: ews124  Port: ios-simulator-wk2  Platform: Mac OS X 10.12.5

[Jonathan Bedard]

Comment on attachment 315506 [details]
Patch

These test failures are unrelated to this patch.

[WebKit Commit Bot]

Comment on attachment 315506 [details]
Patch

Clearing flags on attachment: 315506

Committed r219537: <http://trac.webkit.org/changeset/219537>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Jonathan Bedard]

Build fix committed in <http://trac.webkit.org/changeset/219538>.