diff --git a/core/core.services.yml b/core/core.services.yml
index 6a0669c..aaa5592 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -522,6 +522,9 @@ services:
   image.toolkit.manager:
     class: Drupal\system\Plugin\ImageToolkitManager
     arguments: ['@container.namespaces', '@cache.cache', '@language_manager']
+  image.toolkit.operation.manager:
+    class: Drupal\system\Plugin\ImageToolkitOperationManager
+    arguments: ['@container.namespaces', '@cache.cache', '@language_manager']
   image.toolkit:
     class: Drupal\system\Plugin\ImageToolkitInterface
     factory_method: getDefaultToolkit
diff --git a/core/lib/Drupal/Core/Image/Image.php b/core/lib/Drupal/Core/Image/Image.php
index 0f2fc85..f7248c2 100644
--- a/core/lib/Drupal/Core/Image/Image.php
+++ b/core/lib/Drupal/Core/Image/Image.php
@@ -326,7 +326,7 @@ public function crop($x, $y, $width, $height) {
     $width = (int) round($width);
     $height = (int) round($height);
 
-    return $this->toolkit->crop($this, $x, $y, $width, $height);
+    return $this->toolkit->process('crop', $this, array('x' => $x, 'y' => $y, 'width' => $width, 'height' => $height));
   }
 
   /**
@@ -336,21 +336,21 @@ public function resize($width, $height) {
     $width = (int) round($width);
     $height = (int) round($height);
 
-    return $this->toolkit->resize($this, $width, $height);
+    return $this->toolkit->process('resize', $this, array('width' => $width, 'height' => $height));
   }
 
   /**
    * {@inheritdoc}
    */
   public function desaturate() {
-    return $this->toolkit->desaturate($this);
+    return $this->toolkit->process('desaturate', $this);
   }
 
   /**
    * {@inheritdoc}
    */
   public function rotate($degrees, $background = NULL) {
-    return $this->toolkit->rotate($this, $degrees, $background);
+    return $this->toolkit->process('rotate', $this, array('degrees' => $degrees, 'background' => $background));
   }
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkitOperation.php b/core/modules/system/lib/Drupal/system/Annotation/ImageToolkitOperation.php
new file mode 100644
index 0000000..4c1daa1
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Annotation/ImageToolkitOperation.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Annotation\ImageToolkitOperation.
+ */
+
+namespace Drupal\system\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines a Plugin annotation object for the image toolkit operation plugin.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\system\Plugin\ImageToolkitOperationManager
+ */
+class ImageToolkitOperation extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The human-readable name of the image toolkit operation.
+   *
+   * The string should be wrapped in a @Translation().
+   *
+   * @ingroup plugin_translatable
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   */
+  public $label;
+
+  /**
+   * The description of the image toolkit operation.
+   *
+   * The string should be wrapped in a @Translation().
+   *
+   * @ingroup plugin_translatable
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   */
+  public $description;
+
+  /**
+   * The id of the image toolkit plugin for which the operation is implemented.
+   *
+   * @var \Drupal\system\Plugin\ImageToolkit
+   */
+  public $toolkit;
+
+  /**
+   * The machine name of the image toolkit operation implemented.
+   *
+   * @var string
+   */
+  public $operation;
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php
index cf13884..3a4bc5a 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Plugin\ImageToolkit\GDToolkit;.
+ * Contains \Drupal\system\Plugin\ImageToolkit\GDToolkit.
  */
 
 namespace Drupal\system\Plugin\ImageToolkit;
@@ -11,6 +11,7 @@
 use Drupal\system\Annotation\ImageToolkit;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Plugin\ImageToolkitBase;
 use Drupal\system\Plugin\ImageToolkitInterface;
 
 /**
@@ -21,7 +22,7 @@
  *   title = @Translation("GD2 image manipulation toolkit")
  * )
  */
