Makes a number of changes to ease future merging with and upstreaming to webkit.org.

- Fixes whitespace discrepancies between webkit.org and Android versions
- Re-orders Android-specific changes to minimise the diff with webkit.org
- Makes sure all Android-specific changes are appropriately guarded.
- Fixes some Android-specific style problems

None of these should introduce any functional changes for PLATFORM(ANDROID).

Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1

5 files changed, 14 insertions, 13 deletions

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index c03efb0..da3c92b 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -25,6 +25,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+
 #include "config.h"
 #include "Frame.h"
 
@@ -1630,7 +1631,6 @@ void Frame::pageDestroyed()
         page()->focusController()->setFocusedFrame(0);
 
     script()->clearWindowShell();
-
     script()->clearScriptObjects();
     script()->updatePlatformScriptObjects();
 
@@ -1705,7 +1705,6 @@ bool Frame::shouldClose()
     return chrome->runBeforeUnloadConfirmPanel(text, this);
 }
 
-
 void Frame::scheduleClose()
 {
     if (!shouldClose())
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index e7006ed..888e975 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -23,6 +23,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+
 #include "config.h"
 #include "FrameView.h"
 
diff --git a/WebCore/page/Geolocation.idl b/WebCore/page/Geolocation.idl
index e9770ad..e125118 100644
--- a/WebCore/page/Geolocation.idl
+++ b/WebCore/page/Geolocation.idl
@@ -31,6 +31,7 @@ module core {
         [Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
 
         [Custom] long watchPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
+
         void clearWatch(in long watchId);
     };
 
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 98d08d2..df42718 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -138,7 +138,7 @@ Settings::Settings(Page* page)
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
     AtomicString::init();
-#ifdef ANDROID_META_SUPPORT    
+#ifdef ANDROID_META_SUPPORT
     resetMetadataSettings();
 #endif
 }
@@ -444,9 +444,9 @@ void Settings::setMetadataSettings(const String& key, const String& value)
             int width = value.toInt();
             if (width <= 10000) {
                 if (width <= 320) {
-                    // This is a hack to accommodate the pages designed for the 
-                    // original iPhone. The new version, since 10/2007, is to 
-                    // use device-width which works for both portrait and 
+                    // This is a hack to accommodate the pages designed for the
+                    // original iPhone. The new version, since 10/2007, is to
+                    // use device-width which works for both portrait and
                     // landscape modes.
                     m_viewport_width = 0;
                 } else {
@@ -502,25 +502,25 @@ void Settings::setMetadataSettings(const String& key, const String& value)
     } else if (key == "telephone") {
         if (value == "no") {
             m_format_detection_telephone = false;
-        }        
+        }
     } else if (key == "address") {
         if (value == "no") {
             m_format_detection_address = false;
-        }        
+        }
     } else if (key == "email") {
         if (value == "no") {
             m_format_detection_email = false;
-        }        
+        }
     } else if (key == "format-detection") {
-        // even Apple doc says "format-detection" should be the name of the 
-        // <meta> tag. In the real world, e.g. amazon.com, use 
+        // even Apple doc says "format-detection" should be the name of the
+        // <meta> tag. In the real world, e.g. amazon.com, use
         // "format-detection=no" in the "viewport" <meta> tag to disable all
         // format detection.
         if (value == "no") {
             m_format_detection_telephone = false;
             m_format_detection_address = false;
             m_format_detection_email = false;
-        }        
+        }
     }
 }
 #endif
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 344746f..f03e792 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -92,7 +92,7 @@ namespace WebCore {
         bool useWideViewport() const { return m_useWideViewport; }
         void setUseWideViewport(bool use) { m_useWideViewport = use; }
 #endif
-    
+
         void setSerifFontFamily(const AtomicString&);
         const AtomicString& serifFontFamily() const { return m_serifFontFamily; }