Attachment 341411 Details for Bug 186016 – Patch to see if anything breaks

[patch] Patch to see if anything breaks

file_186016.txt (text/plain), 23.41 KB, created by mitz on 2018-05-26 16:06:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: mitz

Created: 2018-05-26 16:06:40 PDT

Size: 23.41 KB

patch

obsolete

>Index: Source/WebCore/Configurations/WebCore.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/WebCore.xcconfig	(revision 232225)
>+++ Source/WebCore/Configurations/WebCore.xcconfig	(working copy)
>@@ -40,9 +40,6 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
> 
> LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
>-ADDITIONAL_CFLAGS = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks;
>-OTHER_CFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
>-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
> 
> WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
> LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
>Index: Source/WebCore/PAL/Configurations/PAL.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/PAL.xcconfig	(revision 232225)
>+++ Source/WebCore/PAL/Configurations/PAL.xcconfig	(working copy)
>@@ -38,7 +38,7 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(
> 
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> 
> HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
>Index: Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h	(revision 232225)
>+++ Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <QuickLookUI/QLPreviewItem.h>
>+#import <Quartz/Quartz.h>
> 
> @protocol QLPreviewMenuItemDelegate <NSObject>
> @optional
>Index: Source/WebCore/editing/mac/DictionaryLookup.mm
>===================================================================
>--- Source/WebCore/editing/mac/DictionaryLookup.mm	(revision 232225)
>+++ Source/WebCore/editing/mac/DictionaryLookup.mm	(working copy)
>@@ -42,7 +42,7 @@
> #import "VisiblePosition.h"
> #import "VisibleSelection.h"
> #import "VisibleUnits.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <pal/spi/mac/LookupSPI.h>
> #import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
> #import <wtf/BlockObjCExceptions.h>
>Index: Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	(revision 232225)
>+++ Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	(working copy)
>@@ -33,8 +33,7 @@
> #import "PlatformScreen.h"
> #import "Scrollbar.h"
> #import "WindowsKeyboardCodes.h"
>-#import <HIToolbox/CarbonEvents.h>
>-#import <HIToolbox/Events.h>
>+#import <Carbon/Carbon.h>
> #import <mach/mach_time.h>
> #import <pal/spi/mac/HIToolboxSPI.h>
> #import <pal/spi/mac/NSEventSPI.h>
>Index: Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
>===================================================================
>--- Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm	(revision 232225)
>+++ Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if PLATFORM(MAC)
> 
>-#import <CarbonCore/CarbonCore.h>
>+#import <Carbon/Carbon.h>
> #import <wtf/spi/cf/CFStringSPI.h>
> 
> namespace WebCore {
>Index: Source/WebKit/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Source/WebKit/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -42,7 +42,7 @@ LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_
> 
> HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
> 
> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
>Index: Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm	(working copy)
>@@ -32,7 +32,7 @@
> #import "WebInspectorProxy.h"
> #import "WebPageProxy.h"
> #import "_WKAutomationSession.h"
>-#import <HIToolbox/Events.h>
>+#import <Carbon/Carbon.h>
> #import <WebCore/IntPoint.h>
> #import <WebCore/IntSize.h>
> #import <WebCore/PlatformMouseEvent.h>
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(working copy)
>@@ -67,7 +67,7 @@
> #import "WebProcessProxy.h"
> #import "_WKRemoteObjectRegistryInternal.h"
> #import "_WKThumbnailViewInternal.h"
>-#import <HIToolbox/CarbonEventsCore.h>
>+#import <Carbon/Carbon.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/ActivityState.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/UIProcess/mac/WKPrintingView.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKPrintingView.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/mac/WKPrintingView.mm	(working copy)
>@@ -34,7 +34,7 @@
> #import "PrintInfo.h"
> #import "ShareableBitmap.h"
> #import "WebPageProxy.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/GraphicsContext.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <wtf/RunLoop.h>
>Index: Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if USE(APPKIT)
> 
>-#import <HIToolbox/CarbonEventsCore.h>
>+#import <Carbon/Carbon.h>
> #import <pal/spi/mac/HIToolboxSPI.h>
> #import <pal/system/mac/WebPanel.h>
> 
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> 
> @interface PDFAnnotationTextWidget (Details)
> - (BOOL)isMultiline;
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if ENABLE(PDFKIT_PLUGIN)
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> 
> @class CPReadingModel;
> @class PDFViewLayout;
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	(working copy)
>@@ -50,7 +50,7 @@
> #import <JavaScriptCore/JSObjectRef.h>
> #import <JavaScriptCore/JSStringRef.h>
> #import <JavaScriptCore/JSStringRefCF.h>
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <QuartzCore/QuartzCore.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/ArchiveResource.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm	(working copy)
>@@ -33,7 +33,7 @@
> #import "PDFPlugin.h"
> #import "PDFPluginChoiceAnnotation.h"
> #import "PDFPluginTextAnnotation.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm	(working copy)
>@@ -30,7 +30,7 @@
> 
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm	(working copy)
>@@ -31,7 +31,7 @@
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
> #import "PDFPlugin.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/Event.h>
> #import <WebCore/EventNames.h>
> #import <WebCore/HTMLElement.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm	(working copy)
>@@ -32,7 +32,7 @@
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
> #import "PDFPlugin.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(working copy)
>@@ -53,7 +53,7 @@
> #import "WebPasteboardOverrides.h"
> #import "WebPreferencesStore.h"
> #import "WebProcess.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <QuartzCore/QuartzCore.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/BackForwardController.h>
>Index: Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(revision 232225)
>+++ Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(working copy)
>@@ -48,7 +48,7 @@ SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inheri
> 
> OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
>-OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
>+OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> 
> GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
>Index: Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm	(revision 232225)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm	(working copy)
>@@ -30,7 +30,7 @@
> #import <wtf/RetainPtr.h>
> 
> #if !PLATFORM(IOS)
>-#import <PDFKit/PDFDocument.h>
>+#import <Quartz/Quartz.h>
> #endif
> 
> static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
>Index: Source/WebKitLegacy/mac/WebView/WebPDFView.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFView.h	(revision 232225)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFView.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if !PLATFORM(IOS)
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebKitLegacy/WebDocumentInternal.h>
> 
> @class WebDataSource;
>Index: Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
>===================================================================
>--- Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp	(revision 232225)
>+++ Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp	(working copy)
>@@ -47,7 +47,7 @@
> #define COMMON_DIGEST_FOR_OPENSSL
> #include <CommonCrypto/CommonDigest.h>
> #elif PLATFORM(MAC)
>-#include <LaunchServices/UTCoreTypes.h>
>+#include <CoreServices/CoreServices.h>
> #define COMMON_DIGEST_FOR_OPENSSL
> #include <CommonCrypto/CommonDigest.h>
> #endif
>Index: Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -21,7 +21,7 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> GCC_PREFIX_HEADER = DumpRenderTreePrefix.h;
>Index: Tools/Scripts/webkitpy/style/checker.py
>===================================================================
>--- Tools/Scripts/webkitpy/style/checker.py	(revision 232225)
>+++ Tools/Scripts/webkitpy/style/checker.py	(working copy)
>@@ -54,6 +54,7 @@ from checkers.python import PythonChecke
> from checkers.test_expectations import TestExpectationsChecker
> from checkers.text import TextChecker
> from checkers.watchlist import WatchListChecker
>+from checkers.xcconfig import XcodeConfigurationSettingsFileChecker
> from checkers.xcodeproj import XcodeProjectFileChecker
> from checkers.xml import XMLChecker
> from error_handlers import DefaultStyleErrorHandler
>@@ -302,6 +303,8 @@ _TEXT_FILE_EXTENSIONS = [
>     'y',
>     ]
> 
>+_XCCONFIG_FILE_EXTENSION = 'xcconfig'
>+
> _XCODEPROJ_FILE_EXTENSION = 'pbxproj'
> 
> _XML_FILE_EXTENSIONS = [
>@@ -551,6 +554,7 @@ class FileType:
>     XCODEPROJ = 10
>     CMAKE = 11
>     FEATUREDEFINES = 12
>+    XCCONFIG = 13
> 
> 
> class CheckerDispatcher(object):
>@@ -638,6 +642,8 @@ class CheckerDispatcher(object):
>             return FileType.TEXT
>         elif os.path.basename(file_path) == "FeatureDefines.xcconfig":
>             return FileType.FEATUREDEFINES
>+        elif file_extension == _XCCONFIG_FILE_EXTENSION:
>+            return FileType.XCCONFIG
>         else:
>             return FileType.NONE
> 
>@@ -684,6 +690,8 @@ class CheckerDispatcher(object):
>                 checker = PythonChecker(file_path, handle_style_error)
>         elif file_type == FileType.XML:
>             checker = XMLChecker(file_path, handle_style_error)
>+        elif file_type == FileType.XCCONFIG:
>+            checker = XcodeConfigurationSettingsFileChecker(file_path, handle_style_error)
>         elif file_type == FileType.XCODEPROJ:
>             checker = XcodeProjectFileChecker(file_path, handle_style_error)
>         elif file_type == FileType.PNG:
>Index: Tools/Scripts/webkitpy/style/checkers/xcconfig.py
>===================================================================
>--- Tools/Scripts/webkitpy/style/checkers/xcconfig.py	(nonexistent)
>+++ Tools/Scripts/webkitpy/style/checkers/xcconfig.py	(working copy)
>@@ -0,0 +1,46 @@
>+# Copyright (C) 2018 Apple Inc. All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions
>+# are met:
>+# 1. Redistributions of source code must retain the above copyright
>+#    notice, this list of conditions and the following disclaimer.
>+# 2. Redistributions in binary form must reproduce the above copyright
>+#    notice, this list of conditions and the following disclaimer in the
>+#    documentation and/or other materials provided with the distribution.
>+#
>+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+# THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Checks Xcode configuration setting files."""
>+
>+import re
>+
>+
>+class XcodeConfigurationSettingsFileChecker(object):
>+
>+    """Processes Xcode configuration settings file lines for checking style."""
>+
>+    def __init__(self, file_path, handle_style_error):
>+        self.file_path = file_path
>+        self.handle_style_error = handle_style_error
>+
>+    def check(self, lines):
>+        self.check_macOS_sdk_condition(lines)
>+
>+    def check_macOS_sdk_condition(self, lines):
>+        condition = re.compile('^[^=[]*\[sdk=macosx[^\*\]]')
>+        for line_number, line in enumerate(lines):
>+            if condition.match(line):
>+                self.handle_style_error(line_number + 1,
>+                                        'xcconfig/conditions', 4,
>+                                        'Build setting definition is based on macOS SDK version rather than deployment target.')
>Index: Tools/TestWebKitAPI/Configurations/Base.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/Base.xcconfig	(revision 232225)
>+++ Tools/TestWebKitAPI/Configurations/Base.xcconfig	(working copy)
>@@ -97,7 +97,7 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
> 
> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
>-OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>Index: Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm	(revision 232225)
>+++ Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm	(working copy)
>@@ -29,7 +29,7 @@
> 
> #import "PlatformUtilities.h"
> #import "WebCoreTestSupport.h"
>-#import <HIToolbox/CarbonEvents.h>
>+#import <Carbon/Carbon.h>
> #import <IOKit/pwr_mgt/IOPMLib.h>
> #import <JavaScriptCore/JSContext.h>
> #import <WebCore/Settings.h>
>Index: Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -21,6 +21,4 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
>-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
>Index: Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
>===================================================================
>--- Tools/WebKitTestRunner/cg/TestInvocationCG.cpp	(revision 232225)
>+++ Tools/WebKitTestRunner/cg/TestInvocationCG.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include <wtf/RetainPtr.h>
> 
> #if PLATFORM(MAC) && !PLATFORM(IOS)
>-#include <LaunchServices/UTCoreTypes.h>
>+#include <CoreServices/CoreServices.h>
> #endif
> 
> #if PLATFORM(IOS)

Actions: View | Formatted Diff | Diff

Attachments on bug 186016: 341411 | 341412 | 341435 | 341437 | 341439 | 358025