Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html

Issue 783423003: Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
index 2328448d4e8d4de8f508684bff120a7adb456b88..826910acd45a6acf196129a49fd2d7efd147e512 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
@@ -39,7 +39,11 @@
assert_equals(typeof mediaKeys.createSession, 'function');
// Verify MediaKeys are not an ActiveDOMObject.
- assert_equals(numActiveDOMObjectsCreated(), 0, 'MediaKeys.create()');
+ // In non-Oilpan, numActiveDOMObjectsCreate() == 0.
+ // In Oilpan, numActiveDOMObjetsCreated() <= 2.
+ // (1 MediaKeysInitializer and
+ // 1 MediaKeySystemAccessInitializer).
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 2, 'MediaKeys.create()');
// Create 3 sessions.
mediaKeySession1 = mediaKeys.createSession();
@@ -47,19 +51,38 @@
}).then(function() {
assert_true(mediaKeySession1.sessionId && mediaKeySession1.sessionId.length > 0);
// Should be 1 MediaKeySession.
- assert_equals(numActiveDOMObjectsCreated(), 1, 'mediaKeys.createSession(1)');
+ // In non-Oilpan, numActiveDOMObjectsCreate() == 1.
+ // In Oilpan, numActiveDOMObjectsCreated() <= 4.
+ // (1 MediaKeysInitializer,
+ // 1 MediaKeySystemAccessInitializer,
+ // 1 ContentDecryptionModuleResultPromise and
+ // 1 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)');
+ // In non-Oilpan, numActiveDOMObjectsCreate() == 2.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 6.
+ // (1 MediaKeysInitializer,
+ // 1 MediaKeySystemAccessInitializer,
+ // 2 ContentDecryptionModuleResultPromise and
+ // 2 MediaKeySession).
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 6, 'mediaKeys.createSession(2)');
mediaKeySession3 = mediaKeys.createSession();
return mediaKeySession3.generateRequest(initDataType, initData);
}).then(function() {
assert_true(mediaKeySession3.sessionId && mediaKeySession3.sessionId.length > 0);
// Should be 3 MediaKeySessions.
- assert_equals(numActiveDOMObjectsCreated(), 3, 'mediaKeys.createSession(3)');
+ // In non-Oilpan, numActiveDOMObjectsCreate() == 3.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 8.
+ // (1 MediaKeysInitializer,
+ // 1 MediaKeySystemAccessInitializer,
+ // 3 ContentDecryptionModuleResultPromise and
+ // 3 MediaKeySession).
+ // numActiveDOMObjectsCreated() <= 8 (ditto)
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 8, 'mediaKeys.createSession(3)');
// Run gc(). All sessions should remain as we have a
// reference to each one. However, running gc()

Powered by Google App Engine
This is Rietveld 408576698