[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d78e6d3d5cad911b3c72cbedeb3ecee640ec1bcc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 08:10:47 2010 +0000

    2010-02-27  Jing Jin  <jjin at apple.com>
    
            Reviewed by Timothy Hatcher.
    
            Move implementation of Bug 35449 into WebFramePrivate.
    
            * WebView/WebFrame.h:
            * WebView/WebFrame.mm:
            (-[WebFrame setAllowScrollersToOverlapContent:]):
            (-[WebFrame setAlwaysHideHorizontalScroller:]):
            (-[WebFrame setAlwaysHideVerticalScroller:]):
            * WebView/WebFramePrivate.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55349 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7744caf..a2efb96 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-27  Jing Jin  <jjin at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Move implementation of Bug 35449 into WebFramePrivate.
+
+        * WebView/WebFrame.h:
+        * WebView/WebFrame.mm:
+        (-[WebFrame setAllowScrollersToOverlapContent:]):
+        (-[WebFrame setAlwaysHideHorizontalScroller:]):
+        (-[WebFrame setAlwaysHideVerticalScroller:]):
+        * WebView/WebFramePrivate.h:
+
 2010-02-26  Jing Jin  <jjin at apple.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/mac/WebView/WebFrame.h b/WebKit/mac/WebView/WebFrame.h
index 12e446d..64015fd 100644
--- a/WebKit/mac/WebView/WebFrame.h
+++ b/WebKit/mac/WebView/WebFrame.h
@@ -213,30 +213,4 @@
     bridge between the WebKit and JavaScriptCore APIs.
 */
 - (JSGlobalContextRef)globalContext;
-
-/*!
-    @method setAllowScrollersToOverlapContent:
-    @discussion This method sets whether the scrollbars, if any, should be shown inside
-    the document's border (thus overlapping some content) or outside the webView's border 
-    (default behavior). Changing this flag changes the size of the contentView and maintains
-    the size of the frameView.
-    @param flag YES to allow scrollers to overlap content, NO otherwise.
-*/
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag;
-
-/*!
-    @method setAlwaysHideHorizontalScroller:
-    @discussion This method sets if the horizontal scrollbar is always hidden, regardless of
-    other scrollbar visibility settings. This does not affect the scrollability of the document.
-    @param flag YES to always hide the horizontal scroller, NO otherwise.
-*/
-- (void)setAlwaysHideHorizontalScroller:(BOOL)flag;
-
-/*!
-    @method setAlwaysHideVerticalScroller:
-    @discussion This method sets if the vertical scrollbar is always hidden, regardless of
-    other scrollbar visibility settings. This does not affect the scrollability of the document.
-    @param flag YES to always hide the vertical scroller, NO otherwise.
-*/
-- (void)setAlwaysHideVerticalScroller:(BOOL)flag;
 @end
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index d67a267..9a560f4 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -1282,6 +1282,22 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     return toGlobalRef(coreFrame->script()->globalObject(coreWorld)->globalExec());
 }
 
+- (void)setAllowScrollersToOverlapContent:(BOOL)flag
+{
+    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
+    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAllowScrollersToOverlapContent:flag];
+}
+
+- (void)setAlwaysHideHorizontalScroller:(BOOL)flag
+{
+    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
+    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAlwaysHideHorizontalScroller:flag];
+}
+- (void)setAlwaysHideVerticalScroller:(BOOL)flag
+{
+    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
+    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAlwaysHideVerticalScroller:flag];
+}
 @end
 
 @implementation WebFrame
@@ -1524,21 +1540,4 @@ static NSURL *createUniqueWebDataURL()
     return toGlobalRef(coreFrame->script()->globalObject(mainThreadNormalWorld())->globalExec());
 }
 
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag
-{
-    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
-    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAllowScrollersToOverlapContent:flag];
-}
-
-- (void)setAlwaysHideHorizontalScroller:(BOOL)flag
-{
-    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
-    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAlwaysHideHorizontalScroller:flag];
-}
-- (void)setAlwaysHideVerticalScroller:(BOOL)flag
-{
-    ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
-    [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAlwaysHideVerticalScroller:flag];
-}
-
 @end
diff --git a/WebKit/mac/WebView/WebFramePrivate.h b/WebKit/mac/WebView/WebFramePrivate.h
index 462686f..b1dc9ec 100644
--- a/WebKit/mac/WebView/WebFramePrivate.h
+++ b/WebKit/mac/WebView/WebFramePrivate.h
@@ -120,4 +120,14 @@ typedef enum {
 - (NSMutableDictionary *)_cacheabilityDictionary;
 
 - (BOOL)_allowsFollowingLink:(NSURL *)URL;
+
+// Sets whether the scrollbars, if any, should be shown inside the document's border 
+// (thus overlapping some content) or outside the webView's border (default behavior). 
+// Changing this flag changes the size of the contentView and maintains the size of the frameView.
+- (void)setAllowScrollersToOverlapContent:(BOOL)flag;
+
+// Sets if the scrollbar is always hidden, regardless of other scrollbar visibility settings. 
+// This does not affect the scrollability of the document.
+- (void)setAlwaysHideHorizontalScroller:(BOOL)flag;
+- (void)setAlwaysHideVerticalScroller:(BOOL)flag;
 @end

-- 
WebKit Debian packaging