Last round of src/ style fixes.

BUG=None
TEST=None
Review URL: http://codereview.chromium.org/372073

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

25 files changed, 84 insertions, 72 deletions

diff --git a/webkit/api/src/WebDataSourceImpl.h b/webkit/api/src/WebDataSourceImpl.h
index 402cb02..8860fe4 100644
--- a/webkit/api/src/WebDataSourceImpl.h
+++ b/webkit/api/src/WebDataSourceImpl.h
@@ -34,16 +34,19 @@
 // FIXME: This relative path is a temporary hack to support using this
 // header from webkit/glue.
 #include "../public/WebDataSource.h"
+
+#include "DocumentLoader.h"
+#include "KURL.h"
+
 #include "WebPluginLoadObserver.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
 
-#include "DocumentLoader.h"
-#include "KURL.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
+
 namespace WebKit {
 
 class WebPluginLoadObserver;
diff --git a/webkit/api/src/WebDragData.cpp b/webkit/api/src/WebDragData.cpp
index df9991c..4af1119 100644
--- a/webkit/api/src/WebDragData.cpp
+++ b/webkit/api/src/WebDragData.cpp
@@ -31,12 +31,12 @@
 #include "config.h"
 #include "WebDragData.h"
 
+#include "ChromiumDataObject.h"
 #include "WebData.h"
 #include "WebString.h"
 #include "WebURL.h"
 #include "WebVector.h"
 
-#include "ChromiumDataObject.h"
 #include <wtf/PassRefPtr.h>
 
 using namespace WebCore;
diff --git a/webkit/api/src/WebFileChooserCompletionImpl.h b/webkit/api/src/WebFileChooserCompletionImpl.h
index f6c7eea..fe759e0 100644
--- a/webkit/api/src/WebFileChooserCompletionImpl.h
+++ b/webkit/api/src/WebFileChooserCompletionImpl.h
@@ -31,14 +31,16 @@
 #ifndef WebFileChooserCompletionImpl_h
 #define WebFileChooserCompletionImpl_h
 
-#include "FileChooser.h"
-#include <wtf/PassRefPtr.h>
-// FIXME: This relative path is a temporary hack to support using this
+// FIXME: These relative paths are a temporary hack to support using this
 // header from webkit/glue.
 #include "../public/WebFileChooserCompletion.h"
 #include "../public/WebString.h"
 #include "../public/WebVector.h"
 
+#include "FileChooser.h"
+
+#include <wtf/PassRefPtr.h>
+
 using WebKit::WebFileChooserCompletion;
 using WebKit::WebString;
 using WebKit::WebVector;
diff --git a/webkit/api/src/WebNotification.cpp b/webkit/api/src/WebNotification.cpp
index ba1dcba..1f6916e 100644
--- a/webkit/api/src/WebNotification.cpp
+++ b/webkit/api/src/WebNotification.cpp
@@ -33,10 +33,11 @@
 
 #if ENABLE(NOTIFICATIONS)
 
+#include "Notification.h"
+
 #include "WebString.h"
 #include "WebURL.h"
 
-#include "Notification.h"
 #include <wtf/PassRefPtr.h>
 
 using namespace WebCore;
diff --git a/webkit/api/src/WebPluginContainerImpl.cpp b/webkit/api/src/WebPluginContainerImpl.cpp
index 7e37ef0..43f3cef 100644
--- a/webkit/api/src/WebPluginContainerImpl.cpp
+++ b/webkit/api/src/WebPluginContainerImpl.cpp
@@ -421,7 +421,7 @@ WebCore::IntRect WebPluginContainerImpl::windowClipRect() const
     IntRect clipRect =
         convertToContainingWindow(IntRect(0, 0, width(), height()));
 
-    // document()->renderer() can be NULL when we receive messages from the
+    // document()->renderer() can be 0 when we receive messages from the
     // plugins while we are destroying a frame.
     if (m_element->renderer()->document()->renderer()) {
         // Take our element and get the clip rect from the enclosing layer and
diff --git a/webkit/api/src/WebPluginListBuilderImpl.cpp b/webkit/api/src/WebPluginListBuilderImpl.cpp
index 1971911..6926a2d 100644
--- a/webkit/api/src/WebPluginListBuilderImpl.cpp
+++ b/webkit/api/src/WebPluginListBuilderImpl.cpp
@@ -31,9 +31,8 @@
 #include "config.h"
 #include "WebPluginListBuilderImpl.h"
 
-#include "WebString.h"
-
 #include "PluginData.h"
+#include "WebString.h"
 #include <wtf/Vector.h>
 
 using namespace WebCore;
diff --git a/webkit/api/src/WebPopupMenuImpl.cpp b/webkit/api/src/WebPopupMenuImpl.cpp
index 299fbaf..f6d360e 100644
--- a/webkit/api/src/WebPopupMenuImpl.cpp
+++ b/webkit/api/src/WebPopupMenuImpl.cpp
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "WebPopupMenuImpl.h"
 
-#include <skia/ext/platform_canvas.h>
-
 #include "Cursor.h"
 #include "FramelessScrollView.h"
 #include "FrameView.h"
@@ -42,10 +40,13 @@
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
 #include "SkiaUtils.h"
+
 #include "WebInputEvent.h"
+#include "WebInputEventConversion.h"
 #include "WebRect.h"
 #include "WebWidgetClient.h"
-#include "WebInputEventConversion.h"
+
+#include <skia/ext/platform_canvas.h>
 
 using namespace WebCore;
 
diff --git a/webkit/api/src/WebRange.cpp b/webkit/api/src/WebRange.cpp
index bf5ce64..3dd000d 100644
--- a/webkit/api/src/WebRange.cpp
+++ b/webkit/api/src/WebRange.cpp
@@ -31,10 +31,9 @@
 #include "config.h"
 #include "WebRange.h"
 
+#include "Range.h"
 #include "WebNode.h"
 #include "WebString.h"
-
-#include "Range.h"
 #include <wtf/PassRefPtr.h>
 
 using namespace WebCore;
diff --git a/webkit/api/src/WebScriptController.cpp b/webkit/api/src/WebScriptController.cpp
index 9be47a8..06f47e6 100644
--- a/webkit/api/src/WebScriptController.cpp
+++ b/webkit/api/src/WebScriptController.cpp
@@ -31,11 +31,11 @@
 #include "config.h"
 #include "WebScriptController.h"
 
-#include "WebString.h"
-
 #include "V8Binding.h"
 #include "V8Proxy.h"
 
+#include "WebString.h"
+
 using namespace WebCore;
 
 namespace WebKit {
diff --git a/webkit/api/src/WebSearchableFormData.cpp b/webkit/api/src/WebSearchableFormData.cpp
index f0d9c2b..eddaffe 100644
--- a/webkit/api/src/WebSearchableFormData.cpp
+++ b/webkit/api/src/WebSearchableFormData.cpp
@@ -37,9 +37,9 @@
 #include "Frame.h"
 #include "HTMLFormControlElement.h"
 #include "HTMLFormElement.h"
-#include "HTMLOptionElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
+#include "HTMLOptionElement.h"
 #include "HTMLOptionsCollection.h"
 #include "HTMLSelectElement.h"
 #include "TextEncoding.h"
@@ -79,10 +79,10 @@ HTMLFormControlElement* GetButtonToActivate(HTMLFormElement* form)
     HTMLFormControlElement* firstSubmitButton = 0;
     for (Vector<HTMLFormControlElement*>::const_iterator i(form->formElements.begin()); i != form->formElements.end(); ++i) {
       HTMLFormControlElement* formElement = *i;
-      if (formElement->isActivatedSubmit()) {
+      if (formElement->isActivatedSubmit())
           // There's a button that is already activated for submit, return 0.
           return 0;
-      } else if (!firstSubmitButton && formElement->isSuccessfulSubmitButton())
+      if (!firstSubmitButton && formElement->isSuccessfulSubmitButton())
           firstSubmitButton = formElement;
     }
     return firstSubmitButton;
@@ -115,7 +115,8 @@ bool IsSelectInDefaultState(const HTMLSelectElement* select)
             // The page specified the option to select.
             initialSelected = optionElement;
             break;
-        } else if (!initialSelected)
+        }
+        if (!initialSelected)
             initialSelected = optionElement;
     }
     return initialSelected ? initialSelected->selected() : true;
