mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import change from rmottola/Arctic-Fox:
- Bug 1087646 - Properly serialize nullprincipal URIs across IPC. (1fcc5a63e) - bug 1137538 - remove nsIIdentityInfo and nsNSSSocketInfo::GetPreviousCert Bug 1136471 - Remove unused nsIIdentityInfo.getValidEVPolicyOid(). (f23ed7a6f) - Bug 1049476 - 0001. webidl change - Support user certificate parameter (ba92ac3c6) - Bug 1049476 - 0002. Support user certificate parameter in API. (30ec1a9c8) - Bug 1049476 - 0003. Add EAP-TLS to wifi capabilities. (69920f968) - Bug 1130400. Part 1. Pass the passed in anchor frame to SetPopupPosition in nsMenuPopupFrame::LayoutPopup if we have one. r=enndeakin (2de244c51) - Bug 1130400. Part 2. Use a reflow callback to set the position of xul popups. r=enndeakin (aa2117085) - Bug 1130400. Add test. (9047c9013) - Bug 1043143: Step 2a: Add a class like nsDownloader but using memory instead of a file. (fad673f10) - Bug 1034143: Step 2b: Add the ability to read jar files from arbitrary memory. (e1dc9faa6) - Bug 1034143: Step 1: Fix tests for bug 945152 and bug 1008126. r=smaug (e6b6cc408) - Bug 1043143: Step 3: Convert nsJARChannel from temporary files to temporary memory. r=honzab (79e381e50) - Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj (f21f630cb) - Bug 1148527 - Indentation fix after bug 1145631 (a8153b9c5)
This commit is contained in:
Vendored
+12
-12
@@ -47,7 +47,7 @@ using mozilla::ipc::PFileDescriptorSetParent;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class ReadStreamChild MOZ_FINAL : public ReadStream
|
||||
class ReadStreamChild final : public ReadStream
|
||||
{
|
||||
public:
|
||||
ReadStreamChild(PCacheStreamControlChild* aControl, const nsID& aId,
|
||||
@@ -66,7 +66,7 @@ public:
|
||||
NoteClosed();
|
||||
}
|
||||
|
||||
virtual void NoteClosedOnOwningThread() MOZ_OVERRIDE
|
||||
virtual void NoteClosedOnOwningThread() override
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(ReadStream);
|
||||
|
||||
@@ -79,7 +79,7 @@ public:
|
||||
mControl->NoteClosed(mId);
|
||||
}
|
||||
|
||||
virtual void ForgetOnOwningThread() MOZ_OVERRIDE
|
||||
virtual void ForgetOnOwningThread() override
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(ReadStream);
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
mControl->RemoveListener(this);
|
||||
}
|
||||
|
||||
virtual void SerializeControl(PCacheReadStream* aReadStreamOut) MOZ_OVERRIDE
|
||||
virtual void SerializeControl(PCacheReadStream* aReadStreamOut) override
|
||||
{
|
||||
MOZ_ASSERT(aReadStreamOut);
|
||||
MOZ_ASSERT(!mClosed);
|
||||
@@ -101,7 +101,7 @@ public:
|
||||
|
||||
virtual void
|
||||
SerializeFds(PCacheReadStream* aReadStreamOut,
|
||||
const nsTArray<FileDescriptor>& fds) MOZ_OVERRIDE
|
||||
const nsTArray<FileDescriptor>& fds) override
|
||||
{
|
||||
MOZ_ASSERT(!mClosed);
|
||||
PFileDescriptorSetChild* fdSet = nullptr;
|
||||
@@ -125,7 +125,7 @@ private:
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class ReadStreamParent MOZ_FINAL : public ReadStream
|
||||
class ReadStreamParent final : public ReadStream
|
||||
{
|
||||
public:
|
||||
ReadStreamParent(PCacheStreamControlParent* aControl, const nsID& aId,
|
||||
@@ -144,7 +144,7 @@ public:
|
||||
NoteClosed();
|
||||
}
|
||||
|
||||
virtual void NoteClosedOnOwningThread() MOZ_OVERRIDE
|
||||
virtual void NoteClosedOnOwningThread() override
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(ReadStream);
|
||||
|
||||
@@ -159,7 +159,7 @@ public:
|
||||
mControl = nullptr;
|
||||
}
|
||||
|
||||
virtual void ForgetOnOwningThread() MOZ_OVERRIDE
|
||||
virtual void ForgetOnOwningThread() override
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(ReadStream);
|
||||
|
||||
@@ -173,7 +173,7 @@ public:
|
||||
mControl = nullptr;
|
||||
}
|
||||
|
||||
virtual void SerializeControl(PCacheReadStream* aReadStreamOut) MOZ_OVERRIDE
|
||||
virtual void SerializeControl(PCacheReadStream* aReadStreamOut) override
|
||||
{
|
||||
MOZ_ASSERT(aReadStreamOut);
|
||||
MOZ_ASSERT(!mClosed);
|
||||
@@ -184,7 +184,7 @@ public:
|
||||
|
||||
virtual void
|
||||
SerializeFds(PCacheReadStream* aReadStreamOut,
|
||||
const nsTArray<FileDescriptor>& fds) MOZ_OVERRIDE
|
||||
const nsTArray<FileDescriptor>& fds) override
|
||||
{
|
||||
MOZ_ASSERT(!mClosed);
|
||||
MOZ_ASSERT(mControl);
|
||||
@@ -227,7 +227,7 @@ using mozilla::ipc::PFileDescriptorSetChild;
|
||||
// be done on the thread associated with the PBackground actor. Must be
|
||||
// cancelable to execute on Worker threads (which can occur when the
|
||||
// ReadStream is constructed on a child process Worker thread).
|
||||
class ReadStream::NoteClosedRunnable MOZ_FINAL : public nsCancelableRunnable
|
||||
class ReadStream::NoteClosedRunnable final : public nsCancelableRunnable
|
||||
{
|
||||
public:
|
||||
explicit NoteClosedRunnable(ReadStream* aStream)
|
||||
@@ -259,7 +259,7 @@ private:
|
||||
// it on the thread associated with the PBackground actor. Must be
|
||||
// cancelable to execute on Worker threads (which can occur when the
|
||||
// ReadStream is constructed on a child process Worker thread).
|
||||
class ReadStream::ForgetRunnable MOZ_FINAL : public nsCancelableRunnable
|
||||
class ReadStream::ForgetRunnable final : public nsCancelableRunnable
|
||||
{
|
||||
public:
|
||||
explicit ForgetRunnable(ReadStream* aStream)
|
||||
|
||||
Reference in New Issue
Block a user