Optimize KURL protocols

third_party/WebKit/Source/platform/weborigin/KURL.cpp

 /*
  * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2008, 2009, 2011 Google 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 222 matching lines @@
   init(base, relative, &encoding.encodingForFormSubmission());
 }
 
 KURL::KURL(const AtomicString& canonicalString,
            const url::Parsed& parsed,
            bool isValid)
     : m_isValid(isValid),
       m_protocolIsInHTTPFamily(false),
       m_parsed(parsed),
       m_string(canonicalString) {
-  initProtocolIsInHTTPFamily();
+  initProtocolMetadata();
   initInnerURL();
 }
 
 KURL::KURL(WTF::HashTableDeletedValueType)
     : m_isValid(false),
       m_protocolIsInHTTPFamily(false),
       m_string(WTF::HashTableDeletedValue) {}
 
 KURL::KURL(const KURL& other)
     : m_isValid(other.m_isValid),
       m_protocolIsInHTTPFamily(other.m_protocolIsInHTTPFamily),
+      m_protocol(other.m_protocol),
       m_parsed(other.m_parsed),
       m_string(other.m_string) {
   if (other.m_innerURL.get())
     m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));
 }
 
 KURL::~KURL() {}
 
 KURL& KURL::operator=(const KURL& other) {
   m_isValid = other.m_isValid;
   m_protocolIsInHTTPFamily = other.m_protocolIsInHTTPFamily;
+  m_protocol = other.m_protocol;
   m_parsed = other.m_parsed;
   m_string = other.m_string;
   if (other.m_innerURL)
     m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));
   else
     m_innerURL.reset();
   return *this;
 }
 
 KURL KURL::copy() const {
   KURL result;
   result.m_isValid = m_isValid;
   result.m_protocolIsInHTTPFamily = m_protocolIsInHTTPFamily;
+  result.m_protocol = m_protocol.isolatedCopy();
   result.m_parsed = m_parsed;
   result.m_string = m_string.isolatedCopy();
   if (m_innerURL)
     result.m_innerURL = wrapUnique(new KURL(m_innerURL->copy()));
   return result;
 }
 
 bool KURL::isNull() const {
   return m_string.isNull();
 }
@@ skipping 39 matching lines @@
     url::ExtractFileName(m_string.characters16(), path, &file);
 
   // Bug: https://bugs.webkit.org/show_bug.cgi?id=21015 this function returns
   // a null string when the path is empty, which we duplicate here.
   if (!file.is_nonempty())
     return String();
   return componentString(file);
 }
 
 String KURL::protocol() const {
-  return componentString(m_parsed.scheme);
+  return m_protocol;
 }
 
 String KURL::host() const {
   return componentString(m_parsed.host);
 }
 
 // Returns 0 when there is no port.
 //
 // We treat URL's with out-of-range port numbers as invalid URLs, and they will
 // be rejected by the canonicalizer. KURL.cpp will allow them in parsing, but
@@ skipping 76 matching lines @@
   if (!url::CanonicalizeScheme(newProtocolUTF8.data(),
                                url::Component(0, newProtocolUTF8.length()),
                                &canonProtocol, &protocolComponent) ||
       !protocolComponent.is_nonempty())
     return false;
 
   url::Replacements<char> replacements;
   replacements.SetScheme(charactersOrEmpty(newProtocolUTF8),
                          url::Component(0, newProtocolUTF8.length()));
   replaceComponents(replacements);
+  initProtocolMetadata();
 
   // isValid could be false but we still return true here. This is because
   // WebCore or JS scripts can build up a URL by setting individual
   // components, and a JS exception is based on the return value of this
   // function. We want to throw the exception and stop the script only when
   // its trying to set a bad protocol, and not when it maybe just hasn't
   // finished building up its final scheme.
   return true;
 }
 
@@ skipping 270 matching lines @@
 }
 
 void KURL::init(const KURL& base,
                 const String& relative,
                 const WTF::TextEncoding* queryEncoding) {
   if (!relative.isNull() && relative.is8Bit()) {
     StringUTF8Adaptor relativeUTF8(relative);
     init(base, relativeUTF8.data(), relativeUTF8.length(), queryEncoding);
   } else
     init(base, relative.characters16(), relative.length(), queryEncoding);
-  initProtocolIsInHTTPFamily();
+  initProtocolMetadata();
   initInnerURL();
   DCHECK_EQ(protocol(), protocol().lower());
 }
 
 template <typename CHAR>
 void KURL::init(const KURL& base,
                 const CHAR* relative,
                 int relativeLength,
                 const WTF::TextEncoding* queryEncoding) {
   // As a performance optimization, we do not use the charset converter
@@ skipping 29 matching lines @@
   }
   if (url::Parsed* innerParsed = m_parsed.inner_parsed())
     m_innerURL = wrapUnique(new KURL(
         ParsedURLString,
         m_string.substring(innerParsed->scheme.begin,
                            innerParsed->Length() - innerParsed->scheme.begin)));
   else
     m_innerURL.reset();
 }
 
-template <typename CHAR>
-bool internalProtocolIs(const url::Component& scheme,
-                        const CHAR* spec,
-                        const char* protocol) {
-  const CHAR* begin = spec + scheme.begin;
-  const CHAR* end = begin + scheme.len;
-
-  while (begin != end && *protocol) {
-    ASSERT(toASCIILower(*protocol) == *protocol);
-    if (toASCIILower(*begin++) != *protocol++)
-      return false;
-  }
-
-  // Both strings are equal (ignoring case) if and only if all of the characters
-  // were equal, and the end of both has been reached.
-  return begin == end && !*protocol;
-}
-
-template <typename CHAR>
-bool checkIfProtocolIsInHTTPFamily(const url::Component& scheme,
-                                   const CHAR* spec) {
-  if (scheme.len == 4)
-    return internalProtocolIs(scheme, spec, "http");
-  if (scheme.len == 5)
-    return internalProtocolIs(scheme, spec, "https");
-  if (scheme.len == 7)
-    return internalProtocolIs(scheme, spec, "http-so");
-  if (scheme.len == 8)
-    return internalProtocolIs(scheme, spec, "https-so");
-  return false;
-}
-
-void KURL::initProtocolIsInHTTPFamily() {
+void KURL::initProtocolMetadata() {
   if (!m_isValid) {
     m_protocolIsInHTTPFamily = false;
     return;
   }
 
   ASSERT(!m_string.isNull());
-  m_protocolIsInHTTPFamily =
-      m_string.is8Bit() ? checkIfProtocolIsInHTTPFamily(m_parsed.scheme,
-                                                        m_string.characters8())
-                        : checkIfProtocolIsInHTTPFamily(
-                              m_parsed.scheme, m_string.characters16());
+  m_protocol = componentString(m_parsed.scheme);
+  if (!m_protocol.isEmpty())
+    m_protocol = (m_protocol);

[esprehn, 2016/11/04 23:48:32]

what does this do? assigning m_protocol to itself seems like it doesn't do
anything.

[Charlie Harrison, 2016/11/04 23:58:35]

Oops. That should be m_protocol = AtomicString(m_protocol). Sorry about that :/

+
+  // TODO(csharrison): Add "http" and "https" to the AtomicString table at init
+  // time so that the normal case here is just a pointer comparison.
+  m_protocolIsInHTTPFamily = m_protocol == "http" || m_protocol == "https" ||
+                             m_protocol == "http-so" ||
+                             m_protocol == "https-so";
 }
 
 bool KURL::protocolIs(const char* protocol) const {
   assertProtocolIsGood(protocol);
 
   // JavaScript URLs are "valid" and should be executed even if KURL decides
   // they are invalid.  The free function protocolIsJavaScript() should be used
   // instead.
   // FIXME: Chromium code needs to be fixed for this assert to be enabled.
   // ASSERT(strcmp(protocol, "javascript"));
 
-  if (m_string.isNull() || m_parsed.scheme.len <= 0)
+  if (m_string.isNull() || m_protocol.isNull() || m_parsed.scheme.len <= 0)
     return *protocol == '\0';
-
-  return m_string.is8Bit()
-             ? internalProtocolIs(m_parsed.scheme, m_string.characters8(),
-                                  protocol)
-             : internalProtocolIs(m_parsed.scheme, m_string.characters16(),
-                                  protocol);
+  return m_protocol == protocol;
 }
 
 String KURL::stringForInvalidComponent() const {
   if (m_string.isNull())
     return String();
   return emptyString();
 }
 
 String KURL::componentString(const url::Component& component) const {
   if (!m_isValid || component.len <= 0)
@@ skipping 21 matching lines @@
   m_parsed = newParsed;
   m_string = AtomicString::fromUTF8(output.data(), output.length());
 }
 
 bool KURL::isSafeToSendToAnotherThread() const {
   return m_string.isSafeToSendToAnotherThread() &&
          (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
 }
 
 }  // namespace blink