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

3 files changed, 20 insertions, 25 deletions

diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp
index 48b60ca..ae87f02 100644
--- a/WebCore/page/android/DragControllerAndroid.cpp
+++ b/WebCore/page/android/DragControllerAndroid.cpp
@@ -28,9 +28,6 @@
 #include "DragController.h"
 
 #include "DragData.h"
-#include "Frame.h"
-#include "FrameView.h"
-#include "Page.h"
 
 namespace WebCore {
 
@@ -49,7 +46,6 @@ DragOperation DragController::dragOperation(DragData* dragData)
    return DragOperationNone;
 } 
 
-// functions new to Jun-07 tip of tree merge:
 const float DragController::DragImageAlpha = 1.0f;
 static IntSize dummy;
 const IntSize& DragController::maxDragImageSize() { return dummy; }
@@ -58,4 +54,4 @@ const int DragController::DragIconBottomInset = 0;
 const int DragController::LinkDragBorderInset = 0;
 const int DragController::MaxOriginalImageArea = 0;
 
-}
+}  // namespace WebCore
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp
index c0ca503..62ccd2e 100644
--- a/WebCore/page/android/EventHandlerAndroid.cpp
+++ b/WebCore/page/android/EventHandlerAndroid.cpp
@@ -28,14 +28,10 @@
 #include "config.h"
 #include "EventHandler.h"
 
-#include "EventNames.h"
-#include "FloatPoint.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "FrameView.h"
 #include "KeyboardEvent.h"
 #include "MouseEventWithHitTestResults.h"
-#include "NotImplemented.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
@@ -73,13 +69,13 @@ bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
 
 // This function is used to route the mouse down event to the native widgets, it seems like a
 // work around for the Mac platform which does not support double clicks, but browsers do.
-bool EventHandler::passMouseDownEventToWidget(Widget* widget)
+bool EventHandler::passMouseDownEventToWidget(Widget*)
 {
     // return false so the normal propogation handles the event
     return false;
 }
 
-bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
+bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
 {
     notImplemented();
     return false;
@@ -89,8 +85,7 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
 // 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
 // returns true, and pass the event to the correct frame.
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, 
-    Frame* subframe, HitTestResult* hoveredNode)
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame*, HitTestResult*)
 {
     notImplemented();
     return false;
@@ -99,7 +94,7 @@ bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& eve
 // 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)
+bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget*)
 {
     notImplemented();
     return false;
@@ -111,7 +106,7 @@ bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& m
 }
 
 bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, 
-    Frame* subframe, HitTestResult* hoveredNode)
+    Frame* subframe, HitTestResult*)
 {
     return passSubframeEventToSubframe(mev, subframe);
 }
@@ -121,11 +116,14 @@ bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&
     return passSubframeEventToSubframe(mev, subframe);
 }
 
-// functions new to Jun-07 tip of tree merge:
-class Clipboard : public RefCounted<Clipboard> {};
+class Clipboard : public RefCounted<Clipboard> {
+};
 
-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const { return PassRefPtr<Clipboard>(NULL); }
+PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
+{
+    return PassRefPtr<Clipboard>(0);
+}
 
-// new as of SVN change 36269, Sept 8, 2008
 const double EventHandler::TextDragDelay = 0.0;
-}
+
+}  // namespace WebCore
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index db1b5ee..4f55ec4 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -24,8 +24,10 @@
  */
 
 #include "config.h"
-#include "InspectorClient.h"
 #include "InspectorController.h"
+
+#include "InspectorClient.h"
+
 #include "Frame.h"
 #include "Node.h"
 #include "Profile.h"
@@ -62,7 +64,7 @@ struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource>
 };
 
 InspectorController::InspectorController(Page*, InspectorClient* client)
-    : m_startProfiling(this, NULL)
+    : m_startProfiling(this, 0)
 {
     m_client = client;
 }
@@ -91,7 +93,6 @@ void InspectorController::addProfile(PassRefPtr<JSC::Profile>, unsigned int, con
 void InspectorController::inspectedPageDestroyed() {}
 void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, JSC::UString& sourceString) {}
 
-    // new as of SVN change 36269, Sept 8, 2008
 void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame) {}
 void InspectorController::startGroup(MessageSource source, JSC::ExecState* exec, const JSC::ArgList& arguments, unsigned lineNumber, const String& sourceURL) {}
 void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL) {}
@@ -99,10 +100,10 @@ void InspectorController::startTiming(const JSC::UString& title) {}
 bool InspectorController::stopTiming(const JSC::UString& title, double& elapsed) { return false; }
 void InspectorController::count(const JSC::UString& title, unsigned lineNumber, const String& sourceID) {}
 
-    // new as of SVN change 38068, Nov 5, 2008
 void InspectorController::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) {}
 void InspectorController::handleMousePressOnNode(Node*) {}
 void InspectorController::failedToParseSource(JSC::ExecState* exec, const JSC::SourceCode& source, int errorLine, const JSC::UString& errorMessage) {}    
 void InspectorController::didParseSource(JSC::ExecState* exec, const JSC::SourceCode& source) {}
 void InspectorController::didPause() {}
-}
+
+}  // namespace WebCore