diff options
22 files changed, 28 insertions, 236 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm index 413cce4..06a6112 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm @@ -8,7 +8,6 @@ #import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm index 0e184f0..25c7d8f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm @@ -9,7 +9,6 @@ #import "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -257,7 +256,8 @@ using content::UserMetricsAction; fromRect:imageRect operation:NSCompositeSourceOver fraction:[self isEnabled] ? 1.0 : 0.5 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } } diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm index cd988a4..5b91b5a 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm @@ -19,7 +19,6 @@ #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/menu_controller.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" @@ -241,7 +240,8 @@ const CGFloat kMenuYOffsetAdjust = 1.0; fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; [destination unlockFocus]; diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 18be979..6234c61 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -50,7 +50,6 @@ #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" #import "chrome/browser/ui/cocoa/framed_browser_window.h" #import "chrome/browser/ui/cocoa/fullscreen_window.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index a317c1d..46a74c9 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -9,7 +9,6 @@ #include "chrome/browser/download/download_util.h" #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/download/background_theme.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" @@ -555,7 +554,8 @@ using content::DownloadItem; fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:[self isEnabled] ? 1.0 : 0.5 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; // Separator between button and popup parts CGFloat lx = NSMaxX(cellFrame) - kDropdownAreaWidth + 0.5; diff --git a/chrome/browser/ui/cocoa/download/download_show_all_cell.mm b/chrome/browser/ui/cocoa/download/download_show_all_cell.mm index cd6f8aa..554f957 100644 --- a/chrome/browser/ui/cocoa/download/download_show_all_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_show_all_cell.mm @@ -6,7 +6,6 @@ #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/download/background_theme.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" @@ -162,7 +161,8 @@ const CGFloat kOuterStrokeWidth = 1; fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:[self isEnabled] ? 1.0 : 0.5 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } - (NSRect)imageRectForBounds:(NSRect)cellFrame { diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 14fe67e..8cc50bb 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -11,7 +11,6 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" @@ -285,7 +284,8 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver, fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; bounds.origin.y += kBrowserActionBadgeOriginYOffset; [[self cell] drawBadgeWithinFrame:bounds]; @@ -320,7 +320,8 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver, fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; cellFrame.origin.y += kBrowserActionBadgeOriginYOffset; [self drawBadgeWithinFrame:cellFrame]; diff --git a/chrome/browser/ui/cocoa/gradient_button_cell.mm b/chrome/browser/ui/cocoa/gradient_button_cell.mm index f601519..5a81a77 100644 --- a/chrome/browser/ui/cocoa/gradient_button_cell.mm +++ b/chrome/browser/ui/cocoa/gradient_button_cell.mm @@ -7,7 +7,6 @@ #include "base/logging.h" #import "base/memory/scoped_nsobject.h" #import "chrome/browser/themes/theme_service.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" @@ -603,7 +602,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4; fromRect:imageRect operation:NSCompositeSourceOver fraction:[self isEnabled] ? 1.0 : 0.5 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; if (isTemplate && color) { [color set]; NSRectFillUsingOperation(cellFrame, NSCompositeSourceAtop); @@ -623,7 +623,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4; fromRect:imageRect operation:NSCompositeSourceOver fraction:[self isEnabled] ? 1.0 : 0.5 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } } diff --git a/chrome/browser/ui/cocoa/image_button_cell.mm b/chrome/browser/ui/cocoa/image_button_cell.mm index 58f4180..1e4158d 100644 --- a/chrome/browser/ui/cocoa/image_button_cell.mm +++ b/chrome/browser/ui/cocoa/image_button_cell.mm @@ -6,7 +6,6 @@ #include "base/logging.h" #import "chrome/browser/themes/theme_service.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "ui/gfx/image/image.h" @@ -76,7 +75,8 @@ const CGFloat kImageNoFocusAlpha = 0.65; fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:alpha - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; if (overlayImageID_) { NSImage* overlayImage = [self imageForID:overlayImageID_ @@ -91,7 +91,8 @@ const CGFloat kImageNoFocusAlpha = 0.65; fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } } diff --git a/chrome/browser/ui/cocoa/image_utils.h b/chrome/browser/ui/cocoa/image_utils.h deleted file mode 100644 index 919a15d..0000000 --- a/chrome/browser/ui/cocoa/image_utils.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2010 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 CHROME_BROWSER_UI_COCOA_IMAGE_UTILS_H_ -#define CHROME_BROWSER_UI_COCOA_IMAGE_UTILS_H_ - -#import <Cocoa/Cocoa.h> - -@interface NSImage (FlippedAdditions) - -// Works like |-drawInRect:fromRect:operation:fraction:|, except that -// if |neverFlipped| is |YES|, and the context is flipped, the a -// transform is applied to flip it again before drawing the image. -// -// Compare to the 10.6 method -// |-drawInRect:fromRect:operation:fraction:respectFlipped:hints:|. -- (void)drawInRect:(NSRect)dstRect - fromRect:(NSRect)srcRect - operation:(NSCompositingOperation)op - fraction:(CGFloat)requestedAlpha - neverFlipped:(BOOL)neverFlipped; -@end - -#endif // CHROME_BROWSER_UI_COCOA_IMAGE_UTILS_H_ diff --git a/chrome/browser/ui/cocoa/image_utils.mm b/chrome/browser/ui/cocoa/image_utils.mm deleted file mode 100644 index b2883ff..0000000 --- a/chrome/browser/ui/cocoa/image_utils.mm +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2010 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/ui/cocoa/image_utils.h" - -@implementation NSImage (FlippedAdditions) - -- (void)drawInRect:(NSRect)dstRect - fromRect:(NSRect)srcRect - operation:(NSCompositingOperation)op - fraction:(CGFloat)requestedAlpha - neverFlipped:(BOOL)neverFlipped { - NSAffineTransform *transform = nil; - - // Flip drawing and adjust the origin to make the image come out - // right. - if (neverFlipped && [[NSGraphicsContext currentContext] isFlipped]) { - transform = [NSAffineTransform transform]; - [transform scaleXBy:1.0 yBy:-1.0]; - [transform concat]; - - // The lower edge of the image is as far from the origin as the - // upper edge was, plus it's on the other side of the origin. - dstRect.origin.y -= NSMaxY(dstRect) + NSMinY(dstRect); - } - - [self drawInRect:dstRect - fromRect:srcRect - operation:op - fraction:requestedAlpha]; - - // Flip drawing back, if needed. - [transform concat]; -} - -@end diff --git a/chrome/browser/ui/cocoa/image_utils_unittest.mm b/chrome/browser/ui/cocoa/image_utils_unittest.mm deleted file mode 100644 index da60c6f..0000000 --- a/chrome/browser/ui/cocoa/image_utils_unittest.mm +++ /dev/null @@ -1,139 +0,0 @@ -// 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. - -#import "base/memory/scoped_nsobject.h" -#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "chrome/browser/ui/cocoa/image_utils.h" -#include "testing/gtest/include/gtest/gtest.h" - -@interface ImageUtilsTestView : NSView { - @private - // Determine whether the view is flipped. - BOOL isFlipped_; - - // Determines whether to draw using the new method with - // |neverFlipped:|. - BOOL useNeverFlipped_; - - // Passed to |neverFlipped:| when drawing |image_|. - BOOL neverFlipped_; - - scoped_nsobject<NSImage> image_; -} -@property(assign, nonatomic) BOOL isFlipped; -@property(assign, nonatomic) BOOL useNeverFlipped; -@property(assign, nonatomic) BOOL neverFlipped; -@end - -@implementation ImageUtilsTestView -@synthesize isFlipped = isFlipped_; -@synthesize useNeverFlipped = useNeverFlipped_; -@synthesize neverFlipped = neverFlipped_; - -- (id)initWithFrame:(NSRect)rect { - self = [super initWithFrame:rect]; - if (self) { - rect = NSInsetRect(rect, 5.0, 5.0); - rect.origin = NSZeroPoint; - const NSSize imageSize = NSInsetRect(rect, 5.0, 5.0).size; - image_.reset([[NSImage alloc] initWithSize:imageSize]); - - NSBezierPath* path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(NSMinX(rect), NSMinY(rect))]; - [path lineToPoint:NSMakePoint(NSMinX(rect), NSMaxY(rect))]; - [path lineToPoint:NSMakePoint(NSMaxX(rect), NSMinY(rect))]; - [path closePath]; - - [image_ lockFocus]; - [[NSColor blueColor] setFill]; - [path fill]; - [image_ unlockFocus]; - } - return self; -} - -- (void)drawRect:(NSRect)rect { - NSBezierPath* path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(NSMinX(rect), NSMinY(rect))]; - [path lineToPoint:NSMakePoint(NSMinX(rect), NSMaxY(rect))]; - [path lineToPoint:NSMakePoint(NSMaxX(rect), NSMinY(rect))]; - [path closePath]; - - [[NSColor redColor] setFill]; - [path fill]; - - rect = NSInsetRect(rect, 5.0, 5.0); - rect = NSOffsetRect(rect, 2.0, 2.0); - - if (useNeverFlipped_) { - [image_ drawInRect:rect - fromRect:NSZeroRect - operation:NSCompositeCopy - fraction:1.0 - neverFlipped:neverFlipped_]; - } else { - [image_ drawInRect:rect - fromRect:NSZeroRect - operation:NSCompositeCopy - fraction:1.0]; - } -} - -@end - -namespace { - -class ImageUtilTest : public CocoaTest { - public: - ImageUtilTest() { - const NSRect frame = NSMakeRect(0, 0, 300, 100); - scoped_nsobject<ImageUtilsTestView> view( - [[ImageUtilsTestView alloc] initWithFrame: frame]); - view_ = view.get(); - [[test_window() contentView] addSubview:view_]; - } - - NSData* SnapshotView() { - [view_ display]; - - const NSRect bounds = [view_ bounds]; - - [view_ lockFocus]; - scoped_nsobject<NSBitmapImageRep> bitmap( - [[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]); - [view_ unlockFocus]; - - return [bitmap TIFFRepresentation]; - } - - NSData* SnapshotViewBase() { - [view_ setUseNeverFlipped:NO]; - return SnapshotView(); - } - - NSData* SnapshotViewNeverFlipped(BOOL neverFlipped) { - [view_ setUseNeverFlipped:YES]; - [view_ setNeverFlipped:neverFlipped]; - return SnapshotView(); - } - - ImageUtilsTestView* view_; -}; - -TEST_F(ImageUtilTest, Test) { - // When not flipped, both drawing methods return the same data. - [view_ setIsFlipped:NO]; - NSData* baseSnapshotData = SnapshotViewBase(); - EXPECT_TRUE([baseSnapshotData isEqualToData:SnapshotViewNeverFlipped(YES)]); - EXPECT_TRUE([baseSnapshotData isEqualToData:SnapshotViewNeverFlipped(NO)]); - - // When flipped, there's only a difference when the context flip is - // not being respected. - [view_ setIsFlipped:YES]; - baseSnapshotData = SnapshotViewBase(); - EXPECT_FALSE([baseSnapshotData isEqualToData:SnapshotViewNeverFlipped(YES)]); - EXPECT_TRUE([baseSnapshotData isEqualToData:SnapshotViewNeverFlipped(NO)]); -} - -} // namespace diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm index 28e72bc..1180ccc 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm @@ -6,7 +6,6 @@ #include "base/logging.h" #include "base/mac/mac_logging.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm index b568639..2ad9467 100644 --- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm @@ -7,7 +7,6 @@ #import "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h" #include "base/logging.h" -#import "chrome/browser/ui/cocoa/image_utils.h" namespace { @@ -117,7 +116,8 @@ void BubbleDecoration::DrawInFrame(NSRect frame, NSView* control_view) { fromRect:NSZeroRect // Entire image operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } else { imageRect.size = NSZeroSize; } diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm index ee36d6d..7a129a4 100644 --- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm @@ -6,7 +6,6 @@ #import "base/logging.h" #include "base/sys_string_conversions.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/font.h" diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.mm b/chrome/browser/ui/cocoa/location_bar/image_decoration.mm index 8056a4e..a5be9c5 100644 --- a/chrome/browser/ui/cocoa/location_bar/image_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.mm @@ -6,8 +6,6 @@ #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" -#import "chrome/browser/ui/cocoa/image_utils.h" - ImageDecoration::ImageDecoration() { } @@ -50,5 +48,6 @@ void ImageDecoration::DrawInFrame(NSRect frame, NSView* control_view) { fromRect:NSZeroRect // Entire image operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm index cff382f..a22813d 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #include "grit/theme_resources.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" @@ -139,7 +138,8 @@ void KeywordHintDecoration::DrawInFrame(NSRect frame, NSView* control_view) { fromRect:NSZeroRect // Entire image operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; frame.origin.x += NSWidth(image_rect); frame.size.width -= NSWidth(image_rect); diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm index d7c6c30..5faff51 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/location_bar_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.mm b/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.mm index a02130b..37a706e 100644 --- a/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.mm @@ -6,7 +6,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser_tabstrip.h" -#import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index 3b25366..3b0aeeb 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -10,7 +10,6 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/ui/cocoa/event_utils.h" -#include "chrome/browser/ui/cocoa/image_utils.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" @@ -556,7 +555,8 @@ void OmniboxPopupViewMac::OpenURLForRow(int row, bool force_background) { fromRect:NSZeroRect // Entire image operation:NSCompositeSourceOver fraction:1.0 - neverFlipped:YES]; + respectFlipped:YES + hints:nil]; } // Adjust the title position to be lined up under the field's text. diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index c322f4b..adc9f08 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -512,8 +512,6 @@ 'browser/ui/cocoa/hyperlink_text_view.mm', 'browser/ui/cocoa/image_button_cell.h', 'browser/ui/cocoa/image_button_cell.mm', - 'browser/ui/cocoa/image_utils.h', - 'browser/ui/cocoa/image_utils.mm', 'browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm', 'browser/ui/cocoa/importer/import_progress_dialog_cocoa.h', 'browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b5bd5ed..96feb45 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1772,7 +1772,6 @@ 'browser/ui/cocoa/hyperlink_button_cell_unittest.mm', 'browser/ui/cocoa/hyperlink_text_view_unittest.mm', 'browser/ui/cocoa/image_button_cell_unittest.mm', - 'browser/ui/cocoa/image_utils_unittest.mm', 'browser/ui/cocoa/info_bubble_view_unittest.mm', 'browser/ui/cocoa/info_bubble_window_unittest.mm', 'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm', |