[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[bdakin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 909d392caa6e7f1310d75389df7defff68380da2
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 16 20:59:28 2011 +0000

    Fix for <rdar://problem/8871204>
    
    Reviewed by Kevin Decker.
    
    Don't try to save elasticity state. Just rely on
    NSScrollElasticityAutomatic to restore the correct state.
    * WebCoreSupport/WebFrameLoaderClient.h:
    * WebCoreSupport/WebFrameLoaderClient.mm:
    (WebFrameLoaderClient::WebFrameLoaderClient):
    (WebFrameLoaderClient::dispatchDidFirstLayout):
    (WebFrameLoaderClient::provisionalLoadStarted):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75893 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 20ef1e9..458bdaa 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-16  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Fix for <rdar://problem/8871204>
+
+        Don't try to save elasticity state. Just rely on
+        NSScrollElasticityAutomatic to restore the correct state.
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::WebFrameLoaderClient):
+        (WebFrameLoaderClient::dispatchDidFirstLayout):
+        (WebFrameLoaderClient::provisionalLoadStarted):
+
 2011-01-14  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
index 83d3ab6..9de4246 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
@@ -245,9 +245,4 @@ private:
 
     RetainPtr<WebFramePolicyListener> m_policyListener;
     WebCore::FramePolicyFunction m_policyFunction;
-
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    NSScrollElasticity m_verticalElasticity;
-    NSScrollElasticity m_horizontalElasticity;
-#endif
 };
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index ea90baf..f3cdff6 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -210,10 +210,6 @@ static inline void applyAppleDictionaryApplicationQuirk(WebFrameLoaderClient* cl
 WebFrameLoaderClient::WebFrameLoaderClient(WebFrame *webFrame)
     : m_webFrame(webFrame)
     , m_policyFunction(0)
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    , m_verticalElasticity(NSScrollElasticityAutomatic)
-    , m_horizontalElasticity(NSScrollElasticityAutomatic)
-#endif
 {
 }
 
@@ -697,8 +693,8 @@ void WebFrameLoaderClient::dispatchDidFirstLayout()
     if ([getWebView(m_webFrame.get()) drawsBackground])
         [scrollView setDrawsBackground:YES];
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    [scrollView setVerticalScrollElasticity:m_verticalElasticity];
-    [scrollView setHorizontalScrollElasticity:m_horizontalElasticity];
+    [scrollView setVerticalScrollElasticity:NSScrollElasticityAutomatic];
+    [scrollView setHorizontalScrollElasticity:NSScrollElasticityAutomatic];
 #endif
 }
 
@@ -1105,8 +1101,6 @@ void WebFrameLoaderClient::provisionalLoadStarted()
     WebDynamicScrollBarsView *scrollView = [m_webFrame->_private->webFrameView _scrollView];
     [scrollView setDrawsBackground:NO];
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    m_verticalElasticity = [scrollView verticalScrollElasticity];
-    m_horizontalElasticity = [scrollView horizontalScrollElasticity];
     [scrollView setVerticalScrollElasticity:NSScrollElasticityNone];
     [scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
 #endif

-- 
WebKit Debian packaging