[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:58:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f792870440b1b14538fcdf5bd4b929d0201e4a20
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 26 05:31:04 2002 +0000
Broke IFLoadProgress out into its own file, and added
an init method and getters, without which this class
is useless in Objective-C files (but strangely usable
in Objective-C++ files, see radar 2887253).
* WebView.subproj/IFWebController.h:
* WebView.subproj/IFBaseWebController.mm:
Took IFLoadProgress declaration and implementation out of here.
* WebView.subproj/IFLoadProgress.h,
* WebView.subproj/IFLoadProgress.mm:
Moved IFLoadProgress declaration and implementation to here;
added -[IFLoadProgress initWithBytesSoFar:totalToLoad:type:]
and getters for each field.
* WebKit.pbproj/project.pbxproj: Updated for new files
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b84d719..01d04ca 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2002-03-25 John Sullivan <sullivan at apple.com>
+
+ Broke IFLoadProgress out into its own file, and added
+ an init method and getters, without which this class
+ is useless in Objective-C files (but strangely usable
+ in Objective-C++ files, see radar 2887253).
+
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFBaseWebController.mm:
+ Took IFLoadProgress declaration and implementation out of here.
+
+ * WebView.subproj/IFLoadProgress.h,
+ * WebView.subproj/IFLoadProgress.mm:
+ Moved IFLoadProgress declaration and implementation to here;
+ added -[IFLoadProgress initWithBytesSoFar:totalToLoad:type:]
+ and getters for each field.
+
+ * WebKit.pbproj/project.pbxproj: Updated for new files
+
2002-03-25 Richard Williamson <rjw at apple.com>
Tweaks to force layout of frames and iframes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b84d719..01d04ca 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-03-25 John Sullivan <sullivan at apple.com>
+
+ Broke IFLoadProgress out into its own file, and added
+ an init method and getters, without which this class
+ is useless in Objective-C files (but strangely usable
+ in Objective-C++ files, see radar 2887253).
+
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFBaseWebController.mm:
+ Took IFLoadProgress declaration and implementation out of here.
+
+ * WebView.subproj/IFLoadProgress.h,
+ * WebView.subproj/IFLoadProgress.mm:
+ Moved IFLoadProgress declaration and implementation to here;
+ added -[IFLoadProgress initWithBytesSoFar:totalToLoad:type:]
+ and getters for each field.
+
+ * WebKit.pbproj/project.pbxproj: Updated for new files
+
2002-03-25 Richard Williamson <rjw at apple.com>
Tweaks to force layout of frames and iframes.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 633c169..406a873 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -197,6 +197,7 @@
F5D538EA02441F2601A80181,
F5F084BB024BDC8E01CA1520,
F5F084BF024BDCA701CA1520,
+ F58BAB3B025036CA01C1A526,
);
isa = PBXHeadersBuildPhase;
};
@@ -236,6 +237,7 @@
F5AEBB3E024A527601C1A526,
F5F084BC024BDC8E01CA1520,
F5F084C0024BDCA701CA1520,
+ F58BAB390250363E01C1A526,
);
isa = PBXSourcesBuildPhase;
};
@@ -949,6 +951,8 @@
3944606B020F50ED0ECA1767,
3944606C020F50ED0ECA1767,
3944606D020F50ED0ECA1767,
+ F58BAB3A025036CA01C1A526,
+ F58BAB380250363E01C1A526,
3944606E020F50ED0ECA1767,
F5AEBB3D024A527601C1A526,
3944606F020F50ED0ECA1767,
@@ -1063,6 +1067,30 @@
settings = {
};
};
+ F58BAB380250363E01C1A526 = {
+ isa = PBXFileReference;
+ name = IFLoadProgress.mm;
+ path = WebView.subproj/IFLoadProgress.mm;
+ refType = 4;
+ };
+ F58BAB390250363E01C1A526 = {
+ fileRef = F58BAB380250363E01C1A526;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F58BAB3A025036CA01C1A526 = {
+ isa = PBXFileReference;
+ name = IFLoadProgress.h;
+ path = WebView.subproj/IFLoadProgress.h;
+ refType = 4;
+ };
+ F58BAB3B025036CA01C1A526 = {
+ fileRef = F58BAB3A025036CA01C1A526;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5AEBB3D024A527601C1A526 = {
isa = PBXFileReference;
name = IFPreferences.mm;
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 7605ea0..a41870c 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -13,8 +13,6 @@
#import <WebKit/WebKitDebug.h>
-#include <WCLoadProgress.h>
-
// IFObjectHolder holds objects as keys in dictionaries without
// copying.
@@ -72,26 +70,6 @@
@end
- at implementation IFLoadProgress
-
-static id IFLoadProgressMake()
-{
- return [[[IFLoadProgress alloc] init] autorelease];
-}
-
-+(void) load
-{
- WCSetIFLoadProgressMakeFunc(IFLoadProgressMake);
-}
-
-- init
-{
- return [super init];
-}
-
- at end
-
-
@implementation IFBaseWebController
- init
diff --git a/WebKit/WebView.subproj/IFLoadProgress.h b/WebKit/WebView.subproj/IFLoadProgress.h
new file mode 100644
index 0000000..b19a3f4
--- /dev/null
+++ b/WebKit/WebView.subproj/IFLoadProgress.h
@@ -0,0 +1,34 @@
+/*
+ IFLoadProgress.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+
+#import <Foundation/Foundation.h>
+
+typedef enum {
+ IF_LOAD_TYPE_CSS = 1,
+ IF_LOAD_TYPE_IMAGE = 2,
+ IF_LOAD_TYPE_SCRIPT = 3,
+ IF_LOAD_TYPE_HTML = 4
+} IF_LOAD_TYPE;
+
+
+ at interface IFLoadProgress : NSObject
+{
+ int bytesSoFar; // 0 if this is the start of load
+ int totalToLoad; // -1 if this is not known.
+ // bytesSoFar == totalLoaded when complete
+ IF_LOAD_TYPE type;
+}
+
+- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total type:(IF_LOAD_TYPE)loadType;
+
+- (int)bytesSoFar;
+- (int)totalToLoad;
+- (IF_LOAD_TYPE)type;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/IFLoadProgress.mm b/WebKit/WebView.subproj/IFLoadProgress.mm
new file mode 100644
index 0000000..ca11a8f
--- /dev/null
+++ b/WebKit/WebView.subproj/IFLoadProgress.mm
@@ -0,0 +1,50 @@
+/* IFLoadProgress.mm
+
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+
+#import "IFLoadProgress.h"
+
+#include <WCLoadProgress.h>
+
+ at implementation IFLoadProgress
+
+static id IFLoadProgressMake()
+{
+ return [[[IFLoadProgress alloc] init] autorelease];
+}
+
++(void) load
+{
+ WCSetIFLoadProgressMakeFunc(IFLoadProgressMake);
+}
+
+- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total type:(IF_LOAD_TYPE)loadType
+{
+ if (![super init]) {
+ return nil;
+ }
+
+ bytesSoFar = bytes;
+ totalToLoad = total;
+ type = loadType;
+
+ return self;
+}
+
+- (int)bytesSoFar
+{
+ return bytesSoFar;
+}
+
+- (int)totalToLoad
+{
+ return totalToLoad;
+}
+
+- (IF_LOAD_TYPE)type
+{
+ return type;
+}
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 08f9a47..639dd2b 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -6,6 +6,8 @@
*/
#import <Cocoa/Cocoa.h>
+#import <WebKit/IFLoadProgress.h>
+
/*
=============================================================================
@@ -118,30 +120,6 @@
/*
=============================================================================
- A IFLoadProgress capture the state associated with a load progress
- indication. Should we use a struct?
-*/
-typedef enum {
- IF_LOAD_TYPE_CSS = 1,
- IF_LOAD_TYPE_IMAGE = 2,
- IF_LOAD_TYPE_SCRIPT = 3,
- IF_LOAD_TYPE_HTML = 4
-} IF_LOAD_TYPE;
-
-
- at interface IFLoadProgress : NSObject
-{
- int bytesSoFar; // 0 if this is the start of load
- int totalToLoad; // -1 if this is not known.
- // bytesSoFar == totalLoaded when complete
- IF_LOAD_TYPE type; // load types, either image, css, or jscript
-}
- at end
-
-
-/*
- =============================================================================
-
Implementors of this protocol will receive messages indicating
data has been received.
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 08f9a47..639dd2b 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -6,6 +6,8 @@
*/
#import <Cocoa/Cocoa.h>
+#import <WebKit/IFLoadProgress.h>
+
/*
=============================================================================
@@ -118,30 +120,6 @@
/*
=============================================================================
- A IFLoadProgress capture the state associated with a load progress
- indication. Should we use a struct?
-*/
-typedef enum {
- IF_LOAD_TYPE_CSS = 1,
- IF_LOAD_TYPE_IMAGE = 2,
- IF_LOAD_TYPE_SCRIPT = 3,
- IF_LOAD_TYPE_HTML = 4
-} IF_LOAD_TYPE;
-
-
- at interface IFLoadProgress : NSObject
-{
- int bytesSoFar; // 0 if this is the start of load
- int totalToLoad; // -1 if this is not known.
- // bytesSoFar == totalLoaded when complete
- IF_LOAD_TYPE type; // load types, either image, css, or jscript
-}
- at end
-
-
-/*
- =============================================================================
-
Implementors of this protocol will receive messages indicating
data has been received.
diff --git a/WebKit/WebView.subproj/WebLoadProgress.h b/WebKit/WebView.subproj/WebLoadProgress.h
new file mode 100644
index 0000000..b19a3f4
--- /dev/null
+++ b/WebKit/WebView.subproj/WebLoadProgress.h
@@ -0,0 +1,34 @@
+/*
+ IFLoadProgress.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+
+#import <Foundation/Foundation.h>
+
+typedef enum {
+ IF_LOAD_TYPE_CSS = 1,
+ IF_LOAD_TYPE_IMAGE = 2,
+ IF_LOAD_TYPE_SCRIPT = 3,
+ IF_LOAD_TYPE_HTML = 4
+} IF_LOAD_TYPE;
+
+
+ at interface IFLoadProgress : NSObject
+{
+ int bytesSoFar; // 0 if this is the start of load
+ int totalToLoad; // -1 if this is not known.
+ // bytesSoFar == totalLoaded when complete
+ IF_LOAD_TYPE type;
+}
+
+- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total type:(IF_LOAD_TYPE)loadType;
+
+- (int)bytesSoFar;
+- (int)totalToLoad;
+- (IF_LOAD_TYPE)type;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
new file mode 100644
index 0000000..ca11a8f
--- /dev/null
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -0,0 +1,50 @@
+/* IFLoadProgress.mm
+
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+
+#import "IFLoadProgress.h"
+
+#include <WCLoadProgress.h>
+
+ at implementation IFLoadProgress
+
+static id IFLoadProgressMake()
+{
+ return [[[IFLoadProgress alloc] init] autorelease];
+}
+
++(void) load
+{
+ WCSetIFLoadProgressMakeFunc(IFLoadProgressMake);
+}
+
+- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total type:(IF_LOAD_TYPE)loadType
+{
+ if (![super init]) {
+ return nil;
+ }
+
+ bytesSoFar = bytes;
+ totalToLoad = total;
+ type = loadType;
+
+ return self;
+}
+
+- (int)bytesSoFar
+{
+ return bytesSoFar;
+}
+
+- (int)totalToLoad
+{
+ return totalToLoad;
+}
+
+- (IF_LOAD_TYPE)type
+{
+ return type;
+}
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 08f9a47..639dd2b 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -6,6 +6,8 @@
*/
#import <Cocoa/Cocoa.h>
+#import <WebKit/IFLoadProgress.h>
+
/*
=============================================================================
@@ -118,30 +120,6 @@
/*
=============================================================================
- A IFLoadProgress capture the state associated with a load progress
- indication. Should we use a struct?
-*/
-typedef enum {
- IF_LOAD_TYPE_CSS = 1,
- IF_LOAD_TYPE_IMAGE = 2,
- IF_LOAD_TYPE_SCRIPT = 3,
- IF_LOAD_TYPE_HTML = 4
-} IF_LOAD_TYPE;
-
-
- at interface IFLoadProgress : NSObject
-{
- int bytesSoFar; // 0 if this is the start of load
- int totalToLoad; // -1 if this is not known.
- // bytesSoFar == totalLoaded when complete
- IF_LOAD_TYPE type; // load types, either image, css, or jscript
-}
- at end
-
-
-/*
- =============================================================================
-
Implementors of this protocol will receive messages indicating
data has been received.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list