[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:55:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9c85be68089018c17377bc92b3951358b53ae4a6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 6 03:11:19 2002 +0000
WebKit:
Remove old obsolete cache code from tree and build.
* Cache.subproj/NSURICache.h:
* Cache.subproj/NSURICache.m:
* Cache.subproj/NSURICacheData.h:
* Cache.subproj/NSURICacheData.m:
* Cache.subproj/NSURILoad.h:
* Cache.subproj/NSURILoad.m:
* Cache.subproj/NSURILoadReallyPrivate.h:
* Cache.subproj/_NSURICacheQueue.h:
* Cache.subproj/_NSURICacheQueue.m:
* Misc.subproj/WebKitReallyPrivate.h:
* Misc.subproj/_NSMonitor.h:
* Misc.subproj/_NSMonitor.m:
* WebKit.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@594 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6290daf..c0c58d5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-02-05 Maciej Stachowiak <mjs at apple.com>
+
+ Remove old obsolete cache code from tree and build.
+
+ * Cache.subproj/NSURICache.h:
+ * Cache.subproj/NSURICache.m:
+ * Cache.subproj/NSURICacheData.h:
+ * Cache.subproj/NSURICacheData.m:
+ * Cache.subproj/NSURILoad.h:
+ * Cache.subproj/NSURILoad.m:
+ * Cache.subproj/NSURILoadReallyPrivate.h:
+ * Cache.subproj/_NSURICacheQueue.h:
+ * Cache.subproj/_NSURICacheQueue.m:
+ * Misc.subproj/WebKitReallyPrivate.h:
+ * Misc.subproj/_NSMonitor.h:
+ * Misc.subproj/_NSMonitor.m:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-05 Richard Williamson <rjw at apple.com>
Changes to support dynamic scroll bars in frames/iframes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6290daf..c0c58d5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-02-05 Maciej Stachowiak <mjs at apple.com>
+
+ Remove old obsolete cache code from tree and build.
+
+ * Cache.subproj/NSURICache.h:
+ * Cache.subproj/NSURICache.m:
+ * Cache.subproj/NSURICacheData.h:
+ * Cache.subproj/NSURICacheData.m:
+ * Cache.subproj/NSURILoad.h:
+ * Cache.subproj/NSURILoad.m:
+ * Cache.subproj/NSURILoadReallyPrivate.h:
+ * Cache.subproj/_NSURICacheQueue.h:
+ * Cache.subproj/_NSURICacheQueue.m:
+ * Misc.subproj/WebKitReallyPrivate.h:
+ * Misc.subproj/_NSMonitor.h:
+ * Misc.subproj/_NSMonitor.m:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-05 Richard Williamson <rjw at apple.com>
Changes to support dynamic scroll bars in frames/iframes.
diff --git a/WebKit/Misc.subproj/WebKitReallyPrivate.h b/WebKit/Misc.subproj/WebKitReallyPrivate.h
index b71e315..9463084 100644
--- a/WebKit/Misc.subproj/WebKitReallyPrivate.h
+++ b/WebKit/Misc.subproj/WebKitReallyPrivate.h
@@ -2,6 +2,5 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import "_NSMonitor.h"
#import "WebKitDebug.h"
diff --git a/WebKit/Misc.subproj/_NSMonitor.h b/WebKit/Misc.subproj/_NSMonitor.h
deleted file mode 100644
index 58fe96c..0000000
--- a/WebKit/Misc.subproj/_NSMonitor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* _NSMonitor.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#include <Carbon/Carbon.h>
-
-#import <Foundation/Foundation.h>
-
-// NSMonitor ----------------------------------------------------------------
-
-#if defined(__MACH__)
-#import <mach/message.h>
-#include <pthread.h>
-#import <sys/time.h>
-#endif
-#if defined(__WIN32__)
-#include <windows.h>
-#include <process.h>
-#import <sys/utime.h>
-#endif
-
-#if defined(__MACH__)
- #define F_STRUCT_MUTEX_T pthread_mutex_t
- #define F_STRUCT_COND_T pthread_cond_t
-#else
- #define F_STRUCT_MUTEX_T CRITICAL_SECTION
- /* Due to the fact that the unblock-and-wait is not atomic in the
- condition wait, we need to be a little tricky in broadcasting.
- We make wake up a bit more than we should, but that should
- be harmless, since a condition should be being checked. */
- struct _F_wincond {
- HANDLE aevent;
- HANDLE mevent;
- };
- #define F_STRUCT_COND_T struct _F_wincond
-#endif
-
- at interface NSMonitor : NSObject <NSLocking> {
- F_STRUCT_MUTEX_T mutex;
- F_STRUCT_COND_T cond;
- int value;
-}
-
--(id)init;
--(void)wait;
--(BOOL)waitUntilDate:(NSDate *)limit;
--(BOOL)waitInterval:(NSTimeInterval)ti;
--(void)signal;
--(void)broadcast;
-
- at end
diff --git a/WebKit/Misc.subproj/_NSMonitor.m b/WebKit/Misc.subproj/_NSMonitor.m
deleted file mode 100644
index d497eec..0000000
--- a/WebKit/Misc.subproj/_NSMonitor.m
+++ /dev/null
@@ -1,140 +0,0 @@
-/* NSMonitor.m
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import "_NSMonitor.h"
-
-#if defined(__MACH__)
- // moved to .h file #define F_STRUCT_MUTEX_T pthread_mutex_t
- #define F_MUTEX_INIT(m) pthread_mutex_init(m, NULL)
- #define F_MUTEX_FINI(m) pthread_mutex_destroy(m)
- #define F_MUTEX_LOCK(m) pthread_mutex_lock(m)
- #define F_MUTEX_TRYLOCK(m) (EBUSY != pthread_mutex_trylock(m))
- #define F_MUTEX_UNLOCK(m) pthread_mutex_unlock(m)
- // moved to .h file #define F_STRUCT_COND_T pthread_cond_t
- #define F_COND_INIT(c) pthread_cond_init(c, NULL)
- #define F_COND_FINI(c) pthread_cond_destroy(c)
- #define F_CONDITION_WAIT(c, m) pthread_cond_wait(c, m)
- #define F_CONDITION_SIGNAL(c) pthread_cond_signal(c)
- #define F_CONDITION_BROADCAST(c) pthread_cond_broadcast(c)
- /* Returns 0 on timeout, 1 on regular return; t is double seconds */
- static int F_CONDITION_WAIT_TIMEOUT(F_STRUCT_COND_T *c, F_STRUCT_MUTEX_T *m, NSTimeInterval t, unsigned int *value) {
- struct timespec ts;
- int result;
- CFAbsoluteTime at = CFAbsoluteTimeGetCurrent() + t;
- ts.tv_sec = (time_t)(floor(at) + kCFAbsoluteTimeIntervalSince1970);
- ts.tv_nsec = (int32_t)((at - floor(at)) * 1000000000.0);
- result = pthread_cond_timedwait(c, m, &ts);
- if (ETIMEDOUT != result) {
- (*value)--;
- return 1;
- }
- return 0;
- }
-#else
- // moved to .h file #define F_STRUCT_MUTEX_T CRITICAL_SECTION
- #define F_MUTEX_INIT(m) InitializeCriticalSection(m)
- #define F_MUTEX_FINI(m) DeleteCriticalSection(m)
- #define F_MUTEX_LOCK(m) EnterCriticalSection(m)
- #define F_MUTEX_TRYLOCK(m) (0 != TryEnterCriticalSection(m))
- #define F_MUTEX_UNLOCK(m) (LeaveCriticalSection(m), 0)
- // moved to .h file #define F_STRUCT_COND_T struct _F_wincond
- #define F_COND_INIT(c) do { \
- (c)->aevent = CreateEvent(NULL, FALSE, FALSE, NULL); \
- (c)->mevent = CreateEvent(NULL, TRUE, FALSE, NULL); } while (0)
- #define F_COND_FINI(c) do { \
- CloseHandle((c)->aevent); CloseHandle((c)->mevent); } while (0)
- #define F_CONDITION_WAIT(c, m) do { \
- HANDLE _h_[2] = {(c)->aevent, (c)->mevent}; \
- F_MUTEX_UNLOCK(m); \
- WaitForMultipleObjects(2, _h_, FALSE, INFINITE); \
- F_MUTEX_LOCK(m); } while (0)
- #define F_CONDITION_SIGNAL(c) SetEvent((c)->aevent)
- #define F_CONDITION_BROADCAST(c) do { \
- PulseEvent((c)->mevent); SetEvent((c)->aevent);} while (0)
- /* Returns 0 on timeout, 1 on regular return; t is double seconds */
- static int F_CONDITION_WAIT_TIMEOUT(F_STRUCT_COND_T *c, F_STRUCT_MUTEX_T *m, NSTimeInterval t, unsigned int *value) {
- HANDLE _h_[2] = {(c)->aevent, (c)->mevent};
- DWORD timeout, result;
- t *= 1000.0;
- while (0.0 <= t) {
- timeout = (INT_MAX <= t) ? INT_MAX : (DWORD)t;
- F_MUTEX_UNLOCK(m);
- result = WaitForMultipleObjects(2, _h_, FALSE, timeout);
- F_MUTEX_LOCK(m);
- if (WAIT_TIMEOUT != result) {
- (*value)--;
- return 1;
- }
- t -= timeout;
- /* shave off an extra 1us to account for overhead,
- plus make loop terminate if t falls to 0.0 */
- t -= 0.001;
- }
- return 0;
- }
-#endif
-
-
- at implementation NSMonitor
-
-- init {
- F_MUTEX_INIT(&mutex);
- F_COND_INIT(&cond);
- value = 0;
- return self;
-}
-
-- (void)dealloc {
- F_MUTEX_FINI(&mutex);
- F_COND_FINI(&cond);
- [super dealloc];
-}
-
-- (void)lock {
- F_MUTEX_LOCK(&mutex);
-}
-
-- (void)unlock {
- F_MUTEX_UNLOCK(&mutex);
-}
-
-- (void)wait {
- while (value == 0) {
- F_CONDITION_WAIT(&cond, &mutex);
- }
- value--;
-}
-
-- (BOOL)waitUntilDate:(NSDate *)limit {
- NSTimeInterval ti = [limit timeIntervalSinceNow];
- return [self waitInterval:ti];
-}
-
-- (BOOL)waitInterval:(NSTimeInterval)ti {
- BOOL result;
- if (ti < 0.0) {
- result = NO;
- }
- else {
- result = F_CONDITION_WAIT_TIMEOUT(&cond, &mutex, ti, &value);
- }
- return result;
-}
-
-- (void)signal {
- value++;
- F_CONDITION_SIGNAL(&cond);
-}
-
-- (void)broadcast {
- value++;
- F_CONDITION_BROADCAST(&cond);
-}
-
-- (NSString *)description {
- return [(id)CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%s(0x%x)"), "_NSMonitor", self) autorelease];
-}
-
- at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index b8d0e0a..2d2d238 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -80,7 +80,6 @@
};
0867D691FE84028FC02AAC07 = {
children = (
- 394460AB020F75D90ECA1767,
9C7CABBB0190A37C0ECA16EA,
254DC334016E1D3F0ECA149E,
25A8176801B5474B0ECA149E,
@@ -188,12 +187,6 @@
39446096020F50ED0ECA1767,
39446097020F50ED0ECA1767,
39446098020F50ED0ECA1767,
- 394460AE020F75D90ECA1767,
- 394460B4020F77090ECA1767,
- 394460B5020F77090ECA1767,
- 394460BA020F788C0ECA1767,
- 394460BD020F792B0ECA1767,
- 394460C0020F793F0ECA1767,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@@ -224,11 +217,6 @@
394460A8020F50ED0ECA1767,
394460A9020F50ED0ECA1767,
394460AA020F50ED0ECA1767,
- 394460AF020F75D90ECA1767,
- 394460B6020F77090ECA1767,
- 394460B7020F77090ECA1767,
- 394460BB020F788C0ECA1767,
- 394460C1020F793F0ECA1767,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -348,8 +336,6 @@
25C29825016E29620ECA149E,
25A5593101A5996D0ECA149E,
25A5593201A5996D0ECA149E,
- 394460B8020F788C0ECA1767,
- 394460B9020F788C0ECA1767,
);
isa = PBXGroup;
name = Misc;
@@ -914,155 +900,6 @@
settings = {
};
};
- 394460AB020F75D90ECA1767 = {
- children = (
- 394460AC020F75D90ECA1767,
- 394460AD020F75D90ECA1767,
- 394460B0020F77090ECA1767,
- 394460B1020F77090ECA1767,
- 394460B2020F77090ECA1767,
- 394460B3020F77090ECA1767,
- 394460BC020F792B0ECA1767,
- 394460BE020F793F0ECA1767,
- 394460BF020F793F0ECA1767,
- );
- isa = PBXGroup;
- name = Cache;
- path = "";
- refType = 4;
- };
- 394460AC020F75D90ECA1767 = {
- isa = PBXFileReference;
- name = NSURICache.h;
- path = Cache.subproj/NSURICache.h;
- refType = 4;
- };
- 394460AD020F75D90ECA1767 = {
- isa = PBXFileReference;
- name = NSURICache.m;
- path = Cache.subproj/NSURICache.m;
- refType = 4;
- };
- 394460AE020F75D90ECA1767 = {
- fileRef = 394460AC020F75D90ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460AF020F75D90ECA1767 = {
- fileRef = 394460AD020F75D90ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460B0020F77090ECA1767 = {
- isa = PBXFileReference;
- name = NSURICacheData.h;
- path = Cache.subproj/NSURICacheData.h;
- refType = 4;
- };
- 394460B1020F77090ECA1767 = {
- isa = PBXFileReference;
- name = NSURICacheData.m;
- path = Cache.subproj/NSURICacheData.m;
- refType = 4;
- };
- 394460B2020F77090ECA1767 = {
- isa = PBXFileReference;
- name = NSURILoad.h;
- path = Cache.subproj/NSURILoad.h;
- refType = 4;
- };
- 394460B3020F77090ECA1767 = {
- isa = PBXFileReference;
- name = NSURILoad.m;
- path = Cache.subproj/NSURILoad.m;
- refType = 4;
- };
- 394460B4020F77090ECA1767 = {
- fileRef = 394460B0020F77090ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460B5020F77090ECA1767 = {
- fileRef = 394460B2020F77090ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460B6020F77090ECA1767 = {
- fileRef = 394460B1020F77090ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460B7020F77090ECA1767 = {
- fileRef = 394460B3020F77090ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460B8020F788C0ECA1767 = {
- isa = PBXFileReference;
- name = _NSMonitor.h;
- path = Misc.subproj/_NSMonitor.h;
- refType = 4;
- };
- 394460B9020F788C0ECA1767 = {
- isa = PBXFileReference;
- name = _NSMonitor.m;
- path = Misc.subproj/_NSMonitor.m;
- refType = 4;
- };
- 394460BA020F788C0ECA1767 = {
- fileRef = 394460B8020F788C0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460BB020F788C0ECA1767 = {
- fileRef = 394460B9020F788C0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460BC020F792B0ECA1767 = {
- isa = PBXFileReference;
- name = NSURILoadReallyPrivate.h;
- path = Cache.subproj/NSURILoadReallyPrivate.h;
- refType = 4;
- };
- 394460BD020F792B0ECA1767 = {
- fileRef = 394460BC020F792B0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460BE020F793F0ECA1767 = {
- isa = PBXFileReference;
- name = _NSURICacheQueue.h;
- path = Cache.subproj/_NSURICacheQueue.h;
- refType = 4;
- };
- 394460BF020F793F0ECA1767 = {
- isa = PBXFileReference;
- name = _NSURICacheQueue.m;
- path = Cache.subproj/_NSURICacheQueue.m;
- refType = 4;
- };
- 394460C0020F793F0ECA1767 = {
- fileRef = 394460BE020F793F0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460C1020F793F0ECA1767 = {
- fileRef = 394460BF020F793F0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
//390
//391
//392
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list