2011-02-15 David Kilzer <ddkilzer@apple.com>
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Feb 2011 03:16:46 +0000 (03:16 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Feb 2011 03:16:46 +0000 (03:16 +0000)
        <http://webkit.org/b/54505> Move -[WebDynamicScrollBarsView inProgrammaticScroll] to WebDynamicScrollBarsViewInternal.h

        Reviewed by Darin Adler.

        * WebView/WebDynamicScrollBarsView.h:
        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Removed
        declaration.
        * WebView/WebDynamicScrollBarsView.mm:
        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Moved
        implementation into correct category.
        * WebView/WebDynamicScrollBarsViewInternal.h:
        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Added
        declaration.
        * WebView/WebHTMLView.mm: Included
        WebDynamicScrollBarsViewInternal.h instead of
        WebDynamicScrollBarsView.h.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h
Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
Source/WebKit/mac/WebView/WebDynamicScrollBarsViewInternal.h
Source/WebKit/mac/WebView/WebHTMLView.mm

index 508a6ad..a3d8557 100644 (file)
@@ -1,3 +1,22 @@
+2011-02-15  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/54505> Move -[WebDynamicScrollBarsView inProgrammaticScroll] to WebDynamicScrollBarsViewInternal.h
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebDynamicScrollBarsView.h:
+        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Removed
+        declaration.
+        * WebView/WebDynamicScrollBarsView.mm:
+        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Moved
+        implementation into correct category.
+        * WebView/WebDynamicScrollBarsViewInternal.h:
+        (-[WebDynamicScrollBarsView inProgrammaticScroll]): Added
+        declaration.
+        * WebView/WebHTMLView.mm: Included
+        WebDynamicScrollBarsViewInternal.h instead of
+        WebDynamicScrollBarsView.h.
+
 2011-02-14  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Gavin Barraclough and Geoff Garen.
index 3543868..c289a04 100644 (file)
@@ -58,10 +58,4 @@ struct WebDynamicScrollBarsViewPrivate;
 // visible is that they have been suppressed by setAlwaysHideHorizontal/VerticalScroller:.
 - (BOOL)horizontalScrollingAllowed;
 - (BOOL)verticalScrollingAllowed;
-
-// Returns YES if we're currently in the middle of programmatically moving the
-// scrollbar.
-// NOTE: As opposed to other places in the code, programmatically moving the
-// scrollers from inside this class should not fire JS events.
-- (BOOL)inProgrammaticScroll;
 @end
index d31349f..d3f3a83 100644 (file)
@@ -160,11 +160,6 @@ struct WebDynamicScrollBarsViewPrivate {
     return _private->verticalScrollingAllowedButScrollerHidden || [self hasVerticalScroller];
 }
 
-- (BOOL)inProgrammaticScroll
-{
-    return _private->inProgrammaticScroll;
-}
-
 @end
 
 @implementation WebDynamicScrollBarsView (WebInternal)
@@ -594,4 +589,9 @@ static const unsigned cMaxUpdateScrollbarsPass = 2;
     return _private->scrollOrigin;
 }
 
+- (BOOL)inProgrammaticScroll
+{
+    return _private->inProgrammaticScroll;
+}
+
 @end
index 40be88d..f0dacb0 100644 (file)
 
 // Calculate the appropriate frame for the contentView based on allowsScrollersToOverlapContent.
 - (NSRect)contentViewFrame;
+
+// Returns YES if we're currently in the middle of programmatically moving the
+// scrollbar.
+// NOTE: As opposed to other places in the code, programmatically moving the
+// scrollers from inside this class should not fire JS events.
+- (BOOL)inProgrammaticScroll;
 @end
index b7a0012..7a9b098 100644 (file)
@@ -41,7 +41,7 @@
 #import "WebDefaultUIDelegate.h"
 #import "WebDelegateImplementationCaching.h"
 #import "WebDocumentInternal.h"
-#import "WebDynamicScrollBarsView.h"
+#import "WebDynamicScrollBarsViewInternal.h"
 #import "WebEditingDelegate.h"
 #import "WebElementDictionary.h"
 #import "WebFrameInternal.h"