| Index: Source/web/WebPopupMenuImpl.h
 | 
| diff --git a/Source/web/WebPopupMenuImpl.h b/Source/web/WebPopupMenuImpl.h
 | 
| index 20c92e4fe65fba5ecdf6bc69172ac2046a291bd0..7a4594f3e8752c9f5e591b94d30b668f09f054ad 100644
 | 
| --- a/Source/web/WebPopupMenuImpl.h
 | 
| +++ b/Source/web/WebPopupMenuImpl.h
 | 
| @@ -63,30 +63,30 @@ class WebPopupMenuImpl : public WebPopupMenu,
 | 
|      WTF_MAKE_FAST_ALLOCATED;
 | 
|  public:
 | 
|      // 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&, PaintOptions = ReadbackFromCompositorIfAvailable) OVERRIDE;
 | 
| -    virtual void themeChanged() OVERRIDE;
 | 
| -    virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE;
 | 
| -    virtual void mouseCaptureLost() OVERRIDE;
 | 
| -    virtual void setFocus(bool enable) OVERRIDE;
 | 
| +    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 animate(double frameBeginTime) OVERRIDE FINAL;
 | 
| +    virtual void layout() OVERRIDE FINAL;
 | 
| +    virtual void paint(WebCanvas*, const WebRect&, PaintOptions = ReadbackFromCompositorIfAvailable) 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;
 | 
| -    virtual bool confirmComposition() OVERRIDE;
 | 
| -    virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) OVERRIDE;
 | 
| -    virtual bool confirmComposition(const WebString& text) OVERRIDE;
 | 
| -    virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE;
 | 
| -    virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE;
 | 
| -    virtual void setTextDirection(WebTextDirection) OVERRIDE;
 | 
| -    virtual bool isAcceleratedCompositingActive() const OVERRIDE { return false; }
 | 
| -    virtual bool isPopupMenu() const OVERRIDE { return true; }
 | 
| +        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; }
 | 
|  
 | 
|      // WebPopupMenuImpl
 | 
|      void initialize(WebCore::FramelessScrollView* widget, const WebRect& bounds);
 | 
| @@ -111,18 +111,18 @@ public:
 | 
|      ~WebPopupMenuImpl();
 | 
|  
 | 
|      // WebCore::HostWindow methods:
 | 
| -    virtual void invalidateContentsAndRootView(const WebCore::IntRect&) OVERRIDE;
 | 
| -    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&) OVERRIDE;
 | 
| -    virtual void scheduleAnimation() OVERRIDE;
 | 
| +    virtual void invalidateContentsAndRootView(const WebCore::IntRect&) OVERRIDE FINAL;
 | 
| +    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&) OVERRIDE FINAL;
 | 
| +    virtual void scheduleAnimation() OVERRIDE FINAL;
 | 
|      virtual void scroll(
 | 
|          const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
 | 
| -        const WebCore::IntRect& clipRect) OVERRIDE;
 | 
| -    virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const OVERRIDE;
 | 
| -    virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const OVERRIDE;
 | 
| -    virtual WebScreenInfo screenInfo() const OVERRIDE;
 | 
| +        const WebCore::IntRect& clipRect) OVERRIDE FINAL;
 | 
| +    virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const OVERRIDE FINAL;
 | 
| +    virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const OVERRIDE FINAL;
 | 
| +    virtual WebScreenInfo screenInfo() const OVERRIDE FINAL;
 | 
|  
 | 
|      // WebCore::FramelessScrollViewClient methods:
 | 
| -    virtual void popupClosed(WebCore::FramelessScrollView*) OVERRIDE;
 | 
| +    virtual void popupClosed(WebCore::FramelessScrollView*) OVERRIDE FINAL;
 | 
|  
 | 
|      WebWidgetClient* m_client;
 | 
|      WebSize m_size;
 | 
| 
 |