Kill the last few style warnings in webkit/api/public

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/376015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31341 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 56 insertions, 21 deletions

diff --git a/webkit/api/public/WebAccessibilityObject.h b/webkit/api/public/WebAccessibilityObject.h
index 144235e..b6c5191 100644
--- a/webkit/api/public/WebAccessibilityObject.h
+++ b/webkit/api/public/WebAccessibilityObject.h
@@ -31,8 +31,8 @@
 #ifndef WebAccessibilityObject_h
 #define WebAccessibilityObject_h
 
-#include "WebCommon.h"
 #include "WebAccessibilityRole.h"
+#include "WebCommon.h"
 
 #if WEBKIT_IMPLEMENTATION
 namespace WebCore { class AccessibilityObject; }
@@ -53,7 +53,11 @@ public:
 
     WebAccessibilityObject() : m_private(0) { }
     WebAccessibilityObject(const WebAccessibilityObject& o) : m_private(0) { assign(o); }
-    WebAccessibilityObject& operator=(const WebAccessibilityObject& o) { assign(o); return *this; }
+    WebAccessibilityObject& operator=(const WebAccessibilityObject& o)
+    {
+        assign(o);
+        return *this;
+    }
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebAccessibilityObject&);
diff --git a/webkit/api/public/WebApplicationCacheHostClient.h b/webkit/api/public/WebApplicationCacheHostClient.h
index 99a3821..4e830e3 100644
--- a/webkit/api/public/WebApplicationCacheHostClient.h
+++ b/webkit/api/public/WebApplicationCacheHostClient.h
@@ -31,8 +31,8 @@
 #ifndef WebApplicationCacheHostClient_h
 #define WebApplicationCacheHostClient_h
 
-#include "WebCommon.h"
 #include "WebApplicationCacheHost.h"
