Attachment 132807 Details for Bug 81652 – Patch

[patch] Patch

bug-81652-20120320132536.patch (text/plain), 3.73 KB, created by Tommy Widenflycht on 2012-03-20 05:25:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tommy Widenflycht

Created: 2012-03-20 05:25:37 PDT

Size: 3.73 KB

patch

obsolete

>Subversion Revision: 111371
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 7eedb557b16510e08dcbf56d8362204d84078ad4..ff3151caa6afe94294c7770f90e90ee88a4218ce 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,24 @@
>+2012-03-20  Tommy Widenflycht  <tommyw@google.com>
>+
>+        [chromium] MediaStream API (JSEP): Enhancing WebMediaHints and WebICEOptions
>+        https://bugs.webkit.org/show_bug.cgi?id=81652
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adding an initialize method to WebMediaHints and WebICEOptions.
>+        This is needed for Chromium unittests.
>+
>+        * public/platform/WebICEOptions.h:
>+        (WebICEOptions):
>+        * public/platform/WebMediaHints.h:
>+        (WebMediaHints):
>+        * src/WebICEOptions.cpp:
>+        (WebKit::WebICEOptions::initialize):
>+        (WebKit):
>+        * src/WebMediaHints.cpp:
>+        (WebKit::WebMediaHints::initialize):
>+        (WebKit):
>+
> 2012-03-19  Adam Barth  <abarth@webkit.org>
> 
>         Remove support for "magic" iframe
>diff --git a/Source/WebKit/chromium/public/platform/WebICEOptions.h b/Source/WebKit/chromium/public/platform/WebICEOptions.h
>index 682cba42c0b08bd240487133ebc34320c56b629d..f72e0f9443d9dfc4f5fa057506c6c88d0a7257d3 100644
>--- a/Source/WebKit/chromium/public/platform/WebICEOptions.h
>+++ b/Source/WebKit/chromium/public/platform/WebICEOptions.h
>@@ -62,6 +62,7 @@ public:
> 
>     WEBKIT_EXPORT void assign(const WebICEOptions&);
> 
>+    WEBKIT_EXPORT void initialize(CandidateType);
>     WEBKIT_EXPORT void reset();
>     bool isNull() const { return m_private.isNull(); }
> 
>diff --git a/Source/WebKit/chromium/public/platform/WebMediaHints.h b/Source/WebKit/chromium/public/platform/WebMediaHints.h
>index e8ab0c9d89213f6eb1e30576f2ec74229b02b9bc..e780fffdb62cc84e755ff75fc4171dbecfb6e64d 100644
>--- a/Source/WebKit/chromium/public/platform/WebMediaHints.h
>+++ b/Source/WebKit/chromium/public/platform/WebMediaHints.h
>@@ -56,6 +56,7 @@ public:
> 
>     WEBKIT_EXPORT void assign(const WebMediaHints&);
> 
>+    WEBKIT_EXPORT void initialize(bool audio, bool video);
>     WEBKIT_EXPORT void reset();
>     bool isNull() const { return m_private.isNull(); }
> 
>diff --git a/Source/WebKit/chromium/src/WebICEOptions.cpp b/Source/WebKit/chromium/src/WebICEOptions.cpp
>index 17fef64f9e75fc1cc44e047d278fb9bec4054130..c74c49d8d3c3481e123d4da427ba7a8fd931330c 100644
>--- a/Source/WebKit/chromium/src/WebICEOptions.cpp
>+++ b/Source/WebKit/chromium/src/WebICEOptions.cpp
>@@ -50,6 +50,26 @@ void WebICEOptions::assign(const WebICEOptions& other)
>     m_private = other.m_private;
> }
> 
>+void WebICEOptions::initialize(CandidateType candidateType)
>+{
>+    ASSERT(isNull());
>+
>+    IceOptions::UseCandidatesOption option = IceOptions::ALL;
>+    switch (candidateType) {
>+    case CandidateTypeAll:
>+        option = IceOptions::ALL;
>+        break;
>+    case CandidateTypeNoRelay:
>+        option = IceOptions::NO_RELAY;
>+        break;
>+    case CandidateTypeOnlyRelay:
>+        option = IceOptions::ONLY_RELAY;
>+        break;
>+    }
>+
>+    m_private = IceOptions::create(option);
>+}
>+
> void WebICEOptions::reset()
> {
>     m_private.reset();
>diff --git a/Source/WebKit/chromium/src/WebMediaHints.cpp b/Source/WebKit/chromium/src/WebMediaHints.cpp
>index bcff1f76ad09680bfc94c971af95edc9f62a5403..69091f1baba45d70a2355e8825b3eede385bfeeb 100644
>--- a/Source/WebKit/chromium/src/WebMediaHints.cpp
>+++ b/Source/WebKit/chromium/src/WebMediaHints.cpp
>@@ -50,6 +50,12 @@ void WebMediaHints::assign(const WebMediaHints& other)
>     m_private = other.m_private;
> }
> 
>+void WebMediaHints::initialize(bool audio, bool video)
>+{
>+    ASSERT(isNull());
>+    m_private = MediaHints::create(audio, video);
>+}
>+
> void WebMediaHints::reset()
> {
>     m_private.reset();

Actions: View | Formatted Diff | Diff

Attachments on bug 81652: 132807 | 132819 | 133025 | 133027