[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
levin at chromium.org
levin at chromium.org
Fri Jan 21 14:58:57 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit a616293e3361f8fa799c3eeee57b44ec714799f4
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 22:20:41 2011 +0000
2011-01-05 David Levin <levin at chromium.org>
Reviewed by Darin Fisher.
[chromium] WEBKIT_API and styling fixes for the chromium api.
https://bugs.webkit.org/show_bug.cgi?id=51863
Removed some incorrect uses of WEBKIT_API.
Fixed some abbreviations by making them whole words.
* public/WebAnimationController.h: Removed WEBKIT_API from virtual functions.
* public/WebFormElement.h: Removed WEBKIT_API from inline functions
and fixed some abbreviations.
(WebKit::WebFormElement::WebFormElement):
(WebKit::WebFormElement::operator=):
(WebKit::WebFormElement::assign):
* public/WebIDBDatabaseError.h: Ditto.
(WebKit::WebIDBDatabaseError::WebIDBDatabaseError):
(WebKit::WebIDBDatabaseError::operator=):
* public/WebInputElement.h: Ditto.
(WebKit::WebInputElement::WebInputElement):
(WebKit::WebInputElement::operator=):
(WebKit::WebInputElement::assign):
* public/WebLabelElement.h: Ditto.
(WebKit::WebLabelElement::WebLabelElement):
(WebKit::WebLabelElement::operator=):
(WebKit::WebLabelElement::assign):
* public/WebOptionElement.h: Ditto.
(WebKit::WebOptionElement::WebOptionElement):
(WebKit::WebOptionElement::operator=):
(WebKit::WebOptionElement::assign):
* public/WebSelectElement.h: Ditto (and minor spacing cleanup).
(WebKit::WebSelectElement::WebSelectElement):
(WebKit::WebSelectElement::operator=):
(WebKit::WebSelectElement::assign):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75106 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a2592c0..0f2d0ba 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,39 @@
+2011-01-05 David Levin <levin at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] WEBKIT_API and styling fixes for the chromium api.
+ https://bugs.webkit.org/show_bug.cgi?id=51863
+
+ Removed some incorrect uses of WEBKIT_API.
+ Fixed some abbreviations by making them whole words.
+
+ * public/WebAnimationController.h: Removed WEBKIT_API from virtual functions.
+ * public/WebFormElement.h: Removed WEBKIT_API from inline functions
+ and fixed some abbreviations.
+ (WebKit::WebFormElement::WebFormElement):
+ (WebKit::WebFormElement::operator=):
+ (WebKit::WebFormElement::assign):
+ * public/WebIDBDatabaseError.h: Ditto.
+ (WebKit::WebIDBDatabaseError::WebIDBDatabaseError):
+ (WebKit::WebIDBDatabaseError::operator=):
+ * public/WebInputElement.h: Ditto.
+ (WebKit::WebInputElement::WebInputElement):
+ (WebKit::WebInputElement::operator=):
+ (WebKit::WebInputElement::assign):
+ * public/WebLabelElement.h: Ditto.
+ (WebKit::WebLabelElement::WebLabelElement):
+ (WebKit::WebLabelElement::operator=):
+ (WebKit::WebLabelElement::assign):
+ * public/WebOptionElement.h: Ditto.
+ (WebKit::WebOptionElement::WebOptionElement):
+ (WebKit::WebOptionElement::operator=):
+ (WebKit::WebOptionElement::assign):
+ * public/WebSelectElement.h: Ditto (and minor spacing cleanup).
+ (WebKit::WebSelectElement::WebSelectElement):
+ (WebKit::WebSelectElement::operator=):
+ (WebKit::WebSelectElement::assign):
+
2011-01-05 Hans Wennborg <hans at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebAnimationController.h b/WebKit/chromium/public/WebAnimationController.h
index 0d3fcf5..c61e531 100644
--- a/WebKit/chromium/public/WebAnimationController.h
+++ b/WebKit/chromium/public/WebAnimationController.h
@@ -43,16 +43,17 @@ class WebURL;
// owned by a WebFrame and its life span is bound to that WebFrame.
class WebAnimationController {
public:
- WEBKIT_API virtual bool pauseAnimationAtTime(WebElement&,
- const WebString& animationName,
- double time) = 0;
- WEBKIT_API virtual bool pauseTransitionAtTime(WebElement&,
- const WebString& propertyName,
- double time) = 0;
-
- WEBKIT_API virtual unsigned numberOfActiveAnimations() const = 0;
- WEBKIT_API virtual void suspendAnimations() const = 0;
- WEBKIT_API virtual void resumeAnimations() const = 0;
+ virtual bool pauseAnimationAtTime(WebElement&,
+ const WebString& animationName,
+ double time) = 0;
+ virtual bool pauseTransitionAtTime(WebElement&,
+ const WebString& propertyName,
+ double time) = 0;
+
+ virtual unsigned numberOfActiveAnimations() const = 0;
+ virtual void suspendAnimations() const = 0;
+ virtual void resumeAnimations() const = 0;
+
protected:
~WebAnimationController() { }
};
diff --git a/WebKit/chromium/public/WebFormElement.h b/WebKit/chromium/public/WebFormElement.h
index 2b4ee53..53554d7 100644
--- a/WebKit/chromium/public/WebFormElement.h
+++ b/WebKit/chromium/public/WebFormElement.h
@@ -50,14 +50,14 @@ namespace WebKit {
~WebFormElement() { reset(); }
WebFormElement() : WebElement() { }
- WebFormElement(const WebFormElement& e) : WebElement(e) { }
+ WebFormElement(const WebFormElement& element) : WebElement(element) { }
- WebFormElement& operator=(const WebFormElement& e)
+ WebFormElement& operator=(const WebFormElement& element)
{
- WebElement::assign(e);
+ WebElement::assign(element);
return *this;
}
- WEBKIT_API void assign(const WebFormElement& e) { WebElement::assign(e); }
+ void assign(const WebFormElement& element) { WebElement::assign(element); }
WEBKIT_API bool autoComplete() const;
WEBKIT_API WebString action() const;
diff --git a/WebKit/chromium/public/WebIDBDatabaseError.h b/WebKit/chromium/public/WebIDBDatabaseError.h
index c181f78..f247b36 100644
--- a/WebKit/chromium/public/WebIDBDatabaseError.h
+++ b/WebKit/chromium/public/WebIDBDatabaseError.h
@@ -42,11 +42,11 @@ class WebIDBDatabaseError {
public:
~WebIDBDatabaseError() { reset(); }
- WEBKIT_API WebIDBDatabaseError(unsigned short code, const WebString& message) { assign(code, message); }
- WEBKIT_API WebIDBDatabaseError(const WebIDBDatabaseError& e) { assign(e); }
- WEBKIT_API WebIDBDatabaseError& operator=(const WebIDBDatabaseError& e)
+ WebIDBDatabaseError(unsigned short code, const WebString& message) { assign(code, message); }
+ WebIDBDatabaseError(const WebIDBDatabaseError& error) { assign(error); }
+ WebIDBDatabaseError& operator=(const WebIDBDatabaseError& error)
{
- assign(e);
+ assign(error);
return *this;
}
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.
diff --git a/WebKit/chromium/public/WebLabelElement.h b/WebKit/chromium/public/WebLabelElement.h
index 3e97c39..eb9b06d 100644
--- a/WebKit/chromium/public/WebLabelElement.h
+++ b/WebKit/chromium/public/WebLabelElement.h
@@ -44,15 +44,15 @@ namespace WebKit {
class WebLabelElement : public WebElement {
public:
WebLabelElement() : WebElement() { }
- WebLabelElement(const WebLabelElement& e) : WebElement(e) { }
+ WebLabelElement(const WebLabelElement& element) : WebElement(element) { }
- WebLabelElement& operator=(const WebLabelElement& e)
+ WebLabelElement& operator=(const WebLabelElement& element)
{
- WebElement::assign(e);
+ WebElement::assign(element);
return *this;
}
- WEBKIT_API void assign(const WebLabelElement& e) { WebElement::assign(e); }
+ void assign(const WebLabelElement& element) { WebElement::assign(element); }
WEBKIT_API WebElement correspondingControl();
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;
diff --git a/WebKit/chromium/public/WebSelectElement.h b/WebKit/chromium/public/WebSelectElement.h
index 3e7f5e2..97d3a78 100644
--- a/WebKit/chromium/public/WebSelectElement.h
+++ b/WebKit/chromium/public/WebSelectElement.h
@@ -45,14 +45,14 @@ namespace WebKit {
class WebSelectElement : public WebFormControlElement {
public:
WebSelectElement() : WebFormControlElement() { }
- WebSelectElement(const WebSelectElement& e) : WebFormControlElement(e) { }
+ WebSelectElement(const WebSelectElement& element) : WebFormControlElement(element) { }
- WebSelectElement& operator=(const WebSelectElement& e)
- {
- WebFormControlElement::assign(e);
- return *this;
+ WebSelectElement& operator=(const WebSelectElement& element)
+ {
+ WebFormControlElement::assign(element);
+ return *this;
}
- WEBKIT_API void assign(const WebSelectElement& e) { WebFormControlElement::assign(e); }
+ void assign(const WebSelectElement& element) { WebFormControlElement::assign(element); }
WEBKIT_API void setValue(const WebString&);
WEBKIT_API WebString value();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list