Changeset 180186 in webkit

Timestamp:

Feb 16, 2015, 4:17:29 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r177625. rdar://problem/19851970

Location:

branches/safari-600.1.4.15-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/ios/WebVideoFullscreenManager.mm (modified) (2 diffs)

branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-16  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r177625.
+
+    2014-12-21  Eric Carlson  <eric.carlson@apple.com>
+
+            [iOS] avoid WebVideoFullscreenManager crash
+            https://bugs.webkit.org/show_bug.cgi?id=139852
+            <rdar://problem/19319302>
+
+            Reviewed by Darin Adler.
+
+            * WebProcess/ios/WebVideoFullscreenManager.mm:
+            (WebKit::WebVideoFullscreenManager::didExitFullscreen): NULL-check m_layerHostingContext and m_page.
+            (WebKit::WebVideoFullscreenManager::setVideoLayerFrameFenced): NULL-check m_layerHostingContext.
+
 2015-02-13  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm

@@ -216 +216 @@
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        m_layerHostingContext->setRootLayer(nullptr);
-        m_layerHostingContext = nullptr;
-        m_page->send(Messages::WebVideoFullscreenManagerProxy::CleanupFullscreen(), m_page->pageID());
+        if (m_layerHostingContext) {
+            m_layerHostingContext->setRootLayer(nullptr);
+            m_layerHostingContext = nullptr;
+        }
+        if (m_page)
+            m_page->send(Messages::WebVideoFullscreenManagerProxy::CleanupFullscreen(), m_page->pageID());
         protect.clear();
     });
@@ -248 +251 @@
 void WebVideoFullscreenManager::setVideoLayerFrameFenced(WebCore::FloatRect bounds, IPC::Attachment fencePort)
 {
-    m_layerHostingContext->setFencePort(fencePort.port());
+    if (m_layerHostingContext)
+        m_layerHostingContext->setFencePort(fencePort.port());
     setVideoLayerFrame(bounds);
     mach_port_deallocate(mach_task_self(), fencePort.port());