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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 235113002: Oilpan: Remove guardRef and guardDeref from TreeScope. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/DocumentMarkerController.cpp ('k') | Source/core/dom/Element.cpp » ('j') | Source/core/speech/SpeechInput.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentTest.cpp
diff --git a/Source/core/dom/DocumentTest.cpp b/Source/core/dom/DocumentTest.cpp
index 99fac54a39d7b23a8bee7c8cd33f4606967deff6..c5766a8fa5e964dee7d93c6e39930fcfc2444657 100644
--- a/Source/core/dom/DocumentTest.cpp
+++ b/Source/core/dom/DocumentTest.cpp
@@ -55,67 +55,78 @@ void DocumentTest::SetUp()
m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
}
-class MockDocumentVisibilityObserver : public DocumentVisibilityObserver {
+class MockDocumentVisibilityObserver
+ : public NoBaseWillBeGarbageCollectedFinalized<MockDocumentVisibilityObserver>
+ , public DocumentVisibilityObserver {
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockDocumentVisibilityObserver);
public:
- MockDocumentVisibilityObserver(Document& document) : DocumentVisibilityObserver(document) { }
+ static PassOwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> create(Document& document)
+ {
+ return adoptPtrWillBeNoop(new MockDocumentVisibilityObserver(document));
+ }
+
+ virtual void trace(Visitor*) { }
MOCK_METHOD1(didChangeVisibilityState, void(PageVisibilityState));
+
+private:
+ MockDocumentVisibilityObserver(Document& document) : DocumentVisibilityObserver(document) { }
};
TEST_F(DocumentTest, VisibilityOberver)
{
page().setVisibilityState(PageVisibilityStateVisible, true); // initial state
- MockDocumentVisibilityObserver observer1(document());
+ OwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> observer1 = MockDocumentVisibilityObserver::create(document());
{
- MockDocumentVisibilityObserver observer2(document());
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- ::testing::Mock::VerifyAndClearExpectations(&observer1);
- ::testing::Mock::VerifyAndClearExpectations(&observer2);
-
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ OwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> observer2 = MockDocumentVisibilityObserver::create(document());
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ ::testing::Mock::VerifyAndClearExpectations(observer1.get());
+ ::testing::Mock::VerifyAndClearExpectations(observer2.get());
+
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
page().setVisibilityState(PageVisibilityStateHidden, false);
- ::testing::Mock::VerifyAndClearExpectations(&observer1);
- ::testing::Mock::VerifyAndClearExpectations(&observer2);
+ ::testing::Mock::VerifyAndClearExpectations(observer1.get());
+ ::testing::Mock::VerifyAndClearExpectations(observer2.get());
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
page().setVisibilityState(PageVisibilityStateHidden, false);
- ::testing::Mock::VerifyAndClearExpectations(&observer1);
- ::testing::Mock::VerifyAndClearExpectations(&observer2);
+ ::testing::Mock::VerifyAndClearExpectations(observer1.get());
+ ::testing::Mock::VerifyAndClearExpectations(observer2.get());
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(1);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(1);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
OwnPtr<DummyPageHolder> alternatePage = DummyPageHolder::create(IntSize(800, 600));
Document& alternateDocument = alternatePage->document();
- observer2.setObservedDocument(alternateDocument);
+ observer2->setObservedDocument(alternateDocument);
page().setVisibilityState(PageVisibilityStateVisible, false);
- ::testing::Mock::VerifyAndClearExpectations(&observer1);
- ::testing::Mock::VerifyAndClearExpectations(&observer2);
-
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
- EXPECT_CALL(observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
- observer2.setObservedDocument(document());
+ ::testing::Mock::VerifyAndClearExpectations(observer1.get());
+ ::testing::Mock::VerifyAndClearExpectations(observer2.get());
+
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(1);
+ EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
+ observer2->setObservedDocument(document());
page().setVisibilityState(PageVisibilityStateHidden, false);
- ::testing::Mock::VerifyAndClearExpectations(&observer1);
- ::testing::Mock::VerifyAndClearExpectations(&observer2);
+ ::testing::Mock::VerifyAndClearExpectations(observer1.get());
+ ::testing::Mock::VerifyAndClearExpectations(observer2.get());
}
// observer2 destroyed
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
- EXPECT_CALL(observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(1);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
+ EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(1);
page().setVisibilityState(PageVisibilityStateVisible, false);
}
« no previous file with comments | « Source/core/dom/DocumentMarkerController.cpp ('k') | Source/core/dom/Element.cpp » ('j') | Source/core/speech/SpeechInput.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698