From 44e438c9750d2e4896523bc7c1bee5d11493f7f4 Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Wed, 12 Nov 2008 09:14:59 -0600
Subject: [PATCH] Extremely slow scrolling on OS X with CSS "overflow: auto"
 and large HTML page. b=428070 r=josh sr=roc a=beltzner.

---
 widget/src/cocoa/nsChildView.h  |  3 ---
 widget/src/cocoa/nsChildView.mm | 48 ---------------------------------
 2 files changed, 51 deletions(-)

diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 0d876ea297a..dacbb03080b 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -129,9 +129,6 @@ enum {
   // the link back to it must be weak.
   nsChildView* mGeckoChild;
     
-  // tag for our mouse enter/exit tracking rect
-  NSTrackingRectTag mMouseEnterExitTag;
-
   // Whether we're a plugin view.
   BOOL mIsPluginView;
 
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index f534d361177..17d1d0761c7 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -2746,26 +2746,6 @@ NSEvent* gLastDragEvent = nil;
 }
 
 
-// Override in order to keep our mouse enter/exit tracking rect in sync with
-// the frame of the view
-- (void)setFrame:(NSRect)frameRect
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [super setFrame:frameRect];
-  if (mMouseEnterExitTag)
-    [self removeTrackingRect:mMouseEnterExitTag];
-
-  if ([self window])
-    mMouseEnterExitTag = [self addTrackingRect:[self bounds]
-                                         owner:self
-                                      userData:nil
-                                  assumeInside:[[self window] acceptsMouseMovedEvents]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-
 // Make the origin of this view the topLeft corner (gecko origin) rather
 // than the bottomLeft corner (standard cocoa origin).
 - (BOOL)isFlipped
@@ -2851,34 +2831,6 @@ NSEvent* gLastDragEvent = nil;
 }
 
 
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mMouseEnterExitTag)
-    [self removeTrackingRect:mMouseEnterExitTag];
-
-  [super viewWillMoveToWindow:newWindow];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-
-- (void)viewDidMoveToWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if ([self window])
-    mMouseEnterExitTag = [self addTrackingRect:[self bounds] owner:self
-                                      userData:nil assumeInside: [[self window]
-                                      acceptsMouseMovedEvents]];
-
-  [super viewDidMoveToWindow];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-
 - (void)viewWillStartLiveResize
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;