Show scheme in black and content in gray for data: protocol urls

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 111 matching lines @@
 void StoreStateToTab(WebContents* tab,
                      OmniboxViewMacState* state) {
   tab->SetUserData(kOmniboxViewMacStateKey, state);
 }
 
 const OmniboxViewMacState* GetStateFromTab(const WebContents* tab) {
   return static_cast<OmniboxViewMacState*>(
       tab->GetUserData(&kOmniboxViewMacStateKey));
 }
 
-// Helper to make converting url ranges to NSRange easier to
-// read.
-NSRange ComponentToNSRange(const url::Component& component) {
-  return NSMakeRange(static_cast<NSInteger>(component.begin),
-                     static_cast<NSInteger>(component.len));
-}
-
 }  // namespace
 
 // static
 NSImage* OmniboxViewMac::ImageForResource(int resource_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(resource_id).ToNSImage();
 }
 
 // static
 NSColor* OmniboxViewMac::SuggestTextColor() {
@@ skipping 36 matching lines @@
           base::WrapUnique(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_view_(new OmniboxPopupViewMac(this, model(), field)),
       field_(field),
       saved_temporary_selection_(NSMakeRange(0, 0)),
       marked_range_before_change_(NSMakeRange(0, 0)),
       delete_was_pressed_(false),
       delete_at_end_pressed_(false),
       in_coalesced_update_block_(false),
       do_coalesced_text_update_(false),
       do_coalesced_range_update_(false) {

[Robert Sesek, 2017/03/01 18:29:45]

attributing_display_string_ is uninitialized.

[elawrence, 2017/03/01 21:49:01]

Done.

   [field_ setObserver:this];
 
   // Needed so that editing doesn't lose the styling.
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Get the appropriate line height for the font that we use.
   base::scoped_nsobject<NSLayoutManager> layoutManager(
       [[NSLayoutManager alloc] init]);
   [layoutManager setUsesScreenFonts:YES];
 }
@@ skipping 332 matching lines @@
   // If this is a URL, set the top-level paragraph direction to LTR (avoids RTL
   // characters from making the URL render from right to left, as per RFC 3987
   // Section 4.1).
   if (model()->CurrentTextIsURL())
     [paragraph_style setBaseWritingDirection:NSWritingDirectionLeftToRight];
   [attributedString addAttribute:NSParagraphStyleAttributeName
                            value:paragraph_style
                            range:NSMakeRange(0, [attributedString length])];
 }
 
+void OmniboxViewMac::SetEmphasis(bool emphasize, gfx::Range range) {
+  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
+
+  NSRange ns_range = range.IsValid()
+                         ? range.ToNSRange()
+                         : NSMakeRange(0, [attributing_display_string_ length]);
+
+  [attributing_display_string_
+      addAttribute:NSForegroundColorAttributeName
+             value:(emphasize) ? HostTextColor(in_dark_mode)
+                               : BaseTextColor(in_dark_mode)
+             range:ns_range];
+}
+
+void OmniboxViewMac::UpdateSchemeEmphasis(gfx::Range range) {
+  if (!range.IsValid())
+    return;
+
+  const security_state::SecurityLevel security_level =
+      controller()->GetToolbarModel()->GetSecurityLevel(false);
+
+  if ((security_level == security_state::NONE) ||
+      (security_level == security_state::HTTP_SHOW_WARNING))
+    return;
+
+  if (security_level == security_state::DANGEROUS) {
+    // Add a strikethrough through the scheme.
+    [attributing_display_string_
+        addAttribute:NSStrikethroughStyleAttributeName
+               value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
+               range:range.ToNSRange()];
+  }
+
+  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
+
+  [attributing_display_string_
+      addAttribute:NSForegroundColorAttributeName
+             value:GetSecureTextColor(security_level, in_dark_mode)
+             range:range.ToNSRange()];
+}
+
 void OmniboxViewMac::ApplyTextAttributes(
     const base::string16& display_text,
     NSMutableAttributedString* attributedString) {

[Robert Sesek, 2017/03/01 18:29:45]

nit: Since you're here, this should be attributed_string

[elawrence, 2017/03/01 21:49:01]

Done.

   NSUInteger as_length = [attributedString length];
   if (as_length == 0) {
     return;
   }
-  NSRange as_entire_string = NSMakeRange(0, as_length);
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
 
   ApplyTextStyle(attributedString);
 
   // A kinda hacky way to add breaking at periods. This is what Safari does.
   // This works for IDNs too, despite the "en_US".
   [attributedString addAttribute:@"NSLanguage"
                            value:@"en_US_POSIX"
-                           range:as_entire_string];
+                           range:NSMakeRange(0, as_length)];
 
-  [attributedString addAttribute:NSForegroundColorAttributeName
-                           value:HostTextColor(in_dark_mode)
-                           range:as_entire_string];
-
-  url::Component scheme, host;
-  AutocompleteInput::ParseForEmphasizeComponents(
-      display_text, ChromeAutocompleteSchemeClassifier(profile_), &scheme,
-      &host);
-  bool grey_out_url = display_text.substr(scheme.begin, scheme.len) ==
-      base::UTF8ToUTF16(extensions::kExtensionScheme);
-  if (model()->CurrentTextIsURL() &&
-      (host.is_nonempty() || grey_out_url)) {
-    [attributedString addAttribute:NSForegroundColorAttributeName
-                             value:BaseTextColor(in_dark_mode)
-                             range:as_entire_string];
-
-    if (!grey_out_url) {
-      [attributedString addAttribute:NSForegroundColorAttributeName
-                               value:HostTextColor(in_dark_mode)
-                               range:ComponentToNSRange(host)];
-    }
-  }
-
-  // TODO(shess): GTK has this as a member var, figure out why.
-  // [Could it be to not change if no change?  If so, I'm guessing
-  // AppKit may already handle that.]
-  const security_state::SecurityLevel security_level =
-      controller()->GetToolbarModel()->GetSecurityLevel(false);
-
-  // Emphasize the scheme for security UI display purposes (if necessary).
-  if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
-      scheme.is_nonempty() &&
-      (security_level != security_state::NONE) &&
-      (security_level != security_state::HTTP_SHOW_WARNING)) {
-    if (security_level == security_state::DANGEROUS) {
-      // Add a strikethrough through the scheme.
-      [attributedString addAttribute:NSStrikethroughStyleAttributeName
-                 value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
-                 range:ComponentToNSRange(scheme)];
-    }
-    [attributedString
-        addAttribute:NSForegroundColorAttributeName
-               value:GetSecureTextColor(security_level, in_dark_mode)
-               range:ComponentToNSRange(scheme)];
-  }
+  // Cache a pointer to the attributed string to allow the superclass'
+  // virtual method invocations to add attributes.
+  attributing_display_string_ = attributedString;

