| 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 break; | 166 break; |
| 167 case Resource::Script: | 167 case Resource::Script: |
| 168 resource = ScriptResource::fetch(request, fetcher()); | 168 resource = ScriptResource::fetch(request, fetcher()); |
| 169 break; | 169 break; |
| 170 case Resource::CSSStyleSheet: | 170 case Resource::CSSStyleSheet: |
| 171 resource = CSSStyleSheetResource::fetch(request, fetcher()); | 171 resource = CSSStyleSheetResource::fetch(request, fetcher()); |
| 172 break; | 172 break; |
| 173 case Resource::Font: | 173 case Resource::Font: |
| 174 resource = FontResource::fetch(request, fetcher()); | 174 resource = FontResource::fetch(request, fetcher()); |
| 175 // This is needed for fonts as loading doesn't start until there's usage
. | 175 // This is needed for fonts as loading doesn't start until there's usage
. |
| 176 toFontResource(resource)->beginLoadIfNeeded(fetcher()); | 176 if (resource) |
| 177 toFontResource(resource)->beginLoadIfNeeded(fetcher()); |
| 177 break; | 178 break; |
| 178 case Resource::Media: | 179 case Resource::Media: |
| 179 resource = RawResource::fetchMedia(request, fetcher()); | 180 resource = RawResource::fetchMedia(request, fetcher()); |
| 180 break; | 181 break; |
| 181 case Resource::TextTrack: | 182 case Resource::TextTrack: |
| 182 resource = RawResource::fetchTextTrack(request, fetcher()); | 183 resource = RawResource::fetchTextTrack(request, fetcher()); |
| 183 break; | 184 break; |
| 184 case Resource::ImportResource: | 185 case Resource::ImportResource: |
| 185 resource = RawResource::fetchImport(request, fetcher()); | 186 resource = RawResource::fetchImport(request, fetcher()); |
| 186 break; | 187 break; |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 { | 769 { |
| 769 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); | 770 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); |
| 770 if (!source.isNull()) | 771 if (!source.isNull()) |
| 771 m_writer->appendReplacingData(source); | 772 m_writer->appendReplacingData(source); |
| 772 endWriting(m_writer.get()); | 773 endWriting(m_writer.get()); |
| 773 } | 774 } |
| 774 | 775 |
| 775 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 776 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 776 | 777 |
| 777 } // namespace blink | 778 } // namespace blink |
| OLD | NEW |