mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 2284c3e8c336 (bug 1215092)

This commit is contained in:
Carsten "Tomcat" Book 2015-10-28 14:28:37 +01:00
Родитель b8bc8b9405
Коммит df5ef54deb
13 изменённых файлов: 16 добавлений и 84 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
netwerk/ipc/NeckoChild.cpp
Просмотреть файл

@ -145,8 +145,7 @@ NeckoChild::DeallocPWyciwygChannelChild(PWyciwygChannelChild* channel)
PWebSocketChild*
NeckoChild::AllocPWebSocketChild(const PBrowserOrId& browser,
const SerializedLoadContext& aSerialized,
const uint32_t& aSerial)
const SerializedLoadContext& aSerialized)
{
NS_NOTREACHED("AllocPWebSocketChild should not be called");
return nullptr;

3
netwerk/ipc/NeckoChild.h
Просмотреть файл

@ -40,8 +40,7 @@ protected:
virtual bool DeallocPFTPChannelChild(PFTPChannelChild*) override;
virtual PWebSocketChild*
AllocPWebSocketChild(const PBrowserOrId&,
const SerializedLoadContext&,
const uint32_t&) override;
const SerializedLoadContext&) override;
virtual bool DeallocPWebSocketChild(PWebSocketChild*) override;
virtual PTCPSocketChild* AllocPTCPSocketChild(const nsString& host,
const uint16_t& port) override;

6
netwerk/ipc/NeckoParent.cpp
Просмотреть файл

@ -320,8 +320,7 @@ NeckoParent::DeallocPWyciwygChannelParent(PWyciwygChannelParent* channel)
PWebSocketParent*
NeckoParent::AllocPWebSocketParent(const PBrowserOrId& browser,
const SerializedLoadContext& serialized,
const uint32_t& aSerial)
const SerializedLoadContext& serialized)
{
nsCOMPtr<nsILoadContext> loadContext;
const char *error = CreateChannelLoadContext(browser, Manager(),
@ -336,8 +335,7 @@ NeckoParent::AllocPWebSocketParent(const PBrowserOrId& browser,
RefPtr<TabParent> tabParent = TabParent::GetFrom(browser.get_PBrowserParent());
PBOverrideStatus overrideStatus = PBOverrideStatusFromLoadContext(serialized);
WebSocketChannelParent* p = new WebSocketChannelParent(tabParent, loadContext,
overrideStatus,
aSerial);
overrideStatus);
p->AddRef();
return p;
}

3
netwerk/ipc/NeckoParent.h
Просмотреть файл

@ -124,8 +124,7 @@ protected:
virtual bool DeallocPFTPChannelParent(PFTPChannelParent*) override;
virtual PWebSocketParent*
AllocPWebSocketParent(const PBrowserOrId& browser,
const SerializedLoadContext& aSerialized,
const uint32_t& aSerial) override;
const SerializedLoadContext& aSerialized) override;
virtual bool DeallocPWebSocketParent(PWebSocketParent*) override;
virtual PTCPSocketParent* AllocPTCPSocketParent(const nsString& host,
const uint16_t& port) override;

3
netwerk/ipc/PNecko.ipdl
Просмотреть файл

@ -68,8 +68,7 @@ parent:
PFTPChannel(PBrowserOrId browser, SerializedLoadContext loadContext,
FTPChannelCreationArgs args);
PWebSocket(PBrowserOrId browser, SerializedLoadContext loadContext,
uint32_t aSerialID);
PWebSocket(PBrowserOrId browser, SerializedLoadContext loadContext);
PTCPServerSocket(uint16_t localPort, uint16_t backlog, bool useArrayBuffers);
PUDPSocket(Principal principal, nsCString filter);

49
netwerk/protocol/websocket/BaseWebSocketChannel.cpp
Просмотреть файл

