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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.cpp

Issue 394353002: Replace tests of ASSERT_ENABLED with ENABLE(ASSERT). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 27 matching lines...) Expand all
38 #include "platform/ContentType.h" 38 #include "platform/ContentType.h"
39 #include "platform/Logging.h" 39 #include "platform/Logging.h"
40 #include "platform/MIMETypeRegistry.h" 40 #include "platform/MIMETypeRegistry.h"
41 #include "platform/Timer.h" 41 #include "platform/Timer.h"
42 #include "platform/UUID.h" 42 #include "platform/UUID.h"
43 #include "public/platform/Platform.h" 43 #include "public/platform/Platform.h"
44 #include "public/platform/WebContentDecryptionModule.h" 44 #include "public/platform/WebContentDecryptionModule.h"
45 #include "wtf/RefPtr.h" 45 #include "wtf/RefPtr.h"
46 #include "wtf/Uint8Array.h" 46 #include "wtf/Uint8Array.h"
47 47
48 #if ASSERT_ENABLED 48 #if ENABLE(ASSERT)
49 namespace { 49 namespace {
50 50
51 // The list of possible values for |sessionType| passed to createSession(). 51 // The list of possible values for |sessionType| passed to createSession().
52 const char* kTemporary = "temporary"; 52 const char* kTemporary = "temporary";
53 const char* kPersistent = "persistent"; 53 const char* kPersistent = "persistent";
54 54
55 } // namespace 55 } // namespace
56 #endif 56 #endif
57 57
58 namespace WebCore { 58 namespace WebCore {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 void MediaKeys::contextDestroyed() 275 void MediaKeys::contextDestroyed()
276 { 276 {
277 ContextLifecycleObserver::contextDestroyed(); 277 ContextLifecycleObserver::contextDestroyed();
278 278
279 // We don't need the CDM anymore. 279 // We don't need the CDM anymore.
280 m_cdm.clear(); 280 m_cdm.clear();
281 } 281 }
282 282
283 } 283 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698