| Index: third_party/WebKit/Source/core/dom/DocumentInit.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp
|
| index 389db7bfd877a1c6e0e991ab91f6a6cd8441482d..cfc4c3e327bcf9b04b2241fa0d40291cc2e0985e 100644
|
| --- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp
|
| @@ -49,25 +49,16 @@ static Document* parentDocument(LocalFrame* frame)
|
| return &ownerElement->document();
|
| }
|
|
|
| -
|
| -static Document* ownerDocument(LocalFrame* frame)
|
| +DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController)
|
| + : DocumentInit(nullptr, url, frame, contextDocument, importsController)
|
| {
|
| - if (!frame)
|
| - return 0;
|
| -
|
| - Frame* ownerFrame = frame->tree().parent();
|
| - if (!ownerFrame)
|
| - ownerFrame = frame->loader().opener();
|
| - if (!ownerFrame || !ownerFrame->isLocalFrame())
|
| - return 0;
|
| - return toLocalFrame(ownerFrame)->document();
|
| }
|
|
|
| -DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController)
|
| +DocumentInit::DocumentInit(PassRefPtrWillBeRawPtr<Document> ownerDocument, const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController)
|
| : m_url(url)
|
| , m_frame(frame)
|
| , m_parent(parentDocument(frame))
|
| - , m_owner(ownerDocument(frame))
|
| + , m_owner(ownerDocument)
|
| , m_contextDocument(contextDocument)
|
| , m_importsController(importsController)
|
| , m_createNewRegistrationContext(false)
|
|
|