Browser Plugin: Update DOM Node attributes when properties are updated

content/renderer/browser_plugin/browser_plugin_bindings.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_bindings.h"
 
 #include <cstdlib>
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
@@ skipping 362 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginBindingTerminate);
 };
 
 // BrowserPluginPropertyBinding ------------------------------------------------
 
 class BrowserPluginPropertyBinding {
  public:
   explicit BrowserPluginPropertyBinding(const char name[]) : name_(name) {
   }
   virtual ~BrowserPluginPropertyBinding() {}
+  const std::string& name() const { return name_; }
   bool MatchesName(NPIdentifier name) const {
     return WebBindings::getStringIdentifier(name_.c_str()) == name;
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) = 0;
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) = 0;
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) = 0;

[lazyboy, 2012/11/30 22:11:36]

I'd make this non pure virtual, and remove empty impl in ContentWindowBinding
below.

Also add method comment 'Updates dom attribute value with the current plugin
attribute value', to make it clear that we need to call this *after* setting the
attribute value to plugin.

[Fady Samuel, 2012/11/30 22:57:12]

Done.

  private:
   std::string name_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBinding);
 };
 
 class BrowserPluginPropertyBindingAutoSize
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingAutoSize() :
       BrowserPluginPropertyBinding(kAttributeAutoSize) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
-    bool autosize = bindings->instance()->auto_size_attribute();
-    BOOLEAN_TO_NPVARIANT(autosize, *result);
+    bool auto_size = bindings->instance()->auto_size_attribute();
+    BOOLEAN_TO_NPVARIANT(auto_size, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
-    bool autosize = NPVARIANT_TO_BOOLEAN(*variant);
-    bindings->instance()->SetAutoSizeAttribute(autosize);
+    bool auto_size = NPVARIANT_TO_BOOLEAN(*variant);
+    bindings->instance()->SetAutoSizeAttribute(auto_size);
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    bool auto_size = bindings->instance()->auto_size_attribute();
+    bindings->instance()->UpdateDOMAttribute(
+        name(), auto_size ? "true" : "false");
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingAutoSize);
 };
 
 class BrowserPluginPropertyBindingContentWindow
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingContentWindow() :
       BrowserPluginPropertyBinding(kAttributeContentWindow) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     NPObject* obj = bindings->instance()->GetContentWindow();
     if (obj) {
       result->type = NPVariantType_Object;
       result->value.objectValue = WebBindings::retainObject(obj);
     }
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     return false;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingContentWindow);
 };
 
 class BrowserPluginPropertyBindingMaxHeight
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMaxHeight() :
       BrowserPluginPropertyBinding(kAttributeMaxHeight) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     int max_height = bindings->instance()->max_height_attribute();
     INT32_TO_NPVARIANT(max_height, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     int max_height = Int32FromNPVariant(*variant);
     bindings->instance()->SetMaxHeightAttribute(max_height);
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    int max_height = bindings->instance()->max_height_attribute();
+    bindings->instance()->UpdateDOMAttribute(
+        name(), base::IntToString(max_height));
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMaxHeight);
 };
 
 class BrowserPluginPropertyBindingMaxWidth
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMaxWidth() :
       BrowserPluginPropertyBinding(kAttributeMaxWidth) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     int max_width = bindings->instance()->max_width_attribute();
     INT32_TO_NPVARIANT(max_width, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     int max_width = Int32FromNPVariant(*variant);
     bindings->instance()->SetMaxWidthAttribute(max_width);
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    int max_width = bindings->instance()->max_width_attribute();
+    bindings->instance()->UpdateDOMAttribute(
+        name(), base::IntToString(max_width));
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMaxWidth);
 };
 
 class BrowserPluginPropertyBindingMinHeight
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMinHeight() :
       BrowserPluginPropertyBinding(kAttributeMinHeight) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     int min_height = bindings->instance()->min_height_attribute();
     INT32_TO_NPVARIANT(min_height, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     int min_height = Int32FromNPVariant(*variant);
     bindings->instance()->SetMinHeightAttribute(min_height);
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    int min_height = bindings->instance()->min_height_attribute();
+    bindings->instance()->UpdateDOMAttribute(
+        name(), base::IntToString(min_height));
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMinHeight);
 };
 
 class BrowserPluginPropertyBindingMinWidth
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMinWidth() :
       BrowserPluginPropertyBinding(kAttributeMinWidth) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     int min_width = bindings->instance()->min_width_attribute();
     INT32_TO_NPVARIANT(min_width, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     int min_width = Int32FromNPVariant(*variant);
     bindings->instance()->SetMinWidthAttribute(min_width);
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    int min_width = bindings->instance()->min_width_attribute();
+    bindings->instance()->UpdateDOMAttribute(
+        name(), base::IntToString(min_width));
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMinWidth);
 };
 
 class BrowserPluginPropertyBindingPartition
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingPartition() :
       BrowserPluginPropertyBinding(kAttributePartition) {
   }
