| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/renderer_blink_platform_impl.h" | 5 #include "content/renderer/renderer_blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 // SandboxSupport contains a map of WebFontFamily objects, which hold | 300 // SandboxSupport contains a map of WebFontFamily objects, which hold |
| 301 // WebCStrings, which become invalidated when blink is shut down. Hence, we | 301 // WebCStrings, which become invalidated when blink is shut down. Hence, we |
| 302 // need to clear that map now, just before blink::shutdown() is called. | 302 // need to clear that map now, just before blink::shutdown() is called. |
| 303 sandbox_support_.reset(); | 303 sandbox_support_.reset(); |
| 304 #endif | 304 #endif |
| 305 } | 305 } |
| 306 | 306 |
| 307 //------------------------------------------------------------------------------ | 307 //------------------------------------------------------------------------------ |
| 308 | 308 |
| 309 blink::WebURLLoader* RendererBlinkPlatformImpl::createURLLoader() { | 309 blink::WebURLLoader* RendererBlinkPlatformImpl::createURLLoader() { |
| 310 if (!url_loader_factory_) |
| 311 interfaceProvider()->getInterface(mojo::GetProxy(&url_loader_factory_)); |
| 310 ChildThreadImpl* child_thread = ChildThreadImpl::current(); | 312 ChildThreadImpl* child_thread = ChildThreadImpl::current(); |
| 311 // There may be no child thread in RenderViewTests. These tests can still use | 313 // There may be no child thread in RenderViewTests. These tests can still use |
| 312 // data URLs to bypass the ResourceDispatcher. | 314 // data URLs to bypass the ResourceDispatcher. |
| 313 return new content::WebURLLoaderImpl( | 315 return new content::WebURLLoaderImpl( |
| 314 child_thread ? child_thread->resource_dispatcher() : NULL); | 316 child_thread ? child_thread->resource_dispatcher() : NULL, |
| 317 url_loader_factory_.get()); |
| 315 } | 318 } |
| 316 | 319 |
| 317 blink::WebThread* RendererBlinkPlatformImpl::currentThread() { | 320 blink::WebThread* RendererBlinkPlatformImpl::currentThread() { |
| 318 if (main_thread_->isCurrentThread()) | 321 if (main_thread_->isCurrentThread()) |
| 319 return main_thread_.get(); | 322 return main_thread_.get(); |
| 320 return BlinkPlatformImpl::currentThread(); | 323 return BlinkPlatformImpl::currentThread(); |
| 321 } | 324 } |
| 322 | 325 |
| 323 blink::BlameContext* RendererBlinkPlatformImpl::topLevelBlameContext() { | 326 blink::BlameContext* RendererBlinkPlatformImpl::topLevelBlameContext() { |
| 324 return &top_level_blame_context_; | 327 return &top_level_blame_context_; |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 return &trial_token_validator_; | 1317 return &trial_token_validator_; |
| 1315 } | 1318 } |
| 1316 | 1319 |
| 1317 void RendererBlinkPlatformImpl::workerContextCreated( | 1320 void RendererBlinkPlatformImpl::workerContextCreated( |
| 1318 const v8::Local<v8::Context>& worker) { | 1321 const v8::Local<v8::Context>& worker) { |
| 1319 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( | 1322 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( |
| 1320 worker); | 1323 worker); |
| 1321 } | 1324 } |
| 1322 | 1325 |
| 1323 } // namespace content | 1326 } // namespace content |
| OLD | NEW |