Remove virtual/softwarecompositing suite

Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py

 # Copyright (C) 2011, Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 62 matching lines @@
 
     @memoized
     def _relative_baseline_search_paths(self, port_name, baseline_name):
         port = self._port_factory.get(port_name)
         relative_paths = [self._filesystem.relpath(path, port.webkit_base()) for path in self._baseline_search_path(port, baseline_name)]
         return relative_paths + [self._baseline_root(port, baseline_name)]
 
     def _join_directory(self, directory, baseline_name):
         # This code is complicated because both the directory name and the baseline_name have the virtual
         # test suite in the name and the virtual baseline name is not a strict superset of the non-virtual name.
-        # For example, virtual/softwarecompositing/foo-expected.png corresponds to compostiting/foo-expected.png and
-        # the baseline directories are like platform/mac/virtual/softwarecompositing. So, to get the path
+        # For example, virtual/gpu/fast/canvas/foo-expected.png corresponds to fast/canvas/foo-expected.png and
+        # the baseline directories are like platform/mac/virtual/gpu/fast/canvas. So, to get the path
         # to the baseline in the platform directory, we need to append jsut foo-expected.png to the directory.
         virtual_suite = self._port_factory.get().lookup_virtual_suite(baseline_name)
         if virtual_suite:
             baseline_name_without_virtual = baseline_name[len(virtual_suite.name) + 1:]
         else:
             baseline_name_without_virtual = baseline_name
         return self._filesystem.join(self._scm.checkout_root, directory, baseline_name_without_virtual)
 
     def read_results_by_directory(self, baseline_name):
         results_by_directory = {}
@@ skipping 242 matching lines @@
         result = self._optimize_subtree(baseline_name)
         non_virtual_baseline_name = self._port_factory.get().lookup_virtual_test_base(baseline_name)
         if not non_virtual_baseline_name:
             return result, self._files_to_delete, self._files_to_add
 
         self._optimize_virtual_root(baseline_name, non_virtual_baseline_name)
 
         _log.debug("Optimizing non-virtual fallback path.")
         result |= self._optimize_subtree(non_virtual_baseline_name)
         return result, self._files_to_delete, self._files_to_add