Prepare Chromium and Blink for ICU 59

third_party/WebKit/Source/core/html/forms/EmailInputType.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2009 Michelangelo De Simone <micdesim@gmail.com>
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/html/forms/EmailInputType.h"
 
+#include <unicode/idna.h>
+#include <unicode/unistr.h>
+#include <unicode/uvernum.h>
 #include "bindings/core/v8/ScriptRegexp.h"
 #include "core/InputTypeNames.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/page/ChromeClient.h"
 #include "platform/text/PlatformLocale.h"
 #include "public/platform/Platform.h"
 #include "wtf/text/StringBuilder.h"
-#include <unicode/idna.h>
-#include <unicode/unistr.h>
+
+#if U_ICU_VERSION_MAJOR_NUM >= 59
+#include <unicode/char16ptr.h>
+#endif
 
 namespace blink {
 
 using blink::WebLocalizedString;
 
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
 static const char localPartCharacters[] =
     "abcdefghijklmnopqrstuvwxyz0123456789!#$%&'*+/=?^_`{|}~.-";
 static const char emailPattern[] =
     "[a-z0-9!#$%&'*+/=?^_`{|}~.-]+"  // local part
@@ skipping 34 matching lines @@
       icu::IDNA::createUTS46Instance(idnaConversionOption, errorCode);
   DCHECK(idna);
   icu::IDNAInfo idnaInfo;
   idna->nameToASCII(idnDomainName, domainName, idnaInfo, errorCode);
   if (U_FAILURE(errorCode) || idnaInfo.hasErrors() ||
       domainName.length() > maximumDomainNameLength)
     return address;
 
   StringBuilder builder;
   builder.append(address, 0, atPosition + 1);
+#if U_ICU_VERSION_MAJOR_NUM >= 59
+  builder.append(icu::toUCharPtr(domainName.getBuffer()), domainName.length());
+#else
   builder.append(domainName.getBuffer(), domainName.length());
+#endif
   String asciiEmail = builder.toString();
   return isValidEmailAddress(regexp, asciiEmail) ? asciiEmail : address;
 }
 
 String EmailInputType::convertEmailAddressToUnicode(
     const String& address) const {
   if (!address.containsOnlyASCII())
     return address;
 
   size_t atPosition = address.find('@');
@@ skipping 202 matching lines @@
   builder.reserveCapacity(value.length());
   for (size_t i = 0; i < addresses.size(); ++i) {
     if (i > 0)
       builder.append(',');
     builder.append(convertEmailAddressToUnicode(addresses[i]));
   }
   return builder.toString();
 }
 
 }  // namespace blink