diff --git a/webkit/api/src/WebSecurityPolicy.cpp b/webkit/api/src/WebSecurityPolicy.cpp
index 8218381..c66c805 100755
--- a/webkit/api/src/WebSecurityPolicy.cpp
+++ b/webkit/api/src/WebSecurityPolicy.cpp
@@ -31,12 +31,12 @@
 #include "config.h"
 #include "WebSecurityPolicy.h"
 
-#include "WebString.h"
-#include "WebURL.h"
-
 #include "FrameLoader.h"
 #include "SecurityOrigin.h"
 
+#include "WebString.h"
+#include "WebURL.h"
+
 using namespace WebCore;
 
 namespace WebKit {
diff --git a/webkit/api/src/WebSharedWorkerImpl.cpp b/webkit/api/src/WebSharedWorkerImpl.cpp
index dfce401..4547336 100644
--- a/webkit/api/src/WebSharedWorkerImpl.cpp
+++ b/webkit/api/src/WebSharedWorkerImpl.cpp
@@ -111,15 +111,15 @@ void WebSharedWorkerImpl::clientDestroyed()
 
 WebWorkerClient* WebSharedWorkerImpl::client()
 {
-  // We should never be asked for a WebWorkerClient (only dedicated workers have an associated WebWorkerClient).
-  // It should not be possible for SharedWorkerContext to generate an API call outside those supported by WebCommonWorkerClient.
-  ASSERT_NOT_REACHED();
-  return 0;
+    // We should never be asked for a WebWorkerClient (only dedicated workers have an associated WebWorkerClient).
+    // It should not be possible for SharedWorkerContext to generate an API call outside those supported by WebCommonWorkerClient.
+    ASSERT_NOT_REACHED();
+    return 0;
 }
 
 WebSharedWorker* WebSharedWorker::create(WebCommonWorkerClient* client)
 {
-  return new WebSharedWorkerImpl(client);
+    return new WebSharedWorkerImpl(client);
 }
 
 #endif // ENABLE(SHARED_WORKERS)
diff --git a/webkit/api/src/WebStorageAreaImpl.cpp b/webkit/api/src/WebStorageAreaImpl.cpp
index 4e46f54..f24bee3 100644
--- a/webkit/api/src/WebStorageAreaImpl.cpp
+++ b/webkit/api/src/WebStorageAreaImpl.cpp
@@ -40,7 +40,7 @@
 
 namespace WebKit {
 
-const WebURL* WebStorageAreaImpl::storageEventURL = NULL;
+const WebURL* WebStorageAreaImpl::storageEventURL = 0;
 
 WebStorageAreaImpl::WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea)
     : m_storageArea(storageArea)
@@ -73,12 +73,11 @@ void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, c
     ScopedStorageEventURL scope(url);
     m_storageArea->setItem(key, value, exceptionCode, 0);
 
-    if (exceptionCode != 0) {
+    if (exceptionCode) {
         ASSERT(exceptionCode == WebCore::QUOTA_EXCEEDED_ERR);
         quotaException = true;
-    } else {
+    } else
         quotaException = false;
-    }
 }
 
 void WebStorageAreaImpl::removeItem(const WebString& key, const WebURL& url)
