Title: [191096] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 191096
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 23:46:40 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r190992. rdar://problem/22823232
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (191095 => 191096)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-15 06:46:38 UTC (rev 191095)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-15 06:46:40 UTC (rev 191096)
@@ -1,5 +1,23 @@
2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190992. rdar://problem/22823232
+
+ 2015-10-13 Brent Fulgham <bfulg...@apple.com>
+
+ [iOS] Avoid crash due to invalid screen bounds
+ https://bugs.webkit.org/show_bug.cgi?id=150048
+ <rdar://problem/22112664>
+
+ Reviewed by Jer Noble.
+
+ Check for an invalid bounds, and reset it to a known state before
+ attempting to use it.
+
+ * WebProcess/ios/WebVideoFullscreenManager.mm:
+ (WebKit::WebVideoFullscreenManager::setVideoLayerFrameFenced):
+
+2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188486. rdar://problem/22707497
2015-08-13 Andy Estes <aes...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (191095 => 191096)
--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-10-15 06:46:38 UTC (rev 191095)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-10-15 06:46:40 UTC (rev 191096)
@@ -540,6 +540,11 @@
RefPtr<WebVideoFullscreenInterfaceContext> interface;
std::tie(model, interface) = ensureModelAndInterface(contextId);
+ if (std::isnan(bounds.x()) || std::isnan(bounds.y()) || std::isnan(bounds.width()) || std::isnan(bounds.height())) {
+ FloatRect clientRect = clientRectForElement(model->videoElement());
+ bounds = FloatRect(0, 0, clientRect.width(), clientRect.height());
+ }
+
[CATransaction begin];
[CATransaction setAnimationDuration:0];
if (interface->layerHostingContext())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
