diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
| commit | ee4c86d1990a9e26277a6948e7027ad8d525ebfa (patch) | |
| tree | 1e2d3408cd097606571f40ab63353c27bcb7dd5c /Source/WebKit2/WebProcess/InjectedBundle/API | |
| parent | d882bec96d0d30aeeda2141bfadfca7f038ee862 (diff) | |
| download | qtwebkit-ee4c86d1990a9e26277a6948e7027ad8d525ebfa.tar.gz | |
Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718)
New snapshot that includes the return of -fkeep-memory at link time
to reduce memory pressure as well as modularized documentation
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/API')
4 files changed, 16 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h index c0e03937c..40a8f9c90 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h @@ -35,6 +35,7 @@ WK_EXPORT - (void)insertNode:(WKDOMNode *)node before:(WKDOMNode *)refNode; - (void)appendChild:(WKDOMNode *)node; +- (void)removeChild:(WKDOMNode *)node; @property(readonly) WKDOMDocument *document; @property(readonly) WKDOMNode *parentNode; diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm index 4308ff3ab..a3296bfc0 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm +++ b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm @@ -65,6 +65,13 @@ _impl->appendChild(WebKit::toWebCoreNode(node), ec); } +- (void)removeChild:(WKDOMNode *)node +{ + // FIXME: Do something about the exception. + WebCore::ExceptionCode ec; + _impl->removeChild(WebKit::toWebCoreNode(node), ec); +} + - (WKDOMDocument *)document { return WebKit::toWKDOMDocument(_impl->document()); diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h index eb8552e3f..7a97b5e2f 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h @@ -30,7 +30,7 @@ WK_EXPORT @interface WKDOMText : WKDOMNode -@property(readonly) NSString *data; +@property(nonatomic, copy) NSString *data; @end diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm index 4f4f627ab..9bcd7b4c4 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm +++ b/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm @@ -38,6 +38,13 @@ return WebCore::toText(_impl.get())->data(); } +- (void)setData:(NSString *)data +{ + // FIXME: Do something about the exception. + WebCore::ExceptionCode ec; + WebCore::toText(_impl.get())->setData(data, ec); +} + @end #endif // defined(__LP64__) && defined(__clang__) |