diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /WebKit/chromium/public/WebOptionElement.h | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'WebKit/chromium/public/WebOptionElement.h')
| -rw-r--r-- | WebKit/chromium/public/WebOptionElement.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/chromium/public/WebOptionElement.h b/WebKit/chromium/public/WebOptionElement.h index 1689a57..24a6eaa 100644 --- a/WebKit/chromium/public/WebOptionElement.h +++ b/WebKit/chromium/public/WebOptionElement.h @@ -44,14 +44,14 @@ namespace WebKit { class WebOptionElement : public WebFormControlElement { public: WebOptionElement() : WebFormControlElement() { } - WebOptionElement(const WebOptionElement& e) : WebFormControlElement(e) { } + WebOptionElement(const WebOptionElement& element) : WebFormControlElement(element) { } - WebOptionElement& operator=(const WebOptionElement& e) + WebOptionElement& operator=(const WebOptionElement& element) { - WebFormControlElement::assign(e); + WebFormControlElement::assign(element); return *this; } - WEBKIT_API void assign(const WebOptionElement& e) { WebFormControlElement::assign(e); } + void assign(const WebOptionElement& element) { WebFormControlElement::assign(element); } WEBKIT_API void setValue(const WebString&); WEBKIT_API WebString value() const; |