[Mac] Simplify field editor code which tracks whether editor rect changed.

chrome/browser/cocoa/autocomplete_text_field_cell.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #import "base/logging.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
@@ skipping 46 matching lines @@
 }
 CGFloat WidthForKeyword(NSAttributedString* keywordString) {
   return kKeywordXOffset + ceil([keywordString size].width) +
       2 * kKeywordTokenInset;
 }
 
 }  // namespace
 
 @implementation AutocompleteTextFieldCell
 
-@synthesize fieldEditorNeedsReset = fieldEditorNeedsReset_;
-
 // @synthesize doesn't seem to compile for this transition.
 - (NSAttributedString*)keywordString {
   return keywordString_.get();
 }
 - (NSAttributedString*)hintString {
   return hintString_.get();
 }
 
 - (void)setKeywordString:(NSString*)fullString
            partialString:(NSString*)partialString
           availableWidth:(CGFloat)width {
   DCHECK(fullString != nil);
 
-  // Overriding |hintString_| always requires a reset.
-  if (hintString_) {
-    hintString_.reset();
-    fieldEditorNeedsReset_ = YES;
-  }
+  hintString_.reset();
 
   // Adjust for space between editor and decorations.
   width -= 2 * kEditorHorizontalInset;
 
   // If |fullString| won't fit, choose |partialString|.
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:[self font]
                                   forKey:NSFontAttributeName];
   NSString* s = fullString;
   if ([s sizeWithAttributes:attributes].width > width) {
     if (partialString) {
       s = partialString;
     }
   }
-  scoped_nsobject<NSAttributedString> as(
+  keywordString_.reset(
       [[NSAttributedString alloc] initWithString:s attributes:attributes]);
 
-  // If the value has changed, require a reset.
-  if (![keywordString_ isEqualToAttributedString:as]) {
-    keywordString_.reset([as retain]);
-    fieldEditorNeedsReset_ = YES;
-  }
 }
 
 // Convenience for the attributes used in the right-justified info
 // cells.
 - (NSDictionary*)hintAttributes {
   scoped_nsobject<NSMutableParagraphStyle> style(
       [[NSMutableParagraphStyle alloc] init]);
   [style setAlignment:NSRightTextAlignment];
 
   return [NSDictionary dictionaryWithObjectsAndKeys:
               [self font], NSFontAttributeName,
               [NSColor lightGrayColor], NSForegroundColorAttributeName,
               style.get(), NSParagraphStyleAttributeName,
               nil];
 }
 
 - (void)setKeywordHintPrefix:(NSString*)prefixString
                        image:(NSImage*)anImage
                       suffix:(NSString*)suffixString
               availableWidth:(CGFloat)width {
   DCHECK(prefixString != nil);
   DCHECK(anImage != nil);
   DCHECK(suffixString != nil);
 
+  keywordString_.reset();
+
   // Adjust for space between editor and decorations.
   width -= 2 * kEditorHorizontalInset;
 
-  // Overriding |keywordString_| always requires a reset.
-  if (keywordString_) {
-    keywordString_.reset();
-    fieldEditorNeedsReset_ = YES;
-  }
-
   // If |hintString_| is now too wide, clear it so that we don't pass
   // the equality tests.
   if (hintString_ && WidthForHint(hintString_) > width) {
     [self clearKeywordAndHint];
   }
 
   // TODO(shess): Also check the length?
   if (![[hintString_ string] hasPrefix:prefixString] ||
       ![[hintString_ string] hasSuffix:suffixString]) {
 
@@ skipping 19 matching lines @@
           mutableCopy]);
     [is addAttribute:NSBaselineOffsetAttributeName
         value:[NSNumber numberWithFloat:kKeywordHintImageBaseline]
         range:NSMakeRange(0, [is length])];
 
     // Stuff the image attachment between the prefix and suffix.
     [as insertAttributedString:is atIndex:[prefixString length]];
 
     // If too wide, just show the image.
     hintString_.reset(WidthForHint(as) > width ? [is copy] : [as copy]);
-
-    fieldEditorNeedsReset_ = YES;
   }
 }
 
 - (void)setSearchHintString:(NSString*)aString
              availableWidth:(CGFloat)width {
   DCHECK(aString != nil);
 
   // Adjust for space between editor and decorations.
   width -= 2 * kEditorHorizontalInset;
 
-  // Overriding |keywordString_| always requires a reset.
-  if (keywordString_) {
-    keywordString_.reset();
-    fieldEditorNeedsReset_ = YES;
-  }
+  keywordString_.reset();
 
   // If |hintString_| is now too wide, clear it so that we don't pass
   // the equality tests.
   if (hintString_ && WidthForHint(hintString_) > width) {
     [self clearKeywordAndHint];
   }
 
   if (![[hintString_ string] isEqualToString:aString]) {
     scoped_nsobject<NSAttributedString> as(
         [[NSAttributedString alloc] initWithString:aString
                                         attributes:[self hintAttributes]]);
 
     // If too wide, don't keep the hint.
     hintString_.reset(WidthForHint(as) > width ? nil : [as copy]);
-
-    fieldEditorNeedsReset_ = YES;
   }
 }
 
 - (void)clearKeywordAndHint {
-  if (keywordString_ || hintString_) {
-    keywordString_.reset();
-    hintString_.reset();
-
-    fieldEditorNeedsReset_ = YES;
-  }
+  keywordString_.reset();
+  hintString_.reset();
 }
 
 - (void)setHintIcon:(NSImage*)icon
               label:(NSString*)label
               color:(NSColor*)color {
   // Create an attributed string for the label, if a label was given.
   NSAttributedString* as = nil;
   if (label) {
     DCHECK(color);
     NSFont *baseFont = [self font];
     NSFont *font = [NSFont fontWithDescriptor:[baseFont fontDescriptor]
                                          size:[baseFont pointSize] - 2.0];
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObjectsAndKeys:
          color, NSForegroundColorAttributeName,
          font, NSFontAttributeName,
          NULL];
     as = [[[NSAttributedString alloc] initWithString:label
                                           attributes:attributes] autorelease];
   }
 
-  // Did the icon change? Is there a label now but there wasn't before,
-  // or vice-versa? Did the label change?
-  if (icon != hintIcon_.get() || (as && !hintIconLabel_.get()) ||
-      (!as && hintIconLabel_.get()) ||
-      (as && ![hintIconLabel_.get() isEqualToAttributedString:as])) {
-    hintIconLabel_.reset([as retain]);
-    hintIcon_.reset([icon retain]);
-    if (!keywordString_ && !hintString_) {
-      // Redraw if the icon is visible.
-      fieldEditorNeedsReset_ = YES;
-    }
-  }
+  hintIconLabel_.reset([as retain]);
+  hintIcon_.reset([icon retain]);
 }
 
 // TODO(shess): This code is manually drawing the cell's border area,
 // but otherwise the cell assumes -setBordered:YES for purposes of
 // calculating things like the editing area.  This is probably
 // incorrect.  I know that this affects -drawingRectForBounds:.
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   DCHECK([controlView isFlipped]);
   [[NSColor colorWithCalibratedWhite:1.0 alpha:0.25] set];
@@ skipping 179 matching lines @@
 
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 - (void)resetCursorRect:(NSRect)cellFrame inView:(NSView *)controlView {
   [super resetCursorRect:[self textCursorFrameForFrame:cellFrame]
                   inView:controlView];
 }
 
 @end