<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204129] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204129">204129</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-04 12:13:30 -0700 (Thu, 04 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the deprecated Objective-C binding methods
https://bugs.webkit.org/show_bug.cgi?id=160558
Reviewed by Tim Horton.
Put the deprecated methods in their respective category @implementation, and
simply have them call their non-deprecated counterparts.
* bindings/objc/DOMCSSMediaRule.mm:
(-[DOMCSSMediaRule deleteRule:]):
(-[DOMCSSMediaRule insertRule::]):
* bindings/objc/DOMCSSPrimitiveValue.mm:
(-[DOMCSSPrimitiveValue setFloatValue::]):
(-[DOMCSSPrimitiveValue setStringValue::]):
* bindings/objc/DOMCSSStyleDeclaration.mm:
(-[DOMCSSStyleDeclaration setProperty:::]):
* bindings/objc/DOMCSSStyleSheet.mm:
(-[DOMCSSStyleSheet insertRule::]):
* bindings/objc/DOMCharacterData.mm:
(-[DOMCharacterData deleteData:length:]):
(-[DOMCharacterData replaceData:length:data:]):
(-[DOMCharacterData remove]):
(-[DOMCharacterData substringData::]):
(-[DOMCharacterData insertData::]):
(-[DOMCharacterData deleteData::]):
(-[DOMCharacterData replaceData:::]):
* bindings/objc/DOMDocument.mm:
(-[DOMDocument createProcessingInstruction::]):
(-[DOMDocument importNode::]):
(-[DOMDocument createElementNS::]):
(-[DOMDocument createAttributeNS::]):
(-[DOMDocument getElementsByTagNameNS::]):
(-[DOMDocument createNodeIterator::::]):
(-[DOMDocument createTreeWalker::::]):
(-[DOMDocument getOverrideStyle::]):
(-[DOMDocument createExpression::]):
(-[DOMDocument evaluate:::::]):
(-[DOMDocument getComputedStyle::]):
* bindings/objc/DOMElement.mm:
(-[DOMElement setAttribute::]):
(-[DOMElement getAttributeNS::]):
(-[DOMElement setAttributeNS:::]):
(-[DOMElement removeAttributeNS::]):
(-[DOMElement getElementsByTagNameNS::]):
(-[DOMElement getAttributeNodeNS::]):
(-[DOMElement hasAttributeNS::]):
* bindings/objc/DOMEvent.mm:
(-[DOMEvent stopImmediatePropagation]):
(-[DOMEvent initEvent:::]):
* bindings/objc/DOMHTMLSelectElement.mm:
(-[DOMHTMLSelectElement remove:]):
(-[DOMHTMLSelectElement add::]):
* bindings/objc/DOMMouseEvent.mm:
(-[DOMMouseEvent initMouseEvent:::::::::::::::]):
* bindings/objc/DOMMutationEvent.mm:
(-[DOMMutationEvent initMutationEvent::::::::]):
* bindings/objc/DOMNamedNodeMap.mm:
(-[DOMNamedNodeMap getNamedItemNS::]):
(-[DOMNamedNodeMap removeNamedItemNS::]):
* bindings/objc/DOMNode.mm:
(-[DOMNode insertBefore::]):
(-[DOMNode replaceChild::]):
(-[DOMNode isSupported::]):
* bindings/objc/DOMRange.mm:
(-[DOMRange setStart::]):
(-[DOMRange setEnd::]):
(-[DOMRange compareBoundaryPoints::]):
* bindings/objc/DOMUIEvent.mm:
(-[DOMUIEvent initUIEvent:::::]):
* bindings/objc/DOMXPathExpression.mm:
(-[DOMXPathExpression evaluate:::]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSMediaRulemm">trunk/Source/WebCore/bindings/objc/DOMCSSMediaRule.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSPrimitiveValuemm">trunk/Source/WebCore/bindings/objc/DOMCSSPrimitiveValue.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSStyleDeclarationmm">trunk/Source/WebCore/bindings/objc/DOMCSSStyleDeclaration.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSStyleSheetmm">trunk/Source/WebCore/bindings/objc/DOMCSSStyleSheet.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCharacterDatamm">trunk/Source/WebCore/bindings/objc/DOMCharacterData.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMDocumentmm">trunk/Source/WebCore/bindings/objc/DOMDocument.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMElementmm">trunk/Source/WebCore/bindings/objc/DOMElement.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMEventmm">trunk/Source/WebCore/bindings/objc/DOMEvent.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMHTMLSelectElementmm">trunk/Source/WebCore/bindings/objc/DOMHTMLSelectElement.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMMouseEventmm">trunk/Source/WebCore/bindings/objc/DOMMouseEvent.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMMutationEventmm">trunk/Source/WebCore/bindings/objc/DOMMutationEvent.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMNamedNodeMapmm">trunk/Source/WebCore/bindings/objc/DOMNamedNodeMap.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMNodemm">trunk/Source/WebCore/bindings/objc/DOMNode.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMRangemm">trunk/Source/WebCore/bindings/objc/DOMRange.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMUIEventmm">trunk/Source/WebCore/bindings/objc/DOMUIEvent.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMXPathExpressionmm">trunk/Source/WebCore/bindings/objc/DOMXPathExpression.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/ChangeLog 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -1,3 +1,77 @@
</span><ins>+2016-08-04 Anders Carlsson <andersca@apple.com>
+
+ Clean up the deprecated Objective-C binding methods
+ https://bugs.webkit.org/show_bug.cgi?id=160558
+
+ Reviewed by Tim Horton.
+
+ Put the deprecated methods in their respective category @implementation, and
+ simply have them call their non-deprecated counterparts.
+
+ * bindings/objc/DOMCSSMediaRule.mm:
+ (-[DOMCSSMediaRule deleteRule:]):
+ (-[DOMCSSMediaRule insertRule::]):
+ * bindings/objc/DOMCSSPrimitiveValue.mm:
+ (-[DOMCSSPrimitiveValue setFloatValue::]):
+ (-[DOMCSSPrimitiveValue setStringValue::]):
+ * bindings/objc/DOMCSSStyleDeclaration.mm:
+ (-[DOMCSSStyleDeclaration setProperty:::]):
+ * bindings/objc/DOMCSSStyleSheet.mm:
+ (-[DOMCSSStyleSheet insertRule::]):
+ * bindings/objc/DOMCharacterData.mm:
+ (-[DOMCharacterData deleteData:length:]):
+ (-[DOMCharacterData replaceData:length:data:]):
+ (-[DOMCharacterData remove]):
+ (-[DOMCharacterData substringData::]):
+ (-[DOMCharacterData insertData::]):
+ (-[DOMCharacterData deleteData::]):
+ (-[DOMCharacterData replaceData:::]):
+ * bindings/objc/DOMDocument.mm:
+ (-[DOMDocument createProcessingInstruction::]):
+ (-[DOMDocument importNode::]):
+ (-[DOMDocument createElementNS::]):
+ (-[DOMDocument createAttributeNS::]):
+ (-[DOMDocument getElementsByTagNameNS::]):
+ (-[DOMDocument createNodeIterator::::]):
+ (-[DOMDocument createTreeWalker::::]):
+ (-[DOMDocument getOverrideStyle::]):
+ (-[DOMDocument createExpression::]):
+ (-[DOMDocument evaluate:::::]):
+ (-[DOMDocument getComputedStyle::]):
+ * bindings/objc/DOMElement.mm:
+ (-[DOMElement setAttribute::]):
+ (-[DOMElement getAttributeNS::]):
+ (-[DOMElement setAttributeNS:::]):
+ (-[DOMElement removeAttributeNS::]):
+ (-[DOMElement getElementsByTagNameNS::]):
+ (-[DOMElement getAttributeNodeNS::]):
+ (-[DOMElement hasAttributeNS::]):
+ * bindings/objc/DOMEvent.mm:
+ (-[DOMEvent stopImmediatePropagation]):
+ (-[DOMEvent initEvent:::]):
+ * bindings/objc/DOMHTMLSelectElement.mm:
+ (-[DOMHTMLSelectElement remove:]):
+ (-[DOMHTMLSelectElement add::]):
+ * bindings/objc/DOMMouseEvent.mm:
+ (-[DOMMouseEvent initMouseEvent:::::::::::::::]):
+ * bindings/objc/DOMMutationEvent.mm:
+ (-[DOMMutationEvent initMutationEvent::::::::]):
+ * bindings/objc/DOMNamedNodeMap.mm:
+ (-[DOMNamedNodeMap getNamedItemNS::]):
+ (-[DOMNamedNodeMap removeNamedItemNS::]):
+ * bindings/objc/DOMNode.mm:
+ (-[DOMNode insertBefore::]):
+ (-[DOMNode replaceChild::]):
+ (-[DOMNode isSupported::]):
+ * bindings/objc/DOMRange.mm:
+ (-[DOMRange setStart::]):
+ (-[DOMRange setEnd::]):
+ (-[DOMRange compareBoundaryPoints::]):
+ * bindings/objc/DOMUIEvent.mm:
+ (-[DOMUIEvent initUIEvent:::::]):
+ * bindings/objc/DOMXPathExpression.mm:
+ (-[DOMXPathExpression evaluate:::]):
+
</ins><span class="cx"> 2016-08-04 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Temporary redirected m3u8 streaming stopped working.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSMediaRulemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSSMediaRule.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSSMediaRule.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMCSSMediaRule.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -65,21 +65,21 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (unsigned)insertRule:(NSString *)rule :(unsigned)index
</del><ins>+- (void)deleteRule:(unsigned)index
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- unsigned result = IMPL->insertRule(rule, index, ec);
</del><ins>+ IMPL->deleteRule(index, ec);
</ins><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><del>- return result;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)deleteRule:(unsigned)index
</del><ins>+@end
+
+@implementation DOMCSSMediaRule (DOMCSSMediaRuleDeprecated)
+
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->deleteRule(index, ec);
- WebCore::raiseOnDOMError(ec);
</del><ins>+ return [self insertRule:rule index:index];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSPrimitiveValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSSPrimitiveValue.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSSPrimitiveValue.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMCSSPrimitiveValue.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -60,14 +60,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setFloatValue:(unsigned short)unitType :(float)floatValue
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->setFloatValue(unitType, floatValue, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (float)getFloatValue:(unsigned short)unitType
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -85,14 +77,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setStringValue:(unsigned short)stringType :(NSString *)stringValue
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->setStringValue(stringType, stringValue, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (NSString *)getStringValue
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -131,6 +115,20 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMCSSPrimitiveValue (DOMCSSPrimitiveValueDeprecated)
+
+- (void)setFloatValue:(unsigned short)unitType :(float)floatValue
+{
+ [self setFloatValue:unitType floatValue:floatValue];
+}
+
+- (void)setStringValue:(unsigned short)stringType :(NSString *)stringValue
+{
+ [self setStringValue:stringType stringValue:stringValue];
+}
+
+@end
+
</ins><span class="cx"> DOMCSSPrimitiveValue *kit(WebCore::CSSPrimitiveValue* value)
</span><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSStyleDeclarationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSSStyleDeclaration.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSSStyleDeclaration.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMCSSStyleDeclaration.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -117,14 +117,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setProperty:(NSString *)propertyName :(NSString *)value :(NSString *)priority
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->setProperty(propertyName, value, priority, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (NSString *)item:(unsigned)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -145,6 +137,15 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMCSSStyleDeclaration (DOMCSSStyleDeclarationDeprecated)
+
+- (void)setProperty:(NSString *)propertyName :(NSString *)value :(NSString *)priority
+{
+ [self setProperty:propertyName value:value priority:priority];
+}
+
+@end
+
</ins><span class="cx"> WebCore::CSSStyleDeclaration* core(DOMCSSStyleDeclaration *wrapper)
</span><span class="cx"> {
</span><span class="cx"> return wrapper ? reinterpret_cast<WebCore::CSSStyleDeclaration*>(wrapper->_internal) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSStyleSheetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSSStyleSheet.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSSStyleSheet.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMCSSStyleSheet.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -72,15 +72,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (unsigned)insertRule:(NSString *)rule :(unsigned)index
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- unsigned result = IMPL->insertRule(rule, index, ec);
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (void)deleteRule:(unsigned)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -108,6 +99,15 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMCSSStyleSheet (DOMCSSStyleSheetDeprecated)
+
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index
+{
+ return [self insertRule:rule index:index];
+}
+
+@end
+
</ins><span class="cx"> DOMCSSStyleSheet *kit(WebCore::CSSStyleSheet* value)
</span><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCharacterDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCharacterData.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCharacterData.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMCharacterData.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -80,15 +80,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSString *)substringData:(unsigned)offset :(unsigned)inLength
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- NSString *result = IMPL->substringData(offset, inLength, ec);
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (void)appendData:(NSString *)inData
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -103,52 +94,52 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)insertData:(unsigned)offset :(NSString *)inData
</del><ins>+- (void)deleteData:(unsigned)offset length:(unsigned)inLength
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- IMPL->insertData(offset, inData, ec);
</del><ins>+ IMPL->deleteData(offset, inLength, ec);
</ins><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)deleteData:(unsigned)offset length:(unsigned)inLength
</del><ins>+- (void)replaceData:(unsigned)offset length:(unsigned)inLength data:(NSString *)inData
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- IMPL->deleteData(offset, inLength, ec);
</del><ins>+ IMPL->replaceData(offset, inLength, inData, ec);
</ins><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)deleteData:(unsigned)offset :(unsigned)inLength
</del><ins>+- (void)remove
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- IMPL->deleteData(offset, inLength, ec);
</del><ins>+ IMPL->remove(ec);
</ins><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)replaceData:(unsigned)offset length:(unsigned)inLength data:(NSString *)inData
</del><ins>+@end
+
+@implementation DOMCharacterData (DOMCharacterDataDeprecated)
+
+- (NSString *)substringData:(unsigned)offset :(unsigned)inLength
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->replaceData(offset, inLength, inData, ec);
- WebCore::raiseOnDOMError(ec);
</del><ins>+ return [self substringData:offset length:inLength];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)replaceData:(unsigned)offset :(unsigned)inLength :(NSString *)inData
</del><ins>+- (void)insertData:(unsigned)offset :(NSString *)inData
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->replaceData(offset, inLength, inData, ec);
- WebCore::raiseOnDOMError(ec);
</del><ins>+ [self insertData:offset data:inData];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)remove
</del><ins>+- (void)deleteData:(unsigned)offset :(unsigned)inLength
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->remove(ec);
- WebCore::raiseOnDOMError(ec);
</del><ins>+ [self deleteData:offset length:inLength];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)replaceData:(unsigned)offset :(unsigned)inLength :(NSString *)inData
+{
+ [self replaceData:offset length:inLength data:inData];
+}
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMDocumentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMDocument.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMDocument.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMDocument.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -503,15 +503,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMProcessingInstruction *)createProcessingInstruction:(NSString *)target :(NSString *)data
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMProcessingInstruction *result = kit(WTF::getPtr(IMPL->createProcessingInstruction(target, data, ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (DOMAttr *)createAttribute:(NSString *)name
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -547,17 +538,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNode *)importNode:(DOMNode *)importedNode :(BOOL)deep
-{
- WebCore::JSMainThreadNullState state;
- if (!importedNode)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- DOMNode *result = kit(WTF::getPtr(IMPL->importNode(*core(importedNode), deep, ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (DOMElement *)createElementNS:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -567,15 +547,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMElement *)createElementNS:(NSString *)namespaceURI :(NSString *)qualifiedName
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMElement *result = kit(WTF::getPtr(IMPL->createElementNS(namespaceURI, qualifiedName, ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (DOMAttr *)createAttributeNS:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -585,15 +556,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMAttr *)createAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMAttr *result = kit(WTF::getPtr(IMPL->createAttributeNS(namespaceURI, qualifiedName, ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI localName:(NSString *)localName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -600,12 +562,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->getElementsByTagNameNSForObjC(namespaceURI, localName)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->getElementsByTagNameNSForObjC(namespaceURI, localName)));
-}
-
</del><span class="cx"> - (DOMNode *)adoptNode:(DOMNode *)source
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -643,17 +599,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->createNodeIterator(*core(root), whatToShow, WTF::getPtr(nativeNodeFilter), expandEntityReferences)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
-{
- WebCore::JSMainThreadNullState state;
- if (!root)
- WebCore::raiseTypeErrorException();
- RefPtr<WebCore::NodeFilter> nativeNodeFilter;
- if (filter)
- nativeNodeFilter = WebCore::NativeNodeFilter::create(WebCore::ObjCNodeFilterCondition::create(filter));
- return kit(WTF::getPtr(IMPL->createNodeIterator(*core(root), whatToShow, WTF::getPtr(nativeNodeFilter), expandEntityReferences)));
-}
-
</del><span class="cx"> - (DOMTreeWalker *)createTreeWalker:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -665,17 +610,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->createTreeWalker(*core(root), whatToShow, WTF::getPtr(nativeNodeFilter), expandEntityReferences)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
-{
- WebCore::JSMainThreadNullState state;
- if (!root)
- WebCore::raiseTypeErrorException();
- RefPtr<WebCore::NodeFilter> nativeNodeFilter;
- if (filter)
- nativeNodeFilter = WebCore::NativeNodeFilter::create(WebCore::ObjCNodeFilterCondition::create(filter));
- return kit(WTF::getPtr(IMPL->createTreeWalker(*core(root), whatToShow, WTF::getPtr(nativeNodeFilter), expandEntityReferences)));
-}
-
</del><span class="cx"> - (DOMCSSStyleDeclaration *)getOverrideStyle:(DOMElement *)element pseudoElement:(NSString *)pseudoElement
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -682,12 +616,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->getOverrideStyle(core(element), pseudoElement)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMCSSStyleDeclaration *)getOverrideStyle:(DOMElement *)element :(NSString *)pseudoElement
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->getOverrideStyle(core(element), pseudoElement)));
-}
-
</del><span class="cx"> - (DOMXPathExpression *)createExpression:(NSString *)expression resolver:(id <DOMXPathNSResolver>)resolver
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -707,25 +635,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMXPathExpression *)createExpression:(NSString *)expression :(id <DOMXPathNSResolver>)resolver
-{
- WebCore::JSMainThreadNullState state;
- WebCore::XPathNSResolver* nativeResolver = 0;
- RefPtr<WebCore::XPathNSResolver> customResolver;
- if (resolver) {
- if ([resolver isMemberOfClass:[DOMNativeXPathNSResolver class]])
- nativeResolver = core(static_cast<DOMNativeXPathNSResolver *>(resolver));
- else {
- customResolver = WebCore::DOMCustomXPathNSResolver::create(resolver);
- nativeResolver = WTF::getPtr(customResolver);
- }
- }
- WebCore::ExceptionCode ec = 0;
- DOMXPathExpression *result = kit(WTF::getPtr(IMPL->createExpression(expression, WTF::getPtr(nativeResolver), ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (id <DOMXPathNSResolver>)createNSResolver:(DOMNode *)nodeResolver
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -751,25 +660,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMXPathResult *)evaluate:(NSString *)expression :(DOMNode *)contextNode :(id <DOMXPathNSResolver>)resolver :(unsigned short)type :(DOMXPathResult *)inResult
-{
- WebCore::JSMainThreadNullState state;
- WebCore::XPathNSResolver* nativeResolver = 0;
- RefPtr<WebCore::XPathNSResolver> customResolver;
- if (resolver) {
- if ([resolver isMemberOfClass:[DOMNativeXPathNSResolver class]])
- nativeResolver = core(static_cast<DOMNativeXPathNSResolver *>(resolver));
- else {
- customResolver = WebCore::DOMCustomXPathNSResolver::create(resolver);
- nativeResolver = WTF::getPtr(customResolver);
- }
- }
- WebCore::ExceptionCode ec = 0;
- DOMXPathResult *result = kit(WTF::getPtr(IMPL->evaluate(expression, core(contextNode), WTF::getPtr(nativeResolver), type, core(inResult), ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (BOOL)execCommand:(NSString *)command userInterface:(BOOL)userInterface value:(NSString *)value
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -853,17 +743,6 @@
</span><span class="cx"> return kit(WTF::getPtr(dv->getComputedStyle(*core(element), pseudoElement)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)element :(NSString *)pseudoElement
-{
- WebCore::JSMainThreadNullState state;
- if (!element)
- WebCore::raiseTypeErrorException();
- WebCore::DOMWindow* dv = IMPL->defaultView();
- if (!dv)
- return nil;
- return kit(WTF::getPtr(dv->getComputedStyle(*core(element), pseudoElement)));
-}
-
</del><span class="cx"> - (DOMCSSRuleList *)getMatchedCSSRules:(DOMElement *)element pseudoElement:(NSString *)pseudoElement
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -943,6 +822,65 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMDocument (DOMDocumentDeprecated)
+
+- (DOMProcessingInstruction *)createProcessingInstruction:(NSString *)target :(NSString *)data
+{
+ return [self createProcessingInstruction:target data:data];
+}
+
+- (DOMNode *)importNode:(DOMNode *)importedNode :(BOOL)deep
+{
+ return [self importNode:importedNode deep:deep];
+}
+
+- (DOMElement *)createElementNS:(NSString *)namespaceURI :(NSString *)qualifiedName
+{
+ return [self createElementNS:namespaceURI qualifiedName:qualifiedName];
+}
+
+- (DOMAttr *)createAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName
+{
+ return [self createAttributeNS:namespaceURI qualifiedName:qualifiedName];
+}
+
+- (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self getElementsByTagNameNS:namespaceURI localName:localName];
+}
+
+- (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];
+}
+
+- (DOMCSSStyleDeclaration *)getOverrideStyle:(DOMElement *)element :(NSString *)pseudoElement
+{
+ return [self getOverrideStyle:element pseudoElement:pseudoElement];
+}
+
+- (DOMXPathExpression *)createExpression:(NSString *)expression :(id <DOMXPathNSResolver>)resolver
+{
+ return [self createExpression:expression resolver:resolver];
+}
+
+- (DOMXPathResult *)evaluate:(NSString *)expression :(DOMNode *)contextNode :(id <DOMXPathNSResolver>)resolver :(unsigned short)type :(DOMXPathResult *)inResult
+{
+ return [self evaluate:expression contextNode:contextNode resolver:resolver type:type inResult:inResult];
+}
+
+- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)element :(NSString *)pseudoElement
+{
+ return [self getComputedStyle:element pseudoElement:pseudoElement];
+}
+
+@end
+
</ins><span class="cx"> WebCore::Document* core(DOMDocument *wrapper)
</span><span class="cx"> {
</span><span class="cx"> return wrapper ? reinterpret_cast<WebCore::Document*>(wrapper->_internal) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMElement.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMElement.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMElement.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -276,14 +276,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAttribute:(NSString *)name :(NSString *)value
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->setAttribute(name, value, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (void)removeAttribute:(NSString *)name
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -330,12 +322,6 @@
</span><span class="cx"> return IMPL->getAttributeNS(namespaceURI, localName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSString *)getAttributeNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return IMPL->getAttributeNS(namespaceURI, localName);
-}
-
</del><span class="cx"> - (void)setAttributeNS:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName value:(NSString *)value
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -344,14 +330,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName :(NSString *)value
-{
- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->setAttributeNS(namespaceURI, qualifiedName, value, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (void)removeAttributeNS:(NSString *)namespaceURI localName:(NSString *)localName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -358,12 +336,6 @@
</span><span class="cx"> IMPL->removeAttributeNS(namespaceURI, localName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)removeAttributeNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- IMPL->removeAttributeNS(namespaceURI, localName);
-}
-
</del><span class="cx"> - (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI localName:(NSString *)localName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -370,12 +342,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->getElementsByTagNameNSForObjC(namespaceURI, localName)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->getElementsByTagNameNSForObjC(namespaceURI, localName)));
-}
-
</del><span class="cx"> - (DOMAttr *)getAttributeNodeNS:(NSString *)namespaceURI localName:(NSString *)localName
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -382,12 +348,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->getAttributeNodeNS(namespaceURI, localName)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMAttr *)getAttributeNodeNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->getAttributeNodeNS(namespaceURI, localName)));
-}
-
</del><span class="cx"> - (DOMAttr *)setAttributeNodeNS:(DOMAttr *)newAttr
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -411,12 +371,6 @@
</span><span class="cx"> return IMPL->hasAttributeNS(namespaceURI, localName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)hasAttributeNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return IMPL->hasAttributeNS(namespaceURI, localName);
-}
-
</del><span class="cx"> - (void)focus
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -537,6 +491,45 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMElement (DOMElementDeprecated)
+
+- (void)setAttribute:(NSString *)name :(NSString *)value
+{
+ [self setAttribute:name value:value];
+}
+
+- (NSString *)getAttributeNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self getAttributeNS:namespaceURI localName:localName];
+}
+
+- (void)setAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName :(NSString *)value
+{
+ [self setAttributeNS:namespaceURI qualifiedName:qualifiedName value:value];
+}
+
+- (void)removeAttributeNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ [self removeAttributeNS:namespaceURI localName:localName];
+}
+
+- (DOMNodeList *)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self getElementsByTagNameNS:namespaceURI localName:localName];
+}
+
+- (DOMAttr *)getAttributeNodeNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self getAttributeNodeNS:namespaceURI localName:localName];
+}
+
+- (BOOL)hasAttributeNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self hasAttributeNS:namespaceURI localName:localName];
+}
+
+@end
+
</ins><span class="cx"> WebCore::Element* core(DOMElement *wrapper)
</span><span class="cx"> {
</span><span class="cx"> return wrapper ? reinterpret_cast<WebCore::Element*>(wrapper->_internal) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMEvent.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMEvent.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMEvent.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -161,16 +161,19 @@
</span><span class="cx"> IMPL->initEvent(eventTypeArg, canBubbleArg, cancelableArg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)initEvent:(NSString *)eventTypeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg
</del><ins>+- (void)stopImmediatePropagation
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- IMPL->initEvent(eventTypeArg, canBubbleArg, cancelableArg);
</del><ins>+ IMPL->stopImmediatePropagation();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)stopImmediatePropagation
</del><ins>+@end
+
+@implementation DOMEvent (DOMEventDeprecated)
+
+- (void)initEvent:(NSString *)eventTypeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- IMPL->stopImmediatePropagation();
</del><ins>+ [self initEvent:eventTypeArg canBubbleArg:canBubbleArg cancelableArg:cancelableArg];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMHTMLSelectElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMHTMLSelectElement.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMHTMLSelectElement.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMHTMLSelectElement.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -188,20 +188,19 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)add:(DOMHTMLElement *)element :(DOMHTMLElement *)before
</del><ins>+- (void)remove:(int)index
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- if (!element)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- IMPL->add(*core(element), core(before), ec);
- WebCore::raiseOnDOMError(ec);
</del><ins>+ IMPL->removeByIndex(index);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)remove:(int)index
</del><ins>+@end
+
+@implementation DOMHTMLSelectElement (DOMHTMLSelectElementDeprecated)
+
+- (void)add:(DOMHTMLElement *)element :(DOMHTMLElement *)before
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- IMPL->removeByIndex(index);
</del><ins>+ [self add:element before:before];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMMouseEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMMouseEvent.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMMouseEvent.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMMouseEvent.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -165,12 +165,13 @@
</span><span class="cx"> IMPL->initMouseEvent(type, canBubble, cancelable, core(view), detail, inScreenX, inScreenY, inClientX, inClientY, inCtrlKey, inAltKey, inShiftKey, inMetaKey, inButton, inRelatedTargetNode);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation DOMMouseEvent (DOMMouseEventDeprecated)
+
</ins><span class="cx"> - (void)initMouseEvent:(NSString *)type :(BOOL)canBubble :(BOOL)cancelable :(DOMAbstractView *)view :(int)detail :(int)inScreenX :(int)inScreenY :(int)inClientX :(int)inClientY :(BOOL)inCtrlKey :(BOOL)inAltKey :(BOOL)inShiftKey :(BOOL)inMetaKey :(unsigned short)inButton :(id <DOMEventTarget>)inRelatedTarget
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- DOMNode* inRelatedTargetObjC = inRelatedTarget;
- WebCore::Node* inRelatedTargetNode = core(inRelatedTargetObjC);
- IMPL->initMouseEvent(type, canBubble, cancelable, core(view), detail, inScreenX, inScreenY, inClientX, inClientY, inCtrlKey, inAltKey, inShiftKey, inMetaKey, inButton, inRelatedTargetNode);
</del><ins>+ [self initMouseEvent:type canBubble:canBubble cancelable:cancelable view:view detail:detail screenX:inScreenX screenY:inScreenY clientX:inClientX clientY:inClientY ctrlKey:inCtrlKey altKey:inAltKey shiftKey:inShiftKey metaKey:inMetaKey button:inButton relatedTarget:inRelatedTarget];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMMutationEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMMutationEvent.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMMutationEvent.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMMutationEvent.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -77,10 +77,13 @@
</span><span class="cx"> IMPL->initMutationEvent(type, canBubble, cancelable, core(inRelatedNode), inPrevValue, inNewValue, inAttrName, inAttrChange);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation DOMMutationEvent (DOMMutationEventDeprecated)
+
</ins><span class="cx"> - (void)initMutationEvent:(NSString *)type :(BOOL)canBubble :(BOOL)cancelable :(DOMNode *)inRelatedNode :(NSString *)inPrevValue :(NSString *)inNewValue :(NSString *)inAttrName :(unsigned short)inAttrChange
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- IMPL->initMutationEvent(type, canBubble, cancelable, core(inRelatedNode), inPrevValue, inNewValue, inAttrName, inAttrChange);
</del><ins>+ [self initMutationEvent:type canBubble:canBubble cancelable:cancelable relatedNode:inRelatedNode prevValue:inPrevValue newValue:inNewValue attrName:inAttrName attrChange:inAttrChange];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMNamedNodeMapmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMNamedNodeMap.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMNamedNodeMap.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMNamedNodeMap.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -96,12 +96,6 @@
</span><span class="cx"> return kit(WTF::getPtr(IMPL->getNamedItemNS(namespaceURI, localName)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNode *)getNamedItemNS:(NSString *)namespaceURI :(NSString *)localName
-{
- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->getNamedItemNS(namespaceURI, localName)));
-}
-
</del><span class="cx"> - (DOMNode *)setNamedItemNS:(DOMNode *)node
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -122,13 +116,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation DOMNamedNodeMap (DOMNamedNodeMapDeprecated)
+
+- (DOMNode *)getNamedItemNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ return [self getNamedItemNS:namespaceURI localName:localName];
+}
+
</ins><span class="cx"> - (DOMNode *)removeNamedItemNS:(NSString *)namespaceURI :(NSString *)localName
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMNode *result = kit(WTF::getPtr(IMPL->removeNamedItemNS(namespaceURI, localName, ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
</del><ins>+ return [self removeNamedItemNS:namespaceURI localName:localName];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMNode.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMNode.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMNode.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -213,18 +213,6 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNode *)insertBefore:(DOMNode *)newChild :(DOMNode *)refChild
-{
- WebCore::JSMainThreadNullState state;
- if (!newChild)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- if (IMPL->insertBefore(*core(newChild), core(refChild), ec))
- return newChild;
- WebCore::raiseOnDOMError(ec);
- return nil;
-}
-
</del><span class="cx"> - (DOMNode *)replaceChild:(DOMNode *)newChild oldChild:(DOMNode *)oldChild
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -239,20 +227,6 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMNode *)replaceChild:(DOMNode *)newChild :(DOMNode *)oldChild
-{
- WebCore::JSMainThreadNullState state;
- if (!newChild)
- WebCore::raiseTypeErrorException();
- if (!oldChild)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- if (IMPL->replaceChild(*core(newChild), *core(oldChild), ec))
- return oldChild;
- WebCore::raiseOnDOMError(ec);
- return nil;
-}
-
</del><span class="cx"> - (DOMNode *)removeChild:(DOMNode *)oldChild
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -304,12 +278,6 @@
</span><span class="cx"> return IMPL->isSupportedForBindings(feature, version);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isSupported:(NSString *)feature :(NSString *)version
-{
- WebCore::JSMainThreadNullState state;
- return IMPL->isSupportedForBindings(feature, version);
-}
-
</del><span class="cx"> - (BOOL)hasAttributes
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -407,6 +375,25 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation DOMNode (DOMNodeDeprecated)
+
+- (DOMNode *)insertBefore:(DOMNode *)newChild :(DOMNode *)refChild
+{
+ return [self insertBefore:newChild refChild:refChild];
+}
+
+- (DOMNode *)replaceChild:(DOMNode *)newChild :(DOMNode *)oldChild
+{
+ return [self replaceChild:newChild oldChild:oldChild];
+}
+
+- (BOOL)isSupported:(NSString *)feature :(NSString *)version
+{
+ return [self isSupported:feature version:version];
+}
+
+@end
+
</ins><span class="cx"> WebCore::Node* core(DOMNode *wrapper)
</span><span class="cx"> {
</span><span class="cx"> return wrapper ? reinterpret_cast<WebCore::Node*>(wrapper->_internal) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMRangemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMRange.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMRange.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMRange.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -106,16 +106,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setStart:(DOMNode *)refNode :(int)offset
-{
- WebCore::JSMainThreadNullState state;
- if (!refNode)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- IMPL->setStart(*core(refNode), offset, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (void)setEnd:(DOMNode *)refNode offset:(int)offset
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -126,16 +116,6 @@
</span><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setEnd:(DOMNode *)refNode :(int)offset
-{
- WebCore::JSMainThreadNullState state;
- if (!refNode)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- IMPL->setEnd(*core(refNode), offset, ec);
- WebCore::raiseOnDOMError(ec);
-}
-
</del><span class="cx"> - (void)setStartBefore:(DOMNode *)refNode
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -213,17 +193,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange
-{
- WebCore::JSMainThreadNullState state;
- if (!sourceRange)
- WebCore::raiseTypeErrorException();
- WebCore::ExceptionCode ec = 0;
- short result = IMPL->compareBoundaryPointsForBindings(how, *core(sourceRange), ec);
- WebCore::raiseOnDOMError(ec);
- return result;
-}
-
</del><span class="cx"> - (void)deleteContents
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -351,6 +320,25 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@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
+
</ins><span class="cx"> WebCore::Range* core(DOMRange *wrapper)
</span><span class="cx"> {
</span><span class="cx"> return wrapper ? reinterpret_cast<WebCore::Range*>(wrapper->_internal) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMUIEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMUIEvent.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMUIEvent.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMUIEvent.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -102,10 +102,13 @@
</span><span class="cx"> IMPL->initUIEvent(type, canBubble, cancelable, core(inView), inDetail);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation DOMUIEvent (DOMUIEventDeprecated)
+
</ins><span class="cx"> - (void)initUIEvent:(NSString *)type :(BOOL)canBubble :(BOOL)cancelable :(DOMAbstractView *)inView :(int)inDetail
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- IMPL->initUIEvent(type, canBubble, cancelable, core(inView), inDetail);
</del><ins>+ [self initUIEvent:type canBubble:canBubble cancelable:cancelable view:inView detail:inDetail];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMXPathExpressionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMXPathExpression.mm (204128 => 204129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMXPathExpression.mm 2016-08-04 18:48:16 UTC (rev 204128)
+++ trunk/Source/WebCore/bindings/objc/DOMXPathExpression.mm 2016-08-04 19:13:30 UTC (rev 204129)
</span><span class="lines">@@ -62,13 +62,13 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation DOMXPathExpression (DOMXPathExpressionDeprecated)
+
</ins><span class="cx"> - (DOMXPathResult *)evaluate:(DOMNode *)contextNode :(unsigned short)type :(DOMXPathResult *)inResult
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMXPathResult *result = kit(WTF::getPtr(IMPL->evaluate(core(contextNode), type, core(inResult), ec)));
- WebCore::raiseOnDOMError(ec);
- return result;
</del><ins>+ return [self evaluate:contextNode type:type inResult:inResult];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>