Fix locked/unlocked in SW IDC memory dumps.

cc/tiles/software_image_decode_controller.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tiles/software_image_decode_controller.h"
 
 #include <inttypes.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 787 matching lines @@
   return true;
 }
 
 void SoftwareImageDecodeController::DumpImageMemoryForCache(
     const ImageMRUCache& cache,
     const char* cache_name,
     base::trace_event::ProcessMemoryDump* pmd) const {
   lock_.AssertAcquired();
 
   for (const auto& image_pair : cache) {
+    std::string dump_name = base::StringPrintf(
+        "cc/image_memory/controller_0x%" PRIXPTR "/%s/image_%" PRIu64 "_id_%d",
+        reinterpret_cast<uintptr_t>(this), cache_name,
+        image_pair.second->tracing_id(), image_pair.first.image_id());
+    // CreateMemoryAllocatorDump will automatically add tracking values for the
+    // total size. If locked, we also add a "locked_size" below.
+    MemoryAllocatorDump* dump =
+        image_pair.second->memory()->CreateMemoryAllocatorDump(
+            dump_name.c_str(), pmd);
+    DCHECK(dump);
     if (image_pair.second->is_locked()) {
-      std::string dump_name = base::StringPrintf(
-          "cc/image_memory/controller_0x%" PRIXPTR "/%s/image_%" PRIu64
-          "_id_%d",
-          reinterpret_cast<uintptr_t>(this), cache_name,
-          image_pair.second->tracing_id(), image_pair.first.image_id());
-      MemoryAllocatorDump* dump =
-          image_pair.second->memory()->CreateMemoryAllocatorDump(
-              dump_name.c_str(), pmd);
-      DCHECK(dump);
       dump->AddScalar("locked_size", MemoryAllocatorDump::kUnitsBytes,
                       image_pair.first.locked_bytes());
     }
   }
 }
 
 void SoftwareImageDecodeController::SanityCheckState(int line,
                                                      bool lock_acquired) {
 #if DCHECK_IS_ON()
   if (!lock_acquired) {
@@ skipping 294 matching lines @@
         break;
       case base::MemoryState::UNKNOWN:
         NOTREACHED();
         return;
     }
   }
   ReduceCacheUsage();
 }
 
 }  // namespace cc