Oilpan: LargeObjectPage should use HeapObjectHeader::payloadSize() instead of HeapObjectHeader::siz…

third_party/WebKit/Source/platform/heap/HeapPage.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1494 matching lines @@
     WebMemoryAllocatorDump* pageDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
 
     size_t liveSize = 0;
     size_t deadSize = 0;
     size_t liveCount = 0;
     size_t deadCount = 0;
     HeapObjectHeader* header = heapObjectHeader();
     size_t gcInfoIndex = header->gcInfoIndex();
     if (header->isMarked()) {
         liveCount = 1;
         liveSize += header->payloadSize();

[sof, 2016/01/26 06:31:49]

Add a single binding size_t headerSize = header->payloadSize() above the if &
use it throughout?

         info.liveCount[gcInfoIndex]++;
-        info.liveSize[gcInfoIndex] += header->size();
+        info.liveSize[gcInfoIndex] += header->payloadSize();
     } else {
         deadCount = 1;
         deadSize += header->payloadSize();
         info.deadCount[gcInfoIndex]++;
-        info.deadSize[gcInfoIndex] += header->size();
+        info.deadSize[gcInfoIndex] += header->payloadSize();
     }
 
     pageDump->addScalar("live_count", "objects", liveCount);
     pageDump->addScalar("dead_count", "objects", deadCount);
     pageDump->addScalar("live_size", "bytes", liveSize);
     pageDump->addScalar("dead_size", "bytes", deadSize);
 }
 
 #if ENABLE(ASSERT)
 bool LargeObjectPage::contains(Address object)
@@ skipping 40 matching lines @@
 
     m_hasEntries = true;
     size_t index = hash(address);
     ASSERT(!(index & 1));
     Address cachePage = roundToBlinkPageStart(address);
     m_entries[index + 1] = m_entries[index];
     m_entries[index] = cachePage;
 }
 
 } // namespace blink