Fix compile errors when building iOS WebKit using the iOS 10 beta SDK.
Created attachment 285705 [details] Patch
Attachment 285705 [details] did not pass style-queue: ERROR: Source/JavaScriptCore/config.h:52: "wtf/Platform.h" already included at Source/JavaScriptCore/config.h:26 [build/include] [4] ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:31: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:37: "PassKit/PassKit.h" already included at Source/WebCore/platform/spi/cocoa/PassKitSPI.h:30 [build/include] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:63: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:64: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:65: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:68: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WebKit/mac/WebKitPrefix.h:68: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 8 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 285705 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=285705&action=review > Source/JavaScriptCore/config.h:52 > +#include <wtf/Platform.h> Will remove before landing.
Looks like this is breaking the build.
Created attachment 285875 [details] Patch
Attachment 285875 [details] did not pass style-queue: ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:31: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:37: "PassKit/PassKit.h" already included at Source/WebCore/platform/spi/cocoa/PassKitSPI.h:30 [build/include] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:33: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:34: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:35: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:38: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WebKit/mac/WebKitPrefix.h:38: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 7 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 285876 [details] Patch
Attachment 285876 [details] did not pass style-queue: ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:31: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:37: "PassKit/PassKit.h" already included at Source/WebCore/platform/spi/cocoa/PassKitSPI.h:30 [build/include] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:33: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:34: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:35: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/mac/WebKitPrefix.h:38: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WebKit/mac/WebKitPrefix.h:38: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 7 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
The stuff in CoreTextSPI looks fine to me.
Created attachment 285995 [details] Patch Updated the patch to disable OS_LOG when building with the iOS 10 beta SDK as per an in-person conversation with Sam Weinig. Once we fix <rdar://problem/27758343> we can enable OS_LOG when building with iOS 10 beta SDK.
Attachment 285995 [details] did not pass style-queue: ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:31: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:37: "PassKit/PassKit.h" already included at Source/WebCore/platform/spi/cocoa/PassKitSPI.h:30 [build/include] [4] ERROR: Source/WTF/wtf/Platform.h:1178: CPP comments are not allowed in Platform.h, please use C comments /* ... */ [build/cpp_comment] [5] ERROR: Source/WTF/wtf/Platform.h:1178: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WTF/wtf/Platform.h:1178: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 5 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style.
Committed r204456: <http://trac.webkit.org/changeset/204456>