<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[202677] trunk/Source/WebCore</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202677">202677</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2016-06-30 06:37:25 -0700 (Thu, 30 Jun 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>[image-decoders] Use final and override in ImageDecoder subclasses

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

Reviewed by Antonio Gomes.

* platform/image-decoders/bmp/BMPImageDecoder.h:

* platform/image-decoders/gif/GIFImageDecoder.h:

* platform/image-decoders/ico/ICOImageDecoder.cpp:

(WebCore::ICOImageDecoder::frameSizeAtIndex):

* platform/image-decoders/ico/ICOImageDecoder.h:

* platform/image-decoders/jpeg/JPEGImageDecoder.h:

* platform/image-decoders/png/PNGImageDecoder.h:

* platform/image-decoders/webp/WEBPImageDecoder.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecodersbmpBMPImageDecoderh">trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecodersgifGIFImageDecoderh">trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecodersjpegJPEGImageDecoderh">trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecoderspngPNGImageDecoderh">trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h</a></li>

<li><a href="#trunkSourceWebCoreplatformimagedecoderswebpWEBPImageDecoderh">trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/ChangeLog        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -1,3 +1,19 @@

</span><ins>+2016-06-30  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;

+

+        [image-decoders] Use final and override in ImageDecoder subclasses

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

+

+        Reviewed by Antonio Gomes.

+

+        * platform/image-decoders/bmp/BMPImageDecoder.h:

+        * platform/image-decoders/gif/GIFImageDecoder.h:

+        * platform/image-decoders/ico/ICOImageDecoder.cpp:

+        (WebCore::ICOImageDecoder::frameSizeAtIndex):

+        * platform/image-decoders/ico/ICOImageDecoder.h:

+        * platform/image-decoders/jpeg/JPEGImageDecoder.h:

+        * platform/image-decoders/png/PNGImageDecoder.h:

+        * platform/image-decoders/webp/WEBPImageDecoder.h:

+

</ins><span class="cx"> 2016-06-30  Gyuyoung Kim  &lt;gyuyoung.kim@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         Purge PassRefPtr in Modules/webdatabase

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecodersbmpBMPImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -36,19 +36,19 @@

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

<span class="cx">     // This class decodes the BMP image format.

