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]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8e3d6bc7d5779975d0aa1b3070a1a70fcca33c6c..1538884525cfb5bd5ffbef6d90d5d58040346fab 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2006-10-05  Adele Peterson  <adele@apple.com>
+
+        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]):
+
 2006-10-05  Vladimir Olexa  <vladimir.olexa@gmail.com>
 
         Reviewed by Timothy.

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 46c27883445801381f7cd8e8a18a17535c422972..413077d98f2cf8152923fa4ca533148c2828b3dd 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1255,7 +1255,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -1269,8 +1268,6 @@
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
-                       projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );

diff --git a/WebKit/WebView/WebDynamicScrollBarsView.h b/WebKit/WebView/WebDynamicScrollBarsView.h
index 8ed134120105336bbbadae4a9beb6c08e6ae44d3..5c2ce4d041cd99d30b61a6af571634168b05346f 100644 (file)
--- a/WebKit/WebView/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView/WebDynamicScrollBarsView.h
@@ -33,8 +33,8 @@
 
 @interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
 {
-    WebCoreScrollBarMode hScroll;
-    WebCoreScrollBarMode vScroll;
+    WebCoreScrollbarMode hScroll;
+    WebCoreScrollbarMode vScroll;
     BOOL hScrollModeLocked;
     BOOL vScrollModeLocked;
     BOOL suppressLayout;

diff --git a/WebKit/WebView/WebDynamicScrollBarsView.m b/WebKit/WebView/WebDynamicScrollBarsView.m
index 638af8ec319207a467633c356049cb3bf9af2952..9f0a435ddf0b35b3dae3d982bdd427b6c99390df 100644 (file)
--- a/WebKit/WebView/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView/WebDynamicScrollBarsView.m
@@ -69,7 +69,7 @@
         BOOL scrollsHorizontally;
 
         if (!suppressLayout && !suppressScrollers &&
-            (hScroll == WebCoreScrollBarAuto || vScroll == WebCoreScrollBarAuto))
+            (hScroll == WebCoreScrollbarAuto || vScroll == WebCoreScrollbarAuto))
         {
             // Do a layout if pending, before checking if scrollbars are needed.
             // This fixes 2969367, although may introduce a slowdown in live resize performance.
@@ -83,22 +83,22 @@
             NSSize documentSize = [documentView frame].size;
             NSSize frameSize = [self frame].size;
             
-            scrollsVertically = (vScroll == WebCoreScrollBarAlwaysOn) ||
-                (vScroll == WebCoreScrollBarAuto && documentSize.height > frameSize.height);
+            scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) ||
+                (vScroll == WebCoreScrollbarAuto && documentSize.height > frameSize.height);
             if (scrollsVertically)
-                scrollsHorizontally = (hScroll == WebCoreScrollBarAlwaysOn) ||
-                    (hScroll == WebCoreScrollBarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width);
+                scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) ||
+                    (hScroll == WebCoreScrollbarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width);
             else {
-                scrollsHorizontally = (hScroll == WebCoreScrollBarAlwaysOn) ||
-                    (hScroll == WebCoreScrollBarAuto && documentSize.width > frameSize.width);
+                scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) ||
+                    (hScroll == WebCoreScrollbarAuto && documentSize.width > frameSize.width);
                 if (scrollsHorizontally)
-                    scrollsVertically = (vScroll == WebCoreScrollBarAlwaysOn) ||
-                        (vScroll == WebCoreScrollBarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height);
+                    scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) ||
+                        (vScroll == WebCoreScrollbarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height);
             }
         }
         else {
-            scrollsHorizontally = (hScroll == WebCoreScrollBarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollBarAlwaysOn);
-            scrollsVertically = (vScroll == WebCoreScrollBarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollBarAlwaysOn);
+            scrollsHorizontally = (hScroll == WebCoreScrollbarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollbarAlwaysOn);
+            scrollsVertically = (vScroll == WebCoreScrollbarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollbarAlwaysOn);
         }
         
         if (hasVerticalScroller != scrollsVertically) {
@@ -147,15 +147,15 @@
     if (hScrollModeLocked && vScrollModeLocked)
         return;
 
-    if (flag && vScroll == WebCoreScrollBarAlwaysOff)
-        vScroll = WebCoreScrollBarAuto;
-    else if (!flag && vScroll != WebCoreScrollBarAlwaysOff)
-        vScroll = WebCoreScrollBarAlwaysOff;
+    if (flag && vScroll == WebCoreScrollbarAlwaysOff)
+        vScroll = WebCoreScrollbarAuto;
+    else if (!flag && vScroll != WebCoreScrollbarAlwaysOff)
+        vScroll = WebCoreScrollbarAlwaysOff;
 
-    if (flag && hScroll == WebCoreScrollBarAlwaysOff)
-        hScroll = WebCoreScrollBarAuto;
-    else if (!flag && hScroll != WebCoreScrollBarAlwaysOff)
-        hScroll = WebCoreScrollBarAlwaysOff;
+    if (flag && hScroll == WebCoreScrollbarAlwaysOff)
+        hScroll = WebCoreScrollbarAuto;
+    else if (!flag && hScroll != WebCoreScrollbarAlwaysOff)
+        hScroll = WebCoreScrollbarAlwaysOff;
 
     [self updateScrollers];
 }
