Revert of Move DOMArrayBuffer, DOMArrayBufferViews and DataView to the heap.

third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
 namespace blink {
 
 // A class holding a pending action.
 class MediaKeys::PendingAction : public GarbageCollectedFinalized<MediaKeys::PendingAction> {
 public:
     const Persistent<ContentDecryptionModuleResult> result() const
     {
         return m_result;
     }
 
-    DOMArrayBuffer* data() const
+    const RefPtr<DOMArrayBuffer> data() const
     {
         return m_data;
     }
 
-    static PendingAction* CreatePendingSetServerCertificate(ContentDecryptionModuleResult* result, DOMArrayBuffer* serverCertificate)
+    static PendingAction* CreatePendingSetServerCertificate(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuffer> serverCertificate)
     {
         ASSERT(result);
         ASSERT(serverCertificate);
         return new PendingAction(result, serverCertificate);
     }
 
     ~PendingAction()
     {
     }
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_result);
-        visitor->trace(m_data);
     }
 
 private:
-    PendingAction(ContentDecryptionModuleResult* result, DOMArrayBuffer* data)
+    PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuffer> data)
         : m_result(result)
         , m_data(data)
     {
     }
 
     const Member<ContentDecryptionModuleResult> m_result;
-    const Member<DOMArrayBuffer> m_data;
+    const RefPtr<DOMArrayBuffer> m_data;
 };
 
 MediaKeys* MediaKeys::create(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
 {
     MediaKeys* mediaKeys = new MediaKeys(context, supportedSessionTypes, cdm);
     mediaKeys->suspendIfNeeded();
     return mediaKeys;
 }
 
 MediaKeys::MediaKeys(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
@@ skipping 54 matching lines @@
             scriptState, DOMException::create(InvalidAccessError, "The serverCertificate parameter is empty."));
     }
 
     // 2. If the keySystem does not support server certificates, return a
     //    promise rejected with a new DOMException whose name is
     //    "NotSupportedError".
     //    (Let the CDM decide whether to support this or not.)
 
     // 3. Let certificate be a copy of the contents of the serverCertificate
     //    parameter.
-    DOMArrayBuffer* serverCertificateBuffer = DOMArrayBuffer::create(serverCertificate.data(), serverCertificate.byteLength());
+    RefPtr<DOMArrayBuffer> serverCertificateBuffer = DOMArrayBuffer::create(serverCertificate.data(), serverCertificate.byteLength());
 
     // 4. Let promise be a new promise.
     SimpleContentDecryptionModuleResultPromise* result = new SimpleContentDecryptionModuleResultPromise(scriptState);
     ScriptPromise promise = result->promise();
 
     // 5. Run the following steps asynchronously (documented in timerFired()).
-    m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(result, serverCertificateBuffer));
+    m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(result, serverCertificateBuffer.release()));
     if (!m_timer.isActive())
         m_timer.startOneShot(0, BLINK_FROM_HERE);
 
     // 6. Return promise.
     return promise;
 }
 
 bool MediaKeys::reserveForMediaElement(HTMLMediaElement* mediaElement)
 {
     // If some other HtmlMediaElement already has a reference to us, fail.
@@ skipping 91 matching lines @@
 void MediaKeys::stop()
 {
     ActiveDOMObject::stop();
 
     if (m_timer.isActive())
         m_timer.stop();
     m_pendingActions.clear();
 }
 
 } // namespace blink