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

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.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
Download patch
Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html
index 2c0ae79dcb7eb314a02f21ce15b9393f2c0fed93..c6f3f6479b1a608476c1117c10df496dde5d8e02 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html
@@ -12,11 +12,11 @@
async_test(function(test)
{
var mediaKeys;
- 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 a MediaKeys object. Returns a promise that resolves
@@ -34,53 +34,53 @@
// last one created.
createMediaKeys().then(function(result) {
// Should be 1 MediaKeys.
- // In non-Oilpan, numActiveDOMObjectsCreate() == 1.
- // In Oilpan, numActiveDOMObjectsCreated() <= 4.
+ // In non-Oilpan, numSuspendableObjectsCreate() == 1.
+ // In Oilpan, numSuspendableObjectsCreated() <= 4.
// (1 MediaKeysInitializer,
// 1 MediaKeySystemAccessInitializer (navigator.requestMediaKeySystemAccess() use above),
// 1 MediaKeySystemAccessInitializer (isInitDataSupported() (via getSupportedInitDataType())) and
// 1 ContentDecryptionModuleResultPromise).
- assert_between_inclusive(numActiveDOMObjectsCreated(), 1, 4);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 1, 4);
return createMediaKeys();
}).then(function(result) {
// Should be 2 MediaKeys.
- // In non-Oilpan, numActiveDOMObjectsCreate() == 2.
- // In Oilpan, numActiveDOMObjectsCreate() <= 8.
+ // In non-Oilpan, numSuspendableObjectsCreate() == 2.
+ // In Oilpan, numSuspendableObjectsCreate() <= 8.
// (2 MediaKeysInitializer,
// 4 MediaKeySystemAccessInitializer and
// 2 ContentDecryptionModuleResultPromise).
- assert_between_inclusive(numActiveDOMObjectsCreated(), 2, 8);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 2, 8);
return createMediaKeys();
}).then(function(result) {
// Should be 3 MediaKeys.
- // In non-Oilpan, numActiveDOMObjectsCreate() == 3.
- // In Oilpan, numActiveDOMObjectsCreate() <= 12.
+ // In non-Oilpan, numSuspendableObjectsCreate() == 3.
+ // In Oilpan, numSuspendableObjectsCreate() <= 12.
// (3 MediaKeysInitializer,
// 6 MediaKeySystemAccessInitializer and
// 3 ContentDecryptionModuleResultPromise).
- assert_between_inclusive(numActiveDOMObjectsCreated(), 3, 12);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 3, 12);
return createMediaKeys();
}).then(function(result) {
// Should be 4 MediaKeys.
- // In non-Oilpan, numActiveDOMObjectsCreate() == 4.
- // In Oilpan, numActiveDOMObjectsCreate() <= 16.
+ // In non-Oilpan, numSuspendableObjectsCreate() == 4.
+ // In Oilpan, numSuspendableObjectsCreate() <= 16.
// (4 MediaKeysInitializer,
// 8 MediaKeySystemAccessInitializer and
// 4 ContentDecryptionModuleResultPromise).
- assert_between_inclusive(numActiveDOMObjectsCreated(), 4, 16);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 4, 16);
return createMediaKeys();
}).then(function(result) {
// Should be 5 MediaKeys.
- // In non-Oilpan, numActiveDOMObjectsCreate() == 5.
- // In Oilpan, numActiveDOMObjectsCreate() <= 20.
+ // In non-Oilpan, numSuspendableObjectsCreate() == 5.
+ // In Oilpan, numSuspendableObjectsCreate() <= 20.
// (5 MediaKeysInitializer,
// 10 MediaKeySystemAccessInitializer and
// 5 ContentDecryptionModuleResultPromise).
- assert_between_inclusive(numActiveDOMObjectsCreated(), 5, 20);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 5, 20);
// |mediaKeys| refers to the most recently created MediaKeys
// object.
@@ -90,14 +90,14 @@
// collected, it needs time to process any pending events.
return delayToAllowEventProcessingPromise();
}).then(function(result) {
- // In non-Oilpan, numActiveDOMObjectsCreated() == 5
+ // In non-Oilpan, numSuspendableObjectsCreated() == 5
// (5 MediaKeySession objects).
- // In Oilpan, numActiveDOMObjectsCreated() <= 23
+ // In Oilpan, numSuspendableObjectsCreated() <= 23
// (5 MediaKeysInitializer,
// 12 MediaKeySystemAccessInitializer,
// 5 ContentDecryptionModuleResultPromise and
// 1 DOMTimer (in delayToAllowEventProcessingPromise))
- assert_between_inclusive(numActiveDOMObjectsCreated(), 5, 23);
+ assert_between_inclusive(numSuspendableObjectsCreated(), 5, 23);
// As we only have a reference (|mediaKeys|) to the last
// created MediaKeys object, the other 4 MediaKeys objects
@@ -105,7 +105,7 @@
return createGCPromise();
}).then(function(result) {
// Should be 1 MediaKeys and DOMTimer.
- assert_less_than_equal(numActiveDOMObjectsCreated(), 2);
+ assert_less_than_equal(numSuspendableObjectsCreated(), 2);
assert_equals(typeof mediaKeys.createSession, 'function');
// Release the last MediaKeys object created.
@@ -115,7 +115,7 @@
return createGCPromise();
}).then(function(result) {
// Should be just a DOMTimer.
- assert_less_than_equal(numActiveDOMObjectsCreated(), 1);
+ assert_less_than_equal(numSuspendableObjectsCreated(), 1);
test.done();
}).catch(function(error) {
forceTestFailureFromPromise(test, error);

Powered by Google App Engine
This is Rietveld 408576698