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

Unified Diff: Source/core/loader/FrameFetchContextTest.cpp

Issue 1314773009: Oilpan: fix build after r201667. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: more transition type fixes Created 5 years, 3 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 | « 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/loader/FrameFetchContextTest.cpp
diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp
index c6ce4a080ef08c5919cc5ce2b32ba1d250ba4b97..2d764a62852fa9a42c111cfce7ef291775571558 100644
--- a/Source/core/loader/FrameFetchContextTest.cpp
+++ b/Source/core/loader/FrameFetchContextTest.cpp
@@ -74,6 +74,11 @@ private:
class StubFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<StubFrameOwner>, public FrameOwner {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StubFrameOwner);
public:
+ static PassOwnPtrWillBeRawPtr<StubFrameOwner> create()
+ {
+ return adoptPtrWillBeNoop(new StubFrameOwner);
+ }
+
DEFINE_INLINE_VIRTUAL_TRACE() { FrameOwner::trace(visitor); }
bool isLocal() const override { return false; }
@@ -91,6 +96,7 @@ protected:
documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest("http://www.example.com"), SubstituteData());
document = toHTMLDocument(&dummyPageHolder->document());
fetchContext = static_cast<FrameFetchContext*>(&documentLoader->fetcher()->context());
+ owner = StubFrameOwner::create();
FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
}
@@ -109,7 +115,7 @@ protected:
FrameFetchContext* createChildFrame()
{
childClient = StubFrameLoaderClientWithParent::create(document->frame());
- childFrame = LocalFrame::create(childClient.get(), document->frame()->host(), &owner);
+ childFrame = LocalFrame::create(childClient.get(), document->frame()->host(), owner.get());
childFrame->setView(FrameView::create(childFrame.get(), IntSize(500, 500)));
childFrame->init();
childDocumentLoader = DocumentLoader::create(childFrame.get(), ResourceRequest("http://www.example.com"), SubstituteData());
@@ -126,12 +132,11 @@ protected:
RefPtrWillBePersistent<Document> document;
Persistent<FrameFetchContext> fetchContext;
- OwnPtrWillBeRawPtr<StubFrameLoaderClientWithParent> childClient;
- RefPtrWillBeRawPtr<LocalFrame> childFrame;
+ OwnPtrWillBePersistent<StubFrameLoaderClientWithParent> childClient;
+ RefPtrWillBePersistent<LocalFrame> childFrame;
RefPtrWillBePersistent<DocumentLoader> childDocumentLoader;
RefPtrWillBePersistent<Document> childDocument;
- StubFrameOwner owner;
-
+ OwnPtrWillBePersistent<StubFrameOwner> owner;
};
class FrameFetchContextUpgradeTest : public FrameFetchContextTest {
« 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