Remove PNGImageReader JPEGImageReader close() routine

The close() routine is only called from the reader destructor: move
the code into the class destructor and eliminate close().

Also, Blink style fix the if test in the ~PNGImageReader() to avoid
presubmit nit on patch upload.

BUG=439655

Review URL: https://codereview.chromium.org/1418423014

Cr-Commit-Position: refs/heads/master@{#358665}

2 files changed, 5 insertions, 13 deletions

diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index 10c3937..c766f33 100644
--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -335,11 +335,6 @@ public:
 
     ~JPEGImageReader()
     {
-        close();
-    }
-
-    void close()
-    {
 #if USE(QCMSLIB)
         clearColorTransform();
 #endif
diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
index b2f0baf..88d8c69 100644
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -105,17 +105,14 @@ public:
 
     ~PNGImageReader()
     {
-        close();
-    }
-
-    void close()
-    {
-        if (m_png && m_info)
-            // This will zero the pointers.
-            png_destroy_read_struct(&m_png, &m_info, 0);
 #if USE(QCMSLIB)
         clearColorTransform();
 #endif
+        if (m_png && m_info) {
+            // This will zero the pointers.
+            png_destroy_read_struct(&m_png, &m_info, 0);
+        }
+
         m_readOffset = 0;
     }