OLD | NEW |
---|---|
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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
643 return false; | 643 return false; |
644 #if ENABLE(IDLE_GC) | 644 #if ENABLE(IDLE_GC) |
645 return judgeGCThreshold(1024 * 1024, 1.5); | 645 return judgeGCThreshold(1024 * 1024, 1.5); |
646 #else | 646 #else |
647 return false; | 647 return false; |
648 #endif | 648 #endif |
649 } | 649 } |
650 | 650 |
651 bool ThreadState::shouldSchedulePreciseGC() | 651 bool ThreadState::shouldSchedulePreciseGC() |
652 { | 652 { |
653 if (gcState() != NoGCScheduled) | |
654 return false; | |
Yuta Kitamura
2015/08/18 03:06:28
Let me confirm my understanding of this removal.
haraken
2015/08/18 03:45:23
Yes, that is the intention of this CL.
| |
655 #if ENABLE(IDLE_GC) | 653 #if ENABLE(IDLE_GC) |
656 return false; | 654 return false; |
haraken
2015/08/18 02:39:53
yutak@: After landing this change, you just need t
| |
657 #else | 655 #else |
658 return judgeGCThreshold(1024 * 1024, 1.5); | 656 return judgeGCThreshold(1024 * 1024, 1.5); |
659 #endif | 657 #endif |
660 } | 658 } |
661 | 659 |
662 bool ThreadState::shouldSchedulePageNavigationGC(float estimatedRemovalRatio) | 660 bool ThreadState::shouldSchedulePageNavigationGC(float estimatedRemovalRatio) |
663 { | 661 { |
664 return judgeGCThreshold(1024 * 1024, 1.5); | 662 return judgeGCThreshold(1024 * 1024, 1.5); |
665 } | 663 } |
666 | 664 |
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1585 json->beginArray(it->key.ascii().data()); | 1583 json->beginArray(it->key.ascii().data()); |
1586 for (size_t age = 0; age <= maxHeapObjectAge; ++age) | 1584 for (size_t age = 0; age <= maxHeapObjectAge; ++age) |
1587 json->pushInteger(it->value.ages[age]); | 1585 json->pushInteger(it->value.ages[age]); |
1588 json->endArray(); | 1586 json->endArray(); |
1589 } | 1587 } |
1590 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); | 1588 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); |
1591 } | 1589 } |
1592 #endif | 1590 #endif |
1593 | 1591 |
1594 } // namespace blink | 1592 } // namespace blink |
OLD | NEW |