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

3 files changed, 16 insertions, 17 deletions

diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp
index a56411d..eee0cdd 100644
--- a/WebCore/page/android/DragControllerAndroid.cpp
+++ b/WebCore/page/android/DragControllerAndroid.cpp
@@ -42,7 +42,7 @@ DragOperation DragController::dragOperation(DragData* dragData)
 {
     //FIXME: This logic is incomplete  
     ASSERT(0);      
-     if (dragData->containsURL())
+    if (dragData->containsURL())
         return DragOperationCopy;
 
    return DragOperationNone;
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp
index aa522a3..e594482 100644
--- a/WebCore/page/android/EventHandlerAndroid.cpp
+++ b/WebCore/page/android/EventHandlerAndroid.cpp
@@ -42,8 +42,6 @@
 
 namespace WebCore {
 
-// using namespace EventNames;
-
 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
 
 bool EventHandler::tabsToAllControls(KeyboardEvent* ) const
@@ -86,10 +84,10 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
     return false;
 }
 
-// This function is called for mouse events by FrameView::handleMousePressEvent()
-// It is used to ensure that events are sync. correctly between frames, for example
+// This function is called for mouse events by FrameView::handleMousePressEvent().
+// It is used to ensure that events are sync'ed correctly between frames. For example
 // if the user presses down in one frame and up in another frame, this function will
-// return true if that is the case, and pass the event to the correct frame
+// returns true, and pass the event to the correct frame.
 bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, 
     Frame* subframe, HitTestResult* hoveredNode)
 {
@@ -97,8 +95,8 @@ bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& eve
     return false;
 }
 
-// This is called to route Wheel Events to child widgets when they are a RenderWidget
-// as the parent usually gets Wheel Event. Don't have a mouse with a wheel to confirm
+// This is called to route wheel events to child widgets when they are RenderWidget
+// as the parent usually gets wheel event. Don't have a mouse with a wheel to confirm
 // the operation of this function.
 bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& , Widget* widget)
 {
@@ -127,6 +125,6 @@ class Clipboard : public RefCounted<Clipboard> {};
 
 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const { return PassRefPtr<Clipboard>(NULL); }
 
-    // new as of SVN change 36269, Sept 8, 2008
+// new as of SVN change 36269, Sept 8, 2008
 const double EventHandler::TextDragDelay = 0.0;
 }
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index c3b88b7..befcf4a 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -21,13 +21,12 @@
 #include "Node.h"
 #include "Profile.h"
 
-/*
 // This stub file was created to avoid building and linking in all the
 // Inspector codebase. If you would like to enable the Inspector, do the
 // following steps:
-// 1. Replace this file in WebCore/Makefile.android with the common
+// 1. Replace this file in WebCore/Android.mk with the common
 //    implementation, ie page/InsepctorController.cpp
-// 2. Add the JS API files to JavaScriptCore/Makefile.android:
+// 2. Add the JS API files to JavaScriptCore/Android.mk:
 // ?  API/JSBase.cpp \
 //      API/JSCallbackConstructor.cpp \
 //      API/JSCallbackFunction.cpp \
@@ -37,14 +36,13 @@
 //      API/JSObjectRef.cpp \
 //      API/JSStringRef.cpp \
 //      API/JSValueRef.cpp
-// 3. Add the following LOCAL_C_INCLUDES to JavaScriptCore/Makefile.android:
+// 3. Add the following LOCAL_C_INCLUDES to JavaScriptCore/Android.mk:
 // ?$(LOCAL_PATH)/API \
 //      $(LOCAL_PATH)/ForwardingHeaders \
 //      $(LOCAL_PATH)/../../WebKit \
 // 4. Rebuild WebKit
 //
-// Note, for a functional Inspector, you must implement InspectorClientAndroid
-*/
+// Note, for a functional Inspector, you must implement InspectorClientAndroid.
 
 namespace WebCore {
 
@@ -54,8 +52,11 @@ struct InspectorResource : public RefCounted<InspectorResource> {
 struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
 };
 
-InspectorController::InspectorController(Page*, InspectorClient*) :
-    m_startProfiling(this, NULL) {}
+InspectorController::InspectorController(Page*, InspectorClient*)
+    : m_startProfiling(this, NULL)
+{
+}
+
 InspectorController::~InspectorController() {}
 
 void InspectorController::windowScriptObjectAvailable() {}