Diff
Modified: tags/Safari-537.15.1/Source/WebCore/ChangeLog (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebCore/ChangeLog 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebCore/ChangeLog 2012-10-18 21:32:16 UTC (rev 131806)
@@ -1,3 +1,18 @@
+2012-10-18 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r131675.
+
+ 2012-10-17 Andy Estes <aes...@apple.com>
+
+ [WebKit2] Add removeChild: to WKDOMNode and make WKDOMText.data read/write
+ https://bugs.webkit.org/show_bug.cgi?id=99662
+
+ Reviewed by Sam Weinig.
+
+ Export needed symbols.
+
+ * WebCore.exp.in:
+
2012-10-15 Lucas Forschler <lforsch...@apple.com>
Merge r131336.
Modified: tags/Safari-537.15.1/Source/WebCore/WebCore.exp.in (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebCore/WebCore.exp.in 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebCore/WebCore.exp.in 2012-10-18 21:32:16 UTC (rev 131806)
@@ -213,6 +213,7 @@
__ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
__ZN7WebCore13AXObjectCache23focusedUIElementForPageEPKNS_4PageE
__ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
+__ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
__ZN7WebCore13HTTPHeaderMapC1Ev
__ZN7WebCore13HTTPHeaderMapD1Ev
__ZN7WebCore13HitTestResultC1ERKS0_
@@ -670,6 +671,7 @@
__ZN7WebCore4KURLC1ERKS0_RKN3WTF6StringE
__ZN7WebCore4Node10renderRectEPb
__ZN7WebCore4Node11appendChildEN3WTF10PassRefPtrIS0_EERib
+__ZN7WebCore4Node11removeChildEPS0_Ri
__ZN7WebCore4Node14removedLastRefEv
__ZN7WebCore4Node17stopIgnoringLeaksEv
__ZN7WebCore4Node18startIgnoringLeaksEv
Modified: tags/Safari-537.15.1/Source/WebKit2/ChangeLog (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebKit2/ChangeLog 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebKit2/ChangeLog 2012-10-18 21:32:16 UTC (rev 131806)
@@ -1,3 +1,21 @@
+2012-10-18 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r131675
+
+ 2012-10-17 Andy Estes <aes...@apple.com>
+
+ [WebKit2] Add removeChild: to WKDOMNode and make WKDOMText.data read/write
+ https://bugs.webkit.org/show_bug.cgi?id=99662
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMNode.h:
+ * WebProcess/InjectedBundle/API/mac/WKDOMNode.mm:
+ (-[WKDOMNode removeChild:]):
+ * WebProcess/InjectedBundle/API/mac/WKDOMText.h:
+ * WebProcess/InjectedBundle/API/mac/WKDOMText.mm:
+ (-[WKDOMText setData:]):
+
2012-10-14 Sam Weinig <s...@webkit.org>
Simplify user content in WebKit2 by using WebCore::UserStyleSheet and WebCore::UserScript directly
Modified: tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2012-10-18 21:32:16 UTC (rev 131806)
@@ -35,6 +35,7 @@
- (void)insertNode:(WKDOMNode *)node before:(WKDOMNode *)refNode;
- (void)appendChild:(WKDOMNode *)node;
+- (void)removeChild:(WKDOMNode *)node;
@property(readonly) WKDOMDocument *document;
@property(readonly) WKDOMNode *parentNode;
Modified: tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm 2012-10-18 21:32:16 UTC (rev 131806)
@@ -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());
Modified: tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h 2012-10-18 21:32:16 UTC (rev 131806)
@@ -30,7 +30,7 @@
WK_EXPORT
@interface WKDOMText : WKDOMNode
-@property(readonly) NSString *data;
+@property(nonatomic, copy) NSString *data;
@end
Modified: tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm (131805 => 131806)
--- tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm 2012-10-18 21:28:02 UTC (rev 131805)
+++ tags/Safari-537.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.mm 2012-10-18 21:32:16 UTC (rev 131806)
@@ -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__)
