From 974942a736836c67d078bc70543e98751ba7b0f7 Mon Sep 17 00:00:00 2001
From: Saikat Chakrabarti <saikat@gomockingbird.com>
Date: Mon, 10 Mar 2014 14:24:12 -0700
Subject: [PATCH] Fix OS X scrolling issue.  Closes #2078.

---
 AppKit/Platform/DOM/CPPlatformWindow+DOM.j | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
index e542da819..e3a2c79a8 100644
--- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
+++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
@@ -201,6 +201,7 @@ var ModifierKeyCodes = [
     supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 
 var resizeTimer = nil;
+var PreventScroll = true;
 
 #if PLATFORM(DOM)
 
@@ -325,8 +326,8 @@ var resizeTimer = nil;
     _DOMScrollingElement.style.position = "absolute";
     _DOMScrollingElement.style.visibility = "hidden";
     _DOMScrollingElement.style.zIndex = @"999";
-    _DOMScrollingElement.style.height = "60px";
-    _DOMScrollingElement.style.width = "60px";
+    _DOMScrollingElement.style.height = "500px";
+    _DOMScrollingElement.style.width = "500px";
     _DOMScrollingElement.style.overflow = "scroll";
     //_DOMScrollingElement.style.backgroundColor = "rgba(0,0,0,1.0)"; // debug help.
     _DOMScrollingElement.style.opacity = "0";
@@ -335,8 +336,8 @@ var resizeTimer = nil;
     _DOMBodyElement.appendChild(_DOMScrollingElement);
 
     var _DOMInnerScrollingElement = theDocument.createElement("div");
-    _DOMInnerScrollingElement.style.width = "400px";
-    _DOMInnerScrollingElement.style.height = "400px";
+    _DOMInnerScrollingElement.style.width = "5000px";
+    _DOMInnerScrollingElement.style.height = "5000px";
     _DOMScrollingElement.appendChild(_DOMInnerScrollingElement);
 
     // Set an initial scroll offset
@@ -842,6 +843,12 @@ var resizeTimer = nil;
 
 - (void)scrollEvent:(DOMEvent)aDOMEvent
 {
+    if (PreventScroll)
+    {
+        PreventScroll = false;
+        aDOMEvent.preventDefault();
+    }
+
     if (_hideDOMScrollingElementTimeout)
     {
         clearTimeout(_hideDOMScrollingElementTimeout);
@@ -852,7 +859,6 @@ var resizeTimer = nil;
         aDOMEvent = window.event;
 
     var location = nil;
-
     if (CPFeatureIsCompatible(CPJavaScriptMouseWheelValues_8_15))
     {
         var x = aDOMEvent._offsetX || 0.0,
@@ -950,6 +956,7 @@ var resizeTimer = nil;
     // can receive events.
     _hideDOMScrollingElementTimeout = setTimeout(function()
     {
+        PreventScroll = true;
         _DOMScrollingElement.style.visibility = "hidden";
     }, 300);
 }