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

Side by Side Diff: third_party/WebKit/Source/core/dom/DocumentInit.h

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 30 matching lines...) Expand all
41 namespace blink { 41 namespace blink {
42 42
43 class Document; 43 class Document;
44 class LocalFrame; 44 class LocalFrame;
45 class HTMLImportsController; 45 class HTMLImportsController;
46 class Settings; 46 class Settings;
47 47
48 class CORE_EXPORT DocumentInit final { 48 class CORE_EXPORT DocumentInit final {
49 STACK_ALLOCATED(); 49 STACK_ALLOCATED();
50 public: 50 public:
51 explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtrWillBeRa wPtr<Document> = nullptr, HTMLImportsController* = 0); 51 DocumentInit(const KURL& = KURL(), LocalFrame* = nullptr, WeakPtrWillBeRawPt r<Document> contextDocument = nullptr, HTMLImportsController* = nullptr);
52 DocumentInit(PassRefPtrWillBeRawPtr<Document> ownerDocument, const KURL&, Lo calFrame*, WeakPtrWillBeRawPtr<Document> contextDocument = nullptr, HTMLImportsC ontroller* = nullptr);
52 DocumentInit(const DocumentInit&); 53 DocumentInit(const DocumentInit&);
53 ~DocumentInit(); 54 ~DocumentInit();
54 55
55 const KURL& url() const { return m_url; } 56 const KURL& url() const { return m_url; }
56 LocalFrame* frame() const { return m_frame; } 57 LocalFrame* frame() const { return m_frame; }
57 HTMLImportsController* importsController() const { return m_importsControlle r; } 58 HTMLImportsController* importsController() const { return m_importsControlle r; }
58 59
59 bool hasSecurityContext() const { return frameForSecurityContext(); } 60 bool hasSecurityContext() const { return frameForSecurityContext(); }
60 bool shouldTreatURLAsSrcdocDocument() const; 61 bool shouldTreatURLAsSrcdocDocument() const;
61 bool shouldSetURL() const; 62 bool shouldSetURL() const;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // won't be blown away when the network load commits. To make that happen, w e 100 // won't be blown away when the network load commits. To make that happen, w e
100 // "securely transition" the existing LocalDOMWindow to the Document that re sults from 101 // "securely transition" the existing LocalDOMWindow to the Document that re sults from
101 // the network load. See also SecurityContext::isSecureTransitionTo. 102 // the network load. See also SecurityContext::isSecureTransitionTo.
102 // FIXME: This is for DocumentWriter creation, not for one of Document. 103 // FIXME: This is for DocumentWriter creation, not for one of Document.
103 bool m_shouldReuseDefaultView; 104 bool m_shouldReuseDefaultView;
104 }; 105 };
105 106
106 } // namespace blink 107 } // namespace blink
107 108
108 #endif // DocumentInit_h 109 #endif // DocumentInit_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698