Reviewed by Brady.
- Deprecate the rest of the old-style methods that are not generated.
- Add @property syntax to DOMRange.
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOM.mm:
(-[DOMRange setStart:offset:]):
(-[DOMRange setEnd:offset:]):
(-[DOMRange compareBoundaryPoints:sourceRange:]):
(-[DOMRange setStart::]):
(-[DOMRange setEnd::]):
(-[DOMRange compareBoundaryPoints::]):
(-[DOMDocument createNodeIterator:whatToShow:filter:expandEntityReferences:]):
(-[DOMDocument createTreeWalker:whatToShow:filter:expandEntityReferences:]):
(-[DOMDocument createNodeIterator::::]):
(-[DOMDocument createTreeWalker::::]):
* bindings/objc/DOMCSS.h:
* bindings/objc/DOMCSS.mm:
(-[DOMDocument getComputedStyle:pseudoElement:]):
(-[DOMDocument getComputedStyle::]):
(-[DOMDocument getMatchedCSSRules:pseudoElement:]):
* bindings/objc/DOMExtensions.h:
* bindings/objc/DOMHTML.h:
* bindings/objc/DOMRange.h:
* bindings/objc/DOMTraversal.h:
WebKit:
Reviewed by Brady.
Use the non-deprecated method names for getComputedStyle, setEnd and setStart.
* WebInspector/WebInspector.m:
(-[WebInspector _highlightNode:]):
* WebView/WebHTMLView.m:
(unionDOMRanges):
(-[WebHTMLView _selectRangeInMarkedText:]):
(-[WebTextCompleteController doCompletion]):
* WebView/WebView.m:
(-[WebView computedStyleForElement:pseudoElement:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16559
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-09-25 Timothy Hatcher <timothy@apple.com>
+
+ Reviewed by Brady.
+
+ - Deprecate the rest of the old-style methods that are not generated.
+ - Add @property syntax to DOMRange.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/objc/DOM.mm:
+ (-[DOMRange setStart:offset:]):
+ (-[DOMRange setEnd:offset:]):
+ (-[DOMRange compareBoundaryPoints:sourceRange:]):
+ (-[DOMRange setStart::]):
+ (-[DOMRange setEnd::]):
+ (-[DOMRange compareBoundaryPoints::]):
+ (-[DOMDocument createNodeIterator:whatToShow:filter:expandEntityReferences:]):
+ (-[DOMDocument createTreeWalker:whatToShow:filter:expandEntityReferences:]):
+ (-[DOMDocument createNodeIterator::::]):
+ (-[DOMDocument createTreeWalker::::]):
+ * bindings/objc/DOMCSS.h:
+ * bindings/objc/DOMCSS.mm:
+ (-[DOMDocument getComputedStyle:pseudoElement:]):
+ (-[DOMDocument getComputedStyle::]):
+ (-[DOMDocument getMatchedCSSRules:pseudoElement:]):
+ * bindings/objc/DOMExtensions.h:
+ * bindings/objc/DOMHTML.h:
+ * bindings/objc/DOMRange.h:
+ * bindings/objc/DOMTraversal.h:
+
2006-09-25 Eric Seidel <eric@eseidel.com>
Reviewed by mjs.
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
knownRegions = (
English,
mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
+ projectRoot = "";
+ shouldCheckCompatibility = 1;
targets = (
93F198A508245E59001E9ABC /* WebCore */,
DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
return result;
}
-- (void)setStart:(DOMNode *)refNode :(int)offset
+- (void)setStart:(DOMNode *)refNode offset:(int)offset
{
WebCore::ExceptionCode ec = 0;
[self _range]->setStart([refNode _node], offset, ec);
raiseOnDOMError(ec);
}
-- (void)setEnd:(DOMNode *)refNode :(int)offset
+- (void)setEnd:(DOMNode *)refNode offset:(int)offset
{
WebCore::ExceptionCode ec = 0;
[self _range]->setEnd([refNode _node], offset, ec);
raiseOnDOMError(ec);
}
-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange
+- (short)compareBoundaryPoints:(unsigned short)how sourceRange:(DOMRange *)sourceRange
{
WebCore::ExceptionCode ec = 0;
short result = [self _range]->compareBoundaryPoints(static_cast<WebCore::Range::CompareHow>(how), [sourceRange _range], ec);
@end
+@implementation DOMRange (DOMRangeDeprecated)
+
+- (void)setStart:(DOMNode *)refNode :(int)offset
+{
+ [self setStart:refNode offset:offset];
+}
+
+- (void)setEnd:(DOMNode *)refNode :(int)offset
+{
+ [self setEnd:refNode offset:offset];
+}
+
+- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange
+{
+ return [self compareBoundaryPoints:how sourceRange:sourceRange];
+}
+
+@end
+
@implementation DOMRange (WebCoreInternal)
- (id)_initWithRange:(WebCore::Range *)impl
// FIXME: this should be auto-genenerate in DOMDocument.mm
@implementation DOMDocument (DOMDocumentTraversal)
-- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences
{
RefPtr<WebCore::NodeFilter> cppFilter;
if (filter)
return [DOMNodeIterator _nodeIteratorWith:impl.get() filter:filter];
}
-- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences
{
RefPtr<WebCore::NodeFilter> cppFilter;
if (filter)
@end
+@implementation DOMDocument (DOMDocumentTraversalDeprecated)
+
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+{
+ return [self createNodeIterator:root whatToShow:whatToShow filter:filter expandEntityReferences:expandEntityReferences];
+}
+
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+{
+ return [self createTreeWalker:root whatToShow:whatToShow filter:filter expandEntityReferences:expandEntityReferences];
+}
+
+@end
//------------------------------------------------------------------------------------------
// ObjCEventListener
#import <WebCore/DOMRect.h>
@interface DOMDocument (DOMViewCSS)
+- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)element pseudoElement:(NSString *)pseudoElement;
+@end
+
+@interface DOMDocument (DOMViewCSSDeprecated)
+#ifndef BUILDING_ON_TIGER
+- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+#else
- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt;
+#endif
@end
@interface DOMCSSStyleDeclaration (DOMCSS2Properties)
@implementation DOMDocument (DOMViewCSS)
-- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
+- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)element pseudoElement:(NSString *)pseudoElement
{
WebCore::AbstractView* dv = [self _document]->defaultView();
if (!dv)
return nil;
- return [DOMCSSStyleDeclaration _CSSStyleDeclarationWith:WTF::getPtr(dv->getComputedStyle([elt _element], pseudoElt))];
+ return [DOMCSSStyleDeclaration _CSSStyleDeclarationWith:WTF::getPtr(dv->getComputedStyle([element _element], pseudoElement))];
+}
+
+@end
+
+@implementation DOMDocument (DOMViewCSSDeprecated)
+
+- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
+{
+ return [self getComputedStyle:elt pseudoElement:pseudoElt];
}
@end
@implementation DOMDocument (DOMDocumentCSSExtensions)
-- (DOMCSSRuleList *)getMatchedCSSRules:(DOMElement *)elt :(NSString *)pseudoElt
+- (DOMCSSRuleList *)getMatchedCSSRules:(DOMElement *)element pseudoElement:(NSString *)pseudoElement
{
WebCore::AbstractView* dv = [self _document]->defaultView();
return nil;
// The parameter of "false" is handy for the DOM inspector and lets us see user agent and user rules.
- return [DOMCSSRuleList _CSSRuleListWith:WTF::getPtr(dv->getMatchedCSSRules([elt _element], pseudoElt, false))];
+ return [DOMCSSRuleList _CSSRuleListWith:WTF::getPtr(dv->getMatchedCSSRules([element _element], pseudoElement, false))];
}
@end
@end
@interface DOMDocument (DOMDocumentCSSExtensions)
-- (DOMCSSRuleList *)getMatchedCSSRules:(DOMElement *)elt :(NSString *)pseudoElt;
+- (DOMCSSRuleList *)getMatchedCSSRules:(DOMElement *)element pseudoElement:(NSString *)pseudoElement;
@end
@interface DOMElement (DOMElementAppKitExtensions)
#import <WebCore/DOMHTMLDivElement.h>
#import <WebCore/DOMHTMLDocument.h>
#import <WebCore/DOMHTMLElement.h>
+#import <WebCore/DOMHTMLEmbedElement.h>
#import <WebCore/DOMHTMLFieldSetElement.h>
#import <WebCore/DOMHTMLFontElement.h>
#import <WebCore/DOMHTMLFormElement.h>
#import <WebCore/DOMHTMLTextAreaElement.h>
#import <WebCore/DOMHTMLTitleElement.h>
#import <WebCore/DOMHTMLUListElement.h>
-
-// was an HTML extension
-#import <WebCore/DOMHTMLEmbedElement.h>
#import <WebCore/DOMCore.h>
#import <WebCore/DOMDocument.h>
#import <WebCore/DOMObject.h>
-
#import <WebCore/DOMRangeException.h>
// DOM Range comparison codes
};
@interface DOMRange : DOMObject
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMNode *startContainer;
+@property(readonly) int startOffset;
+@property(readonly) DOMNode *endContainer;
+@property(readonly) int endOffset;
+@property(readonly) BOOL collapsed;
+@property(readonly) DOMNode *commonAncestorContainer;
+#else
- (DOMNode *)startContainer;
- (int)startOffset;
- (DOMNode *)endContainer;
- (int)endOffset;
- (BOOL)collapsed;
- (DOMNode *)commonAncestorContainer;
-- (void)setStart:(DOMNode *)refNode :(int)offset;
-- (void)setEnd:(DOMNode *)refNode :(int)offset;
+#endif
+- (void)setStart:(DOMNode *)refNode offset:(int)offset;
+- (void)setEnd:(DOMNode *)refNode offset:(int)offset;
- (void)setStartBefore:(DOMNode *)refNode;
- (void)setStartAfter:(DOMNode *)refNode;
- (void)setEndBefore:(DOMNode *)refNode;
- (void)collapse:(BOOL)toStart;
- (void)selectNode:(DOMNode *)refNode;
- (void)selectNodeContents:(DOMNode *)refNode;
-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange;
+- (short)compareBoundaryPoints:(unsigned short)how sourceRange:(DOMRange *)sourceRange;
- (void)deleteContents;
- (DOMDocumentFragment *)extractContents;
- (DOMDocumentFragment *)cloneContents;
- (NSString *)toString;
- (void)detach;
@end
+
+@interface DOMRange (DOMRangeDeprecated)
+#ifndef BUILDING_ON_TIGER
+- (void)setStart:(DOMNode *)refNode :(int)offset DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+- (void)setEnd:(DOMNode *)refNode :(int)offset DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+#else
+- (void)setStart:(DOMNode *)refNode :(int)offset;
+- (void)setEnd:(DOMNode *)refNode :(int)offset;
+- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange;
+#endif
+@end
#import <WebCore/DOMTreeWalker.h>
@interface DOMDocument (DOMDocumentTraversal)
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences;
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences;
+@end
+
+@interface DOMDocument (DOMDocumentTraversalDeprecated)
+#ifndef BUILDING_ON_TIGER
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+#else
- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
+#endif
@end
+2006-09-25 Timothy Hatcher <timothy@apple.com>
+
+ Reviewed by Brady.
+
+ Use the non-deprecated method names for getComputedStyle, setEnd and setStart.
+
+ * WebInspector/WebInspector.m:
+ (-[WebInspector _highlightNode:]):
+ * WebView/WebHTMLView.m:
+ (unionDOMRanges):
+ (-[WebHTMLView _selectRangeInMarkedText:]):
+ (-[WebTextCompleteController doCompletion]):
+ * WebView/WebView.m:
+ (-[WebView computedStyleForElement:pseudoElement:]):
+
2006-09-22 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
if (!NSIsEmptyRect(bounds)) {
NSArray *rects = nil;
if ([node isKindOfClass:[DOMElement class]]) {
- DOMCSSStyleDeclaration *style = [_private->domDocument getComputedStyle:(DOMElement *)node :@""];
+ DOMCSSStyleDeclaration *style = [_private->domDocument getComputedStyle:(DOMElement *)node pseudoElement:@""];
if ([[style getPropertyValue:@"display"] isEqualToString:@"inline"])
rects = [node lineBoxRects];
} else if ([node isKindOfClass:[DOMText class]])
{
ASSERT(a);
ASSERT(b);
- DOMRange *s = [a compareBoundaryPoints:DOM_START_TO_START :b] <= 0 ? a : b;
- DOMRange *e = [a compareBoundaryPoints:DOM_END_TO_END :b] <= 0 ? b : a;
+ DOMRange *s = [a compareBoundaryPoints:DOM_START_TO_START sourceRange:b] <= 0 ? a : b;
+ DOMRange *e = [a compareBoundaryPoints:DOM_END_TO_END sourceRange:b] <= 0 ? b : a;
DOMRange *r = [[[a startContainer] ownerDocument] createRange];
- [r setStart:[s startContainer] :[s startOffset]];
- [r setEnd:[e endContainer] :[e endOffset]];
+ [r setStart:[s startContainer] offset:[s startOffset]];
+ [r setEnd:[e endContainer] offset:[e endOffset]];
return r;
}
unsigned selectionStart = [markedTextRange startOffset] + range.location;
unsigned selectionEnd = selectionStart + range.length;
- [selectedRange setStart:[markedTextRange startContainer] :selectionStart];
- [selectedRange setEnd:[markedTextRange startContainer] :selectionEnd];
+ [selectedRange setStart:[markedTextRange startContainer] offset:selectionStart];
+ [selectedRange setEnd:[markedTextRange startContainer] offset:selectionEnd];
[bridge setSelectedDOMRange:selectedRange affinity:NSSelectionAffinityDownstream closeTyping:NO];
}
DOMRange *selection = [bridge selectedDOMRange];
DOMRange *wholeWord = [bridge rangeByAlteringCurrentSelection:WebSelectByExtending direction:WebBridgeSelectBackward granularity:WebBridgeSelectByWord];
DOMRange *prefix = [wholeWord cloneRange];
- [prefix setEnd:[selection startContainer] :[selection startOffset]];
+ [prefix setEnd:[selection startContainer] offset:[selection startOffset]];
// Reject some NOP cases
if ([prefix collapsed]) {
if (pseudoElement == nil) {
pseudoElement = @"";
}
- return [[element ownerDocument] getComputedStyle:element :pseudoElement];
+ return [[element ownerDocument] getComputedStyle:element pseudoElement:pseudoElement];
}
@end