auto import from //branches/cupcake/...@127101

22 files changed, 799 insertions, 348 deletions

diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h
index 78df197..1b82ab4 100644
--- a/WebCore/platform/Widget.h
+++ b/WebCore/platform/Widget.h
@@ -198,7 +198,7 @@ private:
     
     IntRect m_frame; // Not used when a native widget exists.
 
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(ANDROID)
+#if PLATFORM(MAC) || PLATFORM(GTK)
     WidgetPrivate* m_data;
 #endif
 #if PLATFORM(ANDROID)
diff --git a/WebCore/platform/android/ClipboardAndroid.cpp b/WebCore/platform/android/ClipboardAndroid.cpp
index 83c65e2..942c628 100644
--- a/WebCore/platform/android/ClipboardAndroid.cpp
+++ b/WebCore/platform/android/ClipboardAndroid.cpp
@@ -28,35 +28,13 @@
 #include "ClipboardAndroid.h"
 
 #include "CachedImage.h"
-#include "CSSHelper.h"
-#include "CString.h"
-#include "Document.h"
-#include "DragData.h"
 #include "Element.h"
-#include "EventHandler.h"
 #include "Frame.h"
-#include "FrameLoader.h"
-#include "FrameView.h"
-#include "HTMLNames.h"
-#include "Image.h"
-//#include "MimeTypeRegistry.h"
-#include "markup.h"
-#include "Page.h"
-#include "Pasteboard.h"
-#include "PlatformMouseEvent.h"
-#include "PlatformString.h"
 #include "Range.h"
-#include "RenderImage.h"
-#include "ResourceResponse.h"
-#include "StringHash.h"
-
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-using namespace HTMLNames;
-
-// format string for 
+// format string for
 static const char szShellDotUrlTemplate[] = "[InternetShortcut]\r\nURL=%s\r\n";
 
 // We provide the IE clipboard types (URL and Text), and the clipboard types specified in the WHATWG Web Applications 1.0 draft
@@ -119,8 +97,9 @@ String ClipboardAndroid::getData(const String& type, bool& success) const
         return "";
     }
 
+    /*
     ClipboardDataType dataType = clipboardTypeFromMIMEType(type);
-   /* if (dataType == ClipboardDataTypeText)
+    if (dataType == ClipboardDataTypeText)
         return getPlainText(m_dataObject.get(), success);
     else if (dataType == ClipboardDataTypeURL) 
         return getURL(m_dataObject.get(), success);
diff --git a/WebCore/platform/android/ContextMenuClientAndroid.cpp b/WebCore/platform/android/ContextMenuClientAndroid.cpp
index 4b75333..7aabfc9 100644
--- a/WebCore/platform/android/ContextMenuClientAndroid.cpp
+++ b/WebCore/platform/android/ContextMenuClientAndroid.cpp
@@ -25,8 +25,9 @@
 
 #include "config.h"
 #include "ContextMenuClientAndroid.h"
+
 #include "NotImplemented.h"
-#include "wtf/Assertions.h"
+#include <wtf/Assertions.h>
 
 namespace WebCore {
     
diff --git a/WebCore/platform/android/ContextMenuClientAndroid.h b/WebCore/platform/android/ContextMenuClientAndroid.h
index 9d91a3a..1860e4e 100644
--- a/WebCore/platform/android/ContextMenuClientAndroid.h
+++ b/WebCore/platform/android/ContextMenuClientAndroid.h
@@ -45,6 +45,6 @@ public:
     virtual void stopSpeaking();
 };
 
-}
+} // namespace WebCore
 
-#endif
+#endif  // ContextMenuClientAndroid_h
diff --git a/WebCore/platform/android/CursorAndroid.cpp b/WebCore/platform/android/CursorAndroid.cpp
index e84070f..7564384 100644
--- a/WebCore/platform/android/CursorAndroid.cpp
+++ b/WebCore/platform/android/CursorAndroid.cpp
@@ -31,12 +31,12 @@
 
 namespace WebCore {
 
-Cursor::Cursor(Image* image, const IntPoint& )
+Cursor::Cursor(Image*, const IntPoint&)
 {
     notImplemented();
 }
 
-Cursor::Cursor(const Cursor& other)
+Cursor::Cursor(const Cursor&)
 {
     notImplemented();
 }
@@ -46,7 +46,7 @@ Cursor::~Cursor()
     notImplemented();
 }
 
-Cursor& Cursor::operator=(const Cursor& other)
+Cursor& Cursor::operator=(const Cursor&)
 {
     notImplemented();
     return *this;
@@ -255,7 +255,7 @@ const Cursor& noneCursor()
     return c;
 }
 
-    // new as of SVN change 36269, Sept 8, 2008
+// new as of SVN change 36269, Sept 8, 2008
 const Cursor& middlePanningCursor()
 {
     notImplemented();
@@ -319,8 +319,17 @@ const Cursor& westPanningCursor()
     return c;
 }
 
-    // new as of SVN change 38068, Nov 5, 2008
-const Cursor& grabCursor() {}
-const Cursor& grabbingCursor() {}
+// new as of SVN change 38068, Nov 5, 2008
+const Cursor& grabCursor() {
+    notImplemented();
+    static Cursor c;
+    return c;
+}
+
+const Cursor& grabbingCursor() {
+    notImplemented();
+    static Cursor c;
+    return c;
+}
 
 }
diff --git a/WebCore/platform/android/DragDataAndroid.cpp b/WebCore/platform/android/DragDataAndroid.cpp
index dca50a8..d62df20 100644
--- a/WebCore/platform/android/DragDataAndroid.cpp
+++ b/WebCore/platform/android/DragDataAndroid.cpp
@@ -61,7 +61,7 @@ class Clipboard : public RefCounted<Clipboard> {};
 
 PassRefPtr<Clipboard> DragData::createClipboard(ClipboardAccessPolicy) const
 {
-    return PassRefPtr<Clipboard>(NULL);
+    return PassRefPtr<Clipboard>(0);
 }
     
 bool DragData::containsCompatibleContent() const
diff --git a/WebCore/platform/android/EventLoopAndroid.cpp b/WebCore/platform/android/EventLoopAndroid.cpp
index 86be31f..3a6d7ed 100644
--- a/WebCore/platform/android/EventLoopAndroid.cpp
+++ b/WebCore/platform/android/EventLoopAndroid.cpp
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "EventLoop.h"
+
 #include "NotImplemented.h"
 
 namespace WebCore {
diff --git a/WebCore/platform/android/FileChooserAndroid.cpp b/WebCore/platform/android/FileChooserAndroid.cpp
index 4b72343..004b653 100644
--- a/WebCore/platform/android/FileChooserAndroid.cpp
+++ b/WebCore/platform/android/FileChooserAndroid.cpp
@@ -25,10 +25,8 @@
 
 #include "config.h"
 #include "FileChooser.h"
+
 #include "Font.h"
-#include "Icon.h"
-#include "LocalizedStrings.h"
-#include "PlatformString.h"
 
 namespace WebCore {
 
@@ -41,7 +39,6 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
         output = output.replace(output.length() - 4, 4, String("..."));
     }
     return output;
-    
 }
 
 
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp
index d7cfbf1..b6d58bc 100644
--- a/WebCore/platform/android/FileSystemAndroid.cpp
+++ b/WebCore/platform/android/FileSystemAndroid.cpp
@@ -26,9 +26,8 @@
  */
 
 #include "config.h"
