Fix a couple typos

gn/compile_sksl_tests.py

@@ -18,7 +18,7 @@
 settings = sys.argv[3]
 input_root_dir = sys.argv[4]
 output_root_dir = sys.argv[5]
-# The last arg is a file containing a space seperated list of filenames
+# The last arg is a file containing a space separated list of filenames
 input_file = sys.argv[6]
 with open(input_file, 'r') as reader:
     inputs = shlex.split(reader.read())

gn/minify_sksl_tests.py

@@ -19,7 +19,7 @@
 rt_shader_module = sys.argv[4]
 input_root_dir = sys.argv[5]
 output_root_dir = sys.argv[6]
-# The last arg is a file containing a space seperated list of filenames
+# The last arg is a file containing a space separated list of filenames
 input_file = sys.argv[7]
 with open(input_file, 'r') as reader:
     all_inputs = shlex.split(reader.read())

include/core/SkTypeface.h

@@ -179,7 +179,7 @@ class SK_API SkTypeface : public SkWeakRefCnt {
 
     /** Copy into tags[] (allocated by the caller) the list of table tags in
      *  the font, and return the number. This will be the same as CountTables()
-     *  or 0 if an error occured. If tags == NULL, this only returns the count
+     *  or 0 if an error occurred. If tags == NULL, this only returns the count
      *  (the same as calling countTables()).
      */
     int getTableTags(SkFontTableTag tags[]) const;
@@ -193,7 +193,7 @@ class SK_API SkTypeface : public SkWeakRefCnt {
      *  (which for most truetype tables is big endian). If the table tag is
      *  not found, or there is an error copying the data, then 0 is returned.
      *  If this happens, it is possible that some or all of the memory pointed
-     *  to by data may have been written to, even though an error has occured.
+     *  to by data may have been written to, even though an error has occurred.
      *
      *  @param tag  The table tag whose contents are to be copied
      *  @param offset The offset in bytes into the table's contents where the

include/gpu/graphite/GraphiteTypes.h

@@ -96,7 +96,7 @@ struct InsertRecordingInfo {
  * and the caller can use the callback to know it is safe to free any resources associated with
  * the Recording that they may be holding onto. If the Recording is successfully submitted to the
  * GPU the callback will be called with CallbackResult::kSuccess once the GPU has finished. All
- * other cases where some failure occured it will be called with CallbackResult::kFailed.
+ * other cases where some failure occurred it will be called with CallbackResult::kFailed.
  */
 struct InsertFinishInfo {
     InsertFinishInfo() = default;

include/private/SkPathRef.h

@@ -36,7 +36,7 @@ class SkRRect;
  * constructor a pointer to a sk_sp<SkPathRef>, which may be updated to point to a new SkPathRef
  * after the editor's constructor returns.
  *
- * The points and verbs are stored in a single allocation. The points are at the begining of the
+ * The points and verbs are stored in a single allocation. The points are at the beginning of the
  * allocation while the verbs are stored at end of the allocation, in reverse order. Thus the points
  * and verbs both grow into the middle of the allocation until the meet. To access verb i in the
  * verb array use ref.verbs()[~i] (because verbs() returns a pointer just beyond the first

infra/bots/assets/mesa_intel_driver_linux/README.md

@@ -59,7 +59,7 @@ Tweak icd.json file and output dir (mesa/lib)
 Finally, use mesa/lib as the input directory to the upload script.
 
 
-Docker Image Maintanence
+Docker Image Maintenance
 ------------------------
 The docker image `mesa-driver-builder` is an Ubuntu container with many build
 tools installed (including Clang 6). It is designed specifically to build the mesa driver.

infra/bots/buildstats/buildstats_cpp.py

@@ -22,7 +22,7 @@ def main():
   propstr = sys.argv[4]
   bloaty_path = sys.argv[5]
   total_size_bytes_key = sys.argv[6]
-  magic_seperator = sys.argv[7]
+  magic_separator = sys.argv[7]
 
   results = {
     'key': { },
@@ -38,7 +38,7 @@ def main():
     results['key'][keys[i]] = keys[i+1]
 
   # Human "readable" overview as an FYI.
-  print(magic_seperator)
+  print(magic_separator)
   print('Note that template instantiations are grouped together, '
         'thus the elided types.')
   print(subprocess.check_output([bloaty_path, input_file,
@@ -77,7 +77,7 @@ def main():
       'vm_size_bytes': int(vmsize),
     }
 
-  print(magic_seperator)
+  print(magic_separator)
   results['results'][name] = r
 
   # Make debugging easier

infra/bots/buildstats/buildstats_flutter.py

@@ -26,7 +26,7 @@ def main():
   config = sys.argv[7]
   total_size_bytes_key = sys.argv[8]
   lib_name = sys.argv[9]
-  magic_seperator = sys.argv[10]
+  magic_separator = sys.argv[10]
 
   results = {
     'key': { },
@@ -42,23 +42,23 @@ def main():
     results['key'][keys[i]] = keys[i+1]
 
   # Human "readable" reports as an FYI.
-  print(magic_seperator)
+  print(magic_separator)
   print('Report by file, then by symbol with ellided/combined templates')
   lines = subprocess.check_output([bloaty_path, stripped_file,
                                    '-d', 'compileunits,symbols', '-s', 'file',
                                    '-n', '0', '--tsv', '--demangle=short',
                                    '--debug-file=%s' % symbols_file],
                                   encoding='utf-8')
   grand_total = print_skia_lines_file_symbol(lines)
-  print(magic_seperator)
+  print(magic_separator)
   print('Report by file, then by symbol with full templates')
   lines = subprocess.check_output([bloaty_path, stripped_file,
                                    '-d', 'compileunits,symbols', '-s', 'file',
                                    '-n', '0', '--tsv', '--demangle=full',
                                    '--debug-file=%s' % symbols_file],
                                   encoding='utf-8')
   print_skia_lines_file_symbol(lines)
-  print(magic_seperator)
+  print(magic_separator)
 
   print('Report by symbol, then by file with ellided/combined templates')
   lines = subprocess.check_output([bloaty_path, stripped_file,
@@ -67,7 +67,7 @@ def main():
                                    '--debug-file=%s' % symbols_file],
                                   encoding='utf-8')
   print_skia_lines_symbol_file(lines)
-  print(magic_seperator)
+  print(magic_separator)
 
   print('Report by symbol, then by file with full templates')
   lines = subprocess.check_output([bloaty_path, stripped_file,
@@ -76,7 +76,7 @@ def main():
                                    '--debug-file=%s' % symbols_file],
                                   encoding='utf-8')
   print_skia_lines_symbol_file(lines)
-  print(magic_seperator)
+  print(magic_separator)
 
   r = {
     # Use the default config as stats about the whole binary

infra/bots/buildstats/buildstats_wasm.py

@@ -20,14 +20,14 @@ def main():
   propstr = sys.argv[4]
   bloaty_path = sys.argv[5]
   total_size_bytes_key = sys.argv[6]
-  magic_seperator = sys.argv[7]
+  magic_separator = sys.argv[7]
 
   results = {
     'key': { },
     'results': { }
   }
 
-  print(magic_seperator)
+  print(magic_separator)
   print('If you see lots of func[19] and such, go check out the debug build')
   print('Note that template instantiations are grouped together, '
         'thus the elided types.')
@@ -36,7 +36,7 @@ def main():
   print(subprocess.check_output([bloaty_path, input_file,
                                  '-d', 'shortsymbols', '-n', '0']))
 
-  print(magic_seperator)
+  print(magic_separator)
   print('If you see lots of func[19] and such, go check out the debug build')
   print(subprocess.check_output([bloaty_path, input_file,
                                  '-d', 'fullsymbols', '-n', '0']))
@@ -70,7 +70,7 @@ def main():
     'default' : r,
   }
 
-  print(magic_seperator)
+  print(magic_separator)
   print(json.dumps(results, indent=2))
 
   with open(os.path.join(out_dir, name+'.json'), 'w') as output:

infra/bots/buildstats/buildstats_web.py

@@ -19,7 +19,7 @@ def main():
   keystr = sys.argv[3]
   propstr = sys.argv[4]
   total_size_bytes_key = sys.argv[5]
-  magic_seperator = sys.argv[6]
+  magic_separator = sys.argv[6]
 
   results = {
     'key': { },
@@ -48,7 +48,7 @@ def main():
 
   name = os.path.basename(input_file)
 
-  print(magic_seperator)
+  print(magic_separator)
   results['results'][name] = {
     # We need this top level layer 'config'/slice
     # Other analysis methods (e.g. libskia) might have

infra/bots/recipes/compute_buildstats.py

@@ -23,7 +23,7 @@
 ]
 
 
-MAGIC_SEPERATOR = '#$%^&*'
+MAGIC_SEPARATOR = '#$%^&*'
 TOTAL_SIZE_BYTES_KEY = "total_size_bytes"
 
 
@@ -146,10 +146,10 @@ def analyze_web_file(api, checkout_root, out_dir, files):
                                  'buildstats_web.py')
       step_data = api.run(api.step, 'Analyze %s' % f,
           cmd=['python3', script, f, out_dir, keystr, propstr,
-               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPERATOR],
+               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPARATOR],
           stdout=api.raw_io.output())
       if step_data and step_data.stdout:
-        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPERATOR)
+        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPARATOR)
         result = api.step.active_result
         logs = result.presentation.logs
         logs['perf_json'] = sections[1].split('\n')
@@ -174,10 +174,10 @@ def analyze_cpp_lib(api, checkout_root, out_dir, files):
                                  'buildstats_cpp.py')
       step_data = api.run(api.step, 'Analyze %s' % f,
           cmd=['python3', script, f, out_dir, keystr, propstr, bloaty_exe,
-               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPERATOR],
+               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPARATOR],
           stdout=api.raw_io.output())
       if step_data and step_data.stdout:
-        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPERATOR)
+        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPARATOR)
         result = api.step.active_result
         logs = result.presentation.logs
         logs['perf_json'] = sections[2].split('\n')
@@ -207,10 +207,10 @@ def analyze_flutter_lib(api, checkout_root, out_dir, files):
       step_data = api.run(api.step, 'Analyze flutter',
           cmd=['python3', script, stripped, out_dir, keystr, propstr,
                bloaty_exe, f, config, TOTAL_SIZE_BYTES_KEY, lib_name,
-               MAGIC_SEPERATOR],
+               MAGIC_SEPARATOR],
           stdout=api.raw_io.output())
       if step_data and step_data.stdout:
-        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPERATOR)
+        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPARATOR)
         result = api.step.active_result
         logs = result.presentation.logs
         # Skip section 0 because it's everything before first print,
