diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebKit/mac/DOM | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebKit/mac/DOM')
-rw-r--r-- | Source/WebKit/mac/DOM/WebDOMOperations.h | 111 | ||||
-rw-r--r-- | Source/WebKit/mac/DOM/WebDOMOperations.mm | 204 | ||||
-rw-r--r-- | Source/WebKit/mac/DOM/WebDOMOperationsInternal.h | 33 | ||||
-rw-r--r-- | Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h | 44 |
4 files changed, 392 insertions, 0 deletions
diff --git a/Source/WebKit/mac/DOM/WebDOMOperations.h b/Source/WebKit/mac/DOM/WebDOMOperations.h new file mode 100644 index 0000000..606dd19 --- /dev/null +++ b/Source/WebKit/mac/DOM/WebDOMOperations.h @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2004, 2005 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 + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import <WebKit/DOMCore.h> +#import <WebKit/DOMHTML.h> +#import <WebKit/DOMRange.h> + +@class WebArchive; +@class WebFrame; + +@interface DOMNode (WebDOMNodeOperations) + +/*! + @method webArchive + @result A WebArchive representing the node and the children of the node. +*/ +- (WebArchive *)webArchive; + +@end + +@interface DOMDocument (WebDOMDocumentOperations) + +/*! + @method webFrame + @abstract Returns the frame of the DOM document. +*/ +- (WebFrame *)webFrame; + +/*! + @method URLWithAttributeString: + @abstract Constructs a URL given an attribute string. + @discussion This method constructs a URL given an attribute string just as WebKit does. + An attribute string is the value of an attribute of an element such as the href attribute on + the DOMHTMLAnchorElement class. This method is only applicable to attributes that refer to URLs. +*/ +- (NSURL *)URLWithAttributeString:(NSString *)string; + +@end + +@interface DOMRange (WebDOMRangeOperations) + +/*! + @method webArchive + @result A WebArchive representing the range. +*/ +- (WebArchive *)webArchive; + +/*! + @method markupString + @result A markup string representing the range. +*/ +- (NSString *)markupString; + +@end + +@interface DOMHTMLFrameElement (WebDOMHTMLFrameElementOperations) + +/*! + @method contentFrame + @abstract Returns the content frame of the element. +*/ +- (WebFrame *)contentFrame; + +@end + +@interface DOMHTMLIFrameElement (WebDOMHTMLIFrameElementOperations) + +/*! + @method contentFrame + @abstract Returns the content frame of the element. +*/ +- (WebFrame *)contentFrame; + +@end + +@interface DOMHTMLObjectElement (WebDOMHTMLObjectElementOperations) + +/*! + @method contentFrame + @abstract Returns the content frame of the element. + @discussion Returns non-nil only if the object represents a child frame + such as if the data of the object is HTML content. +*/ +- (WebFrame *)contentFrame; + +@end diff --git a/Source/WebKit/mac/DOM/WebDOMOperations.mm b/Source/WebKit/mac/DOM/WebDOMOperations.mm new file mode 100644 index 0000000..5e09308 --- /dev/null +++ b/Source/WebKit/mac/DOM/WebDOMOperations.mm @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import "WebDOMOperationsPrivate.h" + +#import "DOMDocumentInternal.h" +#import "DOMElementInternal.h" +#import "DOMNodeInternal.h" +#import "DOMRangeInternal.h" +#import "WebArchiveInternal.h" +#import "WebDataSourcePrivate.h" +#import "WebFrameInternal.h" +#import "WebFramePrivate.h" +#import "WebKitNSStringExtras.h" +#import <JavaScriptCore/APICast.h> +#import <WebCore/Document.h> +#import <WebCore/HTMLParserIdioms.h> +#import <WebCore/JSElement.h> +#import <WebCore/LegacyWebArchive.h> +#import <WebCore/markup.h> +#import <WebCore/RenderTreeAsText.h> +#import <WebKit/DOMExtensions.h> +#import <WebKit/DOMHTML.h> +#import <runtime/JSLock.h> +#import <runtime/JSValue.h> +#import <wtf/Assertions.h> + +using namespace WebCore; +using namespace JSC; + +@implementation DOMElement (WebDOMElementOperationsPrivate) + ++ (DOMElement *)_DOMElementFromJSContext:(JSContextRef)context value:(JSValueRef)value +{ + if (!context) + return 0; + + if (!value) + return 0; + + JSLock lock(SilenceAssertionsOnly); + return kit(toElement(toJS(toJS(context), value))); +} + +- (NSString *)_markerTextForListItem +{ + return WebCore::markerTextForListItem(core(self)); +} + +@end + +@implementation DOMNode (WebDOMNodeOperations) + +- (WebArchive *)webArchive +{ + return [[[WebArchive alloc] _initWithCoreLegacyWebArchive:LegacyWebArchive::create(core(self))] autorelease]; +} + +@end + +@implementation DOMNode (WebDOMNodeOperationsPendingPublic) + +- (NSString *)markupString +{ + return createFullMarkup(core(self)); +} + +- (NSRect)_renderRect:(bool *)isReplaced +{ + return NSRect(core(self)->renderRect(isReplaced)); +} + +@end + +/* This doesn't appear to be used by anyone. We should consider removing this. */ +@implementation DOMNode (WebDOMNodeOperationsInternal) + +- (NSArray *)_subresourceURLs +{ + ListHashSet<KURL> urls; + core(self)->getSubresourceURLs(urls); + if (!urls.size()) + return nil; + + NSMutableArray *array = [NSMutableArray arrayWithCapacity:urls.size()]; + ListHashSet<KURL>::iterator end = urls.end(); + for (ListHashSet<KURL>::iterator it = urls.begin(); it != end; ++it) + [array addObject:(NSURL *)*it]; + + return array; +} + +@end + +@implementation DOMDocument (WebDOMDocumentOperations) + +- (WebFrame *)webFrame +{ + Frame* frame = core(self)->frame(); + if (!frame) + return nil; + return kit(frame); +} + +- (NSURL *)URLWithAttributeString:(NSString *)string +{ + return core(self)->completeURL(stripLeadingAndTrailingHTMLSpaces(string)); +} + +@end + +@implementation DOMDocument (WebDOMDocumentOperationsInternal) + +- (DOMRange *)_documentRange +{ + DOMRange *range = [self createRange]; + + if (DOMNode* documentElement = [self documentElement]) + [range selectNode:documentElement]; + + return range; +} + +@end + +@implementation DOMDocument (WebDOMDocumentOperationsPrivate) + +- (NSArray *)_focusableNodes +{ + Vector<RefPtr<Node> > nodes; + core(self)->getFocusableNodes(nodes); + NSMutableArray *array = [NSMutableArray arrayWithCapacity:nodes.size()]; + for (unsigned i = 0; i < nodes.size(); ++i) + [array addObject:kit(nodes[i].get())]; + return array; +} + +@end + +@implementation DOMRange (WebDOMRangeOperations) + +- (WebArchive *)webArchive +{ + return [[[WebArchive alloc] _initWithCoreLegacyWebArchive:LegacyWebArchive::create(core(self))] autorelease]; +} + +- (NSString *)markupString +{ + return createFullMarkup(core(self)); +} + +@end + +@implementation DOMHTMLFrameElement (WebDOMHTMLFrameElementOperations) + +- (WebFrame *)contentFrame +{ + return [[self contentDocument] webFrame]; +} + +@end + +@implementation DOMHTMLIFrameElement (WebDOMHTMLIFrameElementOperations) + +- (WebFrame *)contentFrame +{ + return [[self contentDocument] webFrame]; +} + +@end + +@implementation DOMHTMLObjectElement (WebDOMHTMLObjectElementOperations) + +- (WebFrame *)contentFrame +{ + return [[self contentDocument] webFrame]; +} + +@end diff --git a/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h b/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h new file mode 100644 index 0000000..c86817d --- /dev/null +++ b/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import <WebKit/WebDOMOperations.h> + +@interface DOMDocument (WebDOMDocumentOperationsInternal) +- (DOMRange *)_documentRange; +@end diff --git a/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h b/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h new file mode 100644 index 0000000..1c22e82 --- /dev/null +++ b/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2005, 2008, 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import <WebKit/WebDOMOperations.h> +#import <JavaScriptCore/JSBase.h> + +@interface DOMElement (WebDOMElementOperationsPrivate) ++ (DOMElement *)_DOMElementFromJSContext:(JSContextRef)context value:(JSValueRef)value; +- (NSString *)_markerTextForListItem; +@end + +@interface DOMDocument (WebDOMDocumentOperationsPrivate) +- (NSArray *)_focusableNodes; +@end + +@interface DOMNode (WebDOMNodeOperationsPendingPublic) +- (NSString *)markupString; +- (NSRect)_renderRect:(bool *)isReplaced; +@end |