Commit 0d74405d authored by eroman@chromium.org's avatar eroman@chromium.org

Use "int" rather than "long" for C++ code interacting with WebIDL's "long".

(WebIDL's "long" is a 32-bit type)

BUG=267360

Review URL: https://codereview.chromium.org/716323002

git-svn-id: svn://svn.chromium.org/blink/trunk@185331 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f82bec68
......@@ -38,11 +38,11 @@
namespace blink {
static const long minToneDurationMs = 70;
static const long defaultToneDurationMs = 100;
static const long maxToneDurationMs = 6000;
static const long minInterToneGapMs = 50;
static const long defaultInterToneGapMs = 50;
static const int minToneDurationMs = 70;
static const int defaultToneDurationMs = 100;
static const int maxToneDurationMs = 6000;
static const int minInterToneGapMs = 50;
static const int defaultInterToneGapMs = 50;
RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, WebRTCPeerConnectionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionState& exceptionState)
{
......@@ -93,12 +93,12 @@ void RTCDTMFSender::insertDTMF(const String& tones, ExceptionState& exceptionSta
insertDTMF(tones, defaultToneDurationMs, defaultInterToneGapMs, exceptionState);
}
void RTCDTMFSender::insertDTMF(const String& tones, long duration, ExceptionState& exceptionState)
void RTCDTMFSender::insertDTMF(const String& tones, int duration, ExceptionState& exceptionState)
{
insertDTMF(tones, duration, defaultInterToneGapMs, exceptionState);
}
void RTCDTMFSender::insertDTMF(const String& tones, long duration, long interToneGap, ExceptionState& exceptionState)
void RTCDTMFSender::insertDTMF(const String& tones, int duration, int interToneGap, ExceptionState& exceptionState)
{
if (!canInsertDTMF()) {
exceptionState.throwDOMException(NotSupportedError, "The 'canInsertDTMF' attribute is false: this sender cannot send DTMF.");
......
......@@ -53,12 +53,12 @@ public:
bool canInsertDTMF() const;
MediaStreamTrack* track() const;
String toneBuffer() const;
long duration() const { return m_duration; }
long interToneGap() const { return m_interToneGap; }
int duration() const { return m_duration; }
int interToneGap() const { return m_interToneGap; }
void insertDTMF(const String& tones, ExceptionState&);
void insertDTMF(const String& tones, long duration, ExceptionState&);
void insertDTMF(const String& tones, long duration, long interToneGap, ExceptionState&);
void insertDTMF(const String& tones, int duration, ExceptionState&);
void insertDTMF(const String& tones, int duration, int interToneGap, ExceptionState&);
DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange);
......@@ -81,8 +81,8 @@ private:
virtual void didPlayTone(const WebString&) override;
Member<MediaStreamTrack> m_track;
long m_duration;
long m_interToneGap;
int m_duration;
int m_interToneGap;
OwnPtr<WebRTCDTMFSenderHandler> m_handler;
......
......@@ -146,7 +146,7 @@ String RTCDataChannel::readyState() const
return String();
}
unsigned long RTCDataChannel::bufferedAmount() const
unsigned RTCDataChannel::bufferedAmount() const
{
return m_handler->bufferedAmount();
}
......
......@@ -66,7 +66,7 @@ public:
bool negotiated() const;
unsigned short id() const;
String readyState() const;
unsigned long bufferedAmount() const;
unsigned bufferedAmount() const;
String binaryType() const;
void setBinaryType(const String&, ExceptionState&);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment