Index: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html |
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html |
index 0447f54e559d680d26651fe4bf6480803d9afcfd..5809d3fcd3042a52be7f165736929196c49ea25b 100644 |
--- a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html |
+++ b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html |
@@ -36,20 +36,29 @@ |
mediaKeys = result; |
// Verify MediaKeys are not an ActiveDOMObject. |
- assert_equals(numActiveDOMObjectsCreated(), 0, 'MediaKeys.create()'); |
+ // MediaKeys are not an ActiveDOMObject, but when creating MediaKeys, |
+ // creating ScriptPromiseResolvers, which are ActiveDOMObjects. |
+ // so numActiveDOMObjetsCreated() <= 2 (1 is MediaKeysInitializer and |
+ // the other is MediaKeySystemAccessInitializer). |
+ // When enabling oilpan, the ScriptPromiseResolvers are not destroyed |
+ // immediately. So numActiveDOMObjectsCreate() <= 2. |
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 2, 'MediaKeys.create()'); |
mediaKeySession1 = mediaKeys.createSession(); |
return mediaKeySession1.generateRequest(initDataType, initData); |
}).then(function() { |
assert_true(mediaKeySession1.sessionId && mediaKeySession1.sessionId.length > 0); |
// Should be 1 MediaKeySession. |
- assert_equals(numActiveDOMObjectsCreated(), 1, 'mediaKeys.createSession(1)'); |
+ // numActiveDOMObjectsCreated() <= 4 (1 is a ScriptPromiseResolver owned by |
+ // ContentDecryptionModuleResultPromise and the other is MediaKeySession). |
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 4, 'MediaKeys.createSession(1)'); |
mediaKeySession2 = mediaKeys.createSession(); |
return mediaKeySession2.generateRequest(initDataType, initData); |
}).then(function() { |
assert_true(mediaKeySession2.sessionId && mediaKeySession2.sessionId.length > 0); |
// Should be 2 MediaKeySessions. |
- assert_equals(numActiveDOMObjectsCreated(), 2, 'mediaKeys.createSession(2)'); |
+ // numActiveDOMObjectsCreated() <= 6 (ditto) |
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 6, 'mediaKeys.createSession(2)'); |
}).then(function(result) { |
// Run gc(). All sessions should remain as we have a |
// reference to each one. |