[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d82aea47abeaef176973e587f51f0dbf03833474
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 14 23:48:09 2003 +0000
Tests:
Reviewed by Chris
Fixed one straggling test I missed earlier when
changing name from WebMonitor to NSURLMonitor
* WebFoundation-CacheLoader/NeverExpiresTest.m:
WebFoundation:
Reviewed by Chris
Cut way down on WebSystemBits. Kept only two thread-priority
functions. The WebSystemBits header is no longer privately exported.
* Misc.subproj/WebSystemBits.h:
* Misc.subproj/WebSystemBits.m:
(WebGetThreadPriority):
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Chris
WebKitSystemBits files that contain a system memory size
getter. This function is used in a few of places in WebKit.
* History.subproj/WebBackForwardList.m:
* Misc.subproj/WebKitSystemBits.h: Added.
* Misc.subproj/WebKitSystemBits.m: Added.
(initCapabilities):
(WebSystemMainMemory):
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebTextRendererFactory.m:
* WebKit.pbproj/project.pbxproj:
WebBrowser:
Reviewed by Chris
Removed dependency on WebFoundation/WebSystemBits.h.
Moved one function that was used into this file. This
function, JaguarSUJagGreenOrLater(), has been tweaked
to be more specialized for the one question it needs
to answer.
* FormCompletionController.m:
(GetRandomBytes):
(generatePassword):
* LocationChangeError.m:
(JaguarSUJagGreenOrLater):
(-[LocationChangeHandler specializedMessageForError:dataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index da02735..a1ecd4a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,21 @@
2003-05-14 Ken Kocienda <kocienda at apple.com>
+ Reviewed by Chris
+
+ WebKitSystemBits files that contain a system memory size
+ getter. This function is used in a few of places in WebKit.
+
+ * History.subproj/WebBackForwardList.m:
+ * Misc.subproj/WebKitSystemBits.h: Added.
+ * Misc.subproj/WebKitSystemBits.m: Added.
+ (initCapabilities):
+ (WebSystemMainMemory):
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebTextRendererFactory.m:
+ * WebKit.pbproj/project.pbxproj:
+
+2003-05-14 Ken Kocienda <kocienda at apple.com>
+
Reviewed by David
File and class renaming in WebFoundation:
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 831618b..931c5a5 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -2,13 +2,12 @@
WebBackForwardList.m
Copyright 2001, 2002, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebAssertions.h>
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebPreferencesPrivate.h>
-
-#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebSystemBits.h>
+#import <WebKit/WebKitSystemBits.h>
#define COMPUTE_DEFAULT_PAGE_CACHE_SIZE UINT_MAX
diff --git a/WebKit/Misc.subproj/WebKitSystemBits.h b/WebKit/Misc.subproj/WebKitSystemBits.h
new file mode 100644
index 0000000..d743b48
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitSystemBits.h
@@ -0,0 +1,8 @@
+/*
+ WebKitSystemBits.h
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+vm_size_t WebSystemMainMemory(void);
\ No newline at end of file
diff --git a/WebKit/Misc.subproj/WebKitSystemBits.m b/WebKit/Misc.subproj/WebKitSystemBits.m
new file mode 100644
index 0000000..7982937
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitSystemBits.m
@@ -0,0 +1,37 @@
+/*
+ WebKitSystemBits.m
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebKitSystemBits.h>
+
+#import <WebKit/WebAssertions.h>
+
+#include <mach/mach.h>
+#include <mach/host_info.h>
+#include <mach/mach_error.h>
+
+static host_basic_info_data_t gHostBasicInfo;
+static pthread_once_t initControl = PTHREAD_ONCE_INIT;
+
+static void initCapabilities()
+{
+ mach_msg_type_number_t count;
+ kern_return_t r;
+ mach_port_t host;
+
+ /* Discover our CPU type */
+ host = mach_host_self();
+ count = HOST_BASIC_INFO_COUNT;
+ r = host_info(host, HOST_BASIC_INFO, (host_info_t) &gHostBasicInfo, &count);
+ mach_port_deallocate(mach_task_self(), host);
+ if (r != KERN_SUCCESS) {
+ ERROR("%s : host_info(%d) : %s.\n", __FUNCTION__, r, mach_error_string(r));
+ }
+}
+
+vm_size_t WebSystemMainMemory(void)
+{
+ pthread_once(&initControl, initCapabilities);
+ return gHostBasicInfo.memory_size;
+}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 2681102..b14cae2 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -5,6 +5,7 @@
#import <WebKit/WebBridge.h>
+#import <WebKit/WebAssertions.h>
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebBasePluginPackage.h>
@@ -23,6 +24,7 @@
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitStatisticsPrivate.h>
+#import <WebKit/WebKitSystemBits.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebNullPluginView.h>
@@ -38,8 +40,6 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebKit/WebAssertions.h>
-
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -47,7 +47,6 @@
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebSystemBits.h>
#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebKit/WebLocalizableStrings.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 65924f8..f366ef0 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -3,13 +3,12 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebAssertions.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitSystemBits.h>
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextRenderer.h>
-#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebSystemBits.h>
-
#import <CoreGraphics/CoreGraphicsPrivate.h>
#import <CoreGraphics/CGFontLCDSupport.h>
#import <CoreGraphics/CGFontCache.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index acff374..baa676a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -294,6 +294,7 @@
6578F5E0045F817400000128,
BEE18F940472A0CF00CA289C,
BEE18F9B0472B73200CA289C,
+ BEE52D4C0473032500CA289C,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -407,6 +408,7 @@
6578F5E1045F817400000128,
BEE18F950472A0CF00CA289C,
BEE18F9C0472B73200CA289C,
+ BEE52D4D0473032500CA289C,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -487,6 +489,8 @@
7082F56F038EADAA00A80180,
7082F570038EADAA00A80180,
F5C283730284676D018635CA,
+ BEE52D4A0473032500CA289C,
+ BEE52D4B0473032500CA289C,
BEE18F990472B73200CA289C,
BEE18F9A0472B73200CA289C,
9345DDB20365FFD0008635CE,
@@ -2427,6 +2431,30 @@
settings = {
};
};
+ BEE52D4A0473032500CA289C = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebKitSystemBits.h;
+ refType = 4;
+ };
+ BEE52D4B0473032500CA289C = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebKitSystemBits.m;
+ refType = 4;
+ };
+ BEE52D4C0473032500CA289C = {
+ fileRef = BEE52D4A0473032500CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ BEE52D4D0473032500CA289C = {
+ fileRef = BEE52D4B0473032500CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//BE0
//BE1
//BE2
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list