Attachment 230660 Details for Bug 132467 – Patch for ews

[patch] Patch for ews

bug-132467-20140502181343.patch (text/plain), 5.21 KB, created by Gyuyoung Kim on 2014-05-02 02:14:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2014-05-02 02:14:06 PDT

Size: 5.21 KB

patch

obsolete

>Subversion Revision: 168148
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4d3441612f9088e644597b0e0e7e813a44164ff6..57a6a62da134c7aa97354944b49950177b794ab8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2014-05-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Convert OwnPtr to std::unique_ptr in CDM
>+        https://bugs.webkit.org/show_bug.cgi?id=132467
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use std::unique_ptr in CDM class.
>+
>+        No new tests, no behavior change.
>+
>+        * Modules/encryptedmedia/CDM.cpp:
>+        (WebCore::CDM::create):
>+        * Modules/encryptedmedia/CDM.h:
>+        * Modules/encryptedmedia/CDMPrivate.h:
>+        * Modules/encryptedmedia/MediaKeys.cpp:
>+        (WebCore::MediaKeys::create):
>+        (WebCore::MediaKeys::MediaKeys):
>+        * Modules/encryptedmedia/MediaKeys.h:
>+
> 2014-05-01  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Migrate all uses of DeviceMotionController and DeviceOrientationController to std::unique_ptr
>diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.cpp b/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>index 75268844196058981bf76bb464db8f6b4acc7b08..967c23ed0d4e4762f21050a2fba7b642f6e80f61 100644
>--- a/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>@@ -94,12 +94,12 @@ bool CDM::keySystemSupportsMimeType(const String& keySystem, const String& mimeT
>     return false;
> }
> 
>-PassOwnPtr<CDM> CDM::create(const String& keySystem)
>+std::unique_ptr<CDM> CDM::create(const String& keySystem)
> {
>     if (!supportsKeySystem(keySystem))
>         return nullptr;
> 
>-    return adoptPtr(new CDM(keySystem));
>+    return std::make_unique<CDM>(keySystem);
> }
> 
> CDM::CDM(const String& keySystem)
>diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.h b/Source/WebCore/Modules/encryptedmedia/CDM.h
>index f30d64f8d468e86b4851e7b7acf476955a087bd5..579c9224fe6b636877f1b2a10bc0344a84e91ed1 100644
>--- a/Source/WebCore/Modules/encryptedmedia/CDM.h
>+++ b/Source/WebCore/Modules/encryptedmedia/CDM.h
>@@ -53,11 +53,12 @@ public:
> 
> class CDM {
> public:
>+    explicit CDM(const String& keySystem);
> 
>     enum CDMErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
>     static bool supportsKeySystem(const String&);
>     static bool keySystemSupportsMimeType(const String& keySystem, const String& mimeType);
>-    static PassOwnPtr<CDM> create(const String& keySystem);
>+    static std::unique_ptr<CDM> create(const String& keySystem);
>     static void registerCDMFactory(CreateCDM, CDMSupportsKeySystem, CDMSupportsKeySystemAndMimeType);
>     ~CDM();
> 
>@@ -72,10 +73,8 @@ public:
>     MediaPlayer* mediaPlayer() const;
> 
> private:
>-    CDM(const String& keySystem);
>-
>     String m_keySystem;
>-    OwnPtr<CDMPrivateInterface> m_private;
>+    std::unique_ptr<CDMPrivateInterface> m_private;
>     CDMClient* m_client;
> };
> 
>diff --git a/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h b/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h
>index 8bb801f4bfd735ceb2066ecea3247939c78dd925..46bd78d93b24c062e5c54d36df1670dc134b8f1e 100644
>--- a/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h
>+++ b/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h
>@@ -28,7 +28,6 @@
> 
> #if ENABLE(ENCRYPTED_MEDIA_V2)
> 
>-#include <wtf/OwnPtr.h>
> #include <wtf/text/WTFString.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
>index c29c33f9c07e1a79e7a85c6cf3bfa06b8c0a3c41..3ebf8225b550b3aee509bbb8c9ae9dcc5ee426aa 100644
>--- a/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
>@@ -57,7 +57,7 @@ PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionCode&
> 
>     // 3. Let cdm be the content decryption module corresponding to keySystem.
>     // 4. Load cdm if necessary.
>-    OwnPtr<CDM> cdm = CDM::create(keySystem);
>+    std::unique_ptr<CDM> cdm = CDM::create(keySystem);
> 
>     // 5. Create a new MediaKeys object.
>     // 5.1 Let the keySystem attribute be keySystem.
>@@ -65,10 +65,10 @@ PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionCode&
>     return adoptRef(new MediaKeys(keySystem, cdm.release()));
> }
> 
>-MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<CDM> cdm)
>+MediaKeys::MediaKeys(const String& keySystem, std::unique_ptr<CDM> cdm)
>     : m_mediaElement(0)
>     , m_keySystem(keySystem)
>-    , m_cdm(cdm)
>+    , m_cdm(std::move(cdm))
> {
>     m_cdm->setClient(this);
> }
>diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeys.h b/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
>index cbfef87021fa68d845946453dad118f6358b9693..1e59382ace10563d8f2922b164079b14b697fd59 100644
>--- a/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
>+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
>@@ -32,7 +32,6 @@
> #include "EventTarget.h"
> #include "ExceptionCode.h"
> #include <runtime/Uint8Array.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/RefCounted.h>
> #include <wtf/Vector.h>
>@@ -68,7 +67,7 @@ protected:
> 
>     HTMLMediaElement* m_mediaElement;
>     String m_keySystem;
>-    OwnPtr<CDM> m_cdm;
>+    std::unique_ptr<CDM> m_cdm;
> };
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 132467: 230660 | 230661 | 230743 | 230784 | 230786