diff --git a/webkit/api/src/WebStorageAreaImpl.h b/webkit/api/src/WebStorageAreaImpl.h
index f4eb0c6..e1f74e0 100644
--- a/webkit/api/src/WebStorageAreaImpl.h
+++ b/webkit/api/src/WebStorageAreaImpl.h
@@ -55,13 +55,15 @@ public:
 private:
     class ScopedStorageEventURL {
     public:
-        ScopedStorageEventURL(const WebURL& url) {
+        ScopedStorageEventURL(const WebURL& url)
+        {
             // FIXME: Once storage events are fired async in WebKit (as they should
-            //        be) this can be ASSERTed to be NULL rather than saved.
+            //        be) this can be ASSERTed to be 0 rather than saved.
             m_existingStorageEventURL = storageEventURL;
             storageEventURL = &url;
         }
-        ~ScopedStorageEventURL() {
+        ~ScopedStorageEventURL()
+        {
             storageEventURL = m_existingStorageEventURL;
         }
 
diff --git a/webkit/api/src/WebStorageEventDispatcherImpl.h b/webkit/api/src/WebStorageEventDispatcherImpl.h
index eaadc1b..6848b999 100644
--- a/webkit/api/src/WebStorageEventDispatcherImpl.h
+++ b/webkit/api/src/WebStorageEventDispatcherImpl.h
@@ -34,9 +34,8 @@
 #if ENABLE(DOM_STORAGE)
 
 #include "StorageEventDispatcherImpl.h"
-#include <wtf/OwnPtr.h>
-
 #include "WebStorageEventDispatcher.h"
+#include <wtf/OwnPtr.h>
 
 namespace WebKit {
 
@@ -46,7 +45,7 @@ public:
 
     virtual void dispatchStorageEvent(const WebString& key, const WebString& oldValue,
                                       const WebString& newValue, const WebString& origin,
-                                      const WebURL& url, bool isLocalStorage);
+                                      const WebURL&, bool isLocalStorage);
 
 private:
     OwnPtr<WebCore::StorageEventDispatcherImpl> m_eventDispatcher;
diff --git a/webkit/api/src/WebString.cpp b/webkit/api/src/WebString.cpp
index cc6112a..f45e05f 100644
--- a/webkit/api/src/WebString.cpp
+++ b/webkit/api/src/WebString.cpp
@@ -31,11 +31,11 @@
 #include "config.h"
 #include "WebString.h"
 
-#include "WebCString.h"
-
+#include "AtomicString.h"
 #include "CString.h"
 #include "PlatformString.h"
-#include "AtomicString.h"
+
+#include "WebCString.h"
 
 namespace WebKit {
 
diff --git a/webkit/api/src/WebURLError.cpp b/webkit/api/src/WebURLError.cpp
index 08c0be2..a038aee 100644
--- a/webkit/api/src/WebURLError.cpp
+++ b/webkit/api/src/WebURLError.cpp
@@ -58,7 +58,7 @@ WebURLError& WebURLError::operator=(const ResourceError& error)
 
 WebURLError::operator ResourceError() const
 {
-    if (reason == 0)
+    if (!reason)
         return ResourceError();
     CString spec = unreachableURL.spec();
     return ResourceError(domain, reason,
diff --git a/webkit/api/src/WebURLRequest.cpp b/webkit/api/src/WebURLRequest.cpp
index a688f98..46fa842 100644
--- a/webkit/api/src/WebURLRequest.cpp
+++ b/webkit/api/src/WebURLRequest.cpp
@@ -31,13 +31,13 @@
 #include "config.h"
 #include "WebURLRequest.h"
 
+#include "ResourceRequest.h"
+
 #include "WebHTTPBody.h"
 #include "WebHTTPHeaderVisitor.h"
 #include "WebURL.h"
 #include "WebURLRequestPrivate.h"
 
-#include "ResourceRequest.h"
-
 using namespace WebCore;
 
 namespace WebKit {
diff --git a/webkit/api/src/WebURLResponse.cpp b/webkit/api/src/WebURLResponse.cpp
index 105689c..49f07f9 100644
--- a/webkit/api/src/WebURLResponse.cpp
+++ b/webkit/api/src/WebURLResponse.cpp
@@ -31,13 +31,13 @@
 #include "config.h"
 #include "WebURLResponse.h"
 
+#include "ResourceResponse.h"
+
 #include "WebHTTPHeaderVisitor.h"
 #include "WebString.h"
 #include "WebURL.h"
 #include "WebURLResponsePrivate.h"
 
-#include "ResourceResponse.h"
-
 using namespace WebCore;
 
 namespace WebKit {
diff --git a/webkit/api/src/WebViewImpl.cpp b/webkit/api/src/WebViewImpl.cpp
index 96840c1..0192c5d 100644
--- a/webkit/api/src/WebViewImpl.cpp
+++ b/webkit/api/src/WebViewImpl.cpp
@@ -49,10 +49,10 @@
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
-#include "HTMLNames.h"
+#include "HitTestResult.h"
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
-#include "HitTestResult.h"
+#include "HTMLNames.h"
 #include "Image.h"
 #include "InspectorController.h"
 #include "IntRect.h"
@@ -167,7 +167,8 @@ void WebView::resetVisitedLinkState()
     Page::allVisitedStateChanged(PageGroup::pageGroup(pageGroupName));
 }
 
-void WebViewImpl::initializeMainFrame(WebFrameClient* frameClient) {
+void WebViewImpl::initializeMainFrame(WebFrameClient* frameClient)
+{
     // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
     // and releases that reference once the corresponding Frame is destroyed.
     RefPtr<WebFrameImpl> frame = WebFrameImpl::create(frameClient);
@@ -444,7 +445,7 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& event)
         return keyEventDefault(event);
 
 #if PLATFORM(WIN_OS) || PLATFORM(LINUX)
-    if (((event.modifiers == 0) && (event.windowsKeyCode == VKEY_APPS))
+    if ((!event.modifiers && (event.windowsKeyCode == VKEY_APPS))
         || ((event.modifiers == WebInputEvent::ShiftKey) && (event.windowsKeyCode == VKEY_F10))) {
         sendContextMenuEvent(event);
         return true;
@@ -917,9 +918,9 @@ void WebViewImpl::setFocus(bool enable)
                 // focused, then the focus element shows with a focus ring but
                 // no caret and does respond to keyboard inputs.
                 Element* element = static_cast<Element*>(focusedNode);
-                if (element->isTextFormControl()) {
+                if (element->isTextFormControl())
                     element->updateFocusAppearance(true);
-                } else {
+                else {
                     // updateFocusAppearance() selects all the text of
                     // contentseditable DIVs. So we set the selection explicitly
                     // instead. Note that this has the side effect of moving the
@@ -1596,7 +1597,8 @@ void WebViewImpl::hideAutofillPopup()
 
 // WebView --------------------------------------------------------------------
 
-bool WebViewImpl::setDropEffect(bool accept) {
+bool WebViewImpl::setDropEffect(bool accept)
+{
     if (m_dragTargetDispatch) {
         m_dropEffect = accept ? DropEffectCopy : DropEffectNone;
         return true;
@@ -1731,11 +1733,12 @@ NotificationPresenterImpl* WebViewImpl::notificationPresenterImpl()
 }
 #endif
 
-void WebViewImpl::refreshAutofillPopup() {
+void WebViewImpl::refreshAutofillPopup()
+{
     ASSERT(m_autocompletePopupShowing);
 
     // Hide the popup if it has become empty.
-    if (m_autocompletePopupClient->listSize() == 0) {
+    if (!m_autocompletePopupClient->listSize()) {
         hideAutoCompletePopup();
         return;
     }
diff --git a/webkit/api/src/WebViewImpl.h b/webkit/api/src/WebViewImpl.h
index 502a0e5..0668904 100644
--- a/webkit/api/src/WebViewImpl.h
+++ b/webkit/api/src/WebViewImpl.h
@@ -31,6 +31,13 @@
 #ifndef WebViewImpl_h
 #define WebViewImpl_h
 
+// FIXME: Remove these relative paths once consumers from glue are removed.
+#include "../public/WebNavigationPolicy.h"
+#include "../public/WebPoint.h"
+#include "../public/WebSize.h"
+#include "../public/WebString.h"
+#include "../public/WebView.h"
+
 #include "BackForwardListClientImpl.h"
 #include "ChromeClientImpl.h"
 #include "ContextMenuClientImpl.h"
@@ -38,12 +45,7 @@
 #include "EditorClientImpl.h"
 #include "InspectorClientImpl.h"
 #include "NotificationPresenterImpl.h"
-// FIXME: remove this relative path once consumers from glue are removed.
-#include "../public/WebNavigationPolicy.h"
-#include "../public/WebPoint.h"
-#include "../public/WebSize.h"
-#include "../public/WebString.h"
-#include "../public/WebView.h"
+
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 
diff --git a/webkit/api/src/WebWorkerBase.cpp b/webkit/api/src/WebWorkerBase.cpp
index 3f19c4b..85a263be 100644
--- a/webkit/api/src/WebWorkerBase.cpp
+++ b/webkit/api/src/WebWorkerBase.cpp
@@ -33,16 +33,17 @@
 
 #include "GenericWorkerTask.h"
 #include "MessagePortChannel.h"
-#include "WorkerThread.h"
-#include <wtf/MainThread.h>
-
 #include "PlatformMessagePortChannel.h"
+
 #include "WebDataSourceImpl.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebMessagePortChannel.h"
-#include "WebWorkerClient.h"
 #include "WebView.h"
+#include "WebWorkerClient.h"
+
+#include "WorkerThread.h"
+#include <wtf/MainThread.h>
 
 using namespace WebCore;
 
diff --git a/webkit/api/src/win/WebInputEventFactory.cpp b/webkit/api/src/win/WebInputEventFactory.cpp
index afc607b..a5bd935 100644
--- a/webkit/api/src/win/WebInputEventFactory.cpp
+++ b/webkit/api/src/win/WebInputEventFactory.cpp
@@ -388,7 +388,7 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(HWND hwnd, UINT message
 
     // Set coordinates by translating event coordinates from screen to client.
     POINT clientPoint = { result.globalX, result.globalY };
-    MapWindowPoints(NULL, hwnd, &clientPoint, 1);
+    MapWindowPoints(0, hwnd, &clientPoint, 1);
     result.x = clientPoint.x;
     result.y = clientPoint.y;
     result.windowX = result.x;
diff --git a/webkit/api/src/win/WebScreenInfoFactory.cpp b/webkit/api/src/win/WebScreenInfoFactory.cpp
index 43cb447..8416acc 100644
--- a/webkit/api/src/win/WebScreenInfoFactory.cpp
+++ b/webkit/api/src/win/WebScreenInfoFactory.cpp
@@ -31,10 +31,10 @@
 #include "config.h"
 #include "WebScreenInfoFactory.h"
 
-#include <windows.h>
-
 #include "WebScreenInfo.h"
 
+#include <windows.h>
+
 namespace WebKit {
 
 static WebRect toWebRect(const RECT& input)
diff --git a/webkit/api/src/x11/WebScreenInfoFactory.cpp b/webkit/api/src/x11/WebScreenInfoFactory.cpp
index 35af6fa..548880c 100644
--- a/webkit/api/src/x11/WebScreenInfoFactory.cpp
+++ b/webkit/api/src/x11/WebScreenInfoFactory.cpp
@@ -31,10 +31,10 @@
 #include "config.h"
 #include "WebScreenInfoFactory.h"
 
-#include <X11/Xlib.h>
-
 #include "WebScreenInfo.h"
 
+#include <X11/Xlib.h>
+
 namespace WebKit {
 
 WebScreenInfo WebScreenInfoFactory::screenInfo(Display* display, int screenNumber)