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

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

Issue 2065513004: Expose flash playback status and volume control to content renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio_focus_manager
Patch Set: addressing nits Created 4 years, 5 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
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bit_cast.h" 10 #include "base/bit_cast.h"
(...skipping 17 matching lines...) Expand all
28 #include "content/common/frame_messages.h" 28 #include "content/common/frame_messages.h"
29 #include "content/public/common/content_constants.h" 29 #include "content/public/common/content_constants.h"
30 #include "content/public/renderer/content_renderer_client.h" 30 #include "content/public/renderer/content_renderer_client.h"
31 #include "content/renderer/pepper/content_decryptor_delegate.h" 31 #include "content/renderer/pepper/content_decryptor_delegate.h"
32 #include "content/renderer/pepper/event_conversion.h" 32 #include "content/renderer/pepper/event_conversion.h"
33 #include "content/renderer/pepper/fullscreen_container.h" 33 #include "content/renderer/pepper/fullscreen_container.h"
34 #include "content/renderer/pepper/gfx_conversion.h" 34 #include "content/renderer/pepper/gfx_conversion.h"
35 #include "content/renderer/pepper/host_dispatcher_wrapper.h" 35 #include "content/renderer/pepper/host_dispatcher_wrapper.h"
36 #include "content/renderer/pepper/host_globals.h" 36 #include "content/renderer/pepper/host_globals.h"
37 #include "content/renderer/pepper/message_channel.h" 37 #include "content/renderer/pepper/message_channel.h"
38 #include "content/renderer/pepper/pepper_audio_controller.h"
38 #include "content/renderer/pepper/pepper_browser_connection.h" 39 #include "content/renderer/pepper/pepper_browser_connection.h"
39 #include "content/renderer/pepper/pepper_compositor_host.h" 40 #include "content/renderer/pepper/pepper_compositor_host.h"
40 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h" 41 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
41 #include "content/renderer/pepper/pepper_graphics_2d_host.h" 42 #include "content/renderer/pepper/pepper_graphics_2d_host.h"
42 #include "content/renderer/pepper/pepper_in_process_router.h" 43 #include "content/renderer/pepper/pepper_in_process_router.h"
43 #include "content/renderer/pepper/pepper_plugin_instance_metrics.h" 44 #include "content/renderer/pepper/pepper_plugin_instance_metrics.h"
44 #include "content/renderer/pepper/pepper_try_catch.h" 45 #include "content/renderer/pepper/pepper_try_catch.h"
45 #include "content/renderer/pepper/pepper_url_loader_host.h" 46 #include "content/renderer/pepper/pepper_url_loader_host.h"
46 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 47 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
47 #include "content/renderer/pepper/plugin_module.h" 48 #include "content/renderer/pepper/plugin_module.h"
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 text_input_caret_bounds_(0, 0, 0, 0), 523 text_input_caret_bounds_(0, 0, 0, 0),
523 text_input_caret_set_(false), 524 text_input_caret_set_(false),
524 selection_caret_(0), 525 selection_caret_(0),
525 selection_anchor_(0), 526 selection_anchor_(0),
526 pending_user_gesture_(0.0), 527 pending_user_gesture_(0.0),
527 document_loader_(NULL), 528 document_loader_(NULL),
528 external_document_load_(false), 529 external_document_load_(false),
529 isolate_(v8::Isolate::GetCurrent()), 530 isolate_(v8::Isolate::GetCurrent()),
530 is_deleted_(false), 531 is_deleted_(false),
531 initialized_(false), 532 initialized_(false),
533 audio_controller_(new PepperAudioController(this)),
532 view_change_weak_ptr_factory_(this), 534 view_change_weak_ptr_factory_(this),
533 weak_factory_(this) { 535 weak_factory_(this) {
534 pp_instance_ = HostGlobals::Get()->AddInstance(this); 536 pp_instance_ = HostGlobals::Get()->AddInstance(this);
535 537
536 memset(&current_print_settings_, 0, sizeof(current_print_settings_)); 538 memset(&current_print_settings_, 0, sizeof(current_print_settings_));
537 module_->InstanceCreated(this); 539 module_->InstanceCreated(this);
538 540
539 if (render_frame) { // NULL in tests 541 if (render_frame) { // NULL in tests
540 render_frame->PepperInstanceCreated(this); 542 render_frame->PepperInstanceCreated(this);
541 view_data_.is_page_visible = !render_frame_->GetRenderWidget()->is_hidden(); 543 view_data_.is_page_visible = !render_frame_->GetRenderWidget()->is_hidden();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 (*i)->InstanceDeleted(); 580 (*i)->InstanceDeleted();
579 } 581 }
580 582
581 if (message_channel_) 583 if (message_channel_)
582 message_channel_->InstanceDeleted(); 584 message_channel_->InstanceDeleted();
583 message_channel_object_.Reset(); 585 message_channel_object_.Reset();
584 586
585 if (TrackedCallback::IsPending(lock_mouse_callback_)) 587 if (TrackedCallback::IsPending(lock_mouse_callback_))
586 lock_mouse_callback_->Abort(); 588 lock_mouse_callback_->Abort();
587 589
590 audio_controller_->OnPepperInstanceDeleted();
591
588 if (render_frame_) 592 if (render_frame_)
589 render_frame_->PepperInstanceDeleted(this); 593 render_frame_->PepperInstanceDeleted(this);
590 594
591 if (!module_->IsProxied() && render_frame_) { 595 if (!module_->IsProxied() && render_frame_) {
592 PepperBrowserConnection* browser_connection = 596 PepperBrowserConnection* browser_connection =
593 PepperBrowserConnection::Get(render_frame_); 597 PepperBrowserConnection::Get(render_frame_);
594 browser_connection->DidDeleteInProcessInstance(pp_instance()); 598 browser_connection->DidDeleteInProcessInstance(pp_instance());
595 } 599 }
596 600
597 UnSetAndDeleteLockTargetAdapter(); 601 UnSetAndDeleteLockTargetAdapter();
(...skipping 2811 matching lines...) Expand 10 before | Expand all | Expand 10 after
3409 const cc::TextureMailbox& mailbox) const { 3413 const cc::TextureMailbox& mailbox) const {
3410 auto it = 3414 auto it =
3411 std::find_if(texture_ref_counts_.begin(), texture_ref_counts_.end(), 3415 std::find_if(texture_ref_counts_.begin(), texture_ref_counts_.end(),
3412 [&mailbox](const TextureMailboxRefCount& ref_count) { 3416 [&mailbox](const TextureMailboxRefCount& ref_count) {
3413 return ref_count.first.mailbox() == mailbox.mailbox(); 3417 return ref_count.first.mailbox() == mailbox.mailbox();
3414 }); 3418 });
3415 return it != texture_ref_counts_.end(); 3419 return it != texture_ref_counts_.end();
3416 } 3420 }
3417 3421
3418 } // namespace content 3422 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698