<!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>[208118] trunk/Source</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/208118">208118</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-10-29 19:56:39 -0700 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert more of DOM from ExceptionCode to Exception
https://bugs.webkit.org/show_bug.cgi?id=164173
Reviewed by Ryosuke Niwa.
Source/WebCore:
* Modules/mediastream/MediaDevices.cpp:
(WebCore::MediaDevices::getUserMedia): Use ExceptionOr.
(WebCore::MediaDevices::enumerateDevices): Ditto.
* Modules/mediastream/MediaDevices.h: Updated for above.
* Modules/mediastream/MediaDevices.idl: Use non-legacy exceptions.
* Modules/mediastream/MediaEndpointSessionDescription.cpp:
Added now-needed include of ExceptionCode.h.
* Modules/mediastream/RTCConfiguration.cpp:
(WebCore::parseIceServer): Use ExceptionOr.
(WebCore::RTCConfiguration::create): Ditto.
(WebCore::RTCConfiguration::initialize): Ditto.
* Modules/mediastream/RTCConfiguration.h: Updated for above.
* Modules/mediastream/RTCConfiguration.idl: Use non-legacy exceptions.
* Modules/mediastream/RTCDTMFSender.cpp:
(WebCore::RTCDTMFSender::create): Use ExceptionOr.
(WebCore::RTCDTMFSender::insertDTMF): Ditto.
* Modules/mediastream/RTCDTMFSender.h: Updated for above.
* Modules/mediastream/RTCDTMFSender.idl: Use non-legacy exceptions.
* Modules/mediastream/RTCDataChannel.cpp:
(WebCore::RTCDataChannel::create): Use ExceptionOr.
(WebCore::RTCDataChannel::setBinaryType): Ditto.
(WebCore::RTCDataChannel::send): Ditto.
(WebCore::RTCDataChannel::didReceiveRawData): Ditto.
* Modules/mediastream/RTCDataChannel.h: Updated for above.
Also fhcanged resturn values to use const AtomicString& and
unsigned instead of unsigned long. Also made more private.
Also changed BinaryType into an enum class.
* Modules/mediastream/RTCDataChannel.idl: Use non-legacy exceptions.
* Modules/mediastream/RTCIceCandidate.cpp:
(WebCore::RTCIceCandidate::create): Use ExceptionOr.
* Modules/mediastream/RTCIceCandidate.h: Updated for above.
* Modules/mediastream/RTCIceCandidate.idl: Use non-legacy exception.
* Modules/mediastream/RTCOfferAnswerOptions.cpp:
(WebCore::RTCOfferOptions::create): Use ExceptionOr.
(WebCore::RTCAnswerOptions::create): Ditto.
* Modules/mediastream/RTCOfferAnswerOptions.h: Updated for above.
Also removed all virtual functions since nothing here is polymorphic
and initalized data members in the header.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::initializeWith): Use ExceptionOr.
(WebCore::RTCPeerConnection::addTrack): Ditto.
(WebCore::RTCPeerConnection::removeTrack): Ditto.
(WebCore::RTCPeerConnection::addTransceiver): Ditto.
(WebCore::RTCPeerConnection::completeAddTransceiver): Ditto.
(WebCore::RTCPeerConnection::queuedCreateOffer): Ditto.
(WebCore::RTCPeerConnection::queuedCreateAnswer): Ditto.
(WebCore::RTCPeerConnection::setConfiguration): Ditto.
(WebCore::RTCPeerConnection::createDataChannel): Ditto.
* Modules/mediastream/RTCPeerConnection.h: Updated for above.
* Modules/mediastream/RTCPeerConnection.idl: Use non-legacy exceptions.
* Modules/mediastream/RTCRtpSender.cpp:
(WebCore::RTCRtpSender::replaceTrack): Use ExceptionOr.
* Modules/mediastream/RTCRtpSender.h: Updated for above.
* Modules/mediastream/RTCRtpSender.idl: Use non-legacy exception.
* Modules/mediastream/RTCSessionDescription.cpp:
(WebCore::RTCSessionDescription::create): Use ExceptoinOr.
* Modules/mediastream/RTCSessionDescription.h: Updated for above.
(WebCore::RTCSessionDescription::~RTCSessionDescription):
* Modules/mediastream/RTCSessionDescription.idl: Use non-legacy exceptions.
* Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
(WebCore::verifyCustomHandlerURL): Just return a boolean, no exception.
(WebCore::verifyProtocolHandlerScheme): Ditto.
(WebCore::NavigatorContentUtils::registerProtocolHandler): Use ExceptionOr.
(WebCore::NavigatorContentUtils::isProtocolHandlerRegistered): Ditto.
(WebCore::NavigatorContentUtils::unregisterProtocolHandler): Ditto.
* Modules/navigatorcontentutils/NavigatorContentUtils.h: Updated for above.
* Modules/navigatorcontentutils/NavigatorContentUtils.idl: Use non-legacy exceptions.
* bindings/js/JSMediaDevicesCustom.cpp:
(WebCore::JSMediaDevicesGetUserMediaPromiseFunction): Use propagateException.
* bindings/scripts/CodeGeneratorJS.pm:
(NeedsExplicitPropagateExceptionCall): Added. Helper function to decide whether
we need to call propagateException explicitly, if return value processing is not
going to propagate the exception for us.
(GenerateParametersCheck): Moved the code from GenerateReturnParameters inline
because it's almost as short as the function call. Use the newly created
NeedsExplicitPropagateExceptionCall function, which properly handles the case
where the return value is a promise.
(GenerateReturnParameters): Deleted.
* dom/CharacterData.cpp:
(WebCore::CharacterData::substringData): Use ExceptionOr.
(WebCore::CharacterData::insertData): Ditto.
(WebCore::CharacterData::deleteData): Ditto.
(WebCore::CharacterData::replaceData): Ditto.
* dom/CharacterData.h: Updated for above.
* dom/CharacterData.idl: Use non-legacy exceptions.
* dom/DataTransferItemList.h: Tried to use ExceptionOr, but this seems
like dead code that doesn't compile.
* dom/DataTransferItemList.idl: Use non-legacy exceptions.
* dom/MessagePort.idl: Use non-legacy exceptions, except this has
already been converted and was a custom binding.
* dom/MutationObserver.cpp:
(WebCore::MutationObserver::observe): Use ExceptionOr.
* dom/MutationObserver.h: Updated for above.
* dom/MutationObserver.idl: Use non-legacy exception.
* dom/Range.cpp:
(WebCore::deleteCharacterData): Updated use of calls that now use
ExceptionOr.
(WebCore::Range::processContentsBetweenOffsets): Ditto.
(WebCore::Range::insertNode): Ditto.
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::setInnerHTML): Use ExceptionOr.
* dom/ShadowRoot.h: Updated for above.
* dom/ShadowRoot.idl: Use non-legacy exception.
* dom/Text.cpp:
(WebCore::Text::splitText): Use ExceptionOr.
(WebCore::Text::replaceWholeText): Removed unused ExceptionCode&.
* dom/Text.h: Updated for above.
* dom/Text.idl: Use non-legacy exception.
* editing/ApplyBlockElementCommand.cpp:
(WebCore::isNewLineAtPosition): Rewrote to use data rather than
substringData; more efficient.
* editing/DeleteFromTextNodeCommand.cpp:
(WebCore::DeleteFromTextNodeCommand::doApply): Updated to work with
functions that return ExceptionOr.
(WebCore::DeleteFromTextNodeCommand::doUnapply): Removed IGNORE_EXCEPTION.
* editing/InsertIntoTextNodeCommand.cpp:
(WebCore::InsertIntoTextNodeCommand::InsertIntoTextNodeCommand):
Use WTFMove to avoid a little bit of reference count churn.
(WebCore::InsertIntoTextNodeCommand::doApply): Removed IGNORE_EXCEPTION.
(WebCore::InsertIntoTextNodeCommand::doReapply): Removed ExceptionCode.
(WebCore::InsertIntoTextNodeCommand::doUnapply): Removed IGNORE_EXCEPTION.
* editing/SplitTextNodeCommand.cpp:
(WebCore::SplitTextNodeCommand::doApply): Updated to work with functions
that return ExceptionCode.
(WebCore::SplitTextNodeCommand::doUnapply): Removed ASSERT_NO_EXCEPTION.
(WebCore::SplitTextNodeCommand::insertText1AndTrimText2): Updated to work
with functions that return ExceptionCode.
* html/HTMLTextFormControlElement.cpp:
Added now-needed include of ExceptionCode.h.
* inspector/DOMEditor.cpp: Removed ExceptionCode out argument from calls
to replaceWholeText, which never throws an exception.
Source/WebKit/mac:
* DOM/DOMCharacterData.mm:
(-[DOMCharacterData substringData:length:]): Updated since this
now uses ExceptionOr.
(-[DOMCharacterData insertData:data:]): Ditto.
(-[DOMCharacterData deleteData:length:]): Ditto.
(-[DOMCharacterData replaceData:length:data:]): Ditto.
* DOM/DOMText.mm:
(-[DOMText splitText:]): Ditto.
(-[DOMText replaceWholeText:]): Removed unneeded exception code
handling from function that does not throw an exception.
Source/WebKit2:
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp:
(webkit_dom_character_data_substring_data): Updated since this
now uses ExceptionOr.
(webkit_dom_character_data_insert_data): Ditto.
(webkit_dom_character_data_delete_data): Ditto.
(webkit_dom_character_data_replace_data): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp:
(webkit_dom_text_replace_whole_text): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp:
(webkit_dom_text_split_text): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicescpp">trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesh">trunk/Source/WebCore/Modules/mediastream/MediaDevices.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesidl">trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationcpp">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationh">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationidl">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderidl">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelidl">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateh">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCOfferAnswerOptionscpp">trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCOfferAnswerOptionsh">trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsh">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsidl">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp">trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatah">trunk/Source/WebCore/dom/CharacterData.h</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDataidl">trunk/Source/WebCore/dom/CharacterData.idl</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemListh">trunk/Source/WebCore/dom/DataTransferItemList.h</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemListidl">trunk/Source/WebCore/dom/DataTransferItemList.idl</a></li>
<li><a href="#trunkSourceWebCoredomMessagePortidl">trunk/Source/WebCore/dom/MessagePort.idl</a></li>
<li><a href="#trunkSourceWebCoredomMutationObservercpp">trunk/Source/WebCore/dom/MutationObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverh">trunk/Source/WebCore/dom/MutationObserver.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserveridl">trunk/Source/WebCore/dom/MutationObserver.idl</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootidl">trunk/Source/WebCore/dom/ShadowRoot.idl</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTexth">trunk/Source/WebCore/dom/Text.h</a></li>
<li><a href="#trunkSourceWebCoredomTextidl">trunk/Source/WebCore/dom/Text.idl</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyBlockElementCommandcpp">trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteFromTextNodeCommandcpp">trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertIntoTextNodeCommandcpp">trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSplitTextNodeCommandcpp">trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMEditorcpp">trunk/Source/WebCore/inspector/DOMEditor.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCharacterDatamm">trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMTextmm">trunk/Source/WebKit/mac/DOM/DOMText.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCharacterDatacpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDeprecatedcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMTextcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/ChangeLog 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -1,3 +1,167 @@
</span><ins>+2016-10-29 Darin Adler <darin@apple.com>
+
+ Convert more of DOM from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=164173
+
+ Reviewed by Ryosuke Niwa.
+
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::MediaDevices::getUserMedia): Use ExceptionOr.
+ (WebCore::MediaDevices::enumerateDevices): Ditto.
+ * Modules/mediastream/MediaDevices.h: Updated for above.
+ * Modules/mediastream/MediaDevices.idl: Use non-legacy exceptions.
+
+ * Modules/mediastream/MediaEndpointSessionDescription.cpp:
+ Added now-needed include of ExceptionCode.h.
+
+ * Modules/mediastream/RTCConfiguration.cpp:
+ (WebCore::parseIceServer): Use ExceptionOr.
+ (WebCore::RTCConfiguration::create): Ditto.
+ (WebCore::RTCConfiguration::initialize): Ditto.
+ * Modules/mediastream/RTCConfiguration.h: Updated for above.
+ * Modules/mediastream/RTCConfiguration.idl: Use non-legacy exceptions.
+
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ (WebCore::RTCDTMFSender::create): Use ExceptionOr.
+ (WebCore::RTCDTMFSender::insertDTMF): Ditto.
+ * Modules/mediastream/RTCDTMFSender.h: Updated for above.
+ * Modules/mediastream/RTCDTMFSender.idl: Use non-legacy exceptions.
+
+ * Modules/mediastream/RTCDataChannel.cpp:
+ (WebCore::RTCDataChannel::create): Use ExceptionOr.
+ (WebCore::RTCDataChannel::setBinaryType): Ditto.
+ (WebCore::RTCDataChannel::send): Ditto.
+ (WebCore::RTCDataChannel::didReceiveRawData): Ditto.
+ * Modules/mediastream/RTCDataChannel.h: Updated for above.
+ Also fhcanged resturn values to use const AtomicString& and
+ unsigned instead of unsigned long. Also made more private.
+ Also changed BinaryType into an enum class.
+ * Modules/mediastream/RTCDataChannel.idl: Use non-legacy exceptions.
+
+ * Modules/mediastream/RTCIceCandidate.cpp:
+ (WebCore::RTCIceCandidate::create): Use ExceptionOr.
+ * Modules/mediastream/RTCIceCandidate.h: Updated for above.
+ * Modules/mediastream/RTCIceCandidate.idl: Use non-legacy exception.
+
+ * Modules/mediastream/RTCOfferAnswerOptions.cpp:
+ (WebCore::RTCOfferOptions::create): Use ExceptionOr.
+ (WebCore::RTCAnswerOptions::create): Ditto.
+ * Modules/mediastream/RTCOfferAnswerOptions.h: Updated for above.
+ Also removed all virtual functions since nothing here is polymorphic
+ and initalized data members in the header.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::initializeWith): Use ExceptionOr.
+ (WebCore::RTCPeerConnection::addTrack): Ditto.
+ (WebCore::RTCPeerConnection::removeTrack): Ditto.
+ (WebCore::RTCPeerConnection::addTransceiver): Ditto.
+ (WebCore::RTCPeerConnection::completeAddTransceiver): Ditto.
+ (WebCore::RTCPeerConnection::queuedCreateOffer): Ditto.
+ (WebCore::RTCPeerConnection::queuedCreateAnswer): Ditto.
+ (WebCore::RTCPeerConnection::setConfiguration): Ditto.
+ (WebCore::RTCPeerConnection::createDataChannel): Ditto.
+ * Modules/mediastream/RTCPeerConnection.h: Updated for above.
+ * Modules/mediastream/RTCPeerConnection.idl: Use non-legacy exceptions.
+
+ * Modules/mediastream/RTCRtpSender.cpp:
+ (WebCore::RTCRtpSender::replaceTrack): Use ExceptionOr.
+ * Modules/mediastream/RTCRtpSender.h: Updated for above.
+ * Modules/mediastream/RTCRtpSender.idl: Use non-legacy exception.
+
+ * Modules/mediastream/RTCSessionDescription.cpp:
+ (WebCore::RTCSessionDescription::create): Use ExceptoinOr.
+ * Modules/mediastream/RTCSessionDescription.h: Updated for above.
+ (WebCore::RTCSessionDescription::~RTCSessionDescription):
+ * Modules/mediastream/RTCSessionDescription.idl: Use non-legacy exceptions.
+
+ * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+ (WebCore::verifyCustomHandlerURL): Just return a boolean, no exception.
+ (WebCore::verifyProtocolHandlerScheme): Ditto.
+ (WebCore::NavigatorContentUtils::registerProtocolHandler): Use ExceptionOr.
+ (WebCore::NavigatorContentUtils::isProtocolHandlerRegistered): Ditto.
+ (WebCore::NavigatorContentUtils::unregisterProtocolHandler): Ditto.
+ * Modules/navigatorcontentutils/NavigatorContentUtils.h: Updated for above.
+ * Modules/navigatorcontentutils/NavigatorContentUtils.idl: Use non-legacy exceptions.
+
+ * bindings/js/JSMediaDevicesCustom.cpp:
+ (WebCore::JSMediaDevicesGetUserMediaPromiseFunction): Use propagateException.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (NeedsExplicitPropagateExceptionCall): Added. Helper function to decide whether
+ we need to call propagateException explicitly, if return value processing is not
+ going to propagate the exception for us.
+ (GenerateParametersCheck): Moved the code from GenerateReturnParameters inline
+ because it's almost as short as the function call. Use the newly created
+ NeedsExplicitPropagateExceptionCall function, which properly handles the case
+ where the return value is a promise.
+ (GenerateReturnParameters): Deleted.
+
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::substringData): Use ExceptionOr.
+ (WebCore::CharacterData::insertData): Ditto.
+ (WebCore::CharacterData::deleteData): Ditto.
+ (WebCore::CharacterData::replaceData): Ditto.
+ * dom/CharacterData.h: Updated for above.
+ * dom/CharacterData.idl: Use non-legacy exceptions.
+
+ * dom/DataTransferItemList.h: Tried to use ExceptionOr, but this seems
+ like dead code that doesn't compile.
+ * dom/DataTransferItemList.idl: Use non-legacy exceptions.
+
+ * dom/MessagePort.idl: Use non-legacy exceptions, except this has
+ already been converted and was a custom binding.
+
+ * dom/MutationObserver.cpp:
+ (WebCore::MutationObserver::observe): Use ExceptionOr.
+ * dom/MutationObserver.h: Updated for above.
+ * dom/MutationObserver.idl: Use non-legacy exception.
+
+ * dom/Range.cpp:
+ (WebCore::deleteCharacterData): Updated use of calls that now use
+ ExceptionOr.
+ (WebCore::Range::processContentsBetweenOffsets): Ditto.
+ (WebCore::Range::insertNode): Ditto.
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::setInnerHTML): Use ExceptionOr.
+ * dom/ShadowRoot.h: Updated for above.
+ * dom/ShadowRoot.idl: Use non-legacy exception.
+
+ * dom/Text.cpp:
+ (WebCore::Text::splitText): Use ExceptionOr.
+ (WebCore::Text::replaceWholeText): Removed unused ExceptionCode&.
+ * dom/Text.h: Updated for above.
+ * dom/Text.idl: Use non-legacy exception.
+
+ * editing/ApplyBlockElementCommand.cpp:
+ (WebCore::isNewLineAtPosition): Rewrote to use data rather than
+ substringData; more efficient.
+
+ * editing/DeleteFromTextNodeCommand.cpp:
+ (WebCore::DeleteFromTextNodeCommand::doApply): Updated to work with
+ functions that return ExceptionOr.
+ (WebCore::DeleteFromTextNodeCommand::doUnapply): Removed IGNORE_EXCEPTION.
+
+ * editing/InsertIntoTextNodeCommand.cpp:
+ (WebCore::InsertIntoTextNodeCommand::InsertIntoTextNodeCommand):
+ Use WTFMove to avoid a little bit of reference count churn.
+ (WebCore::InsertIntoTextNodeCommand::doApply): Removed IGNORE_EXCEPTION.
+ (WebCore::InsertIntoTextNodeCommand::doReapply): Removed ExceptionCode.
+ (WebCore::InsertIntoTextNodeCommand::doUnapply): Removed IGNORE_EXCEPTION.
+
+ * editing/SplitTextNodeCommand.cpp:
+ (WebCore::SplitTextNodeCommand::doApply): Updated to work with functions
+ that return ExceptionCode.
+ (WebCore::SplitTextNodeCommand::doUnapply): Removed ASSERT_NO_EXCEPTION.
+ (WebCore::SplitTextNodeCommand::insertText1AndTrimText2): Updated to work
+ with functions that return ExceptionCode.
+
+ * html/HTMLTextFormControlElement.cpp:
+ Added now-needed include of ExceptionCode.h.
+
+ * inspector/DOMEditor.cpp: Removed ExceptionCode out argument from calls
+ to replaceWholeText, which never throws an exception.
+
</ins><span class="cx"> 2016-10-29 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Parse color() function
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -63,16 +63,24 @@
</span><span class="cx"> return downcast<Document>(scriptExecutionContext());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaDevices::getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&& promise, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> MediaDevices::getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&& promise) const
</ins><span class="cx"> {
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> UserMediaRequest::start(document(), WTFMove(audioConstraints), WTFMove(videoConstraints), WTFMove(promise), ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaDevices::enumerateDevices(EnumerateDevicesPromise&& promise, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> MediaDevices::enumerateDevices(EnumerateDevicesPromise&& promise) const
</ins><span class="cx"> {
</span><del>- RefPtr<MediaDevicesRequest> request = MediaDevicesRequest::create(document(), WTFMove(promise), ec);
</del><ins>+ ExceptionCode ec = 0;
+ auto request = MediaDevicesRequest::create(document(), WTFMove(promise), ec);
+ if (ec)
+ return Exception { ec };
</ins><span class="cx"> if (request)
</span><span class="cx"> request->start();
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaTrackSupportedConstraints> MediaDevices::getSupportedConstraints()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MediaDevices_h
-#define MediaDevices_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="lines">@@ -38,8 +37,6 @@
</span><span class="cx"> #include "MediaDeviceInfo.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <functional>
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -49,8 +46,6 @@
</span><span class="cx"> class MediaStream;
</span><span class="cx"> class MediaTrackSupportedConstraints;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><span class="cx"> class MediaDevices : public ScriptWrappable, public RefCounted<MediaDevices>, public ContextDestructionObserver {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MediaDevices> create(ScriptExecutionContext*);
</span><span class="lines">@@ -61,8 +56,8 @@
</span><span class="cx"> typedef DOMPromise<MediaStream> Promise;
</span><span class="cx"> typedef DOMPromise<MediaDeviceInfoVector> EnumerateDevicesPromise;
</span><span class="cx">
</span><del>- void getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&&, ExceptionCode&) const;
- void enumerateDevices(EnumerateDevicesPromise&&, ExceptionCode&) const;
</del><ins>+ ExceptionOr<void> getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&&) const;
+ ExceptionOr<void> enumerateDevices(EnumerateDevicesPromise&&) const;
</ins><span class="cx"> RefPtr<MediaTrackSupportedConstraints> getSupportedConstraints();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -72,5 +67,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span><del>-
-#endif // MediaDevices_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -34,6 +34,6 @@
</span><span class="cx"> ] interface MediaDevices {
</span><span class="cx"> MediaTrackSupportedConstraints getSupportedConstraints();
</span><span class="cx">
</span><del>- [Custom, PrivateIdentifier, PublicIdentifier] Promise getUserMedia(Dictionary options);
- [MayThrowLegacyException] Promise enumerateDevices();
</del><ins>+ [Custom, MayThrowException, PrivateIdentifier, PublicIdentifier] Promise getUserMedia(Dictionary options);
+ [MayThrowException] Promise enumerateDevices();
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "SDPProcessor.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<RTCIceServer> parseIceServer(const Dictionary& iceServer, ExceptionCode& ec)
</del><ins>+static ExceptionOr<Ref<RTCIceServer>> parseIceServer(const Dictionary& iceServer)
</ins><span class="cx"> {
</span><span class="cx"> String credential, username;
</span><span class="cx"> iceServer.get("credential", credential);
</span><span class="lines">@@ -67,24 +67,17 @@
</span><span class="cx"> // So we convert to a string always, which converts a sequence to a string in the format: "foo, bar, ..",
</span><span class="cx"> // then checking for a comma in the string assures that a string was a sequence and then we convert
</span><span class="cx"> // it to a sequence safely.
</span><del>- if (urlString.isEmpty()) {
- ec = INVALID_ACCESS_ERR;
- return nullptr;
- }
</del><ins>+ if (urlString.isEmpty())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> if (urlString.find(',') != notFound && iceServer.get("urls", urlsList) && urlsList.size()) {
</span><span class="cx"> for (auto iter = urlsList.begin(); iter != urlsList.end(); ++iter) {
</span><del>- if (!validateIceServerURL(*iter)) {
- ec = INVALID_ACCESS_ERR;
- return nullptr;
- }
</del><ins>+ if (!validateIceServerURL(*iter))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if (!validateIceServerURL(urlString)) {
- ec = INVALID_ACCESS_ERR;
- return nullptr;
- }
-
</del><ins>+ if (!validateIceServerURL(urlString))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> urlsList.append(urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,17 +84,17 @@
</span><span class="cx"> return RTCIceServer::create(urlsList, credential, username);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCConfiguration> RTCConfiguration::create(const Dictionary& configuration, ExceptionCode& ec)
</del><ins>+ExceptionOr<RefPtr<RTCConfiguration>> RTCConfiguration::create(const Dictionary& configuration)
</ins><span class="cx"> {
</span><span class="cx"> if (configuration.isUndefinedOrNull())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<RTCConfiguration> rtcConfiguration = adoptRef(new RTCConfiguration());
- rtcConfiguration->initialize(configuration, ec);
- if (ec)
- return nullptr;
</del><ins>+ auto result = adoptRef(*new RTCConfiguration);
+ auto initializeResult = result->initialize(configuration);
+ if (initializeResult.hasException())
+ return initializeResult.releaseException();
</ins><span class="cx">
</span><del>- return rtcConfiguration;
</del><ins>+ return RefPtr<RTCConfiguration> { WTFMove(result) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RTCConfiguration::RTCConfiguration()
</span><span class="lines">@@ -108,35 +101,31 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCConfiguration::initialize(const Dictionary& configuration, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCConfiguration::initialize(const Dictionary& configuration)
</ins><span class="cx"> {
</span><span class="cx"> ArrayValue iceServers;
</span><span class="cx"> bool ok = configuration.get("iceServers", iceServers);
</span><del>- if (!ok || iceServers.isUndefinedOrNull()) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
</del><ins>+ if (!ok || iceServers.isUndefinedOrNull())
+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx">
</span><span class="cx"> size_t numberOfServers;
</span><span class="cx"> ok = iceServers.length(numberOfServers);
</span><del>- if (!ok || !numberOfServers) {
- ec = !ok ? TYPE_MISMATCH_ERR : INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!ok)
+ return Exception { TYPE_MISMATCH_ERR };
+ if (!numberOfServers)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < numberOfServers; ++i) {
</span><span class="cx"> Dictionary iceServerDict;
</span><span class="cx"> ok = iceServers.get(i, iceServerDict);
</span><del>- if (!ok) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
</del><ins>+ if (!ok)
+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx">
</span><del>- RefPtr<RTCIceServer> iceServer = parseIceServer(iceServerDict, ec);
- if (!iceServer)
- return;
</del><ins>+ auto server = parseIceServer(iceServerDict);
+ if (server.hasException())
+ return server.releaseException();
</ins><span class="cx">
</span><del>- m_iceServers.append(WTFMove(iceServer));
</del><ins>+ m_iceServers.append(server.releaseReturnValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String iceTransportPolicy;
</span><span class="lines">@@ -145,10 +134,8 @@
</span><span class="cx"> m_iceTransportPolicy = IceTransportPolicy::Relay;
</span><span class="cx"> else if (iceTransportPolicy == "all")
</span><span class="cx"> m_iceTransportPolicy = IceTransportPolicy::All;
</span><del>- else {
- ec = TypeError;
- return;
- }
</del><ins>+ else
+ return Exception { TypeError };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String bundlePolicy;
</span><span class="lines">@@ -160,8 +147,10 @@
</span><span class="cx"> else if (bundlePolicy == "max-bundle")
</span><span class="cx"> m_bundlePolicy = BundlePolicy::MaxBundle;
</span><span class="cx"> else
</span><del>- ec = TypeError;
</del><ins>+ return Exception { TypeError };
</ins><span class="cx"> }
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,28 +28,23 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCConfiguration_h
-#define RTCConfiguration_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "PeerConnectionStates.h"
</span><span class="cx"> #include "RTCIceServer.h"
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Dictionary;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><ins>+// FIXME: Why reference count this?
</ins><span class="cx"> class RTCConfiguration : public RefCounted<RTCConfiguration> {
</span><span class="cx"> public:
</span><del>- static RefPtr<RTCConfiguration> create(const Dictionary& configuration, ExceptionCode&);
- virtual ~RTCConfiguration() { }
</del><ins>+ static ExceptionOr<RefPtr<RTCConfiguration>> create(const Dictionary& configuration);
</ins><span class="cx">
</span><span class="cx"> using IceTransportPolicy = PeerConnectionStates::IceTransportPolicy;
</span><span class="cx"> IceTransportPolicy iceTransportPolicy() const { return m_iceTransportPolicy; }
</span><span class="lines">@@ -62,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> RTCConfiguration();
</span><span class="cx">
</span><del>- void initialize(const Dictionary& configuration, ExceptionCode&);
</del><ins>+ ExceptionOr<void> initialize(const Dictionary& configuration);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<RTCIceServer>> m_iceServers;
</span><span class="cx"> IceTransportPolicy m_iceTransportPolicy { IceTransportPolicy::All };
</span><span class="lines">@@ -72,5 +67,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCConfiguration_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><ins>+ ImplementationLacksVTable,
</ins><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface RTCConfiguration {
</span><span class="cx"> readonly attribute sequence<RTCIceServer> iceServers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -44,21 +44,19 @@
</span><span class="cx"> static const long minInterToneGapMs = 30;
</span><span class="cx"> static const long defaultInterToneGapMs = 70;
</span><span class="cx">
</span><del>-RefPtr<RTCDTMFSender> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, RefPtr<MediaStreamTrack>&& track, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCDTMFSender>> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, RefPtr<MediaStreamTrack>&& track)
</ins><span class="cx"> {
</span><del>- std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(&track->source());
- if (!handler) {
- ec = NOT_SUPPORTED_ERR;
- return nullptr;
- }
</del><ins>+ auto handler = peerConnectionHandler->createDTMFSender(&track->source());
+ if (!handler)
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><del>- RefPtr<RTCDTMFSender> dtmfSender = adoptRef(new RTCDTMFSender(context, WTFMove(track), WTFMove(handler)));
- dtmfSender->suspendIfNeeded();
- return dtmfSender;
</del><ins>+ auto sender = adoptRef(*new RTCDTMFSender(*context, WTFMove(track), WTFMove(handler)));
+ sender->suspendIfNeeded();
+ return WTFMove(sender);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext* context, RefPtr<MediaStreamTrack>&& track, std::unique_ptr<RTCDTMFSenderHandler> handler)
- : ActiveDOMObject(context)
</del><ins>+RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext& context, RefPtr<MediaStreamTrack>&& track, std::unique_ptr<RTCDTMFSenderHandler> handler)
+ : ActiveDOMObject(&context)
</ins><span class="cx"> , m_track(WTFMove(track))
</span><span class="cx"> , m_duration(defaultToneDurationMs)
</span><span class="cx"> , m_interToneGap(defaultInterToneGapMs)
</span><span class="lines">@@ -88,28 +86,24 @@
</span><span class="cx"> return m_handler->currentToneBuffer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDTMFSender::insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDTMFSender::insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap)
</ins><span class="cx"> {
</span><del>- if (!canInsertDTMF()) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
</del><ins>+ if (!canInsertDTMF())
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><del>- if (duration && (duration.value() > maxToneDurationMs || duration.value() < minToneDurationMs)) {
- ec = SYNTAX_ERR;
- return;
- }
</del><ins>+ if (duration && (duration.value() > maxToneDurationMs || duration.value() < minToneDurationMs))
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (interToneGap && interToneGap.value() < minInterToneGapMs) {
- ec = SYNTAX_ERR;
- return;
- }
</del><ins>+ if (interToneGap && interToneGap.value() < minInterToneGapMs)
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><span class="cx"> m_duration = duration.valueOr(defaultToneDurationMs);
</span><span class="cx"> m_interToneGap = interToneGap.valueOr(defaultInterToneGapMs);
</span><span class="cx">
</span><span class="cx"> if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap))
</span><del>- ec = SYNTAX_ERR;
</del><ins>+ return Exception { SYNTAX_ERR };
+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCDTMFSender::didPlayTone(const String& tone)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -23,17 +23,16 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCDTMFSender_h
-#define RTCDTMFSender_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "RTCDTMFSenderHandlerClient.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/RefCounted.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -41,10 +40,10 @@
</span><span class="cx"> class RTCPeerConnectionHandler;
</span><span class="cx"> class RTCDTMFSenderHandler;
</span><span class="cx">
</span><del>-class RTCDTMFSender final : public RefCounted<RTCDTMFSender>, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject {
</del><ins>+class RTCDTMFSender final : public RefCounted<RTCDTMFSender>, public EventTargetWithInlineData, private RTCDTMFSenderHandlerClient, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><del>- static RefPtr<RTCDTMFSender> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, RefPtr<MediaStreamTrack>&&, ExceptionCode&);
- ~RTCDTMFSender();
</del><ins>+ static ExceptionOr<Ref<RTCDTMFSender>> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, RefPtr<MediaStreamTrack>&&);
+ virtual ~RTCDTMFSender();
</ins><span class="cx">
</span><span class="cx"> bool canInsertDTMF() const;
</span><span class="cx"> MediaStreamTrack* track() const;
</span><span class="lines">@@ -52,33 +51,29 @@
</span><span class="cx"> long duration() const { return m_duration; }
</span><span class="cx"> long interToneGap() const { return m_interToneGap; }
</span><span class="cx">
</span><del>- void insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap, ExceptionCode&);
</del><ins>+ ExceptionOr<void> insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap);
</ins><span class="cx">
</span><del>- // EventTarget
- EventTargetInterface eventTargetInterface() const override { return RTCDTMFSenderEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><del>- using RefCounted<RTCDTMFSender>::ref;
- using RefCounted<RTCDTMFSender>::deref;
-
</del><span class="cx"> private:
</span><del>- RTCDTMFSender(ScriptExecutionContext*, RefPtr<MediaStreamTrack>&&, std::unique_ptr<RTCDTMFSenderHandler>);
</del><ins>+ RTCDTMFSender(ScriptExecutionContext&, RefPtr<MediaStreamTrack>&&, std::unique_ptr<RTCDTMFSenderHandler>);
</ins><span class="cx">
</span><del>- // ActiveDOMObject
- void stop() override;
- const char* activeDOMObjectName() const override;
- bool canSuspendForDocumentSuspension() const override;
</del><ins>+ void stop() final;
+ const char* activeDOMObjectName() const final;
+ bool canSuspendForDocumentSuspension() const final;
</ins><span class="cx">
</span><ins>+ EventTargetInterface eventTargetInterface() const final { return RTCDTMFSenderEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
+
+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
+
+ void didPlayTone(const String&) final;
+
</ins><span class="cx"> void scheduleDispatchEvent(Ref<Event>&&);
</span><span class="cx"> void scheduledEventTimerFired();
</span><span class="cx">
</span><del>- // EventTarget
- void refEventTarget() override { ref(); }
- void derefEventTarget() override { deref(); }
-
- // RTCDTMFSenderHandlerClient
- void didPlayTone(const String&) override;
-
</del><span class="cx"> RefPtr<MediaStreamTrack> m_track;
</span><span class="cx"> long m_duration;
</span><span class="cx"> long m_interToneGap;
</span><span class="lines">@@ -94,5 +89,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCDTMFSender_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ ActiveDOMObject,
+ Conditional=WEB_RTC,
</ins><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=WEB_RTC,
- ActiveDOMObject,
</del><span class="cx"> ] interface RTCDTMFSender : EventTarget {
</span><span class="cx"> readonly attribute boolean canInsertDTMF;
</span><span class="cx"> readonly attribute MediaStreamTrack track;
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> readonly attribute long duration;
</span><span class="cx"> readonly attribute long interToneGap;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void insertDTMF(DOMString tones, optional long duration, optional long interToneGap);
</del><ins>+ [MayThrowException] void insertDTMF(DOMString tones, optional long duration, optional long interToneGap);
</ins><span class="cx">
</span><span class="cx"> attribute EventHandler ontonechange;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return arraybuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const Dictionary& options, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCDataChannel>> RTCDataChannel::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const Dictionary& options)
</ins><span class="cx"> {
</span><span class="cx"> RTCDataChannelInit initData;
</span><span class="cx"> String maxRetransmitsStr;
</span><span class="lines">@@ -71,31 +71,25 @@
</span><span class="cx"> bool maxRetransmitTimeConversion;
</span><span class="cx"> initData.maxRetransmits = maxRetransmitsStr.toUIntStrict(&maxRetransmitsConversion);
</span><span class="cx"> initData.maxRetransmitTime = maxRetransmitTimeStr.toUIntStrict(&maxRetransmitTimeConversion);
</span><del>- if (maxRetransmitsConversion && maxRetransmitTimeConversion) {
- ec = SYNTAX_ERR;
- return nullptr;
- }
</del><ins>+ if (maxRetransmitsConversion && maxRetransmitTimeConversion)
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- std::unique_ptr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);
- if (!handler) {
- ec = NOT_SUPPORTED_ERR;
- return nullptr;
- }
- return adoptRef(*new RTCDataChannel(context, WTFMove(handler)));
</del><ins>+ auto handler = peerConnectionHandler->createDataChannel(label, initData);
+ if (!handler)
+ return Exception { NOT_SUPPORTED_ERR };
+
+ return adoptRef(*new RTCDataChannel(*context, WTFMove(handler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler)
</del><ins>+Ref<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler>&& handler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(handler);
</span><del>- return adoptRef(*new RTCDataChannel(context, WTFMove(handler)));
</del><ins>+ return adoptRef(*new RTCDataChannel(*context, WTFMove(handler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler)
- : m_scriptExecutionContext(context)
</del><ins>+RTCDataChannel::RTCDataChannel(ScriptExecutionContext& context, std::unique_ptr<RTCDataChannelHandler>&& handler)
+ : m_scriptExecutionContext(&context)
</ins><span class="cx"> , m_handler(WTFMove(handler))
</span><del>- , m_stopped(false)
- , m_readyState(ReadyStateConnecting)
- , m_binaryType(BinaryTypeArrayBuffer)
</del><span class="cx"> , m_scheduledEventTimer(*this, &RTCDataChannel::scheduledEventTimerFired)
</span><span class="cx"> {
</span><span class="cx"> m_handler->setClient(this);
</span><span class="lines">@@ -122,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned short RTCDataChannel::maxRetransmits() const
</span><span class="cx"> {
</span><del>-return m_handler->maxRetransmits();
</del><ins>+ return m_handler->maxRetransmits();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String RTCDataChannel::protocol() const
</span><span class="lines">@@ -140,13 +134,13 @@
</span><span class="cx"> return m_handler->id();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AtomicString RTCDataChannel::readyState() const
</del><ins>+const AtomicString& RTCDataChannel::readyState() const
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<AtomicString> connectingState("connecting", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> openState("open", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> closingState("closing", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> closedState("closed", AtomicString::ConstructFromLiteral);
</span><del>-
</del><ins>+
</ins><span class="cx"> switch (m_readyState) {
</span><span class="cx"> case ReadyStateConnecting:
</span><span class="cx"> return connectingState;
</span><span class="lines">@@ -162,17 +156,17 @@
</span><span class="cx"> return emptyAtom;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long RTCDataChannel::bufferedAmount() const
</del><ins>+unsigned RTCDataChannel::bufferedAmount() const
</ins><span class="cx"> {
</span><span class="cx"> return m_handler->bufferedAmount();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AtomicString RTCDataChannel::binaryType() const
</del><ins>+const AtomicString& RTCDataChannel::binaryType() const
</ins><span class="cx"> {
</span><span class="cx"> switch (m_binaryType) {
</span><del>- case BinaryTypeBlob:
</del><ins>+ case BinaryType::Blob:
</ins><span class="cx"> return blobKeyword();
</span><del>- case BinaryTypeArrayBuffer:
</del><ins>+ case BinaryType::ArrayBuffer:
</ins><span class="cx"> return arraybufferKeyword();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,57 +174,58 @@
</span><span class="cx"> return emptyAtom;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::setBinaryType(const AtomicString& binaryType, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDataChannel::setBinaryType(const AtomicString& binaryType)
</ins><span class="cx"> {
</span><span class="cx"> if (binaryType == blobKeyword())
</span><del>- ec = NOT_SUPPORTED_ERR;
- else if (binaryType == arraybufferKeyword())
- m_binaryType = BinaryTypeArrayBuffer;
- else
- ec = TYPE_MISMATCH_ERR;
</del><ins>+ return Exception { NOT_SUPPORTED_ERR };
+ if (binaryType == arraybufferKeyword()) {
+ m_binaryType = BinaryType::ArrayBuffer;
+ return { };
+ }
+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(const String& data, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDataChannel::send(const String& data)
</ins><span class="cx"> {
</span><del>- if (m_readyState != ReadyStateOpen) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (m_readyState != ReadyStateOpen)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> if (!m_handler->sendStringData(data)) {
</span><span class="cx"> // FIXME: Decide what the right exception here is.
</span><del>- ec = SYNTAX_ERR;
</del><ins>+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(ArrayBuffer& data, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDataChannel::send(ArrayBuffer& data)
</ins><span class="cx"> {
</span><del>- if (m_readyState != ReadyStateOpen) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (m_readyState != ReadyStateOpen)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> size_t dataLength = data.byteLength();
</span><span class="cx"> if (!dataLength)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> const char* dataPointer = static_cast<const char*>(data.data());
</span><span class="cx">
</span><span class="cx"> if (!m_handler->sendRawData(dataPointer, dataLength)) {
</span><span class="cx"> // FIXME: Decide what the right exception here is.
</span><del>- ec = SYNTAX_ERR;
</del><ins>+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(ArrayBufferView& data, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDataChannel::send(ArrayBufferView& data)
</ins><span class="cx"> {
</span><del>- send(*data.buffer(), ec);
</del><ins>+ return send(*data.buffer());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(Blob&, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCDataChannel::send(Blob&)
</ins><span class="cx"> {
</span><del>- // FIXME: implement
- ec = NOT_SUPPORTED_ERR;
</del><ins>+ // FIXME: Implement.
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCDataChannel::close()
</span><span class="lines">@@ -273,12 +268,12 @@
</span><span class="cx"> if (m_stopped)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_binaryType == BinaryTypeBlob) {
</del><ins>+ if (m_binaryType == BinaryType::Blob) {
</ins><span class="cx"> // FIXME: Implement.
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_binaryType == BinaryTypeArrayBuffer) {
</del><ins>+ if (m_binaryType == BinaryType::ArrayBuffer) {
</ins><span class="cx"> scheduleDispatchEvent(MessageEvent::create(ArrayBuffer::create(data, dataLength)));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -22,16 +22,15 @@
</span><span class="cx"> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCDataChannel_h
-#define RTCDataChannel_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "EventTarget.h"
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "RTCDataChannelHandlerClient.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/RefCounted.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class ArrayBuffer;
</span><span class="lines">@@ -47,8 +46,8 @@
</span><span class="cx">
</span><span class="cx"> class RTCDataChannel final : public RefCounted<RTCDataChannel>, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
</span><span class="cx"> public:
</span><del>- static Ref<RTCDataChannel> create(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>);
- static RefPtr<RTCDataChannel> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, const String& label, const Dictionary& options, ExceptionCode&);
</del><ins>+ static Ref<RTCDataChannel> create(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>&&);
+ static ExceptionOr<Ref<RTCDataChannel>> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, const String& label, const Dictionary& options);
</ins><span class="cx"> ~RTCDataChannel();
</span><span class="cx">
</span><span class="cx"> String label() const;
</span><span class="lines">@@ -58,57 +57,52 @@
</span><span class="cx"> String protocol() const;
</span><span class="cx"> bool negotiated() const;
</span><span class="cx"> unsigned short id() const;
</span><del>- AtomicString readyState() const;
- unsigned long bufferedAmount() const;
</del><ins>+ const AtomicString& readyState() const;
+ unsigned bufferedAmount() const;
</ins><span class="cx">
</span><del>- AtomicString binaryType() const;
- void setBinaryType(const AtomicString&, ExceptionCode&);
</del><ins>+ const AtomicString& binaryType() const;
+ ExceptionOr<void> setBinaryType(const AtomicString&);
</ins><span class="cx">
</span><del>- void send(const String&, ExceptionCode&);
- void send(JSC::ArrayBuffer&, ExceptionCode&);
- void send(JSC::ArrayBufferView&, ExceptionCode&);
- void send(Blob&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> send(const String&);
+ ExceptionOr<void> send(JSC::ArrayBuffer&);
+ ExceptionOr<void> send(JSC::ArrayBufferView&);
+ ExceptionOr<void> send(Blob&);
</ins><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> void stop();
</span><span class="cx">
</span><del>- // EventTarget
- EventTargetInterface eventTargetInterface() const override { return RTCDataChannelEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const override { return m_scriptExecutionContext; }
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><del>- using RefCounted<RTCDataChannel>::ref;
- using RefCounted<RTCDataChannel>::deref;
-
</del><span class="cx"> private:
</span><del>- RTCDataChannel(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>);
</del><ins>+ RTCDataChannel(ScriptExecutionContext&, std::unique_ptr<RTCDataChannelHandler>&&);
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(Ref<Event>&&);
</span><span class="cx"> void scheduledEventTimerFired();
</span><span class="cx">
</span><del>- // EventTarget
- void refEventTarget() override { ref(); }
- void derefEventTarget() override { deref(); }
</del><ins>+ EventTargetInterface eventTargetInterface() const final { return RTCDataChannelEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final { return m_scriptExecutionContext; }
</ins><span class="cx">
</span><ins>+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
+
</ins><span class="cx"> ScriptExecutionContext* m_scriptExecutionContext;
</span><span class="cx">
</span><del>- // RTCDataChannelHandlerClient
- void didChangeReadyState(ReadyState) override;
- void didReceiveStringData(const String&) override;
- void didReceiveRawData(const char*, size_t) override;
- void didDetectError() override;
</del><ins>+ void didChangeReadyState(ReadyState) final;
+ void didReceiveStringData(const String&) final;
+ void didReceiveRawData(const char*, size_t) final;
+ void didDetectError() final;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<RTCDataChannelHandler> m_handler;
</span><span class="cx">
</span><del>- bool m_stopped;
</del><ins>+ bool m_stopped { false };
</ins><span class="cx">
</span><del>- ReadyState m_readyState;
- enum BinaryType {
- BinaryTypeBlob,
- BinaryTypeArrayBuffer
- };
- BinaryType m_binaryType;
</del><ins>+ ReadyState m_readyState { ReadyStateConnecting };
</ins><span class="cx">
</span><ins>+ enum class BinaryType { Blob, ArrayBuffer };
+ BinaryType m_binaryType { BinaryType::ArrayBuffer };
+
</ins><span class="cx"> Timer m_scheduledEventTimer;
</span><span class="cx"> Vector<Ref<Event>> m_scheduledEvents;
</span><span class="cx"> };
</span><span class="lines">@@ -116,5 +110,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCDataChannel_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -36,12 +36,12 @@
</span><span class="cx"> readonly attribute DOMString readyState;
</span><span class="cx"> readonly attribute unsigned long bufferedAmount;
</span><span class="cx">
</span><del>- [SetterMayThrowLegacyException] attribute DOMString binaryType;
</del><ins>+ [SetterMayThrowException] attribute DOMString binaryType;
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] void send(ArrayBuffer data);
- [MayThrowLegacyException] void send(ArrayBufferView data);
- [MayThrowLegacyException] void send(Blob data);
- [MayThrowLegacyException] void send(DOMString data);
</del><ins>+ [MayThrowException] void send(ArrayBuffer data);
+ [MayThrowException] void send(ArrayBufferView data);
+ [MayThrowException] void send(Blob data);
+ [MayThrowException] void send(DOMString data);
</ins><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -41,13 +41,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<RTCIceCandidate> RTCIceCandidate::create(const Dictionary& dictionary, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCIceCandidate>> RTCIceCandidate::create(const Dictionary& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> String candidate;
</span><del>- if (!dictionary.get("candidate", candidate)) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (!dictionary.get("candidate", candidate))
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> String sdpMid;
</span><span class="cx"> dictionary.getWithUndefinedOrNullCheck("sdpMid", sdpMid);
</span><span class="lines">@@ -58,19 +56,15 @@
</span><span class="cx"> if (dictionary.getWithUndefinedOrNullCheck("sdpMLineIndex", sdpMLineIndexString)) {
</span><span class="cx"> bool intConversionOk;
</span><span class="cx"> unsigned result = sdpMLineIndexString.toUIntStrict(&intConversionOk);
</span><del>- if (!intConversionOk || result > USHRT_MAX) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (!intConversionOk || result > USHRT_MAX)
+ return Exception { TypeError };
</ins><span class="cx"> sdpMLineIndex = result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sdpMid.isNull() && !sdpMLineIndex) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (sdpMid.isNull() && !sdpMLineIndex)
+ return Exception { TypeError };
</ins><span class="cx">
</span><del>- return adoptRef(new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</del><ins>+ return adoptRef(*new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<RTCIceCandidate> RTCIceCandidate::create(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,17 +28,13 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCIceCandidate_h
-#define RTCIceCandidate_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "ExceptionBase.h"
</del><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/Optional.h>
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -47,9 +43,8 @@
</span><span class="cx">
</span><span class="cx"> class RTCIceCandidate : public RefCounted<RTCIceCandidate>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- static RefPtr<RTCIceCandidate> create(const Dictionary&, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<RTCIceCandidate>> create(const Dictionary&);
</ins><span class="cx"> static Ref<RTCIceCandidate> create(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex);
</span><del>- virtual ~RTCIceCandidate() { }
</del><span class="cx">
</span><span class="cx"> const String& candidate() const { return m_candidate; }
</span><span class="cx"> const String& sdpMid() const { return m_sdpMid; }
</span><span class="lines">@@ -66,5 +61,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCIceCandidate_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(Dictionary dictionary),
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
+ ImplementationLacksVTable,
</ins><span class="cx"> PrivateIdentifier,
</span><span class="cx"> PublicIdentifier
</span><span class="cx"> ] interface RTCIceCandidate {
</span><span class="lines">@@ -42,4 +43,3 @@
</span><span class="cx">
</span><span class="cx"> serializer = {candidate, sdpMid, sdpMLineIndex};
</span><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCOfferAnswerOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -33,11 +33,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RTCOfferAnswerOptions::RTCOfferAnswerOptions()
- : m_voiceActivityDetection(true)
-{
-}
-
</del><span class="cx"> bool RTCOfferAnswerOptions::initialize(const Dictionary& options)
</span><span class="cx"> {
</span><span class="cx"> bool voiceActivityDetection;
</span><span class="lines">@@ -47,26 +42,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCOfferOptions> RTCOfferOptions::create(const Dictionary& options, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCOfferOptions>> RTCOfferOptions::create(const Dictionary& options)
</ins><span class="cx"> {
</span><del>- RefPtr<RTCOfferOptions> offerOptions = adoptRef(new RTCOfferOptions());
- if (!offerOptions->initialize(options)) {
</del><ins>+ auto result = adoptRef(*new RTCOfferOptions);
+ if (!result->initialize(options)) {
</ins><span class="cx"> // FIXME: https://webkit.org/b/129800
</span><span class="cx"> // According to the spec, the error is going to be defined yet, so let's use TYPE_MISMATCH_ERR for now.
</span><del>- ec = TYPE_MISMATCH_ERR;
- return nullptr;
</del><ins>+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx"> }
</span><del>-
- return offerOptions;
</del><ins>+ return WTFMove(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RTCOfferOptions::RTCOfferOptions()
- : m_offerToReceiveVideo(0)
- , m_offerToReceiveAudio(0)
- , m_iceRestart(false)
-{
-}
-
</del><span class="cx"> bool RTCOfferOptions::initialize(const Dictionary& options)
</span><span class="cx"> {
</span><span class="cx"> if (options.isUndefinedOrNull())
</span><span class="lines">@@ -99,17 +85,15 @@
</span><span class="cx"> return RTCOfferAnswerOptions::initialize(options);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCAnswerOptions> RTCAnswerOptions::create(const Dictionary& options, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCAnswerOptions>> RTCAnswerOptions::create(const Dictionary& options)
</ins><span class="cx"> {
</span><del>- RefPtr<RTCAnswerOptions> offerOptions = adoptRef(new RTCAnswerOptions());
- if (!offerOptions->initialize(options)) {
</del><ins>+ auto result = adoptRef(*new RTCAnswerOptions);
+ if (!result->initialize(options)) {
</ins><span class="cx"> // FIXME: https://webkit.org/b/129800
</span><span class="cx"> // According to the spec, the error is going to be defined yet, so let's use TYPE_MISMATCH_ERR for now.
</span><del>- ec = TYPE_MISMATCH_ERR;
- return nullptr;
</del><ins>+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx"> }
</span><del>-
- return offerOptions;
</del><ins>+ return WTFMove(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RTCAnswerOptions::initialize(const Dictionary& options)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCOfferAnswerOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCOfferAnswerOptions_h
-#define RTCOfferAnswerOptions_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -38,22 +37,22 @@
</span><span class="cx">
</span><span class="cx"> class Dictionary;
</span><span class="cx">
</span><del>-class RTCOfferAnswerOptions : public RefCounted<RTCOfferAnswerOptions> {
</del><ins>+class RTCOfferAnswerOptions {
</ins><span class="cx"> public:
</span><del>- virtual ~RTCOfferAnswerOptions() { }
-
</del><span class="cx"> bool voiceActivityDetection() const { return m_voiceActivityDetection; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual bool initialize(const Dictionary&);
- RTCOfferAnswerOptions();
</del><ins>+ RTCOfferAnswerOptions() = default;
+ bool initialize(const Dictionary&);
</ins><span class="cx">
</span><del>- bool m_voiceActivityDetection;
</del><ins>+private:
+ bool m_voiceActivityDetection { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class RTCOfferOptions : public RTCOfferAnswerOptions {
</del><ins>+// FIXME: Why is this reference counted?
+class RTCOfferOptions : public RefCounted<RTCOfferOptions>, public RTCOfferAnswerOptions {
</ins><span class="cx"> public:
</span><del>- static RefPtr<RTCOfferOptions> create(const Dictionary&, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<RTCOfferOptions>> create(const Dictionary&);
</ins><span class="cx">
</span><span class="cx"> int64_t offerToReceiveVideo() const { return m_offerToReceiveVideo; }
</span><span class="cx"> int64_t offerToReceiveAudio() const { return m_offerToReceiveAudio; }
</span><span class="lines">@@ -60,25 +59,24 @@
</span><span class="cx"> bool iceRestart() const { return m_iceRestart; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool initialize(const Dictionary&) override;
- RTCOfferOptions();
</del><ins>+ RTCOfferOptions() = default;
+ bool initialize(const Dictionary&);
</ins><span class="cx">
</span><del>- int64_t m_offerToReceiveVideo;
- int64_t m_offerToReceiveAudio;
- bool m_iceRestart;
</del><ins>+ int64_t m_offerToReceiveVideo { 0 };
+ int64_t m_offerToReceiveAudio { 0 };
+ bool m_iceRestart { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class RTCAnswerOptions : public RTCOfferAnswerOptions {
</del><ins>+// FIXME: Why is this reference counted?
+class RTCAnswerOptions : public RefCounted<RTCAnswerOptions>, public RTCOfferAnswerOptions {
</ins><span class="cx"> public:
</span><del>- static RefPtr<RTCAnswerOptions> create(const Dictionary&, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<RTCAnswerOptions>> create(const Dictionary&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- bool initialize(const Dictionary&) override;
- RTCAnswerOptions() { }
</del><ins>+ RTCAnswerOptions() = default;
+ bool initialize(const Dictionary&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCOfferAnswerOptions_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -78,39 +78,29 @@
</span><span class="cx"> stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::initializeWith(Document& document, const Dictionary& rtcConfiguration, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCPeerConnection::initializeWith(Document& document, const Dictionary& rtcConfiguration)
</ins><span class="cx"> {
</span><del>- if (!document.frame()) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
</del><ins>+ if (!document.frame())
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><del>- if (!m_backend) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
</del><ins>+ if (!m_backend)
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><del>- setConfiguration(rtcConfiguration, ec);
</del><ins>+ return setConfiguration(rtcConfiguration);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, const Vector<std::reference_wrapper<MediaStream>>& streams, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCRtpSender>> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, const Vector<std::reference_wrapper<MediaStream>>& streams)
</ins><span class="cx"> {
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> // Require at least one stream until https://github.com/w3c/webrtc-pc/issues/288 is resolved
</span><del>- if (!streams.size()) {
- ec = NOT_SUPPORTED_ERR;
- return nullptr;
- }
</del><ins>+ if (!streams.size())
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><span class="cx"> for (auto& sender : m_transceiverSet->getSenders()) {
</span><del>- if (sender->trackId() == track->id()) {
- ec = INVALID_ACCESS_ERR;
- return nullptr;
- }
</del><ins>+ if (sender->trackId() == track->id())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> mediaStreamIds;
</span><span class="lines">@@ -150,30 +140,27 @@
</span><span class="cx">
</span><span class="cx"> m_backend->markAsNeedingNegotiation();
</span><span class="cx">
</span><del>- return sender;
</del><ins>+ return Ref<RTCRtpSender> { *sender };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::removeTrack(RTCRtpSender& sender, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCPeerConnection::removeTrack(RTCRtpSender& sender)
</ins><span class="cx"> {
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> if (!m_transceiverSet->getSenders().contains(&sender))
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> sender.stop();
</span><span class="cx">
</span><span class="cx"> m_backend->markAsNeedingNegotiation();
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpTransceiver> RTCPeerConnection::addTransceiver(Ref<MediaStreamTrack>&& track, const RtpTransceiverInit& init, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCRtpTransceiver>> RTCPeerConnection::addTransceiver(Ref<MediaStreamTrack>&& track, const RtpTransceiverInit& init)
</ins><span class="cx"> {
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> String transceiverMid = RTCRtpTransceiver::getNextMid();
</span><span class="cx"> const String& trackKind = track->kind();
</span><span class="lines">@@ -184,20 +171,17 @@
</span><span class="cx"> auto transceiver = RTCRtpTransceiver::create(WTFMove(sender), WTFMove(receiver));
</span><span class="cx"> transceiver->setProvisionalMid(transceiverMid);
</span><span class="cx">
</span><del>- return completeAddTransceiver(WTFMove(transceiver), init);
</del><ins>+ completeAddTransceiver(transceiver, init);
+ return WTFMove(transceiver);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpTransceiver> RTCPeerConnection::addTransceiver(const String& kind, const RtpTransceiverInit& init, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCRtpTransceiver>> RTCPeerConnection::addTransceiver(const String& kind, const RtpTransceiverInit& init)
</ins><span class="cx"> {
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>- if (kind != "audio" && kind != "video") {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (kind != "audio" && kind != "video")
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> String transceiverMid = RTCRtpTransceiver::getNextMid();
</span><span class="cx"> String trackId = createCanonicalUUIDString();
</span><span class="lines">@@ -207,17 +191,16 @@
</span><span class="cx"> auto transceiver = RTCRtpTransceiver::create(WTFMove(sender), WTFMove(receiver));
</span><span class="cx"> transceiver->setProvisionalMid(transceiverMid);
</span><span class="cx">
</span><del>- return completeAddTransceiver(WTFMove(transceiver), init);
</del><ins>+ completeAddTransceiver(transceiver, init);
+ return WTFMove(transceiver);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpTransceiver> RTCPeerConnection::completeAddTransceiver(Ref<RTCRtpTransceiver>&& transceiver, const RtpTransceiverInit& init)
</del><ins>+void RTCPeerConnection::completeAddTransceiver(RTCRtpTransceiver& transceiver, const RtpTransceiverInit& init)
</ins><span class="cx"> {
</span><del>- transceiver->setDirection(static_cast<RTCRtpTransceiver::Direction>(init.direction));
</del><ins>+ transceiver.setDirection(static_cast<RTCRtpTransceiver::Direction>(init.direction));
</ins><span class="cx">
</span><del>- m_transceiverSet->append(transceiver.copyRef());
</del><ins>+ m_transceiverSet->append(&transceiver);
</ins><span class="cx"> m_backend->markAsNeedingNegotiation();
</span><del>-
- return WTFMove(transceiver);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::queuedCreateOffer(const Dictionary& offerOptions, SessionDescriptionPromise&& promise)
</span><span class="lines">@@ -227,15 +210,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
- RefPtr<RTCOfferOptions> options = RTCOfferOptions::create(offerOptions, ec);
- if (ec) {
</del><ins>+ auto options = RTCOfferOptions::create(offerOptions);
+ if (options.hasException()) {
</ins><span class="cx"> promise.reject(OperationError, "Invalid createOffer argument");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT(options);
</del><span class="cx">
</span><del>- m_backend->createOffer(*options, WTFMove(promise));
</del><ins>+ m_backend->createOffer(options.releaseReturnValue(), WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::queuedCreateAnswer(const Dictionary& answerOptions, SessionDescriptionPromise&& promise)
</span><span class="lines">@@ -245,14 +226,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
- RefPtr<RTCAnswerOptions> options = RTCAnswerOptions::create(answerOptions, ec);
- if (ec) {
</del><ins>+ auto options = RTCAnswerOptions::create(answerOptions);
+ if (options.hasException()) {
</ins><span class="cx"> promise.reject(OperationError, "Invalid createAnswer argument");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_backend->createAnswer(*options, WTFMove(promise));
</del><ins>+ m_backend->createAnswer(options.releaseReturnValue(), WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::queuedSetLocalDescription(RTCSessionDescription& description, PeerConnection::VoidPromise&& promise)
</span><span class="lines">@@ -379,24 +359,21 @@
</span><span class="cx"> return m_configuration.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::setConfiguration(const Dictionary& configuration, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCPeerConnection::setConfiguration(const Dictionary& configuration)
</ins><span class="cx"> {
</span><del>- if (configuration.isUndefinedOrNull()) {
- ec = TypeError;
- return;
- }
</del><ins>+ if (configuration.isUndefinedOrNull())
+ return Exception { TypeError };
</ins><span class="cx">
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>- RefPtr<RTCConfiguration> newConfiguration = RTCConfiguration::create(configuration, ec);
- if (ec)
- return;
</del><ins>+ auto newConfiguration = RTCConfiguration::create(configuration);
+ if (newConfiguration.hasException())
+ return newConfiguration.releaseException();
</ins><span class="cx">
</span><del>- m_configuration = WTFMove(newConfiguration);
</del><ins>+ m_configuration = newConfiguration.releaseReturnValue();
</ins><span class="cx"> m_backend->setConfiguration(*m_configuration);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::privateGetStats(MediaStreamTrack* selector, PeerConnection::StatsPromise&& promise)
</span><span class="lines">@@ -404,12 +381,10 @@
</span><span class="cx"> m_backend->getStats(selector, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCDataChannel> RTCPeerConnection::createDataChannel(String, const Dictionary&, ExceptionCode& ec)
</del><ins>+ExceptionOr<RefPtr<RTCDataChannel>> RTCPeerConnection::createDataChannel(const String&, const Dictionary&)
</ins><span class="cx"> {
</span><del>- if (m_signalingState == SignalingState::Closed) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (m_signalingState == SignalingState::Closed)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> static Ref<RTCPeerConnection> create(ScriptExecutionContext&);
</span><span class="cx"> ~RTCPeerConnection();
</span><span class="cx">
</span><del>- void initializeWith(Document&, const Dictionary&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> initializeWith(Document&, const Dictionary&);
</ins><span class="cx">
</span><span class="cx"> const Vector<RefPtr<RTCRtpSender>>& getSenders() const { return m_transceiverSet->getSenders(); }
</span><span class="cx"> const Vector<RefPtr<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->getReceivers(); }
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> // Part of legacy MediaStream-based API (mostly implemented as JS built-ins)
</span><span class="cx"> Vector<RefPtr<MediaStream>> getRemoteStreams() const { return m_backend->getRemoteStreams(); }
</span><span class="cx">
</span><del>- RefPtr<RTCRtpSender> addTrack(Ref<MediaStreamTrack>&&, const Vector<std::reference_wrapper<MediaStream>>&, ExceptionCode&);
- void removeTrack(RTCRtpSender&, ExceptionCode&);
</del><ins>+ ExceptionOr<Ref<RTCRtpSender>> addTrack(Ref<MediaStreamTrack>&&, const Vector<std::reference_wrapper<MediaStream>>&);
+ ExceptionOr<void> removeTrack(RTCRtpSender&);
</ins><span class="cx">
</span><span class="cx"> // This enum is mirrored in RTCRtpTransceiver.h
</span><span class="cx"> enum class RtpTransceiverDirection { Sendrecv, Sendonly, Recvonly, Inactive };
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> RtpTransceiverDirection direction;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- RefPtr<RTCRtpTransceiver> addTransceiver(Ref<MediaStreamTrack>&&, const RtpTransceiverInit&, ExceptionCode&);
- RefPtr<RTCRtpTransceiver> addTransceiver(const String& kind, const RtpTransceiverInit&, ExceptionCode&);
</del><ins>+ ExceptionOr<Ref<RTCRtpTransceiver>> addTransceiver(Ref<MediaStreamTrack>&&, const RtpTransceiverInit&);
+ ExceptionOr<Ref<RTCRtpTransceiver>> addTransceiver(const String& kind, const RtpTransceiverInit&);
</ins><span class="cx">
</span><span class="cx"> void queuedCreateOffer(const Dictionary& offerOptions, PeerConnection::SessionDescriptionPromise&&);
</span><span class="cx"> void queuedCreateAnswer(const Dictionary& answerOptions, PeerConnection::SessionDescriptionPromise&&);
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> String iceConnectionState() const;
</span><span class="cx">
</span><span class="cx"> RTCConfiguration* getConfiguration() const;
</span><del>- void setConfiguration(const Dictionary& configuration, ExceptionCode&);
</del><ins>+ ExceptionOr<void> setConfiguration(const Dictionary&);
</ins><span class="cx">
</span><span class="cx"> void privateGetStats(MediaStreamTrack*, PeerConnection::StatsPromise&&);
</span><span class="cx">
</span><del>- RefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionCode&);
</del><ins>+ ExceptionOr<RefPtr<RTCDataChannel>> createDataChannel(const String& label, const Dictionary& dataChannelDict);
</ins><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> private:
</span><span class="cx"> RTCPeerConnection(ScriptExecutionContext&);
</span><span class="cx">
</span><del>- RefPtr<RTCRtpTransceiver> completeAddTransceiver(Ref<RTCRtpTransceiver>&&, const RtpTransceiverInit&);
</del><ins>+ void completeAddTransceiver(RTCRtpTransceiver&, const RtpTransceiverInit&);
</ins><span class="cx">
</span><span class="cx"> // EventTarget implementation.
</span><span class="cx"> void refEventTarget() final { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> JSBuiltinConstructor,
</span><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span><span class="cx"> // Private initializer
</span><del>- [PrivateIdentifier, CallWith=Document, MayThrowLegacyException] void initializeWith(Dictionary parameters);
</del><ins>+ [PrivateIdentifier, CallWith=Document, MayThrowException] void initializeWith(Dictionary parameters);
</ins><span class="cx">
</span><span class="cx"> // RTP Media API extensions
</span><span class="cx"> [PrivateIdentifier, PublicIdentifier] sequence<RTCRtpSender> getSenders();
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> sequence<RTCRtpReceiver> getReceivers();
</span><span class="cx"> sequence<RTCRtpTransceiver> getTransceivers();
</span><span class="cx">
</span><del>- [PrivateIdentifier, PublicIdentifier, MayThrowLegacyException] RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
- [PrivateIdentifier, PublicIdentifier, MayThrowLegacyException] void removeTrack(RTCRtpSender sender);
</del><ins>+ [PrivateIdentifier, PublicIdentifier, MayThrowException] RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
+ [PrivateIdentifier, PublicIdentifier, MayThrowException] void removeTrack(RTCRtpSender sender);
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] RTCRtpTransceiver addTransceiver(MediaStreamTrack track, optional RTCRtpTransceiverInit init);
- [MayThrowLegacyException] RTCRtpTransceiver addTransceiver(DOMString kind, optional RTCRtpTransceiverInit init);
</del><ins>+ [MayThrowException] RTCRtpTransceiver addTransceiver(MediaStreamTrack track, optional RTCRtpTransceiverInit init);
+ [MayThrowException] RTCRtpTransceiver addTransceiver(DOMString kind, optional RTCRtpTransceiverInit init);
</ins><span class="cx">
</span><span class="cx"> // Legacy MediaSream-based API (implemented on top of the RTP Media API)
</span><span class="cx"> [JSBuiltin] sequence<MediaStream> getLocalStreams();
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> readonly attribute DOMString iceConnectionState;
</span><span class="cx">
</span><span class="cx"> RTCConfiguration getConfiguration();
</span><del>- [MayThrowLegacyException] void setConfiguration(Dictionary configuration);
</del><ins>+ [MayThrowException] void setConfiguration(Dictionary configuration);
</ins><span class="cx">
</span><span class="cx"> [JSBuiltin] Promise getStats(optional MediaStreamTrack? selector = null);
</span><span class="cx"> // Legacy signature: Promise getStats(MediaStreamTrack? selector
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> [PrivateIdentifier] Promise queuedAddIceCandidate(RTCIceCandidate candidate);
</span><span class="cx"> [PrivateIdentifier] Promise privateGetStats(MediaStreamTrack? selector);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] RTCDataChannel createDataChannel([TreatNullAs=EmptyString] DOMString label, optional Dictionary options);
</del><ins>+ [MayThrowException] RTCDataChannel createDataChannel([TreatNullAs=EmptyString] DOMString label, optional Dictionary options);
</ins><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -67,19 +67,19 @@
</span><span class="cx"> m_track = WTFMove(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCRtpSender::replaceTrack(Ref<MediaStreamTrack>&& withTrack, PeerConnection::VoidPromise&& promise, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> RTCRtpSender::replaceTrack(Ref<MediaStreamTrack>&& withTrack, PeerConnection::VoidPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (isStopped()) {
</span><span class="cx"> promise.reject(INVALID_STATE_ERR);
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_trackKind != withTrack->kind()) {
- ec = TypeError;
- return;
- }
</del><ins>+ if (m_trackKind != withTrack->kind())
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> m_client->replaceTrack(*this, WTFMove(withTrack), WTFMove(promise));
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,14 +28,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCRtpSender_h
-#define RTCRtpSender_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "PeerConnectionBackend.h"
</span><span class="cx"> #include "RTCRtpSenderReceiverBase.h"
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,7 +59,7 @@
</span><span class="cx"> void stop() { m_client = nullptr; }
</span><span class="cx"> void setTrack(RefPtr<MediaStreamTrack>&&);
</span><span class="cx">
</span><del>- void replaceTrack(Ref<MediaStreamTrack>&&, PeerConnection::VoidPromise&&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> replaceTrack(Ref<MediaStreamTrack>&&, PeerConnection::VoidPromise&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RTCRtpSender(RefPtr<MediaStreamTrack>&&, const String& trackKind, Vector<String>&& mediaStreamIds, RTCRtpSenderClient&);
</span><span class="lines">@@ -75,4 +73,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-#endif // RTCRtpSender_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -33,5 +33,5 @@
</span><span class="cx"> ] interface RTCRtpSender {
</span><span class="cx"> readonly attribute MediaStreamTrack? track;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] Promise replaceTrack(MediaStreamTrack withTrack);
</del><ins>+ [MayThrowException] Promise replaceTrack(MediaStreamTrack withTrack);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "RTCSessionDescription.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCSessionDescription.h"
-
</del><span class="cx"> #include "Dictionary.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,25 +55,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCSessionDescription> RTCSessionDescription::create(const Dictionary& dictionary, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<RTCSessionDescription>> RTCSessionDescription::create(const Dictionary& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> String typeString;
</span><span class="cx"> // Dictionary member type is required.
</span><del>- if (!dictionary.get("type", typeString)) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (!dictionary.get("type", typeString))
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> SdpType type;
</span><del>- if (!parseTypeString(typeString, type)) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (!parseTypeString(typeString, type))
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> String sdp;
</span><span class="cx"> dictionary.get("sdp", sdp);
</span><span class="cx">
</span><del>- return adoptRef(new RTCSessionDescription(type, sdp));
</del><ins>+ return adoptRef(*new RTCSessionDescription(type, sdp));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<RTCSessionDescription> RTCSessionDescription::create(SdpType type, const String& sdp)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,16 +28,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCSessionDescription_h
-#define RTCSessionDescription_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "ExceptionCode.h"
</del><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -52,9 +48,8 @@
</span><span class="cx"> Rollback
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static RefPtr<RTCSessionDescription> create(const Dictionary&, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<RTCSessionDescription>> create(const Dictionary&);
</ins><span class="cx"> static Ref<RTCSessionDescription> create(SdpType, const String& sdp);
</span><del>- virtual ~RTCSessionDescription() { }
</del><span class="cx">
</span><span class="cx"> SdpType type() const { return m_type; }
</span><span class="cx">
</span><span class="lines">@@ -71,5 +66,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCSessionDescription_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -32,11 +32,12 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(Dictionary dictionary),
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
+ ImplementationLacksVTable,
</ins><span class="cx"> PrivateIdentifier,
</span><del>- PublicIdentifier
</del><ins>+ PublicIdentifier,
</ins><span class="cx"> ] interface RTCSessionDescription {
</span><del>- [SetterMayThrowLegacyException] readonly attribute RTCSdpType type;
</del><ins>+ [SetterMayThrowException] readonly attribute RTCSdpType type;
</ins><span class="cx"> readonly attribute DOMString sdp;
</span><span class="cx">
</span><span class="cx"> serializer = {type, sdp};
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -39,16 +39,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool verifyCustomHandlerURL(const URL& baseURL, const String& url, ExceptionCode& ec)
</del><ins>+static bool verifyCustomHandlerURL(const URL& baseURL, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> // The specification requires that it is a SYNTAX_ERR if the "%s" token is
</span><span class="cx"> // not present.
</span><span class="cx"> static const char token[] = "%s";
</span><span class="cx"> int index = url.find(token);
</span><del>- if (-1 == index) {
- ec = SYNTAX_ERR;
</del><ins>+ if (-1 == index)
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // It is also a SYNTAX_ERR if the custom handler URL, as created by removing
</span><span class="cx"> // the "%s" token and prepending the base url, does not resolve.
</span><span class="lines">@@ -57,10 +55,8 @@
</span><span class="cx">
</span><span class="cx"> URL kurl(baseURL, newURL);
</span><span class="cx">
</span><del>- if (kurl.isEmpty() || !kurl.isValid()) {
- ec = SYNTAX_ERR;
</del><ins>+ if (kurl.isEmpty() || !kurl.isValid())
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +72,7 @@
</span><span class="cx"> return protocolWhitelist.get().contains(scheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionCode& ec)
</del><ins>+static bool verifyProtocolHandlerScheme(const String& scheme)
</ins><span class="cx"> {
</span><span class="cx"> if (isProtocolWhitelisted(scheme))
</span><span class="cx"> return true;
</span><span class="lines">@@ -88,7 +84,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ec = SECURITY_ERR;
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,23 +96,25 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigatorContentUtils::registerProtocolHandler(Navigator& navigator, const String& scheme, const String& url, const String& title, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> NavigatorContentUtils::registerProtocolHandler(Navigator& navigator, const String& scheme, const String& url, const String& title)
</ins><span class="cx"> {
</span><span class="cx"> if (!navigator.frame())
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> URL baseURL = navigator.frame()->document()->baseURL();
</span><span class="cx">
</span><del>- if (!verifyCustomHandlerURL(baseURL, url, ec))
- return;
</del><ins>+ if (!verifyCustomHandlerURL(baseURL, url))
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (!verifyProtocolHandlerScheme(scheme, ec))
- return;
</del><ins>+ if (!verifyProtocolHandlerScheme(scheme))
+ return Exception { SECURITY_ERR };
</ins><span class="cx">
</span><span class="cx"> NavigatorContentUtils::from(navigator.frame()->page())->client()->registerProtocolHandler(scheme, baseURL, URL(ParsedURLString, url), navigator.frame()->displayStringModifiedByEncoding(title));
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_SCHEME_HANDLER)
</span><ins>+
</ins><span class="cx"> static String customHandlersStateString(const NavigatorContentUtilsClient::CustomHandlersState state)
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<String> newHandler(ASCIILiteral("new"));
</span><span class="lines">@@ -137,39 +134,41 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String NavigatorContentUtils::isProtocolHandlerRegistered(Navigator& navigator, const String& scheme, const String& url, ExceptionCode& ec)
</del><ins>+ExceptionOr<String> NavigatorContentUtils::isProtocolHandlerRegistered(Navigator& navigator, const String& scheme, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<String> declined(ASCIILiteral("declined"));
</span><span class="cx">
</span><span class="cx"> if (!navigator.frame())
</span><del>- return declined;
</del><ins>+ return String { declined };
</ins><span class="cx">
</span><span class="cx"> URL baseURL = navigator.frame()->document()->baseURL();
</span><span class="cx">
</span><del>- if (!verifyCustomHandlerURL(baseURL, url, ec))
- return declined;
</del><ins>+ if (!verifyCustomHandlerURL(baseURL, url))
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (!verifyProtocolHandlerScheme(scheme, ec))
- return declined;
</del><ins>+ if (!verifyProtocolHandlerScheme(scheme))
+ return Exception { SECURITY_ERR };
</ins><span class="cx">
</span><span class="cx"> return customHandlersStateString(NavigatorContentUtils::from(navigator.frame()->page())->client()->isProtocolHandlerRegistered(scheme, baseURL, URL(ParsedURLString, url)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigatorContentUtils::unregisterProtocolHandler(Navigator& navigator, const String& scheme, const String& url, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> NavigatorContentUtils::unregisterProtocolHandler(Navigator& navigator, const String& scheme, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> if (!navigator.frame())
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> URL baseURL = navigator.frame()->document()->baseURL();
</span><span class="cx">
</span><del>- if (!verifyCustomHandlerURL(baseURL, url, ec))
- return;
</del><ins>+ if (!verifyCustomHandlerURL(baseURL, url))
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (!verifyProtocolHandlerScheme(scheme, ec))
- return;
</del><ins>+ if (!verifyProtocolHandlerScheme(scheme))
+ return Exception { SECURITY_ERR };
</ins><span class="cx">
</span><span class="cx"> NavigatorContentUtils::from(navigator.frame()->page())->client()->unregisterProtocolHandler(scheme, baseURL, URL(ParsedURLString, url));
</span><ins>+ return { };
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> const char* NavigatorContentUtils::supplementName()
</span><span class="lines">@@ -185,4 +184,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NAVIGATOR_CONTENT_UTILS)
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -24,14 +24,13 @@
</span><span class="cx"> * DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef NavigatorContentUtils_h
-#define NavigatorContentUtils_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NAVIGATOR_CONTENT_UTILS)
</span><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "NavigatorContentUtilsClient.h"
</span><span class="cx"> #include "Supplementable.h"
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -51,11 +50,11 @@
</span><span class="cx"> static const char* supplementName();
</span><span class="cx"> static NavigatorContentUtils* from(Page*);
</span><span class="cx">
</span><del>- static void registerProtocolHandler(Navigator&, const String& scheme, const String& url, const String& title, ExceptionCode&);
</del><ins>+ static ExceptionOr<void> registerProtocolHandler(Navigator&, const String& scheme, const String& url, const String& title);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_SCHEME_HANDLER)
</span><del>- static String isProtocolHandlerRegistered(Navigator&, const String& scheme, const String& url, ExceptionCode&);
- static void unregisterProtocolHandler(Navigator&, const String& scheme, const String& url, ExceptionCode&);
</del><ins>+ static ExceptionOr<String> isProtocolHandlerRegistered(Navigator&, const String& scheme, const String& url);
+ static ExceptionOr<void> unregisterProtocolHandler(Navigator&, const String& scheme, const String& url);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -67,5 +66,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NAVIGATOR_CONTENT_UTILS)
</span><del>-
-#endif // NavigatorContentUtils_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx">
</span><span class="cx"> // http://www.w3.org/TR/html5/system-state-and-capabilities.html#custom-handlers
</span><span class="cx"> partial interface Navigator {
</span><del>- [Conditional=NAVIGATOR_CONTENT_UTILS, MayThrowLegacyException] void registerProtocolHandler(DOMString scheme, DOMString url, DOMString title);
- [Conditional=NAVIGATOR_CONTENT_UTILS&CUSTOM_SCHEME_HANDLER, MayThrowLegacyException] DOMString isProtocolHandlerRegistered(DOMString scheme, DOMString url);
- [Conditional=NAVIGATOR_CONTENT_UTILS&CUSTOM_SCHEME_HANDLER, MayThrowLegacyException] void unregisterProtocolHandler(DOMString scheme, DOMString url);
</del><ins>+ [Conditional=NAVIGATOR_CONTENT_UTILS, MayThrowException] void registerProtocolHandler(DOMString scheme, DOMString url, DOMString title);
+ [Conditional=NAVIGATOR_CONTENT_UTILS&CUSTOM_SCHEME_HANDLER, MayThrowException] DOMString isProtocolHandlerRegistered(DOMString scheme, DOMString url);
+ [Conditional=NAVIGATOR_CONTENT_UTILS&CUSTOM_SCHEME_HANDLER, MayThrowException] void unregisterProtocolHandler(DOMString scheme, DOMString url);
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -359,7 +359,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
</del><span class="cx"> auto constraintsDictionary = Dictionary(&state, state.uncheckedArgument(0));
</span><span class="cx">
</span><span class="cx"> MediaTrackConstraintSetMap mandatoryAudioConstraints;
</span><span class="lines">@@ -386,8 +385,7 @@
</span><span class="cx">
</span><span class="cx"> auto audioConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryAudioConstraints), WTFMove(advancedAudioConstraints), areAudioConstraintsValid);
</span><span class="cx"> auto videoConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryVideoConstraints), WTFMove(advancedVideoConstraints), areVideoConstraintsValid);
</span><del>- castThisValue<JSMediaDevices>(state).wrapped().getUserMedia(WTFMove(audioConstraints), WTFMove(videoConstraints), WTFMove(promise), ec);
- setDOMException(&state, ec);
</del><ins>+ propagateException(state, scope, castThisValue<JSMediaDevices>(state).wrapped().getUserMedia(WTFMove(audioConstraints), WTFMove(videoConstraints), WTFMove(promise)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSMediaDevices::getUserMedia(ExecState& state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -4261,6 +4261,18 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub NeedsExplicitPropagateExceptionCall
+{
+ my ($function) = @_;
+
+ return 0 unless $function->signature->extendedAttributes->{MayThrowException};
+
+ return 1 if $function->signature->type && $function->signature->type->name eq "void";
+ return 1 if IsReturningPromise($function);
+
+ return 0;
+}
+
</ins><span class="cx"> sub GenerateParametersCheck
</span><span class="cx"> {
</span><span class="cx"> my ($outputArray, $function, $interface, $functionImplementationName, $svgPropertyType, $svgPropertyOrListPropertyType, $svgListPropertyType) = @_;
</span><span class="lines">@@ -4486,23 +4498,15 @@
</span><span class="cx"> $argumentIndex++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push @arguments, GenerateReturnParameters($function);
</del><ins>+ push(@arguments, "WTFMove(promise)") if IsReturningPromise($function);
+ push(@arguments, "ec") if $function->signature->extendedAttributes->{MayThrowLegacyException};
+
</ins><span class="cx"> my $functionString = "$functionName(" . join(", ", @arguments) . ")";
</span><del>- $functionString = "propagateException(*state, throwScope, $functionString)" if $function->signature->type && $function->signature->type->name eq "void" && $function->signature->extendedAttributes->{MayThrowException};
</del><ins>+ $functionString = "propagateException(*state, throwScope, $functionString)" if NeedsExplicitPropagateExceptionCall($function);
</ins><span class="cx">
</span><span class="cx"> return ($functionString, scalar @arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GenerateReturnParameters
-{
- my $function = shift;
-
- my @arguments;
- push(@arguments, "WTFMove(promise)") if IsReturningPromise($function);
- push(@arguments, "ec") if $function->signature->extendedAttributes->{MayThrowLegacyException};
- return @arguments;
-}
-
</del><span class="cx"> sub GenerateDictionaryHeader
</span><span class="cx"> {
</span><span class="cx"> my ($object, $dictionary, $className, $enumerations) = @_;
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -63,11 +63,10 @@
</span><span class="cx"> document().textRemoved(this, 0, oldLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String CharacterData::substringData(unsigned offset, unsigned count, ExceptionCode& ec)
</del><ins>+ExceptionOr<String> CharacterData::substringData(unsigned offset, unsigned count)
</ins><span class="cx"> {
</span><del>- checkCharDataOperation(offset, ec);
- if (ec)
- return String();
</del><ins>+ if (offset > length())
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> return m_data.substring(offset, count);
</span><span class="cx"> }
</span><span class="lines">@@ -118,11 +117,10 @@
</span><span class="cx"> // FIXME: Should we call textInserted here?
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CharacterData::insertData(unsigned offset, const String& data, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> CharacterData::insertData(unsigned offset, const String& data)
</ins><span class="cx"> {
</span><del>- checkCharDataOperation(offset, ec);
- if (ec)
- return;
</del><ins>+ if (offset > length())
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> String newStr = m_data;
</span><span class="cx"> newStr.insert(data, offset);
</span><span class="lines">@@ -130,13 +128,14 @@
</span><span class="cx"> setDataAndUpdate(newStr, offset, 0, data.length());
</span><span class="cx">
</span><span class="cx"> document().textInserted(this, offset, data.length());
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> CharacterData::deleteData(unsigned offset, unsigned count)
</ins><span class="cx"> {
</span><del>- checkCharDataOperation(offset, ec);
- if (ec)
- return;
</del><ins>+ if (offset > length())
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> count = std::min(count, length() - offset);
</span><span class="cx">
</span><span class="lines">@@ -146,13 +145,14 @@
</span><span class="cx"> setDataAndUpdate(newStr, offset, count, 0);
</span><span class="cx">
</span><span class="cx"> document().textRemoved(this, offset, count);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CharacterData::replaceData(unsigned offset, unsigned count, const String& data, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> CharacterData::replaceData(unsigned offset, unsigned count, const String& data)
</ins><span class="cx"> {
</span><del>- checkCharDataOperation(offset, ec);
- if (ec)
- return;
</del><ins>+ if (offset > length())
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> count = std::min(count, length() - offset);
</span><span class="cx">
</span><span class="lines">@@ -165,6 +165,8 @@
</span><span class="cx"> // update the markers for spell checking and grammar checking
</span><span class="cx"> document().textRemoved(this, offset, count);
</span><span class="cx"> document().textInserted(this, offset, data.length());
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CharacterData::nodeValue() const
</span><span class="lines">@@ -232,18 +234,6 @@
</span><span class="cx"> InspectorInstrumentation::characterDataModified(document(), *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CharacterData::checkCharDataOperation(unsigned offset, ExceptionCode& ec)
-{
- ec = 0;
-
- // INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than the number of 16-bit
- // units in data.
- if (offset > length()) {
- ec = INDEX_SIZE_ERR;
- return;
- }
-}
-
</del><span class="cx"> int CharacterData::maxCharacterOffset() const
</span><span class="cx"> {
</span><span class="cx"> return static_cast<int>(length());
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/CharacterData.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "ContainerNode.h"
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -34,11 +33,11 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setData(const String&);
</span><span class="cx"> unsigned length() const { return m_data.length(); }
</span><del>- WEBCORE_EXPORT String substringData(unsigned offset, unsigned count, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<String> substringData(unsigned offset, unsigned count);
</ins><span class="cx"> WEBCORE_EXPORT void appendData(const String&);
</span><del>- WEBCORE_EXPORT void insertData(unsigned offset, const String&, ExceptionCode&);
- WEBCORE_EXPORT void deleteData(unsigned offset, unsigned count, ExceptionCode&);
- WEBCORE_EXPORT void replaceData(unsigned offset, unsigned count, const String&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> insertData(unsigned offset, const String&);
+ WEBCORE_EXPORT ExceptionOr<void> deleteData(unsigned offset, unsigned count);
+ WEBCORE_EXPORT ExceptionOr<void> replaceData(unsigned offset, unsigned count, const String&);
</ins><span class="cx">
</span><span class="cx"> bool containsOnlyWhitespace() const;
</span><span class="cx">
</span><span class="lines">@@ -68,7 +67,6 @@
</span><span class="cx"> int maxCharacterOffset() const final;
</span><span class="cx"> bool offsetInCharacters() const final;
</span><span class="cx"> void setDataAndUpdate(const String&, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength);
</span><del>- void checkCharDataOperation(unsigned offset, ExceptionCode&);
</del><span class="cx"> void notifyParentAfterChange(ContainerNode::ChildChangeSource);
</span><span class="cx">
</span><span class="cx"> String m_data;
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDataidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/CharacterData.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> [CEReactions, TreatNullAs=EmptyString] attribute DOMString data;
</span><span class="cx"> readonly attribute unsigned long length;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] DOMString? substringData(unsigned long offset, unsigned long length);
</del><ins>+ [MayThrowException] DOMString? substringData(unsigned long offset, unsigned long length);
</ins><span class="cx">
</span><span class="cx"> [CEReactions] void appendData(DOMString data);
</span><del>- [CEReactions, MayThrowLegacyException] void insertData(unsigned long offset, DOMString data);
- [CEReactions, MayThrowLegacyException] void deleteData(unsigned long offset, unsigned long length);
- [CEReactions, MayThrowLegacyException] void replaceData(unsigned long offset, unsigned long length, DOMString data);
</del><ins>+ [CEReactions, MayThrowException] void insertData(unsigned long offset, DOMString data);
+ [CEReactions, MayThrowException] void deleteData(unsigned long offset, unsigned long length);
+ [CEReactions, MayThrowException] void replaceData(unsigned long offset, unsigned long length, DOMString data);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CharacterData implements ChildNode;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItemList.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItemList.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/DataTransferItemList.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef DataTransferItemList_h
-#define DataTransferItemList_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_TRANSFER_ITEMS)
</span><span class="cx">
</span><span class="lines">@@ -41,22 +40,19 @@
</span><span class="cx">
</span><span class="cx"> class File;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><ins>+// FIXME: Unclear why this need to be an abstract base class.
</ins><span class="cx"> class DataTransferItemList : public RefCounted<DataTransferItemList> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~DataTransferItemList() { }
</span><span class="cx">
</span><del>- virtual size_t length() const = 0;
- virtual PassRefPtr<DataTransferItem> item(unsigned long index) = 0;
- virtual void deleteItem(unsigned long index, ExceptionCode&) = 0;
</del><ins>+ virtual unsigned length() const = 0;
+ virtual DataTransferItem* item(unsigned index) = 0;
+ virtual ExceptionOr<void> deleteItem(unsigned index) = 0;
</ins><span class="cx"> virtual void clear() = 0;
</span><del>- virtual void add(const String& data, const String& type, ExceptionCode&) = 0;
- virtual void add(PassRefPtr<File>) = 0;
</del><ins>+ virtual ExceptionOr<void> add(const String& data, const String& type) = 0;
+ virtual void add(RefPtr<File>&&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DATA_TRANSFER_ITEMS)
</span><del>-
-#endif // DataTransferItemList_h
</del></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItemList.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItemList.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/DataTransferItemList.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -40,7 +40,5 @@
</span><span class="cx"> void clear();
</span><span class="cx"> void add(File? file);
</span><span class="cx">
</span><del>- // FIXME: Using "undefined" as default parameter value is wrong.
- [MayThrowLegacyException] void add(optional DOMString data = "undefined", optional DOMString type = "undefined");
</del><ins>+ [MayThrowException] void add(optional DOMString data = "undefined", optional DOMString type = "undefined");
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoredomMessagePortidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessagePort.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessagePort.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/MessagePort.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> GenerateIsReachable=Impl,
</span><span class="cx"> JSCustomMarkFunction,
</span><span class="cx"> ] interface MessagePort : EventTarget {
</span><del>- [Custom, MayThrowLegacyException] void postMessage(any message, optional Array messagePorts);
</del><ins>+ [Custom, MayThrowException] void postMessage(any message, optional Array messagePorts);
</ins><span class="cx">
</span><span class="cx"> void start();
</span><span class="cx"> void close();
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> && ((options & CharacterData) || !(options & CharacterDataOldValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutationObserver::observe(Node& node, const Init& init, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> MutationObserver::observe(Node& node, const Init& init)
</ins><span class="cx"> {
</span><span class="cx"> MutationObserverOptions options = 0;
</span><span class="cx">
</span><span class="lines">@@ -98,12 +98,12 @@
</span><span class="cx"> if (init.characterData ? init.characterData.value() : (options & CharacterDataOldValue))
</span><span class="cx"> options |= CharacterData;
</span><span class="cx">
</span><del>- if (!validateOptions(options)) {
- ec = TypeError;
- return;
- }
</del><ins>+ if (!validateOptions(options))
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> node.registerMutationObserver(this, options, attributeFilter);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<Ref<MutationRecord>> MutationObserver::takeRecords()
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/MutationObserver.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -28,13 +28,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MutationObserver_h
-#define MutationObserver_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/Optional.h>
-#include <wtf/RefCounted.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,11 +43,9 @@
</span><span class="cx"> class MutationRecord;
</span><span class="cx"> class Node;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
</del><ins>+using MutationObserverOptions = unsigned char;
+using MutationRecordDeliveryOptions = unsigned char;
</ins><span class="cx">
</span><del>-typedef unsigned char MutationObserverOptions;
-typedef unsigned char MutationRecordDeliveryOptions;
-
</del><span class="cx"> class MutationObserver : public RefCounted<MutationObserver> {
</span><span class="cx"> friend class MutationObserverMicrotask;
</span><span class="cx"> public:
</span><span class="lines">@@ -85,7 +81,7 @@
</span><span class="cx"> Optional<Vector<String>> attributeFilter;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void observe(Node&, const Init&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> observe(Node&, const Init&);
</ins><span class="cx"> Vector<Ref<MutationRecord>> takeRecords();
</span><span class="cx"> void disconnect();
</span><span class="cx">
</span><span class="lines">@@ -113,5 +109,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // MutationObserver_h
</del></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserveridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/MutationObserver.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> CustomIsReachable,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface MutationObserver {
</span><del>- [MayThrowLegacyException] void observe(Node target, optional MutationObserverInit options);
</del><ins>+ [MayThrowException] void observe(Node target, optional MutationObserverInit options);
</ins><span class="cx"> sequence<MutationRecord> takeRecords();
</span><span class="cx"> void disconnect();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/Range.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -652,10 +652,16 @@
</span><span class="cx">
</span><span class="cx"> static inline void deleteCharacterData(CharacterData& data, unsigned startOffset, unsigned endOffset, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (data.length() - endOffset)
- data.deleteData(endOffset, data.length() - endOffset, ec);
- if (startOffset)
- data.deleteData(0, startOffset, ec);
</del><ins>+ if (data.length() - endOffset) {
+ auto result = data.deleteData(endOffset, data.length() - endOffset);
+ if (result.hasException())
+ ec = result.releaseException().code();
+ }
+ if (startOffset) {
+ auto result = data.deleteData(0, startOffset);
+ if (result.hasException())
+ ec = result.releaseException().code();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Node> Range::processContentsBetweenOffsets(ActionType action, PassRefPtr<DocumentFragment> fragment, Node* container, unsigned startOffset, unsigned endOffset, ExceptionCode& ec)
</span><span class="lines">@@ -680,8 +686,11 @@
</span><span class="cx"> } else
</span><span class="cx"> result = WTFMove(characters);
</span><span class="cx"> }
</span><del>- if (action == Extract || action == Delete)
- downcast<CharacterData>(*container).deleteData(startOffset, endOffset - startOffset, ec);
</del><ins>+ if (action == Extract || action == Delete) {
+ auto result = downcast<CharacterData>(*container).deleteData(startOffset, endOffset - startOffset);
+ if (result.hasException())
+ ec = result.releaseException().code();
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case Node::PROCESSING_INSTRUCTION_NODE:
</span><span class="cx"> endOffset = std::min(endOffset, static_cast<ProcessingInstruction*>(container)->data().length());
</span><span class="lines">@@ -845,9 +854,12 @@
</span><span class="cx">
</span><span class="cx"> EventQueueScope scope;
</span><span class="cx"> if (startIsText) {
</span><del>- referenceNode = downcast<Text>(startContainer()).splitText(startOffset(), ec);
- if (ec)
</del><ins>+ auto result = downcast<Text>(startContainer()).splitText(startOffset());
+ if (result.hasException()) {
+ ec = result.releaseException().code();
</ins><span class="cx"> return;
</span><ins>+ }
+ referenceNode = result.releaseReturnValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (referenceNode == node.ptr())
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "ElementTraversal.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SlotAssignment.h"
</span><span class="lines">@@ -106,21 +107,14 @@
</span><span class="cx"> return createMarkup(*this, ChildrenOnly);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowRoot::setInnerHTML(const String& markup, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ShadowRoot::setInnerHTML(const String& markup)
</ins><span class="cx"> {
</span><del>- if (isOrphan()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
-
</del><ins>+ if (isOrphan())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> auto fragment = createFragmentForInnerOuterHTML(*host(), markup, AllowScriptingContent);
</span><del>- if (fragment.hasException()) {
- ec = fragment.releaseException().code();
- return;
- }
- auto result = replaceChildrenWithFragment(*this, fragment.releaseReturnValue());
- if (result.hasException())
- ec = result.releaseException().code();
</del><ins>+ if (fragment.hasException())
+ return fragment.releaseException();
+ return replaceChildrenWithFragment(*this, fragment.releaseReturnValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ShadowRoot::childTypeAllowed(NodeType type) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -24,16 +24,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ShadowRoot_h
-#define ShadowRoot_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include "ContainerNode.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "Element.h"
</span><del>-#include "ExceptionCode.h"
</del><span class="cx"> #include "ShadowRootMode.h"
</span><del>-#include "TreeScope.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -65,7 +61,7 @@
</span><span class="cx"> void setHost(Element* host) { m_host = host; }
</span><span class="cx">
</span><span class="cx"> String innerHTML() const;
</span><del>- void setInnerHTML(const String&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> setInnerHTML(const String&);
</ins><span class="cx">
</span><span class="cx"> Element* activeElement() const;
</span><span class="cx">
</span><span class="lines">@@ -142,5 +138,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ShadowRoot)
</span><span class="cx"> static bool isType(const WebCore::Node& node) { return node.isShadowRoot(); }
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/ShadowRoot.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> EnabledAtRuntime=ShadowDOM,
</span><span class="cx"> JSGenerateToJSObject
</span><span class="cx"> ] interface ShadowRoot : DocumentFragment {
</span><del>- readonly attribute ShadowRootMode mode;
- readonly attribute Element host;
</del><ins>+ readonly attribute ShadowRootMode mode;
+ readonly attribute Element host;
</ins><span class="cx">
</span><del>- [CEReactions, SetterMayThrowLegacyException, TreatNullAs=EmptyString] attribute DOMString innerHTML;
</del><ins>+ [CEReactions, SetterMayThrowException, TreatNullAs=EmptyString] attribute DOMString innerHTML;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ShadowRoot implements DocumentOrShadowRoot;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/Text.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -56,33 +56,29 @@
</span><span class="cx"> ASSERT(!renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Text> Text::splitText(unsigned offset, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<Text>> Text::splitText(unsigned offset)
</ins><span class="cx"> {
</span><del>- ec = 0;
</del><ins>+ if (offset > length())
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><del>- // INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than
- // the number of 16-bit units in data.
- if (offset > length()) {
- ec = INDEX_SIZE_ERR;
- return 0;
- }
-
</del><span class="cx"> EventQueueScope scope;
</span><del>- String oldStr = data();
- Ref<Text> newText = virtualCreate(oldStr.substring(offset));
- setDataWithoutUpdate(oldStr.substring(0, offset));
</del><ins>+ auto oldData = data();
+ auto newText = virtualCreate(oldData.substring(offset));
+ setDataWithoutUpdate(oldData.substring(0, offset));
</ins><span class="cx">
</span><del>- dispatchModifiedEvent(oldStr);
</del><ins>+ dispatchModifiedEvent(oldData);
</ins><span class="cx">
</span><del>- if (parentNode())
</del><ins>+ if (parentNode()) {
+ ExceptionCode ec = 0;
</ins><span class="cx"> parentNode()->insertBefore(newText, nextSibling(), ec);
</span><del>- if (ec)
- return 0;
</del><ins>+ if (ec)
+ return Exception { ec };
+ }
</ins><span class="cx">
</span><span class="cx"> document().textNodeSplit(this);
</span><span class="cx">
</span><span class="cx"> if (renderer())
</span><del>- renderer()->setTextWithOffset(data(), 0, oldStr.length());
</del><ins>+ renderer()->setTextWithOffset(data(), 0, oldData.length());
</ins><span class="cx">
</span><span class="cx"> return WTFMove(newText);
</span><span class="cx"> }
</span><span class="lines">@@ -122,7 +118,7 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Text> Text::replaceWholeText(const String& newText, ExceptionCode&)
</del><ins>+RefPtr<Text> Text::replaceWholeText(const String& newText)
</ins><span class="cx"> {
</span><span class="cx"> // Remove all adjacent text nodes, and replace the contents of this one.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.h (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.h 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/Text.h 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> virtual ~Text();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT RefPtr<Text> splitText(unsigned offset, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<Ref<Text>> splitText(unsigned offset);
</ins><span class="cx">
</span><span class="cx"> // DOM Level 3: http://www.w3.org/TR/DOM-Level-3-Core/core.html#ID-1312295772
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String wholeText() const;
</span><del>- WEBCORE_EXPORT RefPtr<Text> replaceWholeText(const String&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT RefPtr<Text> replaceWholeText(const String&);
</ins><span class="cx">
</span><span class="cx"> RenderPtr<RenderText> createTextRenderer(const RenderStyle&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.idl (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.idl 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/dom/Text.idl 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006 Apple Inc.
</del><ins>+ * Copyright (C) 2006 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -16,17 +16,14 @@
</span><span class="cx"> * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> [
</span><span class="cx"> Constructor(optional DOMString data),
</span><span class="cx"> ConstructorCallWith=Document,
</span><span class="cx"> CustomToJSObject,
</span><span class="cx"> ] interface Text : CharacterData {
</span><ins>+ [MayThrowException] Text splitText(unsigned long offset);
</ins><span class="cx">
</span><del>- // DOM Level 1
-
- [MayThrowLegacyException] Text splitText(unsigned long offset);
-
- // Introduced in DOM Level 3:
</del><span class="cx"> readonly attribute DOMString wholeText;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyBlockElementCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -175,13 +175,7 @@
</span><span class="cx"> int offset = position.offsetInContainerNode();
</span><span class="cx"> if (!is<Text>(textNode) || offset < 0 || offset >= textNode->maxCharacterOffset())
</span><span class="cx"> return false;
</span><del>-
- ExceptionCode ec = 0;
- String textAtPosition = downcast<Text>(*textNode).substringData(offset, 1, ec);
- if (ec)
- return false;
-
- return textAtPosition[0] == '\n';
</del><ins>+ return downcast<Text>(*textNode).data()[offset] == '\n';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const RenderStyle* ApplyBlockElementCommand::renderStyleOfEnclosingTextNode(const Position& position)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteFromTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -51,12 +51,11 @@
</span><span class="cx"> if (!isEditableNode(*m_node))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
- m_text = m_node->substringData(m_offset, m_count, ec);
- if (ec)
</del><ins>+ auto result = m_node->substringData(m_offset, m_count);
+ if (result.hasException())
</ins><span class="cx"> return;
</span><del>-
- m_node->deleteData(m_offset, m_count, ec);
</del><ins>+ m_text = result.releaseReturnValue();
+ m_node->deleteData(m_offset, m_count);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DeleteFromTextNodeCommand::doUnapply()
</span><span class="lines">@@ -66,7 +65,7 @@
</span><span class="cx"> if (!m_node->hasEditableStyle())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
</del><ins>+ m_node->insertData(m_offset, m_text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertIntoTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #include "InsertIntoTextNodeCommand.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><del>-#include "ExceptionCodePlaceholder.h"
</del><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "Text.h"
</span><ins>+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(RefPtr<Text>&& node, unsigned offset, const String& text, EditAction editingAction)
</span><span class="cx"> : SimpleEditCommand(node->document(), editingAction)
</span><del>- , m_node(node)
</del><ins>+ , m_node(WTFMove(node))
</ins><span class="cx"> , m_offset(offset)
</span><span class="cx"> , m_text(text)
</span><span class="cx"> {
</span><span class="lines">@@ -63,15 +63,19 @@
</span><span class="cx"> renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
</del><ins>+ m_node->insertData(m_offset, m_text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
+// FIXME: Why would reapply be iOS-specific?
</ins><span class="cx"> void InsertIntoTextNodeCommand::doReapply()
</span><span class="cx"> {
</span><del>- ExceptionCode ec;
- m_node->insertData(m_offset, m_text, ec);
</del><ins>+ // FIXME: Shouldn't this have a hasEditableStyle check?
+
+ m_node->insertData(m_offset, m_text);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void InsertIntoTextNodeCommand::doUnapply()
</span><span class="lines">@@ -79,14 +83,16 @@
</span><span class="cx"> if (!m_node->hasEditableStyle())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION);
</del><ins>+ m_node->deleteData(m_offset, m_text.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><ins>+
</ins><span class="cx"> void InsertIntoTextNodeCommand::getNodesInCommand(HashSet<Node*>& nodes)
</span><span class="cx"> {
</span><span class="cx"> addNodeAndDescendants(m_node.get(), nodes);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSplitTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -54,11 +54,14 @@
</span><span class="cx"> if (!parent || !parent->hasEditableStyle())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- String prefixText = m_text2->substringData(0, m_offset, IGNORE_EXCEPTION);
</del><ins>+ auto result = m_text2->substringData(0, m_offset);
+ if (result.hasException())
+ return;
+ auto prefixText = result.releaseReturnValue();
</ins><span class="cx"> if (prefixText.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_text1 = Text::create(document(), prefixText);
</del><ins>+ m_text1 = Text::create(document(), WTFMove(prefixText));
</ins><span class="cx"> ASSERT(m_text1);
</span><span class="cx"> document().markers().copyMarkers(m_text2.get(), 0, m_offset, m_text1.get(), 0);
</span><span class="cx">
</span><span class="lines">@@ -74,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> String prefixText = m_text1->data();
</span><span class="cx">
</span><del>- m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION);
</del><ins>+ m_text2->insertData(0, prefixText);
</ins><span class="cx">
</span><span class="cx"> document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(), m_text2.get(), 0);
</span><span class="cx"> m_text1->remove();
</span><span class="lines">@@ -98,15 +101,17 @@
</span><span class="cx"> m_text2->parentNode()->insertBefore(*m_text1, m_text2.get(), ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- m_text2->deleteData(0, m_offset, ec);
</del><ins>+ m_text2->deleteData(0, m_offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><ins>+
</ins><span class="cx"> void SplitTextNodeCommand::getNodesInCommand(HashSet<Node*>& nodes)
</span><span class="cx"> {
</span><span class="cx"> addNodeAndDescendants(m_text1.get(), nodes);
</span><span class="cx"> addNodeAndDescendants(m_text2.get(), nodes);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "HTMLBRElement.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMEditor.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMEditor.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebCore/inspector/DOMEditor.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -260,15 +260,15 @@
</span><span class="cx"> return redo(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool undo(ExceptionCode& ec) override
</del><ins>+ bool undo(ExceptionCode&) override
</ins><span class="cx"> {
</span><del>- m_textNode->replaceWholeText(m_oldText, ec);
</del><ins>+ m_textNode->replaceWholeText(m_oldText);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool redo(ExceptionCode& ec) override
</del><ins>+ bool redo(ExceptionCode&) override
</ins><span class="cx"> {
</span><del>- m_textNode->replaceWholeText(m_text, ec);
</del><ins>+ m_textNode->replaceWholeText(m_text);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-29 Darin Adler <darin@apple.com>
+
+ Convert more of DOM from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=164173
+
+ Reviewed by Ryosuke Niwa.
+
+ * DOM/DOMCharacterData.mm:
+ (-[DOMCharacterData substringData:length:]): Updated since this
+ now uses ExceptionOr.
+ (-[DOMCharacterData insertData:data:]): Ditto.
+ (-[DOMCharacterData deleteData:length:]): Ditto.
+ (-[DOMCharacterData replaceData:length:data:]): Ditto.
+ * DOM/DOMText.mm:
+ (-[DOMText splitText:]): Ditto.
+ (-[DOMText replaceWholeText:]): Removed unneeded exception code
+ handling from function that does not throw an exception.
+
</ins><span class="cx"> 2016-10-28 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move all classes in the HTML directory from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCharacterDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -73,10 +73,7 @@
</span><span class="cx"> - (NSString *)substringData:(unsigned)offset length:(unsigned)inLength
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- NSString *result = IMPL->substringData(offset, inLength, ec);
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return raiseOnDOMError(IMPL->substringData(offset, inLength));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)appendData:(NSString *)inData
</span><span class="lines">@@ -88,25 +85,19 @@
</span><span class="cx"> - (void)insertData:(unsigned)offset data:(NSString *)inData
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->insertData(offset, inData, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->insertData(offset, inData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)deleteData:(unsigned)offset length:(unsigned)inLength
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->deleteData(offset, inLength, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->deleteData(offset, inLength));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)replaceData:(unsigned)offset length:(unsigned)inLength data:(NSString *)inData
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->replaceData(offset, inLength, inData, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->replaceData(offset, inLength, inData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)remove
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMText.mm (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMText.mm 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit/mac/DOM/DOMText.mm 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -47,19 +47,13 @@
</span><span class="cx"> - (DOMText *)splitText:(unsigned)offset
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMText *result = kit(WTF::getPtr(IMPL->splitText(offset, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(raiseOnDOMError(IMPL->splitText(offset)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMText *)replaceWholeText:(NSString *)content
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMText *result = kit(WTF::getPtr(IMPL->replaceWholeText(content, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(IMPL->replaceWholeText(content).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-29 Darin Adler <darin@apple.com>
+
+ Convert more of DOM from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=164173
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp:
+ (webkit_dom_character_data_substring_data): Updated since this
+ now uses ExceptionOr.
+ (webkit_dom_character_data_insert_data): Ditto.
+ (webkit_dom_character_data_delete_data): Ditto.
+ (webkit_dom_character_data_replace_data): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp:
+ (webkit_dom_text_replace_whole_text): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp:
+ (webkit_dom_text_split_text): Ditto.
+
</ins><span class="cx"> 2016-10-28 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move all classes in the HTML directory from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -169,9 +169,10 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_CHARACTER_DATA(self), 0);
</span><span class="cx"> g_return_val_if_fail(!error || !*error, 0);
</span><span class="cx"> WebCore::CharacterData* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- gchar* result = convertToUTF8String(item->substringData(offset, length, ec));
- return result;
</del><ins>+ auto result = item->substringData(offset, length);
+ if (result.hasException())
+ return nullptr;
+ return convertToUTF8String(result.releaseReturnValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_character_data_append_data(WebKitDOMCharacterData* self, const gchar* data, GError** error)
</span><span class="lines">@@ -193,10 +194,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::CharacterData* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedData = WTF::String::fromUTF8(data);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->insertData(offset, convertedData, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->insertData(offset, convertedData);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.releaseException().code());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -207,10 +207,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_CHARACTER_DATA(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::CharacterData* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->deleteData(offset, length, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->deleteData(offset, length);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.releaseException().code());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -223,10 +222,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::CharacterData* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedData = WTF::String::fromUTF8(data);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->replaceData(offset, length, convertedData, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->replaceData(offset, length, convertedData);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.releaseException().code());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDeprecatedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -155,13 +155,7 @@
</span><span class="cx"> g_return_val_if_fail(!error || !*error, nullptr);
</span><span class="cx">
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::Text> gobjectResult = WTF::getPtr(WebKit::core(self)->replaceWholeText(WTF::String::fromUTF8(content), ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
- g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
- }
- return WebKit::kit(gobjectResult.get());
</del><ins>+ return WebKit::kit(WebKit::core(self)->replaceWholeText(WTF::String::fromUTF8(content)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_html_input_element_get_capture(WebKitDOMHTMLInputElement* self)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp (208117 => 208118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp 2016-10-30 01:38:22 UTC (rev 208117)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp 2016-10-30 02:56:39 UTC (rev 208118)
</span><span class="lines">@@ -140,13 +140,13 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEXT(self), 0);
</span><span class="cx"> g_return_val_if_fail(!error || !*error, 0);
</span><span class="cx"> WebCore::Text* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::Text> gobjectResult = WTF::getPtr(item->splitText(offset, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->splitText(offset);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.releaseException().code());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><ins>+ return nullptr;
</ins><span class="cx"> }
</span><del>- return WebKit::kit(gobjectResult.get());
</del><ins>+ return WebKit::kit(result.releaseReturnValue().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gchar* webkit_dom_text_get_whole_text(WebKitDOMText* self)
</span></span></pre>
</div>
</div>
</body>
</html>