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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
792 blink::WebMIDIAccessor* accessor = | 792 blink::WebMIDIAccessor* accessor = |
793 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); | 793 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); |
794 if (accessor) | 794 if (accessor) |
795 return accessor; | 795 return accessor; |
796 | 796 |
797 return new RendererWebMIDIAccessorImpl(client); | 797 return new RendererWebMIDIAccessorImpl(client); |
798 } | 798 } |
799 | 799 |
800 void RendererBlinkPlatformImpl::getPluginList( | 800 void RendererBlinkPlatformImpl::getPluginList( |
801 bool refresh, | 801 bool refresh, |
| 802 const blink::WebSecurityOrigin& mainFrameOrigin, |
802 blink::WebPluginListBuilder* builder) { | 803 blink::WebPluginListBuilder* builder) { |
803 #if defined(ENABLE_PLUGINS) | 804 #if defined(ENABLE_PLUGINS) |
804 std::vector<WebPluginInfo> plugins; | 805 std::vector<WebPluginInfo> plugins; |
805 if (!plugin_refresh_allowed_) | 806 if (!plugin_refresh_allowed_) |
806 refresh = false; | 807 refresh = false; |
807 RenderThread::Get()->Send(new FrameHostMsg_GetPlugins(refresh, &plugins)); | 808 RenderThread::Get()->Send( |
| 809 new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins)); |
808 for (const WebPluginInfo& plugin : plugins) { | 810 for (const WebPluginInfo& plugin : plugins) { |
809 builder->addPlugin( | 811 builder->addPlugin( |
810 plugin.name, plugin.desc, | 812 plugin.name, plugin.desc, |
811 plugin.path.BaseName().AsUTF16Unsafe()); | 813 plugin.path.BaseName().AsUTF16Unsafe()); |
812 | 814 |
813 for (const WebPluginMimeType& mime_type : plugin.mime_types) { | 815 for (const WebPluginMimeType& mime_type : plugin.mime_types) { |
814 builder->addMediaTypeToLastPlugin( | 816 builder->addMediaTypeToLastPlugin( |
815 WebString::fromUTF8(mime_type.mime_type), mime_type.description); | 817 WebString::fromUTF8(mime_type.mime_type), mime_type.description); |
816 | 818 |
817 for (const auto& extension : mime_type.file_extensions) { | 819 for (const auto& extension : mime_type.file_extensions) { |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1337 return &trial_token_validator_; | 1339 return &trial_token_validator_; |
1338 } | 1340 } |
1339 | 1341 |
1340 void RendererBlinkPlatformImpl::workerContextCreated( | 1342 void RendererBlinkPlatformImpl::workerContextCreated( |
1341 const v8::Local<v8::Context>& worker) { | 1343 const v8::Local<v8::Context>& worker) { |
1342 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( | 1344 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( |
1343 worker); | 1345 worker); |
1344 } | 1346 } |
1345 | 1347 |
1346 } // namespace content | 1348 } // namespace content |
OLD | NEW |