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

Side by Side Diff: Source/core/loader/DocumentLoader.cpp

Issue 1290593004: Oilpan: fix build after r200730. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 ASSERT(!m_applicationCacheHost); 122 ASSERT(!m_applicationCacheHost);
123 } 123 }
124 124
125 DEFINE_TRACE(DocumentLoader) 125 DEFINE_TRACE(DocumentLoader)
126 { 126 {
127 visitor->trace(m_frame); 127 visitor->trace(m_frame);
128 visitor->trace(m_fetcher); 128 visitor->trace(m_fetcher);
129 // TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.) 129 // TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.)
130 visitor->trace(m_writer); 130 visitor->trace(m_writer);
131 visitor->trace(m_archive); 131 visitor->trace(m_archive);
132 visitor->trace(m_documentLoadTiming);
132 visitor->trace(m_applicationCacheHost); 133 visitor->trace(m_applicationCacheHost);
133 visitor->trace(m_contentSecurityPolicy); 134 visitor->trace(m_contentSecurityPolicy);
134 } 135 }
135 136
136 unsigned long DocumentLoader::mainResourceIdentifier() const 137 unsigned long DocumentLoader::mainResourceIdentifier() const
137 { 138 {
138 return m_mainResource ? m_mainResource->identifier() : 0; 139 return m_mainResource ? m_mainResource->identifier() : 0;
139 } 140 }
140 141
141 Document* DocumentLoader::document() const 142 Document* DocumentLoader::document() const
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 { 874 {
874 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true, ForceSynchronousParsing); 875 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true, ForceSynchronousParsing);
875 if (!source.isNull()) 876 if (!source.isNull())
876 m_writer->appendReplacingData(source); 877 m_writer->appendReplacingData(source);
877 endWriting(m_writer.get()); 878 endWriting(m_writer.get());
878 } 879 }
879 880
880 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); 881 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
881 882
882 } // namespace blink 883 } // namespace blink
OLDNEW
« Source/core/loader/DocumentLoadTiming.h ('K') | « Source/core/loader/DocumentLoadTiming.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698