| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 } | 661 } |
| 662 | 662 |
| 663 void WorkerThreadableLoader::MainThreadLoaderHolder::start( | 663 void WorkerThreadableLoader::MainThreadLoaderHolder::start( |
| 664 Document& document, | 664 Document& document, |
| 665 std::unique_ptr<CrossThreadResourceRequestData> request, | 665 std::unique_ptr<CrossThreadResourceRequestData> request, |
| 666 const ThreadableLoaderOptions& options, | 666 const ThreadableLoaderOptions& options, |
| 667 const ResourceLoaderOptions& originalResourceLoaderOptions) { | 667 const ResourceLoaderOptions& originalResourceLoaderOptions) { |
| 668 DCHECK(isMainThread()); | 668 DCHECK(isMainThread()); |
| 669 ResourceLoaderOptions resourceLoaderOptions = originalResourceLoaderOptions; | 669 ResourceLoaderOptions resourceLoaderOptions = originalResourceLoaderOptions; |
| 670 resourceLoaderOptions.requestInitiatorContext = WorkerContext; | 670 resourceLoaderOptions.requestInitiatorContext = WorkerContext; |
| 671 // TODO(yhirano): Remove this CHECK once https://crbug.com/667254 is fixed. |
| 672 CHECK(!m_mainThreadLoader); |
| 671 m_mainThreadLoader = DocumentThreadableLoader::create(document, this, options, | 673 m_mainThreadLoader = DocumentThreadableLoader::create(document, this, options, |
| 672 resourceLoaderOptions); | 674 resourceLoaderOptions); |
| 673 m_mainThreadLoader->start(ResourceRequest(request.get())); | 675 m_mainThreadLoader->start(ResourceRequest(request.get())); |
| 674 } | 676 } |
| 675 | 677 |
| 676 } // namespace blink | 678 } // namespace blink |
| OLD | NEW |