Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: Ie5904a921ece9c5959b52c8e0b74db09fa08f144
diff --git a/Source/modules/mediastream/MediaConstraintsImpl.cpp b/Source/modules/mediastream/MediaConstraintsImpl.cpp
index 0ba8b75..10d1c8b 100644
--- a/Source/modules/mediastream/MediaConstraintsImpl.cpp
+++ b/Source/modules/mediastream/MediaConstraintsImpl.cpp
@@ -63,8 +63,8 @@
Vector<String> names;
constraints.getOwnPropertyNames(names);
- String mandatory = ASCIILiteral("mandatory");
- String optional = ASCIILiteral("optional");
+ String mandatory("mandatory");
+ String optional("optional");
for (Vector<String>::iterator it = names.begin(); it != names.end(); ++it) {
if (*it != mandatory && *it != optional)
diff --git a/Source/modules/mediastream/MediaStream.idl b/Source/modules/mediastream/MediaStream.idl
index 5270472..62d387f 100644
--- a/Source/modules/mediastream/MediaStream.idl
+++ b/Source/modules/mediastream/MediaStream.idl
@@ -44,8 +44,8 @@
readonly attribute boolean ended;
void stop();
- attribute EventListener onended;
- attribute EventListener onaddtrack;
- attribute EventListener onremovetrack;
+ attribute EventHandler onended;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
diff --git a/Source/modules/mediastream/MediaStreamTrack.cpp b/Source/modules/mediastream/MediaStreamTrack.cpp
index e8695fd..58c5612 100644
--- a/Source/modules/mediastream/MediaStreamTrack.cpp
+++ b/Source/modules/mediastream/MediaStreamTrack.cpp
@@ -61,8 +61,8 @@
String MediaStreamTrack::kind() const
{
- DEFINE_STATIC_LOCAL(String, audioKind, (ASCIILiteral("audio")));
- DEFINE_STATIC_LOCAL(String, videoKind, (ASCIILiteral("video")));
+ DEFINE_STATIC_LOCAL(String, audioKind, ("audio"));
+ DEFINE_STATIC_LOCAL(String, videoKind, ("video"));
switch (m_component->source()->type()) {
case MediaStreamSource::TypeAudio:
@@ -106,15 +106,15 @@
String MediaStreamTrack::readyState() const
{
if (m_stopped)
- return ASCIILiteral("ended");
+ return "ended";
switch (m_component->source()->readyState()) {
case MediaStreamSource::ReadyStateLive:
- return ASCIILiteral("live");
+ return "live";
case MediaStreamSource::ReadyStateMuted:
- return ASCIILiteral("muted");
+ return "muted";
case MediaStreamSource::ReadyStateEnded:
- return ASCIILiteral("ended");
+ return "ended";
}
ASSERT_NOT_REACHED();
diff --git a/Source/modules/mediastream/MediaStreamTrack.idl b/Source/modules/mediastream/MediaStreamTrack.idl
index c2df9f9..f5d9ea9 100644
--- a/Source/modules/mediastream/MediaStreamTrack.idl
+++ b/Source/modules/mediastream/MediaStreamTrack.idl
@@ -32,9 +32,9 @@
readonly attribute DOMString readyState;
- attribute EventListener onmute;
- attribute EventListener onunmute;
- attribute EventListener onended;
+ attribute EventHandler onmute;
+ attribute EventHandler onunmute;
+ attribute EventHandler onended;
[CallWith=ScriptExecutionContext, RaisesException] static void getSources(MediaStreamTrackSourcesCallback callback);
};
diff --git a/Source/modules/mediastream/MediaStreamTrackSourcesCallback.h b/Source/modules/mediastream/MediaStreamTrackSourcesCallback.h
index 585031f..d58afeb 100644
--- a/Source/modules/mediastream/MediaStreamTrackSourcesCallback.h
+++ b/Source/modules/mediastream/MediaStreamTrackSourcesCallback.h
@@ -36,7 +36,7 @@
class MediaStreamTrackSourcesCallback : public RefCounted<MediaStreamTrackSourcesCallback> {
public:
virtual ~MediaStreamTrackSourcesCallback() { }
- virtual bool handleEvent(SourceInfoVector) = 0;
+ virtual bool handleEvent(const SourceInfoVector&) = 0;
};
} // namespace WebCore
diff --git a/Source/modules/mediastream/RTCDTMFSender.idl b/Source/modules/mediastream/RTCDTMFSender.idl
index c06a48c..375a6a5 100644
--- a/Source/modules/mediastream/RTCDTMFSender.idl
+++ b/Source/modules/mediastream/RTCDTMFSender.idl
@@ -35,5 +35,5 @@
[RaisesException] void insertDTMF(DOMString tones, optional long duration, optional long interToneGap);
- attribute EventListener ontonechange;
+ attribute EventHandler ontonechange;
};
diff --git a/Source/modules/mediastream/RTCDataChannel.cpp b/Source/modules/mediastream/RTCDataChannel.cpp
index d90f8e7..4a3a5c0 100644
--- a/Source/modules/mediastream/RTCDataChannel.cpp
+++ b/Source/modules/mediastream/RTCDataChannel.cpp
@@ -114,13 +114,13 @@
{
switch (m_readyState) {
case ReadyStateConnecting:
- return ASCIILiteral("connecting");
+ return "connecting";
case ReadyStateOpen:
- return ASCIILiteral("open");
+ return "open";
case ReadyStateClosing:
- return ASCIILiteral("closing");
+ return "closing";
case ReadyStateClosed:
- return ASCIILiteral("closed");
+ return "closed";
}
ASSERT_NOT_REACHED();
@@ -136,9 +136,9 @@
{
switch (m_binaryType) {
case BinaryTypeBlob:
- return ASCIILiteral("blob");
+ return "blob";
case BinaryTypeArrayBuffer:
- return ASCIILiteral("arraybuffer");
+ return "arraybuffer";
}
ASSERT_NOT_REACHED();
return String();
diff --git a/Source/modules/mediastream/RTCDataChannel.idl b/Source/modules/mediastream/RTCDataChannel.idl
index b307d37..f826fb1 100644
--- a/Source/modules/mediastream/RTCDataChannel.idl
+++ b/Source/modules/mediastream/RTCDataChannel.idl
@@ -49,8 +49,8 @@
void close();
- attribute EventListener onopen;
- attribute EventListener onerror;
- attribute EventListener onclose;
- attribute EventListener onmessage;
+ attribute EventHandler onopen;
+ attribute EventHandler onerror;
+ attribute EventHandler onclose;
+ attribute EventHandler onmessage;
};
diff --git a/Source/modules/mediastream/RTCPeerConnection.cpp b/Source/modules/mediastream/RTCPeerConnection.cpp
index 9d18b71..9f99d94 100644
--- a/Source/modules/mediastream/RTCPeerConnection.cpp
+++ b/Source/modules/mediastream/RTCPeerConnection.cpp
@@ -302,17 +302,17 @@
{
switch (m_signalingState) {
case SignalingStateStable:
- return ASCIILiteral("stable");
+ return "stable";
case SignalingStateHaveLocalOffer:
- return ASCIILiteral("have-local-offer");
+ return "have-local-offer";
case SignalingStateHaveRemoteOffer:
- return ASCIILiteral("have-remote-offer");
+ return "have-remote-offer";
case SignalingStateHaveLocalPrAnswer:
- return ASCIILiteral("have-local-pranswer");
+ return "have-local-pranswer";
case SignalingStateHaveRemotePrAnswer:
- return ASCIILiteral("have-remote-pranswer");
+ return "have-remote-pranswer";
case SignalingStateClosed:
- return ASCIILiteral("closed");
+ return "closed";
}
ASSERT_NOT_REACHED();
@@ -323,11 +323,11 @@
{
switch (m_iceGatheringState) {
case IceGatheringStateNew:
- return ASCIILiteral("new");
+ return "new";
case IceGatheringStateGathering:
- return ASCIILiteral("gathering");
+ return "gathering";
case IceGatheringStateComplete:
- return ASCIILiteral("complete");
+ return "complete";
}
ASSERT_NOT_REACHED();
@@ -338,19 +338,19 @@
{
switch (m_iceConnectionState) {
case IceConnectionStateNew:
- return ASCIILiteral("new");
+ return "new";
case IceConnectionStateChecking:
- return ASCIILiteral("checking");
+ return "checking";
case IceConnectionStateConnected:
- return ASCIILiteral("connected");
+ return "connected";
case IceConnectionStateCompleted:
- return ASCIILiteral("completed");
+ return "completed";
case IceConnectionStateFailed:
- return ASCIILiteral("failed");
+ return "failed";
case IceConnectionStateDisconnected:
- return ASCIILiteral("disconnected");
+ return "disconnected";
case IceConnectionStateClosed:
- return ASCIILiteral("closed");
+ return "closed";
}
ASSERT_NOT_REACHED();
diff --git a/Source/modules/mediastream/RTCPeerConnection.idl b/Source/modules/mediastream/RTCPeerConnection.idl
index a2255c8..4a8c614 100644
--- a/Source/modules/mediastream/RTCPeerConnection.idl
+++ b/Source/modules/mediastream/RTCPeerConnection.idl
@@ -69,12 +69,12 @@
[RaisesException] void close();
- attribute EventListener onnegotiationneeded;
- attribute EventListener onicecandidate;
- attribute EventListener onsignalingstatechange;
- attribute EventListener onaddstream;
- attribute EventListener onremovestream;
- attribute EventListener oniceconnectionstatechange;
- attribute EventListener ondatachannel;
+ attribute EventHandler onnegotiationneeded;
+ attribute EventHandler onicecandidate;
+ attribute EventHandler onsignalingstatechange;
+ attribute EventHandler onaddstream;
+ attribute EventHandler onremovestream;
+ attribute EventHandler oniceconnectionstatechange;
+ attribute EventHandler ondatachannel;
};
diff --git a/Source/modules/mediastream/SourceInfo.cpp b/Source/modules/mediastream/SourceInfo.cpp
index e57df18..c748d6e 100644
--- a/Source/modules/mediastream/SourceInfo.cpp
+++ b/Source/modules/mediastream/SourceInfo.cpp
@@ -51,11 +51,11 @@
{
switch (m_webSourceInfo.kind()) {
case WebKit::WebSourceInfo::SourceKindAudio:
- return ASCIILiteral("audio");
+ return "audio";
case WebKit::WebSourceInfo::SourceKindVideo:
- return ASCIILiteral("video");
+ return "video";
case WebKit::WebSourceInfo::SourceKindNone:
- return ASCIILiteral("none");
+ return "none";
}
ASSERT_NOT_REACHED();
@@ -73,9 +73,9 @@
case WebKit::WebSourceInfo::VideoFacingModeNone:
return String();
case WebKit::WebSourceInfo::VideoFacingModeUser:
- return ASCIILiteral("user");
+ return "user";
case WebKit::WebSourceInfo::VideoFacingModeEnvironment:
- return ASCIILiteral("environment");
+ return "environment";
}
ASSERT_NOT_REACHED();
diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
index ceb28b3..86f39e3 100644
--- a/Source/modules/mediastream/UserMediaRequest.cpp
+++ b/Source/modules/mediastream/UserMediaRequest.cpp
@@ -65,11 +65,11 @@
PassRefPtr<UserMediaRequest> UserMediaRequest::create(ScriptExecutionContext* context, UserMediaController* controller, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& es)
{
- RefPtr<MediaConstraintsImpl> audio = parseOptions(options, ASCIILiteral("audio"), es);
+ RefPtr<MediaConstraintsImpl> audio = parseOptions(options, "audio", es);
if (es.hadException())
return 0;
- RefPtr<MediaConstraintsImpl> video = parseOptions(options, ASCIILiteral("video"), es);
+ RefPtr<MediaConstraintsImpl> video = parseOptions(options, "video", es);
if (es.hadException())
return 0;
@@ -154,7 +154,7 @@
return;
if (m_errorCallback) {
- RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(ASCIILiteral("PERMISSION_DENIED"), description, String());
+ RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create("PERMISSION_DENIED", description, String());
m_errorCallback->handleEvent(error.get());
}
}
@@ -166,7 +166,7 @@
return;
if (m_errorCallback) {
- RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(ASCIILiteral("CONSTRAINT_NOT_SATISFIED"), description, constraintName);
+ RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create("CONSTRAINT_NOT_SATISFIED", description, constraintName);
m_errorCallback->handleEvent(error.get());
}
}