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 306039 5c042dab34a257de85b7eaf2bc81aaad16b8a1b0
parent 306038 8c3efcef8b614712b9a730f077f6e0fdcf6fca6e
child 306040 37edfec3a000dfc5fa8fcdb2afd5829e8d6068c3
child 306042 f5f3cae2dc01479b41a1250e33b1324661a36083
child 306043 4a2fd98caea8e63c748ef30d148668427bb706c3
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersritu
bugs1192945, 1231429
milestone44.0
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)