Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: third_party/WebKit/Source/platform/heap/ThreadState.cpp

Issue 2813523002: Remove stray DO NOT SUMBITS left after blink rename (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/heap/BlinkGC.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 break; \ 1367 break; \
1368 case SnapshotType::kFreelistSnapshot: \ 1368 case SnapshotType::kFreelistSnapshot: \
1369 arenas_[BlinkGC::k##ArenaType##ArenaIndex]->TakeFreelistSnapshot( \ 1369 arenas_[BlinkGC::k##ArenaType##ArenaIndex]->TakeFreelistSnapshot( \
1370 heaps_dump_name + "/" #ArenaType); \ 1370 heaps_dump_name + "/" #ArenaType); \
1371 break; \ 1371 break; \
1372 default: \ 1372 default: \
1373 ASSERT_NOT_REACHED(); \ 1373 ASSERT_NOT_REACHED(); \
1374 } \ 1374 } \
1375 } 1375 }
1376 1376
1377 /* DO NOT SUBMIT - Conflict resolution helper:
1378 * Important to use NormalPage instead of kNormalPage1 below */
1379 SNAPSHOT_HEAP(NormalPage1); 1377 SNAPSHOT_HEAP(NormalPage1);
1380 SNAPSHOT_HEAP(NormalPage2); 1378 SNAPSHOT_HEAP(NormalPage2);
1381 SNAPSHOT_HEAP(NormalPage3); 1379 SNAPSHOT_HEAP(NormalPage3);
1382 SNAPSHOT_HEAP(NormalPage4); 1380 SNAPSHOT_HEAP(NormalPage4);
1383 SNAPSHOT_HEAP(EagerSweep); 1381 SNAPSHOT_HEAP(EagerSweep);
1384 SNAPSHOT_HEAP(Vector1); 1382 SNAPSHOT_HEAP(Vector1);
1385 SNAPSHOT_HEAP(Vector2); 1383 SNAPSHOT_HEAP(Vector2);
1386 SNAPSHOT_HEAP(Vector3); 1384 SNAPSHOT_HEAP(Vector3);
1387 SNAPSHOT_HEAP(Vector4); 1385 SNAPSHOT_HEAP(Vector4);
1388 SNAPSHOT_HEAP(InlineVector); 1386 SNAPSHOT_HEAP(InlineVector);
1389 SNAPSHOT_HEAP(HashTable); 1387 SNAPSHOT_HEAP(HashTable);
1390 SNAPSHOT_HEAP(LargeObject); 1388 SNAPSHOT_HEAP(LargeObject);
1391 /* DO NOT SUBMIT - Conflict resolution helper:
1392 * Important to use LargeObject instead of kLargeObject above */
1393 FOR_EACH_TYPED_ARENA(SNAPSHOT_HEAP); 1389 FOR_EACH_TYPED_ARENA(SNAPSHOT_HEAP);
1394 1390
1395 ASSERT(number_of_heaps_reported == BlinkGC::kNumberOfArenas); 1391 ASSERT(number_of_heaps_reported == BlinkGC::kNumberOfArenas);
1396 1392
1397 #undef SNAPSHOT_HEAP 1393 #undef SNAPSHOT_HEAP
1398 1394
1399 if (type == SnapshotType::kFreelistSnapshot) 1395 if (type == SnapshotType::kFreelistSnapshot)
1400 return; 1396 return;
1401 1397
1402 size_t total_live_count = 0; 1398 size_t total_live_count = 0;
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 CollectGarbage(BlinkGC::kNoHeapPointersOnStack, BlinkGC::kGCWithSweep, 1555 CollectGarbage(BlinkGC::kNoHeapPointersOnStack, BlinkGC::kGCWithSweep,
1560 BlinkGC::kForcedGC); 1556 BlinkGC::kForcedGC);
1561 size_t live_objects = Heap().HeapStats().MarkedObjectSize(); 1557 size_t live_objects = Heap().HeapStats().MarkedObjectSize();
1562 if (live_objects == previous_live_objects) 1558 if (live_objects == previous_live_objects)
1563 break; 1559 break;
1564 previous_live_objects = live_objects; 1560 previous_live_objects = live_objects;
1565 } 1561 }
1566 } 1562 }
1567 1563
1568 } // namespace blink 1564 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/BlinkGC.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698