Changeset 16831 in webkit


Ignore:
Timestamp:
Oct 5, 2006 6:23:47 PM (17 years ago)
Author:
adele
Message:

Reviewed by the letter 'B'.

More build fixes.

  • WebKit.xcodeproj/project.pbxproj:
  • WebView/WebDynamicScrollBarsView.h:
  • WebView/WebDynamicScrollBarsView.m: (-[WebDynamicScrollBarsView updateScrollers]): (-[WebDynamicScrollBarsView setAllowsScrolling:]): (-[WebDynamicScrollBarsView allowsScrolling]): (-[WebDynamicScrollBarsView setAllowsHorizontalScrolling:]): (-[WebDynamicScrollBarsView setAllowsVerticalScrolling:]): (-[WebDynamicScrollBarsView allowsHorizontalScrolling]): (-[WebDynamicScrollBarsView allowsVerticalScrolling]): (-[WebDynamicScrollBarsView horizontalScrollingMode]): (-[WebDynamicScrollBarsView verticalScrollingMode]): (-[WebDynamicScrollBarsView setHorizontalScrollingMode:]): (-[WebDynamicScrollBarsView setVerticalScrollingMode:]): (-[WebDynamicScrollBarsView setScrollingMode:]):
  • WebView/WebView.m: (-[WebView setAlwaysShowVerticalScroller:]): (-[WebView alwaysShowVerticalScroller]): (-[WebView setAlwaysShowHorizontalScroller:]): (-[WebView alwaysShowHorizontalScroller]):
