Omnibox: Highlight Matches in URLs Properly

base/strings/utf_offset_string_conversions.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_STRINGS_UTF_OFFSET_STRING_CONVERSIONS_H_
 #define BASE_STRINGS_UTF_OFFSET_STRING_CONVERSIONS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
   // adjusted (e.g., because it points into the middle of a multibyte sequence),
   // it will be set to string16::npos.
   static void AdjustOffsets(const Adjustments& adjustments,
                             std::vector<size_t>* offsets_for_adjustment);
 
   // Adjusts the single |offset| to reflect the adjustments recorded in
   // |adjustments|.
   static void AdjustOffset(const Adjustments& adjustments,
                            size_t* offset);
 
+  // Adjusts all offsets in |offsets_for_unadjustment| to reflect the reverse
+  // of the adjustments recorded in |adjustments|.  In other words, the offsets
+  // provided represent offsets into an adjusted string and the caller wants
+  // to know the offsets they correspond to in the original string.  If an
+  // offset cannot be successfully unadjusted (e.g., because it points into
+  // the middle of a multibyte sequence), it will be set to string16::npos.
+  static void UnadjustOffsets(const Adjustments& adjustments,
+                              std::vector<size_t>* offsets_for_unadjustment);
+
+  // Adjusts the single |offset_for_unadjustment| to reflect the adjustments
+  // recorded in |adjustments|.
+  static void UnadjustOffset(const Adjustments& adjustments,
+                             size_t* offset_for_unadjustment);

[Peter Kasting, 2014/04/23 23:18:01]

Nit: Either name this |offset|, or name the arg to AdjustOffset() above
|offset_for_adjustment|

[Mark P, 2014/04/24 14:05:02]

Did the former.

+
   // Combines two sequential sets of adjustments, storing the combined revised
   // adjustments in |adjustments_on_adjusted_string|.  That is, suppose a
   // string was altered in some way, with the alterations recorded as
   // adjustments in |first_adjustments|.  Then suppose the resulting string is
   // further altered, with the alterations recorded as adjustments scored in
   // |adjustments_on_adjusted_string|, with the offsets recorded in these
   // adjustments being with respect to the intermediate string.  This function
   // combines the two sets of adjustments into one, storing the result in
   // |adjustments_on_adjusted_string|, whose offsets are correct with respect
   // to the original string.
@@ skipping 41 matching lines @@
     if (offset > limit_)
       offset = T::npos;
   }
 
   size_t limit_;
 };
 
 }  // namespace base
 
 #endif  // BASE_STRINGS_UTF_OFFSET_STRING_CONVERSIONS_H_