| Index: Source/web/WebPagePopupImpl.cpp
|
| diff --git a/Source/web/WebPagePopupImpl.cpp b/Source/web/WebPagePopupImpl.cpp
|
| index 628973faca354e2e6e48482cb4bd0208be3960d8..4b347236b72780029bcc70013fac56d94f1afe82 100644
|
| --- a/Source/web/WebPagePopupImpl.cpp
|
| +++ b/Source/web/WebPagePopupImpl.cpp
|
| @@ -65,7 +65,7 @@
|
|
|
| namespace blink {
|
|
|
| -class PagePopupChromeClient : public EmptyChromeClient {
|
| +class PagePopupChromeClient final : public EmptyChromeClient {
|
| WTF_MAKE_NONCOPYABLE(PagePopupChromeClient);
|
| WTF_MAKE_FAST_ALLOCATED(PagePopupChromeClient);
|
|
|
| @@ -76,45 +76,44 @@ public:
|
| 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())
|
| @@ -128,43 +127,43 @@ private:
|
| 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())
|
| @@ -175,7 +174,7 @@ private:
|
| 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));
|
| @@ -185,7 +184,7 @@ private:
|
| };
|
|
|
| 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)
|
|
|