[Peter Kasting, 2017/03/01 02:39:10]

Nit: Consider using base::AutoReset here for safety against future complexity:

  base::AutoReset<NSMutableAttributedString*> resetter(
      &attributing_display_string_, attributedString);
  ApplyEmphasis(display_text, ChromeAutocompleteSchemeClassifier(profile_));

[Robert Sesek, 2017/03/01 18:29:45]

Perhaps DCHECK that attributing_display_string_ is nil first?

[elawrence, 2017/03/01 21:49:01]

Done.

[elawrence, 2017/03/01 21:49:01]

Done.

+  ApplyEmphasis(display_text, ChromeAutocompleteSchemeClassifier(profile_));
+  attributing_display_string_ = nullptr;
 }
 
 void OmniboxViewMac::OnTemporaryTextMaybeChanged(
     const base::string16& display_text,
     bool save_original_selection,
     bool notify_text_changed) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelectedRange();
 
   SetWindowTextAndCaretPos(display_text, display_text.size(), false, false);
@@ skipping 467 matching lines @@
                               display_text);
   NSDictionary* notification_info = @{
       NSAccessibilityAnnouncementKey : announcement,
       NSAccessibilityPriorityKey :     @(NSAccessibilityPriorityHigh)
   };
   NSAccessibilityPostNotificationWithUserInfo(
       [field_ window],
       NSAccessibilityAnnouncementRequestedNotification,
       notification_info);
 }