Location:
trunk/WebKit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/ChangeLog

    r16823 r16831  
     12006-10-05  Adele Peterson  <adele@apple.com>
     2
     3        Reviewed by the letter 'B'.
     4
     5        More build fixes.
     6
     7        * WebKit.xcodeproj/project.pbxproj:
     8        * WebView/WebDynamicScrollBarsView.h:
     9        * WebView/WebDynamicScrollBarsView.m:
     10        (-[WebDynamicScrollBarsView updateScrollers]):
     11        (-[WebDynamicScrollBarsView setAllowsScrolling:]):
     12        (-[WebDynamicScrollBarsView allowsScrolling]):
     13        (-[WebDynamicScrollBarsView setAllowsHorizontalScrolling:]):
     14        (-[WebDynamicScrollBarsView setAllowsVerticalScrolling:]):
     15        (-[WebDynamicScrollBarsView allowsHorizontalScrolling]):
     16        (-[WebDynamicScrollBarsView allowsVerticalScrolling]):
     17        (-[WebDynamicScrollBarsView horizontalScrollingMode]):
     18        (-[WebDynamicScrollBarsView verticalScrollingMode]):
     19        (-[WebDynamicScrollBarsView setHorizontalScrollingMode:]):
     20        (-[WebDynamicScrollBarsView setVerticalScrollingMode:]):
     21        (-[WebDynamicScrollBarsView setScrollingMode:]):
     22        * WebView/WebView.m:
     23        (-[WebView setAlwaysShowVerticalScroller:]):
     24        (-[WebView alwaysShowVerticalScroller]):
     25        (-[WebView setAlwaysShowHorizontalScroller:]):
     26        (-[WebView alwaysShowHorizontalScroller]):
     27
    1282006-10-05  Vladimir Olexa  <vladimir.olexa@gmail.com>
    229
  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r16818 r16831  
    12561256                        isa = PBXProject;
    12571257                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
    1258                         compatibilityVersion = "Xcode 2.4";
    12591258                        hasScannedForEncodings = 1;
    12601259                        knownRegions = (
     
    12701269                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
    12711270                        projectDirPath = "";
    1272                         projectRoot = "";
    1273                         shouldCheckCompatibility = 1;
    12741271                        targets = (
    12751272                                9398100A0824BF01008DF038 /* WebKit */,
  • trunk/WebKit/WebView/WebDynamicScrollBarsView.h

    r14771 r16831  
    3434@interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
    3535{
    36     WebCoreScrollBarMode hScroll;
    37     WebCoreScrollBarMode vScroll;
     36    WebCoreScrollbarMode hScroll;
     37    WebCoreScrollbarMode vScroll;
    3838    BOOL hScrollModeLocked;
    3939    BOOL vScrollModeLocked;
  • trunk/WebKit/WebView/WebDynamicScrollBarsView.m

    r14771 r16831  
    7070
    7171        if (!suppressLayout && !suppressScrollers &&
    72             (hScroll == WebCoreScrollBarAuto || vScroll == WebCoreScrollBarAuto))
     72            (hScroll == WebCoreScrollbarAuto || vScroll == WebCoreScrollbarAuto))
    7373        {
    7474            // Do a layout if pending, before checking if scrollbars are needed.
     
    8484            NSSize frameSize = [self frame].size;
    8585           
    86             scrollsVertically = (vScroll == WebCoreScrollBarAlwaysOn) ||
    87                 (vScroll == WebCoreScrollBarAuto && documentSize.height > frameSize.height);
     86            scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) ||
     87                (vScroll == WebCoreScrollbarAuto && documentSize.height > frameSize.height);
    8888            if (scrollsVertically)
    89                 scrollsHorizontally = (hScroll == WebCoreScrollBarAlwaysOn) ||
    90                     (hScroll == WebCoreScrollBarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width);
     89                scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) ||
     90                    (hScroll == WebCoreScrollbarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width);
    9191            else {
    92                 scrollsHorizontally = (hScroll == WebCoreScrollBarAlwaysOn) ||
    93                     (hScroll == WebCoreScrollBarAuto && documentSize.width > frameSize.width);
     92                scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) ||
     93                    (hScroll == WebCoreScrollbarAuto && documentSize.width > frameSize.width);
    9494                if (scrollsHorizontally)
    95                     scrollsVertically = (vScroll == WebCoreScrollBarAlwaysOn) ||
    96                         (vScroll == WebCoreScrollBarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height);
     95                    scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) ||
     96                        (vScroll == WebCoreScrollbarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height);
    9797            }
    9898        }
    9999        else {
    100             scrollsHorizontally = (hScroll == WebCoreScrollBarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollBarAlwaysOn);
    101             scrollsVertically = (vScroll == WebCoreScrollBarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollBarAlwaysOn);
     100            scrollsHorizontally = (hScroll == WebCoreScrollbarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollbarAlwaysOn);
     101            scrollsVertically = (vScroll == WebCoreScrollbarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollbarAlwaysOn);
    102102        }
    103103       
     
    148148        return;
    149149
    150     if (flag && vScroll == WebCoreScrollBarAlwaysOff)
    151         vScroll = WebCoreScrollBarAuto;
    152     else if (!flag && vScroll != WebCoreScrollBarAlwaysOff)
    153         vScroll = WebCoreScrollBarAlwaysOff;
    154 
    155     if (flag && hScroll == WebCoreScrollBarAlwaysOff)
    156         hScroll = WebCoreScrollBarAuto;
    157     else if (!flag && hScroll != WebCoreScrollBarAlwaysOff)
    158         hScroll = WebCoreScrollBarAlwaysOff;
     150    if (flag && vScroll == WebCoreScrollbarAlwaysOff)
     151        vScroll = WebCoreScrollbarAuto;
     152    else if (!flag && vScroll != WebCoreScrollbarAlwaysOff)
     153        vScroll = WebCoreScrollbarAlwaysOff;
     154
     155    if (flag && hScroll == WebCoreScrollbarAlwaysOff)
     156        hScroll = WebCoreScrollbarAuto;
     157    else if (!flag && hScroll != WebCoreScrollbarAlwaysOff)
     158        hScroll = WebCoreScrollbarAlwaysOff;
    159159
    160160    [self updateScrollers];
     
    164164{
    165165    // Returns YES if either horizontal or vertical scrolling is allowed.
    166     return hScroll != WebCoreScrollBarAlwaysOff || vScroll != WebCoreScrollBarAlwaysOff;
     166    return hScroll != WebCoreScrollbarAlwaysOff || vScroll != WebCoreScrollbarAlwaysOff;
    167167}
    168168
     
    171171    if (hScrollModeLocked)
    172172        return;
    173     if (flag && hScroll == WebCoreScrollBarAlwaysOff)
    174         hScroll = WebCoreScrollBarAuto;
    175     else if (!flag && hScroll != WebCoreScrollBarAlwaysOff)
    176         hScroll = WebCoreScrollBarAlwaysOff;
     173    if (flag && hScroll == WebCoreScrollbarAlwaysOff)
     174        hScroll = WebCoreScrollbarAuto;
     175    else if (!flag && hScroll != WebCoreScrollbarAlwaysOff)
     176        hScroll = WebCoreScrollbarAlwaysOff;
    177177    [self updateScrollers];
    178178}
     
    182182    if (vScrollModeLocked)
    183183        return;
    184     if (flag && vScroll == WebCoreScrollBarAlwaysOff)
    185         vScroll = WebCoreScrollBarAuto;
    186     else if (!flag && vScroll != WebCoreScrollBarAlwaysOff)
    187         vScroll = WebCoreScrollBarAlwaysOff;
     184    if (flag && vScroll == WebCoreScrollbarAlwaysOff)
     185        vScroll = WebCoreScrollbarAuto;
     186    else if (!flag && vScroll != WebCoreScrollbarAlwaysOff)
     187        vScroll = WebCoreScrollbarAlwaysOff;
    188188    [self updateScrollers];
    189189}
     
    191191- (BOOL)allowsHorizontalScrolling
    192192{
    193     return hScroll != WebCoreScrollBarAlwaysOff;
     193    return hScroll != WebCoreScrollbarAlwaysOff;
    194194}
    195195
    196196- (BOOL)allowsVerticalScrolling
    197197{
    198     return vScroll != WebCoreScrollBarAlwaysOff;
    199 }
    200 
    201 -(WebCoreScrollBarMode)horizontalScrollingMode
     198    return vScroll != WebCoreScrollbarAlwaysOff;
     199}
     200
     201-(WebCoreScrollbarMode)horizontalScrollingMode
    202202{
    203203    return hScroll;
    204204}
    205205
    206 -(WebCoreScrollBarMode)verticalScrollingMode
     206-(WebCoreScrollbarMode)verticalScrollingMode
    207207{
    208208    return vScroll;
    209209}
    210210
    211 - (void)setHorizontalScrollingMode:(WebCoreScrollBarMode)mode
     211- (void)setHorizontalScrollingMode:(WebCoreScrollbarMode)mode
    212212{
    213213    if (mode == hScroll || hScrollModeLocked)
     
    217217}
    218218
    219 - (void)setVerticalScrollingMode:(WebCoreScrollBarMode)mode
     219- (void)setVerticalScrollingMode:(WebCoreScrollbarMode)mode
    220220{
    221221    if (mode == vScroll || vScrollModeLocked)
     
    225225}
    226226
    227 - (void)setScrollingMode:(WebCoreScrollBarMode)mode
     227- (void)setScrollingMode:(WebCoreScrollbarMode)mode
    228228{
    229229    if ((mode == vScroll && mode == hScroll) || (vScrollModeLocked && hScrollModeLocked))
  • trunk/WebKit/WebView/WebView.m

    r16823 r16831  
    14651465    WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
    14661466    if (flag) {
    1467         [scrollview setVerticalScrollingMode:WebCoreScrollBarAlwaysOn];
     1467        [scrollview setVerticalScrollingMode:WebCoreScrollbarAlwaysOn];
    14681468        [scrollview setVerticalScrollingModeLocked:YES];
    14691469    } else {
    14701470        [scrollview setVerticalScrollingModeLocked:NO];
    1471         [scrollview setVerticalScrollingMode:WebCoreScrollBarAuto];
     1471        [scrollview setVerticalScrollingMode:WebCoreScrollbarAuto];
    14721472    }
    14731473}
     
    14761476{
    14771477    WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
    1478     return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScrollBarAlwaysOn;
     1478    return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScrollbarAlwaysOn;
    14791479}
    14801480
     
    14831483    WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
    14841484    if (flag) {
    1485         [scrollview setHorizontalScrollingMode:WebCoreScrollBarAlwaysOn];
     1485        [scrollview setHorizontalScrollingMode:WebCoreScrollbarAlwaysOn];
    14861486        [scrollview setHorizontalScrollingModeLocked:YES];
    14871487    } else {
    14881488        [scrollview setHorizontalScrollingModeLocked:NO];
    1489         [scrollview setHorizontalScrollingMode:WebCoreScrollBarAuto];
     1489        [scrollview setHorizontalScrollingMode:WebCoreScrollbarAuto];
    14901490    }
    14911491}
     
    14991499{
    15001500    WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
    1501     return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScrollBarAlwaysOn;
     1501    return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScrollbarAlwaysOn;
    15021502}
    15031503
Note: See TracChangeset for help on using the changeset viewer.