OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/pepper_plugin_delegate_impl.h" | 5 #include "content/renderer/pepper_plugin_delegate_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <queue> | 8 #include <queue> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
822 | 822 |
823 return new PlatformContext3DImpl(parent_context); | 823 return new PlatformContext3DImpl(parent_context); |
824 #else | 824 #else |
825 return NULL; | 825 return NULL; |
826 #endif | 826 #endif |
827 } | 827 } |
828 | 828 |
829 webkit::ppapi::PluginDelegate::PlatformVideoDecoder* | 829 webkit::ppapi::PluginDelegate::PlatformVideoDecoder* |
830 PepperPluginDelegateImpl::CreateVideoDecoder( | 830 PepperPluginDelegateImpl::CreateVideoDecoder( |
831 media::VideoDecodeAccelerator::Client* client, | 831 media::VideoDecodeAccelerator::Client* client, |
832 int command_buffer_route_id) { | 832 int32 command_buffer_route_id, |
833 return new PlatformVideoDecoderImpl(client, command_buffer_route_id); | 833 gpu::CommandBufferHelper* cmd_buffer_helper) { |
| 834 return new PlatformVideoDecoderImpl( |
| 835 client, command_buffer_route_id, cmd_buffer_helper); |
834 } | 836 } |
835 | 837 |
836 void PepperPluginDelegateImpl::NumberOfFindResultsChanged(int identifier, | 838 void PepperPluginDelegateImpl::NumberOfFindResultsChanged(int identifier, |
837 int total, | 839 int total, |
838 bool final_result) { | 840 bool final_result) { |
839 render_view_->reportFindInPageMatchCount(identifier, total, final_result); | 841 render_view_->reportFindInPageMatchCount(identifier, total, final_result); |
840 } | 842 } |
841 | 843 |
842 void PepperPluginDelegateImpl::SelectedFindResultChanged(int identifier, | 844 void PepperPluginDelegateImpl::SelectedFindResultChanged(int identifier, |
843 int index) { | 845 int index) { |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1328 if (!base::SharedMemory::IsHandleValid(handle)) { | 1330 if (!base::SharedMemory::IsHandleValid(handle)) { |
1329 DLOG(WARNING) << "Browser failed to allocate shared memory"; | 1331 DLOG(WARNING) << "Browser failed to allocate shared memory"; |
1330 return NULL; | 1332 return NULL; |
1331 } | 1333 } |
1332 return new base::SharedMemory(handle, false); | 1334 return new base::SharedMemory(handle, false); |
1333 } | 1335 } |
1334 | 1336 |
1335 ppapi::Preferences PepperPluginDelegateImpl::GetPreferences() { | 1337 ppapi::Preferences PepperPluginDelegateImpl::GetPreferences() { |
1336 return ppapi::Preferences(render_view_->webkit_preferences()); | 1338 return ppapi::Preferences(render_view_->webkit_preferences()); |
1337 } | 1339 } |
OLD | NEW |