Browser Plugin: Implement BrowserPluginObserver.

content/renderer/browser_plugin/browser_plugin_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/browser_plugin/browser_plugin.h"
+#include "content/renderer/browser_plugin/browser_plugin_impl.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_client.h"
+#include "content/public/renderer/browser_plugin/browser_plugin_observer.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/v8_value_converter_impl.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMCustomEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ skipping 65 matching lines @@
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
       return "crashed";
     default:
       // This should never happen.
       DCHECK(false);
       return "unknown";
   }
 }
 }
 
-BrowserPlugin::BrowserPlugin(
+BrowserPluginImpl::BrowserPluginImpl(
     int instance_id,
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebPluginParams& params)
     : instance_id_(instance_id),
       render_view_(render_view->AsWeakPtr()),
       render_view_routing_id_(render_view->GetRoutingID()),
       container_(NULL),
       damage_buffer_sequence_id_(0),
       resize_ack_received_(true),
@@ skipping 14 matching lines @@
       visible_(true),
       size_changed_in_flight_(false),
       browser_plugin_manager_(render_view->browser_plugin_manager()),
       current_nav_entry_index_(0),
       nav_entry_count_(0),
       compositing_enabled_(false) {
   browser_plugin_manager()->AddBrowserPlugin(instance_id, this);
   bindings_.reset(new BrowserPluginBindings(this));
 
   ParseAttributes(params);
+  GetContentClient()->renderer()->BrowserPluginCreated(this);
 }
 
-BrowserPlugin::~BrowserPlugin() {
+BrowserPluginImpl::~BrowserPluginImpl() {
   browser_plugin_manager()->RemoveBrowserPlugin(instance_id_);
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_PluginDestroyed(
-          render_view_routing_id_,
-          instance_id_));
+  Send(new BrowserPluginHostMsg_PluginDestroyed(
+      render_view_routing_id_,
+      instance_id_));
 }
 
-bool BrowserPlugin::OnMessageReceived(const IPC::Message& message) {
+void BrowserPluginImpl::AddObserver(BrowserPluginObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void BrowserPluginImpl::RemoveObserver(BrowserPluginObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+bool BrowserPluginImpl::OnMessageReceived(const IPC::Message& message) {
+  ObserverListBase<BrowserPluginObserver>::Iterator it(observers_);

[sadrul, 2013/01/09 15:21:54]

Check observers_.might_have_observers() first.

[Fady Samuel, 2013/01/09 17:41:24]

Done.

+  BrowserPluginObserver* observer;
+  while ((observer = it.GetNext()) != NULL) {
+    if (observer->OnMessageReceived(message))
+      return true;
+  }
+
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(BrowserPlugin, message)
+  IPC_BEGIN_MESSAGE_MAP(BrowserPluginImpl, message)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady,
                         OnGuestContentWindowReady)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestResponsive, OnGuestResponsive)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestUnresponsive, OnGuestUnresponsive)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStop, OnLoadStop)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
                         OnShouldAcceptTouchEvents)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void BrowserPlugin::UpdateDOMAttribute(
+void BrowserPluginImpl::UpdateDOMAttribute(
     const std::string& attribute_name,
     const std::string& attribute_value) {
   if (!container())
     return;
 
   WebKit::WebElement element = container()->element();
   WebKit::WebString web_attribute_name =
       WebKit::WebString::fromUTF8(attribute_name);
   std::string current_value(element.getAttribute(web_attribute_name).utf8());
   if (current_value == attribute_value)
     return;
 
   if (attribute_value.empty()) {
     element.removeAttribute(web_attribute_name);
   } else {
     element.setAttribute(web_attribute_name,
         WebKit::WebString::fromUTF8(attribute_value));
   }
 }
 
-bool BrowserPlugin::SetSrcAttribute(const std::string& src,
-                                    std::string* error_message) {
+bool BrowserPluginImpl::SetSrcAttribute(const std::string& src,
+                                        std::string* error_message) {
   if (!valid_partition_id_) {
     *error_message = kErrorInvalidPartition;
     return false;
   }
 
   if (src.empty() || (src == src_ && !guest_crashed_))
     return true;
 
   // If we haven't created the guest yet, do so now. We will navigate it right
   // after creation. If |src| is empty, we can delay the creation until we
   // acutally need it.
   if (!navigate_src_sent_) {
     BrowserPluginHostMsg_CreateGuest_Params create_guest_params;
     create_guest_params.storage_partition_id = storage_partition_id_;
     create_guest_params.persist_storage = persist_storage_;
     create_guest_params.focused = ShouldGuestBeFocused();
     create_guest_params.visible = visible_;
     GetDamageBufferWithSizeParams(&create_guest_params.auto_size_params,
                                   &create_guest_params.resize_guest_params);
-    browser_plugin_manager()->Send(
-        new BrowserPluginHostMsg_CreateGuest(
-            render_view_routing_id_,
-            instance_id_,
-            create_guest_params));
+    Send(new BrowserPluginHostMsg_CreateGuest(
+        render_view_routing_id_,
+        instance_id_,
+        create_guest_params));
   }
 
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_NavigateGuest(
-          render_view_routing_id_,
-          instance_id_,
-          src));
+  Send(new BrowserPluginHostMsg_NavigateGuest(
+      render_view_routing_id_,
+      instance_id_,
+      src));
   // Record that we sent a NavigateGuest message to embedder.
   // Once this instance has navigated, the storage partition cannot be changed,
   // so this value is used for enforcing this.
   navigate_src_sent_ = true;
   src_ = src;
   return true;
 }
 
-void BrowserPlugin::SetAutoSizeAttribute(bool auto_size) {
+void BrowserPluginImpl::SetAutoSizeAttribute(bool auto_size) {
   if (auto_size_ == auto_size)
     return;
   auto_size_ = auto_size;
   last_view_size_ = plugin_rect_.size();
   UpdateGuestAutoSizeState();
 }
 
-void BrowserPlugin::PopulateAutoSizeParameters(
+void BrowserPluginImpl::PopulateAutoSizeParameters(
     BrowserPluginHostMsg_AutoSize_Params* params) {
   // If maxWidth or maxHeight have not been set, set them to the container size.
   max_height_ = max_height_ ? max_height_ : height();
   max_width_ = max_width_ ? max_width_ : width();
   // minWidth should not be bigger than maxWidth, and minHeight should not be
   // bigger than maxHeight.
   min_height_ = std::min(min_height_, max_height_);
   min_width_ = std::min(min_width_, max_width_);
   params->enable = auto_size_;
   params->max_size = gfx::Size(max_width_, max_height_);
   params->min_size = gfx::Size(min_width_, min_height_);
 }
 
-void BrowserPlugin::UpdateGuestAutoSizeState() {
+void BrowserPluginImpl::UpdateGuestAutoSizeState() {
   // If we haven't yet heard back from the guest about the last resize request,
   // then we don't issue another request until we do in
-  // BrowserPlugin::UpdateRect.
+  // BrowserPluginImpl::UpdateRect.
   if (!navigate_src_sent_ || !resize_ack_received_)
     return;
   BrowserPluginHostMsg_AutoSize_Params auto_size_params;
   BrowserPluginHostMsg_ResizeGuest_Params resize_guest_params;
   GetDamageBufferWithSizeParams(&auto_size_params, &resize_guest_params);
   resize_ack_received_ = false;
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_SetAutoSize(
+  Send(new BrowserPluginHostMsg_SetAutoSize(
       render_view_routing_id_,
       instance_id_,
       auto_size_params,
       resize_guest_params));
 }
 
-void BrowserPlugin::SizeChangedDueToAutoSize(const gfx::Size& old_view_size) {
+void BrowserPluginImpl::SizeChangedDueToAutoSize(
+    const gfx::Size& old_view_size) {
   size_changed_in_flight_ = false;
 
   std::map<std::string, base::Value*> props;
   props[kOldHeight] = base::Value::CreateIntegerValue(old_view_size.height());
   props[kOldWidth] = base::Value::CreateIntegerValue(old_view_size.width());
   props[kNewHeight] = base::Value::CreateIntegerValue(last_view_size_.height());
   props[kNewWidth] = base::Value::CreateIntegerValue(last_view_size_.width());
   TriggerEvent(kEventSizeChanged, &props);
 }
 
 // static
-bool BrowserPlugin::UsesDamageBuffer(
+bool BrowserPluginImpl::UsesDamageBuffer(
     const BrowserPluginMsg_UpdateRect_Params& params) {
   return params.damage_buffer_sequence_id != 0;
 }
 
-bool BrowserPlugin::UsesPendingDamageBuffer(
+bool BrowserPluginImpl::UsesPendingDamageBuffer(
     const BrowserPluginMsg_UpdateRect_Params& params) {
   if (!pending_damage_buffer_.get())
     return false;
   return damage_buffer_sequence_id_ == params.damage_buffer_sequence_id;
 }
 
-void BrowserPlugin::OnAdvanceFocus(int instance_id, bool reverse) {
+void BrowserPluginImpl::OnAdvanceFocus(int instance_id, bool reverse) {
   DCHECK(render_view_);
   render_view_->GetWebView()->advanceFocus(reverse);
 }
 
-void BrowserPlugin::OnGuestContentWindowReady(int instance_id,
-                                            int content_window_routing_id) {
+void BrowserPluginImpl::OnGuestContentWindowReady(
+    int instance_id,
+    int content_window_routing_id) {
   DCHECK(content_window_routing_id != MSG_ROUTING_NONE);
   content_window_routing_id_ = content_window_routing_id;
 }
 
-void BrowserPlugin::OnGuestGone(int instance_id, int process_id, int status) {
+void BrowserPluginImpl::OnGuestGone(int instance_id,
+                                    int process_id,
+                                    int status) {
   // We fire the event listeners before painting the sad graphic to give the
   // developer an opportunity to display an alternative overlay image on crash.
   std::string termination_status = TerminationStatusToString(
       static_cast<base::TerminationStatus>(status));
   std::map<std::string, base::Value*> props;
   props[kProcessId] = base::Value::CreateIntegerValue(process_id);
   props[kReason] = base::Value::CreateStringValue(termination_status);
 
   // Event listeners may remove the BrowserPlugin from the document. If that
   // happens, the BrowserPlugin will be scheduled for later deletion (see
-  // BrowserPlugin::destroy()). That will clear the container_ reference,
+  // BrowserPluginImpl::destroy()). That will clear the container_ reference,
   // but leave other member variables valid below.
   TriggerEvent(kEventExit, &props);
 
   guest_crashed_ = true;
   // We won't paint the contents of the current backing store again so we might
   // as well toss it out and save memory.
   backing_store_.reset();
   // If the BrowserPlugin is scheduled to be deleted, then container_ will be
   // NULL so we shouldn't attempt to access it.
   if (container_)
     container_->invalidate();
 }
 
-void BrowserPlugin::OnGuestResponsive(int instance_id, int process_id) {
+void BrowserPluginImpl::OnGuestResponsive(int instance_id, int process_id) {
   std::map<std::string, base::Value*> props;
   props[kProcessId] = base::Value::CreateIntegerValue(process_id);
   TriggerEvent(kEventResponsive, &props);
 }
 
-void BrowserPlugin::OnGuestUnresponsive(int instance_id, int process_id) {
+void BrowserPluginImpl::OnGuestUnresponsive(int instance_id, int process_id) {
   std::map<std::string, base::Value*> props;
   props[kProcessId] = base::Value::CreateIntegerValue(process_id);
   TriggerEvent(kEventUnresponsive, &props);
 }
 
-void BrowserPlugin::OnLoadAbort(int instance_id,
-                                const GURL& url,
-                                bool is_top_level,
-                                const std::string& type) {
+void BrowserPluginImpl::OnLoadAbort(int instance_id,
+                                    const GURL& url,
+                                    bool is_top_level,
+                                    const std::string& type) {
   std::map<std::string, base::Value*> props;
   props[kURL] = base::Value::CreateStringValue(url.spec());
   props[kIsTopLevel] = base::Value::CreateBooleanValue(is_top_level);
   props[kReason] = base::Value::CreateStringValue(type);
   TriggerEvent(kEventLoadAbort, &props);
 }
 
-void BrowserPlugin::OnLoadCommit(
+void BrowserPluginImpl::OnLoadCommit(
     int instance_id,
     const BrowserPluginMsg_LoadCommit_Params& params) {
   // If the guest has just committed a new navigation then it is no longer
   // crashed.
   guest_crashed_ = false;
   if (params.is_top_level) {
     src_ = params.url.spec();
     UpdateDOMAttribute(kSrc, src_.c_str());
   }
   process_id_ = params.process_id;
   current_nav_entry_index_ = params.current_entry_index;
   nav_entry_count_ = params.entry_count;
 
   std::map<std::string, base::Value*> props;
   props[kURL] = base::Value::CreateStringValue(params.url.spec());
   props[kIsTopLevel] = base::Value::CreateBooleanValue(params.is_top_level);
   TriggerEvent(kEventLoadCommit, &props);
 }
 
-void BrowserPlugin::OnLoadRedirect(int instance_id,
-                                   const GURL& old_url,
-                                   const GURL& new_url,
-                                   bool is_top_level) {
+void BrowserPluginImpl::OnLoadRedirect(int instance_id,
+                                       const GURL& old_url,
+                                       const GURL& new_url,
+                                       bool is_top_level) {
   std::map<std::string, base::Value*> props;
   props[kOldURL] = base::Value::CreateStringValue(old_url.spec());
   props[kNewURL] = base::Value::CreateStringValue(new_url.spec());
   props[kIsTopLevel] = base::Value::CreateBooleanValue(is_top_level);
   TriggerEvent(kEventLoadRedirect, &props);
 }
 
-void BrowserPlugin::OnLoadStart(int instance_id,
-                                const GURL& url,
-                                bool is_top_level) {
+void BrowserPluginImpl::OnLoadStart(int instance_id,
+                                    const GURL& url,
+                                    bool is_top_level) {
   std::map<std::string, base::Value*> props;
   props[kURL] = base::Value::CreateStringValue(url.spec());
   props[kIsTopLevel] = base::Value::CreateBooleanValue(is_top_level);
 
   TriggerEvent(kEventLoadStart, &props);
 }
 
-void BrowserPlugin::OnLoadStop(int instance_id) {
+void BrowserPluginImpl::OnLoadStop(int instance_id) {
   TriggerEvent(kEventLoadStop, NULL);
 }
 
-void BrowserPlugin::OnSetCursor(int instance_id, const WebCursor& cursor) {
+void BrowserPluginImpl::OnSetCursor(int instance_id, const WebCursor& cursor) {
   cursor_ = cursor;
 }
 
-void BrowserPlugin::OnShouldAcceptTouchEvents(int instance_id, bool accept) {
+void BrowserPluginImpl::OnShouldAcceptTouchEvents(int instance_id,
+                                                  bool accept) {
   if (container()) {
     container()->requestTouchEventType(accept ?
         WebKit::WebPluginContainer::TouchEventRequestTypeRaw :
         WebKit::WebPluginContainer::TouchEventRequestTypeNone);
   }
 }
 
-void BrowserPlugin::OnUpdateRect(
+void BrowserPluginImpl::OnUpdateRect(
     int instance_id,
     const BrowserPluginMsg_UpdateRect_Params& params) {
   bool use_new_damage_buffer = !backing_store_;
   BrowserPluginHostMsg_AutoSize_Params auto_size_params;
   BrowserPluginHostMsg_ResizeGuest_Params resize_guest_params;
   // If we have a pending damage buffer, and the guest has begun to use the
   // damage buffer then we know the guest will no longer use the current
   // damage buffer. At this point, we drop the current damage buffer, and
   // mark the pending damage buffer as the current damage buffer.
   if (UsesPendingDamageBuffer(params)) {
@@ skipping 12 matching lines @@
       // The guest has not yet responded to the last resize request, and
       // so we don't want to do anything at this point other than ACK the guest.
       PopulateAutoSizeParameters(&auto_size_params);
     } else {
       // If we have no pending damage buffer, then the guest has not caught up
       // with the BrowserPlugin container. We now tell the guest about the new
       // container size.
       GetDamageBufferWithSizeParams(&auto_size_params,
                                     &resize_guest_params);
     }
-    browser_plugin_manager()->Send(new BrowserPluginHostMsg_UpdateRect_ACK(
+    Send(new BrowserPluginHostMsg_UpdateRect_ACK(
         render_view_routing_id_,
         instance_id_,
         auto_size_params,
         resize_guest_params));
     return;
   }
 
   if (auto_size_ && (params.view_size != last_view_size_)) {
     if (backing_store_)
       backing_store_->Clear(SK_ColorWHITE);
     gfx::Size old_view_size = last_view_size_;
     last_view_size_ = params.view_size;
     // Schedule a SizeChanged instead of calling it directly to ensure that
     // the backing store has been updated before the developer attempts to
     // resize to avoid flicker. |size_changed_in_flight_| acts as a form of
     // flow control for SizeChanged events. If the guest's view size is changing
     // rapidly before a SizeChanged event fires, then we avoid scheduling
     // another SizeChanged event. SizeChanged reads the new size from
     // |last_view_size_| so we can be sure that it always fires an event
     // with the last seen view size.
     if (container_ && !size_changed_in_flight_) {
       size_changed_in_flight_ = true;
       MessageLoop::current()->PostTask(
           FROM_HERE,
-          base::Bind(&BrowserPlugin::SizeChangedDueToAutoSize,
+          base::Bind(&BrowserPluginImpl::SizeChangedDueToAutoSize,
                      base::Unretained(this),
                      old_view_size));
     }
   }
 
   // No more work to do since the guest is no longer using a damage buffer.
   if (!UsesDamageBuffer(params))
     return;
 
   // If we are seeing damage buffers, HW compositing should be turned off.
@@ skipping 21 matching lines @@
     backing_store_->PaintToBackingStore(params.bitmap_rect,
                                         params.copy_rects,
                                         current_damage_buffer_->memory());
   }
   // Invalidate the container.
   // If the BrowserPlugin is scheduled to be deleted, then container_ will be
   // NULL so we shouldn't attempt to access it.
   if (container_)
     container_->invalidate();
   PopulateAutoSizeParameters(&auto_size_params);
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_UpdateRect_ACK(
+  Send(new BrowserPluginHostMsg_UpdateRect_ACK(
       render_view_routing_id_,
       instance_id_,
       auto_size_params,
       resize_guest_params));
 }
 
-void BrowserPlugin::SetMaxHeightAttribute(int max_height) {
+void BrowserPluginImpl::SetMaxHeightAttribute(int max_height) {
   if (max_height_ == max_height)
     return;
   max_height_ = max_height;
   if (!auto_size_)
     return;
   UpdateGuestAutoSizeState();
 }
 
-void BrowserPlugin::SetMaxWidthAttribute(int max_width) {
+void BrowserPluginImpl::SetMaxWidthAttribute(int max_width) {
   if (max_width_ == max_width)
     return;
   max_width_ = max_width;
   if (!auto_size_)
     return;
   UpdateGuestAutoSizeState();
 }
 
-void BrowserPlugin::SetMinHeightAttribute(int min_height) {
+void BrowserPluginImpl::SetMinHeightAttribute(int min_height) {
   if (min_height_ == min_height)
     return;
   min_height_ = min_height;
   if (!auto_size_)
      return;
   UpdateGuestAutoSizeState();
 }
 
-void BrowserPlugin::SetMinWidthAttribute(int min_width) {
+void BrowserPluginImpl::SetMinWidthAttribute(int min_width) {
   if (min_width_ == min_width)
     return;
   min_width_ = min_width;
   if (!auto_size_)
      return;
   UpdateGuestAutoSizeState();
 }
 
-bool BrowserPlugin::InAutoSizeBounds(const gfx::Size& size) const {
+bool BrowserPluginImpl::InAutoSizeBounds(const gfx::Size& size) const {
   return size.width() <= max_width_ && size.height() <= max_height_;
 }
 
-NPObject* BrowserPlugin::GetContentWindow() const {
+NPObject* BrowserPluginImpl::GetContentWindow() const {
   if (content_window_routing_id_ == MSG_ROUTING_NONE)
     return NULL;
   RenderViewImpl* guest_render_view = static_cast<RenderViewImpl*>(
       ChildThread::current()->ResolveRoute(content_window_routing_id_));
   if (!guest_render_view)
     return NULL;
   WebKit::WebFrame* guest_frame = guest_render_view->GetWebView()->mainFrame();
   return guest_frame->windowObject();
 }
 
-std::string BrowserPlugin::GetPartitionAttribute() const {
+std::string BrowserPluginImpl::GetPartitionAttribute() const {
   std::string value;
   if (persist_storage_)
     value.append(kPersistPrefix);
 
   value.append(storage_partition_id_);
   return value;
 }
 
-bool BrowserPlugin::CanGoBack() const {
+bool BrowserPluginImpl::CanGoBack() const {
   return nav_entry_count_ > 1 && current_nav_entry_index_ > 0;
 }
 
-bool BrowserPlugin::CanGoForward() const {
+bool BrowserPluginImpl::CanGoForward() const {
   return current_nav_entry_index_ >= 0 &&
       current_nav_entry_index_ < (nav_entry_count_ - 1);
 }
 
-bool BrowserPlugin::SetPartitionAttribute(const std::string& partition_id,
-                                          std::string* error_message) {
+bool BrowserPluginImpl::SetPartitionAttribute(const std::string& partition_id,
+                                              std::string* error_message) {
   if (navigate_src_sent_) {
     *error_message = kErrorAlreadyNavigated;
     return false;
   }
 
   std::string input = partition_id;
 
   // Since the "persist:" prefix is in ASCII, StartsWith will work fine on
   // UTF-8 encoded |partition_id|. If the prefix is a match, we can safely
   // remove the prefix without splicing in the middle of a multi-byte codepoint.
@@ skipping 11 matching lines @@
     persist_storage_ = true;
   } else {
     persist_storage_ = false;
   }
 
   valid_partition_id_ = true;
   storage_partition_id_ = input;
   return true;
 }
 
-void BrowserPlugin::ParseAttributes(const WebKit::WebPluginParams& params) {
+void BrowserPluginImpl::ParseAttributes(const WebKit::WebPluginParams& params) {
   std::string src;
 
   // Get the src attribute from the attributes vector
   for (unsigned i = 0; i < params.attributeNames.size(); ++i) {
     std::string attributeName = params.attributeNames[i].utf8();
     if (LowerCaseEqualsASCII(attributeName, kSrc)) {
       src = params.attributeValues[i].utf8();
     } else if (LowerCaseEqualsASCII(attributeName, kPartition)) {
       std::string error;
       SetPartitionAttribute(params.attributeValues[i].utf8(), &error);
     }
   }
 
   // Set the 'src' attribute last, as it will set the has_navigated_ flag to
   // true, which prevents changing the 'partition' attribute.
   std::string error;
   SetSrcAttribute(src, &error);
 }
 
-float BrowserPlugin::GetDeviceScaleFactor() const {
+float BrowserPluginImpl::GetDeviceScaleFactor() const {
   if (!render_view_)
     return 1.0f;
   return render_view_->GetWebView()->deviceScaleFactor();
 }
 
-void BrowserPlugin::TriggerEvent(const std::string& event_name,
-                                 std::map<std::string, base::Value*>* props) {
+void BrowserPluginImpl::TriggerEvent(
+    const std::string& event_name,
+    std::map<std::string, base::Value*>* props) {
   if (!container() || !container()->element().document().frame())
     return;
   v8::HandleScope handle_scope;
   std::string json_string;
   if (props) {
     base::DictionaryValue dict;
     for (std::map<std::string, base::Value*>::iterator iter = props->begin(),
              end = props->end(); iter != end; ++iter) {
       dict.Set(iter->first, iter->second);
     }
@@ skipping 14 matching lines @@
   std::string internal_name = base::StringPrintf("-internal-%s",
                                                  event_name.c_str());
   event.initCustomEvent(
       WebKit::WebString::fromUTF8(internal_name.c_str()),
       false, false,
       WebKit::WebSerializedScriptValue::serialize(
           v8::String::New(json_string.c_str(), json_string.size())));
   container()->element().dispatchEvent(event);
 }
 
-void BrowserPlugin::Back() {
+void BrowserPluginImpl::Back() {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_Go(render_view_routing_id_,
-                                  instance_id_, -1));
+  Send(new BrowserPluginHostMsg_Go(render_view_routing_id_,
+                                   instance_id_, -1));
 }
 
-void BrowserPlugin::Forward() {
+void BrowserPluginImpl::Forward() {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_Go(render_view_routing_id_,
-                                  instance_id_, 1));
+  Send(new BrowserPluginHostMsg_Go(render_view_routing_id_,
+                                   instance_id_, 1));
 }
 
-void BrowserPlugin::Go(int relative_index) {
+void BrowserPluginImpl::Go(int relative_index) {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_Go(render_view_routing_id_,
-                                  instance_id_,
-                                  relative_index));
+  Send(new BrowserPluginHostMsg_Go(render_view_routing_id_,
+                                   instance_id_,
+                                   relative_index));
 }
 
-void BrowserPlugin::TerminateGuest() {
+void BrowserPluginImpl::TerminateGuest() {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_TerminateGuest(render_view_routing_id_,
-                                              instance_id_));
+  Send(new BrowserPluginHostMsg_TerminateGuest(render_view_routing_id_,
+                                               instance_id_));
 }
 
-void BrowserPlugin::Stop() {
+void BrowserPluginImpl::Stop() {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_Stop(render_view_routing_id_,
-                                    instance_id_));
+  Send(new BrowserPluginHostMsg_Stop(render_view_routing_id_,
+                                     instance_id_));
 }
 
-void BrowserPlugin::Reload() {
+void BrowserPluginImpl::Reload() {
   if (!navigate_src_sent_)
     return;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_Reload(render_view_routing_id_,
-                                      instance_id_));
+  Send(new BrowserPluginHostMsg_Reload(render_view_routing_id_,
+                                       instance_id_));
 }
 
-void BrowserPlugin::SetEmbedderFocus(bool focused) {
+void BrowserPluginImpl::SetEmbedderFocus(bool focused) {
   if (embedder_focused_ == focused)
     return;
 
   bool old_guest_focus_state = ShouldGuestBeFocused();
   embedder_focused_ = focused;
 
   if (ShouldGuestBeFocused() != old_guest_focus_state)
     UpdateGuestFocusState();
 }
 
-void BrowserPlugin::UpdateGuestFocusState() {
+void BrowserPluginImpl::UpdateGuestFocusState() {
   if (!navigate_src_sent_)
     return;
   bool should_be_focused = ShouldGuestBeFocused();
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_SetFocus(
+  Send(new BrowserPluginHostMsg_SetFocus(
       render_view_routing_id_,
       instance_id_,
       should_be_focused));
 }
 
-bool BrowserPlugin::ShouldGuestBeFocused() const {
+bool BrowserPluginImpl::ShouldGuestBeFocused() const {
   return plugin_focused_ && embedder_focused_;
 }
 
-WebKit::WebPluginContainer* BrowserPlugin::container() const {
+WebKit::WebPluginContainer* BrowserPluginImpl::container() const {
   return container_;
 }
 
-bool BrowserPlugin::initialize(WebPluginContainer* container) {
+bool BrowserPluginImpl::initialize(WebPluginContainer* container) {
   container_ = container;
   container_->setWantsWheelEvents(true);
   return true;
 }
 
-void BrowserPlugin::EnableCompositing(bool enable) {
+void BrowserPluginImpl::EnableCompositing(bool enable) {
   if (enable) {
     LOG(ERROR) << "BrowserPlugin compositing not yet implemented.";
     return;
   }
 
   compositing_enabled_ = enable;
 }
 
-void BrowserPlugin::destroy() {
+void BrowserPluginImpl::destroy() {
   // The BrowserPlugin's WebPluginContainer is deleted immediately after this
   // call returns, so let's not keep a reference to it around.
   container_ = NULL;
+  FOR_EACH_OBSERVER(BrowserPluginObserver, observers_, BrowserPluginGone());
+  FOR_EACH_OBSERVER(BrowserPluginObserver, observers_, OnDestruct());
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
-NPObject* BrowserPlugin::scriptableObject() {
+NPObject* BrowserPluginImpl::scriptableObject() {
   NPObject* browser_plugin_np_object(bindings_->np_object());
   // The object is expected to be retained before it is returned.
   WebKit::WebBindings::retainObject(browser_plugin_np_object);
   return browser_plugin_np_object;
 }
 
-bool BrowserPlugin::supportsKeyboardFocus() const {
+bool BrowserPluginImpl::supportsKeyboardFocus() const {
   return true;
 }
 
-bool BrowserPlugin::canProcessDrag() const {
+bool BrowserPluginImpl::canProcessDrag() const {
   return true;
 }
 
-void BrowserPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
+void BrowserPluginImpl::paint(WebCanvas* canvas, const WebRect& rect) {
   if (guest_crashed_) {
     if (!sad_guest_)  // Lazily initialize bitmap.
-      sad_guest_ = content::GetContentClient()->renderer()->
-          GetSadWebViewBitmap();
+      sad_guest_ = GetContentClient()->renderer()->GetSadWebViewBitmap();
     // content_shell does not have the sad plugin bitmap, so we'll paint black
     // instead to make it clear that something went wrong.
     if (sad_guest_) {
       webkit::PaintSadPlugin(canvas, plugin_rect_, *sad_guest_);
       return;
     }
   }
   SkAutoCanvasRestore auto_restore(canvas, true);
   canvas->translate(plugin_rect_.x(), plugin_rect_.y());
   SkRect image_data_rect = SkRect::MakeXYWH(
@@ skipping 10 matching lines @@
   canvas->drawRect(image_data_rect, paint);
   // Stay a solid color if we have never set a non-empty src, or we don't have a
   // backing store.
   if (!backing_store_.get() || !navigate_src_sent_)
     return;
   float inverse_scale_factor =  1.0f / backing_store_->GetScaleFactor();
   canvas->scale(inverse_scale_factor, inverse_scale_factor);
   canvas->drawBitmap(backing_store_->GetBitmap(), 0, 0);
 }
 
-bool BrowserPlugin::InBounds(const gfx::Point& position) const {
+bool BrowserPluginImpl::InBounds(const gfx::Point& position) const {
   // Note that even for plugins that are rotated using rotate transformations,
   // we use the the |plugin_rect_| provided by updateGeometry, which means we
   // will be off if |position| is within the plugin rect but does not fall
   // within the actual plugin boundary. Not supporting such edge case is OK
   // since this function should not be used for making security-sensitive
   // decisions.
   // This also does not take overlapping plugins into account.
   bool result = position.x() >= plugin_rect_.x() &&
       position.x() < plugin_rect_.x() + plugin_rect_.width() &&
       position.y() >= plugin_rect_.y() &&
       position.y() < plugin_rect_.y() + plugin_rect_.height();
   return result;
 }
 
-gfx::Point BrowserPlugin::ToLocalCoordinates(const gfx::Point& point) const {
+void BrowserPluginImpl::AddMethodBinding(
+    BrowserPluginMethodBinding* method_binding) {
+  bindings_->AddMethodBinding(method_binding);
+}
+
+void BrowserPluginImpl::AddPropertyBinding(
+    BrowserPluginPropertyBinding* method_binding) {
+  bindings_->AddPropertyBinding(method_binding);
+}
+
+bool BrowserPluginImpl::Send(IPC::Message* message) {
+  return browser_plugin_manager()->Send(message);
+}
+
+void BrowserPluginImpl::RequestMessage(uint32 message_id) {
+  browser_plugin_manager()->RequestMessage(message_id);
+}
+
+gfx::Point BrowserPluginImpl::ToLocalCoordinates(
+    const gfx::Point& point) const {
   if (container_)
     return container_->windowToLocalPoint(WebKit::WebPoint(point));
   return gfx::Point(point.x() - plugin_rect_.x(), point.y() - plugin_rect_.y());
 }
 
-void BrowserPlugin::updateGeometry(
+void BrowserPluginImpl::updateGeometry(
     const WebRect& window_rect,
     const WebRect& clip_rect,
     const WebVector<WebRect>& cut_outs_rects,
     bool is_visible) {
   int old_width = width();
   int old_height = height();
   plugin_rect_ = window_rect;
   // In AutoSize mode, guests don't care when the BrowserPlugin container is
   // resized. If |!resize_ack_received_|, then we are still waiting on a
   // previous resize to be ACK'ed and so we don't issue additional resizes
   // until the previous one is ACK'ed.
   if (!navigate_src_sent_ || auto_size_ || !resize_ack_received_ ||
       (old_width == window_rect.width &&
        old_height == window_rect.height)) {
     return;
   }
 
   BrowserPluginHostMsg_ResizeGuest_Params params;
   PopulateResizeGuestParameters(&params, gfx::Size(width(), height()));
   resize_ack_received_ = false;
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_ResizeGuest(
+  Send(new BrowserPluginHostMsg_ResizeGuest(
       render_view_routing_id_,
       instance_id_,
       params));
 }
 
-void BrowserPlugin::SwapDamageBuffers() {
+void BrowserPluginImpl::SwapDamageBuffers() {
   current_damage_buffer_.reset(pending_damage_buffer_.release());
   resize_ack_received_ = true;
 }
 
-void BrowserPlugin::PopulateResizeGuestParameters(
+void BrowserPluginImpl::PopulateResizeGuestParameters(
     BrowserPluginHostMsg_ResizeGuest_Params* params,
     const gfx::Size& view_size) {
   params->view_size = view_size;
   params->scale_factor = GetDeviceScaleFactor();
 
   // In HW compositing mode, we do not need a damage buffer.
   if (compositing_enabled_)
     return;
 
   const size_t stride = skia::PlatformCanvasStrideForWidth(view_size.width());
   // Make sure the size of the damage buffer is at least four bytes so that we
   // can fit in a magic word to verify that the memory is shared correctly.
   size_t size =
       std::max(sizeof(unsigned int),
                static_cast<size_t>(view_size.height() *
                                    stride *
                                    GetDeviceScaleFactor() *
                                    GetDeviceScaleFactor()));
 
   params->damage_buffer_size = size;
   pending_damage_buffer_.reset(
       CreateDamageBuffer(size, &params->damage_buffer_handle));
   if (!pending_damage_buffer_.get())
     NOTREACHED();
   params->damage_buffer_sequence_id = ++damage_buffer_sequence_id_;
 }
 
-void BrowserPlugin::GetDamageBufferWithSizeParams(
+void BrowserPluginImpl::GetDamageBufferWithSizeParams(
     BrowserPluginHostMsg_AutoSize_Params* auto_size_params,
     BrowserPluginHostMsg_ResizeGuest_Params* resize_guest_params) {
   PopulateAutoSizeParameters(auto_size_params);
   gfx::Size view_size = auto_size_params->enable ? auto_size_params->max_size :
       gfx::Size(width(), height());
   if (view_size.IsEmpty())
     return;
   resize_ack_received_ = false;
   PopulateResizeGuestParameters(resize_guest_params, view_size);
 }
 
 #if defined(OS_POSIX)
-base::SharedMemory* BrowserPlugin::CreateDamageBuffer(
+base::SharedMemory* BrowserPluginImpl::CreateDamageBuffer(
     const size_t size,
     base::SharedMemoryHandle* damage_buffer_handle) {
   scoped_ptr<base::SharedMemory> shared_buf(
       content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(
           size).release());
 
   if (shared_buf.get()) {
     if (shared_buf->Map(size)) {
       // Insert the magic word.
       *static_cast<unsigned int*>(shared_buf->memory()) = 0xdeadbeef;
       shared_buf->ShareToProcess(base::GetCurrentProcessHandle(),
                                  damage_buffer_handle);
       return shared_buf.release();
     }
   }
   NOTREACHED();
   return NULL;
 }
 #elif defined(OS_WIN)
 base::SharedMemory* BrowserPlugin::CreateDamageBuffer(
     const size_t size,
     base::SharedMemoryHandle* damage_buffer_handle) {
   scoped_ptr<base::SharedMemory> shared_buf(new base::SharedMemory());
 
   if (!shared_buf->CreateAndMapAnonymous(size)) {
     NOTREACHED() << "Buffer allocation failed";
     return NULL;
   }
-
   // Insert the magic word.
   *static_cast<unsigned int*>(shared_buf->memory()) = 0xdeadbeef;
   if (shared_buf->ShareToProcess(base::GetCurrentProcessHandle(),
                                  damage_buffer_handle))
     return shared_buf.release();
   NOTREACHED();
   return NULL;
 }
 #endif
 
-void BrowserPlugin::updateFocus(bool focused) {
+void BrowserPluginImpl::updateFocus(bool focused) {
   if (plugin_focused_ == focused)
     return;
 
   bool old_guest_focus_state = ShouldGuestBeFocused();
   plugin_focused_ = focused;
 
   if (ShouldGuestBeFocused() != old_guest_focus_state)
     UpdateGuestFocusState();
 }
 
-void BrowserPlugin::updateVisibility(bool visible) {
+void BrowserPluginImpl::updateVisibility(bool visible) {
   if (visible_ == visible)
     return;
 
   visible_ = visible;
   if (!navigate_src_sent_)
     return;
 
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_SetVisibility(
+  Send(new BrowserPluginHostMsg_SetVisibility(
       render_view_routing_id_,
       instance_id_,
       visible));
 }
 
-bool BrowserPlugin::acceptsInputEvents() {
+bool BrowserPluginImpl::acceptsInputEvents() {
   return true;
 }
 
-bool BrowserPlugin::handleInputEvent(const WebKit::WebInputEvent& event,
-                                     WebKit::WebCursorInfo& cursor_info) {
+bool BrowserPluginImpl::handleInputEvent(const WebKit::WebInputEvent& event,
+                                         WebKit::WebCursorInfo& cursor_info) {
   if (guest_crashed_ || !navigate_src_sent_ ||
       event.type == WebKit::WebInputEvent::ContextMenu)
     return false;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
-                                                instance_id_,
-                                                plugin_rect_,
-                                                &event));
+  Send(new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
+                                                 instance_id_,
+                                                 plugin_rect_,
+                                                 &event));
   cursor_.GetCursorInfo(&cursor_info);
   return true;
 }
 
-bool BrowserPlugin::handleDragStatusUpdate(WebKit::WebDragStatus drag_status,
-                                           const WebKit::WebDragData& drag_data,
-                                           WebKit::WebDragOperationsMask mask,
-                                           const WebKit::WebPoint& position,
-                                           const WebKit::WebPoint& screen) {
+bool BrowserPluginImpl::handleDragStatusUpdate(
+    WebKit::WebDragStatus drag_status,
+    const WebKit::WebDragData& drag_data,
+    WebKit::WebDragOperationsMask mask,
+    const WebKit::WebPoint& position,
+    const WebKit::WebPoint& screen) {
   if (guest_crashed_ || !navigate_src_sent_)
     return false;
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_DragStatusUpdate(
-        render_view_routing_id_,
-        instance_id_,
-        drag_status,
-        WebDropData(drag_data),
-        mask,
-        position));
+  Send(new BrowserPluginHostMsg_DragStatusUpdate(
+      render_view_routing_id_,
+      instance_id_,
+      drag_status,
+      WebDropData(drag_data),
+      mask,
+      position));
   return false;
 }
 
-void BrowserPlugin::didReceiveResponse(
+void BrowserPluginImpl::didReceiveResponse(
     const WebKit::WebURLResponse& response) {
 }
 
-void BrowserPlugin::didReceiveData(const char* data, int data_length) {
+void BrowserPluginImpl::didReceiveData(const char* data, int data_length) {
 }
 
-void BrowserPlugin::didFinishLoading() {
+void BrowserPluginImpl::didFinishLoading() {
 }
 
-void BrowserPlugin::didFailLoading(const WebKit::WebURLError& error) {
+void BrowserPluginImpl::didFailLoading(const WebKit::WebURLError& error) {
 }
 
-void BrowserPlugin::didFinishLoadingFrameRequest(const WebKit::WebURL& url,
-                                                 void* notify_data) {
+void BrowserPluginImpl::didFinishLoadingFrameRequest(const WebKit::WebURL& url,
+                                                     void* notify_data) {
 }
 
-void BrowserPlugin::didFailLoadingFrameRequest(
+void BrowserPluginImpl::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content