| Index: content/browser/renderer_host/render_widget_host_view_mac.mm
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| index 1c9ce1e430de8821450808b9dd533f7c5999f680..af317f96ed110e78493b394aac8f5da5b3ed56b4 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -146,29 +146,6 @@ RenderWidgetHostViewMac* GetRenderWidgetHostViewToUse(
|
| - (BOOL)isSpeaking;
|
| @end
|
|
|
| -// This method will return YES for OS X versions 10.7.3 and later, and NO
|
| -// otherwise.
|
| -// Used to prevent a crash when building with the 10.7 SDK and accessing the
|
| -// notification below. See: http://crbug.com/260595.
|
| -static BOOL SupportsBackingPropertiesChangedNotification() {
|
| - // windowDidChangeBackingProperties: method has been added to the
|
| - // NSWindowDelegate protocol in 10.7.3, at the same time as the
|
| - // NSWindowDidChangeBackingPropertiesNotification notification was added.
|
| - // If the protocol contains this method description, the notification should
|
| - // be supported as well.
|
| - Protocol* windowDelegateProtocol = NSProtocolFromString(@"NSWindowDelegate");
|
| - struct objc_method_description methodDescription =
|
| - protocol_getMethodDescription(
|
| - windowDelegateProtocol,
|
| - @selector(windowDidChangeBackingProperties:),
|
| - NO,
|
| - YES);
|
| -
|
| - // If the protocol does not contain the method, the returned method
|
| - // description is {NULL, NULL}
|
| - return methodDescription.name != NULL || methodDescription.types != NULL;
|
| -}
|
| -
|
| // Private methods:
|
| @interface RenderWidgetHostViewCocoa ()
|
| @property(nonatomic, assign) NSRange selectedRange;
|
| @@ -2351,8 +2328,6 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| }
|
|
|
| - (void)shortCircuitScrollWheelEvent:(NSEvent*)event {
|
| - DCHECK(base::mac::IsOSLionOrLater());
|
| -
|
| if ([event phase] != NSEventPhaseEnded &&
|
| [event phase] != NSEventPhaseCancelled) {
|
| return;
|
| @@ -2518,8 +2493,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| // the event is received even when the mouse cursor is no longer over the view
|
| // when the scrolling ends (e.g. if the tab was switched). This is necessary
|
| // for ending rubber-banding in such cases.
|
| - if (base::mac::IsOSLionOrLater() && [event phase] == NSEventPhaseBegan &&
|
| - !endWheelMonitor_) {
|
| + if ([event phase] == NSEventPhaseBegan && !endWheelMonitor_) {
|
| endWheelMonitor_ =
|
| [NSEvent addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
|
| handler:^(NSEvent* blockEvent) {
|
| @@ -2582,18 +2556,11 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| NSNotificationCenter* notificationCenter =
|
| [NSNotificationCenter defaultCenter];
|
|
|
| - // Backing property notifications crash on 10.6 when building with the 10.7
|
| - // SDK, see http://crbug.com/260595.
|
| - static BOOL supportsBackingPropertiesNotification =
|
| - SupportsBackingPropertiesChangedNotification();
|
| -
|
| if (oldWindow) {
|
| - if (supportsBackingPropertiesNotification) {
|
| - [notificationCenter
|
| - removeObserver:self
|
| - name:NSWindowDidChangeBackingPropertiesNotification
|
| - object:oldWindow];
|
| - }
|
| + [notificationCenter
|
| + removeObserver:self
|
| + name:NSWindowDidChangeBackingPropertiesNotification
|
| + object:oldWindow];
|
| [notificationCenter
|
| removeObserver:self
|
| name:NSWindowDidMoveNotification
|
| @@ -2612,13 +2579,11 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| object:oldWindow];
|
| }
|
| if (newWindow) {
|
| - if (supportsBackingPropertiesNotification) {
|
| - [notificationCenter
|
| - addObserver:self
|
| - selector:@selector(windowDidChangeBackingProperties:)
|
| - name:NSWindowDidChangeBackingPropertiesNotification
|
| - object:newWindow];
|
| - }
|
| + [notificationCenter
|
| + addObserver:self
|
| + selector:@selector(windowDidChangeBackingProperties:)
|
| + name:NSWindowDidChangeBackingPropertiesNotification
|
| + object:newWindow];
|
| [notificationCenter
|
| addObserver:self
|
| selector:@selector(windowChangedGlobalFrame:)
|
|
|