Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h
index 3dd7e40..be8623c 100644
--- a/WebKit/chromium/public/WebInputElement.h
+++ b/WebKit/chromium/public/WebInputElement.h
@@ -43,14 +43,14 @@ namespace WebKit {
     class WebInputElement : public WebFormControlElement {
     public:
         WebInputElement() : WebFormControlElement() { }
-        WebInputElement(const WebInputElement& e) : WebFormControlElement(e) { }
+        WebInputElement(const WebInputElement& element) : WebFormControlElement(element) { }
 
-        WebInputElement& operator=(const WebInputElement& e)
+        WebInputElement& operator=(const WebInputElement& element)
         {
-            WebFormControlElement::assign(e);
+            WebFormControlElement::assign(element);
             return *this;
         }
-        WEBKIT_API void assign(const WebInputElement& e) { WebFormControlElement::assign(e); }
+        void assign(const WebInputElement& element) { WebFormControlElement::assign(element); }
 
         // This returns true for all of textfield-looking types such as text,
         // password, search, email, url, and number.