Index: Source/web/WebPagePopupImpl.cpp |
diff --git a/Source/web/WebPagePopupImpl.cpp b/Source/web/WebPagePopupImpl.cpp |
index d7e354dcb852804bad44fc32d47fba478a30405c..24b4cc5d58c86648730ca08aad66e958e250b380 100644 |
--- a/Source/web/WebPagePopupImpl.cpp |
+++ b/Source/web/WebPagePopupImpl.cpp |
@@ -71,49 +71,49 @@ public: |
} |
private: |
- virtual void closeWindowSoon() OVERRIDE |
+ virtual void closeWindowSoon() override |
{ |
m_popup->closePopup(); |
} |
- virtual FloatRect windowRect() OVERRIDE |
+ virtual FloatRect windowRect() override |
{ |
return FloatRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.height); |
} |
- virtual void setWindowRect(const FloatRect& rect) OVERRIDE |
+ virtual void setWindowRect(const FloatRect& rect) override |
{ |
m_popup->m_windowRectInScreen = IntRect(rect); |
m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen); |
} |
- virtual IntRect rootViewToScreen(const IntRect& rect) const OVERRIDE |
+ virtual IntRect rootViewToScreen(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 |
+ virtual 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 invalidateContentsAndRootView(const IntRect& paintRect) OVERRIDE |
+ virtual void invalidateContentsAndRootView(const IntRect& paintRect) override |
{ |
if (paintRect.isEmpty()) |
return; |
m_popup->widgetClient()->didInvalidateRect(paintRect); |
} |
- virtual void invalidateContentsForSlowScroll(const IntRect& updateRect) OVERRIDE |
+ virtual void invalidateContentsForSlowScroll(const IntRect& updateRect) override |
{ |
invalidateContentsAndRootView(updateRect); |
} |
- virtual void scheduleAnimation() OVERRIDE |
+ virtual void scheduleAnimation() override |
{ |
// Calling scheduleAnimation on m_webView so WebTestProxy will call beginFrame. |
if (LayoutTestSupport::isRunningLayoutTest()) |
@@ -127,43 +127,43 @@ private: |
m_popup->m_widgetClient->scheduleAnimation(); |
} |
- virtual WebScreenInfo screenInfo() const OVERRIDE |
+ virtual WebScreenInfo screenInfo() const override |
{ |
return m_popup->m_webView->client() ? m_popup->m_webView->client()->screenInfo() : WebScreenInfo(); |
} |
- virtual void* webView() const OVERRIDE |
+ virtual void* webView() const override |
{ |
return m_popup->m_webView; |
} |
- virtual FloatSize minimumWindowSize() const OVERRIDE |
+ virtual FloatSize minimumWindowSize() const override |
{ |
return FloatSize(0, 0); |
} |
- virtual void setCursor(const Cursor& cursor) OVERRIDE |
+ virtual void setCursor(const Cursor& cursor) override |
{ |
if (m_popup->m_webView->client()) |
m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)); |
} |
- virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE |
+ virtual void needTouchEvents(bool needsTouchEvents) override |
{ |
m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); |
} |
- virtual GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE |
+ virtual GraphicsLayerFactory* graphicsLayerFactory() const override |
{ |
return m_popup->m_webView->graphicsLayerFactory(); |
} |
- virtual void attachRootGraphicsLayer(GraphicsLayer* graphicsLayer) OVERRIDE |
+ virtual void attachRootGraphicsLayer(GraphicsLayer* graphicsLayer) override |
{ |
m_popup->setRootGraphicsLayer(graphicsLayer); |
} |
- virtual void postAccessibilityNotification(AXObject* obj, AXObjectCache::AXNotification notification) OVERRIDE |
+ virtual void postAccessibilityNotification(AXObject* obj, AXObjectCache::AXNotification notification) override |
{ |
WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(m_popup->m_popupClient->ownerElement().document().frame()); |
if (obj && frame && frame->client()) |
@@ -178,7 +178,7 @@ private: |
}; |
class PagePopupFeaturesClient : public ContextFeaturesClient { |
- virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool) OVERRIDE; |
+ virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool) override; |
}; |
bool PagePopupFeaturesClient::isEnabled(Document*, ContextFeatures::FeatureType type, bool defaultValue) |