-
 #include "FileSystem.h"
-#include "PlatformString.h"
+
 #include "CString.h"
 #include <dlfcn.h>
 #include <errno.h>
@@ -93,7 +92,7 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
     return totalBytesWritten;
 }
 
-    // new as of SVN change 36269, Sept 8, 2008
+// new as of SVN change 36269, Sept 8, 2008
 String homeDirectoryPath() 
 {
     return sPluginPath;
diff --git a/WebCore/platform/android/KeyEventAndroid.cpp b/WebCore/platform/android/KeyEventAndroid.cpp
index 7260320..1a245a4 100644
--- a/WebCore/platform/android/KeyEventAndroid.cpp
+++ b/WebCore/platform/android/KeyEventAndroid.cpp
@@ -24,16 +24,17 @@
  */
 
 #include "config.h"
+#include "PlatformKeyboardEvent.h"
+
 #include "KeyboardCodes.h"
 #include "NotImplemented.h"
-#include "PlatformKeyboardEvent.h"
 #include <ui/KeycodeLabels.h>
 
 namespace WebCore {
 
 // compare to same function in gdk/KeyEventGdk.cpp
 static int windowsKeyCodeForKeyEvent(unsigned int keyCode) {
-// Does not provide all key codes, and does not handle all keys.
+    // Does not provide all key codes, and does not handle all keys.
     switch(keyCode) {
         case kKeyCodeDel:
             return VK_BACK;
@@ -161,9 +162,8 @@ static int windowsKeyCodeForKeyEvent(unsigned int keyCode) {
 
 static String keyIdentifierForAndroidKeyCode(int keyCode)
 {
-/*  Does not return all of the same key identifiers, and
- *  does not handle all the keys.
- */
+    // Does not return all of the same key identifiers, and
+    // does not handle all the keys.
     switch (keyCode) {
         case kKeyCodeClear:
             return "Clear";
@@ -180,7 +180,7 @@ static String keyIdentifierForAndroidKeyCode(int keyCode)
             return "Right";
         case kKeyCodeDpadUp:
             return "Up";
-            // Standard says that DEL becomes U+00007F.
+        // Standard says that DEL becomes U+00007F.
         case kKeyCodeDel:
             return "U+00007F";
         default:
diff --git a/WebCore/platform/android/KeyboardCodes.h b/WebCore/platform/android/KeyboardCodes.h
index 758ee5e..321e9da 100644
--- a/WebCore/platform/android/KeyboardCodes.h
+++ b/WebCore/platform/android/KeyboardCodes.h
@@ -542,4 +542,4 @@ const int VK_UNKNOWN = 0;
 
 }
 
-#endif
+#endif // KeyboardCodes_h
diff --git a/WebCore/platform/android/LocalizedStringsAndroid.cpp b/WebCore/platform/android/LocalizedStringsAndroid.cpp
index 42152e5..540dc04 100644
--- a/WebCore/platform/android/LocalizedStringsAndroid.cpp
+++ b/WebCore/platform/android/LocalizedStringsAndroid.cpp
@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-
 #include "LocalizedStrings.h"
+
 #include "NotImplemented.h"
 #include "PlatformString.h"
 
diff --git a/WebCore/platform/android/PopupMenuAndroid.cpp b/WebCore/platform/android/PopupMenuAndroid.cpp
index 61e0535..2cc244b 100644
--- a/WebCore/platform/android/PopupMenuAndroid.cpp
+++ b/WebCore/platform/android/PopupMenuAndroid.cpp
@@ -36,7 +36,7 @@ PopupMenu::~PopupMenu()
 {
 }
 
-void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
+void PopupMenu::show(const IntRect&, FrameView*, int)
 {
 
 }
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 25e74bd..9cccc0c 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "RenderThemeAndroid.h"
-#include "PopupMenu.h"
+
 #include "RenderSkinAndroid.h"
 #include "RenderSkinButton.h"
 #include "RenderSkinCombo.h"
@@ -48,6 +48,7 @@
 #define LISTBOX_PADDING 5
 
 namespace WebCore {
+
 static SkCanvas* getCanvasFromInfo(const RenderObject::PaintInfo& info)
 {
     return info.context->platformContext()->mCanvas;
@@ -59,7 +60,6 @@ static SkCanvas* getCanvasFromInfo(const RenderObject::PaintInfo& info)
  *      the object to be painted, the PaintInfo, from which we get the canvas, the bounding rectangle, 
  *  returns false, meaning no one else has to paint it
 */
-
 static bool paintBrush(RenderSkinAndroid* rSkin, RenderObject* o, const RenderObject::PaintInfo& i,  const IntRect& ir)
 {
     Node* element = o->element();
@@ -96,7 +96,6 @@ RenderThemeAndroid::~RenderThemeAndroid()
 
 void RenderThemeAndroid::close()
 {
-
 }
 
 bool RenderThemeAndroid::stateChanged(RenderObject* o, ControlState state) const
@@ -280,9 +279,6 @@ bool RenderThemeAndroid::paintCombo(RenderObject* o, const RenderObject::PaintIn
     if (o->style() && o->style()->backgroundColor().alpha() == 0)
         return true;
     Node* element = o->element();
-    SkCanvas* canvas = getCanvasFromInfo(i);
-    m_combo->notifyState(element);
-    canvas->save();
     int height = ir.height();
     int y = ir.y();
     // If the combo box is too large, leave it at its max height, and center it.
@@ -290,11 +286,7 @@ bool RenderThemeAndroid::paintCombo(RenderObject* o, const RenderObject::PaintIn
         y += (height - MAX_COMBO_HEIGHT) >> 1;
         height = MAX_COMBO_HEIGHT;
     }
-    canvas->translate(SkIntToScalar(ir.x()), SkIntToScalar(y));
-    m_combo->setDim(ir.width(), height);
-    m_combo->draw(i.context->platformContext());
-    canvas->restore();
-    return false;
+    return m_combo->Draw(getCanvasFromInfo(i), element, ir.x(), y, ir.width(), height);
 }
 
 bool RenderThemeAndroid::paintMenuList(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& ir) 
@@ -304,12 +296,28 @@ bool RenderThemeAndroid::paintMenuList(RenderObject* o, const RenderObject::Pain
 
 void RenderThemeAndroid::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
+    // Copied from RenderThemeSafari.
+    const float baseFontSize = 11.0f;
+    const int baseBorderRadius = 5;
+    float fontScale = style->fontSize() / baseFontSize;
+    
+    style->resetPadding();
+    style->setBorderRadius(IntSize(int(baseBorderRadius + fontScale - 1), int(baseBorderRadius + fontScale - 1))); // FIXME: Round up?
+
+    const int minHeight = 15;
+    style->setMinHeight(Length(minHeight, Fixed));
+    
+    style->setLineHeight(RenderStyle::initialLineHeight());
+    // Found these padding numbers by trial and error.
+    const int padding = 4;
+    style->setPaddingTop(Length(padding, Fixed));
+    style->setPaddingLeft(Length(padding, Fixed));
+    // Added to make room for our arrow.
     style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed));
-    addIntrinsicMargins(style);
 }
 
 bool RenderThemeAndroid::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& ir) 
-{ 
+{
     return paintCombo(o, i, ir);
 }
 
diff --git a/WebCore/platform/android/RenderThemeAndroid.h b/WebCore/platform/android/RenderThemeAndroid.h
index 1844aed..632a2a3 100644
--- a/WebCore/platform/android/RenderThemeAndroid.h
+++ b/WebCore/platform/android/RenderThemeAndroid.h
@@ -30,7 +30,6 @@
 
 namespace WebCore {
 
-class PopupMenu;
 class RenderSkinButton;
 class RenderSkinRadio;
 class RenderSkinCombo;
@@ -93,7 +92,6 @@ protected:
     virtual void adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     virtual bool paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
 
-
 private:
     void addIntrinsicMargins(RenderStyle* style) const;
     void close();
@@ -105,7 +103,7 @@ private:
     RenderSkinCombo*    m_combo;
 };
 
-};
+} // namespace WebCore
 
-#endif
+#endif // RenderThemeAndroid_h
 
diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp
index 20e0f68..c1e43b0 100644
--- a/WebCore/platform/android/ScreenAndroid.cpp
+++ b/WebCore/platform/android/ScreenAndroid.cpp
@@ -25,6 +25,7 @@
  */
 
 #define LOG_TAG "WebCore"
+
 #include "config.h"
 #include "Screen.h"
 
diff --git a/WebCore/platform/android/ScrollViewAndroid.cpp b/WebCore/platform/android/ScrollViewAndroid.cpp
index e86ff5e..5622d8b 100644
--- a/WebCore/platform/android/ScrollViewAndroid.cpp
+++ b/WebCore/platform/android/ScrollViewAndroid.cpp
@@ -28,11 +28,8 @@
 #include "ScrollView.h"
 
 #include "FloatRect.h"
-#include "Frame.h"
 #include "FrameView.h"
-#include "HostWindow.h"
 #include "IntRect.h"
-#include "NotImplemented.h"
 #include "WebCoreFrameBridge.h"
 #include "WebCoreViewBridge.h"
 #include "WebViewCore.h"
diff --git a/WebCore/platform/android/SearchPopupMenuAndroid.cpp b/WebCore/platform/android/SearchPopupMenuAndroid.cpp
index fddfcf2..fa976e7 100644
--- a/WebCore/platform/android/SearchPopupMenuAndroid.cpp
+++ b/WebCore/platform/android/SearchPopupMenuAndroid.cpp
@@ -23,9 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SearchPopupMenuAndroid_h
-#define SearchPopupMenuAndroid_h
-
 #include "config.h"
 #include "SearchPopupMenu.h"
 
@@ -34,31 +31,22 @@ namespace WebCore {
 // Save the past searches stored in 'searchItems' to a database associated with 'name'
 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 
 { 
-    
     //ASSERT(0); //notImplemented(); 
-
 }
 
 // Load past searches associated with 'name' from the database to 'searchItems'
 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 
 { 
-
     //ASSERT(0); //notImplemented(); 
-
 }
 
 // Create a search popup menu - not sure what else we have to do here
 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) : PopupMenu(client) 
 { 
-    
     //ASSERT(0); //notImplemented(); 
-    
 }
         
 // functions new to Jun-07 tip of tree merge:
 bool SearchPopupMenu::enabled() { return false; }
 
-}   // WebCore
-
-#endif
-
+}  // namespace WebCore
diff --git a/WebCore/platform/android/SharedTimerAndroid.cpp b/WebCore/platform/android/SharedTimerAndroid.cpp
index fb856cc..d797cfb 100644
--- a/WebCore/platform/android/SharedTimerAndroid.cpp
+++ b/WebCore/platform/android/SharedTimerAndroid.cpp
@@ -26,6 +26,7 @@
 
 #include "config.h"
 #include "SharedTimer.h"
+
 #include "SystemTime.h"
 #include "JavaSharedClient.h"
 #include "TimerClient.h"
@@ -35,31 +36,29 @@ using namespace android;
 
 namespace WebCore {
 
-    // Single timer, shared to implement all the timers managed by the Timer class.
-    // Not intended to be used directly; use the Timer class instead.
-
-    void setSharedTimerFiredFunction(void (*f)())
-    {
-        if (JavaSharedClient::GetTimerClient())
-            JavaSharedClient::GetTimerClient()->setSharedTimerCallback(f);
-    }
+// Single timer, shared to implement all the timers managed by the Timer class.
+// Not intended to be used directly; use the Timer class instead.
+void setSharedTimerFiredFunction(void (*f)())
+{
+    if (JavaSharedClient::GetTimerClient())
+        JavaSharedClient::GetTimerClient()->setSharedTimerCallback(f);
+}
 
-    // The fire time is relative to the classic POSIX epoch of January 1, 1970,
-    // as the result of currentTime() is.
+// The fire time is relative to the classic POSIX epoch of January 1, 1970,
+// as the result of currentTime() is.
+void setSharedTimerFireTime(double fireTime)
+{
+    long long timeInMS = (long long)((fireTime - currentTime()) * 1000);
 
-    void setSharedTimerFireTime(double fireTime)
-    {
-        long long timeInMS = (long long)((fireTime - currentTime()) * 1000);
-    
-        LOGV("setSharedTimerFireTime: in %ld millisec", timeInMS);
-        if (JavaSharedClient::GetTimerClient())
-            JavaSharedClient::GetTimerClient()->setSharedTimer(timeInMS);
-    }
-    
-    void stopSharedTimer()
-    {
-        if (JavaSharedClient::GetTimerClient())
-            JavaSharedClient::GetTimerClient()->stopSharedTimer();
-    }
+    LOGV("setSharedTimerFireTime: in %ld millisec", timeInMS);
+    if (JavaSharedClient::GetTimerClient())
+        JavaSharedClient::GetTimerClient()->setSharedTimer(timeInMS);
+}
 
+void stopSharedTimer()
+{
+    if (JavaSharedClient::GetTimerClient())
+        JavaSharedClient::GetTimerClient()->stopSharedTimer();
 }
+
+}  // namespace WebCore
diff --git a/WebCore/platform/android/SystemTimeAndroid.cpp b/WebCore/platform/android/SystemTimeAndroid.cpp
index a3ab1ea..9ac32dc 100644
--- a/WebCore/platform/android/SystemTimeAndroid.cpp
+++ b/WebCore/platform/android/SystemTimeAndroid.cpp
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "SystemTime.h"
+
 #include <sys/time.h>
 
 namespace WebCore {
@@ -55,4 +56,4 @@ uint32_t get_thread_msec()
 #endif
 }
 
-}
+}  // namespace WebCore
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 349a75c..01789f4 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -90,12 +90,11 @@
 
 using namespace WebCore;
 
-// This function is called when the frame view has changed the state of it's border. 
+// This function is called when the frame view has changed the state of it's border.
 // iFrames, which are have a FrameView, are drawn with a 1px left/right border and 2px top/bottom border
 // Check function _shouldDrawBorder in WebFrameView.mm
 // We don't draw borders unless css draws them.
-// void FrameView::updateBorder() { verifiedOk(); }
-
+//void FrameView::updateBorder() { verifiedOk(); }
 //int WebCore::screenDepthPerComponent(Widget*) { ASSERT(0); notImplemented(); return 0; }
 //bool WebCore::screenIsMonochrome(Widget*) { ASSERT(0); notImplemented(); return false; }
 
@@ -106,36 +105,66 @@ using namespace WebCore;
 // This function is used by Javascript to find out what the default language
 // the user has selected. It is used by the JS object Navigator.language
 // I guess this information should be mapped with the Accept-Language: HTTP header.
-String WebCore::defaultLanguage() { verifiedOk(); return "en"; }
+String WebCore::defaultLanguage()
+{
+    verifiedOk();
+    return "en";
+}
 
 namespace WebCore {
 
 #if !defined(ANDROID_PLUGINS)
 // If plugins support is turned on, don't use these stubs.
 
-// Except for supportsMIMEType(), these Plugin functions are used by javascript's 
-// navigator.plugins[] object to provide the list of available plugins. This is most 
+// Except for supportsMIMEType(), these Plugin functions are used by javascript's
+// navigator.plugins[] object to provide the list of available plugins. This is most
 // often used with to check to see if the browser supports Flash or which video
 // codec to use.
 // The supportsMIMEType() is used by the Frame to determine if a full screen instance
 // of a plugin can be used to render a mimetype that is not native to the browser.
-PluginInfo* PluginInfoStore::createPluginInfoForPluginAtIndex(unsigned) { ASSERT(0); return 0;}
-unsigned PluginInfoStore::pluginCount() const { verifiedOk(); return 0; }
-// FIXME, return false for now.
-String PluginInfoStore::pluginNameForMIMEType(const String& ) { notImplemented(); return String(); }
-bool PluginInfoStore::supportsMIMEType(const String& ) { verifiedOk(); return false; }
-void refreshPlugins(bool) { verifiedOk(); }
+PluginInfo* PluginInfoStore::createPluginInfoForPluginAtIndex(unsigned)
+{
+    ASSERT(0);
+    return 0;
+}
+
+unsigned PluginInfoStore::pluginCount() const
+{
+    verifiedOk();
+    return 0;
+}
+
+String PluginInfoStore::pluginNameForMIMEType(const String&)
+{
+    notImplemented();
+    return String();
+}
+
+bool PluginInfoStore::supportsMIMEType(const String&)
+{
+    verifiedOk();
+    return false;
+}
+
+void refreshPlugins(bool)
+{
+    verifiedOk();
+}
+
 #endif // !defined(ANDROID_PLUGINS)
 
 // This function tells the bridge that a resource was loaded from the cache and thus
 // the app may update progress with the amount of data loaded.
-void CheckCacheObjectStatus(DocLoader*, CachedResource*) { ASSERT(0); notImplemented();}
+void CheckCacheObjectStatus(DocLoader*, CachedResource*)
+{
+    ASSERT(0);
+    notImplemented();
+}
 
 // This class is used in conjunction with the File Upload form element, and
 // therefore relates to the above. When a file has been selected, an icon
 // representing the file type can be rendered next to the filename on the
 // web page. The icon for the file is encapsulated within this class.
-//Icon::Icon() { notImplemented(); }
 Icon::~Icon() { }
 void Icon::paint(GraphicsContext*, const IntRect&) { }
 
@@ -144,102 +173,449 @@ void Icon::paint(GraphicsContext*, const IntRect&) { }
 // The following functions are used to fetch localized text for HTML form
 // elements submit and reset. These strings are used when the page author
 // has not specified any text for these buttons.
-String submitButtonDefaultLabel() { verifiedOk(); return "Submit"; }
-String resetButtonDefaultLabel() { verifiedOk(); return "Reset"; }
+String submitButtonDefaultLabel()
+{
+    verifiedOk();
+    return "Submit";
+}
+
+String resetButtonDefaultLabel()
+{
+    verifiedOk();
+    return "Reset";
+}
 
 // The alt text for an input element is not used visually, but rather is
-// used for accessability - eg reading the web page. See 
+// used for accessability - eg reading the web page. See
 // HTMLInputElement::altText() for more information.
-String inputElementAltText() { notImplemented(); return String(); }
+String inputElementAltText()
+{
+    notImplemented();
+    return String();
+}
 
 // This is the string that appears before an input box when the HTML element
-// <ISINDEX> is used. The returned string is used if no PROMPT attribute is 
+// <ISINDEX> is used. The returned string is used if no PROMPT attribute is
 // provided.
 // note: Safari and FireFox use (too long for us imho) "This is a searchable index. Enter search keywords:"
-String searchableIndexIntroduction() { verifiedOk(); return String("Enter search:"); }
-
+String searchableIndexIntroduction()
+{
+    verifiedOk();
+    return String("Enter search:");
 }
 
 // This function provides the default value for the CSS property:
 // -webkit-focus-ring-color
 // It is also related to the CSS property outline-color:
-Color WebCore::focusRingColor() { verifiedOk(); return 0xFF0000FF; }
+Color focusRingColor()
+{
+    verifiedOk();
+    return 0xFF0000FF;
+}
 
 // LocalizedStrings
-String WebCore::contextMenuItemTagOpenLinkInNewWindow() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagDownloadLinkToDisk() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCopyLinkToClipboard() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagOpenImageInNewWindow() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagDownloadImageToDisk() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCopyImageToClipboard() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagOpenFrameInNewWindow() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCopy() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagGoBack() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagGoForward() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagStop() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagReload() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCut() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagPaste() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagNoGuessesFound() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagIgnoreSpelling() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagLearnSpelling() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagSearchWeb() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagLookUpInDictionary() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagOpenLink() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagIgnoreGrammar() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagSpellingMenu() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagShowSpellingPanel(bool show) { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCheckSpelling() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCheckSpellingWhileTyping() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagCheckGrammarWithSpelling() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagFontMenu() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagBold() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagItalic() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagUnderline() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagOutline() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagWritingDirectionMenu() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagDefaultDirection() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagLeftToRight() { ASSERT(0); return String(); }
-String WebCore::contextMenuItemTagRightToLeft() { ASSERT(0); return String(); }
+String contextMenuItemTagOpenLinkInNewWindow()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagDownloadLinkToDisk()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCopyLinkToClipboard()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagOpenImageInNewWindow()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagDownloadImageToDisk()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCopyImageToClipboard()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagOpenFrameInNewWindow()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCopy()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagGoBack()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagGoForward()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagStop()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagReload()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCut()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagPaste()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagNoGuessesFound()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagIgnoreSpelling()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagLearnSpelling()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagSearchWeb()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagLookUpInDictionary()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagOpenLink()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagIgnoreGrammar()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagSpellingMenu()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagShowSpellingPanel(bool)
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCheckSpelling()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCheckSpellingWhileTyping()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagCheckGrammarWithSpelling()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagFontMenu()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagBold()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagItalic()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagUnderline()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagOutline()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagWritingDirectionMenu()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagDefaultDirection()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagLeftToRight()
+{
+    ASSERT(0);
+    return String();
+}
+
+String contextMenuItemTagRightToLeft()
+{
+    ASSERT(0);
+    return String();
+}
+
+}  // namespace WebCore
 
 // FIXME, no support for spelling yet.
-Pasteboard* Pasteboard::generalPasteboard() { return new Pasteboard(); }
-void Pasteboard::writeSelection(Range*, bool canSmartCopyOrDelete, Frame*) { notImplemented(); }
-void Pasteboard::writeURL(const KURL&, const String&, Frame*) { notImplemented(); }
-void Pasteboard::clear() { notImplemented(); }
-bool Pasteboard::canSmartReplace() { notImplemented(); return false; }
-PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame*, PassRefPtr<Range>, bool allowPlainText, bool& chosePlainText) { notImplemented(); return 0; }
-String Pasteboard::plainText(Frame* frame) { notImplemented(); return String(); }
-Pasteboard::Pasteboard() { notImplemented(); }
-Pasteboard::~Pasteboard() { notImplemented(); }
-
-ContextMenu::ContextMenu(const HitTestResult& result) : m_hitTestResult(result) { ASSERT(0); notImplemented(); }
-ContextMenu::~ContextMenu() { ASSERT(0); notImplemented(); }
-void ContextMenu::appendItem(ContextMenuItem&) { ASSERT(0); notImplemented(); }
-void ContextMenu::setPlatformDescription(PlatformMenuDescription menu) { ASSERT(0); m_platformDescription = menu; }
-PlatformMenuDescription ContextMenu::platformDescription() const  { ASSERT(0); return m_platformDescription; }
-
-ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription) { ASSERT(0); notImplemented(); }
-ContextMenuItem::ContextMenuItem(ContextMenu*) { ASSERT(0); notImplemented(); }
-ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, ContextMenu* subMenu) { ASSERT(0); notImplemented(); }
-ContextMenuItem::~ContextMenuItem() { ASSERT(0); notImplemented(); }
-PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { ASSERT(0); notImplemented(); return m_platformDescription; }
-ContextMenuItemType ContextMenuItem::type() const { ASSERT(0); notImplemented(); return ActionType; }
-void ContextMenuItem::setType(ContextMenuItemType) { ASSERT(0); notImplemented(); }
-ContextMenuAction ContextMenuItem::action() const { ASSERT(0); notImplemented(); return ContextMenuItemTagNoAction; }
-void ContextMenuItem::setAction(ContextMenuAction) { ASSERT(0); notImplemented(); }
-String ContextMenuItem::title() const { ASSERT(0); notImplemented(); return String(); }
-void ContextMenuItem::setTitle(const String&) { ASSERT(0); notImplemented(); }
-PlatformMenuDescription ContextMenuItem::platformSubMenu() const { ASSERT(0); notImplemented(); return 0; }
-void ContextMenuItem::setSubMenu(ContextMenu*) { ASSERT(0); notImplemented(); }
-void ContextMenuItem::setChecked(bool) { ASSERT(0); notImplemented(); }
-void ContextMenuItem::setEnabled(bool) { ASSERT(0); notImplemented(); }
+Pasteboard* Pasteboard::generalPasteboard()
+{
+    return new Pasteboard();
+}
+
+void Pasteboard::writeSelection(Range*, bool, Frame*)
+{
+    notImplemented();
+}
+
+void Pasteboard::writeURL(const KURL&, const String&, Frame*)
+{
+    notImplemented();
+}
+
+void Pasteboard::clear()
+{
+    notImplemented();
+}
+
+bool Pasteboard::canSmartReplace()
+{
+    notImplemented();
+    return false;
+}
+
+PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame*, PassRefPtr<Range>, bool, bool&)
+{
+    notImplemented();
+    return 0;
+}
+
+String Pasteboard::plainText(Frame*)
+{
+    notImplemented();
+    return String();
+}
+
+Pasteboard::Pasteboard()
+{
+    notImplemented();
+}
+
+Pasteboard::~Pasteboard()
+{
+    notImplemented();
+}
+
+
+ContextMenu::ContextMenu(const HitTestResult& result) : m_hitTestResult(result)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+ContextMenu::~ContextMenu()
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+void ContextMenu::appendItem(ContextMenuItem&)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+void ContextMenu::setPlatformDescription(PlatformMenuDescription menu)
+{
+    ASSERT(0);
+    m_platformDescription = menu;
+}
+
+PlatformMenuDescription ContextMenu::platformDescription() const
+{
+    ASSERT(0);
+    return m_platformDescription;
+}
+
+ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+ContextMenuItem::ContextMenuItem(ContextMenu*)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+ContextMenuItem::ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, ContextMenu*)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+ContextMenuItem::~ContextMenuItem()
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription()
+{
+    ASSERT(0);
+    notImplemented();
+    return m_platformDescription;
+}
+
+ContextMenuItemType ContextMenuItem::type() const
+{
+    ASSERT(0);
+    notImplemented();
+    return ActionType;
+}
+
+void ContextMenuItem::setType(ContextMenuItemType)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+ContextMenuAction ContextMenuItem::action() const
+{
+    ASSERT(0);
+    notImplemented();
+    return ContextMenuItemTagNoAction;
+}
+
+void ContextMenuItem::setAction(ContextMenuAction)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+String ContextMenuItem::title() const
+{
+    ASSERT(0);
+    notImplemented();
+    return String();
+}
+
+void ContextMenuItem::setTitle(const String&)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+PlatformMenuDescription ContextMenuItem::platformSubMenu() const
+{
+    ASSERT(0);
+    notImplemented();
+    return 0;
+}
+
+void ContextMenuItem::setSubMenu(ContextMenu*)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+void ContextMenuItem::setChecked(bool)
+{
+    ASSERT(0);
+    notImplemented();
+}
+
+void ContextMenuItem::setEnabled(bool)
+{
+    ASSERT(0);
+    notImplemented();
+}
 
 namespace WebCore {
-float userIdleTime() { notImplemented(); return 0; }
-// systemBeep() is called by the Editor to indicate that there was nothing to copy, and may be called from 
+
+float userIdleTime()
+{
+    notImplemented();
+    return 0;
+}
+
+// systemBeep() is called by the Editor to indicate that there was nothing to copy, and may be called from
 // other places too.
-void systemBeep() { notImplemented(); }
+void systemBeep()
+{
+    notImplemented();
+}
+
 }
 
 // functions new to Jun-07 tip of tree merge:
