Refactor [FramedBrowserWindow drawWindowThemeInDirtyRect:] to use themeImagePositionForAlignment:

chrome/browser/ui/cocoa/framed_browser_window.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.
 
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 
 #include "base/logging.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "grit/theme_resources.h"
+#include "ui/base/cocoa/nsgraphics_context_additions.h"
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSWindow (LionSDKDeclarations)
 - (void)toggleFullScreen:(id)sender;
 @end
 
 enum {
   NSWindowDocumentVersionsButton = 6,
   NSWindowFullScreenButton
 };
 
 #endif  // MAC_OS_X_VERSION_10_7
 
 
 // Implementer's note: Moving the window controls is tricky. When altering the
 // code, ensure that:
 // - accessibility hit testing works
 // - the accessibility hierarchy is correct
 // - close/min in the background don't bring the window forward
 // - rollover effects work correctly
 
 namespace {
 
 const CGFloat kBrowserFrameViewPaintHeight = 60.0;
-const NSPoint kBrowserFrameViewPatternPhaseOffset = { -5, 3 };
 
 // Size of the gradient. Empirically determined so that the gradient looks
 // like what the heuristic does when there are just a few tabs.
 const CGFloat kWindowGradientHeight = 24.0;
 
 }
 
 @interface FramedBrowserWindow (Private)
 
 - (void)adjustCloseButton:(NSNotification*)notification;
@@ skipping 298 matching lines @@
   [[NSBezierPath bezierPathWithRoundedRect:windowRect
                                    xRadius:cornerRadius
                                    yRadius:cornerRadius] addClip];
   [[NSBezierPath bezierPathWithRect:rect] addClip];
 
   // Do the theming.
   BOOL themed = [FramedBrowserWindow
       drawWindowThemeInDirtyRect:rect
                          forView:view
                           bounds:windowRect
-                          offset:NSZeroPoint
             forceBlackBackground:NO];
 
   // If the window needs a title and we painted over the title as drawn by the
   // default window paint, paint it ourselves.
   if (themed && [view respondsToSelector:@selector(_titlebarTitleRect)] &&
       [view respondsToSelector:@selector(_drawTitleStringIn:withColor:)] &&
       ![self _isTitleHidden]) {
     [view _drawTitleStringIn:[view _titlebarTitleRect]
                    withColor:[self titleColor]];
   }
@@ skipping 12 matching lines @@
                                                          xRadius:cornerRadius
                                                          yRadius:cornerRadius];
     [path setLineWidth:lineWidth];
     [path stroke];
   }
 }
 
 + (BOOL)drawWindowThemeInDirtyRect:(NSRect)dirtyRect
                            forView:(NSView*)view
                             bounds:(NSRect)bounds
