Diff
Modified: tags/Safari-601.1.12/Source/WebCore/ChangeLog (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebCore/ChangeLog 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/ChangeLog 2014-12-12 01:37:07 UTC (rev 177197)
@@ -1,3 +1,21 @@
+2014-12-11 Babak Shafiei <[email protected]>
+
+ Merge r177196.
+
+ 2014-12-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r177081.
+ https://bugs.webkit.org/show_bug.cgi?id=139569
+
+ broke iOS video playback (Requested by eric_carlson on
+ #webkit).
+
+ Reverted changeset:
+
+ "Fix iOS builders for 8.0"
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+ http://trac.webkit.org/changeset/177081
+
2014-12-11 Anders Carlsson <[email protected]>
Call StorageThread::releaseFastMallocFreeMemoryInAllThreads from WebKit
Modified: tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in 2014-12-12 01:37:07 UTC (rev 177197)
@@ -3489,7 +3489,7 @@
__ZThn?_N7WebCore35WebVideoFullscreenModelVideoElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
#endif
-#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
+#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit10invalidateEv
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenENS_7IntRectE
Modified: tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-12 01:37:07 UTC (rev 177197)
@@ -37,7 +37,7 @@
using namespace WebCore;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 82000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
@implementation WebVideoFullscreenController
- (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
@@ -50,16 +50,11 @@
return nullptr;
}
-- (void)enterFullscreen:(UIView *)view mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode
+- (void)enterFullscreen:(UIView *)view
{
UNUSED_PARAM(view);
- UNUSED_PARAM(mode);
}
-- (void)requestHideAndExitFullscreen
-{
-}
-
- (void)exitFullscreen
{
}
Modified: tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-12 01:37:07 UTC (rev 177197)
@@ -26,7 +26,7 @@
#import "config.h"
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
#import "WebVideoFullscreenInterfaceAVKit.h"
Modified: tags/Safari-601.1.12/Source/WebKit2/ChangeLog (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 01:37:07 UTC (rev 177197)
@@ -1,3 +1,21 @@
+2014-12-11 Babak Shafiei <[email protected]>
+
+ Merge r177196.
+
+ 2014-12-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r177081.
+ https://bugs.webkit.org/show_bug.cgi?id=139569
+
+ broke iOS video playback (Requested by eric_carlson on
+ #webkit).
+
+ Reverted changeset:
+
+ "Fix iOS builders for 8.0"
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+ http://trac.webkit.org/changeset/177081
+
2014-12-11 Joseph Pecoraro <[email protected]>
Web Inspector: Inspector Process crash when navigating to non-inspectable page
Modified: tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-12 01:37:07 UTC (rev 177197)
@@ -243,14 +243,10 @@
- (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: tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-12 01:37:07 UTC (rev 177197)
@@ -410,7 +410,7 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
#endif
-#if PLATFORM(IOS) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
+#if PLATFORM(IOS)
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) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
+#if PLATFORM(IOS)
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
#endif
Modified: tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (177196 => 177197)
--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-12 01:37:07 UTC (rev 177197)
@@ -49,9 +49,7 @@
using namespace WebCore;
namespace WebKit {
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
-
+
PassRefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy& page)
{
return adoptRef(new WebVideoFullscreenManagerProxy(page));
@@ -230,7 +228,6 @@
{
m_page->send(Messages::WebVideoFullscreenManager::SelectLegibleMediaOption(index), m_page->pageID());
}
-#endif
} // namespace WebKit
