Bug 891445 - Fix incorrect pointer comparison. r=doublec
authorSotaro Ikeda <sikeda@mozilla.com>
Fri, 12 Jul 2013 17:27:17 -0400
changeset 138348 32c3ccd8946c1f7dda021bff19765dc8ce270053
parent 138347 3a2b4076fd4d1c8deb94611c1a9d07e4556bc97f
child 138349 35bcf95eb40857f07fd138cbbfa07f1f2bb0c77a
child 138418 6375a61aae7b6be87cd357fb6747a31ccb60fee8
child 138448 1a28d74159a56596111cde10f0341b36da0fca6e
child 155547 b3adb6c97eb39f5ddda0b7719125ca4630cf1704
push id24951
push userryanvm@gmail.com
push dateSat, 13 Jul 2013 00:38:23 +0000
treeherdermozilla-central@32c3ccd8946c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec
bugs891445
milestone25.0a1
first release with
nightly linux32
32c3ccd8946c / 25.0a1 / 20130713030205 / files
nightly linux64
32c3ccd8946c / 25.0a1 / 20130713030205 / files
nightly mac
32c3ccd8946c / 25.0a1 / 20130713030205 / files
nightly win32
32c3ccd8946c / 25.0a1 / 20130713030205 / files
nightly win64
32c3ccd8946c / 25.0a1 / 20130713030205 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 891445 - Fix incorrect pointer comparison. r=doublec
content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
--- a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
+++ b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
@@ -154,26 +154,26 @@ void MediaResourceManagerService::onMess
   client->statusChanged(MediaResourceManagerClient::CLIENT_STATE_RESOURCE_ASSIGNED);
 }
 
 void MediaResourceManagerService::cancelClientLocked(const sp<IBinder>& binder)
 {
   // Clear the request from request queue.
   Fifo::iterator it(mVideoCodecRequestQueue.begin());
   while (it != mVideoCodecRequestQueue.end()) {
-    if (*it == binder) {
+    if ((*it).get() == binder.get()) {
       it = mVideoCodecRequestQueue.erase(it);
       continue;
     }
     it++;
   }
 
   // Clear the client from the resource
   for (int i=0 ; i<mVideoDecoderCount ; i++) {
-    if (mVideoDecoderSlots[i].mClient == binder) {
+    if (mVideoDecoderSlots[i].mClient.get() == binder.get()) {
       mVideoDecoderSlots[i].mClient = NULL;
     }
   }
   binder->unlinkToDeath(this);
 }
 
 }; // namespace android