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

Side by Side Diff: Source/core/dom/DocumentInit.cpp

Issue 495743003: Add an extra guard to replaceDocument() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Landing Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/DocumentParser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 64
65 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawP tr<Document> contextDocument, HTMLImportsController* importsController) 65 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawP tr<Document> contextDocument, HTMLImportsController* importsController)
66 : m_url(url) 66 : m_url(url)
67 , m_frame(frame) 67 , m_frame(frame)
68 , m_parent(parentDocument(frame)) 68 , m_parent(parentDocument(frame))
69 , m_owner(ownerDocument(frame)) 69 , m_owner(ownerDocument(frame))
70 , m_contextDocument(contextDocument) 70 , m_contextDocument(contextDocument)
71 , m_importsController(importsController) 71 , m_importsController(importsController)
72 , m_createNewRegistrationContext(false) 72 , m_createNewRegistrationContext(false)
73 , m_shouldReuseDefaultView(frame && frame->shouldReuseDefaultView(url))
73 { 74 {
74 } 75 }
75 76
76 DocumentInit::DocumentInit(const DocumentInit& other) 77 DocumentInit::DocumentInit(const DocumentInit& other)
77 : m_url(other.m_url) 78 : m_url(other.m_url)
78 , m_frame(other.m_frame) 79 , m_frame(other.m_frame)
79 , m_parent(other.m_parent) 80 , m_parent(other.m_parent)
80 , m_owner(other.m_owner) 81 , m_owner(other.m_owner)
81 , m_contextDocument(other.m_contextDocument) 82 , m_contextDocument(other.m_contextDocument)
82 , m_importsController(other.m_importsController) 83 , m_importsController(other.m_importsController)
83 , m_registrationContext(other.m_registrationContext) 84 , m_registrationContext(other.m_registrationContext)
84 , m_createNewRegistrationContext(other.m_createNewRegistrationContext) 85 , m_createNewRegistrationContext(other.m_createNewRegistrationContext)
86 , m_shouldReuseDefaultView(other.m_shouldReuseDefaultView)
85 { 87 {
86 } 88 }
87 89
88 DocumentInit::~DocumentInit() 90 DocumentInit::~DocumentInit()
89 { 91 {
90 } 92 }
91 93
92 bool DocumentInit::shouldSetURL() const 94 bool DocumentInit::shouldSetURL() const
93 { 95 {
94 LocalFrame* frame = frameForSecurityContext(); 96 LocalFrame* frame = frameForSecurityContext();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return m_contextDocument; 158 return m_contextDocument;
157 } 159 }
158 160
159 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url) 161 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)
160 { 162 {
161 return DocumentInit(url, 0, contextDocument, 0); 163 return DocumentInit(url, 0, contextDocument, 0);
162 } 164 }
163 165
164 } // namespace blink 166 } // namespace blink
165 167
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/DocumentParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698