@@ -163,17 +163,17 @@
 - (BOOL)allowsScrolling
 {
     // Returns YES if either horizontal or vertical scrolling is allowed.
-    return hScroll != WebCoreScrollBarAlwaysOff || vScroll != WebCoreScrollBarAlwaysOff;
+    return hScroll != WebCoreScrollbarAlwaysOff || vScroll != WebCoreScrollbarAlwaysOff;
 }
 
 - (void)setAllowsHorizontalScrolling:(BOOL)flag
 {
     if (hScrollModeLocked)
         return;
-    if (flag && hScroll == WebCoreScrollBarAlwaysOff)
-        hScroll = WebCoreScrollBarAuto;
-    else if (!flag && hScroll != WebCoreScrollBarAlwaysOff)
-        hScroll = WebCoreScrollBarAlwaysOff;
+    if (flag && hScroll == WebCoreScrollbarAlwaysOff)
+        hScroll = WebCoreScrollbarAuto;
+    else if (!flag && hScroll != WebCoreScrollbarAlwaysOff)
+        hScroll = WebCoreScrollbarAlwaysOff;
     [self updateScrollers];
 }
 
@@ -181,34 +181,34 @@
 {
     if (vScrollModeLocked)
         return;
-    if (flag && vScroll == WebCoreScrollBarAlwaysOff)
-        vScroll = WebCoreScrollBarAuto;
-    else if (!flag && vScroll != WebCoreScrollBarAlwaysOff)
-        vScroll = WebCoreScrollBarAlwaysOff;
+    if (flag && vScroll == WebCoreScrollbarAlwaysOff)
+        vScroll = WebCoreScrollbarAuto;
+    else if (!flag && vScroll != WebCoreScrollbarAlwaysOff)
+        vScroll = WebCoreScrollbarAlwaysOff;
     [self updateScrollers];
 }
 
 - (BOOL)allowsHorizontalScrolling
 {
-    return hScroll != WebCoreScrollBarAlwaysOff;
+    return hScroll != WebCoreScrollbarAlwaysOff;
 }
 
 - (BOOL)allowsVerticalScrolling
 {
-    return vScroll != WebCoreScrollBarAlwaysOff;
+    return vScroll != WebCoreScrollbarAlwaysOff;
 }
 
--(WebCoreScrollBarMode)horizontalScrollingMode
+-(WebCoreScrollbarMode)horizontalScrollingMode
 {
     return hScroll;
 }
 
--(WebCoreScrollBarMode)verticalScrollingMode
+-(WebCoreScrollbarMode)verticalScrollingMode
 {
     return vScroll;
 }
 
-- (void)setHorizontalScrollingMode:(WebCoreScrollBarMode)mode
+- (void)setHorizontalScrollingMode:(WebCoreScrollbarMode)mode
 {
     if (mode == hScroll || hScrollModeLocked)
         return;
@@ -216,7 +216,7 @@
     [self updateScrollers];
 }
 
-- (void)setVerticalScrollingMode:(WebCoreScrollBarMode)mode
+- (void)setVerticalScrollingMode:(WebCoreScrollbarMode)mode
 {
     if (mode == vScroll || vScrollModeLocked)
         return;
@@ -224,7 +224,7 @@
     [self updateScrollers];
 }
 
-- (void)setScrollingMode:(WebCoreScrollBarMode)mode
+- (void)setScrollingMode:(WebCoreScrollbarMode)mode
 {
     if ((mode == vScroll && mode == hScroll) || (vScrollModeLocked && hScrollModeLocked))
         return;

diff --git a/WebKit/WebView/WebView.m b/WebKit/WebView/WebView.m
index a59ce809c0e2b6d468d1fa44c2548e54b812e1df..7ebc76b3729f5365272a4a2db113431f3f48be14 100644 (file)
--- a/WebKit/WebView/WebView.m
+++ b/WebKit/WebView/WebView.m
@@ -1464,29 +1464,29 @@ static bool debugWidget = true;
 {
     WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
     if (flag) {
-        [scrollview setVerticalScrollingMode:WebCoreScrollBarAlwaysOn];
+        [scrollview setVerticalScrollingMode:WebCoreScrollbarAlwaysOn];
         [scrollview setVerticalScrollingModeLocked:YES];
     } else {
         [scrollview setVerticalScrollingModeLocked:NO];
-        [scrollview setVerticalScrollingMode:WebCoreScrollBarAuto];
+        [scrollview setVerticalScrollingMode:WebCoreScrollbarAuto];
     }
 }
 
 - (BOOL)alwaysShowVerticalScroller
 {
     WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
-    return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScrollBarAlwaysOn;
+    return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScrollbarAlwaysOn;
 }
 
 - (void)setAlwaysShowHorizontalScroller:(BOOL)flag
 {
     WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
     if (flag) {
-        [scrollview setHorizontalScrollingMode:WebCoreScrollBarAlwaysOn];
+        [scrollview setHorizontalScrollingMode:WebCoreScrollbarAlwaysOn];
         [scrollview setHorizontalScrollingModeLocked:YES];
     } else {
         [scrollview setHorizontalScrollingModeLocked:NO];
-        [scrollview setHorizontalScrollingMode:WebCoreScrollBarAuto];
+        [scrollview setHorizontalScrollingMode:WebCoreScrollbarAuto];
     }
 }
 
@@ -1498,7 +1498,7 @@ static bool debugWidget = true;
 - (BOOL)alwaysShowHorizontalScroller
 {
     WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView];
-    return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScrollBarAlwaysOn;
+    return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScrollbarAlwaysOn;
 }
 
 - (void)_setInViewSourceMode:(BOOL)flag