Commit 0f91cc56 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com
Browse files

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78674 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 151e453d
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.
......
......@@ -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
......@@ -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
......@@ -55,4 +55,10 @@
// 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
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment