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/pepper/pepper_plugin_instance_impl.h" | 5 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 #include "ppapi/shared_impl/scoped_pp_resource.h" | 87 #include "ppapi/shared_impl/scoped_pp_resource.h" |
88 #include "ppapi/shared_impl/scoped_pp_var.h" | 88 #include "ppapi/shared_impl/scoped_pp_var.h" |
89 #include "ppapi/shared_impl/time_conversion.h" | 89 #include "ppapi/shared_impl/time_conversion.h" |
90 #include "ppapi/shared_impl/url_request_info_data.h" | 90 #include "ppapi/shared_impl/url_request_info_data.h" |
91 #include "ppapi/shared_impl/var.h" | 91 #include "ppapi/shared_impl/var.h" |
92 #include "ppapi/thunk/enter.h" | 92 #include "ppapi/thunk/enter.h" |
93 #include "ppapi/thunk/ppb_buffer_api.h" | 93 #include "ppapi/thunk/ppb_buffer_api.h" |
94 #include "printing/metafile_skia_wrapper.h" | 94 #include "printing/metafile_skia_wrapper.h" |
95 #include "printing/pdf_metafile_skia.h" | 95 #include "printing/pdf_metafile_skia.h" |
96 #include "skia/ext/platform_canvas.h" | 96 #include "skia/ext/platform_canvas.h" |
| 97 #include "third_party/WebKit/public/platform/URLConversion.h" |
97 #include "third_party/WebKit/public/platform/WebCursorInfo.h" | 98 #include "third_party/WebKit/public/platform/WebCursorInfo.h" |
98 #include "third_party/WebKit/public/platform/WebGamepads.h" | 99 #include "third_party/WebKit/public/platform/WebGamepads.h" |
99 #include "third_party/WebKit/public/platform/WebRect.h" | 100 #include "third_party/WebKit/public/platform/WebRect.h" |
100 #include "third_party/WebKit/public/platform/WebString.h" | 101 #include "third_party/WebKit/public/platform/WebString.h" |
101 #include "third_party/WebKit/public/platform/WebURL.h" | 102 #include "third_party/WebKit/public/platform/WebURL.h" |
102 #include "third_party/WebKit/public/platform/WebURLError.h" | 103 #include "third_party/WebKit/public/platform/WebURLError.h" |
103 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 104 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
104 #include "third_party/WebKit/public/web/WebBindings.h" | 105 #include "third_party/WebKit/public/web/WebBindings.h" |
105 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 106 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
106 #include "third_party/WebKit/public/web/WebDataSource.h" | 107 #include "third_party/WebKit/public/web/WebDataSource.h" |
(...skipping 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2856 if (!full_frame_) | 2857 if (!full_frame_) |
2857 return ppapi::PPB_URLUtil_Shared::GenerateURLReturn(document.url(), | 2858 return ppapi::PPB_URLUtil_Shared::GenerateURLReturn(document.url(), |
2858 components); | 2859 components); |
2859 WebLocalFrame* frame = document.frame(); | 2860 WebLocalFrame* frame = document.frame(); |
2860 if (!frame) | 2861 if (!frame) |
2861 return PP_MakeUndefined(); | 2862 return PP_MakeUndefined(); |
2862 const WebURLRequest& request = frame->dataSource()->originalRequest(); | 2863 const WebURLRequest& request = frame->dataSource()->originalRequest(); |
2863 WebString referer = request.httpHeaderField("Referer"); | 2864 WebString referer = request.httpHeaderField("Referer"); |
2864 if (referer.isEmpty()) | 2865 if (referer.isEmpty()) |
2865 return PP_MakeUndefined(); | 2866 return PP_MakeUndefined(); |
2866 return ppapi::PPB_URLUtil_Shared::GenerateURLReturn(GURL(referer), | 2867 return ppapi::PPB_URLUtil_Shared::GenerateURLReturn( |
2867 components); | 2868 blink::WebStringToGURL(referer), components); |
2868 } | 2869 } |
2869 | 2870 |
2870 PP_ExternalPluginResult PepperPluginInstanceImpl::ResetAsProxied( | 2871 PP_ExternalPluginResult PepperPluginInstanceImpl::ResetAsProxied( |
2871 scoped_refptr<PluginModule> module) { | 2872 scoped_refptr<PluginModule> module) { |
2872 // Save the original module and switch over to the new one now that this | 2873 // Save the original module and switch over to the new one now that this |
2873 // plugin is using the IPC-based proxy. | 2874 // plugin is using the IPC-based proxy. |
2874 original_module_ = module_; | 2875 original_module_ = module_; |
2875 module_ = module; | 2876 module_ = module; |
2876 | 2877 |
2877 // For NaCl instances, remember the NaCl plugin instance interface, so we | 2878 // For NaCl instances, remember the NaCl plugin instance interface, so we |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3290 | 3291 |
3291 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { | 3292 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { |
3292 if (initialized_ && !javascript_used_ && is_flash_plugin_) { | 3293 if (initialized_ && !javascript_used_ && is_flash_plugin_) { |
3293 javascript_used_ = true; | 3294 javascript_used_ = true; |
3294 RenderThread::Get()->RecordAction( | 3295 RenderThread::Get()->RecordAction( |
3295 base::UserMetricsAction("Flash.JavaScriptUsed")); | 3296 base::UserMetricsAction("Flash.JavaScriptUsed")); |
3296 } | 3297 } |
3297 } | 3298 } |
3298 | 3299 |
3299 } // namespace content | 3300 } // namespace content |
OLD | NEW |