Title: [243940] trunk/Source/WebKitLegacy/mac
- Revision
- 243940
- Author
- eric.carl...@apple.com
- Date
- 2019-04-05 11:21:40 -0700 (Fri, 05 Apr 2019)
Log Message
Stop including <AudioToolbox/AudioSession.h>
https://bugs.webkit.org/show_bug.cgi?id=196648
<rdar://problem/39665771>
Reviewed by Jer Noble.
* WebView/WebPreferencesPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (243939 => 243940)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-04-05 18:06:09 UTC (rev 243939)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-04-05 18:21:40 UTC (rev 243940)
@@ -1,3 +1,13 @@
+2019-04-05 Eric Carlson <eric.carl...@apple.com>
+
+ Stop including <AudioToolbox/AudioSession.h>
+ https://bugs.webkit.org/show_bug.cgi?id=196648
+ <rdar://problem/39665771>
+
+ Reviewed by Jer Noble.
+
+ * WebView/WebPreferencesPrivate.h:
+
2019-04-04 Simon Fraser <simon.fra...@apple.com>
Have ScrollableArea store a ScrollType for the current scroll
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (243939 => 243940)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2019-04-05 18:06:09 UTC (rev 243939)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2019-04-05 18:21:40 UTC (rev 243940)
@@ -53,10 +53,6 @@
using namespace WebCore;
-#if HAVE(AUDIO_TOOLBOX_AUDIO_SESSION)
-#import <AudioToolbox/AudioSession.h>
-#endif
-
#if PLATFORM(IOS_FAMILY)
#import <WebCore/Device.h>
#import <WebCore/GraphicsContext.h>
@@ -2389,22 +2385,22 @@
// Clients are passing us OSTypes values from AudioToolbox/AudioSession.h,
// which need to be translated into AudioSession::CategoryType:
switch (override) {
- case kAudioSessionCategory_AmbientSound:
+ case WebKitAudioSessionCategoryAmbientSound:
override = AudioSession::AmbientSound;
break;
- case kAudioSessionCategory_SoloAmbientSound:
+ case WebKitAudioSessionCategorySoloAmbientSound:
override = AudioSession::SoloAmbientSound;
break;
- case kAudioSessionCategory_MediaPlayback:
+ case WebKitAudioSessionCategoryMediaPlayback:
override = AudioSession::MediaPlayback;
break;
- case kAudioSessionCategory_RecordAudio:
+ case WebKitAudioSessionCategoryRecordAudio:
override = AudioSession::RecordAudio;
break;
- case kAudioSessionCategory_PlayAndRecord:
+ case WebKitAudioSessionCategoryPlayAndRecord:
override = AudioSession::PlayAndRecord;
break;
- case kAudioSessionCategory_AudioProcessing:
+ case WebKitAudioSessionCategoryAudioProcessing:
override = AudioSession::AudioProcessing;
break;
default:
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (243939 => 243940)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2019-04-05 18:06:09 UTC (rev 243939)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2019-04-05 18:21:40 UTC (rev 243940)
@@ -62,6 +62,15 @@
WebKitFrameFlatteningFullyEnabled
} WebKitFrameFlattening;
+typedef enum : unsigned {
+ WebKitAudioSessionCategoryAmbientSound = 'ambi',
+ WebKitAudioSessionCategorySoloAmbientSound = 'solo',
+ WebKitAudioSessionCategoryMediaPlayback = 'medi',
+ WebKitAudioSessionCategoryRecordAudio = 'reca',
+ WebKitAudioSessionCategoryPlayAndRecord = 'plar',
+ WebKitAudioSessionCategoryAudioProcessing = 'proc',
+} WebKitAudioSessionCategory;
+
extern NSString *WebPreferencesChangedNotification WEBKIT_DEPRECATED_MAC(10_3, 10_14);
extern NSString *WebPreferencesRemovedNotification WEBKIT_DEPRECATED_MAC(10_3, 10_14);
extern NSString *WebPreferencesChangedInternalNotification WEBKIT_DEPRECATED_MAC(10_3, 10_14);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
