Browser Plugin: Update DOM Node attributes when properties are updated

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"
 #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/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"
@@ skipping 30 matching lines @@
 // Events.
 const char kEventExit[] = "exit";
 const char kEventLoadAbort[] = "loadabort";
 const char kEventLoadCommit[] = "loadcommit";
 const char kEventLoadRedirect[] = "loadredirect";
 const char kEventLoadStart[] = "loadstart";
 const char kEventLoadStop[] = "loadstop";
 const char kEventSizeChanged[] = "sizechanged";
 
 // Parameters/properties on events.
+const char kAutoSize[] = "autosize";

[lazyboy, 2012/11/30 19:15:06]

I'd group them separately if we have to add them, these are not
"parameters/properties on events", maybe group them under 'attributes' or sth
similar.


One way to avoid these dup attribute names would be to make all SetXXXAttribute
return bool, and in bindings if the func returns true you can UpdateAttribute
from there. e.g:

  BrowserPluginPropertyBindingMaxHeight {
    if (bindings->instance()->SetMaxHeightAttribute(max_height))
      bindings->instance()->SetAttribute(name_, ...);
   }

You wouldn't need these in that case. WDYT?

[Fady Samuel, 2012/11/30 21:56:50]

Added UpdateDOMAttribute as an abstract method of BrowserPluginPropertyBinding. 

 const char kIsTopLevel[] = "isTopLevel";
+const char kMaxHeight[] = "maxHeight";
+const char kMaxWidth[] = "maxWidth";
+const char kMinHeight[] = "minHeight";
+const char kMinWidth[] = "minWidth";
 const char kNewURL[] = "newUrl";
 const char kNewHeight[] = "newHeight";
 const char kNewWidth[] = "newWidth";
 const char kOldURL[] = "oldUrl";
 const char kOldHeight[] = "oldHeight";
 const char kOldWidth[] = "oldWidth";
 const char kPartition[] = "partition";
 const char kPersistPrefix[] = "persist:";
 const char kProcessId[] = "processId";
+const char kReason[] = "reason";
 const char kSrc[] = "src";
-const char kReason[] = "reason";
 const char kURL[] = "url";
 
 // Error messages.
 const char kErrorAlreadyNavigated[] =
     "The object has already navigated, so its partition cannot be changed.";
 const char kErrorInvalidPartition[] =
     "Invalid partition attribute.";
 
 static std::string TerminationStatusToString(base::TerminationStatus status) {
   switch (status) {
@@ skipping 100 matching lines @@
   browser_plugin_manager()->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;
+  UpdateAttribute(kSrc, src_);

[lazyboy, 2012/11/30 19:15:06]

UpdateDOMAttribute maybe? b/c we already call the internal attribute update
functions 'SetXXXAttribute' maybe this will explicitly suggest that it's for DOM
element only.

[Fady Samuel, 2012/11/30 21:56:50]

Done.

   return true;
 }
 
 void BrowserPlugin::SetAutoSizeAttribute(bool auto_size) {
   if (auto_size_ == auto_size)
     return;
   auto_size_ = auto_size;
+  UpdateAttribute(kAutoSize, auto_size_ ? "true" : "false");
   last_view_size_ = plugin_rect_.size();
   UpdateGuestAutoSizeState();
 }
 
 void BrowserPlugin::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
@@ skipping 44 matching lines @@
 #else
 bool BrowserPlugin::DamageBufferMatches(
     const TransportDIB* damage_buffer,
     const TransportDIB::Handle& other_damage_buffer_handle) {
   if (!damage_buffer)
     return false;
   return damage_buffer->handle() == other_damage_buffer_handle;
 }
 #endif
 
+void BrowserPlugin::UpdateAttribute(
+    const std::string& attribute_name,
+    const std::string& attribute_value) {
+  if (container()) {
+    container()->element().setAttribute(
+        WebKit::WebString::fromUTF8(attribute_name),
+        WebKit::WebString::fromUTF8(attribute_value));
+  }
+}
+
 void BrowserPlugin::SetMaxHeightAttribute(int max_height) {
   if (max_height_ == max_height)
     return;
   max_height_ = max_height;
   if (!auto_size_)
     return;
+  UpdateAttribute(kMaxHeight, base::IntToString(max_height));
   UpdateGuestAutoSizeState();
 }
 
 void BrowserPlugin::SetMaxWidthAttribute(int max_width) {
   if (max_width_ == max_width)
     return;
   max_width_ = max_width;
   if (!auto_size_)
     return;
+  UpdateAttribute(kMaxWidth, base::IntToString(max_width_));
   UpdateGuestAutoSizeState();
 }
 
 void BrowserPlugin::SetMinHeightAttribute(int min_height) {
   if (min_height_ == min_height)
     return;
   min_height_ = min_height;
   if (!auto_size_)
      return;
+  UpdateAttribute(kMinHeight, base::IntToString(min_height_));
   UpdateGuestAutoSizeState();
 }
 
 void BrowserPlugin::SetMinWidthAttribute(int min_width) {
   if (min_width_ == min_width)
     return;
   min_width_ = min_width;
   if (!auto_size_)
      return;
+  UpdateAttribute(kMinWidth, base::IntToString(min_width_));
   UpdateGuestAutoSizeState();
 }
 
 bool BrowserPlugin::InAutoSizeBounds(const gfx::Size& size) const {
   return size.width() <= max_width_ && size.height() <= max_height_;
 }
 
 NPObject* BrowserPlugin::GetContentWindow() const {
   if (content_window_routing_id_ == MSG_ROUTING_NONE)
     return NULL;
@@ skipping 46 matching lines @@
       *error_message = kErrorInvalidPartition;
       return false;
     }
     persist_storage_ = true;
   } else {
     persist_storage_ = false;
   }
 
   valid_partition_id_ = true;
   storage_partition_id_ = input;
+  UpdateAttribute(kPartition, storage_partition_id_);
   return true;
 }
 
 void BrowserPlugin::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)) {
@@ skipping 235 matching lines @@
   props[kIsTopLevel] = base::Value::CreateBooleanValue(is_top_level);
 
   TriggerEvent(kEventLoadStart, &props);
 }
 
 void BrowserPlugin::LoadCommit(
     const BrowserPluginMsg_LoadCommit_Params& params) {
   // If the guest has just committed a new navigation then it is no longer
   // crashed.
   guest_crashed_ = false;
-  src_ = params.url.spec();
+  if (params.is_top_level) {

[lazyboy, 2012/11/30 19:15:06]

Yes, please make this fix in a separate CL.

[Fady Samuel, 2012/11/30 21:56:50]

Done.

+    src_ = params.url.spec();
+    UpdateAttribute(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(src_);
   props[kIsTopLevel] = base::Value::CreateBooleanValue(params.is_top_level);
   TriggerEvent(kEventLoadCommit, &props);
 }
 
@@ skipping 350 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content