[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 08:29:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 81c81a7c687178499c91e065a243823e2550100b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 16 19:55:07 2004 +0000
WebCore:
Reviewed by Ken.
- a little more DOM cleanup
* kwq/DOM-CSS.mm: Added DOMCSSUnknownRule.
* kwq/DOM.mm: Split category implementations out to match category interfaces.
* kwq/DOMHTML.h: Removed lowSrc, not in DOM Level 2. Added a category for some
extensions we'll want on DOMElement.
* kwq/DOMInternal.h: Moved _documentImpl method here so it can be used from
separate categories.
* kwq/DOMRange.h: Changed DOMDocumentRange to a category from a protocol.
* kwq/HTMLDOM.mm: Removed unneeded methods.
* WebCore.pbproj/project.pbxproj: Sort DOM header files alphabetically.
WebKit:
* DOM.subproj/DOMHTML.h: Updated from WebCore.
* DOM.subproj/DOMRange.h: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6232 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2fb664b..28d0f4a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,23 @@
Reviewed by Ken.
+ - a little more DOM cleanup
+
+ * kwq/DOM-CSS.mm: Added DOMCSSUnknownRule.
+ * kwq/DOM.mm: Split category implementations out to match category interfaces.
+ * kwq/DOMHTML.h: Removed lowSrc, not in DOM Level 2. Added a category for some
+ extensions we'll want on DOMElement.
+ * kwq/DOMInternal.h: Moved _documentImpl method here so it can be used from
+ separate categories.
+ * kwq/DOMRange.h: Changed DOMDocumentRange to a category from a protocol.
+ * kwq/HTMLDOM.mm: Removed unneeded methods.
+
+ * WebCore.pbproj/project.pbxproj: Sort DOM header files alphabetically.
+
+2004-03-16 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
- update for new DOM namespacing and header organization
* WebCore.pbproj/project.pbxproj:
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index fe30aaa..363561e 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -6442,14 +6442,14 @@
F565A2700352410501A80180 = {
children = (
BE94EB6305EFFE6B0032DCB5,
+ 932127520606724900B62302,
+ 932127550606724900B62302,
+ 932127500606724900B62302,
9321274E0606724900B62302,
9321274F0606724900B62302,
- 932127500606724900B62302,
932127510606724900B62302,
- 932127520606724900B62302,
932127530606724900B62302,
932127540606724900B62302,
- 932127550606724900B62302,
BE94EB6505EFFE6B0032DCB5,
BE16801805EDB91A00B87935,
BE9CB65805F9546800514D9C,
diff --git a/WebCore/kwq/DOM-CSS.mm b/WebCore/kwq/DOM-CSS.mm
index e7a9265..ed61440 100644
--- a/WebCore/kwq/DOM-CSS.mm
+++ b/WebCore/kwq/DOM-CSS.mm
@@ -678,6 +678,13 @@ static inline int getPropertyID(NSString *string)
@end
//------------------------------------------------------------------------------------------
+// DOMCSSUnknownRule
+
+ at implementation DOMCSSUnknownRule
+
+ at end
+
+//------------------------------------------------------------------------------------------
// DOMCSSStyleDeclaration
@implementation DOMCSSStyleDeclaration
diff --git a/WebCore/kwq/DOM.mm b/WebCore/kwq/DOM.mm
index e08cb63..2f6b7fd 100644
--- a/WebCore/kwq/DOM.mm
+++ b/WebCore/kwq/DOM.mm
@@ -86,6 +86,7 @@ using DOM::TextImpl;
@interface DOMImplementation (WebCoreInternal)
+ (DOMImplementation *)_DOMImplementationWithImpl:(DOMImplementationImpl *)impl;
+- (DOMImplementationImpl *)_DOMImplementationImpl;
@end
@interface DOMNamedNodeMap (WebCoreInternal)
@@ -335,6 +336,10 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return Node([self _nodeImpl]).hasAttributes();
}
+ at end
+
+ at implementation DOMNode (DOMExtensions)
+
- (NSString *)HTMLString
{
return [self _nodeImpl]->recursive_toHTML(true).getNSString();
@@ -630,11 +635,6 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
[super dealloc];
}
-- (DOMImplementationImpl *)_DOMImplementationImpl
-{
- return reinterpret_cast<DOMImplementationImpl *>(_internal);
-}
-
- (BOOL)hasFeature:(NSString *)feature :(NSString *)version
{
ASSERT(feature);
@@ -667,6 +667,10 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return static_cast<DOMDocument *>([DOMNode _nodeWithImpl:impl]);
}
+ at end
+
+ at implementation DOMImplementation (DOMImplementationCSS)
+
- (DOMCSSStyleSheet *)createCSSStyleSheet:(NSString *)title :(NSString *)media
{
ASSERT(title);
@@ -708,6 +712,11 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return [[[self alloc] _initWithDOMImplementationImpl:impl] autorelease];
}
+- (DOMImplementationImpl *)_DOMImplementationImpl
+{
+ return reinterpret_cast<DOMImplementationImpl *>(_internal);
+}
+
@end
//------------------------------------------------------------------------------------------
@@ -731,11 +740,6 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
@implementation DOMDocument
-- (DocumentImpl *)_documentImpl
-{
- return static_cast<DocumentImpl *>(reinterpret_cast<NodeImpl *>(_internal));
-}
-
- (DOMDocumentType *)doctype
{
return static_cast<DOMDocumentType *>([DOMNode _nodeWithImpl:[self _documentImpl]->doctype()]);
@@ -879,11 +883,19 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return static_cast<DOMElement *>([DOMNode _nodeWithImpl:[self _documentImpl]->getElementById(elementId)]);
}
+ at end
+
+ at implementation DOMDocument (DOMDocumentRange)
+
- (DOMRange *)createRange
{
return [DOMRange _rangeWithImpl:[self _documentImpl]->createRange()];
}
+ at end
+
+ at implementation DOMDocument (DOMDocumentCSS)
+
- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
{
ElementImpl *elementImpl = [elt _elementImpl];
@@ -898,6 +910,10 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return [self getComputedStyle:elt :pseudoElt];
}
+ at end
+
+ at implementation DOMDocument (DOMDocumentStyle)
+
- (DOMStyleSheetList *)styleSheets
{
return [DOMStyleSheetList _styleSheetListWithImpl:[self _documentImpl]->styleSheets()];
@@ -912,6 +928,11 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return static_cast<DOMDocument *>([DOMNode _nodeWithImpl:impl]);
}
+- (DocumentImpl *)_documentImpl
+{
+ return static_cast<DocumentImpl *>(reinterpret_cast<NodeImpl *>(_internal));
+}
+
@end
//------------------------------------------------------------------------------------------
@@ -1235,6 +1256,10 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
return element.hasAttributeNS(namespaceURI, localName);
}
+ at end
+
+ at implementation DOMElement (DOMElementCSS)
+
- (DOMCSSStyleDeclaration *)style
{
ElementImpl *impl = [self _elementImpl];
diff --git a/WebCore/kwq/DOMHTML.h b/WebCore/kwq/DOMHTML.h
index edbb6f9..a0e7462 100644
--- a/WebCore/kwq/DOMHTML.h
+++ b/WebCore/kwq/DOMHTML.h
@@ -479,10 +479,6 @@
@end
@interface DOMHTMLImageElement : DOMHTMLElement
-// xxx
-- (NSString *)lowSrc;
-- (void)setLowSrc:(NSString *)lowSrc;
-
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)align;
@@ -800,7 +796,19 @@
- (DOMDocument *)contentDocument;
@end
-// FIXME: Should this move to another file?
+// FIXME: Should these extensions be moved to another file?
+
@interface DOMNode (DOMHTMLExtensions)
-- (NSString *)HTMLString; // FIXME: Should this be renamed innerHTML or outerHTML?
+- (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/DOMInternal.h b/WebCore/kwq/DOMInternal.h
index ca16349..dc68951 100644
--- a/WebCore/kwq/DOMInternal.h
+++ b/WebCore/kwq/DOMInternal.h
@@ -52,6 +52,7 @@ namespace DOM {
@interface DOMDocument (WebCoreInternal)
+ (DOMDocument *)_documentWithImpl:(DOM::DocumentImpl *)impl;
+- (DOM::DocumentImpl *)_documentImpl;
@end
@interface DOMRange (WebCoreInternal)
diff --git a/WebCore/kwq/DOMRange.h b/WebCore/kwq/DOMRange.h
index 0bbb41e..1d7668a 100644
--- a/WebCore/kwq/DOMRange.h
+++ b/WebCore/kwq/DOMRange.h
@@ -85,6 +85,6 @@ enum {
- (void)detach;
@end
- at protocol DOMDocumentRange
+ at interface DOMDocument (DOMDocumentRange)
- (DOMRange *)createRange;
@end
diff --git a/WebCore/kwq/HTMLDOM.mm b/WebCore/kwq/HTMLDOM.mm
index 895fdaa..e7e44e5 100644
--- a/WebCore/kwq/HTMLDOM.mm
+++ b/WebCore/kwq/HTMLDOM.mm
@@ -948,11 +948,6 @@ using DOM::NodeImpl;
return 0;
}
-- (void)setIndex:(long)index
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (BOOL)disabled
{
ASSERT_WITH_MESSAGE(0, "not implemented");
@@ -2016,17 +2011,6 @@ using DOM::NodeImpl;
@implementation DOMHTMLImageElement
-- (NSString *)lowSrc
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
- return nil;
-}
-
-- (void)setLowSrc:(NSString *)lowSrc
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (NSString *)name
{
ASSERT_WITH_MESSAGE(0, "not implemented");
@@ -3091,33 +3075,18 @@ using DOM::NodeImpl;
return 0;
}
-- (void)setRowIndex:(long)rowIndex
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (long)sectionRowIndex
{
ASSERT_WITH_MESSAGE(0, "not implemented");
return 0;
}
-- (void)setSectionRowIndex:(long)sectionRowIndex
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (DOMHTMLCollection *)cells
{
ASSERT_WITH_MESSAGE(0, "not implemented");
return nil;
}
-- (void)setCells:(DOMHTMLCollection *)cells // Is cells really read/write?
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (NSString *)align
{
ASSERT_WITH_MESSAGE(0, "not implemented");
@@ -3194,11 +3163,6 @@ using DOM::NodeImpl;
return 0;
}
-- (void)setCellIndex:(long)cellIndex
-{
- ASSERT_WITH_MESSAGE(0, "not implemented");
-}
-
- (NSString *)abbr
{
ASSERT_WITH_MESSAGE(0, "not implemented");
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index be1b19c..73c863d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
2004-03-16 Darin Adler <darin at apple.com>
+ * DOM.subproj/DOMHTML.h: Updated from WebCore.
+ * DOM.subproj/DOMRange.h: Ditto.
+
+2004-03-16 Darin Adler <darin at apple.com>
+
Reviewed by Ken.
- update for new DOM namespacing and header organization
diff --git a/WebKit/DOM.subproj/DOMHTML.h b/WebKit/DOM.subproj/DOMHTML.h
index edbb6f9..a0e7462 100644
--- a/WebKit/DOM.subproj/DOMHTML.h
+++ b/WebKit/DOM.subproj/DOMHTML.h
@@ -479,10 +479,6 @@
@end
@interface DOMHTMLImageElement : DOMHTMLElement
-// xxx
-- (NSString *)lowSrc;
-- (void)setLowSrc:(NSString *)lowSrc;
-
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)align;
@@ -800,7 +796,19 @@
- (DOMDocument *)contentDocument;
@end
-// FIXME: Should this move to another file?
+// FIXME: Should these extensions be moved to another file?
+
@interface DOMNode (DOMHTMLExtensions)
-- (NSString *)HTMLString; // FIXME: Should this be renamed innerHTML or outerHTML?
+- (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/WebKit/DOM.subproj/DOMRange.h b/WebKit/DOM.subproj/DOMRange.h
index 0bbb41e..1d7668a 100644
--- a/WebKit/DOM.subproj/DOMRange.h
+++ b/WebKit/DOM.subproj/DOMRange.h
@@ -85,6 +85,6 @@ enum {
- (void)detach;
@end
- at protocol DOMDocumentRange
+ at interface DOMDocument (DOMDocumentRange)
- (DOMRange *)createRange;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list