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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b60f5892e7c5c99b65e38f764a1388dacd1b42ff
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 12 16:12:31 2002 +0000

            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m: Remove private _flags
    	and _attributes accessors, now that Ken added public versions.
            * WebView.subproj/WebFrame.m:
            (-[WebFrame reload:]): Remove sole use thereof.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 15b6ce9..0b0d7ee 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-12  Maciej Stachowiak  <mjs at apple.com>
+
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m: Remove private _flags
+	and _attributes accessors, now that Ken added public versions.
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame reload:]): Remove sole use thereof.
+
 === Alexander-17 ===
 
 2002-08-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 15b6ce9..0b0d7ee 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-12  Maciej Stachowiak  <mjs at apple.com>
+
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m: Remove private _flags
+	and _attributes accessors, now that Ken added public versions.
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame reload:]): Remove sole use thereof.
+
 === Alexander-17 ===
 
 2002-08-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 11e124c..8efe18f 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -121,7 +121,4 @@
 - (void)_makeRepresentation;
 - (void)_receivedData:(NSData *)data;
 
-- (int)_flags;
-- (NSDictionary *)_attributes;
-
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6c408c9..82de2b1 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -495,15 +495,4 @@
     return _private->mainHandle;
 }
 
-- (int)_flags
-{
-    return _private->flags;
-}
-
-- (NSDictionary *)_attributes
-{
-    return _private->attributes;
-}
-
-
 @end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 32ba32e..55141cb 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -201,9 +201,9 @@
 	return;
     }
 
-    flags = [dataSource _flags] | WebResourceHandleFlagLoadFromOrigin;
+    flags = [dataSource flags] | WebResourceHandleFlagLoadFromOrigin;
 
-    WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:[dataSource originalURL] attributes:[dataSource _attributes] flags:flags];
+    WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:[dataSource originalURL] attributes:[dataSource attributes] flags:flags];
     [newDataSource _setParent:[dataSource parent]];
     if ([self setProvisionalDataSource:newDataSource]) {
 	[self _setLoadType:WebFrameLoadTypeRefresh];

-- 
WebKit Debian packaging