Backed out changeset 1f80fae4ca27 (bug 1276590) on developers request
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 31 May 2016 15:56:49 +0200
changeset 338700 69312b20d716fc64a4c311302af16f9ba320a694
parent 338699 1f80fae4ca27fa64d5eb07a19a1334c7cff0b236
child 338701 499f16ca85ec48d1896a1633730715f32bd62140
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1276590
milestone49.0a1
backs out1f80fae4ca27fa64d5eb07a19a1334c7cff0b236
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 1f80fae4ca27 (bug 1276590) on developers request
gfx/layers/ipc/GonkNativeHandleUtils.cpp
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
--- a/gfx/layers/ipc/GonkNativeHandleUtils.cpp
+++ b/gfx/layers/ipc/GonkNativeHandleUtils.cpp
@@ -32,17 +32,17 @@ ParamTraits<GonkNativeHandle>::Write(Mes
 
 bool
 ParamTraits<GonkNativeHandle>::Read(const Message* aMsg,
                                PickleIterator* aIter, paramType* aResult)
 {
   size_t nbytes;
   const char* data;
   if (!aMsg->ReadSize(aIter, &nbytes) ||
-      !aMsg->ReadBytesInto(aIter, &data, nbytes)) {
+      !aMsg->ReadBytes(aIter, &data, nbytes)) {
     return false;
   }
 
   if (nbytes % sizeof(int) != 0) {
     return false;
   }
 
   size_t numInts = nbytes / sizeof(int);
--- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -118,33 +118,33 @@ ParamTraits<MagicGrallocBufferHandle>::R
   size_t nbytes;
   const char* data;
   int owner;
   int64_t index;
 
   if (!aMsg->ReadInt(aIter, &owner) ||
       !aMsg->ReadInt64(aIter, &index) ||
       !aMsg->ReadSize(aIter, &nbytes) ||
-      !aMsg->ReadBytesInto(aIter, &data, nbytes)) {
+      !aMsg->ReadBytes(aIter, &data, nbytes)) {
     printf_stderr("ParamTraits<MagicGrallocBufferHandle>::Read() failed to read a message\n");
     return false;
   }
 
   size_t nfds = aMsg->num_fds();
   int fds[nfds];
 
   for (size_t n = 0; n < nfds; ++n) {
     FileDescriptor fd;
     if (!aMsg->ReadFileDescriptor(aIter, &fd)) {
       printf_stderr("ParamTraits<MagicGrallocBufferHandle>::Read() failed to read file descriptors\n");
       return false;
     }
     // If the GraphicBuffer was shared cross-process, SCM_RIGHTS does
     // the right thing and dup's the fd. If it's shared cross-thread,
-    // SCM_RIGHTS doesn't dup the fd.
+    // SCM_RIGHTS doesn't dup the fd. 
     // But in shared cross-thread, dup fd is not necessary because we get
     // a pointer to the GraphicBuffer directly from SharedBufferManagerParent
     // and don't create a new GraphicBuffer around the fd.
     fds[n] = fd.fd;
   }
 
   aResult->mRef.mOwner = owner;
   aResult->mRef.mKey = index;