Merge "Allow ResourceLoaderImage modules without data URIs"

diff --combined includes/resourceloader/ResourceLoaderImageModule.php
index 576ee3f,9311f6f..b711cbd
--- 1/includes/resourceloader/ResourceLoaderImageModule.php
--- 2/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@@ -40,6 -40,7 +40,7 @@@ class ResourceLoaderImageModule extend
  
        protected $images = [];
        protected $defaultColor = null;
+       protected $useDataURI = true;
        protected $variants = [];
        protected $prefix = null;
        protected $selectorWithoutVariant = '.{prefix}-{name}';
@@@ -51,7 -52,7 +52,7 @@@
         *
         * @param array $options List of options; if not given or empty, an empty module will be
         *     constructed
 -       * @param string $localBasePath Base path to prepend to all local paths in $options. Defaults
 +       * @param string|null $localBasePath Base path to prepend to all local paths in $options. Defaults
         *     to $IP
         *
         * Below is a description for the $options array:
@@@ -183,6 -184,9 +184,9 @@@
                                        $this->{$member} = $option;
                                        break;
  
+                               case 'useDataURI':
+                                       $this->{$member} = (bool)$option;
+                                       break;
                                case 'defaultColor':
                                case 'prefix':
                                case 'selectorWithoutVariant':
@@@ -358,7 -362,7 +362,7 @@@
                $script,
                $variant = null
        ) {
-               $imageDataUri = $image->getDataUri( $context, $variant, 'original' );
+               $imageDataUri = $this->useDataURI ? $image->getDataUri( $context, $variant, 'original' ) : false;
                $primaryUrl = $imageDataUri ?: $image->getUrl( $context, $script, $variant, 'original' );
                $declarations = $this->getCssDeclarations(
                        $primaryUrl,
@@@ -443,7 -447,7 +447,7 @@@
         * Extract a local base path from module definition information.
         *
         * @param array $options Module definition
 -       * @param string $localBasePath Path to use if not provided in module definition. Defaults
 +       * @param string|null $localBasePath Path to use if not provided in module definition. Defaults
         *     to $IP
         * @return string Local base path
         */