Merge "Add unicode flag to blink::ScriptRegexp, and measure incompatibility for |pattern| content a…

third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h

Index: third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h b/third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h
index 1735d5cd938349010f6d672779f96cc62e308af3..67bc602dd6335629629e0c7d241d2814d9cbf93a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptRegexp.h
@@ -42,7 +42,12 @@ enum MultilineMode {
 class ScriptRegexp {
     USING_FAST_MALLOC(ScriptRegexp); WTF_MAKE_NONCOPYABLE(ScriptRegexp);
 public:
-    ScriptRegexp(const String&, TextCaseSensitivity, MultilineMode = MultilineDisabled);
+    enum CharacterMode {
+        BMP, // NOLINT
+        UTF16, // NOLINT
+    };
+
+    ScriptRegexp(const String&, TextCaseSensitivity, MultilineMode = MultilineDisabled, CharacterMode = BMP);
 
     int match(const String&, int startFrom = 0, int* matchLength = 0) const;