Remove FINAL macro to make chromium presubmit happy
TBR=abarth@chromium.org
Review URL: https://codereview.chromium.org/727933002
diff --git a/sky/engine/platform/weborigin/KURL.cpp b/sky/engine/platform/weborigin/KURL.cpp
index f7e1585..eae21a1 100644
--- a/sky/engine/platform/weborigin/KURL.cpp
+++ b/sky/engine/platform/weborigin/KURL.cpp
@@ -93,7 +93,7 @@
namespace {
-class KURLCharsetConverter FINAL : public url::CharsetConverter {
+class KURLCharsetConverter final : public url::CharsetConverter {
public:
// The encoding parameter may be 0, but in this case the object must not be called.
explicit KURLCharsetConverter(const WTF::TextEncoding* encoding)
diff --git a/sky/engine/web/ChromeClientImpl.h b/sky/engine/web/ChromeClientImpl.h
index abb1198..d6dcadc 100644
--- a/sky/engine/web/ChromeClientImpl.h
+++ b/sky/engine/web/ChromeClientImpl.h
@@ -52,7 +52,7 @@
struct WebCursorInfo;
// Handles window-level notifications from WebCore on behalf of a WebView.
-class ChromeClientImpl FINAL : public ChromeClient {
+class ChromeClientImpl final : public ChromeClient {
public:
explicit ChromeClientImpl(WebViewImpl* webView);
virtual ~ChromeClientImpl();
diff --git a/sky/engine/web/EditorClientImpl.h b/sky/engine/web/EditorClientImpl.h
index c4c8f4d..8e84ab5 100644
--- a/sky/engine/web/EditorClientImpl.h
+++ b/sky/engine/web/EditorClientImpl.h
@@ -39,7 +39,7 @@
class LocalFrame;
class WebViewImpl;
-class EditorClientImpl FINAL : public EditorClient {
+class EditorClientImpl final : public EditorClient {
public:
explicit EditorClientImpl(WebViewImpl*);
virtual ~EditorClientImpl();
diff --git a/sky/engine/web/FrameLoaderClientImpl.h b/sky/engine/web/FrameLoaderClientImpl.h
index a06980c..120534d 100644
--- a/sky/engine/web/FrameLoaderClientImpl.h
+++ b/sky/engine/web/FrameLoaderClientImpl.h
@@ -41,7 +41,7 @@
class WebLocalFrameImpl;
-class FrameLoaderClientImpl FINAL : public FrameLoaderClient {
+class FrameLoaderClientImpl final : public FrameLoaderClient {
public:
explicit FrameLoaderClientImpl(WebLocalFrameImpl* webFrame);
virtual ~FrameLoaderClientImpl();
diff --git a/sky/engine/web/GraphicsLayerFactoryChromium.h b/sky/engine/web/GraphicsLayerFactoryChromium.h
index 759e2d3..b876bf5 100644
--- a/sky/engine/web/GraphicsLayerFactoryChromium.h
+++ b/sky/engine/web/GraphicsLayerFactoryChromium.h
@@ -31,7 +31,7 @@
namespace blink {
class WebViewImpl;
-class GraphicsLayerFactoryChromium FINAL : public GraphicsLayerFactory {
+class GraphicsLayerFactoryChromium final : public GraphicsLayerFactory {
public:
explicit GraphicsLayerFactoryChromium(WebViewImpl*);
diff --git a/sky/engine/web/LinkHighlight.h b/sky/engine/web/LinkHighlight.h
index 6756015..a713214 100644
--- a/sky/engine/web/LinkHighlight.h
+++ b/sky/engine/web/LinkHighlight.h
@@ -46,7 +46,7 @@
struct WebRect;
class WebViewImpl;
-class LinkHighlight FINAL : public WebContentLayerClient, public WebCompositorAnimationDelegate, blink::LinkHighlightClient {
+class LinkHighlight final : public WebContentLayerClient, public WebCompositorAnimationDelegate, blink::LinkHighlightClient {
public:
static PassOwnPtr<LinkHighlight> create(Node*, WebViewImpl*);
virtual ~LinkHighlight();
diff --git a/sky/engine/web/SpellCheckerClientImpl.h b/sky/engine/web/SpellCheckerClientImpl.h
index 406e23f..1815f45 100644
--- a/sky/engine/web/SpellCheckerClientImpl.h
+++ b/sky/engine/web/SpellCheckerClientImpl.h
@@ -39,7 +39,7 @@
class LocalFrame;
class WebViewImpl;
-class SpellCheckerClientImpl FINAL : public SpellCheckerClient, public TextCheckerClient {
+class SpellCheckerClientImpl final : public SpellCheckerClient, public TextCheckerClient {
public:
explicit SpellCheckerClientImpl(WebViewImpl*);
diff --git a/sky/engine/web/WebFontImpl.h b/sky/engine/web/WebFontImpl.h
index a649a87..04924f5 100644
--- a/sky/engine/web/WebFontImpl.h
+++ b/sky/engine/web/WebFontImpl.h
@@ -38,7 +38,7 @@
class FontDescription;
-class WebFontImpl FINAL : public WebFont {
+class WebFontImpl final : public WebFont {
public:
explicit WebFontImpl(const FontDescription&);
diff --git a/sky/engine/web/WebLeakDetector.cpp b/sky/engine/web/WebLeakDetector.cpp
index 0454945..e91f568 100644
--- a/sky/engine/web/WebLeakDetector.cpp
+++ b/sky/engine/web/WebLeakDetector.cpp
@@ -53,7 +53,7 @@
// Please see comment in Heap::collectAllGarbage()
static const int kNumberOfGCsToClaimChains = 5;
-class WebLeakDetectorImpl FINAL : public WebLeakDetector {
+class WebLeakDetectorImpl final : public WebLeakDetector {
WTF_MAKE_NONCOPYABLE(WebLeakDetectorImpl);
public:
explicit WebLeakDetectorImpl(WebLeakDetectorClient* client)
diff --git a/sky/engine/web/WebLocalFrameImpl.h b/sky/engine/web/WebLocalFrameImpl.h
index caeba8c..57e6132 100644
--- a/sky/engine/web/WebLocalFrameImpl.h
+++ b/sky/engine/web/WebLocalFrameImpl.h
@@ -54,7 +54,7 @@
template <typename T> class WebVector;
// Implementation of WebFrame, note that this is a reference counted object.
-class WebLocalFrameImpl FINAL
+class WebLocalFrameImpl final
: public WebLocalFrame
, public RefCounted<WebLocalFrameImpl> {
public:
diff --git a/sky/engine/web/WebSettingsImpl.h b/sky/engine/web/WebSettingsImpl.h
index 14ddd48..a763c77 100644
--- a/sky/engine/web/WebSettingsImpl.h
+++ b/sky/engine/web/WebSettingsImpl.h
@@ -37,7 +37,7 @@
class Settings;
-class WebSettingsImpl FINAL : public WebSettings {
+class WebSettingsImpl final : public WebSettings {
public:
explicit WebSettingsImpl(Settings*);
virtual ~WebSettingsImpl() { }
diff --git a/sky/engine/web/WebTextCheckingCompletionImpl.h b/sky/engine/web/WebTextCheckingCompletionImpl.h
index dbe229c..ccd0e96 100644
--- a/sky/engine/web/WebTextCheckingCompletionImpl.h
+++ b/sky/engine/web/WebTextCheckingCompletionImpl.h
@@ -39,7 +39,7 @@
class EditorClientImpl;
-class WebTextCheckingCompletionImpl FINAL : public WebTextCheckingCompletion {
+class WebTextCheckingCompletionImpl final : public WebTextCheckingCompletion {
public:
explicit WebTextCheckingCompletionImpl(WTF::PassRefPtr<TextCheckingRequest> request)
: m_request(request)
diff --git a/sky/engine/web/WebViewImpl.h b/sky/engine/web/WebViewImpl.h
index 7c0f2b3..8fe1758 100644
--- a/sky/engine/web/WebViewImpl.h
+++ b/sky/engine/web/WebViewImpl.h
@@ -63,7 +63,7 @@
class WebImage;
class WebSettingsImpl;
-class WebViewImpl FINAL : public WebView
+class WebViewImpl final : public WebView
, public RefCounted<WebViewImpl>
, public WebGestureCurveTarget
, public PageWidgetEventHandler {
diff --git a/sky/engine/wtf/Compiler.h b/sky/engine/wtf/Compiler.h
index 8efdaf2..927e4fb 100644
--- a/sky/engine/wtf/Compiler.h
+++ b/sky/engine/wtf/Compiler.h
@@ -127,8 +127,6 @@
#define ALLOW_UNUSED
#endif
-/* FIXME: Convert all instance of FINAL to final */
-#define FINAL final
/* REFERENCED_FROM_ASM */
diff --git a/sky/engine/wtf/FilePrintStream.h b/sky/engine/wtf/FilePrintStream.h
index c494ce1..db0b51f 100644
--- a/sky/engine/wtf/FilePrintStream.h
+++ b/sky/engine/wtf/FilePrintStream.h
@@ -32,7 +32,7 @@
namespace WTF {
-class WTF_EXPORT FilePrintStream FINAL : public PrintStream {
+class WTF_EXPORT FilePrintStream final : public PrintStream {
public:
enum AdoptionMode {
Adopt,
diff --git a/sky/engine/wtf/Float32Array.h b/sky/engine/wtf/Float32Array.h
index 8a9cf06..74ce044 100644
--- a/sky/engine/wtf/Float32Array.h
+++ b/sky/engine/wtf/Float32Array.h
@@ -32,7 +32,7 @@
namespace WTF {
-class Float32Array FINAL : public TypedArrayBase<float> {
+class Float32Array final : public TypedArrayBase<float> {
public:
static inline PassRefPtr<Float32Array> create(unsigned length);
static inline PassRefPtr<Float32Array> create(const float* array, unsigned length);
diff --git a/sky/engine/wtf/Float64Array.h b/sky/engine/wtf/Float64Array.h
index 5ea9a22..b6c1ce3 100644
--- a/sky/engine/wtf/Float64Array.h
+++ b/sky/engine/wtf/Float64Array.h
@@ -32,7 +32,7 @@
namespace WTF {
-class Float64Array FINAL : public TypedArrayBase<double> {
+class Float64Array final : public TypedArrayBase<double> {
public:
static inline PassRefPtr<Float64Array> create(unsigned length);
static inline PassRefPtr<Float64Array> create(const double* array, unsigned length);
diff --git a/sky/engine/wtf/Int16Array.h b/sky/engine/wtf/Int16Array.h
index 0298be9..03fc3d5 100644
--- a/sky/engine/wtf/Int16Array.h
+++ b/sky/engine/wtf/Int16Array.h
@@ -32,7 +32,7 @@
class ArrayBuffer;
-class Int16Array FINAL : public IntegralTypedArrayBase<short> {
+class Int16Array final : public IntegralTypedArrayBase<short> {
public:
static inline PassRefPtr<Int16Array> create(unsigned length);
static inline PassRefPtr<Int16Array> create(const short* array, unsigned length);
diff --git a/sky/engine/wtf/Int32Array.h b/sky/engine/wtf/Int32Array.h
index cac1727..9145ab5 100644
--- a/sky/engine/wtf/Int32Array.h
+++ b/sky/engine/wtf/Int32Array.h
@@ -31,7 +31,7 @@
namespace WTF {
-class Int32Array FINAL : public IntegralTypedArrayBase<int> {
+class Int32Array final : public IntegralTypedArrayBase<int> {
public:
static inline PassRefPtr<Int32Array> create(unsigned length);
static inline PassRefPtr<Int32Array> create(const int* array, unsigned length);
diff --git a/sky/engine/wtf/Int8Array.h b/sky/engine/wtf/Int8Array.h
index 1618d27..ad2e6b6 100644
--- a/sky/engine/wtf/Int8Array.h
+++ b/sky/engine/wtf/Int8Array.h
@@ -33,7 +33,7 @@
class ArrayBuffer;
-class Int8Array FINAL : public IntegralTypedArrayBase<signed char> {
+class Int8Array final : public IntegralTypedArrayBase<signed char> {
public:
static inline PassRefPtr<Int8Array> create(unsigned length);
static inline PassRefPtr<Int8Array> create(const signed char* array, unsigned length);
diff --git a/sky/engine/wtf/TypedArrayBase.h b/sky/engine/wtf/TypedArrayBase.h
index ca8cf1c..6319f11 100644
--- a/sky/engine/wtf/TypedArrayBase.h
+++ b/sky/engine/wtf/TypedArrayBase.h
@@ -60,7 +60,7 @@
return m_length;
}
- virtual unsigned byteLength() const override FINAL
+ virtual unsigned byteLength() const override final
{
return m_length * sizeof(T);
}
@@ -137,7 +137,7 @@
return create<Subclass>(buffer(), offset, length);
}
- virtual void neuter() override FINAL
+ virtual void neuter() override final
{
ArrayBufferView::neuter();
m_length = 0;
diff --git a/sky/engine/wtf/Uint16Array.h b/sky/engine/wtf/Uint16Array.h
index 52ad52b..5f4b04a 100644
--- a/sky/engine/wtf/Uint16Array.h
+++ b/sky/engine/wtf/Uint16Array.h
@@ -33,7 +33,7 @@
class ArrayBuffer;
-class Uint16Array FINAL : public IntegralTypedArrayBase<unsigned short> {
+class Uint16Array final : public IntegralTypedArrayBase<unsigned short> {
public:
static inline PassRefPtr<Uint16Array> create(unsigned length);
static inline PassRefPtr<Uint16Array> create(const unsigned short* array, unsigned length);
diff --git a/sky/engine/wtf/Uint32Array.h b/sky/engine/wtf/Uint32Array.h
index 1fac799..8037ab5 100644
--- a/sky/engine/wtf/Uint32Array.h
+++ b/sky/engine/wtf/Uint32Array.h
@@ -33,7 +33,7 @@
class ArrayBuffer;
-class Uint32Array FINAL : public IntegralTypedArrayBase<unsigned> {
+class Uint32Array final : public IntegralTypedArrayBase<unsigned> {
public:
static inline PassRefPtr<Uint32Array> create(unsigned length);
static inline PassRefPtr<Uint32Array> create(const unsigned* array, unsigned length);
diff --git a/sky/engine/wtf/Uint8ClampedArray.h b/sky/engine/wtf/Uint8ClampedArray.h
index 3fb3124..ef6797d 100644
--- a/sky/engine/wtf/Uint8ClampedArray.h
+++ b/sky/engine/wtf/Uint8ClampedArray.h
@@ -33,7 +33,7 @@
namespace WTF {
-class Uint8ClampedArray FINAL : public Uint8Array {
+class Uint8ClampedArray final : public Uint8Array {
public:
static inline PassRefPtr<Uint8ClampedArray> create(unsigned length);
static inline PassRefPtr<Uint8ClampedArray> create(const unsigned char* array, unsigned length);
diff --git a/sky/engine/wtf/text/TextCodecICU.h b/sky/engine/wtf/text/TextCodecICU.h
index f601e02..b999533 100644
--- a/sky/engine/wtf/text/TextCodecICU.h
+++ b/sky/engine/wtf/text/TextCodecICU.h
@@ -37,7 +37,7 @@
class TextCodecInput;
-class TextCodecICU FINAL : public TextCodec {
+class TextCodecICU final : public TextCodec {
public:
static void registerEncodingNames(EncodingNameRegistrar);
static void registerCodecs(TextCodecRegistrar);
diff --git a/sky/engine/wtf/text/TextCodecLatin1.h b/sky/engine/wtf/text/TextCodecLatin1.h
index 34d4ec8..8d95e79 100644
--- a/sky/engine/wtf/text/TextCodecLatin1.h
+++ b/sky/engine/wtf/text/TextCodecLatin1.h
@@ -30,7 +30,7 @@
namespace WTF {
-class TextCodecLatin1 FINAL : public TextCodec {
+class TextCodecLatin1 final : public TextCodec {
public:
static void registerEncodingNames(EncodingNameRegistrar);
static void registerCodecs(TextCodecRegistrar);
diff --git a/sky/engine/wtf/text/TextCodecReplacement.h b/sky/engine/wtf/text/TextCodecReplacement.h
index d33e56a..0d190f7 100644
--- a/sky/engine/wtf/text/TextCodecReplacement.h
+++ b/sky/engine/wtf/text/TextCodecReplacement.h
@@ -10,7 +10,7 @@
namespace WTF {
-class TextCodecReplacement FINAL : public TextCodecUTF8 {
+class TextCodecReplacement final : public TextCodecUTF8 {
public:
TextCodecReplacement();
diff --git a/sky/engine/wtf/text/TextCodecUTF16.h b/sky/engine/wtf/text/TextCodecUTF16.h
index aacb926..d548f27 100644
--- a/sky/engine/wtf/text/TextCodecUTF16.h
+++ b/sky/engine/wtf/text/TextCodecUTF16.h
@@ -30,7 +30,7 @@
namespace WTF {
- class TextCodecUTF16 FINAL : public TextCodec {
+ class TextCodecUTF16 final : public TextCodec {
public:
static void registerEncodingNames(EncodingNameRegistrar);
static void registerCodecs(TextCodecRegistrar);
diff --git a/sky/engine/wtf/text/TextCodecUserDefined.h b/sky/engine/wtf/text/TextCodecUserDefined.h
index 03986e0..4aeda2d 100644
--- a/sky/engine/wtf/text/TextCodecUserDefined.h
+++ b/sky/engine/wtf/text/TextCodecUserDefined.h
@@ -30,7 +30,7 @@
namespace WTF {
- class TextCodecUserDefined FINAL : public TextCodec {
+ class TextCodecUserDefined final : public TextCodec {
public:
static void registerEncodingNames(EncodingNameRegistrar);
static void registerCodecs(TextCodecRegistrar);
