Title: [160427] branches/safari-537.74-branch/Source/WebKit/win
- Revision
- 160427
- Author
- [email protected]
- Date
- 2013-12-11 04:29:41 -0800 (Wed, 11 Dec 2013)
Log Message
Merged r160184. <rdar://problem/15611608>
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Source/WebKit/win/ChangeLog (160426 => 160427)
--- branches/safari-537.74-branch/Source/WebKit/win/ChangeLog 2013-12-11 12:26:15 UTC (rev 160426)
+++ branches/safari-537.74-branch/Source/WebKit/win/ChangeLog 2013-12-11 12:29:41 UTC (rev 160427)
@@ -1,3 +1,18 @@
+2013-12-11 Lucas Forschler <[email protected]>
+
+ Merge r160184
+
+ 2013-12-04 Brent Fulgham <[email protected]>
+
+ [Win] Exiting from Media Full Screen mode via 'escape' key does not work properly
+ https://bugs.webkit.org/show_bug.cgi?id=125272
+
+ Reviewed by Jer Noble.
+
+ * WebView.cpp:
+ (WebView::fullScreenClientWillExitFullScreen): Change to webkitCancelFullScreen method call
+ to more closely match Media Control behavior.
+
2013-10-29 Brent Fulgham <[email protected]>
Merge r154764
Modified: branches/safari-537.74-branch/Source/WebKit/win/WebView.cpp (160426 => 160427)
--- branches/safari-537.74-branch/Source/WebKit/win/WebView.cpp 2013-12-11 12:26:15 UTC (rev 160426)
+++ branches/safari-537.74-branch/Source/WebKit/win/WebView.cpp 2013-12-11 12:29:41 UTC (rev 160427)
@@ -6929,7 +6929,7 @@
void WebView::fullScreenClientWillExitFullScreen()
{
ASSERT(m_fullScreenElement);
- m_fullScreenElement->document()->webkitWillExitFullScreenForElement(m_fullScreenElement.get());
+ m_fullScreenElement->document()->webkitCancelFullScreen();
}
void WebView::fullScreenClientDidExitFullScreen()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
