[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:25:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c10e49bfa53ded03716dc94a134a822aa185c805
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 19 18:02:01 2002 +0000
WebCore:
* khtml/css/makeprop: Fail if we don't find gperf.
* khtml/misc/makeattrs: Fail if we don't find gperf.
* khtml/misc/maketags: Fail if we don't find gperf.
WebKit:
Added some stats that we can use to sniff out "leak the world" problems.
* Misc.subproj/WebKitStatistics.h: Added.
* Misc.subproj/WebKitStatistics.m: Added.
* Misc.subproj/WebKitStatisticsPrivate.h: Added.
* WebKit.pbproj/project.pbxproj: Added new files.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge init]): Bump count.
(-[WebBridge dealloc]): Decrement count.
* WebView.subproj/WebController.m:
(-[WebController initWithView:provisionalDataSource:]): Bump count.
(-[WebController dealloc]): Decrement count.
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithURL:attributes:flags:): Bump count.
(-[WebDataSource dealloc]): Decrement count.
* WebView.subproj/WebFrame.m:
(-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Bump count.
(-[WebFrame dealloc]): Decrement count.
* WebView.subproj/WebView.m:
(-[WebView initWithFrame:]): Bump count.
(-[WebView dealloc]): Decrement count.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1598 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 487355e..50c7979 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ * khtml/css/makeprop: Fail if we don't find gperf.
+ * khtml/misc/makeattrs: Fail if we don't find gperf.
+ * khtml/misc/maketags: Fail if we don't find gperf.
+
2002-07-19 Maciej Stachowiak <mjs at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 487355e..50c7979 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ * khtml/css/makeprop: Fail if we don't find gperf.
+ * khtml/misc/makeattrs: Fail if we don't find gperf.
+ * khtml/misc/maketags: Fail if we don't find gperf.
+
2002-07-19 Maciej Stachowiak <mjs at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 487355e..50c7979 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ * khtml/css/makeprop: Fail if we don't find gperf.
+ * khtml/misc/makeattrs: Fail if we don't find gperf.
+ * khtml/misc/maketags: Fail if we don't find gperf.
+
2002-07-19 Maciej Stachowiak <mjs at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/khtml/css/makeprop b/WebCore/khtml/css/makeprop
index 0c11195..64940c0 100644
--- a/WebCore/khtml/css/makeprop
+++ b/WebCore/khtml/css/makeprop
@@ -36,7 +36,7 @@ print ""; \
print "#define CSS_PROP_MAX CSS_PROP_Z_INDEX"; \
print "#define CSS_PROP_TOTAL " i \
}' >> cssproperties.h
-gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c
+gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1
echo -e '#endif\n' >> cssproperties.h
cat cssproperties.strip | awk '{ \
diff --git a/WebCore/khtml/misc/makeattrs b/WebCore/khtml/misc/makeattrs
index 49d187f..75d7eee 100644
--- a/WebCore/khtml/misc/makeattrs
+++ b/WebCore/khtml/misc/makeattrs
@@ -62,7 +62,8 @@ print header "DOMString getAttrName(unsigned short id);\n";
print header "\n#endif\n";
close header;
-system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -s 2 htmlattrs.gperf > htmlattrs.c");
+my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -s 2 htmlattrs.gperf > htmlattrs.c");
+exit $result if $result;
system("/bin/sh", "-c", 'perl -pi -e "s/\"\"}/\"\", 0}/g" htmlattrs.c');
open(OUT, ">>htmlattrs.c");
diff --git a/WebCore/khtml/misc/maketags b/WebCore/khtml/misc/maketags
index c66c404..f7bd6cc 100644
--- a/WebCore/khtml/misc/maketags
+++ b/WebCore/khtml/misc/maketags
@@ -65,7 +65,8 @@ close out;
print header "\n#endif\n";
close header;
-system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag htmltags.gperf > htmltags.c");
+my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag htmltags.gperf > htmltags.c");
+exit $result if $result;
open(OUT, ">>htmltags.c");
print OUT "\n\nstatic const char * const tagList[] = {\n";
@@ -85,5 +86,3 @@ print OUT "DOMString getTagName(unsigned short id)\n{\n";
print OUT " if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;\n";
print OUT " return DOMString(tagList[id]);\n";
print OUT "};\n";
-
-
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6e75d02..e8a6cc8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ Added some stats that we can use to sniff out "leak the world" problems.
+
+ * Misc.subproj/WebKitStatistics.h: Added.
+ * Misc.subproj/WebKitStatistics.m: Added.
+ * Misc.subproj/WebKitStatisticsPrivate.h: Added.
+
+ * WebKit.pbproj/project.pbxproj: Added new files.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge init]): Bump count.
+ (-[WebBridge dealloc]): Decrement count.
+ * WebView.subproj/WebController.m:
+ (-[WebController initWithView:provisionalDataSource:]): Bump count.
+ (-[WebController dealloc]): Decrement count.
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithURL:attributes:flags:): Bump count.
+ (-[WebDataSource dealloc]): Decrement count.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Bump count.
+ (-[WebFrame dealloc]): Decrement count.
+ * WebView.subproj/WebView.m:
+ (-[WebView initWithFrame:]): Bump count.
+ (-[WebView dealloc]): Decrement count.
+
2002-07-19 Maciej Stachowiak <mjs at apple.com>
More refactoring: Use assertions to make sure a provisional data
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6e75d02..e8a6cc8 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,29 @@
+2002-07-19 Darin Adler <darin at apple.com>
+
+ Added some stats that we can use to sniff out "leak the world" problems.
+
+ * Misc.subproj/WebKitStatistics.h: Added.
+ * Misc.subproj/WebKitStatistics.m: Added.
+ * Misc.subproj/WebKitStatisticsPrivate.h: Added.
+
+ * WebKit.pbproj/project.pbxproj: Added new files.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge init]): Bump count.
+ (-[WebBridge dealloc]): Decrement count.
+ * WebView.subproj/WebController.m:
+ (-[WebController initWithView:provisionalDataSource:]): Bump count.
+ (-[WebController dealloc]): Decrement count.
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithURL:attributes:flags:): Bump count.
+ (-[WebDataSource dealloc]): Decrement count.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Bump count.
+ (-[WebFrame dealloc]): Decrement count.
+ * WebView.subproj/WebView.m:
+ (-[WebView initWithFrame:]): Bump count.
+ (-[WebView dealloc]): Decrement count.
+
2002-07-19 Maciej Stachowiak <mjs at apple.com>
More refactoring: Use assertions to make sure a provisional data
diff --git a/WebKit/Misc.subproj/WebKitStatistics.h b/WebKit/Misc.subproj/WebKitStatistics.h
new file mode 100644
index 0000000..e76e646
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitStatistics.h
@@ -0,0 +1,23 @@
+//
+// WebKitStatistics.h
+// WebKit
+//
+// Created by Darin Adler on Fri Jul 19 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+ at interface WebKitStatistics : NSObject
+{
+}
+
++ (int)controllerCount;
+
++ (int)frameCount;
++ (int)dataSourceCount;
++ (int)viewCount;
+
++ (int)bridgeCount;
+
+ at end
diff --git a/WebKit/Misc.subproj/WebKitStatistics.m b/WebKit/Misc.subproj/WebKitStatistics.m
new file mode 100644
index 0000000..da2a5c1
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitStatistics.m
@@ -0,0 +1,46 @@
+//
+// WebKitStatistics.m
+// WebKit
+//
+// Created by Darin Adler on Fri Jul 19 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import "WebKitStatistics.h"
+
+#import "WebKitStatisticsPrivate.h"
+
+int WebBridgeCount;
+int WebControllerCount;
+int WebDataSourceCount;
+int WebFrameCount;
+int WebViewCount;
+
+ at implementation WebKitStatistics
+
++ (int)controllerCount
+{
+ return WebControllerCount;
+}
+
++ (int)frameCount
+{
+ return WebFrameCount;
+}
+
++ (int)dataSourceCount
+{
+ return WebDataSourceCount;
+}
+
++ (int)viewCount
+{
+ return WebViewCount;
+}
+
++ (int)bridgeCount
+{
+ return WebBridgeCount;
+}
+
+ at end
diff --git a/WebKit/Misc.subproj/WebKitStatisticsPrivate.h b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
new file mode 100644
index 0000000..14902d2
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
@@ -0,0 +1,14 @@
+/*
+ * WebKitStatisticsPrivate.h
+ * WebKit
+ *
+ * Created by Darin Adler on Fri Jul 19 2002.
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+extern int WebBridgeCount;
+extern int WebControllerCount;
+extern int WebDataSourceCount;
+extern int WebFrameCount;
+extern int WebViewCount;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 0031d56..06a61c9 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -14,7 +14,7 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebLoadProgress.h>
-
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebResourceHandle.h>
@@ -25,6 +25,20 @@
@implementation WebBridge
+- init
+{
+ ++WebBridgeCount;
+
+ return [super init];
+}
+
+- (void)dealloc
+{
+ --WebBridgeCount;
+
+ [super dealloc];
+}
+
- (WebCoreFrameBridge *)frame
{
return [[dataSource webFrame] _frameBridge];
@@ -211,7 +225,6 @@
}
}
-
- (BOOL)modifierTrackingEnabled
{
return [WebHTMLView _modifierTrackingEnabled];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 982e4da..0003c39 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -260,6 +260,8 @@
F5927D4B02D253C401CA2DBB,
F5927D4F02D26C5E01CA2DBB,
F508472402DED36E01257167,
+ F53444D002E87CBA018635CA,
+ F53444D302E87D4B018635CA,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -338,6 +340,7 @@
F5A7B11C02BC8413018635CA,
F5488CF702CB04EE01FF6274,
F508472502DED36E01257167,
+ F53444D102E87CBA018635CA,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1469,6 +1472,9 @@
F59EAE410253C8DE018635CA,
F5F81C3502B67C0F018635CA,
F5F81C3602B67C0F018635CA,
+ F53444CE02E87CBA018635CA,
+ F53444D202E87D4B018635CA,
+ F53444CF02E87CBA018635CA,
F5F81C3902B67C26018635CA,
F5F81C3A02B67C26018635CA,
);
@@ -1477,6 +1483,42 @@
path = "";
refType = 4;
};
+ F53444CE02E87CBA018635CA = {
+ isa = PBXFileReference;
+ name = WebKitStatistics.h;
+ path = Misc.subproj/WebKitStatistics.h;
+ refType = 4;
+ };
+ F53444CF02E87CBA018635CA = {
+ isa = PBXFileReference;
+ name = WebKitStatistics.m;
+ path = Misc.subproj/WebKitStatistics.m;
+ refType = 4;
+ };
+ F53444D002E87CBA018635CA = {
+ fileRef = F53444CE02E87CBA018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F53444D102E87CBA018635CA = {
+ fileRef = F53444CF02E87CBA018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F53444D202E87D4B018635CA = {
+ isa = PBXFileReference;
+ name = WebKitStatisticsPrivate.h;
+ path = Misc.subproj/WebKitStatisticsPrivate.h;
+ refType = 4;
+ };
+ F53444D302E87D4B018635CA = {
+ fileRef = F53444D202E87D4B018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5488CF402CB04EE01FF6274 = {
isa = PBXFileReference;
name = WebCookieAdapter.h;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index f255d94..ec13c69 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -3,11 +3,12 @@
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebController.h>
+
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebException.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -16,6 +17,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyHandler.h>
#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
@@ -34,11 +36,15 @@
_private = [[WebControllerPrivate alloc] init];
_private->mainFrame = [[WebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
+ ++WebControllerCount;
+
return self;
}
- (void)dealloc
{
+ --WebControllerCount;
+
[_private release];
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index bdf438f..d75a618 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -14,6 +14,7 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebView.h>
#import <WebKit/WebKitDebug.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebFileTypeMappings.h>
@@ -33,16 +34,26 @@
-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
{
- [super init];
+ self = [super init];
+ if (!self) {
+ return nil;
+ }
+
_private = [[WebDataSourcePrivate alloc] init];
_private->inputURL = [theURL retain];
_private->mainHandle = [[WebResourceHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
+
+ ++WebDataSourceCount;
+
return self;
}
- (void)dealloc
{
+ --WebDataSourceCount;
+
[_private release];
+
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index e810931..2da615e 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -16,9 +16,7 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebLocationChangeHandler.h>
-
-#import <WebFoundation/WebFoundation.h>
-
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitDebug.h>
@implementation WebFrame
@@ -73,11 +71,15 @@
if (v)
[self setWebView: v];
+ ++WebFrameCount;
+
return self;
}
- (void)dealloc
{
+ --WebFrameCount;
+
[_private release];
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 4937b15..6cbbfaf 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -19,6 +19,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
#import <WebKit/WebCookieAdapter.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -71,13 +72,18 @@ enum {
@"NSURLPboardType", @"NSStringPboardType", nil] retain];
[self registerForDraggedTypes:_private->draggingTypes];
+ ++WebViewCount;
+
return self;
}
- (void)dealloc
{
+ --WebViewCount;
+
[_private release];
+
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index f255d94..ec13c69 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -3,11 +3,12 @@
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebController.h>
+
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebException.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -16,6 +17,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyHandler.h>
#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
@@ -34,11 +36,15 @@
_private = [[WebControllerPrivate alloc] init];
_private->mainFrame = [[WebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
+ ++WebControllerCount;
+
return self;
}
- (void)dealloc
{
+ --WebControllerCount;
+
[_private release];
[super dealloc];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list