Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111581 => 111582)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 18:29:44 UTC (rev 111582)
@@ -1,5 +1,30 @@
2012-03-21 Tommy Widenflycht <[email protected]>
+ [chromium] MediaStream API (JSEP): Enhancing WebMediaHints and WebICEOptions
+ https://bugs.webkit.org/show_bug.cgi?id=81652
+
+ Reviewed by Adam Barth.
+
+ Adding an initialize method to WebMediaHints and WebICEOptions.
+ This is needed for Chromium unittests.
+
+ * public/platform/WebICEOptions.h:
+ (WebKit::WebICEOptions::WebICEOptions):
+ (WebICEOptions):
+ * public/platform/WebMediaHints.h:
+ (WebKit::WebMediaHints::WebMediaHints):
+ (WebMediaHints):
+ * src/AssertMatchingEnums.cpp:
+ * src/WebICEOptions.cpp:
+ (WebKit::WebICEOptions::initialize):
+ (WebKit):
+ (WebKit::WebICEOptions::candidateTypeToUse):
+ * src/WebMediaHints.cpp:
+ (WebKit::WebMediaHints::initialize):
+ (WebKit):
+
+2012-03-21 Tommy Widenflycht <[email protected]>
+
[chromium] MediaStream API (JSEP): Introducing WebSessionDescription and WebIceCandidate
https://bugs.webkit.org/show_bug.cgi?id=81339
Modified: trunk/Source/WebKit/chromium/public/platform/WebICEOptions.h (111581 => 111582)
--- trunk/Source/WebKit/chromium/public/platform/WebICEOptions.h 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/public/platform/WebICEOptions.h 2012-03-21 18:29:44 UTC (rev 111582)
@@ -51,6 +51,7 @@
CandidateTypeOnlyRelay,
};
+ WebICEOptions() { }
WebICEOptions(const WebICEOptions& other) { assign(other); }
~WebICEOptions() { reset(); }
@@ -62,6 +63,7 @@
WEBKIT_EXPORT void assign(const WebICEOptions&);
+ WEBKIT_EXPORT void initialize(CandidateType);
WEBKIT_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
@@ -72,8 +74,6 @@
#endif
private:
- WebICEOptions() { }
-
WebPrivatePtr<WebCore::IceOptions> m_private;
};
Modified: trunk/Source/WebKit/chromium/public/platform/WebMediaHints.h (111581 => 111582)
--- trunk/Source/WebKit/chromium/public/platform/WebMediaHints.h 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/public/platform/WebMediaHints.h 2012-03-21 18:29:44 UTC (rev 111582)
@@ -45,6 +45,7 @@
class WebMediaHints {
public:
+ WebMediaHints() { }
WebMediaHints(const WebMediaHints& other) { assign(other); }
~WebMediaHints() { reset(); }
@@ -56,6 +57,7 @@
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(); }
@@ -67,8 +69,6 @@
#endif
private:
- WebMediaHints() { }
-
WebPrivatePtr<WebCore::MediaHints> m_private;
};
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (111581 => 111582)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-03-21 18:29:44 UTC (rev 111582)
@@ -51,6 +51,7 @@
#include "IDBDatabaseException.h"
#include "IDBFactoryBackendInterface.h"
#include "IDBKey.h"
+#include "IceOptions.h"
#include "IconURL.h"
#include "MediaPlayer.h"
#include "MediaStreamSource.h"
@@ -94,12 +95,13 @@
#include "WebStorageQuotaType.h"
#include "WebTextAffinity.h"
#include "WebTextCaseSensitivity.h"
+#include "WebTextCheckingResult.h"
#include "WebTextCheckingType.h"
-#include "WebTextCheckingResult.h"
#include "WebVideoFrame.h"
#include "WebView.h"
#include "platform/WebClipboard.h"
#include "platform/WebFileSystem.h"
+#include "platform/WebICEOptions.h"
#include "platform/WebMediaStreamSource.h"
#include <wtf/Assertions.h>
#include <wtf/text/StringImpl.h>
@@ -503,6 +505,10 @@
#if ENABLE(MEDIA_STREAM)
COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeAudio, MediaStreamSource::TypeAudio);
COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeVideo, MediaStreamSource::TypeVideo);
+
+COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeAll, IceOptions::ALL);
+COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeNoRelay, IceOptions::NO_RELAY);
+COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeOnlyRelay, IceOptions::ONLY_RELAY);
#endif
COMPILE_ASSERT_MATCHING_ENUM(WebReferrerPolicyAlways, SecurityPolicy::ReferrerPolicyAlways);
Modified: trunk/Source/WebKit/chromium/src/WebICEOptions.cpp (111581 => 111582)
--- trunk/Source/WebKit/chromium/src/WebICEOptions.cpp 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/src/WebICEOptions.cpp 2012-03-21 18:29:44 UTC (rev 111582)
@@ -50,6 +50,12 @@
m_private = other.m_private;
}
+void WebICEOptions::initialize(CandidateType candidateType)
+{
+ ASSERT(isNull());
+ m_private = IceOptions::create(static_cast<IceOptions::UseCandidatesOption>(candidateType));
+}
+
void WebICEOptions::reset()
{
m_private.reset();
@@ -58,18 +64,7 @@
WebICEOptions::CandidateType WebICEOptions::candidateTypeToUse() const
{
ASSERT(!isNull());
-
- switch (m_private->useCandidates()) {
- case IceOptions::ALL:
- return CandidateTypeAll;
- case IceOptions::NO_RELAY:
- return CandidateTypeNoRelay;
- case IceOptions::ONLY_RELAY:
- return CandidateTypeOnlyRelay;
- default:
- ASSERT_NOT_REACHED();
- return CandidateTypeAll;
- }
+ return static_cast<CandidateType>(m_private->useCandidates());
}
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebMediaHints.cpp (111581 => 111582)
--- trunk/Source/WebKit/chromium/src/WebMediaHints.cpp 2012-03-21 18:28:48 UTC (rev 111581)
+++ trunk/Source/WebKit/chromium/src/WebMediaHints.cpp 2012-03-21 18:29:44 UTC (rev 111582)
@@ -50,6 +50,12 @@
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();
