mozilla-central: changeset 444537:b4e4e74aa3ccb6673df2a4b62249706e5999fcd6

author	Takuro Ashie <ashie@clear-code.com>
	Tue, 06 Nov 2018 02:56:36 +0000
changeset 444537	b4e4e74aa3ccb6673df2a4b62249706e5999fcd6
parent 444536	b765559ddc3a9d0b54f3665de95407799e58e317
child 444539	e160f0a60e4fc9cc6e77dd57644d74d4c6cc88dd
child 444588	b55684fba8a2d04c2b8942e292fe402ab5436b1a
push id	34996
push user	rgurzau@mozilla.com
push date	Tue, 06 Nov 2018 09:53:23 +0000
treeherder	mozilla-central@e160f0a60e4f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jya
bugs	1502786
milestone	65.0a1
first release with	nightly linux32 957a743c4ca2 / 65.0a1 / 20181106100114 / files nightly linux64 957a743c4ca2 / 65.0a1 / 20181106100114 / files nightly mac 957a743c4ca2 / 65.0a1 / 20181106100114 / files nightly win32 957a743c4ca2 / 65.0a1 / 20181106100114 / files nightly win64 957a743c4ca2 / 65.0a1 / 20181106100114 / files
last release without	nightly linux32 9f9a9234959f / 65.0a1 / 20181105220107 / files nightly linux64 9f9a9234959f / 65.0a1 / 20181105220107 / files nightly mac 9f9a9234959f / 65.0a1 / 20181105220107 / files nightly win32 9f9a9234959f / 65.0a1 / 20181105220107 / files nightly win64 9f9a9234959f / 65.0a1 / 20181105220107 / files

Bug 1502786 - Break cycle between PureOmxPlatformLayer and OmxDataDecoder r=jya OmxDataDecoder, OmxPromiseLayer and PureOmxPlatformLayer consist circular reference by RefPtr, and no one sever the reference. As a result their refcount never decrease to 0. This commit sever it at PureOmxPlatformLayer::Shutdown() which is called by OmxDataDecoder. Differential Revision: https://phabricator.services.mozilla.com/D10028

dom/media/platforms/omx/PureOmxPlatformLayer.cpp

file | annotate | diff | comparison | revisions

--- a/dom/media/platforms/omx/PureOmxPlatformLayer.cpp
+++ b/dom/media/platforms/omx/PureOmxPlatformLayer.cpp
@@ -111,19 +111,16 @@ PureOmxPlatformLayer::PureOmxPlatformLay
   , mImageContainer(aImageContainer)
 {
   LOG("");
 }
 
 PureOmxPlatformLayer::~PureOmxPlatformLayer()
 {
   LOG("");
-  if (mComponent) {
-    OMX_FreeHandle(mComponent);
-  }
 }
 
 OMX_ERRORTYPE
 PureOmxPlatformLayer::InitOmxToStateLoaded(const TrackInfo* aInfo)
 {
   LOG("");
 
   if (!aInfo) {
@@ -272,16 +269,22 @@ PureOmxPlatformLayer::SetParameter(OMX_I
                           aParamIndex,
                           aComponentParameterStructure);
 }
 
 nsresult
 PureOmxPlatformLayer::Shutdown()
 {
   LOG("");
+  if (mComponent) {
+    OMX_FreeHandle(mComponent);
+    mComponent = nullptr;
+  }
+  mPromiseLayer = nullptr;
+  mDataDecoder = nullptr;
   return NS_OK;
 }
 
 /* static */ OMX_ERRORTYPE
 PureOmxPlatformLayer::EventHandler(OMX_HANDLETYPE hComponent,
                                    OMX_PTR pAppData,
                                    OMX_EVENTTYPE eEventType,
                                    OMX_U32 nData1,