Diff
Modified: tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog (171712 => 171713)
--- tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog 2014-07-29 00:11:09 UTC (rev 171713)
@@ -1,3 +1,20 @@
+2014-07-28 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r171635. <rdar://problem/17782407>
+
+ 2014-07-25 Jeremy Jones <jere...@apple.com>
+
+ Parent fullscreen from window instead of view
+ https://bugs.webkit.org/show_bug.cgi?id=135310
+
+ Reviewed by Jer Noble.
+
+ Parenting in the view causes an incorrect animation to fullscreen, and can cause
+ fullscreen to only expand to the size of the view instead of the whole window.
+
+ * WebView/WebView.mm:
+ (-[WebView _enterFullscreenForNode:]): Pass window instead of view.
+
2014-07-24 Lucas Forschler <lforsch...@apple.com>
Merge r171575
Modified: tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm (171712 => 171713)
--- tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm 2014-07-29 00:11:09 UTC (rev 171713)
@@ -227,6 +227,7 @@
#import "WebVisiblePosition.h"
#import <CFNetwork/CFURLCachePriv.h>
#import <MobileGestalt.h>
+#import <UIKit/UIKit.h>
#import <WebCore/EventNames.h>
#import <WebCore/FontCache.h>
#import <WebCore/GraphicsLayer.h>
@@ -8408,7 +8409,7 @@
_private->fullscreenController = [[WebVideoFullscreenController alloc] init];
[_private->fullscreenController setMediaElement:videoElement];
#if PLATFORM(IOS)
- [_private->fullscreenController enterFullscreen:(UIView *)[[[self window] hostLayer] delegate]];
+ [_private->fullscreenController enterFullscreen:[(UIView *)[[[self window] hostLayer] delegate] window]];
#else
[_private->fullscreenController enterFullscreen:[[self window] screen]];
#endif
Modified: tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog (171712 => 171713)
--- tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog 2014-07-29 00:11:09 UTC (rev 171713)
@@ -1,3 +1,25 @@
+2014-07-28 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r171635. <rdar://problem/17782407>
+
+ 2014-07-25 Jeremy Jones <jere...@apple.com>
+
+ Parent fullscreen from window instead of view
+ https://bugs.webkit.org/show_bug.cgi?id=135310
+
+ Reviewed by Jer Noble.
+
+ Parenting in the view causes an incorrect animation to fullscreen, and can cause
+ fullscreen to only expand to the size of the view instead of the whole window.
+
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID): pass view's window.
+ * WebProcess/ios/WebVideoFullscreenManager.mm: screenRect instead of clientRect
+ (WebKit::screenRectForNode): was clientRectForNode
+ (WebKit::WebVideoFullscreenManager::enterFullscreenForNode): use screenRectForNode
+ (WebKit::WebVideoFullscreenManager::exitFullscreenForNode): ditto
+ (WebKit::clientRectForNode): Deleted.
+
2014-07-27 Matthew Hanson <matthew_han...@apple.com>
Merge r171663. <rdar://problem/17818308>
Modified: tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (171712 => 171713)
--- tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-07-29 00:11:09 UTC (rev 171713)
@@ -34,6 +34,7 @@
#include "WebVideoFullscreenManagerMessages.h"
#include "WebVideoFullscreenManagerProxyMessages.h"
#include <QuartzCore/CoreAnimation.h>
+#include <UIKit/UIKit.h>
#include <WebKitSystemInterface.h>
#include <WebCore/TimeRanges.h>
@@ -77,7 +78,7 @@
ASSERT(videoLayerID);
m_layerHost = WKMakeRenderLayer(videoLayerID);
UIView *parentView = toRemoteLayerTreeDrawingAreaProxy(m_page->drawingArea())->remoteLayerTreeHost().rootLayer();
- setupFullscreen(*m_layerHost.get(), initialRect, parentView);
+ setupFullscreen(*m_layerHost.get(), initialRect, [parentView window]);
}
void WebVideoFullscreenManagerProxy::setSeekableRangesVector(Vector<std::pair<double, double>>& ranges)
Modified: tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (171712 => 171713)
--- tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-07-29 00:11:09 UTC (rev 171713)
@@ -50,12 +50,12 @@
namespace WebKit {
-static IntRect clientRectForNode(Node* node)
+static IntRect screenRectForNode(Node* node)
{
if (!node || !node->isElementNode())
return IntRect();
- return toElement(node)->clientRect();
+ return toElement(node)->screenRect();
}
PassRefPtr<WebVideoFullscreenManager> WebVideoFullscreenManager::create(PassRefPtr<WebPage> page)
@@ -97,7 +97,7 @@
m_layerHostingContext = LayerHostingContext::createForExternalHostingProcess();
- m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), clientRectForNode(node)), m_page->pageID());
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), screenRectForNode(node)), m_page->pageID());
}
void WebVideoFullscreenManager::exitFullscreenForNode(Node* node)
@@ -109,7 +109,7 @@
return;
m_isAnimating = true;
- m_page->send(Messages::WebVideoFullscreenManagerProxy::ExitFullscreen(clientRectForNode(node)), m_page->pageID());
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::ExitFullscreen(screenRectForNode(node)), m_page->pageID());
}
void WebVideoFullscreenManager::setDuration(double duration)
