[DMC #26] Add CompositionMarker::Thickness enum

third_party/WebKit/Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 1048 matching lines @@
                        Color& color,
                        ExceptionState& exception_state,
                        String error_message) {
   if (!color.SetFromString(value)) {
     exception_state.ThrowDOMException(kInvalidAccessError, error_message);
     return false;
   }
   return true;
 }
 
+static WTF::Optional<CompositionMarker::Thickness> ThicknessFrom(
+    const String& thickness) {
+  if (EqualIgnoringASCIICase(thickness, "kThin"))

[yosin_UTC9, 2017/05/29 05:22:08]

Let's use "thin" and "thick" as MarkerTypeForm().

+    return CompositionMarker::Thickness::kThin;
+  if (EqualIgnoringASCIICase(thickness, "kThick"))
+    return CompositionMarker::Thickness::kThick;
+  return WTF::nullopt;
+}
+
 void Internals::addCompositionMarker(const Range* range,
                                      const String& underline_color_value,
-                                     bool thick,
+                                     const String& thickness_value,

[yosin_UTC9, 2017/05/29 05:22:08]

Good catch! (^_^)b

                                      const String& background_color_value,
                                      ExceptionState& exception_state) {
   DCHECK(range);
   range->OwnerDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
 
+  WTF::Optional<CompositionMarker::Thickness> thickness =
+      ThicknessFrom(thickness_value);
+  if (!thickness) {
+    exception_state.ThrowDOMException(
+        kSyntaxError,
+        "The thickness provided ('" + thickness_value + "') is invalid.");
+    return;
+  }
+
   Color underline_color;
   Color background_color;
   if (ParseColor(underline_color_value, underline_color, exception_state,
                  "Invalid underline color.") &&
       ParseColor(background_color_value, background_color, exception_state,
                  "Invalid background color.")) {
     range->OwnerDocument().Markers().AddCompositionMarker(
-        EphemeralRange(range), underline_color, thick, background_color);
+        EphemeralRange(range), underline_color, thickness.value(),
+        background_color);
   }
 }
 
 void Internals::setTextMatchMarkersActive(Node* node,
                                           unsigned start_offset,
                                           unsigned end_offset,
                                           bool active) {
   DCHECK(node);
   node->GetDocument().Markers().SetTextMatchMarkersActive(node, start_offset,
                                                           end_offset, active);
@@ skipping 2201 matching lines @@
 
 void Internals::crash() {
   CHECK(false) << "Intentional crash";
 }
 
 void Internals::setIsLowEndDevice(bool is_low_end_device) {
   MemoryCoordinator::SetIsLowEndDeviceForTesting(is_low_end_device);
 }
 
 }  // namespace blink