[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:32:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e88a999b41bb206bdfed3ff0ca31a56a893a7563
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 2 19:43:26 2004 +0000
WebCore:
Moved the DOM extensions to their own headers
Reviewed by kocienda.
* WebCore.pbproj/project.pbxproj:
* kwq/DOM.h: include DOMExtensions.h
* kwq/DOMExtensions.h: Added.
* kwq/DOMHTML.h: moved extensions to DOMExtensions.h
* kwq/DOMHTML.mm: Renamed to match header
WebKit:
Moved the DOM extensions to their own headers
Reviewed by kocienda.
* DOM.subproj/DOM.h: changed from WebCore
* DOM.subproj/DOMHTML.h: ditto
* WebKit.pbproj/project.pbxproj: added DOMExtensions.h
* copy-webcore-files-to-webkit: copy DOMExtensions.h
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6305 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c74e99e..d6ef02d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-04-02 Chris Blumenberg <cblu at apple.com>
+
+ Moved the DOM extensions to their own headers
+
+ Reviewed by kocienda.
+
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/DOM.h: include DOMExtensions.h
+ * kwq/DOMExtensions.h: Added.
+ * kwq/DOMHTML.h: moved extensions to DOMExtensions.h
+ * kwq/DOMHTML.mm: Renamed to match header
+
2004-04-02 David Hyatt <hyatt at apple.com>
Fix for 3610662, rendering sometimes doesn't update in response to mouse events that change style.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index f923f17..cf72d39 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -531,6 +531,7 @@
9321275D0606724900B62302,
BE91FC8D06133666005E3790,
BE91FC9206133697005E3790,
+ 832556E5061DF155007B8054,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -808,9 +809,9 @@
BE9CB64E05F942CB00514D9C,
BE9CB65A05F9546800514D9C,
BEF7EEA305FF8F0D009717EE,
- 845563E606014A9800609194,
BE91FC8E06133666005E3790,
BE91FC9106133697005E3790,
+ 832556E7061DF161007B8054,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1184,25 +1185,49 @@
//702
//703
//704
-//840
-//841
-//842
-//843
-//844
- 845563E406014A9800609194 = {
+//830
+//831
+//832
+//833
+//834
+ 832556E4061DF155007B8054 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = DOMExtensions.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 832556E5061DF155007B8054 = {
+ fileRef = 832556E4061DF155007B8054;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 832556E6061DF161007B8054 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
- path = HTMLDOM.mm;
+ path = DOMHTML.mm;
refType = 4;
sourceTree = "<group>";
};
- 845563E606014A9800609194 = {
- fileRef = 845563E406014A9800609194;
+ 832556E7061DF161007B8054 = {
+ fileRef = 832556E6061DF161007B8054;
isa = PBXBuildFile;
settings = {
};
};
+//830
+//831
+//832
+//833
+//834
+//840
+//841
+//842
+//843
+//844
848A320F057E688B001A2362 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.framework;
@@ -6458,20 +6483,21 @@
F565A2700352410501A80180 = {
children = (
BE94EB6305EFFE6B0032DCB5,
+ BE94EB6505EFFE6B0032DCB5,
932127520606724900B62302,
932127550606724900B62302,
+ BE9CB65805F9546800514D9C,
932127500606724900B62302,
+ 832556E4061DF155007B8054,
9321274E0606724900B62302,
+ 832556E6061DF161007B8054,
+ BE94EB6405EFFE6B0032DCB5,
+ BE9CB64D05F942CB00514D9C,
9321274F0606724900B62302,
932127510606724900B62302,
932127530606724900B62302,
932127540606724900B62302,
- BE94EB6505EFFE6B0032DCB5,
BE16801805EDB91A00B87935,
- BE9CB65805F9546800514D9C,
- BE94EB6405EFFE6B0032DCB5,
- BE9CB64D05F942CB00514D9C,
- 845563E406014A9800609194,
);
isa = PBXGroup;
name = DOM;
diff --git a/WebCore/kwq/DOM.h b/WebCore/kwq/DOM.h
index 0f4c44a..4845b2b 100644
--- a/WebCore/kwq/DOM.h
+++ b/WebCore/kwq/DOM.h
@@ -44,3 +44,4 @@
#import "DOMTraversal.h"
#import "DOMRange.h"
#import "DOMHTML.h"
+#import "DOMExtensions.h"
diff --git a/WebCore/kwq/WebCoreKeyGenerator.h b/WebCore/kwq/DOMExtensions.h
similarity index 70%
copy from WebCore/kwq/WebCoreKeyGenerator.h
copy to WebCore/kwq/DOMExtensions.h
index 545fa95..cfc6ff3 100644
--- a/WebCore/kwq/WebCoreKeyGenerator.h
+++ b/WebCore/kwq/DOMExtensions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,12 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Foundation/Foundation.h>
+#import "DOMHTML.h"
- at interface WebCoreKeyGenerator : NSObject
-
-+ (WebCoreKeyGenerator *)sharedGenerator;
-- (NSArray *)strengthMenuItemTitles;
-- (NSString *)signedPublicKeyAndChallengeStringWithStrengthIndex:(unsigned)index challenge:(NSString *)challenge pageURL:(NSURL *)pageURL;
+ at interface DOMNode (DOMHTMLExtensions)
+- (NSString *)HTMLString; // FIXME: Should this be renamed innerHTML or outerHTML? Is this the same as innerHTML?
+ at end
+ at interface DOMElement (DOMHTMLExtensions)
+- (NSString *)innerHTML;
+- (void)setInnerHTML:(NSString *)innerHTML;
+- (NSString *)innerText;
+- (void)setInnerText:(NSString *)innerText;
+- (DOMHTMLCollection *)children;
+- (NSString *)contentEditable;
+- (void)setContentEditable:(NSString *)contentEditable;
+- (BOOL)isContentEditable;
@end
diff --git a/WebCore/kwq/DOMHTML.h b/WebCore/kwq/DOMHTML.h
index 38c76f7..b26ff0b 100644
--- a/WebCore/kwq/DOMHTML.h
+++ b/WebCore/kwq/DOMHTML.h
@@ -794,20 +794,3 @@
- (void)setWidth:(NSString *)width;
- (DOMDocument *)contentDocument;
@end
-
-// FIXME: Should these extensions be moved to another file?
-
- at interface DOMNode (DOMHTMLExtensions)
-- (NSString *)HTMLString; // FIXME: Should this be renamed innerHTML or outerHTML? Is this the same as innerHTML?
- at end
-
- at interface DOMElement (DOMHTMLExtensions)
-- (NSString *)innerHTML;
-- (void)setInnerHTML:(NSString *)innerHTML;
-- (NSString *)innerText;
-- (void)setInnerText:(NSString *)innerText;
-- (DOMHTMLCollection *)children;
-- (NSString *)contentEditable;
-- (void)setContentEditable:(NSString *)contentEditable;
-- (BOOL)isContentEditable;
- at end
diff --git a/WebCore/kwq/HTMLDOM.mm b/WebCore/kwq/DOMHTML.mm
similarity index 100%
copy from WebCore/kwq/HTMLDOM.mm
copy to WebCore/kwq/DOMHTML.mm
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d55a76c..29f29c3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-02 Chris Blumenberg <cblu at apple.com>
+
+ Moved the DOM extensions to their own headers
+
+ Reviewed by kocienda.
+
+ * DOM.subproj/DOM.h: changed from WebCore
+ * DOM.subproj/DOMHTML.h: ditto
+ * WebKit.pbproj/project.pbxproj: added DOMExtensions.h
+ * copy-webcore-files-to-webkit: copy DOMExtensions.h
+
=== Safari-135 ===
2004-04-01 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/DOM.subproj/DOM.h b/WebKit/DOM.subproj/DOM.h
index 0f4c44a..4845b2b 100644
--- a/WebKit/DOM.subproj/DOM.h
+++ b/WebKit/DOM.subproj/DOM.h
@@ -44,3 +44,4 @@
#import "DOMTraversal.h"
#import "DOMRange.h"
#import "DOMHTML.h"
+#import "DOMExtensions.h"
diff --git a/WebKit/DOM.subproj/DOMHTML.h b/WebKit/DOM.subproj/DOMHTML.h
index 38c76f7..b26ff0b 100644
--- a/WebKit/DOM.subproj/DOMHTML.h
+++ b/WebKit/DOM.subproj/DOMHTML.h
@@ -794,20 +794,3 @@
- (void)setWidth:(NSString *)width;
- (DOMDocument *)contentDocument;
@end
-
-// FIXME: Should these extensions be moved to another file?
-
- at interface DOMNode (DOMHTMLExtensions)
-- (NSString *)HTMLString; // FIXME: Should this be renamed innerHTML or outerHTML? Is this the same as innerHTML?
- at end
-
- at interface DOMElement (DOMHTMLExtensions)
-- (NSString *)innerHTML;
-- (void)setInnerHTML:(NSString *)innerHTML;
-- (NSString *)innerText;
-- (void)setInnerText:(NSString *)innerText;
-- (DOMHTMLCollection *)children;
-- (NSString *)contentEditable;
-- (void)setContentEditable:(NSString *)contentEditable;
-- (BOOL)isContentEditable;
- at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index d2198c9..259973c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -347,6 +347,7 @@
9321290D06068E3100B62302,
51C16E090613868100A1657B,
51C16E4106138EB400A1657B,
+ 83255720061DF71E007B8054,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2009,6 +2010,24 @@
refType = 0;
sourceTree = "<absolute>";
};
+ 8325571F061DF71E007B8054 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = DOMExtensions.h;
+ path = DOM.subproj/DOMExtensions.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 83255720061DF71E007B8054 = {
+ fileRef = 8325571F061DF71E007B8054;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
833987810543012D00EE146E = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -3768,6 +3787,7 @@
932128FE06068E3100B62302,
932128FF06068E3100B62302,
9321290006068E3100B62302,
+ 8325571F061DF71E007B8054,
9321290106068E3100B62302,
9321290206068E3100B62302,
9321290306068E3100B62302,
diff --git a/WebKit/copy-webcore-files-to-webkit b/WebKit/copy-webcore-files-to-webkit
index 359403b..f69ea81 100755
--- a/WebKit/copy-webcore-files-to-webkit
+++ b/WebKit/copy-webcore-files-to-webkit
@@ -17,6 +17,7 @@ my %WebCoreFiles = (
'kwq/DOMRange.h' => 'DOM.subproj/DOMRange.h',
'kwq/DOMHTML.h' => 'DOM.subproj/DOMHTML.h',
'kwq/DOM-compat.h' => 'DOM.subproj/DOM-compat.h',
+ 'kwq/DOMExtensions.h' => 'DOM.subproj/DOMExtensions.h',
);
my %JavaScriptCoreFiles = (
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list