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

Unified Diff: Source/core/html/LinkImport.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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/html/InputType.cpp ('k') | Source/core/html/LinkResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/LinkImport.cpp
diff --git a/Source/core/html/LinkImport.cpp b/Source/core/html/LinkImport.cpp
index 31703ac85ef4d7c946b742ef183752ac05a5dd72..f26e23d31fcc6852f3bcff040a5642ece4fb04e7 100644
--- a/Source/core/html/LinkImport.cpp
+++ b/Source/core/html/LinkImport.cpp
@@ -67,12 +67,12 @@ void LinkImport::process()
return;
if (!m_owner)
return;
- if (!m_owner->document()->frame() && !m_owner->document()->import())
+ if (!m_owner->document().frame() && !m_owner->document().import())
return;
- if (!m_owner->document()->import()) {
- ASSERT(m_owner->document()->frame()); // The document should be the master.
- HTMLImportsController::provideTo(m_owner->document());
+ if (!m_owner->document().import()) {
+ ASSERT(m_owner->document().frame()); // The document should be the master.
+ HTMLImportsController::provideTo(&m_owner->document());
}
LinkRequestBuilder builder(m_owner);
@@ -81,7 +81,7 @@ void LinkImport::process()
return;
}
- HTMLImport* parent = m_owner->document()->import();
+ HTMLImport* parent = m_owner->document().import();
HTMLImportsController* controller = parent->controller();
m_loader = controller->createLoader(parent, builder.build(true));
if (!m_loader) {
« no previous file with comments | « Source/core/html/InputType.cpp ('k') | Source/core/html/LinkResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698