</span><del>-    class BMPImageDecoder : public ImageDecoder {

</del><ins>+    class BMPImageDecoder final : public ImageDecoder {

</ins><span class="cx">     public:

</span><span class="cx">         BMPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx"> 

</span><span class="cx">         // ImageDecoder

</span><del>-        virtual String filenameExtension() const { return &quot;bmp&quot;; }

-        virtual void setData(SharedBuffer&amp;, bool allDataReceived);

-        virtual bool isSizeAvailable();

-        virtual ImageFrame* frameBufferAtIndex(size_t index);

</del><ins>+        String filenameExtension() const override { return &quot;bmp&quot;; }

+        void setData(SharedBuffer&amp;, bool allDataReceived) override;

+        bool isSizeAvailable() override;

+        ImageFrame* frameBufferAtIndex(size_t index) override;

</ins><span class="cx">         // CAUTION: setFailed() deletes |m_reader|.  Be careful to avoid

</span><span class="cx">         // accessing deleted memory, especially when calling this from inside

<span class="cx">         // BMPImageReader!

</span><del>-        virtual bool setFailed();

</del><ins>+        bool setFailed() override;

</ins><span class="cx"> 

</span><span class="cx">     private:

</span><span class="cx">         inline uint32_t readUint32(int offset) const

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecodersgifGIFImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -33,7 +33,7 @@

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

<span class="cx">     // This class decodes the GIF image format.

</span><del>-    class GIFImageDecoder : public ImageDecoder {

</del><ins>+    class GIFImageDecoder final : public ImageDecoder {

</ins><span class="cx">     public:

</span><span class="cx">         GIFImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx">         virtual ~GIFImageDecoder();

</span><span class="lines">@@ -41,18 +41,18 @@

</span><span class="cx">         enum GIFQuery { GIFFullQuery, GIFSizeQuery, GIFFrameCountQuery };

</span><span class="cx"> 

</span><span class="cx">         // ImageDecoder

</span><del>-        virtual String filenameExtension() const { return &quot;gif&quot;; }

-        virtual void setData(SharedBuffer&amp; data, bool allDataReceived);

-        virtual bool isSizeAvailable();

-        virtual bool setSize(unsigned width, unsigned height);

-        virtual size_t frameCount();

-        virtual int repetitionCount() const;

-        virtual ImageFrame* frameBufferAtIndex(size_t index);

</del><ins>+        String filenameExtension() const override { return &quot;gif&quot;; }

+        void setData(SharedBuffer&amp; data, bool allDataReceived) override;

+        bool isSizeAvailable() override;

+        bool setSize(unsigned width, unsigned height) override;

+        size_t frameCount() override;

+        int repetitionCount() const override;

+        ImageFrame* frameBufferAtIndex(size_t index) override;

</ins><span class="cx">         // CAUTION: setFailed() deletes |m_reader|.  Be careful to avoid

</span><span class="cx">         // accessing deleted memory, especially when calling this from inside

<span class="cx">         // GIFImageReader!

</span><del>-        virtual bool setFailed();

-        virtual void clearFrameBufferCache(size_t clearBeforeFrame);

</del><ins>+        bool setFailed() override;

+        void clearFrameBufferCache(size_t clearBeforeFrame) override;

</ins><span class="cx"> 

<span class="cx">         // Callbacks from the GIF reader.

</span><span class="cx">         bool haveDecodedRow(unsigned frameIndex, const Vector&lt;unsigned char&gt;&amp; rowBuffer, size_t width, size_t rowNumber, unsigned repeatCount, bool writeTransparentPixels);

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -83,7 +83,7 @@

</span><span class="cx">     return m_frameSize.isEmpty() ? ImageDecoder::size() : m_frameSize;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-IntSize ICOImageDecoder::frameSizeAtIndex(size_t index) const

</del><ins>+IntSize ICOImageDecoder::frameSizeAtIndex(size_t index, SubsamplingLevel) const

</ins><span class="cx"> {

</span><span class="cx">     return (index &amp;&amp; (index &lt; m_dirEntries.size())) ? m_dirEntries[index].m_size : size();

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -38,25 +38,25 @@

</span><span class="cx">     class PNGImageDecoder;

</span><span class="cx"> 

<span class="cx">     // This class decodes the ICO and CUR image formats.

</span><del>-    class ICOImageDecoder : public ImageDecoder {

</del><ins>+    class ICOImageDecoder final : public ImageDecoder {

</ins><span class="cx">     public:

</span><span class="cx">         ICOImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx">         virtual ~ICOImageDecoder();

</span><span class="cx"> 

</span><span class="cx">         // ImageDecoder

</span><del>-        virtual String filenameExtension() const { return &quot;ico&quot;; }

-        virtual void setData(SharedBuffer&amp;, bool allDataReceived);

-        virtual bool isSizeAvailable();

-        virtual IntSize size() const;

-        virtual IntSize frameSizeAtIndex(size_t) const;

-        virtual bool setSize(unsigned width, unsigned height);

-        virtual size_t frameCount();

-        virtual ImageFrame* frameBufferAtIndex(size_t);

</del><ins>+        String filenameExtension() const override { return &quot;ico&quot;; }

+        void setData(SharedBuffer&amp;, bool allDataReceived) override;

+        bool isSizeAvailable() override;

+        IntSize size() const override;

+        IntSize frameSizeAtIndex(size_t, SubsamplingLevel) const override;

+        bool setSize(unsigned width, unsigned height) override;

+        size_t frameCount() override;

+        ImageFrame* frameBufferAtIndex(size_t) override;

</ins><span class="cx">         // CAUTION: setFailed() deletes all readers and decoders.  Be careful to

</span><span class="cx">         // avoid accessing deleted memory, especially when calling this from

<span class="cx">         // inside BMPImageReader!

</span><del>-        virtual bool setFailed();

-        virtual Optional&lt;IntPoint&gt; hotSpot() const;

</del><ins>+        bool setFailed() override;

+        Optional&lt;IntPoint&gt; hotSpot() const override;

</ins><span class="cx"> 

</span><span class="cx">     private:

</span><span class="cx">         enum ImageType {

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecodersjpegJPEGImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -42,20 +42,20 @@

</span><span class="cx">     class JPEGImageReader;

</span><span class="cx"> 

<span class="cx">     // This class decodes the JPEG image format.

</span><del>-    class JPEGImageDecoder : public ImageDecoder {

</del><ins>+    class JPEGImageDecoder final : public ImageDecoder {

</ins><span class="cx">     public:

</span><span class="cx">         JPEGImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx">         virtual ~JPEGImageDecoder();

</span><span class="cx"> 

</span><span class="cx">         // ImageDecoder

</span><del>-        virtual String filenameExtension() const { return &quot;jpg&quot;; }

-        virtual bool isSizeAvailable();

-        virtual bool setSize(unsigned width, unsigned height);

-        virtual ImageFrame* frameBufferAtIndex(size_t index);

</del><ins>+        String filenameExtension() const override { return &quot;jpg&quot;; }

+        bool isSizeAvailable() override;

+        bool setSize(unsigned width, unsigned height) override;

+        ImageFrame* frameBufferAtIndex(size_t index) override;

</ins><span class="cx">         // CAUTION: setFailed() deletes |m_reader|.  Be careful to avoid

</span><span class="cx">         // accessing deleted memory, especially when calling this from inside

<span class="cx">         // JPEGImageReader!

</span><del>-        virtual bool setFailed();

</del><ins>+        bool setFailed() override;

</ins><span class="cx"> 

</span><span class="cx">         bool willDownSample()

</span><span class="cx">         {

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecoderspngPNGImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -36,7 +36,7 @@

</span><span class="cx">     class PNGImageReader;

</span><span class="cx"> 

<span class="cx">     // This class decodes the PNG image format.

</span><del>-    class PNGImageDecoder : public ImageDecoder {

</del><ins>+    class PNGImageDecoder final : public ImageDecoder {

</ins><span class="cx">     public:

</span><span class="cx">         PNGImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx">         virtual ~PNGImageDecoder();

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformimagedecoderswebpWEBPImageDecoderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h (202676 => 202677)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h        2016-06-30 08:14:35 UTC (rev 202676)

+++ trunk/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h        2016-06-30 13:37:25 UTC (rev 202677)

</span><span class="lines">@@ -37,14 +37,14 @@

</span><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

</span><del>-class WEBPImageDecoder : public ImageDecoder {

</del><ins>+class WEBPImageDecoder final : public ImageDecoder {

</ins><span class="cx"> public:

</span><span class="cx">     WEBPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);

</span><span class="cx">     virtual ~WEBPImageDecoder();

</span><span class="cx"> 

</span><del>-    virtual String filenameExtension() const { return &quot;webp&quot;; }

-    virtual bool isSizeAvailable();

-    virtual ImageFrame* frameBufferAtIndex(size_t index);

</del><ins>+    String filenameExtension() const override { return &quot;webp&quot;; }

+    bool isSizeAvailable() override;

+    ImageFrame* frameBufferAtIndex(size_t index) override;

</ins><span class="cx"> 

</span><span class="cx"> private:

</span><span class="cx">     bool decode(bool onlySize);

</span></span></pre>

</div>

</div>

</body>

</html>