diff options
Diffstat (limited to 'Source/WebCore/css/CSSCanvasValue.h')
| -rw-r--r-- | Source/WebCore/css/CSSCanvasValue.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/Source/WebCore/css/CSSCanvasValue.h b/Source/WebCore/css/CSSCanvasValue.h index 3aaf6ae72..5c422ce4a 100644 --- a/Source/WebCore/css/CSSCanvasValue.h +++ b/Source/WebCore/css/CSSCanvasValue.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CSSCanvasValue_h -#define CSSCanvasValue_h +#pragma once #include "CSSImageGeneratorValue.h" #include "HTMLCanvasElement.h" @@ -32,20 +31,21 @@ namespace WebCore { class Document; +class HTMLCanvasElement; -class CSSCanvasValue : public CSSImageGeneratorValue { +class CSSCanvasValue final : public CSSImageGeneratorValue { public: - static PassRef<CSSCanvasValue> create(const String& name) { return adoptRef(*new CSSCanvasValue(name)); } + static Ref<CSSCanvasValue> create(const String& name) { return adoptRef(*new CSSCanvasValue(name)); } ~CSSCanvasValue(); String customCSSText() const; - PassRefPtr<Image> image(RenderElement*, const IntSize&); + RefPtr<Image> image(RenderElement*, const FloatSize&); bool isFixedSize() const { return true; } - IntSize fixedSize(const RenderElement*); + FloatSize fixedSize(const RenderElement*); bool isPending() const { return false; } - void loadSubimages(CachedResourceLoader*) { } + void loadSubimages(CachedResourceLoader&, const ResourceLoaderOptions&) { } bool equals(const CSSCanvasValue&) const; @@ -54,7 +54,6 @@ private: : CSSImageGeneratorValue(CanvasClass) , m_canvasObserver(*this) , m_name(name) - , m_element(0) { } @@ -72,15 +71,15 @@ private: } private: - virtual void canvasChanged(HTMLCanvasElement& canvas, const FloatRect& changedRect) override + void canvasChanged(HTMLCanvasElement& canvas, const FloatRect& changedRect) final { m_ownerValue.canvasChanged(canvas, changedRect); } - virtual void canvasResized(HTMLCanvasElement& canvas) override + void canvasResized(HTMLCanvasElement& canvas) final { m_ownerValue.canvasResized(canvas); } - virtual void canvasDestroyed(HTMLCanvasElement& canvas) override + void canvasDestroyed(HTMLCanvasElement& canvas) final { m_ownerValue.canvasDestroyed(canvas); } @@ -99,11 +98,10 @@ private: // The name of the canvas. String m_name; // The document supplies the element and owns it. - HTMLCanvasElement* m_element; + HTMLCanvasElement* m_element { nullptr }; }; -CSS_VALUE_TYPE_CASTS(CSSCanvasValue, isCanvasValue()) - } // namespace WebCore -#endif // CSSCanvasValue_h +SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSCanvasValue, isCanvasValue()) + |