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

Unified Diff: Source/core/dom/ActiveDOMObjectTest.cpp

Issue 765033003: Oilpan: Move MockActiveDOMObject to Oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ActiveDOMObjectTest.cpp
diff --git a/Source/core/dom/ActiveDOMObjectTest.cpp b/Source/core/dom/ActiveDOMObjectTest.cpp
index a41a5add7f5364bb7c740720d25f36370bd4d1da..0514f2f588fdf0441794cbe5eda5b9d8f6bd6dbf 100644
--- a/Source/core/dom/ActiveDOMObjectTest.cpp
+++ b/Source/core/dom/ActiveDOMObjectTest.cpp
@@ -39,9 +39,11 @@ using namespace blink;
namespace {
-class MockActiveDOMObject : public ActiveDOMObject {
+class MockActiveDOMObject final : public GarbageCollectedFinalized<MockActiveDOMObject>, public ActiveDOMObject {
public:
- MockActiveDOMObject(ExecutionContext* context) : ActiveDOMObject(context) { }
+ explicit MockActiveDOMObject(ExecutionContext* context) : ActiveDOMObject(context) { }
+
+ void trace(Visitor*) { }
MOCK_METHOD0(suspend, void());
MOCK_METHOD0(resume, void());
@@ -54,20 +56,20 @@ protected:
Document& srcDocument() const { return m_srcPageHolder->document(); }
Document& destDocument() const { return m_destPageHolder->document(); }
- MockActiveDOMObject& activeDOMObject() { return m_activeDOMObject; }
+ MockActiveDOMObject& activeDOMObject() { return *m_activeDOMObject; }
private:
OwnPtr<DummyPageHolder> m_srcPageHolder;
OwnPtr<DummyPageHolder> m_destPageHolder;
- MockActiveDOMObject m_activeDOMObject;
+ Persistent<MockActiveDOMObject> m_activeDOMObject;
};
ActiveDOMObjectTest::ActiveDOMObjectTest()
: m_srcPageHolder(DummyPageHolder::create(IntSize(800, 600)))
, m_destPageHolder(DummyPageHolder::create(IntSize(800, 600)))
- , m_activeDOMObject(&m_srcPageHolder->document())
+ , m_activeDOMObject(new MockActiveDOMObject(&m_srcPageHolder->document()))
{
- m_activeDOMObject.suspendIfNeeded();
+ m_activeDOMObject->suspendIfNeeded();
}
TEST_F(ActiveDOMObjectTest, NewContextObserved)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698