mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-21 06:20:55 +01:00
378a64b39a
- Remove CefNavigationEntry::GetFrameName() (see http://crbug.com/477150#c5). - Devirtualize base::BindState (see http://crbug.com/486594). - Move Tuple to the base namespace.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
diff --git ThemeMac.mm ThemeMac.mm
|
|
index 20a4ff0..38cb2c4 100644
|
|
--- ThemeMac.mm
|
|
+++ ThemeMac.mm
|
|
@@ -482,7 +482,7 @@ static void paintButton(ControlPart part, ControlStates states, GraphicsContext*
|
|
|
|
[buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
|
|
#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
|
|
- if (states & FocusControlState)
|
|
+ if (states & FocusState)
|
|
[buttonCell _web_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
|
|
#endif
|
|
[buttonCell setControlView:nil];
|
|
diff --git WebCoreNSCellExtras.h WebCoreNSCellExtras.h
|
|
index 54e9c9a..075e076 100644
|
|
--- WebCoreNSCellExtras.h
|
|
+++ WebCoreNSCellExtras.h
|
|
@@ -26,11 +26,11 @@
|
|
#import <AppKit/AppKit.h>
|
|
#include "platform/PlatformExport.h"
|
|
|
|
-#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING (!defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7)
|
|
+#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING 1
|
|
|
|
#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
|
|
|
|
-@interface NSCell (WebCoreFocusRingDrawing)
|
|
+PLATFORM_EXPORT @interface NSCell (WebCoreFocusRingDrawing)
|
|
- (void)_web_drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
|
|
@end
|
|
|