-                            offset:(NSPoint)offset
               forceBlackBackground:(BOOL)forceBlackBackground {
   ui::ThemeProvider* themeProvider = [[view window] themeProvider];
   if (!themeProvider)
     return NO;
 
   ThemedWindowStyle windowStyle = [[view window] themedWindowStyle];
 
   // Devtools windows don't get themed.
   if (windowStyle & THEMED_DEVTOOLS)
     return NO;
@@ skipping 20 matching lines @@
 
   // If no theme image, use a gradient if incognito.
   NSGradient* gradient = nil;
   if (!themeImageColor && incognito)
     gradient = themeProvider->GetNSGradient(
         active ? ThemeProperties::GRADIENT_FRAME_INCOGNITO :
                  ThemeProperties::GRADIENT_FRAME_INCOGNITO_INACTIVE);
 
   BOOL themed = NO;
   if (themeImageColor) {
-    // The titlebar/tabstrip header on the mac is slightly smaller than on
-    // Windows.  To keep the window background lined up with the tab and toolbar
-    // patterns, we have to shift the pattern slightly, rather than simply
-    // drawing it from the top left corner.  The offset below was empirically
-    // determined in order to line these patterns up.
-    //
-    // This will make the themes look slightly different than in Windows/Linux
-    // because of the differing heights between window top and tab top, but this
-    // has been approved by UI.
-    NSView* frameView = [[[view window] contentView] superview];
-    NSPoint topLeft = NSMakePoint(NSMinX(bounds), NSMaxY(bounds));
-    NSPoint topLeftInFrameCoordinates =
-        [view convertPoint:topLeft toView:frameView];
-
-    NSPoint phase = kBrowserFrameViewPatternPhaseOffset;
-    phase.x += (offset.x + topLeftInFrameCoordinates.x);
-    phase.y += (offset.y + topLeftInFrameCoordinates.y);
-
-    // Align the phase to physical pixels so resizing the window under HiDPI
-    // doesn't cause wiggling of the theme.
-    phase = [frameView convertPointToBase:phase];
-    phase.x = floor(phase.x);
-    phase.y = floor(phase.y);
-    phase = [frameView convertPointFromBase:phase];
-
     // Default to replacing any existing pixels with the theme image, but if
     // asked paint black first and blend the theme with black.
     NSCompositingOperation operation = NSCompositeCopy;
     if (forceBlackBackground) {
       [[NSColor blackColor] set];
       NSRectFill(dirtyRect);
       operation = NSCompositeSourceOver;
     }
 
-    [[NSGraphicsContext currentContext] setPatternPhase:phase];
+    NSPoint position = [[view window] themeImagePositionForAlignment:
+        THEME_IMAGE_ALIGN_WITH_FRAME];
+
+    // Align the phase to physical pixels so resizing the window under HiDPI
+    // doesn't cause wiggling of the theme.
+    NSView* frameView = [[[view window] contentView] superview];
+    position = [frameView convertPointToBase:position];
+    position.x = floor(position.x);
+    position.y = floor(position.y);
+    position = [frameView convertPointFromBase:position];
+    [[NSGraphicsContext currentContext] cr_setPatternPhase:position
+                                                   forView:view];
+
     [themeImageColor set];
     NSRectFillUsingOperation(dirtyRect, operation);
     themed = YES;
   } else if (gradient) {
     NSPoint startPoint = NSMakePoint(NSMinX(bounds), NSMaxY(bounds));
     NSPoint endPoint = startPoint;
     endPoint.y -= kBrowserFrameViewPaintHeight;
     [gradient drawFromPoint:startPoint toPoint:endPoint options:0];
     themed = YES;
   }
 
   // Check to see if we have an overlay image.
   NSImage* overlayImage = nil;
   if (themeProvider->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && !incognito &&
       !popup) {
     overlayImage = themeProvider->
         GetNSImageNamed(active ? IDR_THEME_FRAME_OVERLAY :
                                  IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
 
   if (overlayImage) {
     // Anchor to top-left and don't scale.
+    NSView* frameView = [[[view window] contentView] superview];
+    NSPoint position = [[view window] themeImagePositionForAlignment:
+        THEME_IMAGE_ALIGN_WITH_FRAME];
+    position = [view convertPoint:position fromView:frameView];
     NSSize overlaySize = [overlayImage size];
     NSRect imageFrame = NSMakeRect(0, 0, overlaySize.width, overlaySize.height);
-    [overlayImage drawAtPoint:NSMakePoint(offset.x,
-                                          NSHeight(bounds) + offset.y -
-                                               overlaySize.height)
+    [overlayImage drawAtPoint:NSMakePoint(position.x,
+                                          position.y - overlaySize.height)
                      fromRect:imageFrame
                     operation:NSCompositeSourceOver
                      fraction:1.0];
   }
 
   return themed;
 }
 
 - (NSColor*)titleColor {
   ui::ThemeProvider* themeProvider = [self themeProvider];
   if (!themeProvider)
     return [NSColor windowFrameTextColor];
 
   ThemedWindowStyle windowStyle = [self themedWindowStyle];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
 @end