@@ -251,64 +627,143 @@ void systemBeep() { notImplemented(); }
 //void WebCore::Frame::cleanupPlatformScriptObjects() {}
 // void WebCore::Frame::dashboardRegionsChanged() {}
 //bool WebCore::Frame::isCharacterSmartReplaceExempt(unsigned short, bool) { return false; }
-void* WebCore::Frame::dragImageForSelection() { return NULL; }
 
-WebCore::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WebCore::String const&) {
+void* WebCore::Frame::dragImageForSelection()
+{
+    return 0;
+}
+
+
+WebCore::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WebCore::String const&)
+{
     return WebCore::String();
 }
 
 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {}
 
 namespace WebCore {
-IntSize dragImageSize(void*) { return IntSize(0, 0); }
+
+IntSize dragImageSize(void*)
+{
+    return IntSize(0, 0);
+}
+
 void deleteDragImage(void*) {}
-void* createDragImageFromImage(Image*) { return NULL; }
-void* dissolveDragImageToFraction(void*, float) { return NULL; }
-void* createDragImageIconForCachedImage(CachedImage*) { return NULL; }
+void* createDragImageFromImage(Image*)
+{
+    return 0;
+}
+
+void* dissolveDragImageToFraction(void*, float)
+{
+    return 0;
+}
+
+void* createDragImageIconForCachedImage(CachedImage*)
+{
+    return 0;
+}
+
 Cursor dummyCursor;
-const Cursor& zoomInCursor() { return dummyCursor; }
-const Cursor& zoomOutCursor() { return dummyCursor; }
-const Cursor& notAllowedCursor() { return dummyCursor; }
-void* scaleDragImage(void*, FloatSize) { return NULL; }
-String searchMenuRecentSearchesText() { return String(); }
-String searchMenuNoRecentSearchesText() { return String(); }
-String searchMenuClearRecentSearchesText() { return String(); }
-Vector<String> supportedKeySizes() { notImplemented(); return Vector<String>(); }
-String signedPublicKeyAndChallengeString(unsigned int, String const&, WebCore::KURL const&) { return String(); }
+const Cursor& zoomInCursor()
+{
+    return dummyCursor;
+}
+
+const Cursor& zoomOutCursor()
+{
+    return dummyCursor;
+}
+
+const Cursor& notAllowedCursor()
+{
+    return dummyCursor;
+}
+
+void* scaleDragImage(void*, FloatSize)
+{
+    return 0;
+}
+
+String searchMenuRecentSearchesText()
+{
+    return String();
+}
+
+String searchMenuNoRecentSearchesText()
+{
+    return String();
+}
+
+String searchMenuClearRecentSearchesText()
+{
+    return String();
+}
+
+Vector<String> supportedKeySizes()
+{
+    notImplemented();
+    return Vector<String>();
+}
 
+String signedPublicKeyAndChallengeString(unsigned int, String const&, WebCore::KURL const&)
+{
+    return String();
 }
 
+} // namespace WebCore
+
 // added for Nov-16-07 ToT integration
 //namespace WebCore {
 //void Frame::clearPlatformScriptObjects() { notImplemented(); }
