[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f736c062e8b32c2a9789c7da87601f5e6260cfd3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 1 21:56:36 2002 +0000

    Added files from WebBrowser`
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 96725fa..291546b 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -194,6 +194,7 @@
 				9C64424F01F7AF2D0ECA16EA,
 				9C64425001F7AF2D0ECA16EA,
 				9C13328B01FFB40A0ECA16EA,
+				9C56CE4B020B42AF0ECA16EA,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -228,6 +229,7 @@
 				9C64425401F7B1740ECA16EA,
 				9C64425601F7B4E20ECA16EA,
 				9C13328C01FFB40A0ECA16EA,
+				9C56CE4C020B42AF0ECA16EA,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -955,6 +957,33 @@
 			settings = {
 			};
 		};
+		9C56CE49020B42AF0ECA16EA = {
+			isa = PBXFileReference;
+			name = WKDynamicScrollBarsView.h;
+			path = WebView.subproj/WKDynamicScrollBarsView.h;
+			refType = 2;
+		};
+		9C56CE4A020B42AF0ECA16EA = {
+			isa = PBXFileReference;
+			name = WKDynamicScrollBarsView.m;
+			path = WebView.subproj/WKDynamicScrollBarsView.m;
+			refType = 2;
+		};
+		9C56CE4B020B42AF0ECA16EA = {
+			fileRef = 9C56CE49020B42AF0ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Private,
+				);
+			};
+		};
+		9C56CE4C020B42AF0ECA16EA = {
+			fileRef = 9C56CE4A020B42AF0ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		9C64424501F78B4B0ECA16EA = {
 			isa = PBXFileReference;
 			name = WKWebViewPrivate.mm;
@@ -1089,6 +1118,8 @@
 				9C64425501F7B4E20ECA16EA,
 				9C13328901FFB40A0ECA16EA,
 				9C13328A01FFB40A0ECA16EA,
+				9C56CE49020B42AF0ECA16EA,
+				9C56CE4A020B42AF0ECA16EA,
 			);
 			isa = PBXGroup;
 			name = WebView;
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
new file mode 100644
index 0000000..8219286
--- /dev/null
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
@@ -0,0 +1,14 @@
+//
+//  DynamicScrollBarsView.h
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+ at interface WKDynamicScrollBarsView : NSScrollView {
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
new file mode 100644
index 0000000..ca80df1
--- /dev/null
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -0,0 +1,26 @@
+//
+//  DynamicScrollBarsView.m
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebKit/WKDynamicScrollBarsView.h>
+
+ at implementation WKDynamicScrollBarsView
+
+// make the horizontal and vertical scroll bars come and go as needed
+- (void) reflectScrolledClipView: (NSClipView*)clipView
+{
+    if( clipView == [self contentView] ) {
+        BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
+        BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
+
+        [self setHasVerticalScroller: scrollsVertically];
+        [self setHasHorizontalScroller: scrollsHorizontally];
+    }
+    [super reflectScrolledClipView: clipView];
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WKDynamicScrollBarsView.h b/WebKit/WebView.subproj/WKDynamicScrollBarsView.h
new file mode 100644
index 0000000..8219286
--- /dev/null
+++ b/WebKit/WebView.subproj/WKDynamicScrollBarsView.h
@@ -0,0 +1,14 @@
+//
+//  DynamicScrollBarsView.h
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+ at interface WKDynamicScrollBarsView : NSScrollView {
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WKDynamicScrollBarsView.m b/WebKit/WebView.subproj/WKDynamicScrollBarsView.m
new file mode 100644
index 0000000..ca80df1
--- /dev/null
+++ b/WebKit/WebView.subproj/WKDynamicScrollBarsView.m
@@ -0,0 +1,26 @@
+//
+//  DynamicScrollBarsView.m
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebKit/WKDynamicScrollBarsView.h>
+
+ at implementation WKDynamicScrollBarsView
+
+// make the horizontal and vertical scroll bars come and go as needed
+- (void) reflectScrolledClipView: (NSClipView*)clipView
+{
+    if( clipView == [self contentView] ) {
+        BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
+        BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
+
+        [self setHasVerticalScroller: scrollsVertically];
+        [self setHasHorizontalScroller: scrollsHorizontally];
+    }
+    [super reflectScrolledClipView: clipView];
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
new file mode 100644
index 0000000..8219286
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -0,0 +1,14 @@
+//
+//  DynamicScrollBarsView.h
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+ at interface WKDynamicScrollBarsView : NSScrollView {
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
new file mode 100644
index 0000000..ca80df1
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -0,0 +1,26 @@
+//
+//  DynamicScrollBarsView.m
+//  WebBrowser
+//
+//  Created by John Sullivan on Tue Jan 22 2002.
+//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebKit/WKDynamicScrollBarsView.h>
+
+ at implementation WKDynamicScrollBarsView
+
+// make the horizontal and vertical scroll bars come and go as needed
+- (void) reflectScrolledClipView: (NSClipView*)clipView
+{
+    if( clipView == [self contentView] ) {
+        BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
+        BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
+
+        [self setHasVerticalScroller: scrollsVertically];
+        [self setHasHorizontalScroller: scrollsHorizontally];
+    }
+    [super reflectScrolledClipView: clipView];
+}
+
+ at end

-- 
WebKit Debian packaging