Modernize CanvasObserverProxy

https://bugs.webkit.org/show_bug.cgi?id=124106

Reviewed by Anders Carlsson.

* css/CSSCanvasValue.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3775586..a3544ba 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-09  Sam Weinig  <sam@webkit.org>
+
+        Modernize CanvasObserverProxy
+        https://bugs.webkit.org/show_bug.cgi?id=124106
+
+        Reviewed by Anders Carlsson.
+
+        * css/CSSCanvasValue.h:
+
 2013-11-09  Patrick Gansterer  <paroga@webkit.org>
 
         Move RunLoop from WebCore to WTF

diff --git a/Source/WebCore/css/CSSCanvasValue.h b/Source/WebCore/css/CSSCanvasValue.h
index 23866c5..67ef6ce 100644 (file)
--- a/Source/WebCore/css/CSSCanvasValue.h
+++ b/Source/WebCore/css/CSSCanvasValue.h
@@ -60,29 +60,31 @@ private:
 
     // NOTE: We put the CanvasObserver in a member instead of inheriting from it
     // to avoid adding a vptr to CSSCanvasValue.
-    class CanvasObserverProxy : public CanvasObserver {
+    class CanvasObserverProxy FINAL : public CanvasObserver {
     public:
-        CanvasObserverProxy(CSSCanvasValue& ownerValue)
+        explicit CanvasObserverProxy(CSSCanvasValue& ownerValue)
             : m_ownerValue(ownerValue)
         {
         }
+
         virtual ~CanvasObserverProxy()
         {
         }
-        virtual void canvasChanged(HTMLCanvasElement& canvas, const FloatRect& changedRect)
+
+    private:
+        virtual void canvasChanged(HTMLCanvasElement& canvas, const FloatRect& changedRect) OVERRIDE
         {
             m_ownerValue.canvasChanged(canvas, changedRect);
         }
-        virtual void canvasResized(HTMLCanvasElement& canvas)
+        virtual void canvasResized(HTMLCanvasElement& canvas) OVERRIDE
         {
             m_ownerValue.canvasResized(canvas);
         }
-        virtual void canvasDestroyed(HTMLCanvasElement& canvas)
+        virtual void canvasDestroyed(HTMLCanvasElement& canvas) OVERRIDE
         {
             m_ownerValue.canvasDestroyed(canvas);
         }
 
-    private:
         CSSCanvasValue& m_ownerValue;
     };