Backed out changeset ce8ed7a0dfef (bug 975338) for build failures; CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Mon, 10 Mar 2014 17:58:25 +0000
changeset 191066 5a0bd36ed10388fcf7d873c61b31cff75c970fff
parent 191065 d8f4a23e6db217739dbc2a19bf38f4a4f1ceb5e8
child 191067 de734e8b03a3a4e55520b3991a48d7e9d1494c62
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs975338
milestone30.0a1
backs outce8ed7a0dfeffa2f6b01ae923c609273306b257c
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
Backed out changeset ce8ed7a0dfef (bug 975338) for build failures; CLOSED TREE
netwerk/base/public/moz.build
netwerk/base/public/nsIDivertableChannel.idl
netwerk/base/src/ADivertableParentChannel.h
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -31,17 +31,16 @@ XPIDL_SOURCES += [
     'nsIChannelPolicy.idl',
     'nsIChildChannel.idl',
     'nsIContentSniffer.idl',
     'nsICryptoFIPSInfo.idl',
     'nsICryptoHash.idl',
     'nsICryptoHMAC.idl',
     'nsIDashboard.idl',
     'nsIDashboardEventNotifier.idl',
-    'nsIDivertableChannel.idl',
     'nsIDownloader.idl',
     'nsIEncodedChannel.idl',
     'nsIExternalProtocolHandler.idl',
     'nsIFileStreams.idl',
     'nsIFileURL.idl',
     'nsIIncrementalDownload.idl',
     'nsIInputStreamChannel.idl',
     'nsIInputStreamPump.idl',
deleted file mode 100644
--- a/netwerk/base/public/nsIDivertableChannel.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-%{C++
-//#include "mozilla/net/ChannelDiverterChild.h"
-namespace mozilla {
-namespace net {
-class ChannelDiverterChild;
-}
-}
-%}
-
-[ptr] native ChannelDiverterChild(mozilla::net::ChannelDiverterChild);
-
-interface nsIStreamListener;
-
-/**
- * A channel implementing this interface allows diverting from an
- * nsIStreamListener in the child process to one in the parent.
- */
-[uuid(4430e0d0-ff70-45f5-99dc-b5fd06943fc1)]
-interface nsIDivertableChannel : nsISupports
-{
-  /**
-   * CHILD ONLY.
-   * Called by Necko client in child process during OnStartRequest to divert
-   * nsIStreamListener and nsIRequest callbacks to the parent process.
-   *
-   * The process should look like the following:
-   *
-   * 1) divertToParent is called in the child process.  It can only be called
-   *    during OnStartRequest().
-   *
-   * 2) The ChannelDiverterChild that is returned is an IPDL object. It should
-   *    be passed via some other IPDL method of the client's choosing to the
-   *    parent.  On the parent the ChannelDiverterParent's divertTo() function
-   *    should be called with an nsIStreamListener that will then receive the
-   *    OnStartRequest/OnDataAvailable/OnStopRequest for the channel.  The
-   *    ChannelDiverterParent can then be deleted (which will also destroy the
-   *    ChannelDiverterChild in the child).
-   *
-   *    After divertToParent() has been called, NO further function calls
-   *    should be made on the channel.  It is a dead object for all purposes.
-   *    The reference that the channel holds to the listener in the child is
-   *    released is once OnStartRequest completes, and no other
-   *    nsIStreamListener calls (OnDataAvailable, OnStopRequest) will be made
-   *    to it.
-   *
-   * @return ChannelDiverterChild IPDL actor to be passed to parent process by
-   *         client IPDL message, e.g. PClient.DivertUsing(PDiverterChild).
-   *
-   * @throws exception if the channel was canceled early. Throws status code of
-   *         canceled channel.
-   */
-  ChannelDiverterChild divertToParent();
-};
deleted file mode 100644
--- a/netwerk/base/src/ADivertableParentChannel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _adivertablechannelparent_h_
-#define _adivertablechannelparent_h_
-
-#include "nsISupports.h"
-
-class nsIStreamListener;
-
-namespace mozilla {
-namespace net {
-
-// To be implemented by a channel's parent actors, e.g. HttpChannelParent
-// and FTPChannelParent. Used by ChannelDiverterParent to divert
-// nsIStreamListener callbacks from the child process to a new
-// listener in the parent process.
-class ADivertableParentChannel : public nsISupports
-{
-public:
-  // Called by ChannelDiverterParent::DivertTo(nsIStreamListener*).
-  // The listener should now be used to received nsIStreamListener callbacks,
-  // i.e. OnStartRequest, OnDataAvailable and OnStopRequest, as if it had been
-  // passed to AsyncOpen for the channel. A reference to the listener will be
-  // added and kept until OnStopRequest has completed.
-  virtual void DivertTo(nsIStreamListener *aListener) = 0;
-
-  // Called to suspend parent channel in ChannelDiverterParent constructor.
-  virtual nsresult SuspendForDiversion() = 0;
-};
-
-} // namespace net
-} // namespace mozilla
-
-#endif