Browser Plugin: Make sure name attribute is propagated to guest if it's set prior to initializing p…

content/renderer/browser_plugin/browser_plugin.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 "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 73 matching lines @@
   switch (status) {
     case base::TERMINATION_STATUS_NORMAL_TERMINATION:
       return "normal";
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
       return "abnormal";
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
       return "killed";
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
       return "crashed";
     default:
-      // This should never happen.
-      DCHECK(false);
+      NOTREACHED() << "Unknown Termination Status.";
       return "unknown";
   }
 }
+
+static std::string GetInternalEventName(const char* event_name) {
+  return base::StringPrintf("-internal-%s", event_name);
+}
 }
 
 BrowserPlugin::BrowserPlugin(
     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()),
@@ skipping 533 matching lines @@
   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);
+    } else if (LowerCaseEqualsASCII(attributeName, kName)) {
+      SetNameAttribute(params.attributeValues[i].utf8());

[sadrul, 2013/01/09 18:04:29]

Can this be tested?

[Fady Samuel, 2013/01/09 18:19:37]

Done.

     }
   }
 
   // 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 {
@@ skipping 21 matching lines @@
   }
 
   WebKit::WebFrame* frame = container()->element().document().frame();
   WebKit::WebDOMEvent dom_event = frame->document().createEvent("CustomEvent");
   WebKit::WebDOMCustomEvent event = dom_event.to<WebKit::WebDOMCustomEvent>();
 
   // The events triggered directly from the plugin <object> are internal events
   // whose implementation details can (and likely will) change over time. The
   // wrapper/shim (e.g. <webview> tag) should receive these events, and expose a
   // more appropriate (and stable) event to the consumers as part of the API.
-  std::string internal_name = base::StringPrintf("-internal-%s",
-                                                 event_name.c_str());
   event.initCustomEvent(
-      WebKit::WebString::fromUTF8(internal_name.c_str()),
+      WebKit::WebString::fromUTF8(GetInternalEventName(event_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() {
   if (!navigate_src_sent_)
     return;
   browser_plugin_manager()->Send(
@@ skipping 170 matching lines @@
     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)) {
+      (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(
       render_view_routing_id_,
       instance_id_,
       params));
@@ skipping 163 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content