@ -14,25 +14,12 @@
#include "nsStandardURL.h"
#include "LoadInfo.h"
#include "nsIDOMNode.h"
#include "mozilla/dom/ContentChild.h"
using mozilla::dom::ContentChild;
PRLogModuleInfo *webSocketLog = nullptr;
namespace mozilla {
namespace net {
static uint64_t gNextWebSocketID = 0;
// We use only 53 bits for the WebSocket serial ID so that it can be converted
// to and from a JS value without loss of precision. The upper bits of the
// WebSocket serial ID hold the process ID. The lower bits identify the
// WebSocket.
static const uint64_t kWebSocketIDTotalBits = 53;
static const uint64_t kWebSocketIDProcessBits = 22;
static const uint64_t kWebSocketIDWebSocketBits = kWebSocketIDTotalBits - kWebSocketIDProcessBits;
BaseWebSocketChannel::BaseWebSocketChannel()
: mWasOpened(0)
, mClientSetPingInterval(0)
@ -44,24 +31,6 @@ BaseWebSocketChannel::BaseWebSocketChannel()
{
if (!webSocketLog)
webSocketLog = PR_NewLogModule("nsWebSocket");
// Generation of a unique serial ID.
uint64_t processID = 0;
if (XRE_IsContentProcess()) {
ContentChild* cc = ContentChild::GetSingleton();
processID = cc->GetID();
}
uint64_t processBits = processID & ((uint64_t(1) << kWebSocketIDProcessBits) - 1);
// Make sure no actual webSocket ends up with mWebSocketID == 0 but less then
// what the kWebSocketIDProcessBits allows.
if (++gNextWebSocketID >= (uint64_t(1) << kWebSocketIDWebSocketBits)) {
gNextWebSocketID = 1;
}
uint64_t webSocketBits = gNextWebSocketID & ((uint64_t(1) << kWebSocketIDWebSocketBits) - 1);
mSerial = (processBits << kWebSocketIDWebSocketBits) | webSocketBits;
}
//-----------------------------------------------------------------------------
@ -228,24 +197,6 @@ BaseWebSocketChannel::InitLoadInfo(nsIDOMNode* aLoadingNode,
return NS_OK;
}
NS_IMETHODIMP
BaseWebSocketChannel::GetSerial(uint32_t* aSerial)
{
if (!aSerial) {
return NS_ERROR_FAILURE;
}
*aSerial = mSerial;
return NS_OK;
}
NS_IMETHODIMP
BaseWebSocketChannel::SetSerial(uint32_t aSerial)
{
mSerial = aSerial;
return NS_OK;
}
//-----------------------------------------------------------------------------
// BaseWebSocketChannel::nsIProtocolHandler
//-----------------------------------------------------------------------------

4
netwerk/protocol/websocket/BaseWebSocketChannel.h
Просмотреть файл

@ -55,8 +55,6 @@ class BaseWebSocketChannel : public nsIWebSocketChannel,
NS_IMETHOD InitLoadInfo(nsIDOMNode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,
nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags,
uint32_t aContentPolicyType) override;
NS_IMETHOD GetSerial(uint32_t* aSerial) override;
NS_IMETHOD SetSerial(uint32_t aSerial) override;
// Off main thread URI access.
virtual void GetEffectiveURL(nsAString& aEffectiveURL) const = 0;
@ -100,8 +98,6 @@ class BaseWebSocketChannel : public nsIWebSocketChannel,
uint32_t mPingInterval; /* milliseconds */
uint32_t mPingResponseTimeout; /* milliseconds */
uint32_t mSerial;
};
} // namespace net

4
netwerk/protocol/websocket/WebSocketChannel.cpp
Просмотреть файл

@ -1138,6 +1138,8 @@ NS_IMPL_ISUPPORTS(OutboundEnqueuer, nsIRunnable)
// WebSocketChannel
//-----------------------------------------------------------------------------
uint32_t WebSocketChannel::sSerialSeed = 0;
WebSocketChannel::WebSocketChannel() :
mPort(0),
mCloseTimeout(20000),
@ -1192,6 +1194,8 @@ WebSocketChannel::WebSocketChannel() :
if (NS_FAILED(rv))
LOG(("Failed to initiate dashboard service."));
mSerial = sSerialSeed++;
mService = WebSocketEventService::GetOrCreate();
}

