Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.h ('k') | media/base/media_keys.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 2411 matching lines...) Expand 10 before | Expand all | Expand 10 after
2422 PP_CdmExceptionCode exception_code, 2422 PP_CdmExceptionCode exception_code,
2423 uint32 system_code, 2423 uint32 system_code,
2424 PP_Var error_description_var) { 2424 PP_Var error_description_var) {
2425 content_decryptor_delegate_->OnPromiseRejected( 2425 content_decryptor_delegate_->OnPromiseRejected(
2426 promise_id, exception_code, system_code, error_description_var); 2426 promise_id, exception_code, system_code, error_description_var);
2427 } 2427 }
2428 2428
2429 void PepperPluginInstanceImpl::SessionMessage(PP_Instance instance, 2429 void PepperPluginInstanceImpl::SessionMessage(PP_Instance instance,
2430 PP_Var web_session_id_var, 2430 PP_Var web_session_id_var,
2431 PP_CdmMessageType message_type, 2431 PP_CdmMessageType message_type,
2432 PP_Var message_var) { 2432 PP_Var message_var,
2433 content_decryptor_delegate_->OnSessionMessage(web_session_id_var, 2433 PP_Var legacy_destination_url) {
2434 message_type, message_var); 2434 content_decryptor_delegate_->OnSessionMessage(
2435 web_session_id_var, message_type, message_var, legacy_destination_url);
2435 } 2436 }
2436 2437
2437 void PepperPluginInstanceImpl::SessionKeysChange( 2438 void PepperPluginInstanceImpl::SessionKeysChange(
2438 PP_Instance instance, 2439 PP_Instance instance,
2439 PP_Var web_session_id_var, 2440 PP_Var web_session_id_var,
2440 PP_Bool has_additional_usable_key, 2441 PP_Bool has_additional_usable_key,
2441 uint32_t key_count, 2442 uint32_t key_count,
2442 const struct PP_KeyInformation key_information[]) { 2443 const struct PP_KeyInformation key_information[]) {
2443 content_decryptor_delegate_->OnSessionKeysChange(web_session_id_var, 2444 content_decryptor_delegate_->OnSessionKeysChange(web_session_id_var,
2444 has_additional_usable_key, 2445 has_additional_usable_key,
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
3294 3295
3295 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { 3296 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() {
3296 if (!javascript_used_ && is_flash_plugin_) { 3297 if (!javascript_used_ && is_flash_plugin_) {
3297 javascript_used_ = true; 3298 javascript_used_ = true;
3298 RenderThread::Get()->RecordAction( 3299 RenderThread::Get()->RecordAction(
3299 base::UserMetricsAction("Flash.JavaScriptUsed")); 3300 base::UserMetricsAction("Flash.JavaScriptUsed"));
3300 } 3301 }
3301 } 3302 }
3302 3303
3303 } // namespace content 3304 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.h ('k') | media/base/media_keys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698