+
 //}
 
 // functions new to Feb-19 tip of tree merge:
 namespace WebCore {
 // isCharacterSmartReplaceExempt is defined in SmartReplaceICU.cpp; in theory, we could use that one
-//      but we don't support all of the required icu functions 
-bool isCharacterSmartReplaceExempt(UChar32 , bool ) { notImplemented(); return false; }
+//      but we don't support all of the required icu functions
+bool isCharacterSmartReplaceExempt(UChar32, bool)
+{
+    notImplemented();
+    return false;
 }
 
+}  // WebCore
+
 int MakeDataExecutable;
 
 // functions new to Mar-2 tip of tree merge:
-String KURL::fileSystemPath() const { notImplemented(); return String(); }
+String KURL::fileSystemPath() const
+{
+    notImplemented();
+    return String();
+}
+
 
 // functions new to Jun-1 tip of tree merge:
-PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&) { notImplemented(); return 0; }
+PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&)
+{
+    notImplemented();
+    return 0;
+}
+
 
-namespace JSC {
-namespace Bindings {
-bool dispatchJNICall(ExecState*, void const*, _jobject*, bool, JNIType, 
-        _jmethodID*, jvalue*, jvalue&, char const*, JSValue*&) {
+namespace JSC { namespace Bindings {
+bool dispatchJNICall(ExecState*, void const*, _jobject*, bool, JNIType,
+    _jmethodID*, jvalue*, jvalue&, char const*, JSValue*&)
+{
     notImplemented();
     return false;
 }
-}
-}
 
-char* dirname(const char*) { notImplemented(); return NULL; } 
+} }  // namespace JSC::Bindings
+
+char* dirname(const char*)
+{
+    notImplemented();
+    return 0;
+}
 
     // new as of SVN change 36269, Sept 8, 2008
 const String& Database::databaseInfoTableName()
@@ -320,21 +775,50 @@ const String& Database::databaseInfoTableName()
 
     // new as of SVN change 38068, Nov 5, 2008
 namespace WebCore {
-void prefetchDNS(const String& hostname) { notImplemented(); }
-void getSupportedKeySizes(Vector<String>&) { notImplemented(); }
-PassRefPtr<Icon> Icon::createIconForFile(const String& filename) { notImplemented(); return 0; }
-PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames) { notImplemented(); return 0; }
-// ScrollbarTheme::nativeTheme() is called by RenderTextControl::calcPrefWidths() 
+void prefetchDNS(const String&)
+{
+    notImplemented();
+}
+
+void getSupportedKeySizes(Vector<String>&)
+{
+    notImplemented();
+}
+
+PassRefPtr<Icon> Icon::createIconForFile(const String&)
+{
+    notImplemented();
+    return 0;
+}
+
+PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>&)
+{
+    notImplemented();
+    return 0;
+}
+
+// ScrollbarTheme::nativeTheme() is called by RenderTextControl::calcPrefWidths()
 // like this: scrollbarSize = ScrollbarTheme::nativeTheme()->scrollbarThickness();
