1 files changed, 48 insertions, 51 deletions

diff --git a/Source/WebKit/chromium/src/WebPopupMenuImpl.h b/Source/WebKit/chromium/src/WebPopupMenuImpl.h
index 1dec77c28..0ad03963a 100644
--- a/Source/WebKit/chromium/src/WebPopupMenuImpl.h
+++ b/Source/WebKit/chromium/src/WebPopupMenuImpl.h
@@ -32,8 +32,8 @@
 #define WebPopupMenuImpl_h
 
 #include "FramelessScrollViewClient.h"
-#include "platform/WebPoint.h"
 #include "WebPopupMenu.h"
+#include "platform/WebPoint.h"
 #include "platform/WebSize.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
@@ -65,81 +65,78 @@ class WebPopupMenuImpl : public WebPopupMenu,
                          public RefCounted<WebPopupMenuImpl> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    // WebWidget
-    virtual void close();
-    virtual WebSize size() { return m_size; }
-    virtual void willStartLiveResize();
-    virtual void resize(const WebSize&);
-    virtual void willEndLiveResize();
-    virtual void animate(double frameBeginTime);
-    virtual void layout();
-    virtual void paint(WebCanvas* canvas, const WebRect& rect);
-    virtual void themeChanged();
-    virtual void composite(bool finish);
-    virtual bool handleInputEvent(const WebInputEvent&);
-    virtual void mouseCaptureLost();
-    virtual void setFocus(bool enable);
+    // WebWidget functions:
+    virtual void close() OVERRIDE;
+    virtual WebSize size() OVERRIDE { return m_size; }
+    virtual void willStartLiveResize() OVERRIDE;
+    virtual void resize(const WebSize&) OVERRIDE;
+    virtual void willEndLiveResize() OVERRIDE;
+    virtual void animate(double frameBeginTime) OVERRIDE;
+    virtual void layout() OVERRIDE;
+    virtual void paint(WebCanvas*, const WebRect&) OVERRIDE;
+    virtual void themeChanged() OVERRIDE;
+    virtual void composite(bool finish) OVERRIDE;
+    virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE;
+    virtual void mouseCaptureLost() OVERRIDE;
+    virtual void setFocus(bool enable) OVERRIDE;
     virtual bool setComposition(
         const WebString& text,
         const WebVector<WebCompositionUnderline>& underlines,
-        int selectionStart, int selectionEnd);
-    virtual bool confirmComposition();
-    virtual bool confirmComposition(const WebString& text);
-    virtual bool compositionRange(size_t* location, size_t* length);
-    virtual WebTextInputType textInputType();
-    virtual bool caretOrSelectionRange(size_t* location, size_t* length);
-    virtual void setTextDirection(WebTextDirection direction);
-    virtual bool isAcceleratedCompositingActive() const { return false; }
+        int selectionStart, int selectionEnd) OVERRIDE;
+    virtual bool confirmComposition() OVERRIDE;
+    virtual bool confirmComposition(const WebString& text) OVERRIDE;
+    virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE;
+    virtual WebTextInputType textInputType() OVERRIDE;
+    virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE;
+    virtual void setTextDirection(WebTextDirection) OVERRIDE;
+    virtual bool isAcceleratedCompositingActive() const OVERRIDE { return false; }
 
     // WebPopupMenuImpl
-    void Init(WebCore::FramelessScrollView* widget,
-              const WebRect& bounds);
+    void init(WebCore::FramelessScrollView* widget, const WebRect& bounds);
 
     WebWidgetClient* client() { return m_client; }
 
-    void MouseMove(const WebMouseEvent&);
-    void MouseLeave(const WebMouseEvent&);
-    void MouseDown(const WebMouseEvent&);
-    void MouseUp(const WebMouseEvent&);
-    void MouseDoubleClick(const WebMouseEvent&);
-    void MouseWheel(const WebMouseWheelEvent&);
-    bool GestureEvent(const WebGestureEvent&);
-    bool TouchEvent(const WebTouchEvent&);
-    bool KeyEvent(const WebKeyboardEvent&);
+    void handleMouseMove(const WebMouseEvent&);
+    void handleMouseLeave(const WebMouseEvent&);
+    void handleMouseDown(const WebMouseEvent&);
+    void handleMouseUp(const WebMouseEvent&);
+    void handleMouseDoubleClick(const WebMouseEvent&);
+    void handleMouseWheel(const WebMouseWheelEvent&);
+    bool handleGestureEvent(const WebGestureEvent&);
+    bool handleTouchEvent(const WebTouchEvent&);
+    bool handleKeyEvent(const WebKeyboardEvent&);
 
    protected:
-    friend class WebPopupMenu;  // For WebPopupMenu::create
+    friend class WebPopupMenu; // For WebPopupMenu::create.
     friend class WTF::RefCounted<WebPopupMenuImpl>;
 
-    WebPopupMenuImpl(WebWidgetClient* client);
+    WebPopupMenuImpl(WebWidgetClient*);
     ~WebPopupMenuImpl();
 
     // WebCore::HostWindow methods:
-    virtual void invalidateContents(const WebCore::IntRect&, bool);
-    virtual void invalidateRootView(const WebCore::IntRect&, bool);
-    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
-    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
-    virtual void scheduleAnimation();
+    virtual void invalidateRootView(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
+    virtual void scheduleAnimation() OVERRIDE;
     virtual void scroll(
         const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
-        const WebCore::IntRect& clipRect);
-    virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const;
-    virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const;
-    virtual PlatformPageClient platformPageClient() const { return 0; }
-    virtual void scrollRectIntoView(const WebCore::IntRect&) const;
-    virtual void scrollbarsModeDidChange() const;
-    virtual void setCursor(const WebCore::Cursor&);
-    virtual void setCursorHiddenUntilMouseMoves(bool);
+        const WebCore::IntRect& clipRect) OVERRIDE;
+    virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const OVERRIDE;
+    virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const OVERRIDE;
+    virtual PlatformPageClient platformPageClient() const OVERRIDE { return 0; }
+    virtual void scrollbarsModeDidChange() const OVERRIDE;
+    virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
+    virtual void setCursorHiddenUntilMouseMoves(bool) OVERRIDE;
 
     // WebCore::FramelessScrollViewClient methods:
-    virtual void popupClosed(WebCore::FramelessScrollView*);
+    virtual void popupClosed(WebCore::FramelessScrollView*) OVERRIDE;
 
     WebWidgetClient* m_client;
     WebSize m_size;
 
     WebPoint m_lastMousePosition;
 
-    // This is a non-owning ref.  The popup will notify us via popupClosed()
+    // This is a non-owning ref. The popup will notify us via popupClosed()
     // before it is destroyed.
     WebCore::FramelessScrollView* m_widget;