Modifications to skpicture_printer

perf_tools/skpicture_printer.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.
 import os
 
 from telemetry.page import page_measurement
 
 _JS = 'chrome.gpuBenchmarking.printToSkPicture("{0}");'
 
 class SkPicturePrinter(page_measurement.PageMeasurement):
   def AddCommandLineOptions(self, parser):
-    parser.add_option('-o', '--outdir', help='Output directory')
+    parser.add_option('-s', '--skp_outdir',
+                      help='Output directory for the SKP files')
 
   def CustomizeBrowserOptions(self, options):
     options.extra_browser_args.extend(['--enable-gpu-benchmarking',
-                                       '--no-sandbox'])
+                                       '--no-sandbox',
+                                       '--enable-deferred-image-decoding',
+                                       '--force-compositing-mode'])
 
   def MeasurePage(self, page, tab, results):
-    if self.options.outdir is not None:

[nduca, 2013/05/28 18:50:25]

why'd you remove the is not none handling?

[rmistry, 2013/05/28 18:55:11]

If outdir was not specified (None), the next line was failing because it was
referencing outpath before it was assigned:
outpath = os.path.abspath(outpath)

Maybe I should throw an Exception if skp_outdir is not specified, though I
expected line 12 to do that for me.

-      outpath = os.path.join(self.options.outdir, page.url_as_file_safe_name)
-    outpath = os.path.abspath(outpath)
+    outpath = os.path.abspath(
+        os.path.join(self.options.skp_outdir,
+                     page.url_as_file_safe_name))
     # Replace win32 path separator char '\' with '\\'.
     js = _JS.format(outpath.replace('\\', '\\\\'))
     tab.EvaluateJavaScript(js)
     results.Add('output_path', 'path', outpath)