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

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

Issue 1021473002: Oilpan: adjust encrypted-media expectations following r192054. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months 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 04145ca3a9523f3e140dd50e08dca82f497d54c8..ed29749c2fe65e811b74b92687f6a8f8ba0d313e 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
@@ -44,10 +44,11 @@
// Verify MediaKeys are not an ActiveDOMObject.
// In non-Oilpan, numActiveDOMObjectsCreate() == 0.
- // In Oilpan, numActiveDOMObjetsCreated() <= 2.
+ // In Oilpan, numActiveDOMObjetsCreated() <= 3.
// (1 MediaKeysInitializer and
- // 1 MediaKeySystemAccessInitializer).
- assert_less_than_equal(numActiveDOMObjectsCreated(), 2, 'MediaKeys.create()');
+ // 1 MediaKeySystemAccessInitializer (navigator.requestMediaKeySystemAccess() use above),
+ // 1 MediaKeySystemAccessInitializer (isInitDataSupported() (via getSupportedInitDataType())))
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 3, 'MediaKeys.create()');
// Create 3 sessions.
mediaKeySession1 = mediaKeys.createSession();
@@ -56,37 +57,37 @@
assert_true(mediaKeySession1.sessionId && mediaKeySession1.sessionId.length > 0);
// Should be 1 MediaKeySession.
// In non-Oilpan, numActiveDOMObjectsCreate() == 1.
- // In Oilpan, numActiveDOMObjectsCreated() <= 4.
+ // In Oilpan, numActiveDOMObjectsCreated() <= 5.
// (1 MediaKeysInitializer,
- // 1 MediaKeySystemAccessInitializer,
+ // 2 MediaKeySystemAccessInitializers,
// 1 ContentDecryptionModuleResultPromise and
// 1 MediaKeySession).
- assert_less_than_equal(numActiveDOMObjectsCreated(), 4, 'MediaKeys.createSession(1)');
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 5, '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.
// In non-Oilpan, numActiveDOMObjectsCreate() == 2.
- // In Oilpan, numActiveDOMObjectsCreate() <= 6.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 7.
// (1 MediaKeysInitializer,
- // 1 MediaKeySystemAccessInitializer,
+ // 2 MediaKeySystemAccessInitializers,
// 2 ContentDecryptionModuleResultPromise and
// 2 MediaKeySession).
- assert_less_than_equal(numActiveDOMObjectsCreated(), 6, 'mediaKeys.createSession(2)');
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 7, '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.
// In non-Oilpan, numActiveDOMObjectsCreate() == 3.
- // In Oilpan, numActiveDOMObjectsCreate() <= 8.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 9.
// (1 MediaKeysInitializer,
- // 1 MediaKeySystemAccessInitializer,
+ // 2 MediaKeySystemAccessInitializers,
// 3 ContentDecryptionModuleResultPromise and
// 3 MediaKeySession).
- // numActiveDOMObjectsCreated() <= 8 (ditto)
- assert_less_than_equal(numActiveDOMObjectsCreated(), 8, 'mediaKeys.createSession(3)');
+ // numActiveDOMObjectsCreated() <= 9 (ditto)
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 9, '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