[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 05c61d284d9aa44bdcf850a5b962d54015bf4520
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 8 01:38:15 2002 +0000

    factor private class out of IFWebFrame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f54cc18..2be1d1d 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -190,6 +190,7 @@
 				39446098020F50ED0ECA1767,
 				F5EBC45702134BC301CA1520,
 				F5EBC45802134BC301CA1520,
+				9CF0E24B021361B10ECA16EA,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -222,6 +223,7 @@
 				394460AA020F50ED0ECA1767,
 				F5EBC45902134BC301CA1520,
 				F5EBC45A02134BC301CA1520,
+				9CF0E24C021361B10ECA16EA,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -938,11 +940,37 @@
 				39446077020F50ED0ECA1767,
 				39446078020F50ED0ECA1767,
 				39446079020F50ED0ECA1767,
+				9CF0E249021361B00ECA16EA,
+				9CF0E24A021361B00ECA16EA,
 			);
 			isa = PBXGroup;
 			name = WebView;
 			refType = 4;
 		};
+		9CF0E249021361B00ECA16EA = {
+			isa = PBXFileReference;
+			name = IFWebFramePrivate.h;
+			path = WebView.subproj/IFWebFramePrivate.h;
+			refType = 2;
+		};
+		9CF0E24A021361B00ECA16EA = {
+			isa = PBXFileReference;
+			name = IFWebFramePrivate.mm;
+			path = WebView.subproj/IFWebFramePrivate.mm;
+			refType = 2;
+		};
+		9CF0E24B021361B10ECA16EA = {
+			fileRef = 9CF0E249021361B00ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		9CF0E24C021361B10ECA16EA = {
+			fileRef = 9CF0E24A021361B00ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 //9C0
 //9C1
 //9C2
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 1bfbc98..049e8f2 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -11,11 +11,8 @@
 
 @interface IFWebFrame : NSObject
 {
-    // FIXME:  Create private class for ivars.
-    NSString *name;
-    id view;
-    IFWebDataSource *dataSource;
-    void *renderFramePart;
+ at private
+    id _framePrivate;
 }
 
 - initWithName: (NSString *)name view: view dataSource: (IFWebDataSource *)dataSource;
@@ -30,4 +27,5 @@
 // private
 - (void)_setRenderFramePart: (void *)p;
 - (void *)_renderFramePart;
+
 @end
diff --git a/WebKit/WebView.subproj/IFWebFrame.m b/WebKit/WebView.subproj/IFWebFrame.m
index 8b27474..e06d912 100644
--- a/WebKit/WebView.subproj/IFWebFrame.m
+++ b/WebKit/WebView.subproj/IFWebFrame.m
@@ -1,85 +1,98 @@
 /*	
-        IFWebFrame.h
+        IFWebFrame.m
 	    
 	    Copyright 2001, Apple, Inc. All rights reserved.
-
-        Public header file.
 */
 #import <Cocoa/Cocoa.h>
 
 #import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebFramePrivate.h>
 #import <WebKit/IFWebDataSource.h>
 
 @implementation IFWebFrame
 
+- init
+{
+    return [self initWithName: nil view: nil dataSource: nil];
+}
+
 - initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d
 {
+    IFWebFramePrivate *data;
+
     [super init];
-    name = [n retain];
-    view = [v retain];
-    dataSource = [d retain];
-    return self;
+    
+    _framePrivate = [[IFWebFramePrivate alloc] init];
+    
+    data = (IFWebFramePrivate *)_framePrivate;
+    
+    [data setName: n];
+    [data setView: v];
+    [data setDataSource:  d];
+    
+    return self; 
 }
 
 - (void)dealloc
 {
-    [name autorelease];
-    [view autorelease];
-    [dataSource autorelease];
+    [_framePrivate release];
 }
 
 - (NSString *)name
 {
-    return name;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    return [data name];
 }
 
 
 - (void)setView: v
 {
-    if (view)
-        [view autorelease];
-    view = [v retain];
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    [data setView: v];
 }
 
 - view
 {
-    return view;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    return [data view];
 }
 
 
 - (IFWebDataSource *)dataSource
 {
-    return dataSource;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    return [data dataSource];
 }
 
 - (void)setDataSource: (IFWebDataSource *)ds
 {
-    if (dataSource == ds)
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    if ([data dataSource] == ds)
         return;
         
-    [dataSource autorelease];
-    dataSource = [ds retain];
-    [dataSource setFrame: self];
+    [data setDataSource: ds];
+    [[data dataSource] setFrame: self];
 }
 
 // Required to break retain cycle between frame and data source.
 - (void)reset
 {
-    [dataSource autorelease];
-    dataSource = nil;
-    [view autorelease];
-    view = nil;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    [data setDataSource: nil];
+    [data setView: nil];
 }
 
 // renderFramePart is a pointer to a RenderPart
 - (void)_setRenderFramePart: (void *)p
 {
-    renderFramePart = p;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    [data setRenderFramePart: p];
 }
 
 - (void *)_renderFramePart
 {
-    return renderFramePart;
+    IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+    return [data renderFramePart];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 1bfbc98..049e8f2 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -11,11 +11,8 @@
 
 @interface IFWebFrame : NSObject
 {
-    // FIXME:  Create private class for ivars.
-    NSString *name;
-    id view;
-    IFWebDataSource *dataSource;
-    void *renderFramePart;
+ at private
+    id _framePrivate;
 }
 
 - initWithName: (NSString *)name view: view dataSource: (IFWebDataSource *)dataSource;
@@ -30,4 +27,5 @@
 // private
 - (void)_setRenderFramePart: (void *)p;
 - (void *)_renderFramePart;
+
 @end

-- 
WebKit Debian packaging