Use override and final instead of OVERRIDE and FINAL
diff --git a/sky/engine/web/WebSettingsImpl.h b/sky/engine/web/WebSettingsImpl.h
index 6001337..a33fd23 100644
--- a/sky/engine/web/WebSettingsImpl.h
+++ b/sky/engine/web/WebSettingsImpl.h
@@ -42,102 +42,102 @@
explicit WebSettingsImpl(Settings*);
virtual ~WebSettingsImpl() { }
- virtual bool mainFrameResizesAreOrientationChanges() const OVERRIDE;
- virtual bool shrinksViewportContentToFit() const OVERRIDE;
- virtual int availablePointerTypes() const OVERRIDE;
- virtual PointerType primaryPointerType() const OVERRIDE;
- virtual int availableHoverTypes() const OVERRIDE;
- virtual HoverType primaryHoverType() const OVERRIDE;
- virtual bool viewportEnabled() const OVERRIDE;
- virtual void setAccelerated2dCanvasEnabled(bool) OVERRIDE;
- virtual void setAccelerated2dCanvasMSAASampleCount(int) OVERRIDE;
- virtual void setPreferCompositingToLCDTextEnabled(bool) OVERRIDE;
- virtual void setAccessibilityEnabled(bool) OVERRIDE;
- virtual void setAllowDisplayOfInsecureContent(bool) OVERRIDE;
- virtual void setAllowFileAccessFromFileURLs(bool) OVERRIDE;
- virtual void setAllowCustomScrollbarInMainFrame(bool) OVERRIDE;
- virtual void setAllowRunningOfInsecureContent(bool) OVERRIDE;
- virtual void setAllowConnectingInsecureWebSocket(bool) OVERRIDE;
- virtual void setAllowUniversalAccessFromFileURLs(bool) OVERRIDE;
- virtual void setAntialiased2dCanvasEnabled(bool) OVERRIDE;
- virtual void setAsynchronousSpellCheckingEnabled(bool) OVERRIDE;
- virtual void setAutoZoomFocusedNodeToLegibleScale(bool) OVERRIDE;
- virtual void setCaretBrowsingEnabled(bool) OVERRIDE;
- virtual void setContainerCullingEnabled(bool) OVERRIDE;
- virtual void setNavigateOnDragDrop(bool) OVERRIDE;
- virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setDOMPasteAllowed(bool) OVERRIDE;
- virtual void setDefaultFixedFontSize(int) OVERRIDE;
- virtual void setDefaultFontSize(int) OVERRIDE;
- virtual void setDefaultTextEncodingName(const WebString&) OVERRIDE;
- virtual void setDefaultVideoPosterURL(const WebString&) OVERRIDE;
- virtual void setDeferredFiltersEnabled(bool) OVERRIDE;
- virtual void setDeferredImageDecodingEnabled(bool) OVERRIDE;
- virtual void setDeviceScaleAdjustment(float) OVERRIDE;
- virtual void setDeviceSupportsMouse(bool) OVERRIDE;
+ virtual bool mainFrameResizesAreOrientationChanges() const override;
+ virtual bool shrinksViewportContentToFit() const override;
+ virtual int availablePointerTypes() const override;
+ virtual PointerType primaryPointerType() const override;
+ virtual int availableHoverTypes() const override;
+ virtual HoverType primaryHoverType() const override;
+ virtual bool viewportEnabled() const override;
+ virtual void setAccelerated2dCanvasEnabled(bool) override;
+ virtual void setAccelerated2dCanvasMSAASampleCount(int) override;
+ virtual void setPreferCompositingToLCDTextEnabled(bool) override;
+ virtual void setAccessibilityEnabled(bool) override;
+ virtual void setAllowDisplayOfInsecureContent(bool) override;
+ virtual void setAllowFileAccessFromFileURLs(bool) override;
+ virtual void setAllowCustomScrollbarInMainFrame(bool) override;
+ virtual void setAllowRunningOfInsecureContent(bool) override;
+ virtual void setAllowConnectingInsecureWebSocket(bool) override;
+ virtual void setAllowUniversalAccessFromFileURLs(bool) override;
+ virtual void setAntialiased2dCanvasEnabled(bool) override;
+ virtual void setAsynchronousSpellCheckingEnabled(bool) override;
+ virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;
+ virtual void setCaretBrowsingEnabled(bool) override;
+ virtual void setContainerCullingEnabled(bool) override;
+ virtual void setNavigateOnDragDrop(bool) override;
+ virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setDOMPasteAllowed(bool) override;
+ virtual void setDefaultFixedFontSize(int) override;
+ virtual void setDefaultFontSize(int) override;
+ virtual void setDefaultTextEncodingName(const WebString&) override;
+ virtual void setDefaultVideoPosterURL(const WebString&) override;
+ virtual void setDeferredFiltersEnabled(bool) override;
+ virtual void setDeferredImageDecodingEnabled(bool) override;
+ virtual void setDeviceScaleAdjustment(float) override;
+ virtual void setDeviceSupportsMouse(bool) override;
// FIXME: Remove once the pointer/hover features are converted to use the
// new APIs (e.g. setPrimaryPointerType) on the chromium side
- virtual void setDeviceSupportsTouch(bool) OVERRIDE;
+ virtual void setDeviceSupportsTouch(bool) override;
- virtual void setDoubleTapToZoomEnabled(bool) OVERRIDE;
- virtual void setDownloadableBinaryFontsEnabled(bool) OVERRIDE;
- virtual void setEnableScrollAnimator(bool) OVERRIDE;
- virtual void setEnableTouchAdjustment(bool) OVERRIDE;
- virtual void setExperimentalWebGLEnabled(bool) OVERRIDE;
- virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setForceZeroLayoutHeight(bool) OVERRIDE;
- virtual void setHyperlinkAuditingEnabled(bool) OVERRIDE;
- virtual void setImagesEnabled(bool) OVERRIDE;
- virtual void setInlineTextBoxAccessibilityEnabled(bool) OVERRIDE;
- virtual void setJavaScriptCanAccessClipboard(bool) OVERRIDE;
- virtual void setLoadsImagesAutomatically(bool) OVERRIDE;
- virtual void setLoadWithOverviewMode(bool) OVERRIDE;
- virtual void setLocalStorageEnabled(bool) OVERRIDE;
- virtual void setMainFrameClipsContent(bool) OVERRIDE;
- virtual void setMainFrameResizesAreOrientationChanges(bool) OVERRIDE;
- virtual void setMaxTouchPoints(int) OVERRIDE;
- virtual void setMediaControlsOverlayPlayButtonEnabled(bool) OVERRIDE;
- virtual void setMediaPlaybackRequiresUserGesture(bool) OVERRIDE;
- virtual void setMinimumAccelerated2dCanvasSize(int) OVERRIDE;
- virtual void setMinimumFontSize(int) OVERRIDE;
- virtual void setMinimumLogicalFontSize(int) OVERRIDE;
- virtual void setOpenGLMultisamplingEnabled(bool) OVERRIDE;
- virtual void setPerTilePaintingEnabled(bool) OVERRIDE;
- virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setPinchOverlayScrollbarThickness(int) OVERRIDE;
- virtual void setPinchVirtualViewportEnabled(bool) OVERRIDE;
- virtual void setAvailablePointerTypes(int) OVERRIDE;
- virtual void setPrimaryPointerType(PointerType) OVERRIDE;
- virtual void setAvailableHoverTypes(int) OVERRIDE;
- virtual void setPrimaryHoverType(HoverType) OVERRIDE;
- virtual void setRenderVSyncNotificationEnabled(bool) OVERRIDE;
- virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setSelectionIncludesAltImageText(bool) OVERRIDE;
- virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setShouldClearDocumentBackground(bool) OVERRIDE;
- virtual void setShouldRespectImageOrientation(bool) OVERRIDE;
- virtual void setShowFPSCounter(bool) OVERRIDE;
- virtual void setShowPaintRects(bool) OVERRIDE;
- virtual void setShrinksStandaloneImagesToFit(bool) OVERRIDE;
- virtual void setShrinksViewportContentToFit(bool) OVERRIDE;
- virtual void setSmartInsertDeleteEnabled(bool) OVERRIDE;
- virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setSupportDeprecatedTargetDensityDPI(bool) OVERRIDE;
- virtual void setTextAreasAreResizable(bool) OVERRIDE;
- virtual void setAccessibilityFontScaleFactor(float) OVERRIDE;
- virtual void setTouchDragDropEnabled(bool) OVERRIDE;
- virtual void setTouchEditingEnabled(bool) OVERRIDE;
- virtual void setUnifiedTextCheckerEnabled(bool) OVERRIDE;
- virtual void setUseSolidColorScrollbars(bool) OVERRIDE;
- virtual void setUseWideViewport(bool) OVERRIDE;
- virtual void setV8CacheOptions(V8CacheOptions) OVERRIDE;
- virtual void setValidationMessageTimerMagnification(int) OVERRIDE;
- virtual void setViewportEnabled(bool) OVERRIDE;
- virtual void setViewportMetaEnabled(bool) OVERRIDE;
- virtual void setWebGLErrorsToConsoleEnabled(bool) OVERRIDE;
- virtual void setWebSecurityEnabled(bool) OVERRIDE;
+ virtual void setDoubleTapToZoomEnabled(bool) override;
+ virtual void setDownloadableBinaryFontsEnabled(bool) override;
+ virtual void setEnableScrollAnimator(bool) override;
+ virtual void setEnableTouchAdjustment(bool) override;
+ virtual void setExperimentalWebGLEnabled(bool) override;
+ virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setForceZeroLayoutHeight(bool) override;
+ virtual void setHyperlinkAuditingEnabled(bool) override;
+ virtual void setImagesEnabled(bool) override;
+ virtual void setInlineTextBoxAccessibilityEnabled(bool) override;
+ virtual void setJavaScriptCanAccessClipboard(bool) override;
+ virtual void setLoadsImagesAutomatically(bool) override;
+ virtual void setLoadWithOverviewMode(bool) override;
+ virtual void setLocalStorageEnabled(bool) override;
+ virtual void setMainFrameClipsContent(bool) override;
+ virtual void setMainFrameResizesAreOrientationChanges(bool) override;
+ virtual void setMaxTouchPoints(int) override;
+ virtual void setMediaControlsOverlayPlayButtonEnabled(bool) override;
+ virtual void setMediaPlaybackRequiresUserGesture(bool) override;
+ virtual void setMinimumAccelerated2dCanvasSize(int) override;
+ virtual void setMinimumFontSize(int) override;
+ virtual void setMinimumLogicalFontSize(int) override;
+ virtual void setOpenGLMultisamplingEnabled(bool) override;
+ virtual void setPerTilePaintingEnabled(bool) override;
+ virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setPinchOverlayScrollbarThickness(int) override;
+ virtual void setPinchVirtualViewportEnabled(bool) override;
+ virtual void setAvailablePointerTypes(int) override;
+ virtual void setPrimaryPointerType(PointerType) override;
+ virtual void setAvailableHoverTypes(int) override;
+ virtual void setPrimaryHoverType(HoverType) override;
+ virtual void setRenderVSyncNotificationEnabled(bool) override;
+ virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setSelectionIncludesAltImageText(bool) override;
+ virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setShouldClearDocumentBackground(bool) override;
+ virtual void setShouldRespectImageOrientation(bool) override;
+ virtual void setShowFPSCounter(bool) override;
+ virtual void setShowPaintRects(bool) override;
+ virtual void setShrinksStandaloneImagesToFit(bool) override;
+ virtual void setShrinksViewportContentToFit(bool) override;
+ virtual void setSmartInsertDeleteEnabled(bool) override;
+ virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setSupportDeprecatedTargetDensityDPI(bool) override;
+ virtual void setTextAreasAreResizable(bool) override;
+ virtual void setAccessibilityFontScaleFactor(float) override;
+ virtual void setTouchDragDropEnabled(bool) override;
+ virtual void setTouchEditingEnabled(bool) override;
+ virtual void setUnifiedTextCheckerEnabled(bool) override;
+ virtual void setUseSolidColorScrollbars(bool) override;
+ virtual void setUseWideViewport(bool) override;
+ virtual void setV8CacheOptions(V8CacheOptions) override;
+ virtual void setValidationMessageTimerMagnification(int) override;
+ virtual void setViewportEnabled(bool) override;
+ virtual void setViewportMetaEnabled(bool) override;
+ virtual void setWebGLErrorsToConsoleEnabled(bool) override;
+ virtual void setWebSecurityEnabled(bool) override;
bool showFPSCounter() const { return m_showFPSCounter; }
bool showPaintRects() const { return m_showPaintRects; }