@@ skipping 10 matching lines @@
     std::string partition_id = StringFromNPVariant(*variant);
     std::string error_message;
     if (!bindings->instance()->SetPartitionAttribute(partition_id,
                                                      &error_message)) {
       WebBindings::setException(
           np_obj, static_cast<const NPUTF8 *>(error_message.c_str()));
       return false;
     }
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    std::string partition_id = bindings->instance()->GetPartitionAttribute();
+    bindings->instance()->UpdateDOMAttribute(name(), partition_id);
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingPartition);
 };
 
 class BrowserPluginPropertyBindingSrc : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingSrc() :
       BrowserPluginPropertyBinding(kAttributeSrc) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPIdentifier name,
                            NPVariant* result) OVERRIDE {
     std::string src = bindings->instance()->src_attribute();
     return StringToNPVariant(src, result);
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            NPIdentifier name,
                            const NPVariant* variant) OVERRIDE {
     std::string src = StringFromNPVariant(*variant);
     std::string error_message;
     if (!bindings->instance()->SetSrcAttribute(src, &error_message)) {
       WebBindings::setException(
           np_obj, static_cast<const NPUTF8 *>(error_message.c_str()));
       return false;
     }
     return true;
   }
+  virtual void UpdateDOMAttribute(BrowserPluginBindings* bindings) OVERRIDE {
+    std::string src = bindings->instance()->src_attribute();
+    bindings->instance()->UpdateDOMAttribute(name(), src);
+  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingSrc);
 };
 
 
 // BrowserPluginBindings ------------------------------------------------------
 
 BrowserPluginBindings::BrowserPluginNPObject::BrowserPluginNPObject() {
 }
 
@@ skipping 65 matching lines @@
   }
   return false;
 }
 
 bool BrowserPluginBindings::SetProperty(NPObject* np_obj,
                                         NPIdentifier name,
                                         const NPVariant* variant) {
   for (PropertyBindingList::iterator iter = property_bindings_.begin();
        iter != property_bindings_.end();
        ++iter) {
-    if ((*iter)->MatchesName(name))
-      return (*iter)->SetProperty(this, np_obj, name, variant);
+    if ((*iter)->MatchesName(name)) {
+      if ((*iter)->SetProperty(this, np_obj, name, variant)) {
+          (*iter)->UpdateDOMAttribute(this);
+          return true;
+      }
+      return false;

[lazyboy, 2012/11/30 22:11:36]

nit: is break; more readable? not sure.

[Fady Samuel, 2012/11/30 22:57:12]

I'm indifferent. I just changed it to break;

+    }
   }
   return false;
 }
 
 bool BrowserPluginBindings::GetProperty(NPIdentifier name, NPVariant* result) {
   for (PropertyBindingList::iterator iter = property_bindings_.begin();
        iter != property_bindings_.end();
        ++iter) {
     if ((*iter)->MatchesName(name))
       return (*iter)->GetProperty(this, name, result);
   }
   return false;
 }
 
 }  // namespace content