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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
798 blink::WebMIDIAccessor* accessor = | 798 blink::WebMIDIAccessor* accessor = |
799 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); | 799 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); |
800 if (accessor) | 800 if (accessor) |
801 return accessor; | 801 return accessor; |
802 | 802 |
803 return new RendererWebMIDIAccessorImpl(client); | 803 return new RendererWebMIDIAccessorImpl(client); |
804 } | 804 } |
805 | 805 |
806 void RendererBlinkPlatformImpl::getPluginList( | 806 void RendererBlinkPlatformImpl::getPluginList( |
807 bool refresh, | 807 bool refresh, |
| 808 const blink::WebSecurityOrigin& mainFrameOrigin, |
808 blink::WebPluginListBuilder* builder) { | 809 blink::WebPluginListBuilder* builder) { |
809 #if defined(ENABLE_PLUGINS) | 810 #if defined(ENABLE_PLUGINS) |
810 std::vector<WebPluginInfo> plugins; | 811 std::vector<WebPluginInfo> plugins; |
811 if (!plugin_refresh_allowed_) | 812 if (!plugin_refresh_allowed_) |
812 refresh = false; | 813 refresh = false; |
813 RenderThread::Get()->Send(new FrameHostMsg_GetPlugins(refresh, &plugins)); | 814 RenderThread::Get()->Send( |
| 815 new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins)); |
814 for (const WebPluginInfo& plugin : plugins) { | 816 for (const WebPluginInfo& plugin : plugins) { |
815 builder->addPlugin( | 817 builder->addPlugin( |
816 plugin.name, plugin.desc, | 818 plugin.name, plugin.desc, |
817 plugin.path.BaseName().AsUTF16Unsafe()); | 819 plugin.path.BaseName().AsUTF16Unsafe()); |
818 | 820 |
819 for (const WebPluginMimeType& mime_type : plugin.mime_types) { | 821 for (const WebPluginMimeType& mime_type : plugin.mime_types) { |
820 builder->addMediaTypeToLastPlugin( | 822 builder->addMediaTypeToLastPlugin( |
821 WebString::fromUTF8(mime_type.mime_type), mime_type.description); | 823 WebString::fromUTF8(mime_type.mime_type), mime_type.description); |
822 | 824 |
823 for (const auto& extension : mime_type.file_extensions) { | 825 for (const auto& extension : mime_type.file_extensions) { |
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1316 return &trial_token_validator_; | 1318 return &trial_token_validator_; |
1317 } | 1319 } |
1318 | 1320 |
1319 void RendererBlinkPlatformImpl::workerContextCreated( | 1321 void RendererBlinkPlatformImpl::workerContextCreated( |
1320 const v8::Local<v8::Context>& worker) { | 1322 const v8::Local<v8::Context>& worker) { |
1321 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( | 1323 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( |
1322 worker); | 1324 worker); |
1323 } | 1325 } |
1324 | 1326 |
1325 } // namespace content | 1327 } // namespace content |
OLD | NEW |