+#include "WebCommon.h"
 
 namespace WebKit {
 
diff --git a/webkit/api/public/WebBindings.h b/webkit/api/public/WebBindings.h
index 0677e74..c8a00216 100644
--- a/webkit/api/public/WebBindings.h
+++ b/webkit/api/public/WebBindings.h
@@ -31,8 +31,8 @@
 #ifndef WebBindings_h
 #define WebBindings_h
 
-#include <bindings/npruntime.h>
 #include "WebCommon.h"
+#include <bindings/npruntime.h>
 
 namespace WebKit {
 
diff --git a/webkit/api/public/WebColor.h b/webkit/api/public/WebColor.h
index 34e5928..034f8db 100644
--- a/webkit/api/public/WebColor.h
+++ b/webkit/api/public/WebColor.h
@@ -31,8 +31,8 @@
 #ifndef WebColor_h
 #define WebColor_h
 
-#include "WebCommon.h"
 #include "WebColorName.h"
+#include "WebCommon.h"
 
 namespace WebKit {
 
diff --git a/webkit/api/public/WebCommon.h b/webkit/api/public/WebCommon.h
index 64d34cc..d347ea6 100644
--- a/webkit/api/public/WebCommon.h
+++ b/webkit/api/public/WebCommon.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -84,9 +84,9 @@ namespace WebKit {
 
     // UTF-16 character type
 #if defined(WIN32)
-    typedef wchar_t WebUChar;
+typedef wchar_t WebUChar;
 #else
-    typedef unsigned short WebUChar;
+typedef unsigned short WebUChar;
 #endif
 
 } // namespace WebKit
diff --git a/webkit/api/public/WebDatabase.h b/webkit/api/public/WebDatabase.h
index 68c728e..179e828 100644
--- a/webkit/api/public/WebDatabase.h
+++ b/webkit/api/public/WebDatabase.h
@@ -51,7 +51,11 @@ public:
     WebDatabase(const WebDatabase& d) : m_private(0) { assign(d); }
     ~WebDatabase() { reset(); }
 
-    WebDatabase& operator=(const WebDatabase& d) { assign(d); return *this; }
+    WebDatabase& operator=(const WebDatabase& d)
+    {
+        assign(d);
+        return *this;
+    }
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebDatabase&);
diff --git a/webkit/api/public/WebDragData.h b/webkit/api/public/WebDragData.h
index 8bd2293..f7a165d 100644
--- a/webkit/api/public/WebDragData.h
+++ b/webkit/api/public/WebDragData.h
@@ -54,7 +54,11 @@ public:
 
     WebDragData() : m_private(0) { }
     WebDragData(const WebDragData& d) : m_private(0) { assign(d); }
-    WebDragData& operator=(const WebDragData& d) { assign(d); return *this; }
+    WebDragData& operator=(const WebDragData& d)
+    {
+        assign(d);
+        return *this;
+    }
 
     WEBKIT_API void initialize();
     WEBKIT_API void reset();
diff --git a/webkit/api/public/WebForm.h b/webkit/api/public/WebForm.h
index 23a4ace..6178b9c 100644
--- a/webkit/api/public/WebForm.h
+++ b/webkit/api/public/WebForm.h
@@ -50,7 +50,11 @@ public:
 
     WebForm() : m_private(0) { }
     WebForm(const WebForm& f) : m_private(0) { assign(f); }
-    WebForm& operator=(const WebForm& f) { assign(f); return *this; }
+    WebForm& operator=(const WebForm& f)
+    {
+        assign(f);
+        return *this;
+    }
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebForm&);
diff --git a/webkit/api/public/WebHTTPBody.h b/webkit/api/public/WebHTTPBody.h
index 07724f0..43f51a6 100644
--- a/webkit/api/public/WebHTTPBody.h
+++ b/webkit/api/public/WebHTTPBody.h
@@ -56,7 +56,11 @@ public:
 
     WebHTTPBody() : m_private(0) { }
     WebHTTPBody(const WebHTTPBody& b) : m_private(0) { assign(b); }
-    WebHTTPBody& operator=(const WebHTTPBody& b) { assign(b); return *this; }
+    WebHTTPBody& operator=(const WebHTTPBody& b)
+    {
+        assign(b);
+        return *this;
+    }
 
     WEBKIT_API void initialize();
     WEBKIT_API void reset();
diff --git a/webkit/api/public/WebHistoryItem.h b/webkit/api/public/WebHistoryItem.h
index fbc70c7..f15a62c 100644
--- a/webkit/api/public/WebHistoryItem.h
+++ b/webkit/api/public/WebHistoryItem.h
@@ -57,7 +57,11 @@ public:
 
     WebHistoryItem() : m_private(0) { }
     WebHistoryItem(const WebHistoryItem& h) : m_private(0) { assign(h); }
-    WebHistoryItem& operator=(const WebHistoryItem& h) { assign(h); return *this; }
+    WebHistoryItem& operator=(const WebHistoryItem& h)
+    {
+        assign(h);
+        return *this;
+    }
 
     WEBKIT_API void initialize();
     WEBKIT_API void reset();
diff --git a/webkit/api/public/WebKitClient.h b/webkit/api/public/WebKitClient.h
index 3f87823..6ff6aa6 100644
--- a/webkit/api/public/WebKitClient.h
+++ b/webkit/api/public/WebKitClient.h
@@ -134,7 +134,7 @@ public:
     typedef int FileHandle;
 #endif
 
-    // Opens a database file; dirHandle should be NULL if the caller does not need
+    // Opens a database file; dirHandle should be 0 if the caller does not need
     // a handle to the directory containing this file
     virtual FileHandle databaseOpenFile(
         const WebString& fileName, int desiredFlags, FileHandle* dirHandle) = 0;
diff --git a/webkit/api/public/WebSecurityOrigin.h b/webkit/api/public/WebSecurityOrigin.h
index 394dabb..d04fbc6 100644
--- a/webkit/api/public/WebSecurityOrigin.h
+++ b/webkit/api/public/WebSecurityOrigin.h
@@ -49,7 +49,11 @@ public:
 
     WebSecurityOrigin() : m_private(0) { }
     WebSecurityOrigin(const WebSecurityOrigin& s) : m_private(0) { assign(s); }
-    WebSecurityOrigin& operator=(const WebSecurityOrigin& s) { assign(s); return *this; }
+    WebSecurityOrigin& operator=(const WebSecurityOrigin& s)
+    {
+        assign(s);
+        return *this;
+    }
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebSecurityOrigin&);
diff --git a/webkit/api/public/WebURLRequest.h b/webkit/api/public/WebURLRequest.h
index 3b74e69e..ce5c17c 100644
--- a/webkit/api/public/WebURLRequest.h
+++ b/webkit/api/public/WebURLRequest.h
@@ -68,7 +68,11 @@ public:
 
     WebURLRequest() : m_private(0) { }
     WebURLRequest(const WebURLRequest& r) : m_private(0) { assign(r); }
-    WebURLRequest& operator=(const WebURLRequest& r) { assign(r); return *this; }
+    WebURLRequest& operator=(const WebURLRequest& r)
+    {
+        assign(r);
+        return *this;
+    }
 
     explicit WebURLRequest(const WebURL& url) : m_private(0)
     {
diff --git a/webkit/api/public/WebURLResponse.h b/webkit/api/public/WebURLResponse.h
index 57115e6..cdac83c 100644
--- a/webkit/api/public/WebURLResponse.h
+++ b/webkit/api/public/WebURLResponse.h
@@ -51,7 +51,11 @@ public:
 
     WebURLResponse() : m_private(0) { }
     WebURLResponse(const WebURLResponse& r) : m_private(0) { assign(r); }
-    WebURLResponse& operator=(const WebURLResponse& r) { assign(r); return *this; }
+    WebURLResponse& operator=(const WebURLResponse& r)
+    {
+        assign(r);
+        return *this;
+    }
 
     explicit WebURLResponse(const WebURL& url) : m_private(0)
     {
diff --git a/webkit/api/public/linux/WebFontRendering.h b/webkit/api/public/linux/WebFontRendering.h
index 2f1aacc..9b61bdc 100644
--- a/webkit/api/public/linux/WebFontRendering.h
+++ b/webkit/api/public/linux/WebFontRendering.h
@@ -32,9 +32,8 @@
 #define WebFontRendering_h
 
 #include "../WebCommon.h"
-
-#include <SkPaint.h>
 #include <SkFontHost.h>
+#include <SkPaint.h>
 
 namespace WebKit {