[Telemetry] Migrate bitmap.py from bitmaptools.cc to numpy

content/test/gpu/gpu_tests/pixel.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from datetime import datetime
 import glob
 import optparse
 import os
 import re
 
 import cloud_storage_test_base
 import page_sets
 import pixel_expectations
 
 from telemetry import benchmark
-from telemetry.core import bitmap
+from telemetry.image_processing import image_util
 from telemetry.page import page_test
 from telemetry.util import cloud_storage
 
 
 test_data_dir = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
 
 default_reference_image_dir = os.path.join(test_data_dir, 'gpu_reference')
 
 test_harness_script = r"""
@@ skipping 29 matching lines @@
 
   def ValidateAndMeasurePage(self, page, tab, results):
     if not _DidTestSucceed(tab):
       raise page_test.Failure('Page indicated a failure')
 
     if not tab.screenshot_supported:
       raise page_test.Failure('Browser does not support screenshot capture')
 
     screenshot = tab.Screenshot(5)
 
-    if not screenshot:
+    if screenshot is None:
       raise page_test.Failure('Could not capture screenshot')
 
     if hasattr(page, 'test_rect'):
-      screenshot = screenshot.Crop(
-          page.test_rect[0], page.test_rect[1],
+      screenshot = image_util.Crop(
+          screenshot, page.test_rect[0], page.test_rect[1],
           page.test_rect[2], page.test_rect[3])
 
     image_name = self._UrlToImageName(page.display_name)
 
     if self.options.upload_refimg_to_cloud_storage:
       if self._ConditionallyUploadToCloudStorage(image_name, page, tab,
                                                  screenshot):
         # This is the new reference image; there's nothing to compare against.
         ref_png = screenshot
       else:
@@ skipping 16 matching lines @@
         # generated. Otherwise silent failures could happen for long
         # periods of time.
         raise page_test.Failure('Could not find image %s in cloud storage' %
                                 image_name)
     else:
       # Legacy path using on-disk results.
       ref_png = self._GetReferenceImage(self.options.reference_dir,
           image_name, page.revision, screenshot)
 
     # Test new snapshot against existing reference image
-    if not ref_png.IsEqual(screenshot, tolerance=2):
+    if not image_util.AreEqual(ref_png, screenshot, tolerance=2):
       if self.options.test_machine_name:
         self._UploadErrorImagesToCloudStorage(image_name, screenshot, ref_png)
       else:
         self._WriteErrorImages(self.options.generated_dir, image_name,
                                screenshot, ref_png)
       raise page_test.Failure('Reference image did not match captured screen')
 
   def _DeleteOldReferenceImages(self, ref_image_path, cur_revision):
     if not cur_revision:
       return
 
     old_revisions = glob.glob(ref_image_path + "_*.png")
     for rev_path in old_revisions:
       m = re.match(r'^.*_(\d+)\.png$', rev_path)
       if m and int(m.group(1)) < cur_revision:
         print 'Found deprecated reference image. Deleting rev ' + m.group(1)
         os.remove(rev_path)
 
   def _GetReferenceImage(self, img_dir, img_name, cur_revision, screenshot):
     if not cur_revision:
       cur_revision = 0
 
     image_path = os.path.join(img_dir, img_name)
 
     self._DeleteOldReferenceImages(image_path, cur_revision)
 
     image_path = image_path + '_' + str(cur_revision) + '.png'
 
     try:
-      ref_png = bitmap.Bitmap.FromPngFile(image_path)
+      ref_png = image_util.FromPngFile(image_path)
     except IOError:
       ref_png = None
 
-    if ref_png:
+    if ref_png is not None:
       return ref_png
 
     print 'Reference image not found. Writing tab contents as reference.'
 
     self._WriteImage(image_path, screenshot)
     return screenshot
 
 class Pixel(cloud_storage_test_base.TestBase):
   test = _PixelValidator
 
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, group):
     super(Pixel, cls).AddBenchmarkCommandLineArgs(group)
     group.add_option('--reference-dir',
         help='Overrides the default on-disk location for reference images '
         '(only used for local testing without a cloud storage account)',
         default=default_reference_image_dir)
 
   def CreatePageSet(self, options):
     page_set = page_sets.PixelTestsPageSet()
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set
 
   def CreateExpectations(self):
     return pixel_expectations.PixelExpectations()