Revert 170866

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,
                            NPVariant* result) = 0;
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            const NPVariant* variant) = 0;
-  virtual std::string GetDOMAttributeValue(BrowserPlugin* browser_plugin) = 0;
-  // Updates the DOM Attribute value with the current property value.
-  void UpdateDOMAttribute(BrowserPluginBindings* bindings) {
-    bindings->instance()->UpdateDOMAttribute(name(),
-        GetDOMAttributeValue(bindings->instance()));
-  }
  private:
   std::string name_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBinding);
 };
 
 class BrowserPluginPropertyBindingAutoSize
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingAutoSize() :
       BrowserPluginPropertyBinding(kAttributeAutoSize) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPVariant* result) OVERRIDE {
-    bool auto_size = bindings->instance()->auto_size_attribute();
-    BOOLEAN_TO_NPVARIANT(auto_size, *result);
+    bool autosize = bindings->instance()->auto_size_attribute();
+    BOOLEAN_TO_NPVARIANT(autosize, *result);
     return true;
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            const NPVariant* variant) OVERRIDE {
-    bool auto_size = NPVARIANT_TO_BOOLEAN(*variant);
-    bindings->instance()->SetAutoSizeAttribute(auto_size);
+    bool autosize = NPVARIANT_TO_BOOLEAN(*variant);
+    bindings->instance()->SetAutoSizeAttribute(autosize);
     return true;
   }
-  virtual std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return browser_plugin->auto_size_attribute() ? "true" : "false";
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingAutoSize);
 };
 
 class BrowserPluginPropertyBindingContentWindow
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingContentWindow() :
       BrowserPluginPropertyBinding(kAttributeContentWindow) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            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,
                            const NPVariant* variant) OVERRIDE {
     return false;
   }
-  virtual std::string GetDOMAttributeValue(BrowserPlugin* browser_plugin) {
-    return std::string();
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingContentWindow);
 };
 
 class BrowserPluginPropertyBindingMaxHeight
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMaxHeight() :
       BrowserPluginPropertyBinding(kAttributeMaxHeight) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            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,
                            const NPVariant* variant) OVERRIDE {
     int max_height = Int32FromNPVariant(*variant);
     bindings->instance()->SetMaxHeightAttribute(max_height);
     return true;
   }
-  virtual std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return base::IntToString(browser_plugin->max_height_attribute());
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMaxHeight);
 };
 
 class BrowserPluginPropertyBindingMaxWidth
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMaxWidth() :
       BrowserPluginPropertyBinding(kAttributeMaxWidth) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            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,
                            const NPVariant* variant) OVERRIDE {
     int max_width = Int32FromNPVariant(*variant);
     bindings->instance()->SetMaxWidthAttribute(max_width);
     return true;
   }
-  virtual std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return base::IntToString(browser_plugin->max_width_attribute());
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMaxWidth);
 };
 
 class BrowserPluginPropertyBindingMinHeight
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMinHeight() :
       BrowserPluginPropertyBinding(kAttributeMinHeight) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            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,
                            const NPVariant* variant) OVERRIDE {
     int min_height = Int32FromNPVariant(*variant);
     bindings->instance()->SetMinHeightAttribute(min_height);
     return true;
   }
-  virtual std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return base::IntToString(browser_plugin->min_height_attribute());
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMinHeight);
 };
 
 class BrowserPluginPropertyBindingMinWidth
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingMinWidth() :
       BrowserPluginPropertyBinding(kAttributeMinWidth) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            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,
                            const NPVariant* variant) OVERRIDE {
     int min_width = Int32FromNPVariant(*variant);
     bindings->instance()->SetMinWidthAttribute(min_width);
     return true;
   }
-  virtual std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return base::IntToString(browser_plugin->min_width_attribute());
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingMinWidth);
 };
 
 class BrowserPluginPropertyBindingPartition
     : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingPartition() :
       BrowserPluginPropertyBinding(kAttributePartition) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPVariant* result) OVERRIDE {
     std::string partition_id = bindings->instance()->GetPartitionAttribute();
     return StringToNPVariant(partition_id, result);
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            const NPVariant* variant) OVERRIDE {
     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 std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return browser_plugin->GetPartitionAttribute();
-  }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingPartition);
 };
 
 class BrowserPluginPropertyBindingSrc : public BrowserPluginPropertyBinding {
  public:
   BrowserPluginPropertyBindingSrc() :
       BrowserPluginPropertyBinding(kAttributeSrc) {
   }
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPVariant* result) OVERRIDE {
     std::string src = bindings->instance()->src_attribute();
     return StringToNPVariant(src, result);
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            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 std::string GetDOMAttributeValue(
-      BrowserPlugin* browser_plugin) OVERRIDE {
-    return browser_plugin->src_attribute();
-  }
  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)) {
-      if ((*iter)->SetProperty(this, np_obj, variant)) {
-        (*iter)->UpdateDOMAttribute(this);
-        return true;
-      }
-      break;
-    }
+    if ((*iter)->MatchesName(name))
+      return (*iter)->SetProperty(this, np_obj, variant);
   }
   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, result);
   }
   return false;
 }
 
 }  // namespace content