Title: [199921] tags/Safari-602.1.29/Source/WebKit2
- Revision
- 199921
- Author
- bshaf...@apple.com
- Date
- 2016-04-22 15:58:24 -0700 (Fri, 22 Apr 2016)
Log Message
Merged r199903.
Modified Paths
Diff
Modified: tags/Safari-602.1.29/Source/WebKit2/ChangeLog (199920 => 199921)
--- tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 22:57:42 UTC (rev 199920)
+++ tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 22:58:24 UTC (rev 199921)
@@ -1,5 +1,19 @@
2016-04-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r199903.
+
+ 2016-04-22 Ryan Haddad <ryanhad...@apple.com>
+
+ Take 2 for fixing builds that do not support AVKit
+
+ Unreviewed build fix.
+
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState):
+
+2016-04-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r199896.
2016-04-22 Ryan Haddad <ryanhad...@apple.com>
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h (199920 => 199921)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-04-22 22:57:42 UTC (rev 199920)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-04-22 22:58:24 UTC (rev 199921)
@@ -26,7 +26,7 @@
#ifndef WebVideoFullscreenManagerProxy_h
#define WebVideoFullscreenManagerProxy_h
-#if PLATFORM(IOS) && HAVE(AVKIT) || (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/WebPageProxy.cpp (199920 => 199921)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-04-22 22:57:42 UTC (rev 199920)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-04-22 22:58:24 UTC (rev 199921)
@@ -5082,7 +5082,7 @@
m_visibleScrollerThumbRect = IntRect();
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
if (m_playbackSessionManager) {
m_playbackSessionManager->invalidate();
m_playbackSessionManager = nullptr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
