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

Unified Diff: third_party/WebKit/Source/platform/heap/HeapPage.cpp

Issue 2652923002: Devirtualize Visitor and remove inline visitor specialization. (Closed)
Patch Set: rebased Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/heap/HeapPage.cpp
diff --git a/third_party/WebKit/Source/platform/heap/HeapPage.cpp b/third_party/WebKit/Source/platform/heap/HeapPage.cpp
index cb8f77ef9f12a2499aafa3fbabedbc2a98cde4af..79c74b5f73fd0bf32aafe0507f63a348928d1184 100644
--- a/third_party/WebKit/Source/platform/heap/HeapPage.cpp
+++ b/third_party/WebKit/Source/platform/heap/HeapPage.cpp
@@ -36,7 +36,6 @@
#include "platform/heap/BlinkGCMemoryDumpProvider.h"
#include "platform/heap/CallbackStack.h"
#include "platform/heap/HeapCompact.h"
-#include "platform/heap/MarkingVisitor.h"
#include "platform/heap/PageMemory.h"
#include "platform/heap/PagePool.h"
#include "platform/heap/SafePoint.h"
@@ -1700,13 +1699,28 @@ static void markPointer(Visitor* visitor, HeapObjectHeader* header) {
}
void NormalPage::checkAndMarkPointer(Visitor* visitor, Address address) {
- ASSERT(contains(address));
+#if DCHECK_IS_ON()
+ DCHECK(contains(address));
+#endif
HeapObjectHeader* header = findHeaderFromAddress(address);
if (!header || header->isDead())
return;
markPointer(visitor, header);
}
+#if DCHECK_IS_ON()
+void NormalPage::checkAndMarkPointer(Visitor* visitor,
+ Address address,
+ MarkedPointerCallbackForTesting callback) {
+ DCHECK(contains(address));
+ HeapObjectHeader* header = findHeaderFromAddress(address);
+ if (!header || header->isDead())
+ return;
+ if (!callback(header))
+ markPointer(visitor, header);
+}
+#endif
+
void NormalPage::markOrphaned() {
// Zap the payload with a recognizable value to detect any incorrect
// cross thread pointer usage.
@@ -1827,12 +1841,27 @@ void LargeObjectPage::poisonUnmarkedObjects() {
#endif
void LargeObjectPage::checkAndMarkPointer(Visitor* visitor, Address address) {
- ASSERT(contains(address));
+#if DCHECK_IS_ON()
+ DCHECK(contains(address));
+#endif
if (!containedInObjectPayload(address) || heapObjectHeader()->isDead())
return;
markPointer(visitor, heapObjectHeader());
}
+#if DCHECK_IS_ON()
+void LargeObjectPage::checkAndMarkPointer(
+ Visitor* visitor,
+ Address address,
+ MarkedPointerCallbackForTesting callback) {
+ DCHECK(contains(address));
+ if (!containedInObjectPayload(address) || heapObjectHeader()->isDead())
+ return;
+ if (!callback(heapObjectHeader()))
+ markPointer(visitor, heapObjectHeader());
+}
+#endif
+
void LargeObjectPage::markOrphaned() {
// Zap the payload with a recognizable value to detect any incorrect
// cross thread pointer usage.
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapPage.h ('k') | third_party/WebKit/Source/platform/heap/HeapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698