mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-29 10:39:49 +01:00
2ba756d3e1
- Restore CefRenderHandler::OnScrollOffsetChanged. - Add new RT_PING and RT_SERVICE_WORKER resource type values. - The resource type for image sub-resource loads has changed from RT_IMAGE to RT_PREFETCH (this is a regression, see http://crbug.com/415253#c23). - Add a patch to fix a crash in Scheduler::swapQueuesRunPendingTasks* (http://crbug.com/415478). - Add documentation for cef_key_event_type_t values. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1846 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git ThemeMac.mm ThemeMac.mm
|
|
index a405ba5..e20144d 100644
|
|
--- ThemeMac.mm
|
|
+++ ThemeMac.mm
|
|
@@ -490,7 +490,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 8623826..b9f683d 100644
|
|
--- WebCoreNSCellExtras.h
|
|
+++ WebCoreNSCellExtras.h
|
|
@@ -26,12 +26,12 @@
|
|
#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_MAX_ALLOWED < 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
|
|
|
|
// FIXME: Might want to use this on Mac once we only support OS X 10.8+
|
|
-@interface NSCell (WebCoreFocusRingDrawing)
|
|
+PLATFORM_EXPORT @interface NSCell (WebCoreFocusRingDrawing)
|
|
- (void)_web_drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
|
|
@end
|
|
|