author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 10 Sep 2012 14:11:19 -0400 (2012-09-10) | |
changeset 104723 | 9c8189bcb3900ece9741b32af3b9ba2e3ed2fc5d |
parent 104722 | c675ef1daee1f0f27fc0f860af542be3afe9f9eb |
child 104724 | 1485815e2524a0ecf430ba6cdd63c4e22709bc0f |
push id | 23445 |
push user | ryanvm@gmail.com |
push date | Tue, 11 Sep 2012 01:39:46 +0000 (2012-09-11) |
treeherder | mozilla-central@96287ad60bef [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 579517 |
milestone | 18.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/base/src/WebSocket.h +++ b/content/base/src/WebSocket.h @@ -183,17 +183,17 @@ protected: nsresult Init(JSContext* aCx, nsIPrincipal* aPrincipal, nsPIDOMWindow* aOwnerWindow, const nsAString& aURL, nsTArray<nsString>& aProtocolArray); void Send(nsIInputStream* aMsgStream, const nsACString& aMsgString, - PRUint32 aMsgLength, + uint32_t aMsgLength, bool aIsBinary, ErrorResult& aRv); nsresult ParseURL(const nsString& aURL); nsresult EstablishConnection(); // These methods when called can release the WebSocket object nsresult FailConnection(uint16_t reasonCode, @@ -201,17 +201,17 @@ protected: nsresult CloseConnection(uint16_t reasonCode, const nsACString& aReasonString = EmptyCString()); nsresult Disconnect(); nsresult ConsoleError(); nsresult PrintErrorOnConsole(const char* aBundleURI, const PRUnichar* aError, const PRUnichar** aFormatStrings, - PRUint32 aFormatStringsLen); + uint32_t aFormatStringsLen); nsresult DoOnMessageAvailable(const nsACString& aMsg, bool isBinary); // ConnectionCloseEvents: 'error' event if needed, then 'close' event. // - These must not be dispatched while we are still within an incoming call // from JS (ex: close()). Set 'sync' to false in that case to dispatch in a // separate new event. @@ -221,17 +221,17 @@ protected: // 2nd half of ScheduleConnectionCloseEvents, sometimes run in its own event. void DispatchConnectionCloseEvents(); // These methods actually do the dispatch for various events. nsresult CreateAndDispatchSimpleEvent(const nsString& aName); nsresult CreateAndDispatchMessageEvent(const nsACString& aData, bool isBinary); nsresult CreateAndDispatchCloseEvent(bool aWasClean, - PRUint16 aCode, + uint16_t aCode, const nsString& aReason); nsresult CreateResponseBlob(const nsACString& aData, JSContext* aCx, jsval& jsData); // if there are "strong event listeners" (see comment in WebSocket.cpp) or // outgoing not sent messages then this method keeps the object alive // when js doesn't have strong references to it.