Backed out changeset 7bd651ae54dd (bug 1192945) to hopefully fix 1231429 a=ritu
authorWes Kocher <wkocher@mozilla.com>
Thu, 14 Jan 2016 15:40:56 -0800
changeset 323144 beff2f1d75224ad339a965e02f9193a9a4f43e79
parent 323143 5031dae2d2af05cdbe8d346a2d892f184ede8483
child 323145 cbd385ecef20a6ca6c9664dcaa64bb0862ced92c
push id9672
push userahunt@mozilla.com
push dateTue, 19 Jan 2016 18:38:49 +0000
reviewersritu
bugs1192945, 1231429
milestone45.0a2
backs out7bd651ae54dd6b090555d4420f34525de3fda931
Backed out changeset 7bd651ae54dd (bug 1192945) to hopefully fix 1231429 a=ritu
widget/windows/nsDataObj.cpp
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -69,24 +69,24 @@ nsresult nsDataObj::CStream::Init(nsIURI
   // we can not create a channel without a requestingNode
   if (!aRequestingNode) {
     return NS_ERROR_FAILURE;
   }
   nsresult rv;
   rv = NS_NewChannel(getter_AddRefs(mChannel),
                      pSourceURI,
                      aRequestingNode,
-                     nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS,
+                     nsILoadInfo::SEC_NORMAL,
                      nsIContentPolicy::TYPE_OTHER,
                      nullptr,   // loadGroup
                      nullptr,   // aCallbacks
                      nsIRequest::LOAD_FROM_CACHE);
 
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = mChannel->AsyncOpen2(this);
+  rv = mChannel->AsyncOpen(this, nullptr);
   NS_ENSURE_SUCCESS(rv, rv);
   return NS_OK;
 }
 
 //-----------------------------------------------------------------------------
 // IUnknown's QueryInterface, nsISupport's AddRef and Release are shared by
 // IUnknown and nsIStreamListener.
 STDMETHODIMP nsDataObj::CStream::QueryInterface(REFIID refiid, void** ppvResult)