General code cleanup of ChromeClient-related classes.

Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 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 47 matching lines @@
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
-class PagePopupChromeClient : public EmptyChromeClient {
+class PagePopupChromeClient final : public EmptyChromeClient {
     WTF_MAKE_NONCOPYABLE(PagePopupChromeClient);
     WTF_MAKE_FAST_ALLOCATED(PagePopupChromeClient);
 
 public:
     explicit PagePopupChromeClient(WebPagePopupImpl* popup)
         : m_popup(popup)
     {
         ASSERT(m_popup->widgetClient());
     }
 
-    virtual void setWindowRect(const IntRect& rect) override
+    void setWindowRect(const IntRect& rect) override
     {
         m_popup->m_windowRectInScreen = rect;
         m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen);
     }
 
 private:
-    virtual void closeWindowSoon() override
+    void closeWindowSoon() override
     {
         m_popup->closePopup();
     }
 
-    virtual IntRect windowRect() override
+    IntRect windowRect() override
     {
         return IntRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.height);
     }
 
-    virtual IntRect viewportToScreen(const IntRect& rect) const override
+    IntRect viewportToScreen(const IntRect& rect) const override
     {
         IntRect rectInScreen(rect);
         rectInScreen.move(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y);
         return rectInScreen;
     }
 
-    virtual void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String&, const String&) override
+    void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String&, const String&) override
     {
 #ifndef NDEBUG
         fprintf(stderr, "CONSOLE MESSSAGE:%u: %s\n", lineNumber, message.utf8().data());
 #endif
     }
 
-    virtual void invalidateRect(const IntRect& paintRect) override
+    void invalidateRect(const IntRect& paintRect) override
     {
-        if (paintRect.isEmpty())
-            return;
-        m_popup->widgetClient()->didInvalidateRect(paintRect);
+        if (!paintRect.isEmpty())
+            m_popup->widgetClient()->didInvalidateRect(paintRect);
     }
 
-    virtual void scheduleAnimation() override
+    void scheduleAnimation() override
     {
         // Calling scheduleAnimation on m_webView so WebTestProxy will call beginFrame.
         if (LayoutTestSupport::isRunningLayoutTest())
             m_popup->m_webView->scheduleAnimation();
 
         if (m_popup->isAcceleratedCompositingActive()) {
             ASSERT(m_popup->m_layerTreeView);
             m_popup->m_layerTreeView->setNeedsAnimate();
             return;
         }
         m_popup->m_widgetClient->scheduleAnimation();
     }
 
-    virtual WebScreenInfo screenInfo() const override
+    WebScreenInfo screenInfo() const override
     {
         return m_popup->m_webView->client() ? m_popup->m_webView->client()->screenInfo() : WebScreenInfo();
     }
 
-    virtual void* webView() const override
+    void* webView() const override
     {
         return m_popup->m_webView;
     }
 
-    virtual IntSize minimumWindowSize() const override
+    IntSize minimumWindowSize() const override
     {
         return IntSize(0, 0);
     }
 
-    virtual void setCursorInternal(const Cursor& cursor) override
+    void setCursorInternal(const Cursor& cursor) override
     {
         if (m_popup->m_webView->client())
             m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor));
     }
 
-    virtual void needTouchEvents(bool needsTouchEvents) override
+    void needTouchEvents(bool needsTouchEvents) override
     {
         m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
     }
 
-    virtual GraphicsLayerFactory* graphicsLayerFactory() const override
+    GraphicsLayerFactory* graphicsLayerFactory() const override
     {
         return m_popup->m_webView->graphicsLayerFactory();
     }
 
-    virtual void attachRootGraphicsLayer(GraphicsLayer* graphicsLayer, LocalFrame* localRoot) override
+    void attachRootGraphicsLayer(GraphicsLayer* graphicsLayer, LocalFrame* localRoot) override
     {
         m_popup->setRootGraphicsLayer(graphicsLayer);
     }
 
-    virtual void postAccessibilityNotification(AXObject* obj, AXObjectCache::AXNotification notification) override
+    void postAccessibilityNotification(AXObject* obj, AXObjectCache::AXNotification notification) override
     {
         WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(m_popup->m_popupClient->ownerElement().document().frame());
         if (obj && frame && frame->client())
             frame->client()->postAccessibilityEvent(WebAXObject(obj), static_cast<WebAXEvent>(notification));
 
         // FIXME: Delete these lines once Chromium only uses the frame client interface, above.
         if (obj && m_popup->m_webView->client())
             m_popup->m_webView->client()->postAccessibilityEvent(WebAXObject(obj), static_cast<WebAXEvent>(notification));
     }
 
-    virtual void setToolTip(const String& tooltipText, TextDirection dir) override
+    void setToolTip(const String& tooltipText, TextDirection dir) override
     {
         if (m_popup->widgetClient())
             m_popup->widgetClient()->setToolTipText(tooltipText, toWebTextDirection(dir));
     }
 
     WebPagePopupImpl* m_popup;
 };
 
 class PagePopupFeaturesClient : public ContextFeaturesClient {
-    virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool) override;
+    bool isEnabled(Document*, ContextFeatures::FeatureType, bool) override;
 };
 
 bool PagePopupFeaturesClient::isEnabled(Document*, ContextFeatures::FeatureType type, bool defaultValue)
 {
     if (type == ContextFeatures::PagePopup)
         return true;
     return defaultValue;
 }
 
 // WebPagePopupImpl ----------------------------------------------------------------
@@ skipping 321 matching lines @@
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink