| Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html
|
| diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html
|
| index 80868a2de5e6715269832b58864e14505ed36ac2..e0bb9cba3cde88ffb6b2f9ffae9093de2fe111eb 100644
|
| --- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html
|
| +++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html
|
| @@ -8,7 +8,7 @@
|
| </head>
|
| <body>
|
| <script>
|
| - // Since MediaKeySession (and MediaKeys) are ActiveDOMObjects,
|
| + // Since MediaKeySession (and MediaKeys) are SuspendableObjects,
|
| // we can determine when they are garbage collected.
|
| // MediaKeySessions remain as long as:
|
| // JavaScript has a reference to it
|
| @@ -21,11 +21,11 @@
|
| var mediaKeySession2;
|
| var initDataType;
|
| var initData;
|
| - var startingActiveDOMObjectCount = window.internals.activeDOMObjectCount(document);
|
| + var startingSuspendableObjectCount = window.internals.suspendableObjectCount(document);
|
|
|
| - function numActiveDOMObjectsCreated()
|
| + function numSuspendableObjectsCreated()
|
| {
|
| - return window.internals.activeDOMObjectCount(document) - startingActiveDOMObjectCount;
|
| + return window.internals.suspendableObjectCount(document) - startingSuspendableObjectCount;
|
| }
|
|
|
| // Create 2 sessions.
|
| @@ -36,40 +36,40 @@
|
| }).then(function(result) {
|
| mediaKeys = result;
|
|
|
| - // Verify MediaKeys is an ActiveDOMObject.
|
| - // In non-Oilpan, numActiveDOMObjectsCreate() == 1.
|
| - // In Oilpan, numActiveDOMObjectsCreate() <= 4.
|
| + // Verify MediaKeys is an SuspendableObject.
|
| + // In non-Oilpan, numSuspendableObjectsCreate() == 1.
|
| + // In Oilpan, numSuspendableObjectsCreate() <= 4.
|
| // (1 MediaKeys,
|
| // 1 MediaKeysInitializer and
|
| // 1 MediaKeySystemAccessInitializer (navigator.requestMediaKeySystemAccess() use above),
|
| // 1 MediaKeySystemAccessInitializer (isInitDataSupported() (via getSupportedInitDataType())))
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 1, 4, 'MediaKeys.create()');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 1, 4, 'MediaKeys.create()');
|
|
|
| mediaKeySession1 = mediaKeys.createSession();
|
| return mediaKeySession1.generateRequest(initDataType, initData);
|
| }).then(function() {
|
| // Should be 1 MediaKeys + 1 MediaKeySession.
|
| - // In non-Oilpan, numActiveDOMObjectsCreate() == 2.
|
| - // In Oilpan, numActiveDOMObjectsCreate() <= 6.
|
| + // In non-Oilpan, numSuspendableObjectsCreate() == 2.
|
| + // In Oilpan, numSuspendableObjectsCreate() <= 6.
|
| // (1 MediaKeys,
|
| // 1 MediaKeysInitializer,
|
| // 2 MediaKeySystemAccessInitializers,
|
| // 1 ContentDecryptionModuleResultPromise and
|
| // 1 MediaKeySession).
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 2, 6, 'MediaKeys.createSession(1)');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 2, 6, 'MediaKeys.createSession(1)');
|
|
|
| mediaKeySession2 = mediaKeys.createSession();
|
| return mediaKeySession2.generateRequest(initDataType, initData);
|
| }).then(function() {
|
| // Should be 1 MediaKeys + 2 MediaKeySessions.
|
| - // In non-Oilpan, numActiveDOMObjectsCreate() == 3.
|
| - // In Oilpan, numActiveDOMObjectsCreate() <= 8.
|
| + // In non-Oilpan, numSuspendableObjectsCreate() == 3.
|
| + // In Oilpan, numSuspendableObjectsCreate() <= 8.
|
| // (1 MediaKeys,
|
| // 1 MediaKeysInitializer,
|
| // 2 MediaKeySystemAccessInitializers,
|
| // 2 ContentDecryptionModuleResultPromise and
|
| // 2 MediaKeySession).
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 3, 8, 'mediaKeys.createSession(2)');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 3, 8, 'mediaKeys.createSession(2)');
|
|
|
| // Close the sessions. Once completed, only the JS
|
| // reference to them keeps them around.
|
| @@ -81,28 +81,28 @@
|
| // reference to them from JS will result in the session
|
| // being garbage-collected.
|
| // Should be 1 MediaKeys + 2 MediaKeySessions.
|
| - // In non-Oilpan, numActiveDOMObjectsCreate() == 3.
|
| - // In Oilpan, numActiveDOMObjectsCreate() <= 10.
|
| + // In non-Oilpan, numSuspendableObjectsCreate() == 3.
|
| + // In Oilpan, numSuspendableObjectsCreate() <= 10.
|
| // (1 MediaKeys,
|
| // 1 MediaKeysInitializer,
|
| // 2 MediaKeySystemAccessInitializers,
|
| // 4 ContentDecryptionModuleResultPromise and
|
| // 2 MediaKeySession).
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 3, 10, 'after close');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 3, 10, 'after close');
|
|
|
| mediaKeySession1 = null;
|
| return createGCPromise();
|
| }).then(function() {
|
| // Only MediaKeys + mediaKeySession2 should remain.
|
| // In non-Oilpan, there is also something from createGCPromise().
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 2, 3, 'mediaKeySession1 not collected');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 2, 3, 'mediaKeySession1 not collected');
|
|
|
| mediaKeySession2 = null;
|
| return createGCPromise();
|
| }).then(function() {
|
| // Only MediaKeys should remain.
|
| // In non-Oilpan, there is also something from createGCPromise().
|
| - assert_between_inclusive(numActiveDOMObjectsCreated(), 1, 2, 'mediaKeySession2 not collected');
|
| + assert_between_inclusive(numSuspendableObjectsCreated(), 1, 2, 'mediaKeySession2 not collected');
|
| test.done();
|
| }).catch(function(error) {
|
| forceTestFailureFromPromise(test, error);
|
|
|
Chromium Code Reviews
Issue 2587913002:
Rename activeDOMObjectsAreSuspended to isContextSuspended (Closed)