@@ -242,10 +242,10 @@ def analyze_wasm_file(api, checkout_root, out_dir, files):
                                  'buildstats_wasm.py')
       step_data = api.run(api.step, 'Analyze wasm',
           cmd=['python3', script, f, out_dir, keystr, propstr, bloaty_exe,
-               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPERATOR],
+               TOTAL_SIZE_BYTES_KEY, MAGIC_SEPARATOR],
                stdout=api.raw_io.output())
       if step_data and step_data.stdout:
-        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPERATOR)
+        sections = step_data.stdout.decode('utf-8').split(MAGIC_SEPARATOR)
         result = api.step.active_result
         logs = result.presentation.logs
         # Skip section 0 because it's everything before first print,

infra/lottiecap/gold/lottie-web-aggregator.go

@@ -49,7 +49,7 @@ var (
 	taskId        = flag.String("task_id", "", "Skia task id")
 )
 
-// reportBody is the JSON recieved from the JS side. It represents
+// reportBody is the JSON received from the JS side. It represents
 // exactly one unique Gold image/test.
 type reportBody struct {
 	// a base64 encoded PNG image.

modules/sksg/include/SkSGNode.h

@@ -32,7 +32,7 @@ class InvalidationController;
  */
 class Node : public SkRefCnt {
 public:
-    // Traverse the DAG and revalidate any dependant/invalidated nodes.
+    // Traverse the DAG and revalidate any dependent/invalidated nodes.
     // Returns the bounding box for the DAG fragment.
     const SkRect& revalidate(InvalidationController*, const SkMatrix&);
 

src/gpu/ganesh/GrDrawOpAtlas.cpp

@@ -167,7 +167,7 @@ inline bool GrDrawOpAtlas::updatePlot(GrDeferredUploadTarget* target,
     this->makeMRU(plot, pageIdx);
 
     // If our most recent upload has already occurred then we have to insert a new
-    // upload. Otherwise, we already have a scheduled upload that hasn't yet ocurred.
+    // upload. Otherwise, we already have a scheduled upload that hasn't yet occurred.
     // This new update will piggy back on that previously scheduled update.
     if (plot->lastUploadToken() < target->tokenTracker()->nextFlushToken()) {
         // With c+14 we could move sk_sp into lamba to only ref once.

src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h

@@ -165,7 +165,7 @@ class GrGLSLShaderBuilder {
     GrGLSLProgramBuilder* getProgramBuilder() { return fProgramBuilder; }
 
     /**
-     * Helper for begining and ending a block in the shader code.
+     * Helper for beginning and ending a block in the shader code.
      */
     class ShaderBlock {
     public:

src/gpu/graphite/Renderer.h

@@ -101,7 +101,7 @@ enum class Coverage { kNone, kSingleChannel, kLCD };
  * attributes, strides, and layouts (see fStaticAttrs, fAppendAttrs, etc.), and resides on a
  * specific binding on the GPU. This minimizes the number of bindings during a draw pass.
  * - Static data is information that is fixed in count, does not change between calls of the same
- *   RenderStep, and known after recieving device capabilities. Consequently, it is uploaded ONCE by
+ *   RenderStep, and known after receiving device capabilities. Consequently, it is uploaded ONCE by
  *   the StaticBufferManager prior to any drawPasses, and is initialized during the constructor of a
  *   RenderStep. Currently, static data can be either Indices or Vertices.
  * - Append data might not be fixed in count and its' usage is not known prior to the draw pass.

src/gpu/graphite/vk/VulkanCaps.cpp

@@ -392,7 +392,7 @@ void VulkanCaps::applyDriverCorrectnessWorkarounds(const PhysicalDevicePropertie
     // discardable msaa attachments. This causes the resolve to resolve uninitialized data from the
     // msaa image into the resolve image. This was reproed on a Pixel4 using the DstReadShuffle GM
     // where the top half of the GM would drop out. In Ganesh we had also seen this on Arm devices,
-    // but the issue hasn't appeared yet in Graphite. It may just have occured on older Arm drivers
+    // but the issue hasn't appeared yet in Graphite. It may just have occurred on older Arm drivers
     // that we don't even test any more. This also occurs on swiftshader: b/303705884 in Ganesh, but
     // we aren't currently testing that in Graphite yet so leaving that off the workaround for now
     // until we run into it.

tests/OSPathTest.cpp

@@ -47,7 +47,7 @@ static void test_dir_with_file(skiatest::Reporter* reporter, const SkString& dir
     // basename should be the same as filename
     REPORTER_ASSERT(reporter, basename.equals(filename));
 
-    // dirname should be the same as dir with any trailing seperators removed.
+    // dirname should be the same as dir with any trailing separators removed.
     // Except when the the string is just "/".
     SkString strippedDir = dir;
     while (strippedDir.size() > 2 && strippedDir[strippedDir.size() - 1] == SkOSPath::SEPARATOR) {

tools/sksl-minify/BUILD.bazel

@@ -144,7 +144,7 @@ genrule(
     name = "enumerate_test_input_list",
     srcs = ["//resources/sksl:sksl_minify_tests_sources"],
     outs = ["test_input_list.txt"],
-    # Put a space seperated list of file names into the one output
+    # Put a space separated list of file names into the one output
     # This is done because the list could be quite long and overflow
     # the command line length
     # https://bazel.build/reference/be/make-variables#predefined_genrule_variables

tools/skslc/compile_sksl.bzl

@@ -46,7 +46,7 @@ def compile_sksl(name, lang, inputs, settings = "settings"):
         name = "enumerate_%s_list" % name,  # This name does not really matter.
         srcs = [inputs],
         outs = [name + ".txt"],
-        # Put a space seperated list of file names into the one output
+        # Put a space separated list of file names into the one output
         # This is done because the list could be quite long and overflow
         # the command line length
         # https://bazel.build/reference/be/make-variables#predefined_genrule_variables