Diff
Modified: trunk/Source/WebCore/ChangeLog (229545 => 229546)
--- trunk/Source/WebCore/ChangeLog 2018-03-12 20:19:53 UTC (rev 229545)
+++ trunk/Source/WebCore/ChangeLog 2018-03-12 20:51:41 UTC (rev 229546)
@@ -1,3 +1,15 @@
+2018-03-12 Tim Horton <timothy_hor...@apple.com>
+
+ Use a different SPI header for some AudioToolbox enums
+ https://bugs.webkit.org/show_bug.cgi?id=183574
+ <rdar://problem/38385889>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/audio/ios/AudioDestinationIOS.cpp:
+ * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp:
+ Adjust SPI imports.
+
2018-03-12 Danyao Wang <dan...@chromium.org>
Add a query and fragment exception to history API's unique origin restriction.
Modified: trunk/Source/WebCore/PAL/ChangeLog (229545 => 229546)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-03-12 20:19:53 UTC (rev 229545)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-03-12 20:51:41 UTC (rev 229546)
@@ -1,3 +1,14 @@
+2018-03-12 Tim Horton <timothy_hor...@apple.com>
+
+ Use a different SPI header for some AudioToolbox enums
+ https://bugs.webkit.org/show_bug.cgi?id=183574
+ <rdar://problem/38385889>
+
+ Reviewed by Anders Carlsson.
+
+ * PAL.xcodeproj/project.pbxproj:
+ * pal/spi/cocoa/AudioToolboxSPI.h: Added.
+
2018-03-07 Tim Horton <timothy_hor...@apple.com>
Sort and separate FeatureDefines.xcconfig
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (229545 => 229546)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2018-03-12 20:19:53 UTC (rev 229545)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2018-03-12 20:51:41 UTC (rev 229546)
@@ -106,6 +106,7 @@
1C4876D81F8D7F4E00CCEEBD /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4876D61F8D7F4E00CCEEBD /* Logging.cpp */; };
1C4876D91F8D7F4E00CCEEBD /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4876D71F8D7F4E00CCEEBD /* Logging.h */; };
1C4876E01F8D837500CCEEBD /* LoggingCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C4876DF1F8D837500CCEEBD /* LoggingCocoa.mm */; };
+ 2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */; };
7A1656441F97B2B900BA3CE4 /* NSKeyedArchiverSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1656431F97B2B800BA3CE4 /* NSKeyedArchiverSPI.h */; };
A10265871F56746100B4C844 /* FoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A10265861F56746100B4C844 /* FoundationSPI.h */; };
A10265891F56747A00B4C844 /* HIToolboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A10265881F56747A00B4C844 /* HIToolboxSPI.h */; };
@@ -250,6 +251,7 @@
1C4876DF1F8D837500CCEEBD /* LoggingCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingCocoa.mm; sourceTree = "<group>"; };
1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
1C67CEA21E32EE2600F80F2E /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
+ 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioToolboxSPI.h; sourceTree = "<group>"; };
7A1656431F97B2B800BA3CE4 /* NSKeyedArchiverSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSKeyedArchiverSPI.h; sourceTree = "<group>"; };
93E5909C1F93BF1E0067F8CF /* UnencodableHandling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UnencodableHandling.h; sourceTree = "<group>"; };
A10265861F56746100B4C844 /* FoundationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoundationSPI.h; sourceTree = "<group>"; };
@@ -349,6 +351,7 @@
0C2DA1201F3BE9E700DBC317 /* cocoa */ = {
isa = PBXGroup;
children = (
+ 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */,
0C2DA1221F3BEB4900DBC317 /* AVKitSPI.h */,
0C2DA1231F3BEB4900DBC317 /* CFNSURLConnectionSPI.h */,
0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */,
@@ -601,6 +604,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */,
0C7785891F45130F00F4EBB6 /* AVFoundationSPI.h in Headers */,
0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */,
0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */,
Added: trunk/Source/WebCore/PAL/pal/spi/cocoa/AudioToolboxSPI.h (0 => 229546)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AudioToolboxSPI.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AudioToolboxSPI.h 2018-03-12 20:51:41 UTC (rev 229546)
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AudioToolbox/AudioComponentPriv.h>
+
+#endif
Modified: trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (229545 => 229546)
--- trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2018-03-12 20:19:53 UTC (rev 229545)
+++ trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2018-03-12 20:51:41 UTC (rev 229546)
@@ -39,6 +39,7 @@
#include "Logging.h"
#include "RuntimeApplicationChecks.h"
#include <AudioToolbox/AudioServices.h>
+#include <pal/spi/cocoa/AudioToolboxSPI.h>
#include <wtf/HashSet.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/SoftLinking.h>
Modified: trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp (229545 => 229546)
--- trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2018-03-12 20:19:53 UTC (rev 229545)
+++ trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2018-03-12 20:51:41 UTC (rev 229546)
@@ -33,6 +33,7 @@
#include "Logging.h"
#include <pal/cf/CoreMediaSoftLink.h>
+#include <pal/spi/cocoa/AudioToolboxSPI.h>
#if ENABLE(VIDEO_TRACK) && ENABLE(MEDIA_STREAM)
