Diff
Modified: tags/Safari-602.1.29/Source/WebCore/ChangeLog (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebCore/ChangeLog 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebCore/ChangeLog 2016-04-22 20:12:39 UTC (rev 199898)
@@ -1,3 +1,16 @@
+2016-04-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r199896.
+
+ 2016-04-22 Ryan Haddad <ryanhad...@apple.com>
+
+ Fix builds that do not support AVKit
+
+ Unreviewed build fix.
+
+ * platform/ios/WebAVPlayerController.h:
+ * platform/ios/WebAVPlayerController.mm:
+
2016-04-21 Dean Jackson <d...@apple.com>
Backdrop Filter should not be visible if element has visibility:hidden
Modified: tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.h (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.h 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.h 2016-04-22 20:12:39 UTC (rev 199898)
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && HAVE(AVKIT)
#import "AVKitSPI.h"
Modified: tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.mm (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.mm 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebCore/platform/ios/WebAVPlayerController.mm 2016-04-22 20:12:39 UTC (rev 199898)
@@ -27,7 +27,7 @@
#import "config.h"
#import "WebAVPlayerController.h"
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && HAVE(AVKIT)
#import "AVKitSPI.h"
#import "Logging.h"
Modified: tags/Safari-602.1.29/Source/WebKit2/ChangeLog (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 20:12:39 UTC (rev 199898)
@@ -1,3 +1,21 @@
+2016-04-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r199896.
+
+ 2016-04-22 Ryan Haddad <ryanhad...@apple.com>
+
+ Fix builds that do not support AVKit
+
+ Unreviewed build fix.
+
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::viewDidLeaveWindow):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+
2016-04-21 Dean Jackson <d...@apple.com>
Backdrop Filter should not be visible if element has visibility:hidden
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-04-22 20:12:39 UTC (rev 199898)
@@ -26,7 +26,7 @@
#ifndef WebVideoFullscreenManagerProxy_h
#define WebVideoFullscreenManagerProxy_h
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
#include "MessageReceiver.h"
#include <WebCore/GraphicsLayer.h>
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-04-22 20:12:39 UTC (rev 199898)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WebVideoFullscreenManagerProxy.h"
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
#import "WebPageProxy.h"
#import "WebPlaybackSessionManagerProxy.h"
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/WebPageProxy.cpp (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-04-22 20:12:39 UTC (rev 199898)
@@ -474,7 +474,7 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
m_playbackSessionManager = WebPlaybackSessionManagerProxy::create(*this);
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
#endif
@@ -712,7 +712,7 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
m_playbackSessionManager = WebPlaybackSessionManagerProxy::create(*this);
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
#endif
@@ -1412,7 +1412,7 @@
if (m_colorPicker)
endColorPicker();
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
// When leaving the current page, close the video fullscreen.
if (m_videoFullscreenManager)
m_videoFullscreenManager->requestHideAndExitFullscreen();
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (199897 => 199898)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-04-22 19:53:37 UTC (rev 199897)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-04-22 20:12:39 UTC (rev 199898)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WebPageProxy.h"
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && HAVE(AVKIT)
#import "APIUIClient.h"
#import "DataReference.h"
