| 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 return; | 543 return; |
| 544 } | 544 } |
| 545 } | 545 } |
| 546 | 546 |
| 547 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); | 547 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); |
| 548 | 548 |
| 549 if (m_isLoadingMultipartContent) { | 549 if (m_isLoadingMultipartContent) { |
| 550 setupForReplace(); | 550 setupForReplace(); |
| 551 m_mainResource->clear(); | 551 m_mainResource->clear(); |
| 552 } else if (response.isMultipart()) { | 552 } else if (response.isMultipart()) { |
| 553 FeatureObserver::observe(m_frame->document(), FeatureObserver::Multipart
MainResource); | 553 UseCounter::observe(m_frame->document(), UseCounter::MultipartMainResour
ce); |
| 554 m_isLoadingMultipartContent = true; | 554 m_isLoadingMultipartContent = true; |
| 555 } | 555 } |
| 556 | 556 |
| 557 m_response = response; | 557 m_response = response; |
| 558 | 558 |
| 559 if (m_identifierForLoadWithoutResourceLoader) | 559 if (m_identifierForLoadWithoutResourceLoader) |
| 560 frameLoader()->notifier()->dispatchDidReceiveResponse(this, m_identifier
ForLoadWithoutResourceLoader, m_response, 0); | 560 frameLoader()->notifier()->dispatchDidReceiveResponse(this, m_identifier
ForLoadWithoutResourceLoader, m_response, 0); |
| 561 | 561 |
| 562 ASSERT(!m_waitingForContentPolicy); | 562 ASSERT(!m_waitingForContentPolicy); |
| 563 m_waitingForContentPolicy = true; | 563 m_waitingForContentPolicy = true; |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 commitLoad(resourceData->data(), resourceData->size()); | 1202 commitLoad(resourceData->data(), resourceData->size()); |
| 1203 } | 1203 } |
| 1204 | 1204 |
| 1205 void DocumentLoader::handledOnloadEvents() | 1205 void DocumentLoader::handledOnloadEvents() |
| 1206 { | 1206 { |
| 1207 m_wasOnloadHandled = true; | 1207 m_wasOnloadHandled = true; |
| 1208 applicationCacheHost()->stopDeferringEvents(); | 1208 applicationCacheHost()->stopDeferringEvents(); |
| 1209 } | 1209 } |
| 1210 | 1210 |
| 1211 } // namespace WebCore | 1211 } // namespace WebCore |
| OLD | NEW |