Replace OVERRIDE and FINAL with override and final in WebKit/public

Source/web/WebPopupMenuImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 class WebMouseWheelEvent;
 class WebRange;
 class WebTouchEvent;
 class Widget;
 struct WebRect;
 
 class WebPopupMenuImpl : public WebPopupMenu, public PopupContainerClient, public WebContentLayerClient, public RefCounted<WebPopupMenuImpl> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     // WebWidget functions:
-    virtual void close() OVERRIDE FINAL;
-    virtual WebSize size() OVERRIDE FINAL { return m_size; }
-    virtual void willStartLiveResize() OVERRIDE FINAL;
-    virtual void resize(const WebSize&) OVERRIDE FINAL;
-    virtual void willEndLiveResize() OVERRIDE FINAL;
-    virtual void beginFrame(const WebBeginFrameArgs&) OVERRIDE FINAL;
-    virtual void layout() OVERRIDE FINAL;
-    virtual void paint(WebCanvas*, const WebRect&) OVERRIDE FINAL;
-    virtual void themeChanged() OVERRIDE FINAL;
-    virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE FINAL;
-    virtual void mouseCaptureLost() OVERRIDE FINAL;
-    virtual void setFocus(bool enable) OVERRIDE FINAL;
+    virtual void close() override final;
+    virtual WebSize size() override final { return m_size; }
+    virtual void willStartLiveResize() override final;
+    virtual void resize(const WebSize&) override final;
+    virtual void willEndLiveResize() override final;
+    virtual void beginFrame(const WebBeginFrameArgs&) override final;
+    virtual void layout() override final;
+    virtual void paint(WebCanvas*, const WebRect&) override final;
+    virtual void themeChanged() override final;
+    virtual bool handleInputEvent(const WebInputEvent&) override final;
+    virtual void mouseCaptureLost() override final;
+    virtual void setFocus(bool enable) override final;
     virtual bool setComposition(
         const WebString& text,
         const WebVector<WebCompositionUnderline>& underlines,
-        int selectionStart, int selectionEnd) OVERRIDE FINAL;
-    virtual bool confirmComposition() OVERRIDE FINAL;
-    virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) OVERRIDE FINAL;
-    virtual bool confirmComposition(const WebString& text) OVERRIDE FINAL;
-    virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE FINAL;
-    virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE FINAL;
-    virtual void setTextDirection(WebTextDirection) OVERRIDE FINAL;
-    virtual bool isAcceleratedCompositingActive() const OVERRIDE FINAL { return false; }
-    virtual bool isPopupMenu() const OVERRIDE FINAL { return true; }
-    virtual void willCloseLayerTreeView() OVERRIDE FINAL;
+        int selectionStart, int selectionEnd) override final;
+    virtual bool confirmComposition() override final;
+    virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) override final;
+    virtual bool confirmComposition(const WebString& text) override final;
+    virtual bool compositionRange(size_t* location, size_t* length) override final;
+    virtual bool caretOrSelectionRange(size_t* location, size_t* length) override final;
+    virtual void setTextDirection(WebTextDirection) override final;
+    virtual bool isAcceleratedCompositingActive() const override final { return false; }
+    virtual bool isPopupMenu() const override final { return true; }
+    virtual void willCloseLayerTreeView() override final;
 
     // WebContentLayerClient
-    virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE FINAL;
+    virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) override final;
 
     // WebPopupMenuImpl
     void initialize(PopupContainer* widget, const WebRect& bounds);
 
     WebWidgetClient* client() { return m_client; }
 
     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 WTF::RefCounted<WebPopupMenuImpl>;
 
     explicit WebPopupMenuImpl(WebWidgetClient*);
     ~WebPopupMenuImpl();
 
     // HostWindow methods:
-    virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE FINAL;
-    virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE FINAL;
-    virtual void scheduleAnimation() OVERRIDE FINAL;
-    virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE FINAL;
-    virtual WebScreenInfo screenInfo() const OVERRIDE FINAL;
+    virtual void invalidateContentsAndRootView(const IntRect&) override final;
+    virtual void invalidateContentsForSlowScroll(const IntRect&) override final;
+    virtual void scheduleAnimation() override final;
+    virtual IntRect rootViewToScreen(const IntRect&) const override final;
+    virtual WebScreenInfo screenInfo() const override final;
 
     // PopupContainerClient methods:
-    virtual void popupClosed(PopupContainer*) OVERRIDE FINAL;
+    virtual void popupClosed(PopupContainer*) override final;
 
     WebWidgetClient* m_client;
     WebSize m_size;
 
     WebLayerTreeView* m_layerTreeView;
     OwnPtr<WebContentLayer> m_rootLayer;
 
     WebPoint m_lastMousePosition;
 
     // This is a non-owning ref. The popup will notify us via popupClosed()
     // before it is destroyed.
     PopupContainer* m_widget;
 };
 
 DEFINE_TYPE_CASTS(WebPopupMenuImpl, WebWidget, widget, widget->isPopupMenu(), widget.isPopupMenu());
 // WebPopupMenuImpl is the only implementation of PopupContainerClient, so
 // no need for further checking.
 DEFINE_TYPE_CASTS(WebPopupMenuImpl, PopupContainerClient, client, true, true);
 
 } // namespace blink
 
 #endif