Title: [197469] trunk/Source/WebKit2
- Revision
- 197469
- Author
- [email protected]
- Date
- 2016-03-02 15:48:43 -0800 (Wed, 02 Mar 2016)
Log Message
Crashes in media tests after http://trac.webkit.org/changeset/197461
https://bugs.webkit.org/show_bug.cgi?id=154933
Reviewed by Eric Carlson.
Since the controlsManagerInterface is not guaranteed to exist, it doesn't
make sense to return a reference. Return a pointer instead.
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenManagerProxy::isVisible):
(WebKit::WebVideoFullscreenManagerProxy::controlsManagerInterface):
(WebKit::WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197468 => 197469)
--- trunk/Source/WebKit2/ChangeLog 2016-03-02 22:45:46 UTC (rev 197468)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-02 23:48:43 UTC (rev 197469)
@@ -1,5 +1,20 @@
2016-03-02 Beth Dakin <[email protected]>
+ Crashes in media tests after http://trac.webkit.org/changeset/197461
+ https://bugs.webkit.org/show_bug.cgi?id=154933
+
+ Reviewed by Eric Carlson.
+
+ Since the controlsManagerInterface is not guaranteed to exist, it doesn't
+ make sense to return a reference. Return a pointer instead.
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::isVisible):
+ (WebKit::WebVideoFullscreenManagerProxy::controlsManagerInterface):
+ (WebKit::WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline):
+
+2016-03-02 Beth Dakin <[email protected]>
+
Add support for playbackControlsManager
https://bugs.webkit.org/show_bug.cgi?id=154742
-and corresponding-
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h (197468 => 197469)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-03-02 22:45:46 UTC (rev 197468)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-03-02 23:48:43 UTC (rev 197469)
@@ -119,7 +119,7 @@
void applicationDidBecomeActive();
bool isVisible() const;
- PlatformWebVideoFullscreenInterface& controlsManagerInterface();
+ PlatformWebVideoFullscreenInterface* controlsManagerInterface();
private:
friend class WebVideoFullscreenModelContext;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm (197468 => 197469)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-03-02 22:45:46 UTC (rev 197468)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-03-02 23:48:43 UTC (rev 197469)
@@ -633,9 +633,13 @@
return m_page->isViewVisible() && m_page->isInWindow();
}
-PlatformWebVideoFullscreenInterface& WebVideoFullscreenManagerProxy::controlsManagerInterface()
+PlatformWebVideoFullscreenInterface* WebVideoFullscreenManagerProxy::controlsManagerInterface()
{
- return ensureInterface(m_controlsManagerContextId);
+ if (!m_controlsManagerContextId)
+ return nullptr;
+
+ auto& interface = ensureInterface(m_controlsManagerContextId);
+ return &interface;
}
void WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline(uint64_t contextId)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
