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

Unified Diff: third_party/WebKit/Source/platform/heap/MarkingVisitor.h

Issue 2617393004: Remove marking visitors' shouldMarkObject(). (Closed)
Patch Set: reinstate same-thread dcheck for ensureMarked() 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/MarkingVisitor.h
diff --git a/third_party/WebKit/Source/platform/heap/MarkingVisitor.h b/third_party/WebKit/Source/platform/heap/MarkingVisitor.h
index 9416e4dd127ae7cd964b31ca71a4b429f00024e1..af59226eb77a0f6de13bf289ce5fb966f1dcce56 100644
--- a/third_party/WebKit/Source/platform/heap/MarkingVisitor.h
+++ b/third_party/WebKit/Source/platform/heap/MarkingVisitor.h
@@ -13,9 +13,8 @@ class MarkingVisitor final : public Visitor,
public MarkingVisitorImpl<MarkingVisitor> {
public:
using Impl = MarkingVisitorImpl<MarkingVisitor>;
- friend class MarkingVisitorImpl<MarkingVisitor>;
- explicit MarkingVisitor(ThreadState* state, Visitor::MarkingMode mode)
+ MarkingVisitor(ThreadState* state, Visitor::MarkingMode mode)
: Visitor(state, mode) {}
void markHeader(HeapObjectHeader* header, TraceCallback callback) override {
@@ -66,19 +65,6 @@ class MarkingVisitor final : public Visitor,
WeakCallback callback) override {
Impl::registerWeakCellWithCallback(cell, callback);
}
-
- protected:
- inline bool shouldMarkObject(const void* objectPointer) const {
- if (getMarkingMode() != ThreadLocalMarking)
- return true;
-
- BasePage* page = pageFromObject(objectPointer);
- ASSERT(!page->orphaned());
- // When doing a thread local GC, the marker checks if
- // the object resides in another thread's heap. If it
- // does, the object should not be marked & traced.
- return page->terminating();
- }
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698