Teach run-webkit-tests to look for flag-specific platform baselines.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 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 1221 matching lines @@
         return test_configurations
 
     def warn_if_bug_missing_in_test_expectations(self):
         return True
 
     def _flag_specific_expectations_files(self):
         return [self._filesystem.join(self.layout_tests_dir(), 'FlagExpectations', flag.lstrip('-'))
                 for flag in self.get_option('additional_driver_flag', [])]
 
     def _flag_specific_baseline_search_path(self):
-        # TODO(skobes): Baselines specific to both flag and platform?
-        return [self._filesystem.join(self.layout_tests_dir(), 'flag-specific', flag.lstrip('-'))
-                for flag in self.get_option('additional_driver_flag', [])]
+        flag_dirs = [self._filesystem.join(self.layout_tests_dir(), 'flag-specific', flag.lstrip('-'))
+                     for flag in self.get_option('additional_driver_flag', [])]
+        return [self._filesystem.join(flag_dir, 'platform', platform_dir)
+                for platform_dir in self.FALLBACK_PATHS[self.version()]
+                for flag_dir in flag_dirs] + flag_dirs
 
     def expectations_dict(self):
         """Returns an OrderedDict of name -> expectations strings.
         The names are expected to be (but not required to be) paths in the filesystem.
         If the name is a path, the file can be considered updatable for things like rebaselining,
         so don't use names that are paths if they're not paths.
         Generally speaking the ordering should be files in the filesystem in cascade order
         (TestExpectations followed by Skipped, if the port honors both formats),
         then any built-in expectations (e.g., from compile-time exclusions), then --additional-expectations options.
         """
@@ skipping 388 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)