Changeset 195412 in webkit
- Timestamp:
- Jan 21, 2016, 10:25:02 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 16 edited
- 1 moved
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
-
WTF/ChangeLog (modified) (1 diff)
-
WTF/wtf/Platform.h (modified) (1 diff)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
-
WebCore/WebCore.xcodeproj/project.pbxproj (modified) (9 diffs)
-
WebCore/html/HTMLVideoElement.cpp (modified) (2 diffs)
-
WebCore/platform/cocoa/WebVideoFullscreenInterface.h (moved) (moved from trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterface.h ) (5 diffs)
-
WebCore/platform/graphics/MediaPlayer.cpp (modified) (1 diff)
-
WebCore/platform/graphics/MediaPlayer.h (modified) (2 diffs)
-
WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
-
WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (modified) (1 diff)
-
WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (added)
-
WebKit/mac/ChangeLog (modified) (1 diff)
-
WebKit/mac/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
-
WebKit2/ChangeLog (modified) (1 diff)
-
WebKit2/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r195407 r195412 1 2016-01-19 Ada Chan <adachan@apple.com> 2 3 Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms. 4 https://bugs.webkit.org/show_bug.cgi?id=153218 5 6 Reviewed by Eric Carlson. 7 8 * Configurations/FeatureDefines.xcconfig: 9 1 10 2016-01-21 Per Arne Vollan <peavo@outlook.com> 2 11 -
trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
r195317 r195412 171 171 ENABLE_VIDEO = ENABLE_VIDEO; 172 172 ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE; 173 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)) 174 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101000 = ; 175 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101100 = ; 176 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE; 173 177 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK; 174 178 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; -
trunk/Source/WTF/ChangeLog
r195395 r195412 1 2016-01-19 Ada Chan <adachan@apple.com> 2 3 Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms. 4 https://bugs.webkit.org/show_bug.cgi?id=153218 5 6 Reviewed by Eric Carlson. 7 8 * wtf/Platform.h: 9 1 10 2016-01-19 Filip Pizlo <fpizlo@apple.com> 2 11 -
trunk/Source/WTF/wtf/Platform.h
r195079 r195412 1137 1137 #endif 1138 1138 1139 #if PLATFORM(IOS) 1139 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) 1140 1140 #define ENABLE_VIDEO_PRESENTATION_MODE 1 1141 1141 #endif -
trunk/Source/WebCore/ChangeLog
r195411 r195412 1 2016-01-19 Ada Chan <adachan@apple.com> 2 3 Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms. 4 https://bugs.webkit.org/show_bug.cgi?id=153218 5 6 Reviewed by Eric Carlson. 7 8 No new tests. Code refactoring. 9 10 * Configurations/FeatureDefines.xcconfig: 11 * WebCore.xcodeproj/project.pbxproj: 12 Move WebVideoFullscreenInterface.h from ios to cocoa. 13 * html/HTMLVideoElement.cpp: 14 (WebCore::HTMLVideoElement::webkitSupportsPresentationMode): 15 The declaration of supportsPictureInPicture() has been moved to WebVideoFullscreenInterface.h 16 so include that header instead. Guard the supportsPictureInPicture() call with PLATFORM(COCOA) 17 as that method is only defined in Cocoa. 18 * platform/cocoa/WebVideoFullscreenInterface.h: Renamed from Source/WebCore/platform/ios/WebVideoFullscreenInterface.h. 19 Also move the declaration of supportsPictureInPicture() here. 20 * platform/graphics/MediaPlayer.cpp: 21 * platform/graphics/MediaPlayer.h: 22 * platform/graphics/MediaPlayerPrivate.h: 23 Implementations of methods related to the video fullscreen layer are now guarded by 24 PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) instead. 25 * platform/ios/WebVideoFullscreenInterfaceAVKit.h: 26 Declaration of supportsPictureInPicture() has been moved to WebVideoFullscreenInterface.h 27 * platform/mac/WebVideoFullscreenInterfaceMac.mm: Added. 28 (WebCore::supportsPictureInPicture): 29 Return false for now. 30 1 31 2016-01-21 Said Abou-Hallawa <sabouhallawa@apple.com> 2 32 -
trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig
r195317 r195412 171 171 ENABLE_VIDEO = ENABLE_VIDEO; 172 172 ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE; 173 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)) 174 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101000 = ; 175 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101100 = ; 176 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE; 173 177 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK; 174 178 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r195410 r195412 1471 1471 3F42B31E1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F42B31C1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm */; }; 1472 1472 3FBC4AEA189880EF0046EE38 /* WebVideoFullscreenModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AE9189880EF0046EE38 /* WebVideoFullscreenModel.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1473 3FBC4AEC1898810E0046EE38 /* WebVideoFullscreenInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AEB1898810E0046EE38 /* WebVideoFullscreenInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };1474 1473 3FBC4AF3189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC4AF1189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm */; }; 1475 1474 3FBC4AF4189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 2254 2253 51FB67DB1AE6B82B00D06C5A /* ContentExtensionStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */; }; 2255 2254 51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2255 52131E591C4F15350033F802 /* WebVideoFullscreenInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 52131E581C4F15220033F802 /* WebVideoFullscreenInterface.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2256 52131E5B1C4F15760033F802 /* WebVideoFullscreenInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */; }; 2256 2257 521D46F611AEC98100514613 /* KillRingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 521D46F511AEC98100514613 /* KillRingMac.mm */; }; 2257 2258 521D46F811AEC9B100514613 /* KillRing.h in Headers */ = {isa = PBXBuildFile; fileRef = 521D46F711AEC9B100514613 /* KillRing.h */; }; … … 8846 8847 3F42B31C1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenControllerAVKit.mm; sourceTree = "<group>"; }; 8847 8848 3FBC4AE9189880EF0046EE38 /* WebVideoFullscreenModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenModel.h; sourceTree = "<group>"; }; 8848 3FBC4AEB1898810E0046EE38 /* WebVideoFullscreenInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenInterface.h; sourceTree = "<group>"; };8849 8849 3FBC4AF1189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenInterfaceAVKit.mm; sourceTree = "<group>"; }; 8850 8850 3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenInterfaceAVKit.h; sourceTree = "<group>"; }; … … 9717 9717 51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionStyleSheet.cpp; sourceTree = "<group>"; }; 9718 9718 51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionStyleSheet.h; sourceTree = "<group>"; }; 9719 52131E581C4F15220033F802 /* WebVideoFullscreenInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenInterface.h; sourceTree = "<group>"; }; 9720 52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenInterfaceMac.mm; sourceTree = "<group>"; }; 9719 9721 521D46F511AEC98100514613 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KillRingMac.mm; sourceTree = "<group>"; }; 9720 9722 521D46F711AEC9B100514613 /* KillRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KillRing.h; sourceTree = "<group>"; }; … … 17641 17643 CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */, 17642 17644 CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */, 17645 52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */, 17643 17646 CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */, 17644 17647 CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */, … … 19712 19715 3F42B31B1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h */, 19713 19716 3F42B31C1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm */, 19714 3FBC4AEB1898810E0046EE38 /* WebVideoFullscreenInterface.h */,19715 19717 3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */, 19716 19718 3FBC4AF1189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm */, … … 19753 19755 CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */, 19754 19756 CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */, 19757 52131E581C4F15220033F802 /* WebVideoFullscreenInterface.h */, 19755 19758 ); 19756 19759 path = cocoa; … … 28162 28165 3F42B31D1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h in Headers */, 28163 28166 CD82030C1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h in Headers */, 28164 3FBC4AEC1898810E0046EE38/* WebVideoFullscreenInterface.h in Headers */,28167 52131E591C4F15350033F802 /* WebVideoFullscreenInterface.h in Headers */, 28165 28168 3FBC4AF4189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h in Headers */, 28166 28169 3FBC4AEA189880EF0046EE38 /* WebVideoFullscreenModel.h in Headers */, … … 31573 31576 CD82030D1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm in Sources */, 31574 31577 3FBC4AF3189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm in Sources */, 31578 52131E5B1C4F15760033F802 /* WebVideoFullscreenInterfaceMac.mm in Sources */, 31575 31579 65FD466619B596F6001E2B4D /* WebVideoFullscreenModelVideoElement.mm in Sources */, 31576 31580 F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */, -
trunk/Source/WebCore/html/HTMLVideoElement.cpp
r194496 r195412 46 46 47 47 #if ENABLE(VIDEO_PRESENTATION_MODE) 48 #include "WebVideoFullscreenInterface AVKit.h"48 #include "WebVideoFullscreenInterface.h" 49 49 #endif 50 50 … … 374 374 return mediaSession().fullscreenPermitted(*this) && supportsFullscreen(); 375 375 376 if (mode == presentationModePictureInPicture()) 377 return supportsPictureInPicture() && mediaSession().allowsPictureInPicture(*this) && supportsFullscreen(); 376 if (mode == presentationModePictureInPicture()) { 377 #if PLATFORM(COCOA) 378 if (!supportsPictureInPicture()) 379 return false; 380 #endif 381 382 return mediaSession().allowsPictureInPicture(*this) && supportsFullscreen(); 383 } 378 384 379 385 if (mode == presentationModeInline()) -
trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenInterface.h
r195411 r195412 1 1 /* 2 * Copyright (C) 2014 Apple Inc. All rights reserved.2 * Copyright (C) 2014-2016 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 27 26 #ifndef WebVideoFullscreenInterface_h 28 27 #define WebVideoFullscreenInterface_h 29 28 30 #if PLATFORM(IOS) 29 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) 31 30 32 31 #include <wtf/Vector.h> … … 37 36 38 37 namespace WebCore { 39 38 39 bool supportsPictureInPicture(); 40 41 #if PLATFORM(IOS) 40 42 class TimeRanges; 41 43 … … 48 50 virtual void setDuration(double) = 0; 49 51 virtual void setCurrentTime(double currentTime, double anchorTime) = 0; 50 virtual void setBufferedTime(double bufferedTime) = 0;52 virtual void setBufferedTime(double) = 0; 51 53 virtual void setRate(bool isPlaying, float playbackRate) = 0; 52 54 virtual void setVideoDimensions(bool hasVideo, float width, float height) = 0; … … 58 60 virtual void setWirelessVideoPlaybackDisabled(bool) = 0; 59 61 }; 62 #endif 60 63 61 64 } -
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
r194819 r195412 644 644 } 645 645 646 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) 647 void MediaPlayer::setVideoFullscreenLayer(PlatformLayer* layer) 648 { 649 m_private->setVideoFullscreenLayer(layer); 650 } 651 652 void MediaPlayer::setVideoFullscreenFrame(FloatRect frame) 653 { 654 m_private->setVideoFullscreenFrame(frame); 655 } 656 657 void MediaPlayer::setVideoFullscreenGravity(MediaPlayer::VideoGravity gravity) 658 { 659 m_private->setVideoFullscreenGravity(gravity); 660 } 661 662 void MediaPlayer::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode) 663 { 664 m_private->setVideoFullscreenMode(mode); 665 } 666 667 MediaPlayer::VideoFullscreenMode MediaPlayer::fullscreenMode() const 668 { 669 return m_client.mediaPlayerFullscreenMode(); 670 } 671 #endif 672 646 673 #if PLATFORM(IOS) 647 void MediaPlayer::setVideoFullscreenLayer(PlatformLayer* layer)648 {649 m_private->setVideoFullscreenLayer(layer);650 }651 652 void MediaPlayer::setVideoFullscreenFrame(FloatRect frame)653 {654 m_private->setVideoFullscreenFrame(frame);655 }656 657 void MediaPlayer::setVideoFullscreenGravity(MediaPlayer::VideoGravity gravity)658 {659 m_private->setVideoFullscreenGravity(gravity);660 }661 662 void MediaPlayer::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)663 {664 m_private->setVideoFullscreenMode(mode);665 }666 667 MediaPlayer::VideoFullscreenMode MediaPlayer::fullscreenMode() const668 {669 return m_client.mediaPlayerFullscreenMode();670 }671 672 674 NSArray* MediaPlayer::timedMetadata() const 673 675 { -
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
r193479 r195412 309 309 PlatformMedia platformMedia() const; 310 310 PlatformLayer* platformLayer() const; 311 #if PLATFORM(IOS) 311 312 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) 312 313 void setVideoFullscreenLayer(PlatformLayer*); 313 314 void setVideoFullscreenFrame(FloatRect); … … 316 317 void setVideoFullscreenMode(VideoFullscreenMode); 317 318 VideoFullscreenMode fullscreenMode() const; 318 319 #endif 320 321 #if PLATFORM(IOS) 319 322 NSArray *timedMetadata() const; 320 323 String accessLog() const; -
trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h
r193479 r195412 58 58 virtual PlatformMedia platformMedia() const { return NoPlatformMedia; } 59 59 virtual PlatformLayer* platformLayer() const { return 0; } 60 #if PLATFORM(IOS) 60 61 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) 61 62 virtual void setVideoFullscreenLayer(PlatformLayer*) { } 62 63 virtual void setVideoFullscreenFrame(FloatRect) { } 63 64 virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity) { } 64 65 virtual void setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode) { } 65 66 #endif 67 68 #if PLATFORM(IOS) 66 69 virtual NSArray *timedMetadata() const { return 0; } 67 70 virtual String accessLog() const { return emptyString(); } -
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
r193340 r195412 162 162 }; 163 163 164 bool supportsPictureInPicture();165 166 164 } 167 165 -
trunk/Source/WebKit/mac/ChangeLog
r195327 r195412 1 2016-01-19 Ada Chan <adachan@apple.com> 2 3 Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms. 4 https://bugs.webkit.org/show_bug.cgi?id=153218 5 6 Reviewed by Eric Carlson. 7 8 * Configurations/FeatureDefines.xcconfig: 9 1 10 2016-01-19 Beth Dakin <bdakin@apple.com> 2 11 -
trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
r195317 r195412 171 171 ENABLE_VIDEO = ENABLE_VIDEO; 172 172 ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE; 173 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)) 174 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101000 = ; 175 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101100 = ; 176 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE; 173 177 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK; 174 178 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; -
trunk/Source/WebKit2/ChangeLog
r195358 r195412 1 2016-01-19 Ada Chan <adachan@apple.com> 2 3 Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms. 4 https://bugs.webkit.org/show_bug.cgi?id=153218 5 6 Reviewed by Eric Carlson. 7 8 * Configurations/FeatureDefines.xcconfig: 9 1 10 2016-01-20 Alex Christensen <achristensen@webkit.org> 2 11 -
trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig
r195317 r195412 171 171 ENABLE_VIDEO = ENABLE_VIDEO; 172 172 ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE; 173 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)) 174 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101000 = ; 175 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101100 = ; 176 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE; 173 177 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK; 174 178 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
Note:
See TracChangeset
for help on using the changeset viewer.