-class GDToolkit extends PluginBase implements ImageToolkitInterface {
+class GDToolkit extends ImageToolkitBase implements ImageToolkitInterface {
 
   /**
    * {@inheritdoc}
@@ -51,109 +52,6 @@ public function settingsFormSubmit($form, &$form_state) {
   /**
    * {@inheritdoc}
    */
-  public function resize(ImageInterface $image, $width, $height) {
-    $res = $this->createTmp($image, $width, $height);
-
-    if (!imagecopyresampled($res, $image->getResource(), 0, 0, 0, 0, $width, $height, $image->getWidth(), $image->getHeight())) {
-      return FALSE;
-    }
-
-    imagedestroy($image->getResource());
-    // Update image object.
-    $image
-      ->setResource($res)
-      ->setWidth($width)
-      ->setHeight($height);
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rotate(ImageInterface $image, $degrees, $background = NULL) {
-    // PHP installations using non-bundled GD do not have imagerotate.
-    if (!function_exists('imagerotate')) {
-      watchdog('image', 'The image %file could not be rotated because the imagerotate() function is not available in this PHP installation.', array('%file' => $image->getSource()));
-      return FALSE;
-    }
-
-    // Convert the hexadecimal background value to a color index value.
-    if (isset($background)) {
-      $rgb = array();
-      for ($i = 16; $i >= 0; $i -= 8) {
-        $rgb[] = (($background >> $i) & 0xFF);
-      }
-      $background = imagecolorallocatealpha($image->getResource(), $rgb[0], $rgb[1], $rgb[2], 0);
-    }
-    // Set the background color as transparent if $background is NULL.
-    else {
-      // Get the current transparent color.
-      $background = imagecolortransparent($image->getResource());
-
-      // If no transparent colors, use white.
-      if ($background == 0) {
-        $background = imagecolorallocatealpha($image->getResource(), 255, 255, 255, 0);
-      }
-    }
-
-    // Images are assigned a new color palette when rotating, removing any
-    // transparency flags. For GIF images, keep a record of the transparent color.
-    if ($image->getType() == IMAGETYPE_GIF) {
-      $transparent_index = imagecolortransparent($image->getResource());
-      if ($transparent_index != 0) {
-        $transparent_gif_color = imagecolorsforindex($image->getResource(), $transparent_index);
-      }
-    }
-
-    $image->setResource(imagerotate($image->getResource(), 360 - $degrees, $background));
-
-    // GIFs need to reassign the transparent color after performing the rotate.
-    if (isset($transparent_gif_color)) {
-      $background = imagecolorexactalpha($image->getResource(), $transparent_gif_color['red'], $transparent_gif_color['green'], $transparent_gif_color['blue'], $transparent_gif_color['alpha']);
-      imagecolortransparent($image->getResource(), $background);
-    }
-
-    $image
-      ->setWidth(imagesx($image->getResource()))
-      ->setHeight(imagesy($image->getResource()));
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function crop(ImageInterface $image, $x, $y, $width, $height) {
-    $res = $this->createTmp($image, $width, $height);
-
-    if (!imagecopyresampled($res, $image->getResource(), 0, 0, $x, $y, $width, $height, $width, $height)) {
-      return FALSE;
-    }
-
-    // Destroy the original image and return the modified image.
-    imagedestroy($image->getResource());
-    $image
-      ->setResource($res)
-      ->setWidth($width)
-      ->setHeight($height);
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function desaturate(ImageInterface $image) {
-    // PHP installations using non-bundled GD do not have imagefilter.
-    if (!function_exists('imagefilter')) {
-      watchdog('image', 'The image %file could not be desaturated because the imagefilter() function is not available in this PHP installation.', array('%file' => $image->getSource()));
-      return FALSE;
-    }
-
-    return imagefilter($image->getResource(), IMG_FILTER_GRAYSCALE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function load(ImageInterface $image) {
     $function = 'imagecreatefrom' . image_type_to_extension($image->getType(), FALSE);
     if (function_exists($function) && $resource = $function($image->getSource())) {
@@ -293,4 +191,5 @@ public static function isAvailable() {
   public static function supportedTypes() {
     return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF);
   }
+
 }
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitBase.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitBase.php
new file mode 100644
index 0000000..ffb3554
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitBase.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitBase.
+ */
+
+namespace Drupal\system\Plugin;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Image\ImageInterface;
+
+/**
+ * Base class implementation of an image toolkit.
+ */
+abstract class ImageToolkitBase extends PluginBase {
+
+  /**
+   * Stores instantiated image toolkit operation plugins.
+   *
+   * @var array
+   */
+  protected $operationPlugins = array();
+
+  /**
+   * Processes a toolkit operation.
+   *
+   * @param string $operation
+   *   The toolkit operation to be processed.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of variables to be used by the toolkit operation.
+   *
+   * @return mixed
+   *   The return value of the image toolkit operation.
+   */
+  public function process($operation, ImageInterface $image, array $data = array()) {
+    // Check if operation plugin has been instantiated already. If not,
+    // create an instance.
+    if (isset($this->operationPlugins[$operation])) {
+      $plugin = $this->operationPlugins[$operation];
+    }
+    else {
+      $manager = \Drupal::service('image.toolkit.operation.manager');
+      $plugin_id = $manager->getToolkitOperationPluginId($this->getPluginId(), $operation);
+      $plugin = $manager->createInstance($plugin_id);
+      $this->operationPlugins[$operation] = $plugin;
+    }
+    return $plugin->process($this, $image, $data);
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
index 5918160..cbc3bfa 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
@@ -60,78 +60,6 @@ public function settingsForm();
   public function settingsFormSubmit($form, &$form_state);
 
   /**
-   * Scales an image to the specified size.
-   *
-   * @param \Drupal\Core\Image\ImageInterface $image
-   *   An image object. The $image->resource, $image->info['width'], and
-   *   $image->info['height'] values will be modified by this call.
-   * @param int $width
-   *   The new width of the resized image, in pixels.
-   * @param int $height
-   *   The new height of the resized image, in pixels.
-   *
-   * @return bool
-   *   TRUE or FALSE, based on success.
-   */
-  public function resize(ImageInterface $image, $width, $height);
-
-  /**
-   * Rotates an image the given number of degrees.
-   *
-   * @param \Drupal\Core\Image\ImageInterface $image
-   *   An image object. The $image->resource, $image->info['width'], and
-   *   $image->info['height'] values will be modified by this call.
-   * @param int $degrees
-   *   The number of (clockwise) degrees to rotate the image.
-   * @param string $background
-   *   (optional) An hexadecimal integer specifying the background color to use
-   *   for the uncovered area of the image after the rotation. E.g. 0x000000 for
-   *   black, 0xff00ff for magenta, and 0xffffff for white. For images that
-   *   support transparency, this will default to transparent. Otherwise it will
-   *   be white.
-   *
-   * @return bool
-   *   TRUE or FALSE, based on success.
-   */
-  public function rotate(ImageInterface $image, $degrees, $background = NULL);
-
-  /**
-   * Crops an image.
-   *
-   * @param \Drupal\Core\Image\ImageInterface $image
-   *   An image object. The $image->resource, $image->info['width'], and
-   *   $image->info['height'] values will be modified by this call.
-   * @param int $x
-   *   The starting x offset at which to start the crop, in pixels.
-   * @param int $y
-   *   The starting y offset at which to start the crop, in pixels.
-   * @param int $width
-   *   The width of the cropped area, in pixels.
-   * @param int $height
-   *   The height of the cropped area, in pixels.
-   *
-   * @return bool
-   *   TRUE or FALSE, based on success.
-   *
-   * @see image_crop()
-   */
-  public function crop(ImageInterface $image, $x, $y, $width, $height);
-
-  /**
-   * Converts an image resource to grayscale.
-   *
-   * Note that transparent GIFs loose transparency when desaturated.
-   *
-   * @param \Drupal\Core\Image\ImageInterface $image
-   *   An image object. The $image->resource value will be modified by this
-   *   call.
-   *
-   * @return bool
-   *   TRUE or FALSE, based on success.
-   */
-  public function desaturate(ImageInterface $image);
-
-  /**
    * Creates an image resource from a file.
    *
    * @param \Drupal\Core\Image\ImageInterface $image
@@ -189,4 +117,19 @@ public static function isAvailable();
    *   IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
    */
   public static function supportedTypes();
+
+  /**
+   * Processes a toolkit operation.
+   *
+   * @param string $operation
+   *   The toolkit operation to be processed.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of variables to be used by the toolkit operation.
+   *
+   * @return mixed
+   *   The return value of the image toolkit operation.
+   */
+  public function process($operation, ImageInterface $image, array $data = array());
 }
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitCrop.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitCrop.php
new file mode 100644
index 0000000..9cc7a72
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitCrop.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperation\GDToolkitCrop.
+ */
+
+namespace Drupal\system\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines GD2 Crop operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "system_gd_crop",
+ *   label = @Translation("Crop"),
+ *   description = @Translation("GD2 toolkit crop"),
+ *   toolkit = "gd",
+ *   operation = "crop",
+ *   weight = 0
+ * )
+ */
+class GDToolkitCrop extends ImageToolkitOperationBase {
+
+  /**
+   * Crops an image.
+   *
+   * The image resource, width, and height values will be modified by this
+   * call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - x: The starting x offset at which to start the crop, in pixels.
+   *   - y: The starting y offset at which to start the crop, in pixels.
+   *   - width: The width of the cropped area, in pixels.
+   *   - height: The height of the cropped area, in pixels.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   *
+   * @see image_crop()
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    $res = $toolkit->createTmp($image, $data['width'], $data['height']);
+
+    if (!imagecopyresampled($res, $image->getResource(), 0, 0, $data['x'], $data['y'], $data['width'], $data['height'], $data['width'], $data['height'])) {
+      return FALSE;
+    }
+
+    // Destroy the original image and return the modified image.
+    imagedestroy($image->getResource());
+    $image
+      ->setResource($res)
+      ->setWidth($data['width'])
+      ->setHeight($data['height']);
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitDesaturate.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitDesaturate.php
new file mode 100644
index 0000000..5050d08
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitDesaturate.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperation\GDToolkitDesaturate.
+ */
+
+namespace Drupal\system\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines GD2 Desaturate operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "system_gd_desaturate",
+ *   label = @Translation("Desaturate"),
+ *   description = @Translation("GD2 toolkit desaturate"),
+ *   toolkit = "gd",
+ *   operation = "desaturate",
+ *   weight = 0
+ * )
+ */
+class GDToolkitDesaturate extends ImageToolkitOperationBase {
+
+  /**
+   * Converts an image resource to grayscale.
+   *
+   * Note that transparent GIFs loose transparency when desaturated. The image
+   * resource value will be modified by this call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   Not used, should be left empty.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    // PHP installations using non-bundled GD do not have imagefilter.
+    if (!function_exists('imagefilter')) {
+      watchdog('image', 'The image %file could not be desaturated because the imagefilter() function is not available in this PHP installation.', array('%file' => $image->getSource()));
+      return FALSE;
+    }
+
+    return imagefilter($image->getResource(), IMG_FILTER_GRAYSCALE);
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitResize.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitResize.php
new file mode 100644
index 0000000..1330b1d
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitResize.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperation\GDToolkitResize.
+ */
+
+namespace Drupal\system\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines GD2 resize operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "system_gd_resize",
+ *   label = @Translation("Resize"),
+ *   description = @Translation("GD2 toolkit resize"),
+ *   toolkit = "gd",
+ *   operation = "resize",
+ *   weight = 0
+ * )
+ */
+class GDToolkitResize extends ImageToolkitOperationBase {
+
+  /**
+   * Scales an image to the specified size.
+   *
+   * The image resource, width, and height values will be modified by this
+   * call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - width: The new width of the resized image, in pixels.
+   *   - height: The new height of the resized image, in pixels.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    $res = $toolkit->createTmp($image, $data['width'], $data['height']);
+
+    if (!imagecopyresampled($res, $image->getResource(), 0, 0, 0, 0, $data['width'], $data['height'], $image->getWidth(), $image->getHeight())) {
+      return FALSE;
+    }
+
+    imagedestroy($image->getResource());
+    // Update image object.
+    $image
+      ->setResource($res)
+      ->setWidth($data['width'])
+      ->setHeight($data['height']);
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitRotate.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitRotate.php
new file mode 100644
index 0000000..7c28ae9
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperation/GDToolkitRotate.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperation\GDToolkitRotate.
+ */
+
+namespace Drupal\system\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines GD2 rotate operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "system_gd_rotate",
+ *   label = @Translation("Rotate"),
+ *   description = @Translation("GD2 toolkit rotate"),
+ *   toolkit = "gd",
+ *   operation = "rotate",
+ *   weight = 0
+ * )
+ */
+class GDToolkitRotate extends ImageToolkitOperationBase {
+
+  /**
+   * Rotates an image the given number of degrees.
+   *
+   * An image object. The image resource, width, and height values will
+   * be modified by this call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - degrees: The number of (clockwise) degrees to rotate the image.
+   *   - background: (optional) An hexadecimal integer specifying the
+   *     background color to use for the uncovered area of the image after
+   *     the rotation. E.g. 0x000000 for black, 0xff00ff for magenta, and
+   *     0xffffff for white. For images that support transparency, this will
+   *     default to transparent. Otherwise it will be white.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    // Ensure background variable is set.
+    $data['background'] = isset($data['background']) ? $data['background'] : NULL;
+
+    // PHP installations using non-bundled GD do not have imagerotate.
+    if (!function_exists('imagerotate')) {
+      watchdog('image', 'The image %file could not be rotated because the imagerotate() function is not available in this PHP installation.', array('%file' => $image->getSource()));
+      return FALSE;
+    }
+
+    // Convert the hexadecimal background value to a color index value.
+    if (!empty($data['background'])) {
+      $rgb = array();
+      for ($i = 16; $i >= 0; $i -= 8) {
+        $rgb[] = (($data['background'] >> $i) & 0xFF);
+      }
+      $data['background'] = imagecolorallocatealpha($image->getResource(), $rgb[0], $rgb[1], $rgb[2], 0);
+    }
+    // Set the background color as transparent if $data['background'] is NULL.
+    else {
+      // Get the current transparent color.
+      $data['background'] = imagecolortransparent($image->getResource());
+
+      // If no transparent colors, use white.
+      if ($data['background'] == 0) {
+        $data['background'] = imagecolorallocatealpha($image->getResource(), 255, 255, 255, 0);
+      }
+    }
+
+    // Images are assigned a new color palette when rotating, removing any
+    // transparency flags. For GIF images, keep a record of the transparent color.
+    if ($image->getType() == IMAGETYPE_GIF) {
+      $transparent_index = imagecolortransparent($image->getResource());
+      if ($transparent_index != 0) {
+        $transparent_gif_color = imagecolorsforindex($image->getResource(), $transparent_index);
+      }
+    }
+
+    $image->setResource(imagerotate($image->getResource(), 360 - $data['degrees'], $data['background']));
+
+    // GIFs need to reassign the transparent color after performing the rotate.
+    if (isset($transparent_gif_color)) {
+      $data['background'] = imagecolorexactalpha($image->getResource(), $transparent_gif_color['red'], $transparent_gif_color['green'], $transparent_gif_color['blue'], $transparent_gif_color['alpha']);
+      imagecolortransparent($image->getResource(), $data['background']);
+    }
+
+    $image
+      ->setWidth(imagesx($image->getResource()))
+      ->setHeight(imagesy($image->getResource()));
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationBase.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationBase.php
new file mode 100644
index 0000000..8728865
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationBase.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperationBase.
+ */
+
+namespace Drupal\system\Plugin;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationInterface;
+
+/**
+ * Base class implementation of a image toolkit operation.
+ */
+abstract class ImageToolkitOperationBase extends PluginBase implements ImageToolkitOperationInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public abstract function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array());
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationInterface.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationInterface.php
new file mode 100644
index 0000000..b67347e
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperationInterface.
+ */
+
+namespace Drupal\system\Plugin;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Plugin\ImageToolkitInterface;
+
+/**
+ * Defines an interface for image toolkit operations.
+ *
+ * An image toolkit operation provides image manipulations like scaling,
+ * cropping, rotating, etc.
+ */
+interface ImageToolkitOperationInterface extends PluginInspectionInterface {
+
+  /**
+   * Processes an image toolkit operation.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *
+   * @return mixed
+   *   The return value of the image toolkit operation.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array());
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationManager.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationManager.php
new file mode 100644
index 0000000..8452227
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitOperationManager.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Plugin\ImageToolkitOperationManager.
+ */
+
+namespace Drupal\system\Plugin;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Plugin\Discovery\AlterDecorator;
+
+/**
+ * Manages toolkit operation plugins.
+ */
+class ImageToolkitOperationManager extends DefaultPluginManager {
+
+  /**
+   * Constructs the ImageToolkitOperationManager object.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Language\LanguageManager $language_manager
+   *   The language manager.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager) {
+    parent::__construct('Plugin/ImageToolkitOperation', $namespaces, 'Drupal\system\Annotation\ImageToolkitOperation');
+    $this->discovery = new AlterDecorator($this->discovery, 'image_toolkit_operation');
+    $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit_operation');
+  }
+
+  /**
+   * @todo
+   */
+  public function getToolkitOperationPluginId($toolkitName, $operation) {
+    $result = NULL;
+    $resultWeight = PHP_INT_MAX;
+    $definitions = $this->getDefinitions();
+    foreach ($definitions as $plugin_id => $definition) {
+      if ($definition['toolkit'] === $toolkitName && $definition['operation'] === $operation && $definition['weight'] < $resultWeight) {
+        $result = $plugin_id;
+        $resultWeight = $definition['weight'];
+      }
+    }
+    return $result;
+  }
+  
+}
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php
index 778e9e2..508bd47 100644
--- a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php
@@ -11,6 +11,7 @@
 use Drupal\system\Annotation\ImageToolkit;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Plugin\ImageToolkitBase;
 use Drupal\system\Plugin\ImageToolkitInterface;
 
 /**
@@ -21,7 +22,7 @@
  *   title = @Translation("A dummy toolkit that works")
  * )
  */
-class TestToolkit extends PluginBase implements ImageToolkitInterface {
+class TestToolkit extends ImageToolkitBase implements ImageToolkitInterface {
 
   /**
    * {@inheritdoc}
@@ -76,38 +77,6 @@ public function save(ImageInterface $image, $destination) {
   }
 
   /**
-   * {@inheritdoc}
-   */
-  public function crop(ImageInterface $image, $x, $y, $width, $height) {
-    $this->logCall('crop', array($image, $x, $y, $width, $height));
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resize(ImageInterface $image, $width, $height) {
-    $this->logCall('resize', array($image, $width, $height));
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rotate(ImageInterface $image, $degrees, $background = NULL) {
-    $this->logCall('rotate', array($image, $degrees, $background));
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function desaturate(ImageInterface $image) {
-    $this->logCall('desaturate', array($image));
-    return TRUE;
-  }
-
-  /**
    * Stores the values passed to a toolkit call.
    *
    * @param string $op
@@ -119,7 +88,7 @@ public function desaturate(ImageInterface $image) {
    * @see \Drupal\system\Tests\Image\ToolkitTestBase::imageTestReset()
    * @see \Drupal\system\Tests\Image\ToolkitTestBase::imageTestGetAllCalls()
    */
-  protected function logCall($op, $args) {
+  public function logCall($op, $args) {
     $results = \Drupal::state()->get('image_test.results') ?: array();
     $results[$op][] = $args;
     \Drupal::state()->set('image_test.results', $results);
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitCrop.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitCrop.php
new file mode 100644
index 0000000..eaa6643
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitCrop.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkitOperation\TestToolkitCrop.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines Test Crop operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "image_test_test_crop",
+ *   label = @Translation("Crop"),
+ *   description = @Translation("Test toolkit crop"),
+ *   toolkit = "test",
+ *   operation = "crop",
+ *   weight = 0
+ * )
+ */
+class TestToolkitCrop extends ImageToolkitOperationBase {
+
+  /**
+   * Crops an image.
+   *
+   * The image resource, width, and height values will be modified by this
+   * call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - x: The starting x offset at which to start the crop, in pixels.
+   *   - y: The starting y offset at which to start the crop, in pixels.
+   *   - width: The width of the cropped area, in pixels.
+   *   - height: The height of the cropped area, in pixels.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   *
+   * @see image_crop()
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    $toolkit->logCall('crop', array($image, $data['x'], $data['y'], $data['width'], $data['height']));
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitDesaturate.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitDesaturate.php
new file mode 100644
index 0000000..a60a3e0
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitDesaturate.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkitOperation\TestToolkitDesaturate.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines Test Desaturate operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "image_test_test_desaturate",
+ *   label = @Translation("Desaturate"),
+ *   description = @Translation("Test toolkit desaturate"),
+ *   toolkit = "test",
+ *   operation = "desaturate",
+ *   weight = 0
+ * )
+ */
+class TestToolkitDesaturate extends ImageToolkitOperationBase {
+
+  /**
+   * Converts an image resource to grayscale.
+   *
+   * Note that transparent GIFs loose transparency when desaturated. The image
+   * resource value will be modified by this call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   Not used, should be left empty.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    $toolkit->logCall('desaturate', array($image));
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitResize.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitResize.php
new file mode 100644
index 0000000..9026534
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitResize.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkitOperation\TestToolkitResize.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines Test resize operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "image_test_test_resize",
+ *   label = @Translation("Resize"),
+ *   description = @Translation("Test toolkit resize"),
+ *   toolkit = "test",
+ *   operation = "resize",
+ *   weight = 0
+ * )
+ */
+class TestToolkitResize extends ImageToolkitOperationBase {
+
+  /**
+   * Scales an image to the specified size.
+   *
+   * The image resource, width, and height values will be modified by this
+   * call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - width: The new width of the resized image, in pixels.
+   *   - height: The new height of the resized image, in pixels.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    $toolkit->logCall('resize', array($image, $data['width'], $data['height']));
+    return TRUE;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitRotate.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitRotate.php
new file mode 100644
index 0000000..7aaf0aa
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkitOperation/TestToolkitRotate.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkitOperation\TestToolkitRotate.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkitOperation;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\system\Annotation\ImageToolkitOperation;
+use Drupal\system\Plugin\ImageToolkitInterface;
+use Drupal\system\Plugin\ImageToolkitOperationBase;
+
+/**
+ * Defines Test rotate operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "image_test_test_rotate",
+ *   label = @Translation("Rotate"),
+ *   description = @Translation("Test toolkit rotate"),
+ *   toolkit = "test",
+ *   operation = "rotate",
+ *   weight = 0
+ * )
+ */
+class TestToolkitRotate extends ImageToolkitOperationBase {
+
+  /**
+   * Rotates an image the given number of degrees.
+   *
+   * An image object. The image resource, width, and height values will
+   * be modified by this call.
+   *
+   * @param \Drupal\system\Plugin\ImageToolkitInterface $toolkit
+   *   An image toolkit.
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   An image object.
+   * @param array $data
+   *   An array of data to be used by the toolkit operation.
+   *   - degrees: The number of (clockwise) degrees to rotate the image.
+   *   - background: (optional) An hexadecimal integer specifying the
+   *     background color to use for the uncovered area of the image after
+   *     the rotation. E.g. 0x000000 for black, 0xff00ff for magenta, and
+   *     0xffffff for white. For images that support transparency, this will
+   *     default to transparent. Otherwise it will be white.
+   *
+   * @return bool
+   *   TRUE or FALSE, based on success.
+   */
+  public function process(ImageToolkitInterface $toolkit, ImageInterface $image, array $data = array()) {
+    // Ensure background variable is set.
+    $data['background'] = isset($data['background']) ? $data['background'] : NULL;
+    $toolkit->logCall('rotate', array($image, $data['degrees'], $data['background']));
+    return TRUE;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 700973e..67ca501 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -219,7 +219,8 @@ public function testProcessInfoFails() {
    */
   public function testScaleWidth() {
     $this->toolkit->expects($this->once())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnArgument(2));
     $height = $this->image->scale(44);
     $this->assertEquals($height, 50);
@@ -230,7 +231,8 @@ public function testScaleWidth() {
    */
   public function testScaleHeight() {
     $this->toolkit->expects($this->once())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnArgument(1));
 
     $width = $this->image->scale(NULL, 50);
@@ -243,7 +245,8 @@ public function testScaleHeight() {
   public function testScaleSame() {
     // Dimensions are the same, resize should not be called.
     $this->toolkit->expects($this->never())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnArgument(1));
 
     $width = $this->image->scale(88, 100);
@@ -255,11 +258,13 @@ public function testScaleSame() {
    */
   public function testScaleAndCropWidth() {
     $this->toolkit->expects($this->once())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnValue(TRUE));
 
     $this->toolkit->expects($this->once())
-      ->method('crop')
+      ->method('process')
+      ->with($this->equalTo('crop'))
       ->will($this->returnArgument(1));
 
     $x = $this->image->scaleAndCrop(34, 50);
@@ -271,11 +276,13 @@ public function testScaleAndCropWidth() {
    */
   public function testScaleAndCropHeight() {
     $this->toolkit->expects($this->once())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnValue(TRUE));
 
     $this->toolkit->expects($this->once())
-      ->method('crop')
+      ->method('process')
+      ->with($this->equalTo('crop'))
       ->will($this->returnArgument(2));
 
     $y = $this->image->scaleAndCrop(44, 40);
@@ -287,11 +294,13 @@ public function testScaleAndCropHeight() {
    */
   public function testScaleAndCropFails() {
     $this->toolkit->expects($this->once())
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnValue(FALSE));
 
     $this->toolkit->expects($this->never())
-      ->method('crop');
+      ->method('process')
+      ->with($this->equalTo('crop'));
     $this->image->scaleAndCrop(44, 40);
   }
 
@@ -300,7 +309,8 @@ public function testScaleAndCropFails() {
    */
   public function testCropWidth() {
     $this->toolkit->expects($this->once())
-      ->method('crop')
+      ->method('process')
+      ->with($this->equalTo('crop'))
       ->will($this->returnArgument(4));
     // Cropping with width only should preserve the aspect ratio.
     $height = $this->image->crop(0, 0, 44, NULL);
@@ -312,7 +322,8 @@ public function testCropWidth() {
    */
   public function testCropHeight() {
     $this->toolkit->expects($this->once())
-      ->method('crop')
+      ->method('process')
+      ->with($this->equalTo('crop'))
       ->will($this->returnArgument(3));
     // Cropping with height only should preserve the aspect ratio.
     $width = $this->image->crop(0, 0, NULL, 50);
@@ -324,7 +335,8 @@ public function testCropHeight() {
    */
   public function testCrop() {
     $this->toolkit->expects($this->once())
-      ->method('crop')
+      ->method('process')
+      ->with($this->equalTo('crop'))
       ->will($this->returnArgument(3));
     $width = $this->image->crop(0, 0, 44, 50);
     $this->assertEquals($width, 44);
@@ -335,7 +347,8 @@ public function testCrop() {
    */
   public function testResize() {
     $this->toolkit->expects($this->exactly(2))
-      ->method('resize')
+      ->method('process')
+      ->with($this->equalTo('resize'))
       ->will($this->returnArgument(1));
     // Resize with integer for width and height.
     $this->image->resize(30, 40);
@@ -350,7 +363,8 @@ public function testResize() {
    */
   public function testDesaturate() {
     $this->toolkit->expects($this->once())
-      ->method('desaturate');
+      ->method('process')
+      ->with($this->equalTo('desaturate'));
     $this->image->desaturate();
   }
 
@@ -359,7 +373,8 @@ public function testDesaturate() {
    */
   public function testRotate() {
     $this->toolkit->expects($this->once())
-      ->method('rotate');
+      ->method('process')
+      ->with($this->equalTo('rotate'));
     $this->image->rotate(90);
   }
 