-// with this comment: 
+// with this comment:
 // // FIXME: We should get the size of the scrollbar from the RenderTheme instead.
 // since our text control doesn't have scrollbars, the default size of 0 width should be
 // ok. notImplemented() is commented out below so that we can find other unresolved
 // unimplemented functions.
-ScrollbarTheme* ScrollbarTheme::nativeTheme() { /* notImplemented(); */ static ScrollbarTheme theme; return &theme; }
-JSC::JSValue* toJS(JSC::ExecState* , JSC::Profile* ) { notImplemented(); return NULL; }
+ScrollbarTheme* ScrollbarTheme::nativeTheme()
+{
+    /* notImplemented(); */
+    static ScrollbarTheme theme;
+    return &theme;
 }
 
+JSC::JSValue* toJS(JSC::ExecState*, JSC::Profile*)
+{
+    notImplemented();
+    return 0;
+}
+
+}  // namespace WebCore
+
 FileList::FileList()
 {
     notImplemented();
@@ -343,7 +827,7 @@ FileList::FileList()
 File* FileList::item(unsigned index) const
 {
     notImplemented();
-    return NULL;
+    return 0;
 }
 
 AXObjectCache::~AXObjectCache()
@@ -355,12 +839,12 @@ AXObjectCache::~AXObjectCache()
 bool AXObjectCache::gAccessibilityEnabled = false;
 bool AXObjectCache::gAccessibilityEnhancedUserInterfaceEnabled = false;
 
-void AXObjectCache::childrenChanged(RenderObject* renderer)
+void AXObjectCache::childrenChanged(RenderObject*)
 {
     notImplemented();
 }
 
-void AXObjectCache::remove(RenderObject* renderer)
+void AXObjectCache::remove(RenderObject*)
 {
     notImplemented();
 }
@@ -379,22 +863,23 @@ OpaqueJSClassContextData::~OpaqueJSClassContextData()
 }
 
 namespace WebCore {
+
 JSC::JSValue* JavaScriptCallFrame::evaluate(JSC::UString const&, JSC::JSValue*&) const
 {
     notImplemented();
-    return NULL;
+    return 0;
 }
 
 const JSC::ScopeChainNode* JavaScriptCallFrame::scopeChain() const
 {
     notImplemented();
-    return NULL;
+    return 0;
 }
 
 JSC::JSObject* JavaScriptCallFrame::thisObject() const
 {
     notImplemented();
-    return NULL;
+    return 0;
 }
 
 JSC::DebuggerCallFrame::Type JavaScriptCallFrame::type() const
@@ -406,7 +891,7 @@ JSC::DebuggerCallFrame::Type JavaScriptCallFrame::type() const
 JavaScriptCallFrame* JavaScriptCallFrame::caller()
 {
     notImplemented();
-    return NULL;
+    return 0;
 }
 
 String JavaScriptCallFrame::functionName() const
@@ -417,7 +902,7 @@ String JavaScriptCallFrame::functionName() const
 }
 
 JavaScriptDebugServer::JavaScriptDebugServer() :
