Diff
Modified: trunk/Source/WebCore/ChangeLog (177080 => 177081)
--- trunk/Source/WebCore/ChangeLog 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebCore/ChangeLog 2014-12-10 19:25:11 UTC (rev 177081)
@@ -1,3 +1,18 @@
+2014-12-10 Enrica Casucci <enr...@apple.com>
+
+ Fix iOS builders for 8.0
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+
+ Reviewed by Eric Carlson.
+
+ * WebCore.exp.in:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (-[WebVideoFullscreenController enterFullscreen:mode:]):
+ (-[WebVideoFullscreenController requestHideAndExitFullscreen]):
+ (-[WebVideoFullscreenController enterFullscreen:]): Deleted.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+
+
2014-12-10 pe...@outlook.com <pe...@outlook.com>
[Curl] Cache entry is sometimes deleted when request receives a not modified response.
Modified: trunk/Source/WebCore/WebCore.exp.in (177080 => 177081)
--- trunk/Source/WebCore/WebCore.exp.in 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-10 19:25:11 UTC (rev 177081)
@@ -3491,7 +3491,7 @@
__ZThn?_N7WebCore35WebVideoFullscreenModelVideoElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
#endif
-#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit10invalidateEv
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenENS_7IntRectE
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (177080 => 177081)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-10 19:25:11 UTC (rev 177081)
@@ -37,7 +37,7 @@
using namespace WebCore;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 82000
@implementation WebVideoFullscreenController
- (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
@@ -50,11 +50,16 @@
return nullptr;
}
-- (void)enterFullscreen:(UIView *)view
+- (void)enterFullscreen:(UIView *)view mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode
{
UNUSED_PARAM(view);
+ UNUSED_PARAM(mode);
}
+- (void)requestHideAndExitFullscreen
+{
+}
+
- (void)exitFullscreen
{
}
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (177080 => 177081)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-10 19:25:11 UTC (rev 177081)
@@ -26,7 +26,7 @@
#import "config.h"
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
#import "WebVideoFullscreenInterfaceAVKit.h"
Modified: trunk/Source/WebKit2/ChangeLog (177080 => 177081)
--- trunk/Source/WebKit2/ChangeLog 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-10 19:25:11 UTC (rev 177081)
@@ -1,3 +1,17 @@
+2014-12-10 Enrica Casucci <enr...@apple.com>
+
+ Fix iOS builders for 8.0
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _mayAutomaticallyShowVideoOptimized]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+
2014-12-10 Julien Isorce <j.iso...@samsung.com>
[GTK] Enable depth 32 for the RedirectedXCompositeWindow
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (177080 => 177081)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-10 19:25:11 UTC (rev 177081)
@@ -243,10 +243,14 @@
- (BOOL)_mayAutomaticallyShowVideoOptimized
{
+#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 82000)
+ return false;
+#else
if (!_page || !_page->videoFullscreenManager())
return false;
return _page->videoFullscreenManager()->mayAutomaticallyShowVideoOptimized();
+#endif
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177080 => 177081)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-10 19:25:11 UTC (rev 177081)
@@ -410,7 +410,7 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
#endif
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
#endif
#if ENABLE(VIBRATION)
@@ -583,7 +583,7 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
#endif
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
#endif
Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (177080 => 177081)
--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-10 18:54:26 UTC (rev 177080)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-10 19:25:11 UTC (rev 177081)
@@ -49,7 +49,9 @@
using namespace WebCore;
namespace WebKit {
-
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
+
PassRefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy& page)
{
return adoptRef(new WebVideoFullscreenManagerProxy(page));
@@ -223,6 +225,7 @@
{
m_page->send(Messages::WebVideoFullscreenManager::SelectLegibleMediaOption(index), m_page->pageID());
}
+#endif
} // namespace WebKit
