Add config options to run different GPU APIs to dm and nanobench

src/core/SkString.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkAtomics.h"
@@ skipping 606 matching lines @@
 
 SkString SkStringPrintf(const char* format, ...) {
     SkString formattedOutput;
     char buffer[kBufferSize];
     SK_UNUSED int length;
     ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
     formattedOutput.set(buffer);
     return formattedOutput;
 }
 
-void SkStrSplit(const char* str, const char* delimiters, SkTArray<SkString>* out) {
-    const char* end = str + strlen(str);
-    while (str != end) {
+void SkStrSplit(const char* str, const char* delimiters, SkStrSplitResult resultBehavior,
+                SkTArray<SkString>* out) {
+    if (resultBehavior != kAll_SkStrSplitResult) {

[scroggo, 2015/12/07 13:27:52]

Why not

if (resultBehavior == kNonEmpty_SkStrSplitResult)

This makes it seem like there are multiple resultBehaviors that should hit this
case.

[Kimmo Kinnunen, 2015/12/08 09:07:51]

Done.

+        // Skip any delimiters.
+        str += strspn(str, delimiters);
+    }
+    if (!*str) {
+        return;
+    }
+
+    while (true) {
         // Find a token.
         const size_t len = strcspn(str, delimiters);
-        out->push_back().set(str, len);
-        str += len;
-        // Skip any delimiters.
-        str += strspn(str, delimiters);
+        if (resultBehavior == kAll_SkStrSplitResult || len > 0) {
+            out->push_back().set(str, len);
+            str += len;
+        }
+
+        if (!*str) {
+            return;
+        }
+        if (resultBehavior != kAll_SkStrSplitResult) {
+            // Skip any delimiters.
+            str += strspn(str, delimiters);
+        } else {
+            // Skip one delimiter.
+            str += 1;
+        }
     }
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF