| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 | 138 |
| 139 DEFINE_TRACE(DocumentLoader) | 139 DEFINE_TRACE(DocumentLoader) |
| 140 { | 140 { |
| 141 visitor->trace(m_frame); | 141 visitor->trace(m_frame); |
| 142 visitor->trace(m_fetcher); | 142 visitor->trace(m_fetcher); |
| 143 visitor->trace(m_mainResource); | 143 visitor->trace(m_mainResource); |
| 144 visitor->trace(m_writer); | 144 visitor->trace(m_writer); |
| 145 visitor->trace(m_documentLoadTiming); | 145 visitor->trace(m_documentLoadTiming); |
| 146 visitor->trace(m_applicationCacheHost); | 146 visitor->trace(m_applicationCacheHost); |
| 147 visitor->trace(m_contentSecurityPolicy); | 147 visitor->trace(m_contentSecurityPolicy); |
| 148 RawResourceClient::trace(visitor); |
| 148 } | 149 } |
| 149 | 150 |
| 150 unsigned long DocumentLoader::mainResourceIdentifier() const | 151 unsigned long DocumentLoader::mainResourceIdentifier() const |
| 151 { | 152 { |
| 152 return m_mainResource ? m_mainResource->identifier() : 0; | 153 return m_mainResource ? m_mainResource->identifier() : 0; |
| 153 } | 154 } |
| 154 | 155 |
| 155 const ResourceRequest& DocumentLoader::originalRequest() const | 156 const ResourceRequest& DocumentLoader::originalRequest() const |
| 156 { | 157 { |
| 157 return m_originalRequest; | 158 return m_originalRequest; |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 { | 719 { |
| 719 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); | 720 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); |
| 720 if (!source.isNull()) | 721 if (!source.isNull()) |
| 721 m_writer->appendReplacingData(source); | 722 m_writer->appendReplacingData(source); |
| 722 endWriting(m_writer.get()); | 723 endWriting(m_writer.get()); |
| 723 } | 724 } |
| 724 | 725 |
| 725 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 726 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 726 | 727 |
| 727 } // namespace blink | 728 } // namespace blink |
| OLD | NEW |