<browser>: Always read <browser>.src attribute from <object>.src.

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/message_loop.h"
 #include "base/string_util.h"
 #if defined (OS_WIN)
 #include "base/sys_info.h"
@@ skipping 82 matching lines @@
 void BrowserPlugin::Cleanup() {
   if (damage_buffer_)
     FreeDamageBuffer();
 }
 
 std::string BrowserPlugin::GetSrcAttribute() const {
   return src_;
 }
 
 void BrowserPlugin::SetSrcAttribute(const std::string& src) {
-  if (src == src_ && !guest_crashed_)
+  if (src.empty() || (src == src_ && !guest_crashed_))
     return;
 
-  // If we haven't created the guest yet, do so now, if |src| is not empty and
-  // 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_ && !src.empty()) {
+  // If we haven't created the guest yet, do so now, we will navigate it right

[Charlie Reis, 2012/10/15 18:57:28]

nit: Start a new sentence at "we will".

[lazyboy, 2012/10/15 20:45:57]

Done.

+  // after creation. If |src| is empty, we can delay the creation until we
+  // acutally need it.
+  if (!navigate_src_sent_) {
     BrowserPluginManager::Get()->Send(
         new BrowserPluginHostMsg_CreateGuest(
             render_view_->GetRoutingID(),
             instance_id_,
             storage_partition_id_,
             persist_storage_));
   }
 
-  if (navigate_src_sent_ || !src.empty()) {
-    scoped_ptr<BrowserPluginHostMsg_ResizeGuest_Params> params(
-        GetPendingResizeParams());
-    DCHECK(!params->resize_pending);
+  scoped_ptr<BrowserPluginHostMsg_ResizeGuest_Params> params(
+      GetPendingResizeParams());
+  DCHECK(!params->resize_pending);
 
-    BrowserPluginManager::Get()->Send(
-        new BrowserPluginHostMsg_NavigateGuest(
-            render_view_->GetRoutingID(),
-            instance_id_,
-            src,
-            *params));
-    // Record that we sent a NavigateGuest message to embedder. Once we send
-    // such a message, subsequent SetSrcAttribute() calls must always send
-    // NavigateGuest messages to the embedder (even if |src| is empty), so
-    // resize works correctly for all cases (e.g. The embedder can reset the
-    // guest's |src| to empty value, resize and then set the |src| to a
-    // non-empty value).
-    // Additionally, once this instance has navigated, the storage partition
-    // cannot be changed, so this value is used for enforcing this.
-    navigate_src_sent_ = true;
-  }
+  BrowserPluginManager::Get()->Send(
+      new BrowserPluginHostMsg_NavigateGuest(
+          render_view_->GetRoutingID(),
+          instance_id_,
+          src,
+          *params));
+  // 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;
   guest_crashed_ = false;
 }
 
 std::string BrowserPlugin::GetPartitionAttribute() const {
   std::string value;
   if (persist_storage_)
     value.append(kPersistPrefix);
 
   value.append(storage_partition_id_);
@@ skipping 41 matching lines @@
     if (LowerCaseEqualsASCII(attributeName, kSrcAttribute)) {
       src = params.attributeValues[i].utf8();
     } else if (LowerCaseEqualsASCII(attributeName, kPartitionAttribute)) {
       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.
-  if (!src.empty())
-    SetSrcAttribute(src);
+  SetSrcAttribute(src);
 }
 
 float BrowserPlugin::GetDeviceScaleFactor() const {
   if (!render_view_)
     return 1.0f;
   return render_view_->GetWebView()->deviceScaleFactor();
 }
 
 void BrowserPlugin::RemoveEventListeners() {
   EventListenerMap::iterator event_listener_map_iter =
@@ skipping 545 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content