[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:47:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a63268ffe45428f3a411d0a7e30a14acfa6a19a3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 4 18:51:41 2002 +0000
Changed WebDOMNode name to WebDebugDOMNode to make room for
real node.
* Debug/DOMTree.m:
(-[DOMTreeDataSource initWithWebView:]):
(-[DOMTree itemSelected:]):
Changed WebDOMNode name to WebDebugDOMNode to make room for
real node.
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebDOMNode.h: Removed.
* WebView.subproj/WebDOMNode.m: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2245 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fe5bb7f..b6cea65 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-10-04 Richard Williamson <rjw at apple.com>
+
+ Changed WebDOMNode name to WebDebugDOMNode to make room for
+ real node.
+
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebDOMNode.h: Removed.
+ * WebView.subproj/WebDOMNode.m: Removed.
+
+2002-10-04 Richard Williamson <rjw at apple.com>
+
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-03 Richard Williamson <rjw at apple.com>
Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fe5bb7f..b6cea65 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-04 Richard Williamson <rjw at apple.com>
+
+ Changed WebDOMNode name to WebDebugDOMNode to make room for
+ real node.
+
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebDOMNode.h: Removed.
+ * WebView.subproj/WebDOMNode.m: Removed.
+
+2002-10-04 Richard Williamson <rjw at apple.com>
+
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-03 Richard Williamson <rjw at apple.com>
Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 14e7469..7fc69c5 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -4,7 +4,7 @@
.objc_class_name_WebContentPolicy
.objc_class_name_WebController
.objc_class_name_WebCoreStatistics
-.objc_class_name_WebDOMNode
+.objc_class_name_WebDebugDOMNode
.objc_class_name_WebDataSource
.objc_class_name_WebDefaultContextMenuDelegate
.objc_class_name_WebDefaultPolicyDelegate
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 9dd473f..d695772 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
- hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
@@ -237,7 +236,6 @@
9CE1F8A402A5C6F30ECA2ACD,
9CE1F8A602A5C6F30ECA2ACD,
F59668CA02AD2923018635CA,
- F5F81C3702B67C0F018635CA,
F5F81C3B02B67C26018635CA,
35081D9C02B6D4D80ACA2ACA,
35081D9E02B6D4D80ACA2ACA,
@@ -279,6 +277,7 @@
84D4BFF90348EF7600CA2ACA,
84D4BFFD0348EF9D00CA2ACA,
513D422F034CF55A00CA2ACD,
+ F57FB8C6034E180101A80180,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -337,7 +336,6 @@
9CE1F8A502A5C6F30ECA2ACD,
9CE1F8A702A5C6F30ECA2ACD,
F59668CB02AD2923018635CA,
- F5F81C3802B67C0F018635CA,
F5F81C3C02B67C26018635CA,
35081D9D02B6D4D80ACA2ACA,
35081D9F02B6D4D80ACA2ACA,
@@ -370,6 +368,7 @@
8398847D03426FB000BC5F5E,
84D4BFFA0348EF7600CA2ACA,
84D4BFFE0348EF9D00CA2ACA,
+ F57FB8C7034E180101A80180,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1988,8 +1987,6 @@
children = (
F59EAE3E0253C7EE018635CA,
F59EAE410253C8DE018635CA,
- F5F81C3502B67C0F018635CA,
- F5F81C3602B67C0F018635CA,
93AEB17D032C1735008635CE,
93AEB17E032C1735008635CE,
F53444CE02E87CBA018635CA,
@@ -1999,6 +1996,8 @@
F5F81C3A02B67C26018635CA,
F501251B0302EA04018635CE,
F501251C0302EA04018635CE,
+ F57FB8C4034E180101A80180,
+ F57FB8C5034E180101A80180,
);
isa = PBXGroup;
name = Debug;
@@ -2108,6 +2107,33 @@
settings = {
};
};
+ F57FB8C4034E180101A80180 = {
+ isa = PBXFileReference;
+ name = WebDebugDOMNode.h;
+ path = WebView.subproj/WebDebugDOMNode.h;
+ refType = 2;
+ };
+ F57FB8C5034E180101A80180 = {
+ isa = PBXFileReference;
+ name = WebDebugDOMNode.m;
+ path = WebView.subproj/WebDebugDOMNode.m;
+ refType = 2;
+ };
+ F57FB8C6034E180101A80180 = {
+ fileRef = F57FB8C4034E180101A80180;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ F57FB8C7034E180101A80180 = {
+ fileRef = F57FB8C5034E180101A80180;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5883BDE025E5C6A01000102 = {
isa = PBXFileReference;
name = nullplugin.tiff;
@@ -2799,35 +2825,6 @@
settings = {
};
};
- F5F81C3502B67C0F018635CA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = WebDOMNode.h;
- path = ../WebView.subproj/WebDOMNode.h;
- refType = 4;
- };
- F5F81C3602B67C0F018635CA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = WebDOMNode.m;
- path = ../WebView.subproj/WebDOMNode.m;
- refType = 4;
- };
- F5F81C3702B67C0F018635CA = {
- fileRef = F5F81C3502B67C0F018635CA;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Private,
- );
- };
- };
- F5F81C3802B67C0F018635CA = {
- fileRef = F5F81C3602B67C0F018635CA;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5F81C3902B67C26018635CA = {
fileEncoding = 30;
isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebDOMNode.h b/WebKit/WebView.subproj/WebDOMNode.h
deleted file mode 100644
index 37ed2e9..0000000
--- a/WebKit/WebView.subproj/WebDOMNode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// WebDOMNode.h
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at class WebView;
-
- at interface WebDOMNode : NSObject
-{
- NSArray *children;
- NSString *name;
- NSString *value;
- NSString *source;
-}
-
-- initWithWebView:(WebView *)view;
-
-- (NSArray *)children;
-- (NSString *)name;
-- (NSString *)value;
-- (NSString *)source;
-
- at end
diff --git a/WebKit/WebView.subproj/WebDOMNode.m b/WebKit/WebView.subproj/WebDOMNode.m
deleted file mode 100644
index 7e15450..0000000
--- a/WebKit/WebView.subproj/WebDOMNode.m
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// WebDOMNode.m
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "WebDOMNode.h"
-
-#import <WebKit/WebView.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebHTMLViewPrivate.h>
-
- at interface WebKitDOMTreeCopier : NSObject <WebCoreDOMTreeCopier>
- at end
-
- at implementation WebDOMNode
-
-- initWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
-{
- [super init];
-
- children = [c copy];
- name = [n copy];
- value = [v copy];
- source = [s copy];
-
- return self;
-}
-
-- initWithWebView:(WebView *)view
-{
- WebKitDOMTreeCopier *copier;
-
- [self dealloc];
-
- if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
- return nil;
- }
-
- copier = [[WebKitDOMTreeCopier alloc] init];
- WebHTMLView *htmlView = (WebHTMLView *)[view documentView];
- self = [[[htmlView _bridge] copyDOMTree:copier] retain];
- [copier release];
-
- return self;
-}
-
-- (void)dealloc
-{
- [children release];
- [name release];
- [value release];
- [source release];
-
- [super dealloc];
-}
-
-- (NSArray *)children
-{
- return children;
-}
-
-- (NSString *)name
-{
- return name;
-}
-
-- (NSString *)value
-{
- return value;
-}
-
-- (NSString *)source
-{
- return source;
-}
-
- at end
-
- at implementation WebKitDOMTreeCopier
-
-- (NSObject *)nodeWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
-{
- return [[[WebDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
-}
-
- at end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list