MAGETWO-65248: [Backport] - [Performance] Caching of swatches data in block cache - for 2.1.6

Author: lestare

app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php

@@ -365,30 +365,18 @@ protected function getConfigurableOptionsIds(array $attributeData)
     }
 
     /**
-     * Produce and return block's html output
+     * Return HTML code
      *
      * @codeCoverageIgnore
      * @return string
      */
-    public function toHtml()
+    protected function _toHtml()
     {
         $this->initIsProductHasSwatchAttribute();
         $this->setTemplate(
             $this->getRendererTemplate()
         );
-
-        return parent::toHtml();
-    }
-
-    /**
-     * Return HTML code
-     *
-     * @codeCoverageIgnore
-     * @return string
-     */
-    protected function _toHtml()
-    {
-        return $this->getHtmlOutput();
+        return parent::_toHtml();
     }
 
     /**
@@ -402,6 +390,7 @@ protected function getRendererTemplate()
     }
 
     /**
+     * @deprecated
      * @codeCoverageIgnore
      * @return string
      */

app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php

@@ -28,7 +28,7 @@ protected function getHtmlOutput()
     {
         $output = '';
         if ($this->isProductHasSwatchAttribute) {
-            $output = parent::getHtmlOutput();
+            $output = parent::toHtml();
         }
 
         return $output;