| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011, 2012 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 { | 271 { |
| 272 didFail(error); | 272 didFail(error); |
| 273 } | 273 } |
| 274 | 274 |
| 275 void AssociatedURLLoader::ClientAdapter::enableErrorNotifications() | 275 void AssociatedURLLoader::ClientAdapter::enableErrorNotifications() |
| 276 { | 276 { |
| 277 m_enableErrorNotifications = true; | 277 m_enableErrorNotifications = true; |
| 278 // If an error has already been received, start a timer to report it to the
client | 278 // If an error has already been received, start a timer to report it to the
client |
| 279 // after AssociatedURLLoader::loadAsynchronously has returned to the caller. | 279 // after AssociatedURLLoader::loadAsynchronously has returned to the caller. |
| 280 if (m_didFail) | 280 if (m_didFail) |
| 281 m_errorTimer.startOneShot(0, FROM_HERE); | 281 m_errorTimer.startOneShot(0, BLINK_FROM_HERE); |
| 282 } | 282 } |
| 283 | 283 |
| 284 void AssociatedURLLoader::ClientAdapter::notifyError(Timer<ClientAdapter>* timer
) | 284 void AssociatedURLLoader::ClientAdapter::notifyError(Timer<ClientAdapter>* timer
) |
| 285 { | 285 { |
| 286 ASSERT_UNUSED(timer, timer == &m_errorTimer); | 286 ASSERT_UNUSED(timer, timer == &m_errorTimer); |
| 287 | 287 |
| 288 m_client->didFail(m_loader, m_error); | 288 m_client->didFail(m_loader, m_error); |
| 289 } | 289 } |
| 290 | 290 |
| 291 AssociatedURLLoader::AssociatedURLLoader(PassRefPtrWillBeRawPtr<WebLocalFrameImp
l> frameImpl, const WebURLLoaderOptions& options) | 291 AssociatedURLLoader::AssociatedURLLoader(PassRefPtrWillBeRawPtr<WebLocalFrameImp
l> frameImpl, const WebURLLoaderOptions& options) |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 if (m_loader) | 382 if (m_loader) |
| 383 m_loader->setDefersLoading(defersLoading); | 383 m_loader->setDefersLoading(defersLoading); |
| 384 } | 384 } |
| 385 | 385 |
| 386 void AssociatedURLLoader::setLoadingTaskRunner(blink::WebTaskRunner*) | 386 void AssociatedURLLoader::setLoadingTaskRunner(blink::WebTaskRunner*) |
| 387 { | 387 { |
| 388 // TODO(alexclarke): Maybe support this one day if it proves worthwhile. | 388 // TODO(alexclarke): Maybe support this one day if it proves worthwhile. |
| 389 } | 389 } |
| 390 | 390 |
| 391 } // namespace blink | 391 } // namespace blink |
| OLD | NEW |