third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html - Issue 2587913002: Rename activeDOMObjectsAreSuspended to isContextSuspended

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html

Issue 2587913002: Rename activeDOMObjectsAreSuspended to isContextSuspended (Closed)

Patch Set: temp Created 4 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

« no previous file with comments | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release.html ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html

diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html

index 38c4a2d9987d0de8cd78b723df31949418bfffc0..bff8e233a3b5da44ea66ab8ddbc12bd7d70470d1 100644

--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html

+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-release-noreference.html

@@ -8,7 +8,7 @@

</head>

<body>

- // 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

@@ -18,11 +18,11 @@

{

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.

@@ -37,14 +37,14 @@

}).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);

@@ -52,14 +52,14 @@

assert_true(mediaKeySession1.sessionId && mediaKeySession1.sessionId.length > 0);

// 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 and

// 2 MediaKeySystemAccessInitializer,

// 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);

@@ -67,14 +67,14 @@

assert_true(mediaKeySession2.sessionId && mediaKeySession2.sessionId.length > 0);

// 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 and

// 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)');

}).then(function(result) {

// Run gc(). All sessions should remain as we have a

// reference to each one.

@@ -82,7 +82,7 @@

}).then(function(result) {

// Should be just 1 MediaKeys + 2 MediaKeySessions.

// In non-Oilpan, there is also something from createGCPromise().

- assert_between_inclusive(numActiveDOMObjectsCreated(), 3, 4, 'After gc()');

+ assert_between_inclusive(numSuspendableObjectsCreated(), 3, 4, 'After gc()');

// Close the sessions. Once the close() event is received,

// they should get garbage collected as there are no JS

@@ -99,7 +99,7 @@

}).then(function(result) {

// 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');

var promise = mediaKeySession2.close();

mediaKeySession2 = null;

@@ -113,7 +113,7 @@

}).then(function(result) {

// 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');

assert_not_equals(mediaKeys, null);

test.done();