Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.

This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.

This has already been submitted to master branch.

18 files changed, 22 insertions, 21 deletions

diff --git a/WebCore/config.h b/WebCore/config.h
index d950ef6..21442bf 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004, 2005, 2006 Apple Inc.
- *
+ * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp
index 4ad090b..b711759 100644
--- a/WebCore/dom/Event.cpp
+++ b/WebCore/dom/Event.cpp
@@ -171,7 +171,7 @@ bool Event::isErrorEvent() const
     return false;
 }
 #endif
-
+    
 bool Event::storesResultAsString() const
 {
     return false;
diff --git a/WebCore/dom/Event.h b/WebCore/dom/Event.h
index b6a9c8f..0b9bcf0 100644
--- a/WebCore/dom/Event.h
+++ b/WebCore/dom/Event.h
@@ -125,7 +125,7 @@ namespace WebCore {
 #if ENABLE(WORKERS)
         virtual bool isErrorEvent() const;
 #endif
-
+        
         bool propagationStopped() const { return m_propagationStopped; }
 
         bool defaultPrevented() const { return m_defaultPrevented; }
diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h
index 356349e..fdc1776 100644
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -122,7 +122,7 @@ private:
     Document* m_doc;
     
     int m_requestCount;
-
+    
     ListHashSet<CachedResource*> m_preloads;
     struct PendingPreload {
         CachedResource::Type m_type;
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index 1835f69..c0af78f 100644
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -1375,7 +1375,7 @@ void* IconDatabase::syncThreadMainLoop()
             didAnyWork = readFromDatabase();
             if (shouldStopThreadActivity())
                 break;
-               
+                
             // Prune unretained icons after the first time we sync anything out to the database
             // This way, pruning won't be the only operation we perform to the database by itself
             // We also don't want to bother doing this if the thread should be terminating (the user is quitting)
diff --git a/WebCore/page/PageGroup.h b/WebCore/page/PageGroup.h
index 8c842b9..f92c2e6 100644
--- a/WebCore/page/PageGroup.h
+++ b/WebCore/page/PageGroup.h
@@ -44,7 +44,7 @@ namespace WebCore {
 
         static PageGroup* pageGroup(const String& groupName);
         static void closeLocalStorage();
-
+        
         const HashSet<Page*>& pages() const { return m_pages; }
 
         void addPage(Page*);
diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp
index 99e18a6..e67a277 100644
--- a/WebCore/page/android/DragControllerAndroid.cpp
+++ b/WebCore/page/android/DragControllerAndroid.cpp
@@ -38,8 +38,8 @@ bool DragController::isCopyKeyDown()
     
 DragOperation DragController::dragOperation(DragData* dragData)
 {
-    //FIXME: This logic is incomplete  
-    ASSERT(0);      
+    // FIXME: This logic is incomplete
+    ASSERT(0);
     if (dragData->containsURL())
         return DragOperationCopy;
 
diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h
index cd918d6..256d490 100644
--- a/WebCore/platform/SharedBuffer.h
+++ b/WebCore/platform/SharedBuffer.h
@@ -61,7 +61,7 @@ public:
     // The buffer must be in non-purgeable state before adopted to a SharedBuffer. 
     // It will stay that way until released.
     static PassRefPtr<SharedBuffer> adoptPurgeableBuffer(PurgeableBuffer* buffer);
-
+    
 #if PLATFORM(ANDROID)
     virtual
 #endif
diff --git a/WebCore/platform/SystemTime.h b/WebCore/platform/SystemTime.h
index 2620b94..361d446 100644
--- a/WebCore/platform/SystemTime.h
+++ b/WebCore/platform/SystemTime.h
@@ -30,7 +30,7 @@ namespace WebCore {
 
     // Return the number of seconds since a user event has been generated
     float userIdleTime();
- 
+    
 }
 
 #endif
diff --git a/WebCore/platform/Timer.cpp b/WebCore/platform/Timer.cpp
index d4235d9..bd29fd8 100644
--- a/WebCore/platform/Timer.cpp
+++ b/WebCore/platform/Timer.cpp
@@ -332,3 +332,4 @@ void TimerBase::fireTimersInNestedEventLoop()
 }
 
 } // namespace WebCore
+
diff --git a/WebCore/platform/android/ClipboardAndroid.h b/WebCore/platform/android/ClipboardAndroid.h
index 3d26ef4..f11798d 100644
--- a/WebCore/platform/android/ClipboardAndroid.h
+++ b/WebCore/platform/android/ClipboardAndroid.h
@@ -51,7 +51,7 @@ namespace WebCore {
     
         void setDragImage(CachedImage*, const IntPoint&);
         void setDragImageElement(Node*, const IntPoint&);
-		
+        
         virtual DragImageRef createDragImage(IntPoint&) const;
         virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*);
         virtual void writeURL(const KURL&, const String&, Frame*);
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 39c0bb7..482565b 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -454,7 +454,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&)
 
 #if USE(JSC)
 namespace JSC { namespace Bindings {
-bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType,
+bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType, 
         jmethodID methodID, jvalue* args, jvalue& result, const char* callingURL, JSValue& exceptionDescription)
 {
     notImplemented();
diff --git a/WebCore/platform/graphics/skia/SkiaUtils.cpp b/WebCore/platform/graphics/skia/SkiaUtils.cpp
index 662ea5c..bb15aa2 100644
--- a/WebCore/platform/graphics/skia/SkiaUtils.cpp
+++ b/WebCore/platform/graphics/skia/SkiaUtils.cpp
@@ -131,10 +131,10 @@ SkColor SkPMColorToColor(SkPMColor pm)
 {
     if (0 == pm)
         return 0;
-
+    
     unsigned a = SkGetPackedA32(pm);
     uint32_t scale = (255 << 16) / a;
-
+    
     return SkColorSetARGB(a,
                           InvScaleByte(SkGetPackedR32(pm), scale),
                           InvScaleByte(SkGetPackedG32(pm), scale),
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index c6b0cae..eeb4af4 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -401,7 +401,7 @@ void PluginView::performRequest(PluginRequest* request)
     // Targeted JavaScript requests are only allowed on the frame that contains the JavaScript plugin
     // and this has been made sure in ::load.
     ASSERT(targetFrameName.isEmpty() || m_parentFrame->tree()->find(targetFrameName) == m_parentFrame);
-
+    
 #if USE(JSC)
     // Executing a script can cause the plugin view to be destroyed, so we keep a reference to the parent frame.
     RefPtr<Frame> parentFrame = m_parentFrame;
@@ -1194,11 +1194,11 @@ void PluginView::paintMissingPluginIcon(GraphicsContext* context, const IntRect&
     int yOffset = (frameRect().height() - imageRect.height()) / 2;
 
     imageRect.move(xOffset, yOffset);
-    
+
     if (!rect.intersects(imageRect)) {
         return;
     }
-    
+
     context->save();
     context->clip(windowClipRect());
     context->drawImage(nullPluginImage.get(), imageRect.location());
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 5c39535..f88bfdf 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -299,7 +299,7 @@ namespace WebCore {
         NPP m_instance;
         NPP_t m_instanceStruct;
         NPWindow m_npWindow;
-        
+
         Vector<bool, 4> m_popupStateStack;
 
         HashSet<RefPtr<PluginStream> > m_streams;
diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp
index 6bbcc43..84c94e4 100644
--- a/WebCore/rendering/RenderFlexibleBox.cpp
+++ b/WebCore/rendering/RenderFlexibleBox.cpp
@@ -218,7 +218,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
 
     int previousWidth = width();
     int previousHeight = height();
-
+    
     #ifdef ANDROID_LAYOUT
     int previousVisibleWidth = m_visibleWidth;
 #endif
diff --git a/WebCore/rendering/RenderFrameSet.cpp b/WebCore/rendering/RenderFrameSet.cpp
index 0838798..041a025 100644
--- a/WebCore/rendering/RenderFrameSet.cpp
+++ b/WebCore/rendering/RenderFrameSet.cpp
@@ -520,7 +520,7 @@ void RenderFrameSet::positionFrames()
 
     int rows = frameSet()->totalRows();
     int cols = frameSet()->totalCols();
-    
+
     int yPos = 0;
     int borderThickness = frameSet()->border();
 #ifdef FLATTEN_FRAMESET
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index 089fe85..a486b34 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -169,7 +169,7 @@ protected:
 
 private:
     bool shouldRepaint(const IntRect& r) const;
-
+        
 #ifdef FLATTEN_FRAMESET
 public: // used by layout function
 #endif