2
netwerk/protocol/websocket/WebSocketChannel.h
Просмотреть файл

@ -294,6 +294,8 @@ private:
bool mPrivateBrowsing;
nsCOMPtr<nsIDashboardEventNotifier> mConnectionLogService;
uint32_t mSerial;
static uint32_t sSerialSeed;
// These members are used for network per-app metering (bug 855949)
// Currently, they are only available on gonk.

3
netwerk/protocol/websocket/WebSocketChannelChild.cpp
Просмотреть файл

@ -489,8 +489,7 @@ WebSocketChannelChild::AsyncOpen(nsIURI *aURI,
NS_ENSURE_SUCCESS(rv, rv);
gNeckoChild->SendPWebSocketConstructor(this, tabChild,
IPC::SerializedLoadContext(this),
mSerial);
IPC::SerializedLoadContext(this));
if (!SendAsyncOpen(uri, nsCString(aOrigin), aInnerWindowID, mProtocol,
mEncrypted, mPingInterval, mClientSetPingInterval,
mPingResponseTimeout, mClientSetPingTimeout, loadInfoArgs)) {

9
netwerk/protocol/websocket/WebSocketChannelParent.cpp
Просмотреть файл

@ -26,12 +26,10 @@ NS_IMPL_ISUPPORTS(WebSocketChannelParent,
WebSocketChannelParent::WebSocketChannelParent(nsIAuthPromptProvider* aAuthProvider,
nsILoadContext* aLoadContext,
PBOverrideStatus aOverrideStatus,
uint32_t aSerial)
PBOverrideStatus aOverrideStatus)
: mAuthProvider(aAuthProvider)
, mLoadContext(aLoadContext)
, mIPCOpen(true)
, mSerial(aSerial)
{
// Websocket channels can't have a private browsing override
MOZ_ASSERT_IF(!aLoadContext, aOverrideStatus == kPBOverride_Unset);
@ -97,11 +95,6 @@ WebSocketChannelParent::RecvAsyncOpen(const URIParams& aURI,
if (NS_FAILED(rv))
goto fail;
rv = mChannel->SetSerial(mSerial);
if (NS_WARN_IF(NS_FAILED(rv))) {
goto fail;
}
rv = LoadInfoArgsToLoadInfo(aLoadInfoArgs, getter_AddRefs(loadInfo));
if (NS_FAILED(rv))
goto fail;

4
netwerk/protocol/websocket/WebSocketChannelParent.h
Просмотреть файл

@ -35,8 +35,7 @@ class WebSocketChannelParent : public PWebSocketParent,
WebSocketChannelParent(nsIAuthPromptProvider* aAuthProvider,
nsILoadContext* aLoadContext,
PBOverrideStatus aOverrideStatus,
uint32_t aSerial);
PBOverrideStatus aOverrideStatus);
private:
bool RecvAsyncOpen(const URIParams& aURI,
@ -67,7 +66,6 @@ class WebSocketChannelParent : public PWebSocketParent,
nsCOMPtr<nsILoadContext> mLoadContext;
bool mIPCOpen;
uint32_t mSerial;
};
} // namespace net

7
netwerk/protocol/websocket/nsIWebSocketChannel.idl
Просмотреть файл

@ -22,7 +22,7 @@ interface nsIPrincipal;
* We are also making it scriptable for now, but this may change once we have
* WebSockets for Workers.
*/
[scriptable, uuid(1bfc252b-ad46-413c-860b-2079bf1399c7)]
[scriptable, uuid(352e0c08-f14c-40c8-ad06-2f8bb5d9d9e0)]
interface nsIWebSocketChannel : nsISupports
{
/**
@ -223,9 +223,4 @@ interface nsIWebSocketChannel : nsISupports
*/
attribute unsigned long pingTimeout;
/**
* Unique ID for this channel. It's not readonly because when the channel is
* created via IPC, the serial number is received from the child process.
*/
attribute unsigned long serial;
};