-    m_recompileTimer(this, NULL)
+    m_recompileTimer(this, 0)
 {
     notImplemented();
 }
@@ -434,48 +919,47 @@ JavaScriptDebugServer& JavaScriptDebugServer::shared()
     return server;
 }
 
-void JavaScriptDebugServer::atStatement(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::atStatement(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::callEvent(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::callEvent(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::didExecuteProgram(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::didExecuteProgram(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::didReachBreakpoint(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::didReachBreakpoint(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::exception(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::exception(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::sourceParsed(ExecState* exec, const SourceCode&, 
-    int sourceID, const UString& sourceURL)
+void JavaScriptDebugServer::sourceParsed(ExecState*, const SourceCode&, int, const UString&)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::pageCreated(Page* page)
+void JavaScriptDebugServer::pageCreated(Page*)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::returnEvent(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::returnEvent(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
 
-void JavaScriptDebugServer::willExecuteProgram(const DebuggerCallFrame& debuggerCallFrame, int sourceID, int lineNumber)
+void JavaScriptDebugServer::willExecuteProgram(const DebuggerCallFrame&, int, int)
 {
     notImplemented();
 }
diff --git a/WebCore/platform/android/WidgetAndroid.cpp b/WebCore/platform/android/WidgetAndroid.cpp
index 2f9f997..84ab26c 100644
--- a/WebCore/platform/android/WidgetAndroid.cpp
+++ b/WebCore/platform/android/WidgetAndroid.cpp
@@ -26,112 +26,101 @@
 #include "config.h"
 #include "Widget.h"
 
-#include "Document.h"
-#include "Element.h"
 #include "Font.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
-#include "HostWindow.h"
 #include "NotImplemented.h"
-
 #include "WebCoreFrameBridge.h"
 #include "WebCoreViewBridge.h"
 #include "WebViewCore.h"
 
 namespace WebCore {
 
-    class WidgetPrivate
-    {
-      public:
-        Font                m_font;
-    };
-
-    Widget::Widget(PlatformWidget widget) : m_data(new WidgetPrivate)
-    {
-        init(widget);
-    }
-
-    Widget::~Widget()
-    {
-        ASSERT(!parent());
-        releasePlatformWidget();
-        delete m_data;
-    }
-
-    IntRect Widget::frameRect() const
-    {
-        // FIXME: use m_frame instead?
-        if (!platformWidget())
-            return IntRect(0, 0, 0, 0);
-        return platformWidget()->getBounds();
-    }
-
-    void Widget::setFocus()
-    {
-        notImplemented();
-    }
-
-    void Widget::paint(GraphicsContext* ctx, const IntRect& r)
-    {
-        // FIXME: in what case, will this be called for the top frame?
-        if (!platformWidget())
-            return;
-        platformWidget()->draw(ctx, r);
-    }
-
-    void Widget::releasePlatformWidget()
-    {
-        Release(platformWidget());
-    }
-
-    void Widget::retainPlatformWidget()
-    {
-        Retain(platformWidget());
-    }
-
-    void Widget::setCursor(const Cursor& cursor)
-    {
-        notImplemented();
-    }
-
-    void Widget::show()
-    {
-        notImplemented(); 
-    }
-
-    void Widget::hide()
-    {
-        notImplemented(); 
-    }
-
-    void Widget::setFrameRect(const IntRect& rect)
-    {
-        // FIXME: set m_frame instead?
-        // platformWidget() is NULL when called from Scrollbar
-        if (!platformWidget())
-            return;
-        platformWidget()->setLocation(rect.x(), rect.y());
-        platformWidget()->setSize(rect.width(), rect.height());
-    }
-
-    void Widget::setIsSelected(bool isSelected)
-    {
-        notImplemented();
-    }
-
-    int Widget::screenWidth() const
-    {
-        const Widget* widget = this;
-        while (!widget->isFrameView()) {
-            widget = widget->parent();
-            if (!widget)
-                break;
-        }
+Widget::Widget(PlatformWidget widget)
+{
+    init(widget);
+}
+
+Widget::~Widget()
+{
+    ASSERT(!parent());
+    releasePlatformWidget();
+}
+
+IntRect Widget::frameRect() const
+{
+    // FIXME: use m_frame instead?
+    if (!platformWidget())
+        return IntRect(0, 0, 0, 0);
+    return platformWidget()->getBounds();
+}
+
+void Widget::setFocus()
+{
+    notImplemented();
+}
+
+void Widget::paint(GraphicsContext* ctx, const IntRect& r)
+{
+    // FIXME: in what case, will this be called for the top frame?
+    if (!platformWidget())
+        return;
+    platformWidget()->draw(ctx, r);
+}
+
+void Widget::releasePlatformWidget()
+{
+    Release(platformWidget());
+}
+
+void Widget::retainPlatformWidget()
+{
+    Retain(platformWidget());
+}
+
+void Widget::setCursor(const Cursor& cursor)
+{
+    notImplemented();
+}
+
+void Widget::show()
+{
+    notImplemented(); 
+}
+
+void Widget::hide()
+{
+    notImplemented(); 
+}
+
+void Widget::setFrameRect(const IntRect& rect)
+{
+    // FIXME: set m_frame instead?
+    // platformWidget() is NULL when called from Scrollbar
+    if (!platformWidget())
+        return;
+    platformWidget()->setLocation(rect.x(), rect.y());
+    platformWidget()->setSize(rect.width(), rect.height());
+}
+
+void Widget::setIsSelected(bool isSelected)
+{
+    notImplemented();
+}
+
+int Widget::screenWidth() const
+{
+    const Widget* widget = this;
+    while (!widget->isFrameView()) {
+        widget = widget->parent();
         if (!widget)
-            return 0;
-
-        return android::WebViewCore::getWebViewCore(
-                static_cast<const ScrollView*>(widget))->screenWidth();
+            break;
     }
+    if (!widget)
+        return 0;
+
+    return android::WebViewCore::getWebViewCore(
+            static_cast<const ScrollView*>(widget))->screenWidth();
+}
 
 } // WebCore namepsace