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

Side by Side Diff: Source/core/html/imports/LinkImport.cpp

Issue 1035803002: Remove ResourceFetcher's access to a real FetchContext at frame detach time (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return m_owner && !m_owner->async(); 121 return m_owner && !m_owner->async();
122 } 122 }
123 123
124 HTMLLinkElement* LinkImport::link() 124 HTMLLinkElement* LinkImport::link()
125 { 125 {
126 return m_owner; 126 return m_owner;
127 } 127 }
128 128
129 bool LinkImport::hasLoaded() const 129 bool LinkImport::hasLoaded() const
130 { 130 {
131 // Should never be called after importChildWasDestroyed was called. 131 return m_owner && m_child && m_child->isDone() && !m_child->loader()->hasErr or();
Mike West 2015/03/26 04:43:14 Why doesn't this ASSERT hold true anymore?
132 ASSERT(m_owner);
133 return m_child && m_child->isDone() && !m_child->loader()->hasError();
134 } 132 }
135 133
136 void LinkImport::ownerInserted() 134 void LinkImport::ownerInserted()
137 { 135 {
138 if (m_child) 136 if (m_child)
139 m_child->ownerInserted(); 137 m_child->ownerInserted();
140 } 138 }
141 139
142 DEFINE_TRACE(LinkImport) 140 DEFINE_TRACE(LinkImport)
143 { 141 {
144 visitor->trace(m_child); 142 visitor->trace(m_child);
145 HTMLImportChildClient::trace(visitor); 143 HTMLImportChildClient::trace(visitor);
146 LinkResource::trace(visitor); 144 LinkResource::trace(visitor);
147 } 145 }
148 146
149 } // namespace blink 147 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698