Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Issue 611453004: Mac: Fix theme image drawing when building with >=10.9 SDK. (Closed)

Created:
6 years, 2 months ago by Andre
Modified:
6 years, 2 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Mac: Fix theme image drawing when building with >=10.9 SDK. When linking with >=10.9 SDK, NSThemeFrame will have wantsLayer=YES and wantsUpdateLayer=YES, resulting in the swizzled drawRect to be ineffective (updateLayer is called instead of drawRect). This patch moves the drawing of the theme image behind the tab strip area to use a small subview instead. This subview is positioned at the top of the window, behind its sibling views. The view will redraw when the window's activation state changes because the theme image may be different. NativeAppWindowCocoa is another user of the swizzled drawRect, so I'm not removing the swizzling yet in this CL. BUG=417872 Committed: https://crrev.com/b8bc771d55ccc9090f7e9b625a344b7377666720 Cr-Commit-Position: refs/heads/master@{#297498}

Patch Set 1 : #

Patch Set 2 : Cleanup pass #

Patch Set 3 : Add comments #

Patch Set 4 : Rebase #

Total comments: 7

Patch Set 5 : Add comment #

Patch Set 6 : Update moveContentViewToBack #

Total comments: 2

Patch Set 7 : Fix for erikchen #

Total comments: 2

Patch Set 8 : Comment for Avi #

Unified diffs Side-by-side diffs Delta from patch set Stats (+137 lines, -69 lines) Patch
M chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm View 1 2 3 4 5 1 chunk +7 lines, -3 lines 0 comments Download
M chrome/browser/ui/cocoa/framed_browser_window.h View 1 2 3 4 5 6 7 1 chunk +4 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/framed_browser_window.mm View 1 2 3 2 chunks +0 lines, -64 lines 0 comments Download
A chrome/browser/ui/cocoa/tabs/tab_strip_background_view.h View 1 2 1 chunk +17 lines, -0 lines 0 comments Download
A chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm View 1 2 3 4 1 chunk +73 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tabs/tab_window_controller.h View 1 2 3 4 5 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tabs/tab_window_controller.mm View 1 2 3 4 5 6 5 chunks +32 lines, -2 lines 0 comments Download
M chrome/chrome_browser_ui.gypi View 1 2 3 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 24 (7 generated)
Andre
Erik, please review.
6 years, 2 months ago (2014-09-26 23:54:27 UTC) #3
erikchen
https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/framed_browser_window.h File chrome/browser/ui/cocoa/framed_browser_window.h (right): https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/framed_browser_window.h#newcode22 chrome/browser/ui/cocoa/framed_browser_window.h:22: const CGFloat kBrowserFrameViewPaintHeight = 60.0; My personal preference is ...
6 years, 2 months ago (2014-09-27 00:23:33 UTC) #4
Andre
https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/framed_browser_window.h File chrome/browser/ui/cocoa/framed_browser_window.h (right): https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/framed_browser_window.h#newcode22 chrome/browser/ui/cocoa/framed_browser_window.h:22: const CGFloat kBrowserFrameViewPaintHeight = 60.0; On 2014/09/27 00:23:33, erikchen ...
6 years, 2 months ago (2014-09-27 18:17:02 UTC) #5
Andre
https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm File chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm (right): https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm#newcode29 chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm:29: NSRect strokeRect = NSInsetRect(roundedRect, -lineWidth/2, lineWidth/2); On 2014/09/27 18:17:02, ...
6 years, 2 months ago (2014-09-27 18:47:00 UTC) #6
Andre
On 2014/09/27 18:47:00, Andre wrote: > https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm > File chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm (right): > > https://codereview.chromium.org/611453004/diff/80001/chrome/browser/ui/cocoa/tabs/tab_strip_background_view.mm#newcode29 > ...
6 years, 2 months ago (2014-09-29 16:13:28 UTC) #8
erikchen
lgtm
6 years, 2 months ago (2014-09-29 23:16:36 UTC) #10
Andre
Avi, please review.
6 years, 2 months ago (2014-09-29 23:17:30 UTC) #12
erikchen
https://codereview.chromium.org/611453004/diff/140001/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm File chrome/browser/ui/cocoa/tabs/tab_window_controller.mm (right): https://codereview.chromium.org/611453004/diff/140001/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm#newcode317 chrome/browser/ui/cocoa/tabs/tab_window_controller.mm:317: relativeTo:tabStripBackgroundView_]; This doesn't look right. If tabStripBackgroundView_ is nil, ...
6 years, 2 months ago (2014-09-29 23:23:32 UTC) #13
Andre
https://codereview.chromium.org/611453004/diff/140001/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm File chrome/browser/ui/cocoa/tabs/tab_window_controller.mm (right): https://codereview.chromium.org/611453004/diff/140001/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm#newcode317 chrome/browser/ui/cocoa/tabs/tab_window_controller.mm:317: relativeTo:tabStripBackgroundView_]; On 2014/09/29 23:23:32, erikchen wrote: > This doesn't ...
6 years, 2 months ago (2014-09-30 03:57:38 UTC) #15
Avi (use Gerrit)
lgtm https://codereview.chromium.org/611453004/diff/180001/chrome/browser/ui/cocoa/framed_browser_window.h File chrome/browser/ui/cocoa/framed_browser_window.h (right): https://codereview.chromium.org/611453004/diff/180001/chrome/browser/ui/cocoa/framed_browser_window.h#newcode22 chrome/browser/ui/cocoa/framed_browser_window.h:22: const CGFloat kBrowserFrameViewPaintHeight = 60.0; Comment?
6 years, 2 months ago (2014-09-30 15:49:33 UTC) #16
Andre
https://codereview.chromium.org/611453004/diff/180001/chrome/browser/ui/cocoa/framed_browser_window.h File chrome/browser/ui/cocoa/framed_browser_window.h (right): https://codereview.chromium.org/611453004/diff/180001/chrome/browser/ui/cocoa/framed_browser_window.h#newcode22 chrome/browser/ui/cocoa/framed_browser_window.h:22: const CGFloat kBrowserFrameViewPaintHeight = 60.0; On 2014/09/30 15:49:32, Avi ...
6 years, 2 months ago (2014-09-30 16:47:39 UTC) #17
Andre
Erik, latest patch looks good to you?
6 years, 2 months ago (2014-09-30 19:51:32 UTC) #18
erikchen
lgtm
6 years, 2 months ago (2014-09-30 19:59:12 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/611453004/200001
6 years, 2 months ago (2014-09-30 20:51:11 UTC) #21
commit-bot: I haz the power
Committed patchset #8 (id:200001) as dccb855d2738f7ce970aad3cd1dec5c128501a08
6 years, 2 months ago (2014-09-30 21:01:24 UTC) #22
commit-bot: I haz the power
Patchset 8 (id:??) landed as https://crrev.com/b8bc771d55ccc9090f7e9b625a344b7377666720 Cr-Commit-Position: refs/heads/master@{#297498}
6 years, 2 months ago (2014-09-30 21:02:13 UTC) #23
commit-bot: I haz the power
6 years, 2 months ago (2014-09-30 21:02:29 UTC) #24
Message was sent while issue was closed.
Patchset 8 (id:??) landed as
https://crrev.com/b8bc771d55ccc9090f7e9b625a344b7377666720
Cr-Commit-Position: refs/heads/master@{#297498}

Powered by Google App Engine
This is Rietveld 408576698