<!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>[208096] trunk</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/208096">208096</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-10-28 19:32:20 -0700 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move all classes in the HTML directory from ExceptionCode to Exception
https://bugs.webkit.org/show_bug.cgi?id=163876
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/url/url-setters-expected.txt: Updated for progressions that occurred
because setting the href attribute on a DOMURL object no longer modifies the URL as a side
effect in the cases where it throw an exception.
Source/WebCore:
* bindings/js/JSDOMBinding.cpp:
(WebCore::shouldAllowAccessToNode): Deleted.
(WebCore::BindingSecurity::shouldAllowAccessToFrame): Moved function into the
BindingSecurity namespace. Also changed arguments to references.
(WebCore::BindingSecurity::shouldAllowAccessToDOMWindow): Ditto.
(WebCore::BindingSecurity::shouldAllowAccessToNode): Changed argument type
from pointer to reference.
* bindings/js/JSDOMBinding.h: Removed top level shouldAllowAccessTo functions,
moving all of them into the BindingSecurity namespace. Changed BindingSecurity
from a class into a namespace. Added new checkSecurityForNode functions that
can be used directly to implement CheckSecurityForNode; they turn the node
into a null, which is no change in behavior from what bindings already did.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess): Changed argument
type for passed-in string to const String& instead of String&.
(WebCore::JSDOMWindow::getOwnPropertySlot): Updated for BindingSecurity changes.
(WebCore::JSDOMWindow::getOwnPropertySlotByIndex): Ditto.
(WebCore::JSDOMWindow::put): Ditto.
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::attributesFor3DContext): Renamed from get3DContextAttributes and
changed to use a return value instead of an out argument.
(WebCore::JSHTMLCanvasElement::getContext): Updated for the above.
(WebCore::JSHTMLCanvasElement::toDataURL): Rewrote to handle ExceptionOr
and also to use Optional<double> instead of const double*.
* bindings/js/JSHTMLFrameElementCustom.cpp:
(WebCore::JSHTMLFrameElement::setLocation): Moved the logic from
allowSettingJavascriptURL in here and updated for BindingSecurity changes.
* bindings/js/JSHTMLOptionsCollectionCustom.cpp:
(WebCore::JSHTMLOptionsCollection::setLength): Use propagateException.
Also streamlined the code a bit.
(WebCore::JSHTMLOptionsCollection::indexSetter): Updated for new name and
argument types for selectElementIndexSetter.
* bindings/js/JSHTMLSelectElementCustom.cpp:
(WebCore::selectElementIndexSetter): Updated name and argument types and
to use propagateException.
(WebCore::JSHTMLSelectElement::indexSetter): Updated for above.
* bindings/js/JSHTMLSelectElementCustom.h: Ditto.
* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::getOwnPropertySlotDelegate): Updated for changes to
BindingSecurity.
(WebCore::JSLocation::putDelegate): Ditto. Also rearranged logic a bit.
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::canAccessFromCurrentOrigin): Updated for
changes to BindingSecurity.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation): Removed old support for CheckSecurityForNode.
(NativeToJSValue): Added new support for CheckSecurityForNode, which uses
the new checkSecurityForNode function, and works properly with ExceptionOr.
* bindings/scripts/test/JS/JSTestObj.cpp: Updated for change below.
* dom/ChildNode.idl: Move the remove function to non-legacy exception.
Needed now because this needs to match the one in HTMLSelectElement.
* dom/Element.cpp:
(WebCore::Element::dispatchMouseForceWillBegin): Refactored a little bit.
(WebCore::Element::mergeWithNextTextNode): Support ExceptionOr for remove.
(WebCore::Element::setOuterHTML): Support ExceptionOr for
createFragmentForInnerOuterHTML.
(WebCore::Element::setInnerHTML): Ditto.
(WebCore::Element::insertAdjacentHTML): Ditto.
* dom/Node.cpp:
(WebCore::Node::remove): Use ExceptionOr.
(WebCore::Node::normalize): Remove use of IGNORE_EXCEPTION.
* dom/Node.h: Use ExceptionOr for remove.
* dom/Range.cpp:
(WebCore::Range::insertNode): Updated for change to remove.
(WebCore::Range::createContextualFragment): Updated for change
to WebCore::createContextualFragment.
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::setInnerHTML): Use ExceptionOr for
createFragmentForInnerOuterHTML and replaceChildrenWithFragment.
* editing/AppendNodeCommand.cpp:
(WebCore::AppendNodeCommand::doUnapply): Remove IGNORE_EXCEPTION.
* editing/InsertNodeBeforeCommand.cpp:
(WebCore::InsertNodeBeforeCommand::doUnapply): Ditto.
* editing/MergeIdenticalElementsCommand.cpp:
(WebCore::MergeIdenticalElementsCommand::doApply): Ditto.
* editing/RemoveNodeCommand.cpp:
(WebCore::RemoveNodeCommand::doApply): Ditto.
* editing/SplitElementCommand.cpp:
(WebCore::SplitElementCommand::doUnapply): Ditto.
* editing/SplitTextNodeCommand.cpp:
(WebCore::SplitTextNodeCommand::doUnapply): Ditto.
* editing/WrapContentsInDummySpanCommand.cpp:
(WebCore::WrapContentsInDummySpanCommand::doUnapply): Ditto.
* editing/Editor.cpp:
(WebCore::Editor::insertDictationPhrases): Deleted. Moved this
iOS-specific function to EditorIOS.mm.
(WebCore::Editor::setDictationPhrasesAsChildOfElement): Ditto.
(WebCore::Editor::confirmMarkedText): Ditto.
(WebCore::Editor::setTextAsChildOfElement): Ditto.
(WebCore::Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping): Ditto.
* editing/ios/EditorIOS.mm:
(WebCore::Editor::fontForSelection): Remove ASSERT_NO_EXCEPTION.
(WebCore::Editor::fontAttributesForSelectionStart): Ditto.
(WebCore::Editor::insertDictationPhrases): Moved here from Editor.cpp.
(WebCore::Editor::setDictationPhrasesAsChildOfElement): Ditto. Also
updated code that used remove to not pass an ExceptionCode.
(WebCore::Editor::confirmMarkedText): Ditto.
(WebCore::Editor::setTextAsChildOfElement): Ditto.
(WebCore::Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping): Ditto.
* editing/mac/EditorMac.mm:
(WebCore::Editor::fontForSelection): Remove ASSERT_NO_EXCEPTION.
(WebCore::Editor::fontAttributesForSelectionStart): Ditto.
* editing/markup.cpp:
(WebCore::createFragmentForInnerOuterHTML): Use ExceptionOr.
(WebCore::createContextualFragment): Ditto.
(WebCore::replaceChildrenWithFragment): Ditto.
(WebCore::replaceChildrenWithText): Ditto.
* editing/markup.h: Updated for above changes.
* html/BaseChooserOnlyDateAndTimeInputType.cpp:
(WebCore::BaseChooserOnlyDateAndTimeInputType::updateAppearance):
Removed ASSERT_NO_EXCEPTION.
* html/BaseDateAndTimeInputType.cpp:
(WebCore::BaseDateAndTimeInputType::setValueAsDate): Use ExceptionOr.
(WebCore::BaseDateAndTimeInputType::setValueAsDecimal): Ditto.
* html/BaseDateAndTimeInputType.h: Updated for above changes.
* html/DateTimeLocalInputType.cpp:
(WebCore::DateTimeLocalInputType::setValueAsDate): Use ExceptionOr.
* html/DateTimeLocalInputType.h: Updated for above changes.
* html/DOMTokenList.cpp:
(WebCore::DOMTokenList::validateToken): Use ExceptionOr.
(WebCore::DOMTokenList::validateTokens): Ditto.
(WebCore::DOMTokenList::addInternal): Ditto.
(WebCore::DOMTokenList::add): Ditto.
(WebCore::DOMTokenList::removeInternal): Ditto.
(WebCore::DOMTokenList::remove): Ditto.
(WebCore::DOMTokenList::toggle): Ditto.
(WebCore::DOMTokenList::replace): Ditto.
(WebCore::DOMTokenList::supports): Ditto.
* html/DOMTokenList.h: Updated for above changes.
* html/DOMTokenList.idl: Use non-legacy exceptions.
* html/DOMURL.cpp:
(WebCore::DOMURL::DOMURL): Just take the two URL objects and let
the create functions do all the processing.
(WebCore::DOMURL::create): Use ExceptionOr, and move the processing
of the URLs here out of the constructors.
(WebCore::DOMURL::setHref): Use ExceptionOr.
* html/DOMURL.h: Updated for above changes.
* html/DOMURL.idl: Use non-legacy exceptions.
* html/FTPDirectoryDocument.cpp:
(WebCore::FTPDirectoryDocumentParser::appendEntry): Remove
IGNORE_EXCEPTION and use releaseReturnValue().
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::toDataURL): Use ExceptionOr.
* html/HTMLCanvasElement.h: Updated for above changes.
* html/HTMLCanvasElement.idl: Use non-legacy exception.
* html/HTMLElement.cpp:
(WebCore::HTMLElement::textToFragment): Use ExceptionOr.
(WebCore::HTMLElement::setInnerText): Ditto.
(WebCore::HTMLElement::setOuterText): Ditto.
(WebCore::HTMLElement::setContentEditable): Ditto.
(WebCore::HTMLElement::translateAttributeMode): Deleted.
(WebCore::HTMLElement::translate): Moved the logic from the
translateAttributeMode function in here.
* html/HTMLElement.h: Updated for above changes.
* html/HTMLElement.idl: Use non-legacy exceptions.
* html/HTMLEmbedElement.idl: Use non-legacy exception.
* html/HTMLFrameElement.idl: Ditto.
* html/HTMLFrameOwnerElement.cpp:
(WebCore::HTMLFrameOwnerElement::getSVGDocument): Use ExceptionOr.
* html/HTMLFrameOwnerElement.h: Updated for above.
* html/HTMLIFrameElement.idl: Use non-legacy exception.
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::stepUp): Use ExceptionOr.
(WebCore::HTMLInputElement::stepDown): Ditto.
(WebCore::HTMLInputElement::setValue): Ditto.
(WebCore::HTMLInputElement::setValueAsDate): Ditto.
(WebCore::HTMLInputElement::setValueAsNumber): Ditto.
(WebCore::HTMLInputElement::setSize): Ditto.
(WebCore::HTMLInputElement::maxLengthAttributeChanged): Use the
new internalSetMaxLength function; old code relied on a setMaxLength
that was different from the one exposed to bindings.
(WebCore::HTMLInputElement::minLengthAttributeChanged): Ditto.
(WebCore::HTMLInputElement::setRangeText): Use ExceptionOr.
* html/HTMLInputElement.h: Updated for above changes. Also use
data member initialization for InputElementClickState instead of
a constructor.
* html/HTMLInputElement.idl: Use non-legacy exception.
* html/HTMLMarqueeElement.cpp:
(WebCore::HTMLMarqueeElement::setLoop): Use ExceptionOr.
(WebCore::HTMLMarqueeElement::renderMarquee): Tweaked.
* html/HTMLMarqueeElement.h: Updated for above changes.
* html/HTMLMarqueeElement.idl: Ditto.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::TrackGroup::TrackGroup):
Initialize most data members in class definition rather than
the constructor.
(WebCore::HTMLMediaElement::HTMLMediaElement): Ditto.
(WebCore::HTMLMediaElement::~HTMLMediaElement): Updated since
removeMediaElement now takes a reference.
(WebCore::HTMLMediaElement::updateActiveTextTrackCues): Use
a modern for loop to streamline code.
(WebCore::HTMLMediaElement::textTrackModeChanged): Updated since
track now returns a reference.
(WebCore::HTMLMediaElement::setCurrentTimeForBindings): Renamed
to prevent ambiguity with the other version that has slightly
different semantics and overloading and changed to use ExceptionOr.
(WebCore::HTMLMediaElement::playInternal): Updated to use reference.
(WebCore::HTMLMediaElement::setVolume): Use ExceptionOr.
(WebCore::HTMLMediaElement::mediaPlayerDidAddAudioTrack): Take a
reference instead of a PassRefPtr.
(WebCore::HTMLMediaElement::mediaPlayerDidAddTextTrack): Ditto.
(WebCore::HTMLMediaElement::mediaPlayerDidAddVideoTrack): Ditto.
(WebCore::HTMLMediaElement::mediaPlayerDidRemoveAudioTrack): Ditto.
(WebCore::HTMLMediaElement::mediaPlayerDidRemoveTextTrack): Ditto.
(WebCore::HTMLMediaElement::mediaPlayerDidRemoveVideoTrack): Ditto.
(WebCore::HTMLMediaElement::addTextTrack): Use ExceptionOr.
(WebCore::HTMLMediaElement::didAddTextTrack): Use a reference.
(WebCore::HTMLMediaElement::didRemoveTextTrack): Ditto.
(WebCore::HTMLMediaElement::maxBufferedTime): Update to use different
interface to time ranges that does not need to deal with exceptions.
(WebCore::HTMLMediaElement::setController): Pass references.
(WebCore::HTMLMediaElement::outOfBandTrackSources): Use reference.
* html/HTMLMediaElement.h: Updated for above.
* html/HTMLMediaElement.idl: Use non-legacy exceptions.
* html/HTMLObjectElement.idl: Use non-legacy exception.
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::createForJSConstructor): Use ExceptionOr.
* html/HTMLOptionElement.h: Updated for above change.
* html/HTMLOptionElement.idl: Use non-legacy exception.
* html/HTMLOptionsCollection.cpp:
(WebCore::HTMLOptionsCollection::setLength): Use ExceptionOr.
* html/HTMLOptionsCollection.h: Updated for above change.
* html/HTMLOptionsCollection.idl: Use non-legacy exception.
* html/HTMLProgressElement.cpp:
(WebCore::HTMLProgressElement::setValue): Removed non-finite handling
because that is now handled by the bindings.
(WebCore::HTMLProgressElement::setMax): Ditto.
* html/HTMLProgressElement.h: Updated for above.
* html/HTMLProgressElement.idl: Changed attributes to be double instead
of unrestricted double, and this was able to remove exceptions.
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::removeByIndex): Drop IGNORE_EXCEPTION.
(WebCore::HTMLSelectElement::remove): Use ExceptionOr.
(WebCore::HTMLSelectElement::setOption): Ditto.
(WebCore::HTMLSelectElement::setLength): Ditto.
* html/HTMLSelectElement.h: Updated for above changes.
* html/HTMLSelectElement.idl: Use non-legacy exceptions.
* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::setCaption): Use ExceptionOr.
(WebCore::HTMLTableElement::setTHead): Ditto.
(WebCore::HTMLTableElement::setTFoot): Ditto.
(WebCore::HTMLTableElement::createTHead): Streamline a bit.
(WebCore::HTMLTableElement::deleteTHead): Ditto.
(WebCore::HTMLTableElement::createTFoot): Ditto.
(WebCore::HTMLTableElement::deleteTFoot): Ditto.
(WebCore::HTMLTableElement::createTBody): Ditto.
(WebCore::HTMLTableElement::createCaption): Ditto.
(WebCore::HTMLTableElement::insertRow): Use ExceptionOr.
(WebCore::HTMLTableElement::deleteRow): Ditto.
* html/HTMLTableElement.h: Updated for above changes.
* html/HTMLTableElement.idl: Use non-legacy exceptions.
* html/HTMLTableRowElement.cpp:
(WebCore::findTable): Added.
(WebCore::HTMLTableRowElement::rowIndex): Streamline a bit using the
findTable function above.
(WebCore::findRows): Added.
(WebCore::HTMLTableRowElement::sectionRowIndex): Streamline a bit using
the findRows function above.
(WebCore::HTMLTableRowElement::insertCell): Use ExceptionOr.
(WebCore::HTMLTableRowElement::deleteCell): Ditto.
(WebCore::HTMLTableRowElement::setCells): Deleted.
* html/HTMLTableRowElement.h: Updated for the above. The setCells function
was dead code.
* html/HTMLTableRowElement.idl: Use non-legacy exceptions.
* html/HTMLTableSectionElement.cpp:
(WebCore::HTMLTableSectionElement::additionalPresentationAttributeStyle):
Tweaked a bit to use early return.
(WebCore::HTMLTableSectionElement::insertRow): Use ExceptionOr.
(WebCore::HTMLTableSectionElement::deleteRow): Ditto.
(WebCore::HTMLTableSectionElement::numRows): Use childrenOfType.
(WebCore::HTMLTableSectionElement::align): Deleted.
(WebCore::HTMLTableSectionElement::setAlign): Deleted.
(WebCore::HTMLTableSectionElement::ch): Deleted.
(WebCore::HTMLTableSectionElement::setCh): Deleted.
(WebCore::HTMLTableSectionElement::chOff): Deleted.
(WebCore::HTMLTableSectionElement::setChOff): Deleted.
(WebCore::HTMLTableSectionElement::vAlign): Deleted.
(WebCore::HTMLTableSectionElement::setVAlign): Deleted.
* html/HTMLTableSectionElement.h: Updated for the above.
* html/HTMLTableSectionElement.idl: Use non-legacy exception.
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::maxLengthAttributeChanged): Use the new
internalSetMaxLength function; old code relied on a setMaxLength
that was different from the one exposed to bindings.
(WebCore::HTMLTextAreaElement::minLengthAttributeChanged): Ditto.
(WebCore::HTMLTextAreaElement::updatePlaceholderText): Removed
ASSERT_NO_EXCEPTION.
* html/HTMLTextAreaElement.idl: Use non-legacy exceptions.
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::setRangeText): Use ExceptionOr.
(WebCore::HTMLTextFormControlElement::setInnerTextValue): Ditto.
(WebCore::HTMLTextFormControlElement::setMaxLength): Ditto.
(WebCore::HTMLTextFormControlElement::setMinLength): Ditto.
* html/HTMLTextFormControlElement.h: Updated for above changes.
Also renamed the setMin/MaxLength function overloads for internal use
to internSetMin/MaxLength and made them protected.
* html/HTMLTrackElement.cpp:
(WebCore::HTMLTrackElement::~HTMLTrackElement): Call clearElement on the
track to break the connection. Before this was done as a side effect of
clearClient, but that is called in other cases where we do not want to
clear the link back to the track element.
(WebCore::HTMLTrackElement::insertedInto): Removed code that uses the
track function for its side effect of creating a track; no longer needed.
Rewrote this so it's more symmetric with removedFrom.
(WebCore::HTMLTrackElement::removedFrom): Pass reference. Also reordered
and removed an unnecessary check for null parent.
(WebCore::HTMLTrackElement::parseAttribute): Use track.
(WebCore::HTMLTrackElement::kind): Ditto.
(WebCore::HTMLTrackElement::track): Renamed ensureTrack to this. Also
removed the redundant code to call setTrackElement; we no longer change
the track element on a track until the track element is destroyed.
(WebCore::HTMLTrackElement::scheduleLoad): Use track.
(WebCore::HTMLTrackElement::loadTimerFired): Ditto.
(WebCore::HTMLTrackElement::setReadyState): Ditto.
(WebCore::HTMLTrackElement::readyState): Ditto.
(WebCore::HTMLTrackElement::mediaElement): Rearranged to use early return.
* html/HTMLTrackElement.h: Updated for above changes.
* html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::webkitEnterFullscreen): Use ExceptionOr.
* html/HTMLVideoElement.h: Removed the functions used just for
capitalization reasons; that's now handled in the bindings.
* html/HTMLVideoElement.idl: Use non-legacy bindings and ImplementedAs.
* html/ImageData.cpp:
(WebCore::ImageData::create): Return ExceptionOr.
* html/ImageData.h: Updated for above changes.
* html/ImageData.idl: Use non-legacy exceptions.
* html/InputType.cpp:
(WebCore::InputType::setValueAsDate): Use ExceptionOr.
(WebCore::InputType::setValueAsDouble): Ditto.
(WebCore::InputType::setValueAsDecimal): Ditto.
(WebCore::InputType::applyStep): Ditto.
(WebCore::InputType::stepUp): Ditto.
(WebCore::InputType::stepUpFromRenderer): Removed IGNORE_EXCEPTION.
* html/InputType.h: Updated for the above.
* html/MediaController.cpp:
(MediaController::addMediaElement): Take a reference instead of a pointer.
(MediaController::removeMediaElement): Ditto.
(MediaController::containsMediaElement): Ditto.
(MediaController::setVolume): Use ExceptionOr.
(MediaController::bringElementUpToSpeed): Take a reference.
* html/MediaController.h: Updated for above changes. Also made lots of
function overrides private.
* html/MediaController.idl: Use non-legacy exception.
* html/MediaControllerInterface.h: Use ExceptionOr for setVolume.
* html/NumberInputType.cpp:
(WebCore::RealNumberRenderSize::max): Use aggregate initialization instead
of a constructor.
(WebCore::calculateRenderSize): Ditto.
(WebCore::NumberInputType::setValueAsDouble): Use ExceptionOr.
(WebCore::NumberInputType::setValueAsDecimal): Ditto.
* html/NumberInputType.h: Updated for above changes.
* html/RangeInputType.cpp:
(WebCore::RangeInputType::RangeInputType): Initialize scalar data member
in class definition instead of here.
(WebCore::RangeInputType::setValueAsDecimal): Use ExceptionOr.
(WebCore::RangeInputType::handleKeydownEvent): Removed IGNORE_EXCEPTION.
* html/RangeInputType.h: Updated for above changes.
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::updatePlaceholderText): Removed
ASSERT_NO_EXCEPTION.
* html/TimeRanges.cpp:
(WebCore::TimeRanges::start): Use ExceptionOr.
(WebCore::TimeRanges::end): Ditto.
* html/TimeRanges.h: Updated for the above.
* html/TimeRanges.idl: Use non-legacy exceptions.
* html/URLUtils.idl: Use non-legacy exception.
* html/ValidationMessage.cpp:
(WebCore::ValidationMessage::setMessageDOMAndStartTimer): Removed
ASSERT_NO_EXCEPTION, IGNORE_EXCEPTION, and other exception-ignoring idioms.
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processStartTagForInBody): Ditto.
* html/shadow/MediaControlElementTypes.cpp:
(WebCore::MediaControlVolumeSliderElement::defaultEventHandler): Ditto.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::setPosition): Ditto.
(WebCore::MediaControlPanelElement::resetPosition): Ditto.
(WebCore::MediaControlStatusDisplayElement::update): Ditto.
(WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay): Ditto.
(WebCore::MediaControlFullscreenVolumeMinButtonElement::defaultEventHandler): Ditto.
(WebCore::MediaControlFullscreenVolumeMaxButtonElement::defaultEventHandler): Ditto.
* html/shadow/MediaControls.cpp:
(WebCore::MediaControls::updateCurrentTimeDisplay): Ditto.
* html/shadow/MediaControlsApple.cpp:
(WebCore::MediaControlsApple::updateCurrentTimeDisplay): Ditto.
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::LoadableTextTrack): Take reference.
(WebCore::LoadableTextTrack::~LoadableTextTrack): Deleted.
(WebCore::LoadableTextTrack::clearClient): Deleted override. We no longer
want to clear m_trackElement when clearing the client.
(WebCore::LoadableTextTrack::setTrackElement): Deleted.
(WebCore::LoadableTextTrack::id): Changed to use
attributeWithoutSynchronization for better performance and idAttr instead
of a string constant.
* html/track/LoadableTextTrack.h: Updated for above changes. Added a new
clearElement function. Made the element and isDefault functions private.
* html/track/VTTCue.cpp:
(WebCore::VTTCue::~VTTCue): Removed ASSERT_NO_EXCEPTION, IGNORE_EXCEPTION,
and other exception-ignoring idioms.
(WebCore::VTTCue::removeDisplayTree): Ditto.
* html/track/VTTRegion.cpp:
(WebCore::VTTRegion::displayLastTextTrackCueBox): Ditto.
(WebCore::VTTRegion::willRemoveTextTrackCueBox): Ditto.
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::pushNodeByBackendIdToFrontend):
Rewrote to avoid multiplehash table lookups and added a FIXME about
the peculiar code here.
(WebCore::InspectorDOMAgent::resolveNode): Streamlined.
(WebCore::InspectorDOMAgent::nodeAsScriptValue): Use the new
checkSecurityForNode instead of the old shouldAllowAccessToNode.
* platform/graphics/ImageBuffer.h: Take Optional<double> instead of
const double* in toDataURL. Renamed ImageDataToDataURL to just dataURL.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::addAudioTrack): Take a reference instead of PassRefPtr.
(WebCore::MediaPlayer::removeAudioTrack): Ditto.
(WebCore::MediaPlayer::addTextTrack): Ditto.
(WebCore::MediaPlayer::removeTextTrack): Ditto.
(WebCore::MediaPlayer::addVideoTrack): Ditto.
(WebCore::MediaPlayer::removeVideoTrack): Ditto.
* platform/graphics/MediaPlayer.h: Updated for the above.
* platform/graphics/PlatformTimeRanges.h: Exported a couple of functions
that are now used in WebKit.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::clearTextTracks): Use a modern for loop.
(WebCore::MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks):
Fixed a bug that would cause this function to fail to process half the tracks.
Also updated for the change from PassRefPtr to references.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::determineChangedTracksFromNewTracksAndOldItems): Pass references.
(WebCore::MediaPlayerPrivateAVFoundationObjC::audioSourceProvider): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::processMetadataTrack): Ditto.
(WebCore::assetMetadataKeyNames): Tweaked formatting.
(WebCore::itemKVOProperties): Ditto.
(WebCore::playerKVOProperties): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::updateTracksOfType): Pass references.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::toDataURL): Use Optional<double>
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::createBitmapImageAfterScalingIfNeeded): Use auto.
(WebCore::encodeImage): Ditto. Also renamed from CGImageEncodeToData.
(WebCore::dataURL): Ditto. Also renamed from CGImageToDataURL and from
ImageDataToDataURL.
(WebCore::ImageBuffer::toDataURL): Ditto.
* platform/graphics/efl/ImageBufferEfl.cpp:
(WebCore::encodeImageJPEG): Use Optional<double>
(WebCore::ImageBuffer::toDataURL): Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Pass
a reference instead of pointer.
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::processTableOfContents): Ditto.
* platform/graphics/gtk/ImageBufferGtk.cpp:
(WebCore::encodeImage): Use Optional<double>
(WebCore::ImageBuffer::toDataURL): Ditto.
* platform/graphics/win/ImageBufferDirect2D.cpp:
(WebCore::ImageBuffer::toDataURL): Use Optional<double>
* platform/image-encoders/JPEGImageEncoder.cpp:
(WebCore::compressRGBABigEndianToJPEG): Use Optional<double>
* platform/image-encoders/JPEGImageEncoder.h: Ditto.
* platform/ios/WebPlaybackSessionInterfaceAVKit.mm:
(WebCore::WebPlaybackSessionInterfaceAVKit::seekableRangesChanged):
Updated for change to TimeRanges.
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController setVolume:]): Removed IGNORE_EXCEPTION.
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::endElementNs): Ditto.
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMediaSliderTrack): Updated for changes to
the TimeRanges class.
Source/WebKit/mac:
* DOM/DOMCharacterData.mm:
(-[DOMCharacterData remove]): Updated exception handling.
* DOM/DOMDOMTokenList.mm:
(-[DOMDOMTokenList toggle:force:]): Ditto.
* DOM/DOMDocumentType.mm:
(-[DOMDocumentType remove]): Ditto.
* DOM/DOMElement.mm:
(-[DOMElement remove]): Ditto.
* DOM/DOMHTML.mm:
(-[DOMHTMLInputElement setValueAsNumberWithChangeEvent:]): Ditto.
* DOM/DOMHTMLCanvasElement.mm:
(-[DOMHTMLCanvasElement toDataURL:]): Ditto.
* DOM/DOMHTMLElement.mm:
(-[DOMHTMLElement setInnerText:]): Ditto.
(-[DOMHTMLElement setOuterText:]): Ditto.
(-[DOMHTMLElement setContentEditable:]): Ditto.
* DOM/DOMHTMLInputElement.mm:
(-[DOMHTMLInputElement setMaxLength:]): Ditto.
(-[DOMHTMLInputElement setValueAsDate:]): Ditto.
(-[DOMHTMLInputElement setValueAsNumber:]): Ditto.
(-[DOMHTMLInputElement stepUp:]): Ditto.
(-[DOMHTMLInputElement stepDown:]): Ditto.
(-[DOMHTMLInputElement setRangeText:]): Ditto.
(-[DOMHTMLInputElement setRangeText:start:end:selectionMode:]): Ditto.
* DOM/DOMHTMLMarqueeElement.mm:
(-[DOMHTMLMarqueeElement setLoop:]): Ditto.
* DOM/DOMHTMLMediaElement.mm:
(-[DOMHTMLMediaElement setCurrentTime:]): Ditto.
(-[DOMHTMLMediaElement setVolume:]): Ditto.
* DOM/DOMHTMLOptionsCollection.mm:
(-[DOMHTMLOptionsCollection setLength:]): Ditto.
* DOM/DOMHTMLTableElement.mm:
(-[DOMHTMLTableElement setCaption:]): Ditto.
(-[DOMHTMLTableElement setTHead:]): Ditto.
(-[DOMHTMLTableElement setTFoot:]): Ditto.
(-[DOMHTMLTableElement insertRow:]): Ditto.
(-[DOMHTMLTableElement deleteRow:]): Ditto.
* DOM/DOMHTMLTableRowElement.mm:
(-[DOMHTMLTableRowElement insertCell:]): Ditto.
(-[DOMHTMLTableRowElement deleteCell:]): Ditto.
* DOM/DOMHTMLTableSectionElement.mm:
(-[DOMHTMLTableSectionElement insertRow:]): Ditto.
(-[DOMHTMLTableSectionElement deleteRow:]): Ditto.
* DOM/DOMHTMLTextAreaElement.mm:
(-[DOMHTMLTextAreaElement setMaxLength:]): Ditto.
(-[DOMHTMLTextAreaElement setRangeText:]): Ditto.
(-[DOMHTMLTextAreaElement setRangeText:start:end:selectionMode:]): Ditto.
* DOM/DOMHTMLVideoElement.mm:
(-[DOMHTMLVideoElement webkitEnterFullscreen]): Ditto.
(-[DOMHTMLVideoElement webkitEnterFullScreen]): Changed to call the other named
version (lowercase S) instead of repeating the logic from that method.
(-[DOMHTMLVideoElement webkitExitFullScreen]): Ditto.
* DOM/DOMTimeRanges.mm:
(-[DOMTimeRanges start:]): Updated exception handling.
(-[DOMTimeRanges end:]): Ditto.
Source/WebKit/win:
* DOMHTMLClasses.cpp:
(DOMHTMLElement::setInnerText): Update exception handling.
* FullscreenVideoController.cpp:
(FullscreenVideoController::setVolume): Ditto.
Source/WebKit2:
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp:
(webkit_dom_dom_token_list_add): Updated exception handling.
(webkit_dom_dom_token_list_remove): Ditto.
(webkit_dom_dom_token_list_toggle): Ditto.
(webkit_dom_dom_token_list_replace): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp:
(webkit_dom_element_remove): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp:
(webkit_dom_html_element_set_inner_text): Ditto.
(webkit_dom_html_element_set_outer_text): Ditto.
(webkit_dom_html_element_set_content_editable): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp:
(webkit_dom_html_input_element_set_max_length): Ditto.
(webkit_dom_html_input_element_set_size): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp:
(webkit_dom_html_select_element_set_length): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp:
(webkit_dom_html_table_element_insert_row): Ditto.
(webkit_dom_html_table_element_delete_row): Ditto.
(webkit_dom_html_table_element_set_caption): Ditto.
(webkit_dom_html_table_element_set_t_head): Ditto.
(webkit_dom_html_table_element_set_t_foot): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp:
(webkit_dom_html_table_row_element_insert_cell): Ditto.
(webkit_dom_html_table_row_element_delete_cell): Ditto.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp:
(webkit_dom_html_table_section_element_insert_row): Ditto.
(webkit_dom_html_table_section_element_delete_row): Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState): Removed ASSERT_NO_EXCEPTION.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::setAssistedNodeValueAsNumber): Removed ASSERT_NO_EXCEPTION.
* WebProcess/cocoa/WebPlaybackSessionManager.mm:
(WebKit::WebPlaybackSessionManager::seekableRangesChanged):
Changed the code to use a different interface to TimeRange that does
not involve exceptions.
Tools:
* TestWebKitAPI/Tests/WebCore/TimeRanges.cpp:
(TestWebKitAPI::ToString): Updated for changes to the TimeRanges class.
(TestWebKitAPI::TEST): Ditto.
LayoutTests:
* fast/dom/DOMURL/set-href-attribute-hash-expected.txt:
* fast/dom/DOMURL/set-href-attribute-hash.html:
* fast/dom/DOMURL/set-href-attribute-hostname-expected.txt:
* fast/dom/DOMURL/set-href-attribute-hostname.html:
* fast/dom/DOMURL/set-href-attribute-pathname-expected.txt:
* fast/dom/DOMURL/set-href-attribute-pathname.html:
Updated these tests to expect that if you set href and it raises an exception,
then the URL does not change. The old expected results showed the exception being
raised but the URL being changed to the invalid href.
* fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js:
* fast/dom/HTMLProgressElement/set-progress-properties-expected.txt:
Updated to expect a different exception, TypeError rather than NotSupportedError,
for non-finite values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributehashexpectedtxt">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributehashhtml">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash.html</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributehostnameexpectedtxt">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributehostnamehtml">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname.html</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributepathnameexpectedtxt">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMURLsethrefattributepathnamehtml">trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLProgressElementscripttestssetprogresspropertiesjs">trunk/LayoutTests/fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLProgressElementsetprogresspropertiesexpectedtxt">trunk/LayoutTests/fast/dom/HTMLProgressElement/set-progress-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsurlurlsettersexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/url/url-setters-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFrameElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLOptionsCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomh">trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLocationCustomcpp">trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildNodeidl">trunk/Source/WebCore/dom/ChildNode.idl</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</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="#trunkSourceWebCoreeditingAppendNodeCommandcpp">trunk/Source/WebCore/editing/AppendNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertNodeBeforeCommandcpp">trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingMergeIdenticalElementsCommandcpp">trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveNodeCommandcpp">trunk/Source/WebCore/editing/RemoveNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSplitElementCommandcpp">trunk/Source/WebCore/editing/SplitElementCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSplitTextNodeCommandcpp">trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingWrapContentsInDummySpanCommandcpp">trunk/Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkuph">trunk/Source/WebCore/editing/markup.h</a></li>
<li><a href="#trunkSourceWebCorehtmlBaseChooserOnlyDateAndTimeInputTypecpp">trunk/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlBaseDateAndTimeInputTypecpp">trunk/Source/WebCore/html/BaseDateAndTimeInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlBaseDateAndTimeInputTypeh">trunk/Source/WebCore/html/BaseDateAndTimeInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListcpp">trunk/Source/WebCore/html/DOMTokenList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListh">trunk/Source/WebCore/html/DOMTokenList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListidl">trunk/Source/WebCore/html/DOMTokenList.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLcpp">trunk/Source/WebCore/html/DOMURL.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLh">trunk/Source/WebCore/html/DOMURL.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLidl">trunk/Source/WebCore/html/DOMURL.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlDateTimeLocalInputTypecpp">trunk/Source/WebCore/html/DateTimeLocalInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDateTimeLocalInputTypeh">trunk/Source/WebCore/html/DateTimeLocalInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlFTPDirectoryDocumentcpp">trunk/Source/WebCore/html/FTPDirectoryDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementidl">trunk/Source/WebCore/html/HTMLCanvasElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementh">trunk/Source/WebCore/html/HTMLElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementidl">trunk/Source/WebCore/html/HTMLElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementidl">trunk/Source/WebCore/html/HTMLEmbedElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameElementidl">trunk/Source/WebCore/html/HTMLFrameElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp">trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementh">trunk/Source/WebCore/html/HTMLFrameOwnerElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLIFrameElementidl">trunk/Source/WebCore/html/HTMLIFrameElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementidl">trunk/Source/WebCore/html/HTMLInputElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementcpp">trunk/Source/WebCore/html/HTMLMarqueeElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementh">trunk/Source/WebCore/html/HTMLMarqueeElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementidl">trunk/Source/WebCore/html/HTMLMarqueeElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementidl">trunk/Source/WebCore/html/HTMLMediaElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementidl">trunk/Source/WebCore/html/HTMLObjectElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementh">trunk/Source/WebCore/html/HTMLOptionElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementidl">trunk/Source/WebCore/html/HTMLOptionElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectioncpp">trunk/Source/WebCore/html/HTMLOptionsCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionh">trunk/Source/WebCore/html/HTMLOptionsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionidl">trunk/Source/WebCore/html/HTMLOptionsCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLProgressElementcpp">trunk/Source/WebCore/html/HTMLProgressElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLProgressElementh">trunk/Source/WebCore/html/HTMLProgressElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLProgressElementidl">trunk/Source/WebCore/html/HTMLProgressElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementidl">trunk/Source/WebCore/html/HTMLSelectElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableElementcpp">trunk/Source/WebCore/html/HTMLTableElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableElementh">trunk/Source/WebCore/html/HTMLTableElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableElementidl">trunk/Source/WebCore/html/HTMLTableElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowElementcpp">trunk/Source/WebCore/html/HTMLTableRowElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowElementh">trunk/Source/WebCore/html/HTMLTableRowElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowElementidl">trunk/Source/WebCore/html/HTMLTableRowElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementcpp">trunk/Source/WebCore/html/HTMLTableSectionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementh">trunk/Source/WebCore/html/HTMLTableSectionElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementidl">trunk/Source/WebCore/html/HTMLTableSectionElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementidl">trunk/Source/WebCore/html/HTMLTextAreaElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementh">trunk/Source/WebCore/html/HTMLTextFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementcpp">trunk/Source/WebCore/html/HTMLTrackElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementh">trunk/Source/WebCore/html/HTMLTrackElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementcpp">trunk/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementh">trunk/Source/WebCore/html/HTMLVideoElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementidl">trunk/Source/WebCore/html/HTMLVideoElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDatacpp">trunk/Source/WebCore/html/ImageData.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDatah">trunk/Source/WebCore/html/ImageData.h</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDataidl">trunk/Source/WebCore/html/ImageData.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypecpp">trunk/Source/WebCore/html/InputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypeh">trunk/Source/WebCore/html/InputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllercpp">trunk/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControlleridl">trunk/Source/WebCore/html/MediaController.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerInterfaceh">trunk/Source/WebCore/html/MediaControllerInterface.h</a></li>
<li><a href="#trunkSourceWebCorehtmlNumberInputTypecpp">trunk/Source/WebCore/html/NumberInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlNumberInputTypeh">trunk/Source/WebCore/html/NumberInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlRangeInputTypecpp">trunk/Source/WebCore/html/RangeInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlRangeInputTypeh">trunk/Source/WebCore/html/RangeInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTimeRangescpp">trunk/Source/WebCore/html/TimeRanges.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTimeRangesh">trunk/Source/WebCore/html/TimeRanges.h</a></li>
<li><a href="#trunkSourceWebCorehtmlTimeRangesidl">trunk/Source/WebCore/html/TimeRanges.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlURLUtilsidl">trunk/Source/WebCore/html/URLUtils.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlValidationMessagecpp">trunk/Source/WebCore/html/ValidationMessage.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementTypescpp">trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlscpp">trunk/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsApplecpp">trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackh">trunk/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegioncpp">trunk/Source/WebCore/html/track/VTTRegion.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformTimeRangesh">trunk/Source/WebCore/platform/graphics/PlatformTimeRanges.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp">trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimageencodersJPEGImageEncodercpp">trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimageencodersJPEGImageEncoderh">trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebPlaybackSessionInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.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="#trunkSourceWebKitmacDOMDOMDOMTokenListmm">trunk/Source/WebKit/mac/DOM/DOMDOMTokenList.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMDocumentTypemm">trunk/Source/WebKit/mac/DOM/DOMDocumentType.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMElementmm">trunk/Source/WebKit/mac/DOM/DOMElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLmm">trunk/Source/WebKit/mac/DOM/DOMHTML.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLCanvasElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLCanvasElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLInputElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLInputElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLMarqueeElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLMarqueeElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLMediaElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLOptionsCollectionmm">trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLTableElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLTableElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLTableRowElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLTableRowElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLTableSectionElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLTableSectionElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLTextAreaElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLTextAreaElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLVideoElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLVideoElement.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMTimeRangesmm">trunk/Source/WebKit/mac/DOM/DOMTimeRanges.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMHTMLClassescpp">trunk/Source/WebKit/win/DOMHTMLClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllercpp">trunk/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDOMTokenListcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLInputElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLSelectElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableRowElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableSectionElementcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm">trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreTimeRangescpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/TimeRanges.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * fast/dom/DOMURL/set-href-attribute-hash-expected.txt:
+ * fast/dom/DOMURL/set-href-attribute-hash.html:
+ * fast/dom/DOMURL/set-href-attribute-hostname-expected.txt:
+ * fast/dom/DOMURL/set-href-attribute-hostname.html:
+ * fast/dom/DOMURL/set-href-attribute-pathname-expected.txt:
+ * fast/dom/DOMURL/set-href-attribute-pathname.html:
+ Updated these tests to expect that if you set href and it raises an exception,
+ then the URL does not change. The old expected results showed the exception being
+ raised but the URL being changed to the invalid href.
+
+ * fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js:
+ * fast/dom/HTMLProgressElement/set-progress-properties-expected.txt:
+ Updated to expect a different exception, TypeError rather than NotSupportedError,
+ for non-finite values.
+
</ins><span class="cx"> 2016-10-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAudio does not resume when moving from background to foreground tab.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributehashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash-expected.txt (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash-expected.txt 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash-expected.txt 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> PASS a.href is 'http://www.mydomain.com/path/testurl.html#hash?value'
</span><span class="cx"> '#' in hash value, and illegal characters in hostname
</span><span class="cx"> PASS a.href = "https://ww w.my\"d(){}|~om?ain#com/path/testurl.html#middle" threw exception TypeError: Type error.
</span><del>-PASS a.href is 'https://ww w.my\"d(){}|~om?ain#com/path/testurl.html#middle'
</del><ins>+PASS a.href is 'http://www.mydomain.com/path/testurl.html#hash#value'
</ins><span class="cx"> Set hash to null
</span><span class="cx"> PASS a.href is 'https://www.mydomain.com/path/testurl.html#null'
</span><span class="cx"> Set hash to empty string
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributehashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash.html (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash.html 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hash.html 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> // with the URL API, assigning an invalid href throws
</span><span class="cx"> shouldThrow('a.href = "https://ww w.my\\"d(){}|~om?ain#com/path/testurl.html#middle"');
</span><span class="cx"> a.hash = "#hash#value";
</span><del>-shouldBe("a.href", "'https://ww w.my\\\"d(){}|~om?ain#com/path/testurl.html#middle'");
</del><ins>+shouldBe("a.href", "'http://www.mydomain.com/path/testurl.html#hash#value'");
</ins><span class="cx">
</span><span class="cx"> debug("Set hash to null");
</span><span class="cx"> a.href = "https://www.mydomain.com/path/testurl.html#middle";
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributehostnameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname-expected.txt (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname-expected.txt 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname-expected.txt 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> PASS a.href is 'really:bad:url'
</span><span class="cx"> Set a hostname that contains space in it
</span><span class="cx"> PASS a.href = "http://www.my domain.com/path/" threw exception TypeError: Type error.
</span><del>-PASS a.href is 'http://www.my domain.com/path/'
</del><ins>+PASS a.href is 'really:bad:url'
</ins><span class="cx"> Set hostname on a local file
</span><span class="cx"> FAIL a.href should be c:/path/testurl.html. Was c://a/path/testurl.html.
</span><span class="cx"> Set hostname to undefined
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributehostnamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname.html (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname.html 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-hostname.html 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> debug("Set a hostname that contains space in it");
</span><span class="cx"> shouldThrow('a.href = "http://www.my domain.com/path/"');
</span><span class="cx"> a.hostname = "www.other domain.com";
</span><del>-shouldBe("a.href", "'http://www.my domain.com/path/'");
</del><ins>+shouldBe("a.href", "'really:bad:url'");
</ins><span class="cx">
</span><span class="cx"> // IE8 throws an exception "The URL is invalid".
</span><span class="cx"> try {
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributepathnameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname-expected.txt (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname-expected.txt 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname-expected.txt 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -17,10 +17,10 @@
</span><span class="cx"> PASS a.href is 'https://www.mydomain.com/?key=value'
</span><span class="cx"> Set pathname that includes illegal characters to URL that contains illegal characters.
</span><span class="cx"> PASS a.href = "https://www.my|d[]()omain.com/path/testurl.html?key=value" threw exception TypeError: Type error.
</span><del>-PASS a.href is 'https://www.my|d[]()omain.com/path/testurl.html?key=value'
</del><ins>+PASS a.href is 'https://www.mydomain.com/p$a|th?key=value'
</ins><span class="cx"> Set pathname to URL that contains '@' in host
</span><span class="cx"> PASS a.href = "http://w@#ww" threw exception TypeError: Type error.
</span><del>-PASS a.href is 'http://w@#ww'
</del><ins>+PASS a.href is 'https://www.mydomain.com/path?key=value'
</ins><span class="cx"> Set pathname to a URL with non-hierarchical protocol
</span><span class="cx"> PASS a.href is 'tel:+1800-555-1212'
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMURLsethrefattributepathnamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname.html (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname.html 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/DOMURL/set-href-attribute-pathname.html 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> debug("Set pathname that includes illegal characters to URL that contains illegal characters.");
</span><span class="cx"> shouldThrow('a.href = "https://www.my|d[]()omain.com/path/testurl.html?key=value"');
</span><span class="cx"> a.pathname = "p$a|th";
</span><del>-shouldBe("a.href", "'https://www.my|d[]()omain.com/path/testurl.html?key=value'");
</del><ins>+shouldBe("a.href", "'https://www.mydomain.com/p$a|th?key=value'");
</ins><span class="cx">
</span><span class="cx"> // IE8 throws a security exception. Gecko parses this as a URL with an empty hostname.
</span><span class="cx"> try {
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> debug("Set pathname to URL that contains '@' in host");
</span><span class="cx"> shouldThrow('a.href = "http://w@#ww"');
</span><span class="cx"> a.pathname = "path";
</span><del>-shouldBe("a.href", "'http://w@#ww'");
</del><ins>+shouldBe("a.href", "'https://www.mydomain.com/path?key=value'");
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> debug("Exception: " + e.description);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLProgressElementscripttestssetprogresspropertiesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/HTMLProgressElement/script-tests/set-progress-properties.js 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -27,16 +27,16 @@
</span><span class="cx"> shouldBe('p.position', '0');
</span><span class="cx">
</span><span class="cx"> debug("Set invalid value, should throw");
</span><del>-shouldThrow('p.value = "200A";', '"NotSupportedError (DOM Exception 9): The operation is not supported."');
</del><ins>+shouldThrow('p.value = "200A";', '"TypeError: The provided value is non-finite"');
</ins><span class="cx">
</span><span class="cx"> debug("Set invalid max, should throw");
</span><del>-shouldThrow('p.max = "max";', '"NotSupportedError (DOM Exception 9): The operation is not supported."');
</del><ins>+shouldThrow('p.max = "max";', '"TypeError: The provided value is non-finite"');
</ins><span class="cx">
</span><span class="cx"> debug("Set max to Infinity, should throw");
</span><del>-shouldThrow('p.max = Infinity;', '"NotSupportedError (DOM Exception 9): The operation is not supported."');
</del><ins>+shouldThrow('p.max = Infinity;', '"TypeError: The provided value is non-finite"');
</ins><span class="cx">
</span><span class="cx"> debug("Set value to NaN, should throw");
</span><del>-shouldThrow('p.value = NaN;', '"NotSupportedError (DOM Exception 9): The operation is not supported."');
</del><ins>+shouldThrow('p.value = NaN;', '"TypeError: The provided value is non-finite"');
</ins><span class="cx">
</span><span class="cx"> debug("Set value to null and max to 0");
</span><span class="cx"> p.value = null;
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLProgressElementsetprogresspropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLProgressElement/set-progress-properties-expected.txt (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLProgressElement/set-progress-properties-expected.txt 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/fast/dom/HTMLProgressElement/set-progress-properties-expected.txt 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,13 +19,13 @@
</span><span class="cx"> PASS p.value is 0
</span><span class="cx"> PASS p.position is 0
</span><span class="cx"> Set invalid value, should throw
</span><del>-PASS p.value = "200A"; threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
</del><ins>+PASS p.value = "200A"; threw exception TypeError: The provided value is non-finite.
</ins><span class="cx"> Set invalid max, should throw
</span><del>-PASS p.max = "max"; threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
</del><ins>+PASS p.max = "max"; threw exception TypeError: The provided value is non-finite.
</ins><span class="cx"> Set max to Infinity, should throw
</span><del>-PASS p.max = Infinity; threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
</del><ins>+PASS p.max = Infinity; threw exception TypeError: The provided value is non-finite.
</ins><span class="cx"> Set value to NaN, should throw
</span><del>-PASS p.value = NaN; threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
</del><ins>+PASS p.value = NaN; threw exception TypeError: The provided value is non-finite.
</ins><span class="cx"> Set value to null and max to 0
</span><span class="cx"> PASS p.value is 0
</span><span class="cx"> PASS p.max is 1
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/url/url-setters-expected.txt: Updated for progressions that occurred
+ because setting the href attribute on a DOMURL object no longer modifies the URL as a side
+ effect in the cases where it throw an exception.
+
</ins><span class="cx"> 2016-10-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Partially revert 207805 after resolution in URL spec issue 87
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsurlurlsettersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/url/url-setters-expected.txt (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/url/url-setters-expected.txt 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/url/url-setters-expected.txt 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> PASS URL: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored
</span><span class="cx"> PASS <a>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored
</span><span class="cx"> PASS <area>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored
</span><del>-FAIL URL: Setting <file:///home/you/index.html>.username = 'me' No host means no username assert_equals: expected "file:///home/you/index.html" but got "file://me@/home/you/index.html"
</del><ins>+PASS URL: Setting <file:///home/you/index.html>.username = 'me' No host means no username
</ins><span class="cx"> FAIL <a>: Setting <file:///home/you/index.html>.username = 'me' No host means no username assert_equals: expected "file:///home/you/index.html" but got "file://me@/home/you/index.html"
</span><span class="cx"> FAIL <area>: Setting <file:///home/you/index.html>.username = 'me' No host means no username assert_equals: expected "file:///home/you/index.html" but got "file://me@/home/you/index.html"
</span><del>-FAIL URL: Setting <unix:/run/foo.socket>.username = 'me' No host means no username assert_equals: expected "unix:/run/foo.socket" but got "unix://me@/run/foo.socket"
</del><ins>+PASS URL: Setting <unix:/run/foo.socket>.username = 'me' No host means no username
</ins><span class="cx"> FAIL <a>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username assert_equals: expected "unix:/run/foo.socket" but got "unix://me@/run/foo.socket"
</span><span class="cx"> FAIL <area>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username assert_equals: expected "unix:/run/foo.socket" but got "unix://me@/run/foo.socket"
</span><span class="cx"> FAIL URL: Setting <mailto:you@example.net>.username = 'me' Cannot-be-a-base means no username assert_equals: expected "mailto:you@example.net" but got "mailto://me%40you@example.net"
</span><span class="lines">@@ -72,10 +72,10 @@
</span><span class="cx"> PASS URL: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is.
</span><span class="cx"> PASS <a>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is.
</span><span class="cx"> PASS <area>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is.
</span><del>-FAIL URL: Setting <file:///home/me/index.html>.password = 'secret' No host means no password assert_equals: expected "file:///home/me/index.html" but got "file://:secret@/home/me/index.html"
</del><ins>+PASS URL: Setting <file:///home/me/index.html>.password = 'secret' No host means no password
</ins><span class="cx"> FAIL <a>: Setting <file:///home/me/index.html>.password = 'secret' No host means no password assert_equals: expected "file:///home/me/index.html" but got "file://:secret@/home/me/index.html"
</span><span class="cx"> FAIL <area>: Setting <file:///home/me/index.html>.password = 'secret' No host means no password assert_equals: expected "file:///home/me/index.html" but got "file://:secret@/home/me/index.html"
</span><del>-FAIL URL: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password assert_equals: expected "unix:/run/foo.socket" but got "unix://:secret@/run/foo.socket"
</del><ins>+PASS URL: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password
</ins><span class="cx"> FAIL <a>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password assert_equals: expected "unix:/run/foo.socket" but got "unix://:secret@/run/foo.socket"
</span><span class="cx"> FAIL <area>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password assert_equals: expected "unix:/run/foo.socket" but got "unix://:secret@/run/foo.socket"
</span><span class="cx"> FAIL URL: Setting <mailto:me@example.net>.password = 'secret' Cannot-be-a-base means no password assert_equals: expected "mailto:me@example.net" but got "mailto://:secret%40me@example.net"
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> PASS URL: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized
</span><span class="cx"> PASS <a>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized
</span><span class="cx"> PASS <area>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized
</span><del>-FAIL URL: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized assert_equals: expected "http://[::1]:2/" but got "http://[:0/"
</del><ins>+FAIL URL: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized assert_equals: expected "http://[::1]:2/" but got "http://example.net/"
</ins><span class="cx"> FAIL <a>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized assert_equals: expected "http://[::1]:2/" but got "http://[:0/"
</span><span class="cx"> FAIL <area>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized assert_equals: expected "http://[::1]:2/" but got "http://[:0/"
</span><span class="cx"> PASS URL: Setting <http://example.net>.host = 'example.com:80' Default port number is removed
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> PASS URL: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes
</span><span class="cx"> PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes
</span><span class="cx"> PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes
</span><del>-FAIL URL: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</del><ins>+PASS URL: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain
</ins><span class="cx"> FAIL <a>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</span><span class="cx"> FAIL <area>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</span><span class="cx"> PASS URL: Setting <view-source+http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> PASS URL: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers
</span><span class="cx"> PASS <a>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers
</span><span class="cx"> PASS <area>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers
</span><del>-FAIL URL: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. assert_equals: expected "http://example.com/path" but got "http://example.com:65536/path"
</del><ins>+FAIL URL: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. assert_equals: expected "http://example.com/path" but got "http://example.net/path"
</ins><span class="cx"> FAIL <a>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. assert_equals: expected "http://example.com/path" but got "http://example.com:65536/path"
</span><span class="cx"> FAIL <area>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. assert_equals: expected "http://example.com/path" but got "http://example.com:65536/path"
</span><span class="cx"> PASS URL: Setting <mailto:me@example.net>.hostname = 'example.com' Cannot-be-a-base means no host
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> FAIL URL: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes assert_equals: expected "http://example.com/path" but got "http://example.com/stuff/path"
</span><span class="cx"> FAIL <a>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes assert_equals: expected "http://example.com/path" but got "http://example.com/stuff/path"
</span><span class="cx"> FAIL <area>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes assert_equals: expected "http://example.com/path" but got "http://example.com/stuff/path"
</span><del>-FAIL URL: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</del><ins>+PASS URL: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain
</ins><span class="cx"> FAIL <a>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</span><span class="cx"> FAIL <area>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, and it’s invalid in a domain assert_equals: expected "view-source+http://example.net/path" but got "view-source+http://example.com\\stuff/path"
</span><span class="cx"> PASS URL: Setting <http://example.net>.port = '8080'
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,558 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::shouldAllowAccessToNode): Deleted.
+ (WebCore::BindingSecurity::shouldAllowAccessToFrame): Moved function into the
+ BindingSecurity namespace. Also changed arguments to references.
+ (WebCore::BindingSecurity::shouldAllowAccessToDOMWindow): Ditto.
+ (WebCore::BindingSecurity::shouldAllowAccessToNode): Changed argument type
+ from pointer to reference.
+
+ * bindings/js/JSDOMBinding.h: Removed top level shouldAllowAccessTo functions,
+ moving all of them into the BindingSecurity namespace. Changed BindingSecurity
+ from a class into a namespace. Added new checkSecurityForNode functions that
+ can be used directly to implement CheckSecurityForNode; they turn the node
+ into a null, which is no change in behavior from what bindings already did.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess): Changed argument
+ type for passed-in string to const String& instead of String&.
+ (WebCore::JSDOMWindow::getOwnPropertySlot): Updated for BindingSecurity changes.
+ (WebCore::JSDOMWindow::getOwnPropertySlotByIndex): Ditto.
+ (WebCore::JSDOMWindow::put): Ditto.
+
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ (WebCore::attributesFor3DContext): Renamed from get3DContextAttributes and
+ changed to use a return value instead of an out argument.
+ (WebCore::JSHTMLCanvasElement::getContext): Updated for the above.
+ (WebCore::JSHTMLCanvasElement::toDataURL): Rewrote to handle ExceptionOr
+ and also to use Optional<double> instead of const double*.
+
+ * bindings/js/JSHTMLFrameElementCustom.cpp:
+ (WebCore::JSHTMLFrameElement::setLocation): Moved the logic from
+ allowSettingJavascriptURL in here and updated for BindingSecurity changes.
+
+ * bindings/js/JSHTMLOptionsCollectionCustom.cpp:
+ (WebCore::JSHTMLOptionsCollection::setLength): Use propagateException.
+ Also streamlined the code a bit.
+ (WebCore::JSHTMLOptionsCollection::indexSetter): Updated for new name and
+ argument types for selectElementIndexSetter.
+
+ * bindings/js/JSHTMLSelectElementCustom.cpp:
+ (WebCore::selectElementIndexSetter): Updated name and argument types and
+ to use propagateException.
+ (WebCore::JSHTMLSelectElement::indexSetter): Updated for above.
+ * bindings/js/JSHTMLSelectElementCustom.h: Ditto.
+
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::getOwnPropertySlotDelegate): Updated for changes to
+ BindingSecurity.
+ (WebCore::JSLocation::putDelegate): Ditto. Also rearranged logic a bit.
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::canAccessFromCurrentOrigin): Updated for
+ changes to BindingSecurity.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation): Removed old support for CheckSecurityForNode.
+ (NativeToJSValue): Added new support for CheckSecurityForNode, which uses
+ the new checkSecurityForNode function, and works properly with ExceptionOr.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp: Updated for change below.
+
+ * dom/ChildNode.idl: Move the remove function to non-legacy exception.
+ Needed now because this needs to match the one in HTMLSelectElement.
+
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchMouseForceWillBegin): Refactored a little bit.
+ (WebCore::Element::mergeWithNextTextNode): Support ExceptionOr for remove.
+ (WebCore::Element::setOuterHTML): Support ExceptionOr for
+ createFragmentForInnerOuterHTML.
+ (WebCore::Element::setInnerHTML): Ditto.
+ (WebCore::Element::insertAdjacentHTML): Ditto.
+
+ * dom/Node.cpp:
+ (WebCore::Node::remove): Use ExceptionOr.
+ (WebCore::Node::normalize): Remove use of IGNORE_EXCEPTION.
+ * dom/Node.h: Use ExceptionOr for remove.
+
+ * dom/Range.cpp:
+ (WebCore::Range::insertNode): Updated for change to remove.
+ (WebCore::Range::createContextualFragment): Updated for change
+ to WebCore::createContextualFragment.
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::setInnerHTML): Use ExceptionOr for
+ createFragmentForInnerOuterHTML and replaceChildrenWithFragment.
+
+ * editing/AppendNodeCommand.cpp:
+ (WebCore::AppendNodeCommand::doUnapply): Remove IGNORE_EXCEPTION.
+ * editing/InsertNodeBeforeCommand.cpp:
+ (WebCore::InsertNodeBeforeCommand::doUnapply): Ditto.
+ * editing/MergeIdenticalElementsCommand.cpp:
+ (WebCore::MergeIdenticalElementsCommand::doApply): Ditto.
+ * editing/RemoveNodeCommand.cpp:
+ (WebCore::RemoveNodeCommand::doApply): Ditto.
+ * editing/SplitElementCommand.cpp:
+ (WebCore::SplitElementCommand::doUnapply): Ditto.
+ * editing/SplitTextNodeCommand.cpp:
+ (WebCore::SplitTextNodeCommand::doUnapply): Ditto.
+ * editing/WrapContentsInDummySpanCommand.cpp:
+ (WebCore::WrapContentsInDummySpanCommand::doUnapply): Ditto.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::insertDictationPhrases): Deleted. Moved this
+ iOS-specific function to EditorIOS.mm.
+ (WebCore::Editor::setDictationPhrasesAsChildOfElement): Ditto.
+ (WebCore::Editor::confirmMarkedText): Ditto.
+ (WebCore::Editor::setTextAsChildOfElement): Ditto.
+ (WebCore::Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping): Ditto.
+
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::fontForSelection): Remove ASSERT_NO_EXCEPTION.
+ (WebCore::Editor::fontAttributesForSelectionStart): Ditto.
+ (WebCore::Editor::insertDictationPhrases): Moved here from Editor.cpp.
+ (WebCore::Editor::setDictationPhrasesAsChildOfElement): Ditto. Also
+ updated code that used remove to not pass an ExceptionCode.
+ (WebCore::Editor::confirmMarkedText): Ditto.
+ (WebCore::Editor::setTextAsChildOfElement): Ditto.
+ (WebCore::Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping): Ditto.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::fontForSelection): Remove ASSERT_NO_EXCEPTION.
+ (WebCore::Editor::fontAttributesForSelectionStart): Ditto.
+
+ * editing/markup.cpp:
+ (WebCore::createFragmentForInnerOuterHTML): Use ExceptionOr.
+ (WebCore::createContextualFragment): Ditto.
+ (WebCore::replaceChildrenWithFragment): Ditto.
+ (WebCore::replaceChildrenWithText): Ditto.
+ * editing/markup.h: Updated for above changes.
+
+ * html/BaseChooserOnlyDateAndTimeInputType.cpp:
+ (WebCore::BaseChooserOnlyDateAndTimeInputType::updateAppearance):
+ Removed ASSERT_NO_EXCEPTION.
+
+ * html/BaseDateAndTimeInputType.cpp:
+ (WebCore::BaseDateAndTimeInputType::setValueAsDate): Use ExceptionOr.
+ (WebCore::BaseDateAndTimeInputType::setValueAsDecimal): Ditto.
+ * html/BaseDateAndTimeInputType.h: Updated for above changes.
+
+ * html/DateTimeLocalInputType.cpp:
+ (WebCore::DateTimeLocalInputType::setValueAsDate): Use ExceptionOr.
+ * html/DateTimeLocalInputType.h: Updated for above changes.
+
+ * html/DOMTokenList.cpp:
+ (WebCore::DOMTokenList::validateToken): Use ExceptionOr.
+ (WebCore::DOMTokenList::validateTokens): Ditto.
+ (WebCore::DOMTokenList::addInternal): Ditto.
+ (WebCore::DOMTokenList::add): Ditto.
+ (WebCore::DOMTokenList::removeInternal): Ditto.
+ (WebCore::DOMTokenList::remove): Ditto.
+ (WebCore::DOMTokenList::toggle): Ditto.
+ (WebCore::DOMTokenList::replace): Ditto.
+ (WebCore::DOMTokenList::supports): Ditto.
+ * html/DOMTokenList.h: Updated for above changes.
+ * html/DOMTokenList.idl: Use non-legacy exceptions.
+
+ * html/DOMURL.cpp:
+ (WebCore::DOMURL::DOMURL): Just take the two URL objects and let
+ the create functions do all the processing.
+ (WebCore::DOMURL::create): Use ExceptionOr, and move the processing
+ of the URLs here out of the constructors.
+ (WebCore::DOMURL::setHref): Use ExceptionOr.
+ * html/DOMURL.h: Updated for above changes.
+ * html/DOMURL.idl: Use non-legacy exceptions.
+
+ * html/FTPDirectoryDocument.cpp:
+ (WebCore::FTPDirectoryDocumentParser::appendEntry): Remove
+ IGNORE_EXCEPTION and use releaseReturnValue().
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::toDataURL): Use ExceptionOr.
+ * html/HTMLCanvasElement.h: Updated for above changes.
+ * html/HTMLCanvasElement.idl: Use non-legacy exception.
+
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::textToFragment): Use ExceptionOr.
+ (WebCore::HTMLElement::setInnerText): Ditto.
+ (WebCore::HTMLElement::setOuterText): Ditto.
+ (WebCore::HTMLElement::setContentEditable): Ditto.
+ (WebCore::HTMLElement::translateAttributeMode): Deleted.
+ (WebCore::HTMLElement::translate): Moved the logic from the
+ translateAttributeMode function in here.
+ * html/HTMLElement.h: Updated for above changes.
+ * html/HTMLElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLEmbedElement.idl: Use non-legacy exception.
+ * html/HTMLFrameElement.idl: Ditto.
+
+ * html/HTMLFrameOwnerElement.cpp:
+ (WebCore::HTMLFrameOwnerElement::getSVGDocument): Use ExceptionOr.
+ * html/HTMLFrameOwnerElement.h: Updated for above.
+
+ * html/HTMLIFrameElement.idl: Use non-legacy exception.
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::stepUp): Use ExceptionOr.
+ (WebCore::HTMLInputElement::stepDown): Ditto.
+ (WebCore::HTMLInputElement::setValue): Ditto.
+ (WebCore::HTMLInputElement::setValueAsDate): Ditto.
+ (WebCore::HTMLInputElement::setValueAsNumber): Ditto.
+ (WebCore::HTMLInputElement::setSize): Ditto.
+ (WebCore::HTMLInputElement::maxLengthAttributeChanged): Use the
+ new internalSetMaxLength function; old code relied on a setMaxLength
+ that was different from the one exposed to bindings.
+ (WebCore::HTMLInputElement::minLengthAttributeChanged): Ditto.
+ (WebCore::HTMLInputElement::setRangeText): Use ExceptionOr.
+ * html/HTMLInputElement.h: Updated for above changes. Also use
+ data member initialization for InputElementClickState instead of
+ a constructor.
+ * html/HTMLInputElement.idl: Use non-legacy exception.
+
+ * html/HTMLMarqueeElement.cpp:
+ (WebCore::HTMLMarqueeElement::setLoop): Use ExceptionOr.
+ (WebCore::HTMLMarqueeElement::renderMarquee): Tweaked.
+ * html/HTMLMarqueeElement.h: Updated for above changes.
+ * html/HTMLMarqueeElement.idl: Ditto.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::TrackGroup::TrackGroup):
+ Initialize most data members in class definition rather than
+ the constructor.
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Ditto.
+ (WebCore::HTMLMediaElement::~HTMLMediaElement): Updated since
+ removeMediaElement now takes a reference.
+ (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Use
+ a modern for loop to streamline code.
+ (WebCore::HTMLMediaElement::textTrackModeChanged): Updated since
+ track now returns a reference.
+ (WebCore::HTMLMediaElement::setCurrentTimeForBindings): Renamed
+ to prevent ambiguity with the other version that has slightly
+ different semantics and overloading and changed to use ExceptionOr.
+ (WebCore::HTMLMediaElement::playInternal): Updated to use reference.
+ (WebCore::HTMLMediaElement::setVolume): Use ExceptionOr.
+ (WebCore::HTMLMediaElement::mediaPlayerDidAddAudioTrack): Take a
+ reference instead of a PassRefPtr.
+ (WebCore::HTMLMediaElement::mediaPlayerDidAddTextTrack): Ditto.
+ (WebCore::HTMLMediaElement::mediaPlayerDidAddVideoTrack): Ditto.
+ (WebCore::HTMLMediaElement::mediaPlayerDidRemoveAudioTrack): Ditto.
+ (WebCore::HTMLMediaElement::mediaPlayerDidRemoveTextTrack): Ditto.
+ (WebCore::HTMLMediaElement::mediaPlayerDidRemoveVideoTrack): Ditto.
+ (WebCore::HTMLMediaElement::addTextTrack): Use ExceptionOr.
+ (WebCore::HTMLMediaElement::didAddTextTrack): Use a reference.
+ (WebCore::HTMLMediaElement::didRemoveTextTrack): Ditto.
+ (WebCore::HTMLMediaElement::maxBufferedTime): Update to use different
+ interface to time ranges that does not need to deal with exceptions.
+ (WebCore::HTMLMediaElement::setController): Pass references.
+ (WebCore::HTMLMediaElement::outOfBandTrackSources): Use reference.
+ * html/HTMLMediaElement.h: Updated for above.
+ * html/HTMLMediaElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLObjectElement.idl: Use non-legacy exception.
+
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::createForJSConstructor): Use ExceptionOr.
+ * html/HTMLOptionElement.h: Updated for above change.
+ * html/HTMLOptionElement.idl: Use non-legacy exception.
+
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::setLength): Use ExceptionOr.
+ * html/HTMLOptionsCollection.h: Updated for above change.
+ * html/HTMLOptionsCollection.idl: Use non-legacy exception.
+
+ * html/HTMLProgressElement.cpp:
+ (WebCore::HTMLProgressElement::setValue): Removed non-finite handling
+ because that is now handled by the bindings.
+ (WebCore::HTMLProgressElement::setMax): Ditto.
+ * html/HTMLProgressElement.h: Updated for above.
+ * html/HTMLProgressElement.idl: Changed attributes to be double instead
+ of unrestricted double, and this was able to remove exceptions.
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::removeByIndex): Drop IGNORE_EXCEPTION.
+ (WebCore::HTMLSelectElement::remove): Use ExceptionOr.
+ (WebCore::HTMLSelectElement::setOption): Ditto.
+ (WebCore::HTMLSelectElement::setLength): Ditto.
+ * html/HTMLSelectElement.h: Updated for above changes.
+ * html/HTMLSelectElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLTableElement.cpp:
+ (WebCore::HTMLTableElement::setCaption): Use ExceptionOr.
+ (WebCore::HTMLTableElement::setTHead): Ditto.
+ (WebCore::HTMLTableElement::setTFoot): Ditto.
+ (WebCore::HTMLTableElement::createTHead): Streamline a bit.
+ (WebCore::HTMLTableElement::deleteTHead): Ditto.
+ (WebCore::HTMLTableElement::createTFoot): Ditto.
+ (WebCore::HTMLTableElement::deleteTFoot): Ditto.
+ (WebCore::HTMLTableElement::createTBody): Ditto.
+ (WebCore::HTMLTableElement::createCaption): Ditto.
+ (WebCore::HTMLTableElement::insertRow): Use ExceptionOr.
+ (WebCore::HTMLTableElement::deleteRow): Ditto.
+ * html/HTMLTableElement.h: Updated for above changes.
+ * html/HTMLTableElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLTableRowElement.cpp:
+ (WebCore::findTable): Added.
+ (WebCore::HTMLTableRowElement::rowIndex): Streamline a bit using the
+ findTable function above.
+ (WebCore::findRows): Added.
+ (WebCore::HTMLTableRowElement::sectionRowIndex): Streamline a bit using
+ the findRows function above.
+ (WebCore::HTMLTableRowElement::insertCell): Use ExceptionOr.
+ (WebCore::HTMLTableRowElement::deleteCell): Ditto.
+ (WebCore::HTMLTableRowElement::setCells): Deleted.
+ * html/HTMLTableRowElement.h: Updated for the above. The setCells function
+ was dead code.
+ * html/HTMLTableRowElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLTableSectionElement.cpp:
+ (WebCore::HTMLTableSectionElement::additionalPresentationAttributeStyle):
+ Tweaked a bit to use early return.
+ (WebCore::HTMLTableSectionElement::insertRow): Use ExceptionOr.
+ (WebCore::HTMLTableSectionElement::deleteRow): Ditto.
+ (WebCore::HTMLTableSectionElement::numRows): Use childrenOfType.
+ (WebCore::HTMLTableSectionElement::align): Deleted.
+ (WebCore::HTMLTableSectionElement::setAlign): Deleted.
+ (WebCore::HTMLTableSectionElement::ch): Deleted.
+ (WebCore::HTMLTableSectionElement::setCh): Deleted.
+ (WebCore::HTMLTableSectionElement::chOff): Deleted.
+ (WebCore::HTMLTableSectionElement::setChOff): Deleted.
+ (WebCore::HTMLTableSectionElement::vAlign): Deleted.
+ (WebCore::HTMLTableSectionElement::setVAlign): Deleted.
+ * html/HTMLTableSectionElement.h: Updated for the above.
+ * html/HTMLTableSectionElement.idl: Use non-legacy exception.
+
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::maxLengthAttributeChanged): Use the new
+ internalSetMaxLength function; old code relied on a setMaxLength
+ that was different from the one exposed to bindings.
+ (WebCore::HTMLTextAreaElement::minLengthAttributeChanged): Ditto.
+ (WebCore::HTMLTextAreaElement::updatePlaceholderText): Removed
+ ASSERT_NO_EXCEPTION.
+ * html/HTMLTextAreaElement.idl: Use non-legacy exceptions.
+
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::setRangeText): Use ExceptionOr.
+ (WebCore::HTMLTextFormControlElement::setInnerTextValue): Ditto.
+ (WebCore::HTMLTextFormControlElement::setMaxLength): Ditto.
+ (WebCore::HTMLTextFormControlElement::setMinLength): Ditto.
+ * html/HTMLTextFormControlElement.h: Updated for above changes.
+ Also renamed the setMin/MaxLength function overloads for internal use
+ to internSetMin/MaxLength and made them protected.
+
+ * html/HTMLTrackElement.cpp:
+ (WebCore::HTMLTrackElement::~HTMLTrackElement): Call clearElement on the
+ track to break the connection. Before this was done as a side effect of
+ clearClient, but that is called in other cases where we do not want to
+ clear the link back to the track element.
+ (WebCore::HTMLTrackElement::insertedInto): Removed code that uses the
+ track function for its side effect of creating a track; no longer needed.
+ Rewrote this so it's more symmetric with removedFrom.
+ (WebCore::HTMLTrackElement::removedFrom): Pass reference. Also reordered
+ and removed an unnecessary check for null parent.
+ (WebCore::HTMLTrackElement::parseAttribute): Use track.
+ (WebCore::HTMLTrackElement::kind): Ditto.
+ (WebCore::HTMLTrackElement::track): Renamed ensureTrack to this. Also
+ removed the redundant code to call setTrackElement; we no longer change
+ the track element on a track until the track element is destroyed.
+ (WebCore::HTMLTrackElement::scheduleLoad): Use track.
+ (WebCore::HTMLTrackElement::loadTimerFired): Ditto.
+ (WebCore::HTMLTrackElement::setReadyState): Ditto.
+ (WebCore::HTMLTrackElement::readyState): Ditto.
+ (WebCore::HTMLTrackElement::mediaElement): Rearranged to use early return.
+ * html/HTMLTrackElement.h: Updated for above changes.
+
+ * html/HTMLVideoElement.cpp:
+ (WebCore::HTMLVideoElement::webkitEnterFullscreen): Use ExceptionOr.
+ * html/HTMLVideoElement.h: Removed the functions used just for
+ capitalization reasons; that's now handled in the bindings.
+ * html/HTMLVideoElement.idl: Use non-legacy bindings and ImplementedAs.
+
+ * html/ImageData.cpp:
+ (WebCore::ImageData::create): Return ExceptionOr.
+ * html/ImageData.h: Updated for above changes.
+ * html/ImageData.idl: Use non-legacy exceptions.
+
+ * html/InputType.cpp:
+ (WebCore::InputType::setValueAsDate): Use ExceptionOr.
+ (WebCore::InputType::setValueAsDouble): Ditto.
+ (WebCore::InputType::setValueAsDecimal): Ditto.
+ (WebCore::InputType::applyStep): Ditto.
+ (WebCore::InputType::stepUp): Ditto.
+ (WebCore::InputType::stepUpFromRenderer): Removed IGNORE_EXCEPTION.
+ * html/InputType.h: Updated for the above.
+
+ * html/MediaController.cpp:
+ (MediaController::addMediaElement): Take a reference instead of a pointer.
+ (MediaController::removeMediaElement): Ditto.
+ (MediaController::containsMediaElement): Ditto.
+ (MediaController::setVolume): Use ExceptionOr.
+ (MediaController::bringElementUpToSpeed): Take a reference.
+ * html/MediaController.h: Updated for above changes. Also made lots of
+ function overrides private.
+ * html/MediaController.idl: Use non-legacy exception.
+
+ * html/MediaControllerInterface.h: Use ExceptionOr for setVolume.
+
+ * html/NumberInputType.cpp:
+ (WebCore::RealNumberRenderSize::max): Use aggregate initialization instead
+ of a constructor.
+ (WebCore::calculateRenderSize): Ditto.
+ (WebCore::NumberInputType::setValueAsDouble): Use ExceptionOr.
+ (WebCore::NumberInputType::setValueAsDecimal): Ditto.
+ * html/NumberInputType.h: Updated for above changes.
+
+ * html/RangeInputType.cpp:
+ (WebCore::RangeInputType::RangeInputType): Initialize scalar data member
+ in class definition instead of here.
+ (WebCore::RangeInputType::setValueAsDecimal): Use ExceptionOr.
+ (WebCore::RangeInputType::handleKeydownEvent): Removed IGNORE_EXCEPTION.
+ * html/RangeInputType.h: Updated for above changes.
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::updatePlaceholderText): Removed
+ ASSERT_NO_EXCEPTION.
+
+ * html/TimeRanges.cpp:
+ (WebCore::TimeRanges::start): Use ExceptionOr.
+ (WebCore::TimeRanges::end): Ditto.
+ * html/TimeRanges.h: Updated for the above.
+ * html/TimeRanges.idl: Use non-legacy exceptions.
+
+ * html/URLUtils.idl: Use non-legacy exception.
+
+ * html/ValidationMessage.cpp:
+ (WebCore::ValidationMessage::setMessageDOMAndStartTimer): Removed
+ ASSERT_NO_EXCEPTION, IGNORE_EXCEPTION, and other exception-ignoring idioms.
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processStartTagForInBody): Ditto.
+ * html/shadow/MediaControlElementTypes.cpp:
+ (WebCore::MediaControlVolumeSliderElement::defaultEventHandler): Ditto.
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlPanelElement::setPosition): Ditto.
+ (WebCore::MediaControlPanelElement::resetPosition): Ditto.
+ (WebCore::MediaControlStatusDisplayElement::update): Ditto.
+ (WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay): Ditto.
+ (WebCore::MediaControlFullscreenVolumeMinButtonElement::defaultEventHandler): Ditto.
+ (WebCore::MediaControlFullscreenVolumeMaxButtonElement::defaultEventHandler): Ditto.
+ * html/shadow/MediaControls.cpp:
+ (WebCore::MediaControls::updateCurrentTimeDisplay): Ditto.
+ * html/shadow/MediaControlsApple.cpp:
+ (WebCore::MediaControlsApple::updateCurrentTimeDisplay): Ditto.
+
+
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::LoadableTextTrack): Take reference.
+ (WebCore::LoadableTextTrack::~LoadableTextTrack): Deleted.
+ (WebCore::LoadableTextTrack::clearClient): Deleted override. We no longer
+ want to clear m_trackElement when clearing the client.
+ (WebCore::LoadableTextTrack::setTrackElement): Deleted.
+ (WebCore::LoadableTextTrack::id): Changed to use
+ attributeWithoutSynchronization for better performance and idAttr instead
+ of a string constant.
+ * html/track/LoadableTextTrack.h: Updated for above changes. Added a new
+ clearElement function. Made the element and isDefault functions private.
+
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCue::~VTTCue): Removed ASSERT_NO_EXCEPTION, IGNORE_EXCEPTION,
+ and other exception-ignoring idioms.
+ (WebCore::VTTCue::removeDisplayTree): Ditto.
+ * html/track/VTTRegion.cpp:
+ (WebCore::VTTRegion::displayLastTextTrackCueBox): Ditto.
+ (WebCore::VTTRegion::willRemoveTextTrackCueBox): Ditto.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::pushNodeByBackendIdToFrontend):
+ Rewrote to avoid multiplehash table lookups and added a FIXME about
+ the peculiar code here.
+ (WebCore::InspectorDOMAgent::resolveNode): Streamlined.
+ (WebCore::InspectorDOMAgent::nodeAsScriptValue): Use the new
+ checkSecurityForNode instead of the old shouldAllowAccessToNode.
+
+ * platform/graphics/ImageBuffer.h: Take Optional<double> instead of
+ const double* in toDataURL. Renamed ImageDataToDataURL to just dataURL.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::addAudioTrack): Take a reference instead of PassRefPtr.
+ (WebCore::MediaPlayer::removeAudioTrack): Ditto.
+ (WebCore::MediaPlayer::addTextTrack): Ditto.
+ (WebCore::MediaPlayer::removeTextTrack): Ditto.
+ (WebCore::MediaPlayer::addVideoTrack): Ditto.
+ (WebCore::MediaPlayer::removeVideoTrack): Ditto.
+ * platform/graphics/MediaPlayer.h: Updated for the above.
+
+ * platform/graphics/PlatformTimeRanges.h: Exported a couple of functions
+ that are now used in WebKit.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::clearTextTracks): Use a modern for loop.
+ (WebCore::MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks):
+ Fixed a bug that would cause this function to fail to process half the tracks.
+ Also updated for the change from PassRefPtr to references.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::determineChangedTracksFromNewTracksAndOldItems): Pass references.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::audioSourceProvider): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::processMetadataTrack): Ditto.
+ (WebCore::assetMetadataKeyNames): Tweaked formatting.
+ (WebCore::itemKVOProperties): Ditto.
+ (WebCore::playerKVOProperties): Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::updateTracksOfType): Pass references.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::toDataURL): Use Optional<double>
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::createBitmapImageAfterScalingIfNeeded): Use auto.
+ (WebCore::encodeImage): Ditto. Also renamed from CGImageEncodeToData.
+ (WebCore::dataURL): Ditto. Also renamed from CGImageToDataURL and from
+ ImageDataToDataURL.
+ (WebCore::ImageBuffer::toDataURL): Ditto.
+
+ * platform/graphics/efl/ImageBufferEfl.cpp:
+ (WebCore::encodeImageJPEG): Use Optional<double>
+ (WebCore::ImageBuffer::toDataURL): Ditto.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Pass
+ a reference instead of pointer.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::processTableOfContents): Ditto.
+
+ * platform/graphics/gtk/ImageBufferGtk.cpp:
+ (WebCore::encodeImage): Use Optional<double>
+ (WebCore::ImageBuffer::toDataURL): Ditto.
+
+ * platform/graphics/win/ImageBufferDirect2D.cpp:
+ (WebCore::ImageBuffer::toDataURL): Use Optional<double>
+
+ * platform/image-encoders/JPEGImageEncoder.cpp:
+ (WebCore::compressRGBABigEndianToJPEG): Use Optional<double>
+ * platform/image-encoders/JPEGImageEncoder.h: Ditto.
+
+ * platform/ios/WebPlaybackSessionInterfaceAVKit.mm:
+ (WebCore::WebPlaybackSessionInterfaceAVKit::seekableRangesChanged):
+ Updated for change to TimeRanges.
+
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindowController setVolume:]): Removed IGNORE_EXCEPTION.
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::endElementNs): Ditto.
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintMediaSliderTrack): Updated for changes to
+ the TimeRanges class.
+
</ins><span class="cx"> 2016-10-28 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Allow @font-face src descriptor's format function to contain identifiers
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -346,31 +346,19 @@
</span><span class="cx"> return !applyMethod.isUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool shouldAllowAccessToNode(ExecState* exec, Node* node)
</del><ins>+bool BindingSecurity::shouldAllowAccessToFrame(ExecState& state, Frame& frame, String& message)
</ins><span class="cx"> {
</span><del>- return BindingSecurity::shouldAllowAccessToNode(exec, node);
-}
-
-bool shouldAllowAccessToFrame(ExecState* exec, Frame* target)
-{
- return BindingSecurity::shouldAllowAccessToFrame(exec, target);
-}
-
-bool shouldAllowAccessToFrame(ExecState* exec, Frame* frame, String& message)
-{
- if (!frame)
- return false;
- if (BindingSecurity::shouldAllowAccessToFrame(exec, frame, DoNotReportSecurityError))
</del><ins>+ if (BindingSecurity::shouldAllowAccessToFrame(&state, &frame, DoNotReportSecurityError))
</ins><span class="cx"> return true;
</span><del>- message = frame->document()->domWindow()->crossDomainAccessErrorMessage(activeDOMWindow(exec));
</del><ins>+ message = frame.document()->domWindow()->crossDomainAccessErrorMessage(activeDOMWindow(&state));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool shouldAllowAccessToDOMWindow(ExecState* exec, DOMWindow& target, String& message)
</del><ins>+bool BindingSecurity::shouldAllowAccessToDOMWindow(ExecState& state, DOMWindow& globalObject, String& message)
</ins><span class="cx"> {
</span><del>- if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, target, DoNotReportSecurityError))
</del><ins>+ if (BindingSecurity::shouldAllowAccessToDOMWindow(&state, globalObject, DoNotReportSecurityError))
</ins><span class="cx"> return true;
</span><del>- message = target.crossDomainAccessErrorMessage(activeDOMWindow(exec));
</del><ins>+ message = globalObject.crossDomainAccessErrorMessage(activeDOMWindow(&state));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -788,9 +776,9 @@
</span><span class="cx"> return target && canAccessDocument(state, target->document(), reportingOption);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool BindingSecurity::shouldAllowAccessToNode(JSC::ExecState* state, Node* target)
</del><ins>+bool BindingSecurity::shouldAllowAccessToNode(JSC::ExecState& state, Node* target)
</ins><span class="cx"> {
</span><del>- return target && canAccessDocument(state, &target->document(), LogSecurityError);
</del><ins>+ return !target || canAccessDocument(&state, &target->document(), LogSecurityError);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue throwTypeError(JSC::ExecState& state, JSC::ThrowScope& scope, const String& errorMessage)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -282,24 +282,17 @@
</span><span class="cx"> template<typename T, typename JSType> Vector<Ref<T>> toRefNativeArray(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> WEBCORE_EXPORT bool hasIteratorMethod(JSC::ExecState&, JSC::JSValue);
</span><span class="cx">
</span><del>-bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
-bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*);
-bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, String& message);
-bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, String& message);
-
-enum SecurityReportingOption {
- DoNotReportSecurityError,
- LogSecurityError, // Legacy behavior.
- ThrowSecurityError
</del><ins>+enum SecurityReportingOption { DoNotReportSecurityError, LogSecurityError, ThrowSecurityError };
+namespace BindingSecurity {
+ template<typename T> T* checkSecurityForNode(JSC::ExecState&, T*);
+ template<typename T> ExceptionOr<T*> checkSecurityForNode(JSC::ExecState&, ExceptionOr<T*>&&);
+ bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, SecurityReportingOption = LogSecurityError);
+ bool shouldAllowAccessToDOMWindow(JSC::ExecState&, DOMWindow&, String& message);
+ bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, SecurityReportingOption = LogSecurityError);
+ bool shouldAllowAccessToFrame(JSC::ExecState&, Frame&, String& message);
+ bool shouldAllowAccessToNode(JSC::ExecState&, Node*);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class BindingSecurity {
-public:
- static bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
- static bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, SecurityReportingOption = LogSecurityError);
- static bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, SecurityReportingOption = LogSecurityError);
-};
-
</del><span class="cx"> void printErrorMessageForFrame(Frame*, const String& message);
</span><span class="cx">
</span><span class="cx"> String propertyNameToString(JSC::PropertyName);
</span><span class="lines">@@ -780,4 +773,16 @@
</span><span class="cx"> return toJSNewlyCreated(&state, &globalObject, value.releaseReturnValue());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> inline T* BindingSecurity::checkSecurityForNode(JSC::ExecState& state, T* node)
+{
+ return shouldAllowAccessToNode(state, node) ? node : nullptr;
+}
+
+template<typename T> inline ExceptionOr<T*> BindingSecurity::checkSecurityForNode(JSC::ExecState& state, ExceptionOr<T*>&& value)
+{
+ if (value.hasException())
+ return WTFMove(value);
+ return checkSecurityForNode(state, value.releaseReturnValue());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static bool jsDOMWindowGetOwnPropertySlotRestrictedAccess(JSDOMWindow* thisObject, Frame* frame, ExecState* exec, PropertyName propertyName, PropertySlot& slot, String& errorMessage)
</del><ins>+static bool jsDOMWindowGetOwnPropertySlotRestrictedAccess(JSDOMWindow* thisObject, Frame* frame, ExecState* exec, PropertyName propertyName, PropertySlot& slot, const String& errorMessage)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="lines">@@ -163,12 +163,12 @@
</span><span class="cx"> // (1) indexed properties,
</span><span class="cx"> // (2) regular own properties,
</span><span class="cx"> // (3) named properties (in fact, these shouldn't be on the window, should be on the NPO).
</span><del>-bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</del><ins>+bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
</ins><span class="cx"> {
</span><span class="cx"> // (1) First, indexed properties.
</span><span class="cx"> // Hand off all indexed access to getOwnPropertySlotByIndex, which supports the indexed getter.
</span><span class="cx"> if (Optional<unsigned> index = parseIndex(propertyName))
</span><del>- return getOwnPropertySlotByIndex(object, exec, index.value(), slot);
</del><ins>+ return getOwnPropertySlotByIndex(object, state, index.value(), slot);
</ins><span class="cx">
</span><span class="cx"> auto* thisObject = jsCast<JSDOMWindow*>(object);
</span><span class="cx"> auto* frame = thisObject->wrapped().frame();
</span><span class="lines">@@ -175,8 +175,8 @@
</span><span class="cx">
</span><span class="cx"> // Hand off all cross-domain/frameless access to jsDOMWindowGetOwnPropertySlotRestrictedAccess.
</span><span class="cx"> String errorMessage;
</span><del>- if (!frame || !shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), errorMessage))
- return jsDOMWindowGetOwnPropertySlotRestrictedAccess(thisObject, frame, exec, propertyName, slot, errorMessage);
</del><ins>+ if (!frame || !BindingSecurity::shouldAllowAccessToDOMWindow(*state, thisObject->wrapped(), errorMessage))
+ return jsDOMWindowGetOwnPropertySlotRestrictedAccess(thisObject, frame, state, propertyName, slot, errorMessage);
</ins><span class="cx">
</span><span class="cx"> // FIXME: this need more explanation.
</span><span class="cx"> // (Particularly, is it correct that this exists here but not in getOwnPropertySlotByIndex?)
</span><span class="lines">@@ -184,11 +184,11 @@
</span><span class="cx">
</span><span class="cx"> // (2) Regular own properties.
</span><span class="cx"> PropertySlot slotCopy = slot;
</span><del>- if (Base::getOwnPropertySlot(thisObject, exec, propertyName, slot)) {
</del><ins>+ if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot)) {
</ins><span class="cx"> // Detect when we're getting the property 'showModalDialog', this is disabled, and has its original value.
</span><del>- bool isShowModalDialogAndShouldHide = propertyName == exec->propertyNames().showModalDialog
</del><ins>+ bool isShowModalDialogAndShouldHide = propertyName == state->propertyNames().showModalDialog
</ins><span class="cx"> && !DOMWindow::canShowModalDialog(frame)
</span><del>- && slot.isValue() && isHostFunction(slot.getValue(exec, propertyName), jsDOMWindowInstanceFunctionShowModalDialog);
</del><ins>+ && slot.isValue() && isHostFunction(slot.getValue(state, propertyName), jsDOMWindowInstanceFunctionShowModalDialog);
</ins><span class="cx"> // Unless we're in the showModalDialog special case, we're done.
</span><span class="cx"> if (!isShowModalDialogAndShouldHide)
</span><span class="cx"> return true;
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(USER_MESSAGE_HANDLERS)
</span><del>- if (propertyName == exec->propertyNames().webkit && thisObject->wrapped().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
</del><ins>+ if (propertyName == state->propertyNames().webkit && thisObject->wrapped().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
</ins><span class="cx"> slot.setCacheableCustom(thisObject, DontDelete | ReadOnly, jsDOMWindowWebKit);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> // (1) indexed properties,
</span><span class="cx"> // (2) regular own properties,
</span><span class="cx"> // (3) named properties (in fact, these shouldn't be on the window, should be on the NPO).
</span><del>-bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned index, PropertySlot& slot)
</del><ins>+bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* state, unsigned index, PropertySlot& slot)
</ins><span class="cx"> {
</span><span class="cx"> auto* thisObject = jsCast<JSDOMWindow*>(object);
</span><span class="cx"> auto* frame = thisObject->wrapped().frame();
</span><span class="lines">@@ -220,22 +220,22 @@
</span><span class="cx"> // (1) First, indexed properties.
</span><span class="cx"> // These are also allowed cross-orgin, so come before the access check.
</span><span class="cx"> if (frame && index < frame->tree().scopedChildCount()) {
</span><del>- slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum, toJS(exec, frame->tree().scopedChild(index)->document()->domWindow()));
</del><ins>+ slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum, toJS(state, frame->tree().scopedChild(index)->document()->domWindow()));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Hand off all cross-domain/frameless access to jsDOMWindowGetOwnPropertySlotRestrictedAccess.
</span><span class="cx"> String errorMessage;
</span><del>- if (!frame || !shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), errorMessage))
- return jsDOMWindowGetOwnPropertySlotRestrictedAccess(thisObject, frame, exec, Identifier::from(exec, index), slot, errorMessage);
</del><ins>+ if (!frame || !BindingSecurity::shouldAllowAccessToDOMWindow(*state, thisObject->wrapped(), errorMessage))
+ return jsDOMWindowGetOwnPropertySlotRestrictedAccess(thisObject, frame, state, Identifier::from(state, index), slot, errorMessage);
</ins><span class="cx">
</span><span class="cx"> // (2) Regular own properties.
</span><del>- return Base::getOwnPropertySlotByIndex(thisObject, exec, index, slot);
</del><ins>+ return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSDOMWindow::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</del><ins>+bool JSDOMWindow::put(JSCell* cell, ExecState* state, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</ins><span class="cx"> {
</span><del>- VM& vm = exec->vm();
</del><ins>+ VM& vm = state->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> auto* thisObject = jsCast<JSDOMWindow*>(cell);
</span><span class="lines">@@ -243,19 +243,19 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String errorMessage;
</span><del>- if (!shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), errorMessage)) {
</del><ins>+ if (!BindingSecurity::shouldAllowAccessToDOMWindow(*state, thisObject->wrapped(), errorMessage)) {
</ins><span class="cx"> // We only allow setting "location" attribute cross-origin.
</span><del>- if (propertyName == exec->propertyNames().location) {
</del><ins>+ if (propertyName == state->propertyNames().location) {
</ins><span class="cx"> bool putResult = false;
</span><del>- if (lookupPut(exec, propertyName, thisObject, value, *s_info.staticPropHashTable, slot, putResult))
</del><ins>+ if (lookupPut(state, propertyName, thisObject, value, *s_info.staticPropHashTable, slot, putResult))
</ins><span class="cx"> return putResult;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- throwSecurityError(*exec, scope, errorMessage);
</del><ins>+ throwSecurityError(*state, scope, errorMessage);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Base::put(thisObject, exec, propertyName, value, slot);
</del><ins>+ return Base::put(thisObject, state, propertyName, value, slot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindow::putByIndex(JSCell* cell, ExecState* exec, unsigned index, JSValue value, bool shouldThrow)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -44,14 +44,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>-static void get3DContextAttributes(ExecState& state, RefPtr<CanvasContextAttributes>& attrs)
</del><ins>+
+static RefPtr<CanvasContextAttributes> attributesFor3DContext(ExecState& state, ThrowScope& scope)
</ins><span class="cx"> {
</span><del>- VM& vm = state.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
</del><span class="cx"> JSValue initializerValue = state.argument(1);
</span><span class="cx"> if (initializerValue.isUndefinedOrNull())
</span><del>- return;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> JSObject* initializerObject = initializerValue.toObject(&state);
</span><span class="cx"> ASSERT_UNUSED(scope, !scope.exception());
</span><span class="lines">@@ -67,8 +65,9 @@
</span><span class="cx"> dictionary.tryGetProperty("preserveDrawingBuffer", graphicsAttrs.preserveDrawingBuffer);
</span><span class="cx"> dictionary.tryGetProperty("preferLowPowerToHighPerformance", graphicsAttrs.preferLowPowerToHighPerformance);
</span><span class="cx">
</span><del>- attrs = WebGLContextAttributes::create(graphicsAttrs);
</del><ins>+ return WebGLContextAttributes::create(graphicsAttrs);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLCanvasElement::getContext(ExecState& state)
</span><span class="lines">@@ -82,15 +81,16 @@
</span><span class="cx"> HTMLCanvasElement& canvas = wrapped();
</span><span class="cx"> const String& contextId = state.uncheckedArgument(0).toWTFString(&state);
</span><span class="cx">
</span><del>- RefPtr<CanvasContextAttributes> attrs;
</del><ins>+ RefPtr<CanvasContextAttributes> attributes;
+
</ins><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> if (HTMLCanvasElement::is3dType(contextId)) {
</span><del>- get3DContextAttributes(state, attrs);
</del><ins>+ attributes = attributesFor3DContext(state, scope);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- CanvasRenderingContext* context = canvas.getContext(contextId, attrs.get());
</del><ins>+ auto* context = canvas.getContext(contextId, attributes.get());
</ins><span class="cx"> if (!context)
</span><span class="cx"> return jsNull();
</span><span class="cx">
</span><span class="lines">@@ -104,23 +104,25 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLCanvasElement::toDataURL(ExecState& state)
</span><span class="cx"> {
</span><del>- HTMLCanvasElement& canvas = wrapped();
- ExceptionCode ec = 0;
</del><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> auto type = convert<IDLNullable<IDLDOMString>>(state, state.argument(0));
</span><del>- double quality;
- double* qualityPtr = 0;
- if (state.argumentCount() > 1) {
- JSValue v = state.uncheckedArgument(1);
- if (v.isNumber()) {
- quality = v.toNumber(&state);
- qualityPtr = &quality;
- }
</del><ins>+ RETURN_IF_EXCEPTION(scope, JSC::JSValue());
+
+ Optional<double> quality;
+ auto qualityValue = state.argument(1);
+ if (qualityValue.isNumber())
+ quality = qualityValue.toNumber(&state);
+
+ // We would use toJS<IDLString> here, but it uses jsStringWithCache and we historically
+ // did not cache here, presumably because results are likely to be differing long strings.
+ auto result = wrapped().toDataURL(type, quality);
+ if (result.hasException()) {
+ propagateException(state, scope, result.releaseException());
+ return { };
</ins><span class="cx"> }
</span><del>-
- JSValue result = JSC::jsString(&state, canvas.toDataURL(type, qualityPtr, ec));
- setDOMException(&state, ec);
- return result;
</del><ins>+ return jsString(&state, result.releaseReturnValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFrameElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "HTMLFrameElement.h"
</span><del>-#include "HTMLNames.h"
</del><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx">
</span><span class="lines">@@ -39,27 +38,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-
-static inline bool allowSettingJavascriptURL(ExecState& state, HTMLFrameElement* imp, const String& value)
-{
- if (protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(value))) {
- Document* contentDocument = imp->contentDocument();
- if (contentDocument && !shouldAllowAccessToNode(&state, contentDocument))
- return false;
- }
- return true;
-}
-
</del><span class="cx"> void JSHTMLFrameElement::setLocation(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><del>- HTMLFrameElement& imp = wrapped();
</del><ins>+ HTMLFrameElement& element = wrapped();
</ins><span class="cx"> String locationValue = value.isNull() ? String() : value.toWTFString(&state);
</span><del>-
- if (!allowSettingJavascriptURL(state, &imp, locationValue))
- return;
-
- imp.setLocation(locationValue);
</del><ins>+ if (protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(locationValue))) {
+ if (!BindingSecurity::shouldAllowAccessToNode(state, element.contentDocument()))
+ return;
+ }
+ element.setLocation(locationValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLOptionsCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -54,29 +54,27 @@
</span><span class="cx"> CustomElementReactionStack customElementReactionStack;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
- unsigned newLength = 0;
- double lengthValue = value.toNumber(&state);
- if (!std::isnan(lengthValue) && !std::isinf(lengthValue)) {
- if (lengthValue < 0.0)
- ec = INDEX_SIZE_ERR;
- else if (lengthValue > static_cast<double>(UINT_MAX))
- newLength = UINT_MAX;
- else
- newLength = static_cast<unsigned>(lengthValue);
- }
- if (!ec)
- wrapped().setLength(newLength, ec);
- setDOMException(&state, ec);
</del><ins>+ VM& vm = state.vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ double number = value.toNumber(&state);
+ RETURN_IF_EXCEPTION(throwScope, void());
+ unsigned length;
+ if (!std::isfinite(number))
+ length = 0;
+ else if (number < 0)
+ return setDOMException(&state, throwScope, INDEX_SIZE_ERR);
+ else
+ length = static_cast<unsigned>(std::min<double>(number, UINT_MAX));
+ propagateException(state, throwScope, wrapped().setLength(length));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSHTMLOptionsCollection::indexSetter(ExecState* exec, unsigned index, JSValue value)
</del><ins>+void JSHTMLOptionsCollection::indexSetter(ExecState* state, unsigned index, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx"> CustomElementReactionStack customElementReactionStack;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- selectIndexSetter(&wrapped().selectElement(), exec, index, value);
</del><ins>+ selectElementIndexSetter(*state, wrapped().selectElement(), index, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "HTMLOptionElement.h"
</span><span class="cx"> #include "HTMLSelectElement.h"
</span><span class="cx"> #include "JSHTMLOptionElement.h"
</span><ins>+#include "JSHTMLSelectElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -33,27 +34,32 @@
</span><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-void selectIndexSetter(HTMLSelectElement* select, JSC::ExecState* exec, unsigned index, JSC::JSValue value)
</del><ins>+void selectElementIndexSetter(JSC::ExecState& state, HTMLSelectElement& element, unsigned index, JSC::JSValue value)
</ins><span class="cx"> {
</span><del>- if (value.isUndefinedOrNull())
- select->removeByIndex(index);
- else {
- ExceptionCode ec = 0;
- HTMLOptionElement* option = JSHTMLOptionElement::toWrapped(value);
- if (!option)
- ec = TYPE_MISMATCH_ERR;
- else
- select->setOption(index, *option, ec);
- setDOMException(exec, ec);
</del><ins>+ VM& vm = state.vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+
+ if (value.isUndefinedOrNull()) {
+ element.removeByIndex(index);
+ return;
</ins><span class="cx"> }
</span><ins>+
+ auto* option = JSHTMLOptionElement::toWrapped(value);
+ if (!option) {
+ setDOMException(&state, throwScope, TYPE_MISMATCH_ERR);
+ return;
+ }
+
+ propagateException(state, throwScope, element.setOption(index, *option));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSHTMLSelectElement::indexSetter(JSC::ExecState* exec, unsigned index, JSC::JSValue value)
</del><ins>+void JSHTMLSelectElement::indexSetter(JSC::ExecState* state, unsigned index, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx"> CustomElementReactionStack customElementReactionStack;
</span><span class="cx"> #endif
</span><del>- selectIndexSetter(&wrapped(), exec, index, value);
</del><ins>+
+ selectElementIndexSetter(*state, wrapped(), index, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,15 +26,17 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef JSHTMLSelectElementCustom_h
-#define JSHTMLSelectElementCustom_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include "JSHTMLSelectElement.h"
</del><ins>+namespace JSC {
+class ExecState;
+class JSValue;
+}
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void selectIndexSetter(HTMLSelectElement*, JSC::ExecState*, unsigned index, JSC::JSValue);
</del><ins>+class HTMLSelectElement;
</ins><span class="cx">
</span><ins>+void selectElementIndexSetter(JSC::ExecState&, HTMLSelectElement&, unsigned index, JSC::JSValue);
+
</ins><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool JSLocation::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</del><ins>+bool JSLocation::getOwnPropertySlotDelegate(ExecState* state, PropertyName propertyName, PropertySlot& slot)
</ins><span class="cx"> {
</span><del>- VM& vm = exec->vm();
</del><ins>+ VM& vm = state->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> Frame* frame = wrapped().frame();
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx"> // Our custom code is only needed to implement the Window cross-domain scheme, so if access is
</span><span class="cx"> // allowed, return false so the normal lookup will take place.
</span><span class="cx"> String message;
</span><del>- if (shouldAllowAccessToFrame(exec, frame, message))
</del><ins>+ if (BindingSecurity::shouldAllowAccessToFrame(*state, *frame, message))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // We only allow access to Location.replace() cross origin.
</span><del>- if (propertyName == exec->propertyNames().replace) {
</del><ins>+ if (propertyName == state->propertyNames().replace) {
</ins><span class="cx"> slot.setCustom(this, ReadOnly | DontEnum, nonCachingStaticFunctionGetter<jsLocationInstanceFunctionReplace, 1>);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> // Getting location.href cross origin needs to throw. However, getOwnPropertyDescriptor() needs to return
</span><span class="cx"> // a descriptor that has a setter but no getter.
</span><del>- if (slot.internalMethodType() == PropertySlot::InternalMethodType::GetOwnProperty && propertyName == exec->propertyNames().href) {
</del><ins>+ if (slot.internalMethodType() == PropertySlot::InternalMethodType::GetOwnProperty && propertyName == state->propertyNames().href) {
</ins><span class="cx"> auto* entry = JSLocation::info()->staticPropHashTable->entry(propertyName);
</span><span class="cx"> CustomGetterSetter* customGetterSetter = CustomGetterSetter::create(vm, nullptr, entry->propertyPutter());
</span><span class="cx"> slot.setCustomGetterSetter(this, DontEnum | CustomAccessor, customGetterSetter);
</span><span class="lines">@@ -66,35 +66,33 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- throwSecurityError(*exec, scope, message);
</del><ins>+ throwSecurityError(*state, scope, message);
</ins><span class="cx"> slot.setUndefined();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSLocation::putDelegate(ExecState* exec, PropertyName propertyName, JSValue, PutPropertySlot&, bool& putResult)
</del><ins>+bool JSLocation::putDelegate(ExecState* state, PropertyName propertyName, JSValue, PutPropertySlot&, bool& putResult)
</ins><span class="cx"> {
</span><del>- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
</del><ins>+ putResult = false;
</ins><span class="cx">
</span><del>- putResult = false;
</del><span class="cx"> Frame* frame = wrapped().frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (propertyName == exec->propertyNames().toString || propertyName == exec->propertyNames().valueOf)
</del><ins>+ // Silently block access to toString and valueOf.
+ if (propertyName == state->propertyNames().toString || propertyName == state->propertyNames().valueOf)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- String errorMessage;
- if (shouldAllowAccessToFrame(exec, frame, errorMessage))
</del><ins>+ // Always allow assigning to the whole location.
+ // However, alllowing assigning of pieces might inadvertently disclose parts of the original location.
+ // So fall through to the access check for those.
+ if (propertyName == state->propertyNames().href)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Cross-domain access to the location is allowed when assigning the whole location,
- // but not when assigning the individual pieces, since that might inadvertently
- // disclose other parts of the original location.
- if (propertyName != exec->propertyNames().href) {
- throwSecurityError(*exec, scope, errorMessage);
</del><ins>+ // Block access and throw if there is a security error.
+ if (!BindingSecurity::shouldAllowAccessToFrame(state, frame, ThrowSecurityError))
</ins><span class="cx"> return true;
</span><del>- }
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -298,14 +298,15 @@
</span><span class="cx"> return UserGestureIndicator::processingUserGestureForMedia();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScriptController::canAccessFromCurrentOrigin(Frame *frame)
</del><ins>+bool ScriptController::canAccessFromCurrentOrigin(Frame* frame)
</ins><span class="cx"> {
</span><del>- ExecState* exec = JSMainThreadExecState::currentState();
- if (exec)
- return shouldAllowAccessToFrame(exec, frame);
- // If the current state is 0 we're in a call path where the DOM security
- // check doesn't apply (eg. parser).
- return true;
</del><ins>+ ExecState* state = JSMainThreadExecState::currentState();
+
+ // If the current state is null we're in a call path where the DOM security check doesn't apply (eg. parser).
+ if (!state)
+ return true;
+
+ return BindingSecurity::shouldAllowAccessToFrame(state, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptController::attachDebugger(JSC::Debugger* debugger)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -3228,10 +3228,6 @@
</span><span class="cx">
</span><span class="cx"> if (HasCustomGetter($attribute->signature->extendedAttributes)) {
</span><span class="cx"> push(@implContent, " return thisObject.$implGetterFunctionName(state);\n");
</span><del>- } elsif ($attribute->signature->extendedAttributes->{CheckSecurityForNode}) {
- $implIncludes{"JSDOMBinding.h"} = 1;
- push(@implContent, " auto& impl = thisObject.wrapped();\n");
- push(@implContent, " return shouldAllowAccessToNode(&state, impl." . $attribute->signature->name . "()) ? " . NativeToJSValueUsingReferences($attribute->signature, 0, $interface, "impl.$implGetterFunctionName()", "thisObject") . " : jsNull();\n");
</del><span class="cx"> } elsif ($type->name eq "EventHandler") {
</span><span class="cx"> $implIncludes{"EventNames.h"} = 1;
</span><span class="cx"> my $getter = $attribute->signature->extendedAttributes->{WindowEventHandler} ? "windowEventHandlerAttribute"
</span><span class="lines">@@ -3839,12 +3835,6 @@
</span><span class="cx">
</span><span class="cx"> push(@implContent, " ExceptionCode ec = 0;\n") if $mayThrowLegacyException;
</span><span class="cx">
</span><del>- if ($function->signature->extendedAttributes->{CheckSecurityForNode}) {
- push(@implContent, " if (!shouldAllowAccessToNode(state, impl." . $function->signature->name . "(" . ($mayThrowLegacyException ? "ec" : "") .")))\n");
- push(@implContent, " return JSValue::encode(jsNull());\n");
- $implIncludes{"JSDOMBinding.h"} = 1;
- }
-
</del><span class="cx"> my ($functionString, $dummy) = GenerateParametersCheck(\@implContent, $function, $interface, $functionImplementationName, $svgPropertyType, $svgPropertyOrListPropertyType, $svgListPropertyType);
</span><span class="cx"> GenerateImplementationFunctionCall($function, $functionString, " ", $svgPropertyType, $interface);
</span><span class="cx"> }
</span><span class="lines">@@ -5482,6 +5472,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $value = "BindingSecurity::checkSecurityForNode($stateReference, $value)" if $signature->extendedAttributes->{CheckSecurityForNode};
+
</ins><span class="cx"> my $functionName = "toJS";
</span><span class="cx"> $functionName = "toJSNewlyCreated" if $signature->extendedAttributes->{NewObject};
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -2954,7 +2954,8 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- return shouldAllowAccessToNode(&state, impl.contentDocument()) ? toJS(&state, thisObject.globalObject(), impl.contentDocument()) : jsNull();
</del><ins>+ JSValue result = toJS(&state, thisObject.globalObject(), BindingSecurity::checkSecurityForNode(state, impl.contentDocument()));
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSValue jsTestObjMutablePointGetter(ExecState&, JSTestObj&, ThrowScope& throwScope);
</span><span class="lines">@@ -7578,9 +7579,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- if (!shouldAllowAccessToNode(state, impl.getSVGDocument(ec)))
- return JSValue::encode(jsNull());
- JSValue result = toJS(state, castedThis->globalObject(), impl.getSVGDocument(ec));
</del><ins>+ JSValue result = toJS(state, castedThis->globalObject(), BindingSecurity::checkSecurityForNode(*state, impl.getSVGDocument(ec)));
</ins><span class="cx">
</span><span class="cx"> setDOMException(state, throwScope, ec);
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildNode.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildNode.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/ChildNode.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx"> [CEReactions, Unscopable, MayThrowLegacyException] void before((Node or DOMString)... nodes);
</span><span class="cx"> [CEReactions, Unscopable, MayThrowLegacyException] void after((Node or DOMString)... nodes);
</span><span class="cx"> [CEReactions, Unscopable, MayThrowLegacyException] void replaceWith((Node or DOMString)... nodes);
</span><del>- [CEReactions, Unscopable, MayThrowLegacyException] void remove();
</del><ins>+ [CEReactions, Unscopable, MayThrowException] void remove();
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -2535,9 +2535,9 @@
</span><span class="cx"> EventDispatcher::dispatchEvent(this, FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, WTFMove(newFocusedElement)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(MOUSE_FORCE_EVENTS)
</del><span class="cx"> bool Element::dispatchMouseForceWillBegin()
</span><span class="cx"> {
</span><ins>+#if ENABLE(MOUSE_FORCE_EVENTS)
</ins><span class="cx"> if (!document().hasListenerType(Document::FORCEWILLBEGIN_LISTENER))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -2545,32 +2545,29 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtClick, NoTap);
- Ref<MouseEvent> mouseForceWillBeginEvent = MouseEvent::create(eventNames().webkitmouseforcewillbeginEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
</del><ins>+ PlatformMouseEvent platformMouseEvent { frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtClick, NoTap };
+ auto mouseForceWillBeginEvent = MouseEvent::create(eventNames().webkitmouseforcewillbeginEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
</ins><span class="cx"> mouseForceWillBeginEvent->setTarget(this);
</span><span class="cx"> dispatchEvent(mouseForceWillBeginEvent);
</span><span class="cx">
</span><span class="cx"> if (mouseForceWillBeginEvent->defaultHandled() || mouseForceWillBeginEvent->defaultPrevented())
</span><span class="cx"> return true;
</span><ins>+#endif
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#else
-bool Element::dispatchMouseForceWillBegin()
-{
- return false;
-}
-#endif // #if ENABLE(MOUSE_FORCE_EVENTS)
</del><span class="cx">
</span><span class="cx"> void Element::mergeWithNextTextNode(Text& node, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- Node* next = node.nextSibling();
</del><ins>+ auto* next = node.nextSibling();
</ins><span class="cx"> if (!is<Text>(next))
</span><span class="cx"> return;
</span><ins>+ Ref<Text> textNext { downcast<Text>(*next) };
</ins><span class="cx">
</span><del>- Ref<Text> textNode(node);
- Ref<Text> textNext(downcast<Text>(*next));
- textNode->appendData(textNext->data());
- textNext->remove(ec);
</del><ins>+ node.appendData(textNext->data());
+ auto result = textNext->remove();
+ if (result.hasException())
+ ec = result.releaseException().code();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Element::innerHTML() const
</span><span class="lines">@@ -2594,11 +2591,13 @@
</span><span class="cx"> RefPtr<Node> prev = previousSibling();
</span><span class="cx"> RefPtr<Node> next = nextSibling();
</span><span class="cx">
</span><del>- RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(*parent, html, AllowScriptingContent, ec);
- if (ec)
</del><ins>+ auto fragment = createFragmentForInnerOuterHTML(*parent, html, AllowScriptingContent);
+ if (fragment.hasException()) {
+ ec = fragment.releaseException().code();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- parent->replaceChild(*fragment, *this, ec);
</del><ins>+ parent->replaceChild(fragment.releaseReturnValue().get(), *this, ec);
</ins><span class="cx"> RefPtr<Node> node = next ? next->previousSibling() : nullptr;
</span><span class="cx"> if (!ec && is<Text>(node.get()))
</span><span class="cx"> mergeWithNextTextNode(downcast<Text>(*node), ec);
</span><span class="lines">@@ -2609,14 +2608,21 @@
</span><span class="cx">
</span><span class="cx"> void Element::setInnerHTML(const String& html, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(*this, html, AllowScriptingContent, ec)) {
- ContainerNode* container = this;
</del><ins>+ auto fragment = createFragmentForInnerOuterHTML(*this, html, AllowScriptingContent);
+ if (fragment.hasException()) {
+ ec = fragment.releaseException().code();
+ return;
+ }
</ins><span class="cx">
</span><del>- if (is<HTMLTemplateElement>(*this))
- container = &downcast<HTMLTemplateElement>(*this).content();
</del><ins>+ ContainerNode* container;
+ if (!is<HTMLTemplateElement>(*this))
+ container = this;
+ else
+ container = &downcast<HTMLTemplateElement>(*this).content();
</ins><span class="cx">
</span><del>- replaceChildrenWithFragment(*container, fragment.releaseNonNull(), ec);
- }
</del><ins>+ auto result = replaceChildrenWithFragment(*container, fragment.releaseReturnValue());
+ if (result.hasException())
+ ec = fragment.releaseException().code();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Element::innerText()
</span><span class="lines">@@ -3747,11 +3753,13 @@
</span><span class="cx"> } else
</span><span class="cx"> contextElement = downcast<Element>(contextNode);
</span><span class="cx"> // Step 3.
</span><del>- RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(*contextElement, markup, AllowScriptingContent, ec);
- if (!fragment)
</del><ins>+ auto fragment = createFragmentForInnerOuterHTML(*contextElement, markup, AllowScriptingContent);
+ if (fragment.hasException()) {
+ ec = fragment.releaseException().code();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx"> // Step 4.
</span><del>- insertAdjacent(where, fragment.releaseNonNull(), ec);
</del><ins>+ insertAdjacent(where, fragment.releaseReturnValue(), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::insertAdjacentText(const String& where, const String& text, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -551,10 +551,16 @@
</span><span class="cx"> parent->insertBefore(*node, viableNextSibling.get(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Node::remove(ExceptionCode& ec)
</del><ins>+ExceptionOr<void> Node::remove()
</ins><span class="cx"> {
</span><del>- if (ContainerNode* parent = parentNode())
- parent->removeChild(*this, ec);
</del><ins>+ auto* parent = parentNode();
+ if (!parent)
+ return { };
+ ExceptionCode ec = 0;
+ parent->removeChild(*this, ec);
+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::normalize()
</span><span class="lines">@@ -584,7 +590,7 @@
</span><span class="cx"> if (!text->length()) {
</span><span class="cx"> // Care must be taken to get the next node before removing the current node.
</span><span class="cx"> node = NodeTraversal::nextPostOrder(*node);
</span><del>- text->remove(IGNORE_EXCEPTION);
</del><ins>+ text->remove();
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -596,7 +602,7 @@
</span><span class="cx">
</span><span class="cx"> // Remove empty text nodes.
</span><span class="cx"> if (!nextText->length()) {
</span><del>- nextText->remove(IGNORE_EXCEPTION);
</del><ins>+ nextText->remove();
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -604,7 +610,7 @@
</span><span class="cx"> unsigned offset = text->length();
</span><span class="cx"> text->appendData(nextText->data());
</span><span class="cx"> document().textNodesMerged(nextText.get(), offset);
</span><del>- nextText->remove(IGNORE_EXCEPTION);
</del><ins>+ nextText->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> node = NodeTraversal::nextPostOrder(*node);
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/Node.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -25,12 +25,13 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "EventTarget.h"
</span><del>-#include "URLHash.h"
</del><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="cx"> #include "StyleValidity.h"
</span><span class="cx"> #include "TreeScope.h"
</span><ins>+#include "URLHash.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -195,7 +196,7 @@
</span><span class="cx"> void before(Vector<NodeOrString>&&, ExceptionCode&);
</span><span class="cx"> void after(Vector<NodeOrString>&&, ExceptionCode&);
</span><span class="cx"> void replaceWith(Vector<NodeOrString>&&, ExceptionCode&);
</span><del>- WEBCORE_EXPORT void remove(ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> remove();
</ins><span class="cx">
</span><span class="cx"> // Other methods (not part of DOM)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/Range.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -853,9 +853,11 @@
</span><span class="cx"> if (referenceNode == node.ptr())
</span><span class="cx"> referenceNode = referenceNode->nextSibling();
</span><span class="cx">
</span><del>- node->remove(ec);
- if (ec)
</del><ins>+ auto removeResult = node->remove();
+ if (removeResult.hasException()) {
+ ec = removeResult.releaseException().code();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> unsigned newOffset = referenceNode ? referenceNode->computeNodeIndex() : parent->countChildNodes();
</span><span class="cx"> if (is<DocumentFragment>(node.get()))
</span><span class="lines">@@ -918,7 +920,12 @@
</span><span class="cx"> if (!element || (is<HTMLDocument>(element->document()) && is<HTMLHtmlElement>(*element)))
</span><span class="cx"> element = HTMLBodyElement::create(node.document());
</span><span class="cx">
</span><del>- return WebCore::createContextualFragment(*element, markup, AllowScriptingContentAndDoNotMarkAlreadyStarted, ec);
</del><ins>+ auto result = WebCore::createContextualFragment(*element, markup, AllowScriptingContentAndDoNotMarkAlreadyStarted);
+ if (result.hasException()) {
+ ec = result.releaseException().code();
+ return nullptr;
+ }
+ return result.releaseReturnValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -113,8 +113,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(*host(), markup, AllowScriptingContent, ec))
- replaceChildrenWithFragment(*this, fragment.releaseNonNull(), ec);
</del><ins>+ auto fragment = createFragmentForInnerOuterHTML(*host(), markup, AllowScriptingContent);
+ if (fragment.hasException()) {
+ ec = fragment.releaseException().code();
+ return;
+ }
+ auto result = replaceChildrenWithFragment(*this, fragment.releaseReturnValue());
+ if (result.hasException())
+ ec = result.releaseException().code();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ShadowRoot::childTypeAllowed(NodeType type) const
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAppendNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AppendNodeCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (!m_parent->hasEditableStyle())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_node->remove(IGNORE_EXCEPTION);
</del><ins>+ m_node->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -99,12 +99,6 @@
</span><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "DictationCommandIOS.h"
-#include <wtf/text/StringBuilder.h>
-#include <wtf/text/WTFString.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "ServicesOverlayController.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -241,17 +235,13 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (event.isPaste()) {
</span><del>- if (event.pastingFragment())
</del><ins>+ if (event.pastingFragment()) {
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- {
</del><span class="cx"> if (client()->performsTwoStepPaste(event.pastingFragment()))
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx"> replaceSelectionWithFragment(event.pastingFragment(), false, event.shouldSmartReplace(), event.shouldMatchStyle(), EditActionPaste, event.mailBlockquoteHandling());
</span><del>-#if PLATFORM(IOS)
- }
-#endif
- else
</del><ins>+ } else
</ins><span class="cx"> replaceSelectionWithText(event.data(), false, event.shouldSmartReplace(), EditActionPaste);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -424,76 +414,6 @@
</span><span class="cx"> ClearTextCommand::CreateAndApply(&m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
-void Editor::insertDictationPhrases(Vector<Vector<String>>&& dictationPhrases, RetainPtr<id> metadata)
-{
- if (m_frame.selection().isNone())
- return;
-
- if (dictationPhrases.isEmpty())
- return;
-
- applyCommand(DictationCommandIOS::create(document(), WTFMove(dictationPhrases), WTFMove(metadata)));
-}
-
-void Editor::setDictationPhrasesAsChildOfElement(const Vector<Vector<String>>& dictationPhrases, RetainPtr<id> metadata, Element& element)
-{
- // Clear the composition.
- clear();
-
- // Clear the Undo stack, since the operations that follow are not Undoable, and will corrupt the stack. Some day
- // we could make them Undoable, and let callers clear the Undo stack explicitly if they wish.
- clearUndoRedoOperations();
-
- m_frame.selection().clear();
-
- element.removeChildren();
-
- if (dictationPhrases.isEmpty()) {
- client()->respondToChangedContents();
- return;
- }
-
- ExceptionCode ec;
- RefPtr<Range> context = document().createRange();
- context->selectNodeContents(element, ec);
-
- StringBuilder dictationPhrasesBuilder;
- for (auto& interpretations : dictationPhrases)
- dictationPhrasesBuilder.append(interpretations[0]);
-
- element.appendChild(createFragmentFromText(*context, dictationPhrasesBuilder.toString()), ec);
-
- // We need a layout in order to add markers below.
- document().updateLayout();
-
- if (!element.firstChild()->isTextNode()) {
- // Shouldn't happen.
- ASSERT(element.firstChild()->isTextNode());
- return;
- }
-
- Text& textNode = downcast<Text>(*element.firstChild());
- int previousDictationPhraseStart = 0;
- for (auto& interpretations : dictationPhrases) {
- int dictationPhraseLength = interpretations[0].length();
- int dictationPhraseEnd = previousDictationPhraseStart + dictationPhraseLength;
- if (interpretations.size() > 1) {
- auto dictationPhraseRange = Range::create(document(), &textNode, previousDictationPhraseStart, &textNode, dictationPhraseEnd);
- document().markers().addDictationPhraseWithAlternativesMarker(dictationPhraseRange.ptr(), interpretations);
- }
- previousDictationPhraseStart = dictationPhraseEnd;
- }
-
- auto resultRange = Range::create(document(), &textNode, 0, &textNode, textNode.length());
- document().markers().addDictationResultMarker(resultRange.ptr(), metadata);
-
- client()->respondToChangedContents();
-}
-
-#endif
-
</del><span class="cx"> void Editor::pasteAsPlainText(const String& pastingText, bool smartReplace)
</span><span class="cx"> {
</span><span class="cx"> Node* target = findEventTargetFromSelection();
</span><span class="lines">@@ -616,85 +536,6 @@
</span><span class="cx"> return m_frame.selection().toNormalizedRange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-void Editor::confirmMarkedText()
-{
- // FIXME: This is a hacky workaround for the keyboard calling this method too late -
- // after the selection and focus have already changed. See <rdar://problem/5975559>
- Element* focused = document().focusedElement();
- Node* composition = compositionNode();
-
- if (composition && focused && focused != composition && !composition->isDescendantOrShadowDescendantOf(focused)) {
- cancelComposition();
- document().setFocusedElement(focused);
- } else
- confirmComposition();
-}
-
-void Editor::setTextAsChildOfElement(const String& text, Element& element)
-{
- // Clear the composition
- clear();
-
- // Clear the Undo stack, since the operations that follow are not Undoable, and will corrupt the stack. Some day
- // we could make them Undoable, and let callers clear the Undo stack explicitly if they wish.
- clearUndoRedoOperations();
-
- // If the element is empty already and we're not adding text, we can early return and avoid clearing/setting
- // a selection at [0, 0] and the expense involved in creation VisiblePositions.
- if (!element.firstChild() && text.isEmpty())
- return;
-
- // As a side effect this function sets a caret selection after the inserted content. Much of what
- // follows is more expensive if there is a selection, so clear it since it's going to change anyway.
- m_frame.selection().clear();
-
- // clear out all current children of element
- element.removeChildren();
-
- if (text.length()) {
- // insert new text
- // remove element from tree while doing it
- // FIXME: The element we're inserting into is often the body element. It seems strange to be removing it
- // (even if it is only temporary). ReplaceSelectionCommand doesn't bother doing this when it inserts
- // content, why should we here?
- ExceptionCode ec;
- RefPtr<Node> parent = element.parentNode();
- RefPtr<Node> siblingAfter = element.nextSibling();
- if (parent)
- element.remove(ec);
-
- auto context = document().createRange();
- context->selectNodeContents(element, ec);
- element.appendChild(createFragmentFromText(context, text), ec);
-
- // restore element to document
- if (parent) {
- if (siblingAfter)
- parent->insertBefore(element, siblingAfter.get(), ec);
- else
- parent->appendChild(element, ec);
- }
- }
-
- // set the selection to the end
- VisibleSelection selection;
-
- Position pos = createLegacyEditingPosition(&element, element.countChildNodes());
-
- VisiblePosition visiblePos(pos, VP_DEFAULT_AFFINITY);
- if (visiblePos.isNull())
- return;
-
- selection.setBase(visiblePos);
- selection.setExtent(visiblePos);
-
- m_frame.selection().setSelection(selection);
-
- client()->respondToChangedContents();
-}
-#endif
-
</del><span class="cx"> bool Editor::shouldDeleteRange(Range* range) const
</span><span class="cx"> {
</span><span class="cx"> if (!range || range->collapsed())
</span><span class="lines">@@ -884,14 +725,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_lastEditCommand = nullptr;
</span><span class="cx"> }
</span><del>-#if PLATFORM(IOS)
-// If the selection is adjusted from UIKit without closing the typing, the typing command may
-// have a stale selection.
-void Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping()
-{
- TypingCommand::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping(&m_frame, m_frame.selection().selection());
-}
-#endif
</del><span class="cx">
</span><span class="cx"> // Returns whether caller should continue with "the default processing", which is the same as
</span><span class="cx"> // the event handler NOT setting the return value to false
</span><span class="lines">@@ -1497,6 +1330,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void Editor::copyImage(const HitTestResult& result)
</span><span class="cx"> {
</span><span class="cx"> Element* element = result.innerNonSharedElement();
</span><span class="lines">@@ -1513,6 +1347,7 @@
</span><span class="cx"> Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool Editor::isContinuousSpellCheckingEnabled() const
</span><span class="lines">@@ -2006,6 +1841,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void Editor::advanceToNextMisspelling(bool startBeforeSelection)
</span><span class="cx"> {
</span><span class="cx"> // The basic approach is to search in two phases - from the selection end to the end of the doc, and
</span><span class="lines">@@ -2181,6 +2017,7 @@
</span><span class="cx"> document().markers().addMarker(misspellingRange.get(), DocumentMarker::Spelling);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> String Editor::misspelledWordAtCaretOrRange(Node* clickedNode) const
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertNodeBeforeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if (!isEditableNode(*m_insertChild))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_insertChild->remove(IGNORE_EXCEPTION);
</del><ins>+ m_insertChild->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMergeIdenticalElementsCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> for (auto& child : children)
</span><span class="cx"> m_element2->insertBefore(child, m_atChild.get(), IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- m_element1->remove(IGNORE_EXCEPTION);
</del><ins>+ m_element1->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MergeIdenticalElementsCommand::doUnapply()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveNodeCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveNodeCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/RemoveNodeCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> m_parent = parent;
</span><span class="cx"> m_refChild = m_node->nextSibling();
</span><span class="cx">
</span><del>- m_node->remove(IGNORE_EXCEPTION);
</del><ins>+ m_node->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoveNodeCommand::doUnapply()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSplitElementCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SplitElementCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SplitElementCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/SplitElementCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> if (!id.isNull())
</span><span class="cx"> m_element2->setIdAttribute(id);
</span><span class="cx">
</span><del>- m_element1->remove(IGNORE_EXCEPTION);
</del><ins>+ m_element1->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SplitElementCommand::doReapply()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSplitTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION);
</span><span class="cx">
</span><span class="cx"> document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(), m_text2.get(), 0);
</span><del>- m_text1->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ m_text1->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SplitTextNodeCommand::doReapply()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingWrapContentsInDummySpanCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> for (auto& child : children)
</span><span class="cx"> m_element->appendChild(child, IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- m_dummySpan->remove(IGNORE_EXCEPTION);
</del><ins>+ m_dummySpan->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WrapContentsInDummySpanCommand::doReapply()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx"> #import "CachedImage.h"
</span><span class="cx"> #import "CachedResourceLoader.h"
</span><span class="cx"> #import "DataTransfer.h"
</span><ins>+#import "DictationCommandIOS.h"
</ins><span class="cx"> #import "DocumentFragment.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span><ins>+#import "DocumentMarkerController.h"
</ins><span class="cx"> #import "EditorClient.h"
</span><span class="cx"> #import "FontCascade.h"
</span><span class="cx"> #import "Frame.h"
</span><span class="lines">@@ -60,6 +62,7 @@
</span><span class="cx"> #import "markup.h"
</span><span class="cx"> #import <MobileCoreServices/MobileCoreServices.h>
</span><span class="cx"> #import <wtf/BlockObjCExceptions.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(AppSupport)
</span><span class="cx"> SOFT_LINK(AppSupport, CPSharedResourcesDirectory, CFStringRef, (void), ())
</span><span class="lines">@@ -173,7 +176,7 @@
</span><span class="cx"> if (style) {
</span><span class="cx"> result = &style->fontCascade().primaryFont();
</span><span class="cx"> if (nodeToRemove)
</span><del>- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ nodeToRemove->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -219,7 +222,7 @@
</span><span class="cx"> getTextDecorationAttributesRespectingTypingStyle(*style, result);
</span><span class="cx">
</span><span class="cx"> if (nodeToRemove)
</span><del>- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ nodeToRemove->remove();
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -603,4 +606,153 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Editor::insertDictationPhrases(Vector<Vector<String>>&& dictationPhrases, RetainPtr<id> metadata)
+{
+ if (m_frame.selection().isNone())
+ return;
+
+ if (dictationPhrases.isEmpty())
+ return;
+
+ applyCommand(DictationCommandIOS::create(document(), WTFMove(dictationPhrases), WTFMove(metadata)));
+}
+
+void Editor::setDictationPhrasesAsChildOfElement(const Vector<Vector<String>>& dictationPhrases, RetainPtr<id> metadata, Element& element)
+{
+ // Clear the composition.
+ clear();
+
+ // Clear the Undo stack, since the operations that follow are not Undoable, and will corrupt the stack.
+ // Some day we could make them Undoable, and let callers clear the Undo stack explicitly if they wish.
+ clearUndoRedoOperations();
+
+ m_frame.selection().clear();
+
+ element.removeChildren();
+
+ if (dictationPhrases.isEmpty()) {
+ client()->respondToChangedContents();
+ return;
+ }
+
+ ExceptionCode ec;
+ RefPtr<Range> context = document().createRange();
+ context->selectNodeContents(element, ec);
+
+ StringBuilder dictationPhrasesBuilder;
+ for (auto& interpretations : dictationPhrases)
+ dictationPhrasesBuilder.append(interpretations[0]);
+
+ element.appendChild(createFragmentFromText(*context, dictationPhrasesBuilder.toString()), ec);
+
+ // We need a layout in order to add markers below.
+ document().updateLayout();
+
+ if (!element.firstChild()->isTextNode()) {
+ // Shouldn't happen.
+ ASSERT(element.firstChild()->isTextNode());
+ return;
+ }
+
+ Text& textNode = downcast<Text>(*element.firstChild());
+ int previousDictationPhraseStart = 0;
+ for (auto& interpretations : dictationPhrases) {
+ int dictationPhraseLength = interpretations[0].length();
+ int dictationPhraseEnd = previousDictationPhraseStart + dictationPhraseLength;
+ if (interpretations.size() > 1) {
+ auto dictationPhraseRange = Range::create(document(), &textNode, previousDictationPhraseStart, &textNode, dictationPhraseEnd);
+ document().markers().addDictationPhraseWithAlternativesMarker(dictationPhraseRange.ptr(), interpretations);
+ }
+ previousDictationPhraseStart = dictationPhraseEnd;
+ }
+
+ auto resultRange = Range::create(document(), &textNode, 0, &textNode, textNode.length());
+ document().markers().addDictationResultMarker(resultRange.ptr(), metadata);
+
+ client()->respondToChangedContents();
+}
+
+void Editor::confirmMarkedText()
+{
+ // FIXME: This is a hacky workaround for the keyboard calling this method too late -
+ // after the selection and focus have already changed. See <rdar://problem/5975559>.
+ Element* focused = document().focusedElement();
+ Node* composition = compositionNode();
+ if (composition && focused && focused != composition && !composition->isDescendantOrShadowDescendantOf(focused)) {
+ cancelComposition();
+ document().setFocusedElement(focused);
+ } else
+ confirmComposition();
+}
+
+void Editor::setTextAsChildOfElement(const String& text, Element& element)
+{
+ // Clear the composition
+ clear();
+
+ // Clear the Undo stack, since the operations that follow are not Undoable, and will corrupt the stack.
+ // Some day we could make them Undoable, and let callers clear the Undo stack explicitly if they wish.
+ clearUndoRedoOperations();
+
+ // If the element is empty already and we're not adding text, we can early return and avoid clearing/setting
+ // a selection at [0, 0] and the expense involved in creation VisiblePositions.
+ if (!element.firstChild() && text.isEmpty())
+ return;
+
+ // As a side effect this function sets a caret selection after the inserted content. Much of what
+ // follows is more expensive if there is a selection, so clear it since it's going to change anyway.
+ m_frame.selection().clear();
+
+ // clear out all current children of element
+ element.removeChildren();
+
+ if (text.length()) {
+ // insert new text
+ // remove element from tree while doing it
+ // FIXME: The element we're inserting into is often the body element. It seems strange to be removing it
+ // (even if it is only temporary). ReplaceSelectionCommand doesn't bother doing this when it inserts
+ // content, why should we here?
+ ExceptionCode ec;
+ RefPtr<Node> parent = element.parentNode();
+ RefPtr<Node> siblingAfter = element.nextSibling();
+ if (parent)
+ element.remove();
+
+ auto context = document().createRange();
+ context->selectNodeContents(element, ec);
+ element.appendChild(createFragmentFromText(context, text), ec);
+
+ // restore element to document
+ if (parent) {
+ if (siblingAfter)
+ parent->insertBefore(element, siblingAfter.get(), ec);
+ else
+ parent->appendChild(element, ec);
+ }
+ }
+
+ // set the selection to the end
+ VisibleSelection selection;
+
+ Position pos = createLegacyEditingPosition(&element, element.countChildNodes());
+
+ VisiblePosition visiblePos(pos, VP_DEFAULT_AFFINITY);
+ if (visiblePos.isNull())
+ return;
+
+ selection.setBase(visiblePos);
+ selection.setExtent(visiblePos);
+
+ m_frame.selection().setSelection(selection);
+
+ client()->respondToChangedContents();
+}
+
+// If the selection is adjusted from UIKit without closing the typing, the typing command may
+// have a stale selection.
+void Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping()
+{
+ TypingCommand::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping(&m_frame, m_frame.selection().selection());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> if (style) {
</span><span class="cx"> result = &style->fontCascade().primaryFont();
</span><span class="cx"> if (nodeToRemove)
</span><del>- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ nodeToRemove->remove();
</ins><span class="cx"> }
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> getTextDecorationAttributesRespectingTypingStyle(*style, result);
</span><span class="cx">
</span><span class="cx"> if (nodeToRemove)
</span><del>- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ nodeToRemove->remove();
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/markup.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -881,24 +881,22 @@
</span><span class="cx"> return markup.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DocumentFragment> createFragmentForInnerOuterHTML(Element& contextElement, const String& markup, ParserContentPolicy parserContentPolicy, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DocumentFragment>> createFragmentForInnerOuterHTML(Element& contextElement, const String& markup, ParserContentPolicy parserContentPolicy)
</ins><span class="cx"> {
</span><del>- Document* document = &contextElement.document();
</del><ins>+ auto* document = &contextElement.document();
</ins><span class="cx"> if (contextElement.hasTagName(templateTag))
</span><span class="cx"> document = &document->ensureTemplateDocument();
</span><del>- RefPtr<DocumentFragment> fragment = DocumentFragment::create(*document);
</del><ins>+ auto fragment = DocumentFragment::create(*document);
</ins><span class="cx">
</span><span class="cx"> if (document->isHTMLDocument()) {
</span><span class="cx"> fragment->parseHTML(markup, &contextElement, parserContentPolicy);
</span><del>- return fragment;
</del><ins>+ return WTFMove(fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool wasValid = fragment->parseXML(markup, &contextElement, parserContentPolicy);
</span><del>- if (!wasValid) {
- ec = SYNTAX_ERR;
- return nullptr;
- }
- return fragment;
</del><ins>+ if (!wasValid)
+ return Exception { SYNTAX_ERR };
+ return WTFMove(fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DocumentFragment> createFragmentForTransformToFragment(Document& outputDoc, const String& sourceString, const String& sourceMIMEType)
</span><span class="lines">@@ -951,31 +949,29 @@
</span><span class="cx"> fragment.removeChild(element, ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DocumentFragment> createContextualFragment(Element& element, const String& markup, ParserContentPolicy parserContentPolicy, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DocumentFragment>> createContextualFragment(Element& element, const String& markup, ParserContentPolicy parserContentPolicy)
</ins><span class="cx"> {
</span><del>- if (element.ieForbidsInsertHTML()) {
- ec = NOT_SUPPORTED_ERR;
- return nullptr;
- }
</del><ins>+ if (element.ieForbidsInsertHTML())
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><span class="cx"> if (element.hasTagName(colTag) || element.hasTagName(colgroupTag) || element.hasTagName(framesetTag)
</span><del>- || element.hasTagName(headTag) || element.hasTagName(styleTag) || element.hasTagName(titleTag)) {
- ec = NOT_SUPPORTED_ERR;
- return nullptr;
- }
</del><ins>+ || element.hasTagName(headTag) || element.hasTagName(styleTag) || element.hasTagName(titleTag))
+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx">
</span><del>- RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(element, markup, parserContentPolicy, ec);
- if (!fragment)
- return nullptr;
</del><ins>+ auto result = createFragmentForInnerOuterHTML(element, markup, parserContentPolicy);
+ if (result.hasException())
+ return result.releaseException();
</ins><span class="cx">
</span><ins>+ auto fragment = result.releaseReturnValue();
+
</ins><span class="cx"> // We need to pop <html> and <body> elements and remove <head> to
</span><span class="cx"> // accommodate folks passing complete HTML documents to make the
</span><span class="cx"> // child of an element.
</span><del>- auto toRemove = collectElementsToRemoveFromFragment(*fragment);
</del><ins>+ auto toRemove = collectElementsToRemoveFromFragment(fragment);
</ins><span class="cx"> for (auto& element : toRemove)
</span><del>- removeElementFromFragmentPreservingChildren(*fragment, element);
</del><ins>+ removeElementFromFragmentPreservingChildren(fragment, element);
</ins><span class="cx">
</span><del>- return fragment;
</del><ins>+ return WTFMove(fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool hasOneChild(ContainerNode& node)
</span><span class="lines">@@ -1005,7 +1001,7 @@
</span><span class="cx"> return !authorScriptMayHaveReference && !mutationScope.canObserve() && !hasMutationEventListeners(containerChild.document());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void replaceChildrenWithFragment(ContainerNode& container, Ref<DocumentFragment>&& fragment, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> replaceChildrenWithFragment(ContainerNode& container, Ref<DocumentFragment>&& fragment)
</ins><span class="cx"> {
</span><span class="cx"> Ref<ContainerNode> containerNode(container);
</span><span class="cx"> ChildListMutationScope mutation(containerNode);
</span><span class="lines">@@ -1012,7 +1008,7 @@
</span><span class="cx">
</span><span class="cx"> if (!fragment->firstChild()) {
</span><span class="cx"> containerNode->removeChildren();
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto* containerChild = containerNode->firstChild();
</span><span class="lines">@@ -1020,18 +1016,25 @@
</span><span class="cx"> if (is<Text>(*containerChild) && hasOneTextChild(fragment) && canUseSetDataOptimization(downcast<Text>(*containerChild), mutation)) {
</span><span class="cx"> ASSERT(!fragment->firstChild()->refCount());
</span><span class="cx"> downcast<Text>(*containerChild).setData(downcast<Text>(*fragment->firstChild()).data());
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> containerNode->replaceChild(fragment, *containerChild, ec);
</span><del>- return;
</del><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> containerNode->removeChildren();
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> containerNode->appendChild(fragment, ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void replaceChildrenWithText(ContainerNode& container, const String& text, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> replaceChildrenWithText(ContainerNode& container, const String& text)
</ins><span class="cx"> {
</span><span class="cx"> Ref<ContainerNode> containerNode(container);
</span><span class="cx"> ChildListMutationScope mutation(containerNode);
</span><span class="lines">@@ -1038,18 +1041,25 @@
</span><span class="cx">
</span><span class="cx"> if (hasOneTextChild(containerNode)) {
</span><span class="cx"> downcast<Text>(*containerNode->firstChild()).setData(text);
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto textNode = Text::create(containerNode->document(), text);
</span><span class="cx">
</span><span class="cx"> if (hasOneChild(containerNode)) {
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> containerNode->replaceChild(textNode, *containerNode->firstChild(), ec);
</span><del>- return;
</del><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> containerNode->removeChildren();
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> containerNode->appendChild(textNode, ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/editing/markup.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -23,9 +23,9 @@
</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 markup_h
-#define markup_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "FragmentScriptingPermission.h"
</span><span class="cx"> #include "HTMLInterchange.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -51,16 +51,15 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<DocumentFragment> createFragmentFromText(Range& context, const String& text);
</span><span class="cx"> WEBCORE_EXPORT Ref<DocumentFragment> createFragmentFromMarkup(Document&, const String& markup, const String& baseURL, ParserContentPolicy = AllowScriptingContent);
</span><del>-RefPtr<DocumentFragment> createFragmentForInnerOuterHTML(Element&, const String& markup, ParserContentPolicy, ExceptionCode&);
</del><ins>+ExceptionOr<Ref<DocumentFragment>> createFragmentForInnerOuterHTML(Element&, const String& markup, ParserContentPolicy);
</ins><span class="cx"> RefPtr<DocumentFragment> createFragmentForTransformToFragment(Document&, const String& sourceString, const String& sourceMIMEType);
</span><del>-RefPtr<DocumentFragment> createContextualFragment(Element&, const String& markup, ParserContentPolicy, ExceptionCode&);
</del><ins>+ExceptionOr<Ref<DocumentFragment>> createContextualFragment(Element&, const String& markup, ParserContentPolicy);
</ins><span class="cx">
</span><span class="cx"> bool isPlainTextMarkup(Node*);
</span><span class="cx">
</span><del>-// These methods are used by HTMLElement & ShadowRoot to replace the
-// children with respected fragment/text.
-void replaceChildrenWithFragment(ContainerNode&, Ref<DocumentFragment>&&, ExceptionCode&);
-void replaceChildrenWithText(ContainerNode&, const String&, ExceptionCode&);
</del><ins>+// These methods are used by HTMLElement & ShadowRoot to replace the children with respected fragment/text.
+ExceptionOr<void> replaceChildrenWithFragment(ContainerNode&, Ref<DocumentFragment>&&);
+ExceptionOr<void> replaceChildrenWithText(ContainerNode&, const String&);
</ins><span class="cx">
</span><span class="cx"> String createMarkup(const Range&, Vector<Node*>* = nullptr, EAnnotateForInterchange = DoNotAnnotateForInterchange, bool convertBlocksToInlines = false, EAbsoluteURLs = DoNotResolveURLs);
</span><span class="cx"> String createMarkup(const Node&, EChildrenOnly = IncludeNode, Vector<Node*>* = nullptr, EAbsoluteURLs = DoNotResolveURLs, Vector<QualifiedName>* tagNamesToSkip = nullptr, EFragmentSerialization = HTMLFragmentSerialization);
</span><span class="lines">@@ -73,5 +72,3 @@
</span><span class="cx"> String documentTypeString(const Document&);
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // markup_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlBaseChooserOnlyDateAndTimeInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,9 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</del><span class="cx"> #include "BaseChooserOnlyDateAndTimeInputType.h"
</span><span class="cx">
</span><ins>+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
+
</ins><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "HTMLDivElement.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> // Need to put something to keep text baseline.
</span><span class="cx"> displayValue = ASCIILiteral(" ");
</span><span class="cx"> }
</span><del>- downcast<HTMLElement>(*node).setInnerText(displayValue, ASSERT_NO_EXCEPTION);
</del><ins>+ downcast<HTMLElement>(*node).setInnerText(displayValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BaseChooserOnlyDateAndTimeInputType::setValue(const String& value, bool valueChanged, TextFieldEventBehavior eventBehavior)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlBaseDateAndTimeInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/BaseDateAndTimeInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/BaseDateAndTimeInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/BaseDateAndTimeInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -55,9 +55,10 @@
</span><span class="cx"> return valueAsDouble();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BaseDateAndTimeInputType::setValueAsDate(double value, ExceptionCode&) const
</del><ins>+ExceptionOr<void> BaseDateAndTimeInputType::setValueAsDate(double value) const
</ins><span class="cx"> {
</span><span class="cx"> element().setValue(serializeWithMilliseconds(value));
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double BaseDateAndTimeInputType::valueAsDouble() const
</span><span class="lines">@@ -66,9 +67,10 @@
</span><span class="cx"> return value.isFinite() ? value.toDouble() : DateComponents::invalidMilliseconds();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BaseDateAndTimeInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior, ExceptionCode&) const
</del><ins>+ExceptionOr<void> BaseDateAndTimeInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior) const
</ins><span class="cx"> {
</span><span class="cx"> element().setValue(serialize(newValue), eventBehavior);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BaseDateAndTimeInputType::typeMismatchFor(const String& value) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlBaseDateAndTimeInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/BaseDateAndTimeInputType.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/BaseDateAndTimeInputType.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/BaseDateAndTimeInputType.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -29,10 +29,10 @@
</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 BaseDateAndTimeInputType_h
-#define BaseDateAndTimeInputType_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</span><ins>+
</ins><span class="cx"> #include "DateComponents.h"
</span><span class="cx"> #include "InputType.h"
</span><span class="cx">
</span><span class="lines">@@ -60,9 +60,9 @@
</span><span class="cx"> virtual DateComponents::Type dateType() const = 0;
</span><span class="cx"> #endif
</span><span class="cx"> double valueAsDate() const override;
</span><del>- void setValueAsDate(double, ExceptionCode&) const override;
</del><ins>+ ExceptionOr<void> setValueAsDate(double) const override;
</ins><span class="cx"> double valueAsDouble() const override;
</span><del>- void setValueAsDecimal(const Decimal&, TextFieldEventBehavior, ExceptionCode&) const override;
</del><ins>+ ExceptionOr<void> setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const override;
</ins><span class="cx"> bool typeMismatchFor(const String&) const override;
</span><span class="cx"> bool typeMismatch() const override;
</span><span class="cx"> bool valueMissing(const String&) const override;
</span><span class="lines">@@ -76,5 +76,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
</ins><span class="cx"> #endif
</span><del>-#endif // BaseDateAndTimeInputType_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -48,28 +48,25 @@
</span><span class="cx"> return token.find(isHTMLSpace) != notFound;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMTokenList::validateToken(const String& token, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::validateToken(const String& token)
</ins><span class="cx"> {
</span><del>- if (token.isEmpty()) {
- ec = SYNTAX_ERR;
- return false;
- }
</del><ins>+ if (token.isEmpty())
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (tokenContainsHTMLSpace(token)) {
- ec = INVALID_CHARACTER_ERR;
- return false;
- }
</del><ins>+ if (tokenContainsHTMLSpace(token))
+ return Exception { INVALID_CHARACTER_ERR };
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMTokenList::validateTokens(const String* tokens, size_t length, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::validateTokens(const String* tokens, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><del>- if (!validateToken(tokens[i], ec))
- return false;
</del><ins>+ auto result = validateToken(tokens[i]);
+ if (result.hasException())
+ return result;
</ins><span class="cx"> }
</span><del>- return true;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMTokenList::contains(const AtomicString& token) const
</span><span class="lines">@@ -77,7 +74,7 @@
</span><span class="cx"> return tokens().contains(token);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void DOMTokenList::addInternal(const String* newTokens, size_t length, ExceptionCode& ec)
</del><ins>+inline ExceptionOr<void> DOMTokenList::addInternal(const String* newTokens, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> // This is usually called with a single token.
</span><span class="cx"> Vector<AtomicString, 1> uniqueNewTokens;
</span><span class="lines">@@ -84,9 +81,11 @@
</span><span class="cx"> uniqueNewTokens.reserveInitialCapacity(length);
</span><span class="cx">
</span><span class="cx"> auto& tokens = this->tokens();
</span><ins>+
</ins><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><del>- if (!validateToken(newTokens[i], ec))
- return;
</del><ins>+ auto result = validateToken(newTokens[i]);
+ if (result.hasException())
+ return result;
</ins><span class="cx"> if (!tokens.contains(newTokens[i]) && !uniqueNewTokens.contains(newTokens[i]))
</span><span class="cx"> uniqueNewTokens.uncheckedAppend(newTokens[i]);
</span><span class="cx"> }
</span><span class="lines">@@ -95,22 +94,25 @@
</span><span class="cx"> tokens.appendVector(uniqueNewTokens);
</span><span class="cx">
</span><span class="cx"> updateAssociatedAttributeFromTokens();
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::add(const Vector<String>& tokens, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::add(const Vector<String>& tokens)
</ins><span class="cx"> {
</span><del>- addInternal(tokens.data(), tokens.size(), ec);
</del><ins>+ return addInternal(tokens.data(), tokens.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::add(const WTF::AtomicString& token, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::add(const AtomicString& token)
</ins><span class="cx"> {
</span><del>- addInternal(&token.string(), 1, ec);
</del><ins>+ return addInternal(&token.string(), 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void DOMTokenList::removeInternal(const String* tokensToRemove, size_t length, ExceptionCode& ec)
</del><ins>+inline ExceptionOr<void> DOMTokenList::removeInternal(const String* tokensToRemove, size_t length)
</ins><span class="cx"> {
</span><del>- if (!validateTokens(tokensToRemove, length, ec))
- return;
</del><ins>+ auto result = validateTokens(tokensToRemove, length);
+ if (result.hasException())
+ return result;
</ins><span class="cx">
</span><span class="cx"> auto& tokens = this->tokens();
</span><span class="cx"> for (size_t i = 0; i < length; ++i)
</span><span class="lines">@@ -117,22 +119,25 @@
</span><span class="cx"> tokens.removeFirst(tokensToRemove[i]);
</span><span class="cx">
</span><span class="cx"> updateAssociatedAttributeFromTokens();
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::remove(const Vector<String>& tokens, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::remove(const Vector<String>& tokens)
</ins><span class="cx"> {
</span><del>- removeInternal(tokens.data(), tokens.size(), ec);
</del><ins>+ return removeInternal(tokens.data(), tokens.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::remove(const WTF::AtomicString& token, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::remove(const AtomicString& token)
</ins><span class="cx"> {
</span><del>- removeInternal(&token.string(), 1, ec);
</del><ins>+ return removeInternal(&token.string(), 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMTokenList::toggle(const AtomicString& token, Optional<bool> force, ExceptionCode& ec)
</del><ins>+ExceptionOr<bool> DOMTokenList::toggle(const AtomicString& token, Optional<bool> force)
</ins><span class="cx"> {
</span><del>- if (!validateToken(token, ec))
- return false;
</del><ins>+ auto result = validateToken(token);
+ if (result.hasException())
+ return result.releaseException();
</ins><span class="cx">
</span><span class="cx"> auto& tokens = this->tokens();
</span><span class="cx">
</span><span class="lines">@@ -153,22 +158,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::replace(const AtomicString& token, const AtomicString& newToken, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> DOMTokenList::replace(const AtomicString& token, const AtomicString& newToken)
</ins><span class="cx"> {
</span><del>- if (token.isEmpty() || newToken.isEmpty()) {
- ec = SYNTAX_ERR;
- return;
- }
</del><ins>+ if (token.isEmpty() || newToken.isEmpty())
+ return Exception { SYNTAX_ERR };
</ins><span class="cx">
</span><del>- if (tokenContainsHTMLSpace(token) || tokenContainsHTMLSpace(newToken)) {
- ec = INVALID_CHARACTER_ERR;
- return;
- }
</del><ins>+ if (tokenContainsHTMLSpace(token) || tokenContainsHTMLSpace(newToken))
+ return Exception { INVALID_CHARACTER_ERR };
</ins><span class="cx">
</span><span class="cx"> auto& tokens = this->tokens();
</span><span class="cx"> size_t index = tokens.find(token);
</span><span class="cx"> if (index == notFound)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> if (tokens.find(newToken) != notFound)
</span><span class="cx"> tokens.remove(index);
</span><span class="lines">@@ -176,15 +177,15 @@
</span><span class="cx"> tokens[index] = newToken;
</span><span class="cx">
</span><span class="cx"> updateAssociatedAttributeFromTokens();
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://dom.spec.whatwg.org/#concept-domtokenlist-validation
</span><del>-bool DOMTokenList::supports(StringView token, ExceptionCode& ec)
</del><ins>+ExceptionOr<bool> DOMTokenList::supports(StringView token)
</ins><span class="cx"> {
</span><del>- if (!m_isSupportedToken) {
- ec = TypeError;
- return false;
- }
</del><ins>+ if (!m_isSupportedToken)
+ return Exception { TypeError };
</ins><span class="cx"> return m_isSupportedToken(token);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMTokenList.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DOMTokenList {
</span><del>- WTF_MAKE_NONCOPYABLE(DOMTokenList); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> DOMTokenList(Element&, const QualifiedName& attributeName, WTF::Function<bool(StringView)>&& isSupportedToken = { });
</span><span class="cx">
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> const AtomicString& item(unsigned index) const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool contains(const AtomicString&) const;
</span><del>- void add(const Vector<String>&, ExceptionCode&);
- void add(const AtomicString&, ExceptionCode&);
- void remove(const Vector<String>&, ExceptionCode&);
- void remove(const AtomicString&, ExceptionCode&);
- WEBCORE_EXPORT bool toggle(const AtomicString&, Optional<bool> force, ExceptionCode&);
- void replace(const AtomicString& token, const AtomicString& newToken, ExceptionCode&);
- bool supports(StringView token, ExceptionCode&);
</del><ins>+ ExceptionOr<void> add(const Vector<String>&);
+ ExceptionOr<void> add(const AtomicString&);
+ ExceptionOr<void> remove(const Vector<String>&);
+ ExceptionOr<void> remove(const AtomicString&);
+ WEBCORE_EXPORT ExceptionOr<bool> toggle(const AtomicString&, Optional<bool> force);
+ ExceptionOr<void> replace(const AtomicString& token, const AtomicString& newToken);
+ ExceptionOr<bool> supports(StringView token);
</ins><span class="cx">
</span><span class="cx"> Element& element() const { return m_element; }
</span><span class="cx">
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<AtomicString>& tokens();
</span><span class="cx"> const Vector<AtomicString>& tokens() const { return const_cast<DOMTokenList&>(*this).tokens(); }
</span><span class="cx">
</span><del>- static bool validateToken(const String&, ExceptionCode&);
- static bool validateTokens(const String* tokens, size_t length, ExceptionCode&);
- void addInternal(const String* tokens, size_t length, ExceptionCode&);
- void removeInternal(const String* tokens, size_t length, ExceptionCode&);
</del><ins>+ static ExceptionOr<void> validateToken(const String&);
+ static ExceptionOr<void> validateTokens(const String* tokens, size_t length);
+ ExceptionOr<void> addInternal(const String* tokens, size_t length);
+ ExceptionOr<void> removeInternal(const String* tokens, size_t length);
</ins><span class="cx">
</span><span class="cx"> Element& m_element;
</span><span class="cx"> const WebCore::QualifiedName& m_attributeName;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMTokenList.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx"> readonly attribute unsigned long length;
</span><span class="cx"> getter DOMString? item(unsigned long index);
</span><span class="cx"> boolean contains(DOMString token);
</span><del>- [CEReactions, MayThrowLegacyException] void add(DOMString... tokens);
- [CEReactions, MayThrowLegacyException] void remove(DOMString... tokens);
- [CEReactions, MayThrowLegacyException] boolean toggle(DOMString token, optional boolean force);
- [CEReactions, MayThrowLegacyException] void replace(DOMString token, DOMString newToken);
- [MayThrowLegacyException] boolean supports(DOMString token);
</del><ins>+ [CEReactions, MayThrowException] void add(DOMString... tokens);
+ [CEReactions, MayThrowException] void remove(DOMString... tokens);
+ [CEReactions, MayThrowException] boolean toggle(DOMString token, optional boolean force);
+ [CEReactions, MayThrowException] void replace(DOMString token, DOMString newToken);
+ [MayThrowException] boolean supports(DOMString token);
</ins><span class="cx">
</span><span class="cx"> iterable<DOMString>;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMURL.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,58 +26,51 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DOMURL.h"
</span><span class="cx">
</span><del>-#include "SecurityOrigin.h"
</del><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "Blob.h"
</span><span class="cx"> #include "BlobURL.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "PublicURLManager.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><ins>+#include "SecurityOrigin.h"
</ins><span class="cx"> #include "URLSearchParams.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<DOMURL> DOMURL::create(const String& url, const String& base, ExceptionCode& ec)
</del><ins>+inline DOMURL::DOMURL(URL&& completeURL, URL&& baseURL)
+ : m_baseURL(WTFMove(baseURL))
+ , m_url(WTFMove(completeURL))
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DOMURL(url, base, ec));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DOMURL> DOMURL::create(const String& url, const DOMURL& base, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DOMURL>> DOMURL::create(const String& url, const String& base)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DOMURL(url, base, ec));
</del><ins>+ URL baseURL { URL { }, base };
+ if (!baseURL.isValid())
+ return Exception { TypeError };
+ URL completeURL { baseURL, url };
+ if (!completeURL.isValid())
+ return Exception { TypeError };
+ return adoptRef(*new DOMURL(WTFMove(completeURL), WTFMove(baseURL)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DOMURL> DOMURL::create(const String& url, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DOMURL>> DOMURL::create(const String& url, const DOMURL& base)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DOMURL(url, ec));
</del><ins>+ return create(url, base.href());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline DOMURL::DOMURL(const String& url, const String& base, ExceptionCode& ec)
- : m_baseURL(URL(), base)
- , m_url(m_baseURL, url)
</del><ins>+ExceptionOr<Ref<DOMURL>> DOMURL::create(const String& url)
</ins><span class="cx"> {
</span><del>- if (!m_baseURL.isValid() || !m_url.isValid())
- ec = TypeError;
</del><ins>+ URL baseURL { blankURL() };
+ URL completeURL { baseURL, url };
+ if (!completeURL.isValid())
+ return Exception { TypeError };
+ return adoptRef(*new DOMURL(WTFMove(completeURL), WTFMove(baseURL)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline DOMURL::DOMURL(const String& url, const DOMURL& base, ExceptionCode& ec)
- : m_baseURL(base.href())
- , m_url(m_baseURL, url)
-{
- if (!m_baseURL.isValid() || !m_url.isValid())
- ec = TypeError;
-}
-
-inline DOMURL::DOMURL(const String& url, ExceptionCode& ec)
- : m_baseURL(blankURL())
- , m_url(m_baseURL, url)
-{
- if (!m_url.isValid())
- ec = TypeError;
-}
-
</del><span class="cx"> DOMURL::~DOMURL()
</span><span class="cx"> {
</span><span class="cx"> if (m_searchParams)
</span><span class="lines">@@ -84,11 +77,15 @@
</span><span class="cx"> m_searchParams->associatedURLDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMURL::setHref(const String& url)
</del><ins>+ExceptionOr<void> DOMURL::setHref(const String& url)
</ins><span class="cx"> {
</span><del>- m_url = URL(m_baseURL, url);
</del><ins>+ URL completeURL { m_baseURL, url };
+ if (!completeURL.isValid())
+ return Exception { TypeError };
+ m_url = WTFMove(completeURL);
</ins><span class="cx"> if (m_searchParams)
</span><span class="cx"> m_searchParams->updateFromAssociatedURL();
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMURL::setQuery(const String& query)
</span><span class="lines">@@ -96,13 +93,6 @@
</span><span class="cx"> m_url.setQuery(query);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMURL::setHref(const String& url, ExceptionCode& ec)
-{
- setHref(url);
- if (!m_url.isValid())
- ec = TypeError;
-}
-
</del><span class="cx"> String DOMURL::createObjectURL(ScriptExecutionContext& scriptExecutionContext, Blob& blob)
</span><span class="cx"> {
</span><span class="cx"> return createPublicURL(scriptExecutionContext, blob);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMURL.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,12 +26,10 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "ExceptionCode.h"
</del><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "URLUtils.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,14 +40,13 @@
</span><span class="cx">
</span><span class="cx"> class DOMURL : public RefCounted<DOMURL>, public URLUtils<DOMURL> {
</span><span class="cx"> public:
</span><del>- static Ref<DOMURL> create(const String& url, const String& base, ExceptionCode&);
- static Ref<DOMURL> create(const String& url, const DOMURL& base, ExceptionCode&);
- static Ref<DOMURL> create(const String& url, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<DOMURL>> create(const String& url, const String& base);
+ static ExceptionOr<Ref<DOMURL>> create(const String& url, const DOMURL& base);
+ static ExceptionOr<Ref<DOMURL>> create(const String& url);
</ins><span class="cx"> ~DOMURL();
</span><span class="cx">
</span><span class="cx"> URL href() const { return m_url; }
</span><del>- void setHref(const String& url);
- void setHref(const String&, ExceptionCode&);
</del><ins>+ ExceptionOr<void> setHref(const String& url);
</ins><span class="cx"> void setQuery(const String&);
</span><span class="cx">
</span><span class="cx"> URLSearchParams& searchParams();
</span><span class="lines">@@ -58,10 +55,9 @@
</span><span class="cx"> static void revokeObjectURL(ScriptExecutionContext&, const String&);
</span><span class="cx">
</span><span class="cx"> static String createPublicURL(ScriptExecutionContext&, URLRegistrable&);
</span><ins>+
</ins><span class="cx"> private:
</span><del>- DOMURL(const String& url, const String& base, ExceptionCode&);
- DOMURL(const String& url, const DOMURL& base, ExceptionCode&);
- DOMURL(const String& url, ExceptionCode&);
</del><ins>+ DOMURL(URL&& completeURL, URL&& baseURL);
</ins><span class="cx">
</span><span class="cx"> URL m_baseURL;
</span><span class="cx"> URL m_url;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DOMURL.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> Constructor(USVString url),
</span><span class="cx"> Constructor(USVString url, USVString base),
</span><span class="cx"> Constructor(USVString url, DOMURL base),
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> JSGenerateToJSObject,
</span><span class="cx"> InterfaceName=URL,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDateTimeLocalInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DateTimeLocalInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DateTimeLocalInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DateTimeLocalInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -29,9 +29,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(INPUT_TYPE_DATETIMELOCAL)
</del><span class="cx"> #include "DateTimeLocalInputType.h"
</span><span class="cx">
</span><ins>+#if ENABLE(INPUT_TYPE_DATETIMELOCAL)
+
</ins><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "InputTypeNames.h"
</span><span class="lines">@@ -61,10 +62,10 @@
</span><span class="cx"> return DateComponents::invalidMilliseconds();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DateTimeLocalInputType::setValueAsDate(double value, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> DateTimeLocalInputType::setValueAsDate(double value) const
</ins><span class="cx"> {
</span><span class="cx"> // valueAsDate doesn't work for the datetime-local type according to the standard.
</span><del>- InputType::setValueAsDate(value, ec);
</del><ins>+ return InputType::setValueAsDate(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StepRange DateTimeLocalInputType::createStepRange(AnyStepHandling anyStepHandling) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDateTimeLocalInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DateTimeLocalInputType.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DateTimeLocalInputType.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/DateTimeLocalInputType.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -28,10 +28,10 @@
</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 DateTimeLocalInputType_h
-#define DateTimeLocalInputType_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_DATETIMELOCAL)
</span><ins>+
</ins><span class="cx"> #include "BaseChooserOnlyDateAndTimeInputType.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -41,17 +41,16 @@
</span><span class="cx"> explicit DateTimeLocalInputType(HTMLInputElement& element) : BaseChooserOnlyDateAndTimeInputType(element) { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- const AtomicString& formControlType() const override;
- DateComponents::Type dateType() const override;
- double valueAsDate() const override;
- void setValueAsDate(double, ExceptionCode&) const override;
- StepRange createStepRange(AnyStepHandling) const override;
- bool parseToDateComponentsInternal(const UChar*, unsigned length, DateComponents*) const override;
- bool setMillisecondToDateComponents(double, DateComponents*) const override;
- bool isDateTimeLocalField() const override;
</del><ins>+ const AtomicString& formControlType() const final;
+ DateComponents::Type dateType() const final;
+ double valueAsDate() const final;
+ ExceptionOr<void> setValueAsDate(double) const final;
+ StepRange createStepRange(AnyStepHandling) const final;
+ bool parseToDateComponentsInternal(const UChar*, unsigned length, DateComponents*) const final;
+ bool setMillisecondToDateComponents(double, DateComponents*) const final;
+ bool isDateTimeLocalField() const final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#endif // DateTimeLocalInputType_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlFTPDirectoryDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FTPDirectoryDocument.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FTPDirectoryDocument.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/FTPDirectoryDocument.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> void FTPDirectoryDocumentParser::appendEntry(const String& filename, const String& size, const String& date, bool isDirectory)
</span><span class="cx"> {
</span><del>- auto rowElement = m_tableElement->insertRow(-1, IGNORE_EXCEPTION);
</del><ins>+ auto rowElement = m_tableElement->insertRow(-1).releaseReturnValue();
</ins><span class="cx"> rowElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryEntryRow", AtomicString::ConstructFromLiteral));
</span><span class="cx">
</span><span class="cx"> auto typeElement = document()->createElement(tdTag, false);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -458,15 +458,13 @@
</span><span class="cx"> return mimeType.convertToASCIILowercase();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String HTMLCanvasElement::toDataURL(const String& mimeType, const double* quality, ExceptionCode& ec)
</del><ins>+ExceptionOr<String> HTMLCanvasElement::toDataURL(const String& mimeType, Optional<double> quality)
</ins><span class="cx"> {
</span><del>- if (!m_originClean) {
- ec = SECURITY_ERR;
- return String();
- }
</del><ins>+ if (!m_originClean)
+ return Exception { SECURITY_ERR };
</ins><span class="cx">
</span><span class="cx"> if (m_size.isEmpty() || !buffer())
</span><del>- return ASCIILiteral("data:,");
</del><ins>+ return String { ASCIILiteral { "data:," } };
</ins><span class="cx">
</span><span class="cx"> String encodingMIMEType = toEncodingMimeType(mimeType);
</span><span class="cx">
</span><span class="lines">@@ -473,7 +471,7 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> // Try to get ImageData first, as that may avoid lossy conversions.
</span><span class="cx"> if (auto imageData = getImageData())
</span><del>- return ImageDataToDataURL(*imageData, encodingMIMEType, quality);
</del><ins>+ return dataURL(*imageData, encodingMIMEType, quality);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> makeRenderingResultsAvailable();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class ImageData;
</span><span class="cx">
</span><span class="cx"> namespace DisplayList {
</span><del>-typedef unsigned AsTextFlags;
</del><ins>+using AsTextFlags = unsigned;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class CanvasObserver {
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static String toEncodingMimeType(const String& mimeType);
</span><del>- WEBCORE_EXPORT String toDataURL(const String& mimeType, const double* quality, ExceptionCode&);
- String toDataURL(const String& mimeType, ExceptionCode& ec) { return toDataURL(mimeType, nullptr, ec); }
</del><ins>+ WEBCORE_EXPORT ExceptionOr<String> toDataURL(const String& mimeType, Optional<double> quality);
+ ExceptionOr<String> toDataURL(const String& mimeType) { return toDataURL(mimeType, Nullopt); }
</ins><span class="cx">
</span><span class="cx"> // Used for rendering
</span><span class="cx"> void didDraw(const FloatRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -32,9 +32,8 @@
</span><span class="cx"> attribute unsigned long width;
</span><span class="cx"> attribute unsigned long height;
</span><span class="cx">
</span><del>- [Custom, MayThrowLegacyException] DOMString toDataURL(optional DOMString? type);
</del><ins>+ [Custom, MayThrowException] DOMString toDataURL(optional DOMString? type);
</ins><span class="cx">
</span><span class="cx"> // The custom binding is needed to handle context creation attributes.
</span><span class="cx"> [Custom] any getContext(DOMString contextId, any... arguments);
</span><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -435,10 +435,8 @@
</span><span class="cx"> setAttributeEventListener(eventName, name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DocumentFragment> HTMLElement::textToFragment(const String& text, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DocumentFragment>> HTMLElement::textToFragment(const String& text)
</ins><span class="cx"> {
</span><del>- ec = 0;
-
</del><span class="cx"> auto fragment = DocumentFragment::create(document());
</span><span class="cx">
</span><span class="cx"> for (unsigned start = 0, length = text.length(); start < length; ) {
</span><span class="lines">@@ -452,9 +450,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> fragment->appendChild(Text::create(document(), text.substring(start, i - start)), ec);
</span><span class="cx"> if (ec)
</span><del>- break;
</del><ins>+ return Exception { ec };
</ins><span class="cx">
</span><span class="cx"> if (i == length)
</span><span class="cx"> break;
</span><span class="lines">@@ -461,7 +460,7 @@
</span><span class="cx">
</span><span class="cx"> fragment->appendChild(HTMLBRElement::create(document()), ec);
</span><span class="cx"> if (ec)
</span><del>- break;
</del><ins>+ return Exception { ec };
</ins><span class="cx">
</span><span class="cx"> // Make sure \r\n doesn't result in two line breaks.
</span><span class="cx"> if (c == '\r' && i + 1 < length && text[i + 1] == '\n')
</span><span class="lines">@@ -470,7 +469,7 @@
</span><span class="cx"> start = i + 1; // Character after line break.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return fragment;
</del><ins>+ return WTFMove(fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool shouldProhibitSetInnerOuterText(const HTMLElement& element)
</span><span class="lines">@@ -515,16 +514,12 @@
</span><span class="cx"> setAttributeWithoutSynchronization(dirAttr, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::setInnerText(const String& text, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLElement::setInnerText(const String& text)
</ins><span class="cx"> {
</span><del>- if (ieForbidsInsertHTML()) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return;
- }
- if (shouldProhibitSetInnerOuterText(*this)) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return;
- }
</del><ins>+ if (ieForbidsInsertHTML())
+ return Exception { NO_MODIFICATION_ALLOWED_ERR };
+ if (shouldProhibitSetInnerOuterText(*this))
+ return Exception { NO_MODIFICATION_ALLOWED_ERR };
</ins><span class="cx">
</span><span class="cx"> // FIXME: This doesn't take whitespace collapsing into account at all.
</span><span class="cx">
</span><span class="lines">@@ -531,10 +526,9 @@
</span><span class="cx"> if (!text.contains('\n') && !text.contains('\r')) {
</span><span class="cx"> if (text.isEmpty()) {
</span><span class="cx"> removeChildren();
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><del>- replaceChildrenWithText(*this, text, ec);
- return;
</del><ins>+ return replaceChildrenWithText(*this, text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Do we need to be able to detect preserveNewline style even when there's no renderer?
</span><span class="lines">@@ -542,63 +536,67 @@
</span><span class="cx"> // For example, for the contents of textarea elements that are display:none?
</span><span class="cx"> auto r = renderer();
</span><span class="cx"> if ((r && r->style().preserveNewline()) || (inDocument() && isTextControlInnerTextElement())) {
</span><del>- if (!text.contains('\r')) {
- replaceChildrenWithText(*this, text, ec);
- return;
- }
</del><ins>+ if (!text.contains('\r'))
+ return replaceChildrenWithText(*this, text);
</ins><span class="cx"> String textWithConsistentLineBreaks = text;
</span><span class="cx"> textWithConsistentLineBreaks.replace("\r\n", "\n");
</span><span class="cx"> textWithConsistentLineBreaks.replace('\r', '\n');
</span><del>- replaceChildrenWithText(*this, textWithConsistentLineBreaks, ec);
- return;
</del><ins>+ return replaceChildrenWithText(*this, textWithConsistentLineBreaks);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add text nodes and <br> elements.
</span><del>- ec = 0;
- Ref<DocumentFragment> fragment = textToFragment(text, ec);
- if (!ec)
- replaceChildrenWithFragment(*this, WTFMove(fragment), ec);
</del><ins>+ auto fragment = textToFragment(text);
+ if (fragment.hasException())
+ return fragment.releaseException();
+ return replaceChildrenWithFragment(*this, fragment.releaseReturnValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::setOuterText(const String& text, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLElement::setOuterText(const String& text)
</ins><span class="cx"> {
</span><del>- if (ieForbidsInsertHTML()) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return;
- }
- if (shouldProhibitSetInnerOuterText(*this)) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return;
- }
</del><ins>+ if (ieForbidsInsertHTML())
+ return Exception { NO_MODIFICATION_ALLOWED_ERR };
+ if (shouldProhibitSetInnerOuterText(*this))
+ return Exception { NO_MODIFICATION_ALLOWED_ERR };
</ins><span class="cx">
</span><span class="cx"> RefPtr<ContainerNode> parent = parentNode();
</span><del>- if (!parent) {
- ec = NO_MODIFICATION_ALLOWED_ERR;
- return;
- }
</del><ins>+ if (!parent)
+ return Exception { NO_MODIFICATION_ALLOWED_ERR };
</ins><span class="cx">
</span><span class="cx"> RefPtr<Node> prev = previousSibling();
</span><span class="cx"> RefPtr<Node> next = nextSibling();
</span><span class="cx"> RefPtr<Node> newChild;
</span><del>- ec = 0;
-
</del><ins>+
</ins><span class="cx"> // Convert text to fragment with <br> tags instead of linebreaks if needed.
</span><del>- if (text.contains('\r') || text.contains('\n'))
- newChild = textToFragment(text, ec);
- else
</del><ins>+ if (text.contains('\r') || text.contains('\n')) {
+ auto result = textToFragment(text);
+ if (result.hasException())
+ return result.releaseException();
+ newChild = result.releaseReturnValue();
+ } else
</ins><span class="cx"> newChild = Text::create(document(), text);
</span><span class="cx">
</span><span class="cx"> if (!parentNode())
</span><del>- ec = HIERARCHY_REQUEST_ERR;
</del><ins>+ return Exception { HIERARCHY_REQUEST_ERR };
+
+ ExceptionCode ec = 0;
+ parent->replaceChild(*newChild, *this, ec);
</ins><span class="cx"> if (ec)
</span><del>- return;
- parent->replaceChild(*newChild, *this, ec);
</del><ins>+ return Exception { ec };
</ins><span class="cx">
</span><span class="cx"> RefPtr<Node> node = next ? next->previousSibling() : nullptr;
</span><del>- if (!ec && is<Text>(node.get()))
</del><ins>+ if (is<Text>(node.get())) {
+ ExceptionCode ec = 0;
</ins><span class="cx"> mergeWithNextTextNode(downcast<Text>(*node), ec);
</span><del>- if (!ec && is<Text>(prev.get()))
</del><ins>+ if (ec)
+ return Exception { ec };
+ }
+ if (is<Text>(prev.get())) {
+ ExceptionCode ec = 0;
</ins><span class="cx"> mergeWithNextTextNode(downcast<Text>(*prev), ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ }
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStyleProperties& style)
</span><span class="lines">@@ -661,7 +659,7 @@
</span><span class="cx"> return ASCIILiteral("inherit");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::setContentEditable(const String& enabled, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLElement::setContentEditable(const String& enabled)
</ins><span class="cx"> {
</span><span class="cx"> if (equalLettersIgnoringASCIICase(enabled, "true"))
</span><span class="cx"> setAttributeWithoutSynchronization(contenteditableAttr, AtomicString("true", AtomicString::ConstructFromLiteral));
</span><span class="lines">@@ -672,7 +670,8 @@
</span><span class="cx"> else if (equalLettersIgnoringASCIICase(enabled, "inherit"))
</span><span class="cx"> removeAttribute(contenteditableAttr);
</span><span class="cx"> else
</span><del>- ec = SYNTAX_ERR;
</del><ins>+ return Exception { SYNTAX_ERR };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLElement::draggable() const
</span><span class="lines">@@ -721,30 +720,15 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TranslateAttributeMode HTMLElement::translateAttributeMode() const
-{
- const AtomicString& value = attributeWithoutSynchronization(translateAttr);
-
- if (value.isNull())
- return TranslateAttributeInherit;
- if (equalLettersIgnoringASCIICase(value, "yes") || value.isEmpty())
- return TranslateAttributeYes;
- if (equalLettersIgnoringASCIICase(value, "no"))
- return TranslateAttributeNo;
-
- return TranslateAttributeInherit;
-}
-
</del><span class="cx"> bool HTMLElement::translate() const
</span><span class="cx"> {
</span><span class="cx"> for (auto& element : lineageOfType<HTMLElement>(*this)) {
</span><del>- TranslateAttributeMode mode = element.translateAttributeMode();
- if (mode == TranslateAttributeInherit)
- continue;
- ASSERT(mode == TranslateAttributeYes || mode == TranslateAttributeNo);
- return mode == TranslateAttributeYes;
</del><ins>+ const AtomicString& value = element.attributeWithoutSynchronization(translateAttr);
+ if (equalLettersIgnoringASCIICase(value, "yes") || (value.isEmpty() && !value.isNull()))
+ return true;
+ if (equalLettersIgnoringASCIICase(value, "no"))
+ return false;
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> // Default on the root element is translate=yes.
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLElement_h
-#define HTMLElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "StyledElement.h"
</span><span class="cx">
</span><span class="lines">@@ -32,12 +31,6 @@
</span><span class="cx"> class HTMLCollection;
</span><span class="cx"> class HTMLFormElement;
</span><span class="cx">
</span><del>-enum TranslateAttributeMode {
- TranslateAttributeYes,
- TranslateAttributeNo,
- TranslateAttributeInherit
-};
-
</del><span class="cx"> class HTMLElement : public StyledElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLElement> create(const QualifiedName& tagName, Document&);
</span><span class="lines">@@ -46,14 +39,14 @@
</span><span class="cx">
</span><span class="cx"> int tabIndex() const override;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setInnerText(const String&, ExceptionCode&);
- WEBCORE_EXPORT void setOuterText(const String&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setInnerText(const String&);
+ WEBCORE_EXPORT ExceptionOr<void> setOuterText(const String&);
</ins><span class="cx">
</span><span class="cx"> virtual bool hasCustomFocusLogic() const;
</span><span class="cx"> bool supportsFocus() const override;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String contentEditable() const;
</span><del>- WEBCORE_EXPORT void setContentEditable(const String&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setContentEditable(const String&);
</ins><span class="cx">
</span><span class="cx"> static Editability editabilityFromContentEditableAttr(const Node&);
</span><span class="cx">
</span><span class="lines">@@ -128,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HTMLFormElement* virtualForm() const;
</span><span class="cx">
</span><del>- Ref<DocumentFragment> textToFragment(const String&, ExceptionCode&);
</del><ins>+ ExceptionOr<Ref<DocumentFragment>> textToFragment(const String&);
</ins><span class="cx">
</span><span class="cx"> void dirAttributeChanged(const AtomicString&);
</span><span class="cx"> void adjustDirectionalityIfNeededAfterChildAttributeChanged(Element* child);
</span><span class="lines">@@ -135,8 +128,6 @@
</span><span class="cx"> void adjustDirectionalityIfNeededAfterChildrenChanged(Element* beforeChange, ChildChangeType);
</span><span class="cx"> TextDirection directionality(Node** strongDirectionalityTextNode= 0) const;
</span><span class="cx">
</span><del>- TranslateAttributeMode translateAttributeMode() const;
-
</del><span class="cx"> static void populateEventHandlerNameMap(EventHandlerNameMap&, const QualifiedName* const table[], size_t tableSize);
</span><span class="cx"> static EventHandlerNameMap createEventHandlerNameMap();
</span><span class="cx"> };
</span><span class="lines">@@ -164,5 +155,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #include "HTMLElementTypeHelpers.h"
</span><del>-
-#endif // HTMLElement_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx"> #if defined(ENABLE_CUSTOM_ELEMENTS) && ENABLE_CUSTOM_ELEMENTS
</span><span class="cx"> CustomConstructor(),
</span><span class="cx"> #endif
</span><ins>+ ExportMacro=WEBCORE_EXPORT,
+ JSCustomPushEventHandlerScope,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><del>- JSCustomPushEventHandlerScope,
- ExportMacro=WEBCORE_EXPORT,
</del><span class="cx"> ] interface HTMLElement : Element {
</span><span class="cx"> [CEReactions, Reflect] attribute DOMString title;
</span><span class="cx"> [CEReactions, Reflect] attribute DOMString lang;
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx"> [CEReactions, Reflect] attribute boolean hidden;
</span><span class="cx"> [CEReactions, Reflect] attribute DOMString accessKey;
</span><span class="cx">
</span><del>- [CEReactions, SetterMayThrowLegacyException, TreatNullAs=EmptyString] attribute DOMString innerText;
- [CEReactions, SetterMayThrowLegacyException, TreatNullAs=EmptyString] attribute DOMString outerText;
</del><ins>+ [CEReactions, SetterMayThrowException, TreatNullAs=EmptyString] attribute DOMString innerText;
+ [CEReactions, SetterMayThrowException, TreatNullAs=EmptyString] attribute DOMString outerText;
</ins><span class="cx">
</span><del>- [CEReactions, SetterMayThrowLegacyException] attribute DOMString contentEditable;
</del><ins>+ [CEReactions, SetterMayThrowException] attribute DOMString contentEditable;
</ins><span class="cx"> readonly attribute boolean isContentEditable;
</span><span class="cx">
</span><span class="cx"> [CEReactions] attribute boolean spellcheck;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ CustomCall,
</ins><span class="cx"> CustomNamedSetter,
</span><span class="cx"> JSCustomGetOwnPropertySlotAndDescriptor,
</span><del>- CustomCall,
</del><span class="cx"> ] interface HTMLEmbedElement : HTMLElement {
</span><span class="cx"> [Reflect] attribute DOMString align;
</span><span class="cx"> [Reflect] attribute DOMString height;
</span><span class="lines">@@ -30,6 +30,5 @@
</span><span class="cx"> [Reflect] attribute DOMString type;
</span><span class="cx"> [Reflect] attribute DOMString width;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowException] Document getSVGDocument();
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> interface HTMLFrameElement : HTMLElement {
</span><del>-
</del><span class="cx"> [Reflect] attribute DOMString frameBorder;
</span><span class="cx"> [Reflect, URL] attribute USVString longDesc;
</span><span class="cx">
</span><span class="lines">@@ -31,13 +30,11 @@
</span><span class="cx"> [Reflect] attribute DOMString scrolling;
</span><span class="cx"> [Reflect, URL] attribute USVString src;
</span><span class="cx">
</span><del>- // Introduced in DOM Level 2:
</del><span class="cx"> [CheckSecurityForNode] readonly attribute Document contentDocument;
</span><span class="cx">
</span><del>- // Extensions
</del><span class="cx"> readonly attribute DOMWindow contentWindow;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowException] Document getSVGDocument();
</ins><span class="cx">
</span><span class="cx"> // FIXME: No other browser has this attribute.
</span><span class="cx"> [CustomSetter] attribute DOMString location;
</span><span class="lines">@@ -44,6 +41,4 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute long width;
</span><span class="cx"> readonly attribute long height;
</span><del>-
</del><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -112,14 +112,13 @@
</span><span class="cx"> return m_contentFrame && HTMLElement::isKeyboardFocusable(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Document* HTMLFrameOwnerElement::getSVGDocument(ExceptionCode& ec) const
</del><ins>+ExceptionOr<Document*> HTMLFrameOwnerElement::getSVGDocument() const
</ins><span class="cx"> {
</span><del>- Document* document = contentDocument();
</del><ins>+ auto* document = contentDocument();
</ins><span class="cx"> if (is<SVGDocument>(document))
</span><del>- return downcast<SVGDocument>(document);
</del><ins>+ return document;
</ins><span class="cx"> // Spec: http://www.w3.org/TR/SVG/struct.html#InterfaceGetSVGDocument
</span><del>- ec = NOT_SUPPORTED_ERR;
- return nullptr;
</del><ins>+ return Exception { NOT_SUPPORTED_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFrameOwnerElement::scheduleinvalidateStyleAndLayerComposition()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> // RenderElement when using fallback content.
</span><span class="cx"> RenderWidget* renderWidget() const;
</span><span class="cx">
</span><del>- Document* getSVGDocument(ExceptionCode&) const;
</del><ins>+ ExceptionOr<Document*> getSVGDocument() const;
</ins><span class="cx">
</span><span class="cx"> virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLIFrameElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLIFrameElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -35,12 +35,9 @@
</span><span class="cx"> [Reflect] attribute DOMString srcdoc;
</span><span class="cx"> [Reflect] attribute DOMString width;
</span><span class="cx">
</span><del>- // Introduced in DOM Level 2:
</del><span class="cx"> [CheckSecurityForNode] readonly attribute Document contentDocument;
</span><span class="cx">
</span><del>- // Extensions
</del><span class="cx"> readonly attribute DOMWindow contentWindow;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowException] Document getSVGDocument();
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -375,14 +375,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void HTMLInputElement::stepUp(int n, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLInputElement::stepUp(int n)
</ins><span class="cx"> {
</span><del>- m_inputType->stepUp(n, ec);
</del><ins>+ return m_inputType->stepUp(n);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::stepDown(int n, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLInputElement::stepDown(int n)
</ins><span class="cx"> {
</span><del>- m_inputType->stepUp(-n, ec);
</del><ins>+ return m_inputType->stepUp(-n);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::blur()
</span><span class="lines">@@ -1018,19 +1018,13 @@
</span><span class="cx"> dispatchInputEvent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setValue(const String& value, ExceptionCode& ec, TextFieldEventBehavior eventBehavior)
</del><ins>+ExceptionOr<void> HTMLInputElement::setValue(const String& value, TextFieldEventBehavior eventBehavior)
</ins><span class="cx"> {
</span><del>- if (isFileUpload() && !value.isEmpty()) {
- ec = INVALID_STATE_ERR;
- return;
- }
- setValue(value.isNull() ? emptyString() : value, eventBehavior);
-}
</del><ins>+ if (isFileUpload() && !value.isEmpty())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>-void HTMLInputElement::setValue(const String& value, TextFieldEventBehavior eventBehavior)
-{
</del><span class="cx"> if (!m_inputType->canSetValue(value))
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> Ref<HTMLInputElement> protectedThis(*this);
</span><span class="cx"> EventQueueScope scope;
</span><span class="lines">@@ -1040,6 +1034,7 @@
</span><span class="cx"> setLastChangeWasNotUserEdit();
</span><span class="cx"> setFormControlValueMatchesRenderer(false);
</span><span class="cx"> m_inputType->setValue(sanitizedValue, valueChanged, eventBehavior);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::setValueInternal(const String& sanitizedValue, TextFieldEventBehavior eventBehavior)
</span><span class="lines">@@ -1054,9 +1049,9 @@
</span><span class="cx"> return m_inputType->valueAsDate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setValueAsDate(double value, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLInputElement::setValueAsDate(double value)
</ins><span class="cx"> {
</span><del>- m_inputType->setValueAsDate(value, ec);
</del><ins>+ return m_inputType->setValueAsDate(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double HTMLInputElement::valueAsNumber() const
</span><span class="lines">@@ -1064,13 +1059,11 @@
</span><span class="cx"> return m_inputType->valueAsDouble();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setValueAsNumber(double newValue, ExceptionCode& ec, TextFieldEventBehavior eventBehavior)
</del><ins>+ExceptionOr<void> HTMLInputElement::setValueAsNumber(double newValue, TextFieldEventBehavior eventBehavior)
</ins><span class="cx"> {
</span><del>- if (!std::isfinite(newValue)) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
- m_inputType->setValueAsDouble(newValue, eventBehavior, ec);
</del><ins>+ if (!std::isfinite(newValue))
+ return Exception { NOT_SUPPORTED_ERR };
+ return m_inputType->setValueAsDouble(newValue, eventBehavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::setValueFromRenderer(const String& value)
</span><span class="lines">@@ -1306,19 +1299,14 @@
</span><span class="cx"> return hasAttributeWithoutSynchronization(multipleAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setSize(unsigned size)
</del><ins>+ExceptionOr<void> HTMLInputElement::setSize(unsigned size)
</ins><span class="cx"> {
</span><ins>+ if (!size)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> setUnsignedIntegralAttribute(sizeAttr, limitToOnlyHTMLNonNegativeNumbersGreaterThanZero(size, defaultSize));
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setSize(unsigned size, ExceptionCode& ec)
-{
- if (!size)
- ec = INDEX_SIZE_ERR;
- else
- setSize(size);
-}
-
</del><span class="cx"> URL HTMLInputElement::src() const
</span><span class="cx"> {
</span><span class="cx"> return document().completeURL(attributeWithoutSynchronization(srcAttr));
</span><span class="lines">@@ -1777,11 +1765,7 @@
</span><span class="cx"> void HTMLInputElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> unsigned oldEffectiveMaxLength = effectiveMaxLength();
</span><del>- if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
- setMaxLength(maxLength.value());
- else
- setMaxLength(-1);
-
</del><ins>+ internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</ins><span class="cx"> if (oldEffectiveMaxLength != effectiveMaxLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -1793,11 +1777,7 @@
</span><span class="cx"> void HTMLInputElement::minLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> int oldMinLength = minLength();
</span><del>- if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
- setMinLength(minLength.value());
- else
- setMinLength(-1);
-
</del><ins>+ internalSetMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</ins><span class="cx"> if (oldMinLength != minLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -1932,24 +1912,20 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void HTMLInputElement::setRangeText(const String& replacement, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLInputElement::setRangeText(const String& replacement)
</ins><span class="cx"> {
</span><del>- if (!m_inputType->supportsSelectionAPI()) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!m_inputType->supportsSelectionAPI())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>- HTMLTextFormControlElement::setRangeText(replacement, ec);
</del><ins>+ return HTMLTextFormControlElement::setRangeText(replacement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLInputElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode)
</ins><span class="cx"> {
</span><del>- if (!m_inputType->supportsSelectionAPI()) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!m_inputType->supportsSelectionAPI())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>- HTMLTextFormControlElement::setRangeText(replacement, start, end, selectionMode, ec);
</del><ins>+ return HTMLTextFormControlElement::setRangeText(replacement, start, end, selectionMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLInputElement::shouldTruncateText(const RenderStyle& style) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLInputElement_h
-#define HTMLInputElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "FileChooser.h"
</span><span class="cx"> #include "HTMLTextFormControlElement.h"
</span><span class="lines">@@ -50,14 +49,9 @@
</span><span class="cx"> struct DateTimeChooserParameters;
</span><span class="cx">
</span><span class="cx"> struct InputElementClickState {
</span><del>- InputElementClickState()
- : stateful(false)
- , checked(false)
- , indeterminate(false)
- { }
- bool stateful;
- bool checked;
- bool indeterminate;
</del><ins>+ bool stateful { false };
+ bool checked { false };
+ bool indeterminate { false };
</ins><span class="cx"> RefPtr<HTMLInputElement> checkedRadioButton;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -94,11 +88,9 @@
</span><span class="cx"> Optional<Decimal> findClosestTickMarkValue(const Decimal&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // Implementations of HTMLInputElement::stepUp() and stepDown().
- WEBCORE_EXPORT void stepUp(int, ExceptionCode&);
- WEBCORE_EXPORT void stepDown(int, ExceptionCode&);
- void stepUp(ExceptionCode& ec) { stepUp(1, ec); }
- void stepDown(ExceptionCode& ec) { stepDown(1, ec); }
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> stepUp(int = 1);
+ WEBCORE_EXPORT ExceptionOr<void> stepDown(int = 1);
+
</ins><span class="cx"> // stepUp()/stepDown() for user-interaction.
</span><span class="cx"> bool isSteppable() const;
</span><span class="cx">
</span><span class="lines">@@ -173,8 +165,7 @@
</span><span class="cx"> WEBCORE_EXPORT void setType(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String value() const final;
</span><del>- void setValue(const String&, ExceptionCode&, TextFieldEventBehavior = DispatchNoEvent);
- WEBCORE_EXPORT void setValue(const String&, TextFieldEventBehavior = DispatchNoEvent);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setValue(const String&, TextFieldEventBehavior = DispatchNoEvent);
</ins><span class="cx"> WEBCORE_EXPORT void setValueForUser(const String&);
</span><span class="cx"> // Checks if the specified string would be a valid value.
</span><span class="cx"> // We should not call this for types with no string value such as CHECKBOX and RADIO.
</span><span class="lines">@@ -191,10 +182,10 @@
</span><span class="cx"> WEBCORE_EXPORT void setEditingValue(const String&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT double valueAsDate() const;
</span><del>- WEBCORE_EXPORT void setValueAsDate(double, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setValueAsDate(double);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT double valueAsNumber() const;
</span><del>- WEBCORE_EXPORT void setValueAsNumber(double, ExceptionCode&, TextFieldEventBehavior = DispatchNoEvent);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setValueAsNumber(double, TextFieldEventBehavior = DispatchNoEvent);
</ins><span class="cx">
</span><span class="cx"> String valueWithDefault() const;
</span><span class="cx">
</span><span class="lines">@@ -232,8 +223,7 @@
</span><span class="cx"> String accept() const;
</span><span class="cx"> WEBCORE_EXPORT String alt() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setSize(unsigned);
- void setSize(unsigned, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setSize(unsigned);
</ins><span class="cx">
</span><span class="cx"> URL src() const;
</span><span class="cx">
</span><span class="lines">@@ -318,8 +308,8 @@
</span><span class="cx"> static Vector<FileChooserFileInfo> filesFromFileInputFormControlState(const FormControlState&);
</span><span class="cx">
</span><span class="cx"> bool matchesReadWritePseudoClass() const final;
</span><del>- WEBCORE_EXPORT void setRangeText(const String& replacement, ExceptionCode&) final;
- WEBCORE_EXPORT void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&) final;
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setRangeText(const String& replacement) final;
+ WEBCORE_EXPORT ExceptionOr<void> setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode) final;
</ins><span class="cx">
</span><span class="cx"> HTMLImageLoader* imageLoader() { return m_imageLoader.get(); }
</span><span class="cx"> HTMLImageLoader& ensureImageLoader();
</span><span class="lines">@@ -469,5 +459,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} //namespace
-#endif
</del><ins>+}
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLInputElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> attribute boolean indeterminate;
</span><span class="cx"> [Conditional=DATALIST_ELEMENT] readonly attribute HTMLElement list;
</span><span class="cx"> [Reflect] attribute DOMString max;
</span><del>- [SetterMayThrowLegacyException] attribute long minLength;
- [SetterMayThrowLegacyException] attribute long maxLength;
</del><ins>+ [SetterMayThrowException] attribute long minLength;
+ [SetterMayThrowException] attribute long maxLength;
</ins><span class="cx"> [Reflect] attribute DOMString min;
</span><span class="cx"> [Reflect] attribute boolean multiple;
</span><span class="cx"> [Reflect] attribute DOMString name;
</span><span class="lines">@@ -53,18 +53,18 @@
</span><span class="cx"> [Reflect] attribute DOMString placeholder;
</span><span class="cx"> [Reflect] attribute boolean readOnly;
</span><span class="cx"> [Reflect] attribute boolean required;
</span><del>- [SetterMayThrowLegacyException] attribute unsigned long size; // Changed string -> long -> unsigned long
</del><ins>+ [SetterMayThrowException] attribute unsigned long size;
</ins><span class="cx"> [Reflect, URL] attribute USVString src;
</span><span class="cx"> [Reflect] attribute DOMString step;
</span><span class="cx"> attribute DOMString type; // readonly dropped as part of DOM level 2
</span><span class="cx"> attribute DOMString defaultValue;
</span><span class="cx"> // See the discussion in https://bugs.webkit.org/show_bug.cgi?id=100085
</span><del>- [TreatNullAs=EmptyString, SetterMayThrowLegacyException] attribute DOMString value;
- [SetterMayThrowLegacyException] attribute Date? valueAsDate;
- [SetterMayThrowLegacyException] attribute unrestricted double valueAsNumber;
</del><ins>+ [TreatNullAs=EmptyString, SetterMayThrowException] attribute DOMString value;
+ [SetterMayThrowException] attribute Date? valueAsDate;
+ [SetterMayThrowException] attribute unrestricted double valueAsNumber;
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] void stepUp(optional long n = 1);
- [MayThrowLegacyException] void stepDown(optional long n = 1);
</del><ins>+ [MayThrowException] void stepUp(optional long n = 1);
+ [MayThrowException] void stepDown(optional long n = 1);
</ins><span class="cx">
</span><span class="cx"> attribute unsigned long width;
</span><span class="cx"> readonly attribute boolean willValidate;
</span><span class="lines">@@ -81,12 +81,11 @@
</span><span class="cx"> [Custom] attribute long selectionEnd;
</span><span class="cx"> [Custom] attribute DOMString selectionDirection;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void setRangeText(DOMString replacement);
- [MayThrowLegacyException] void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional DOMString selectionMode);
</del><ins>+ [MayThrowException] void setRangeText(DOMString replacement);
+ [MayThrowException] void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional DOMString selectionMode);
</ins><span class="cx">
</span><span class="cx"> [Custom] void setSelectionRange(long start, long end, optional DOMString direction);
</span><span class="cx">
</span><del>- // Non-standard attributes
</del><span class="cx"> [Reflect] attribute DOMString align;
</span><span class="cx"> [Reflect] attribute DOMString useMap;
</span><span class="cx"> [Reflect] attribute boolean incremental;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<HTMLMarqueeElement> HTMLMarqueeElement::create(const QualifiedName& tagName, Document& document)
</span><span class="cx"> {
</span><del>- Ref<HTMLMarqueeElement> marqueeElement = adoptRef(*new HTMLMarqueeElement(tagName, document));
</del><ins>+ auto marqueeElement = adoptRef(*new HTMLMarqueeElement(tagName, document));
</ins><span class="cx"> marqueeElement->suspendIfNeeded();
</span><span class="cx"> return marqueeElement;
</span><span class="cx"> }
</span><span class="lines">@@ -112,14 +112,14 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMarqueeElement::start()
</span><span class="cx"> {
</span><del>- if (RenderMarquee* marqueeRenderer = renderMarquee())
- marqueeRenderer->start();
</del><ins>+ if (auto* renderer = renderMarquee())
+ renderer->start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMarqueeElement::stop()
</span><span class="cx"> {
</span><del>- if (RenderMarquee* marqueeRenderer = renderMarquee())
- marqueeRenderer->stop();
</del><ins>+ if (auto* renderer = renderMarquee())
+ renderer->stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned HTMLMarqueeElement::scrollAmount() const
</span><span class="lines">@@ -149,12 +149,12 @@
</span><span class="cx"> return ok && loopValue > 0 ? loopValue : -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMarqueeElement::setLoop(int loop, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLMarqueeElement::setLoop(int loop)
</ins><span class="cx"> {
</span><span class="cx"> if (loop <= 0 && loop != -1)
</span><del>- ec = INDEX_SIZE_ERR;
- else
- setIntegralAttribute(loopAttr, loop);
</del><ins>+ return Exception { INDEX_SIZE_ERR };
+ setIntegralAttribute(loopAttr, loop);
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMarqueeElement::canSuspendForDocumentSuspension() const
</span><span class="lines">@@ -176,9 +176,9 @@
</span><span class="cx">
</span><span class="cx"> RenderMarquee* HTMLMarqueeElement::renderMarquee() const
</span><span class="cx"> {
</span><del>- if (renderer() && renderer()->hasLayer())
- return renderBoxModelObject()->layer()->marquee();
- return 0;
</del><ins>+ if (!renderer() || !renderer()->hasLayer())
+ return nullptr;
+ return renderBoxModelObject()->layer()->marquee();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLMarqueeElement_h
-#define HTMLMarqueeElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="lines">@@ -36,8 +35,6 @@
</span><span class="cx">
</span><span class="cx"> int minimumDelay() const;
</span><span class="cx">
</span><del>- // DOM Functions
-
</del><span class="cx"> WEBCORE_EXPORT void start();
</span><span class="cx"> WEBCORE_EXPORT void stop() final;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> // Loop count. -1 means loop indefinitely.
</span><span class="cx"> WEBCORE_EXPORT int loop() const;
</span><del>- WEBCORE_EXPORT void setLoop(int, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setLoop(int);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLMarqueeElement(const QualifiedName&, Document&);
</span><span class="lines">@@ -59,7 +56,6 @@
</span><span class="cx"> bool isPresentationAttribute(const QualifiedName&) const final;
</span><span class="cx"> void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final;
</span><span class="cx">
</span><del>- // ActiveDOMObject
</del><span class="cx"> bool canSuspendForDocumentSuspension() const final;
</span><span class="cx"> void suspend(ReasonForSuspension) final;
</span><span class="cx"> void resume() final;
</span><span class="lines">@@ -69,5 +65,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // HTMLMarqueeElement_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> [Reflect] attribute DOMString direction;
</span><span class="cx"> [Reflect] attribute DOMString height;
</span><span class="cx"> [Reflect] attribute unsigned long hspace;
</span><del>- [SetterMayThrowLegacyException] attribute long loop;
</del><ins>+ [SetterMayThrowException] attribute long loop;
</ins><span class="cx"> attribute unsigned long scrollAmount;
</span><span class="cx"> attribute unsigned long scrollDelay;
</span><span class="cx"> [Reflect] attribute boolean trueSpeed;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -286,10 +286,7 @@
</span><span class="cx"> enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, Other };
</span><span class="cx">
</span><span class="cx"> TrackGroup(GroupKind kind)
</span><del>- : visibleTrack(0)
- , defaultTrack(0)
- , kind(kind)
- , hasSrcLang(false)
</del><ins>+ : kind(kind)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,7 +294,7 @@
</span><span class="cx"> RefPtr<TextTrack> visibleTrack;
</span><span class="cx"> RefPtr<TextTrack> defaultTrack;
</span><span class="cx"> GroupKind kind;
</span><del>- bool hasSrcLang;
</del><ins>+ bool hasSrcLang { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> HashSet<HTMLMediaElement*>& HTMLMediaElement::allMediaElements()
</span><span class="lines">@@ -397,37 +394,8 @@
</span><span class="cx"> , m_scanTimer(*this, &HTMLMediaElement::scanTimerFired)
</span><span class="cx"> , m_playbackControlsManagerBehaviorRestrictionsTimer(*this, &HTMLMediaElement::playbackControlsManagerBehaviorRestrictionsTimerFired)
</span><span class="cx"> , m_seekToPlaybackPositionEndedTimer(*this, &HTMLMediaElement::seekToPlaybackPositionEndedTimerFired)
</span><del>- , m_playedTimeRanges()
</del><span class="cx"> , m_asyncEventQueue(*this)
</span><del>- , m_requestedPlaybackRate(1)
- , m_reportedPlaybackRate(1)
- , m_defaultPlaybackRate(1)
- , m_webkitPreservesPitch(true)
- , m_networkState(NETWORK_EMPTY)
- , m_readyState(HAVE_NOTHING)
- , m_readyStateMaximum(HAVE_NOTHING)
- , m_volume(1.0f)
- , m_volumeInitialized(false)
- , m_previousProgressTime(std::numeric_limits<double>::max())
- , m_clockTimeAtLastUpdateEvent(0)
</del><span class="cx"> , m_lastTimeUpdateEventMovieTime(MediaTime::positiveInfiniteTime())
</span><del>- , m_loadState(WaitingForSource)
- , m_videoFullscreenMode(VideoFullscreenModeNone)
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
- , m_videoFullscreenGravity(MediaPlayer::VideoGravityResizeAspect)
-#endif
- , m_preload(MediaPlayer::Auto)
- , m_displayMode(Unknown)
- , m_processingMediaPlayerCallback(0)
-#if ENABLE(MEDIA_SOURCE)
- , m_droppedVideoFrames(0)
-#endif
- , m_clockTimeAtLastCachedTimeUpdate(0)
- , m_minimumClockTimeToUpdateCachedTime(0)
- , m_pendingActionFlags(0)
- , m_actionAfterScan(Nothing)
- , m_scanType(Scan)
- , m_scanDirection(Forward)
</del><span class="cx"> , m_firstTimePlaying(true)
</span><span class="cx"> , m_playing(false)
</span><span class="cx"> , m_isWaitingUntilMediaCanStart(false)
</span><span class="lines">@@ -464,21 +432,8 @@
</span><span class="cx"> , m_tracksAreReady(true)
</span><span class="cx"> , m_haveVisibleTextTrack(false)
</span><span class="cx"> , m_processingPreferenceChange(false)
</span><del>- , m_lastTextTrackUpdateTime(MediaTime(-1, 1))
- , m_captionDisplayMode(CaptionUserPreferences::Automatic)
- , m_audioTracks(0)
- , m_textTracks(0)
- , m_videoTracks(0)
- , m_ignoreTrackDisplayUpdate(0)
</del><span class="cx"> #endif
</span><del>-#if ENABLE(WEB_AUDIO)
- , m_audioSourceNode(0)
-#endif
</del><span class="cx"> , m_mediaSession(std::make_unique<MediaElementSession>(*this))
</span><del>- , m_reportedExtraMemoryCost(0)
-#if ENABLE(MEDIA_STREAM)
- , m_mediaStreamSrcObject(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> allMediaElements().add(this);
</span><span class="cx">
</span><span class="lines">@@ -575,7 +530,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_mediaController) {
</span><del>- m_mediaController->removeMediaElement(this);
</del><ins>+ m_mediaController->removeMediaElement(*this);
</ins><span class="cx"> m_mediaController = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -584,7 +539,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><del>- webkitSetMediaKeys(0);
</del><ins>+ webkitSetMediaKeys(nullptr);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="lines">@@ -1460,7 +1415,7 @@
</span><span class="cx"> // If the url should be loaded from the application cache, pass the url of the cached file
</span><span class="cx"> // to the media engine.
</span><span class="cx"> ApplicationCacheHost* cacheHost = frame->loader().documentLoader()->applicationCacheHost();
</span><del>- ApplicationCacheResource* resource = 0;
</del><ins>+ ApplicationCacheResource* resource = nullptr;
</ins><span class="cx"> if (cacheHost && cacheHost->shouldLoadResourceFromApplicationCache(ResourceRequest(url), resource)) {
</span><span class="cx"> // Resources that are not present in the manifest will always fail to load (at least, after the
</span><span class="cx"> // cache has been primed the first time), making the testing of offline applications simpler.
</span><span class="lines">@@ -1550,8 +1505,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-static bool trackIndexCompare(TextTrack* a,
- TextTrack* b)
</del><ins>+
+static bool trackIndexCompare(TextTrack* a, TextTrack* b)
</ins><span class="cx"> {
</span><span class="cx"> return a->trackIndex() - b->trackIndex() < 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1578,9 +1533,8 @@
</span><span class="cx"> static bool compareCueInterval(const CueInterval& one, const CueInterval& two)
</span><span class="cx"> {
</span><span class="cx"> return one.data()->isOrderedBefore(two.data());
</span><del>-};
</del><ins>+}
</ins><span class="cx">
</span><del>-
</del><span class="cx"> void HTMLMediaElement::updateActiveTextTrackCues(const MediaTime& movieTime)
</span><span class="cx"> {
</span><span class="cx"> // 4.8.10.8 Playing the media resource
</span><span class="lines">@@ -1628,16 +1582,10 @@
</span><span class="cx"> // end times are less than or equal to the current playback position.
</span><span class="cx"> // Otherwise, let missed cues be an empty list.
</span><span class="cx"> if (lastTime >= MediaTime::zeroTime() && m_lastSeekTime < movieTime) {
</span><del>- CueList potentiallySkippedCues =
- m_cueTree.allOverlaps(m_cueTree.createInterval(lastTime, movieTime));
-
- for (size_t i = 0; i < potentiallySkippedCues.size(); ++i) {
- MediaTime cueStartTime = potentiallySkippedCues[i].low();
- MediaTime cueEndTime = potentiallySkippedCues[i].high();
-
</del><ins>+ for (auto& cue : m_cueTree.allOverlaps(m_cueTree.createInterval(lastTime, movieTime))) {
</ins><span class="cx"> // Consider cues that may have been missed since the last seek time.
</span><del>- if (cueStartTime > std::max(m_lastSeekTime, lastTime) && cueEndTime < movieTime)
- missedCues.append(potentiallySkippedCues[i]);
</del><ins>+ if (cue.low() > std::max(m_lastSeekTime, lastTime) && cue.high() < movieTime)
+ missedCues.append(cue);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1709,8 +1657,7 @@
</span><span class="cx"> for (size_t i = 0; i < missedCuesSize; ++i) {
</span><span class="cx"> // 9 - For each text track cue in missed cues, prepare an event named enter
</span><span class="cx"> // for the TextTrackCue object with the text track cue start time.
</span><del>- eventTasks.append(std::make_pair(missedCues[i].data()->startMediaTime(),
- missedCues[i].data()));
</del><ins>+ eventTasks.append({ missedCues[i].data()->startMediaTime(), missedCues[i].data() });
</ins><span class="cx">
</span><span class="cx"> // 10 - For each text track [...] in missed cues, prepare an event
</span><span class="cx"> // named exit for the TextTrackCue object with the with the later of
</span><span class="lines">@@ -1722,7 +1669,7 @@
</span><span class="cx"> // affect sorting events before dispatch either, because the exit
</span><span class="cx"> // event has the same time as the enter event.
</span><span class="cx"> if (missedCues[i].data()->startMediaTime() < missedCues[i].data()->endMediaTime())
</span><del>- eventTasks.append(std::make_pair(missedCues[i].data()->endMediaTime(), missedCues[i].data()));
</del><ins>+ eventTasks.append({ missedCues[i].data()->endMediaTime(), missedCues[i].data() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < previousCuesSize; ++i) {
</span><span class="lines">@@ -1730,8 +1677,7 @@
</span><span class="cx"> // track cue active flag set prepare an event named exit for the
</span><span class="cx"> // TextTrackCue object with the text track cue end time.
</span><span class="cx"> if (!currentCues.contains(previousCues[i]))
</span><del>- eventTasks.append(std::make_pair(previousCues[i].data()->endMediaTime(),
- previousCues[i].data()));
</del><ins>+ eventTasks.append({ previousCues[i].data()->endMediaTime(), previousCues[i].data() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < currentCuesSize; ++i) {
</span><span class="lines">@@ -1739,8 +1685,7 @@
</span><span class="cx"> // text track cue active flag set, prepare an event named enter for the
</span><span class="cx"> // TextTrackCue object with the text track cue start time.
</span><span class="cx"> if (!previousCues.contains(currentCues[i]))
</span><del>- eventTasks.append(std::make_pair(currentCues[i].data()->startMediaTime(),
- currentCues[i].data()));
</del><ins>+ eventTasks.append({ currentCues[i].data()->startMediaTime(), currentCues[i].data() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 12 - Sort the tasks in events in ascending time order (tasks with earlier
</span><span class="lines">@@ -1747,32 +1692,31 @@
</span><span class="cx"> // times first).
</span><span class="cx"> std::sort(eventTasks.begin(), eventTasks.end(), eventTimeCueCompare);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < eventTasks.size(); ++i) {
- if (!affectedTracks.contains(eventTasks[i].second->track()))
- affectedTracks.append(eventTasks[i].second->track());
</del><ins>+ for (auto& eventTask : eventTasks) {
+ if (!affectedTracks.contains(eventTask.second->track()))
+ affectedTracks.append(eventTask.second->track());
</ins><span class="cx">
</span><span class="cx"> // 13 - Queue each task in events, in list order.
</span><del>- RefPtr<Event> event;
</del><span class="cx">
</span><span class="cx"> // Each event in eventTasks may be either an enterEvent or an exitEvent,
</span><span class="cx"> // depending on the time that is associated with the event. This
</span><span class="cx"> // correctly identifies the type of the event, if the startTime is
</span><span class="cx"> // less than the endTime in the cue.
</span><del>- if (eventTasks[i].second->startTime() >= eventTasks[i].second->endTime()) {
- event = Event::create(eventNames().enterEvent, false, false);
- event->setTarget(eventTasks[i].second);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
</del><ins>+ if (eventTask.second->startTime() >= eventTask.second->endTime()) {
+ auto enterEvent = Event::create(eventNames().enterEvent, false, false);
+ enterEvent->setTarget(eventTask.second);
+ m_asyncEventQueue.enqueueEvent(WTFMove(enterEvent));
</ins><span class="cx">
</span><del>- event = Event::create(eventNames().exitEvent, false, false);
- event->setTarget(eventTasks[i].second);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
</del><ins>+ auto exitEvent = Event::create(eventNames().exitEvent, false, false);
+ exitEvent->setTarget(eventTask.second);
+ m_asyncEventQueue.enqueueEvent(WTFMove(exitEvent));
</ins><span class="cx"> } else {
</span><del>- if (eventTasks[i].first == eventTasks[i].second->startMediaTime())
</del><ins>+ RefPtr<Event> event;
+ if (eventTask.first == eventTask.second->startMediaTime())
</ins><span class="cx"> event = Event::create(eventNames().enterEvent, false, false);
</span><span class="cx"> else
</span><span class="cx"> event = Event::create(eventNames().exitEvent, false, false);
</span><del>-
- event->setTarget(eventTasks[i].second);
</del><ins>+ event->setTarget(eventTask.second);
</ins><span class="cx"> m_asyncEventQueue.enqueueEvent(WTFMove(event));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1783,20 +1727,18 @@
</span><span class="cx">
</span><span class="cx"> // 15 - For each text track in affected tracks, in the list order, queue a
</span><span class="cx"> // task to fire a simple event named cuechange at the TextTrack object, and, ...
</span><del>- for (size_t i = 0; i < affectedTracks.size(); ++i) {
- RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
- event->setTarget(affectedTracks[i]);
-
</del><ins>+ for (auto& affectedTrack : affectedTracks) {
+ auto event = Event::create(eventNames().cuechangeEvent, false, false);
+ event->setTarget(affectedTrack);
</ins><span class="cx"> m_asyncEventQueue.enqueueEvent(WTFMove(event));
</span><span class="cx">
</span><span class="cx"> // ... if the text track has a corresponding track element, to then fire a
</span><span class="cx"> // simple event named cuechange at the track element as well.
</span><del>- if (is<LoadableTextTrack>(*affectedTracks[i])) {
- RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
- HTMLTrackElement* trackElement = downcast<LoadableTextTrack>(*affectedTracks[i]).trackElement();
</del><ins>+ if (is<LoadableTextTrack>(*affectedTrack)) {
+ auto event = Event::create(eventNames().cuechangeEvent, false, false);
+ auto* trackElement = downcast<LoadableTextTrack>(*affectedTrack).trackElement();
</ins><span class="cx"> ASSERT(trackElement);
</span><span class="cx"> event->setTarget(trackElement);
</span><del>-
</del><span class="cx"> m_asyncEventQueue.enqueueEvent(WTFMove(event));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1863,7 +1805,7 @@
</span><span class="cx"> if (track->trackType() == TextTrack::TrackElement) {
</span><span class="cx"> trackIsLoaded = false;
</span><span class="cx"> for (auto& trackElement : childrenOfType<HTMLTrackElement>(*this)) {
</span><del>- if (trackElement.track() == track) {
</del><ins>+ if (&trackElement.track() == track) {
</ins><span class="cx"> if (trackElement.readyState() == HTMLTrackElement::LOADING || trackElement.readyState() == HTMLTrackElement::LOADED)
</span><span class="cx"> trackIsLoaded = true;
</span><span class="cx"> break;
</span><span class="lines">@@ -2477,7 +2419,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_mediaKeys)
</span><del>- m_mediaKeys->setMediaElement(0);
</del><ins>+ m_mediaKeys->setMediaElement(nullptr);
</ins><span class="cx"> m_mediaKeys = mediaKeys;
</span><span class="cx"> if (m_mediaKeys)
</span><span class="cx"> m_mediaKeys->setMediaElement(this);
</span><span class="lines">@@ -2488,6 +2430,7 @@
</span><span class="cx"> if (m_player)
</span><span class="cx"> m_player->keyAdded();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::progressEventTimerFired()
</span><span class="lines">@@ -2884,16 +2827,12 @@
</span><span class="cx"> seekInternal(time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::setCurrentTime(double time, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLMediaElement::setCurrentTimeForBindings(double time)
</ins><span class="cx"> {
</span><del>- // On setting, if the media element has a current media controller, then the user agent must
- // throw an InvalidStateError exception
- if (m_mediaController) {
- ec = INVALID_STATE_ERR;
- return;
- }
-
</del><ins>+ if (m_mediaController)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> seek(MediaTime::createWithDouble(time));
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::duration() const
</span><span class="lines">@@ -3136,7 +3075,7 @@
</span><span class="cx"> seekInternal(MediaTime::zeroTime());
</span><span class="cx">
</span><span class="cx"> if (m_mediaController)
</span><del>- m_mediaController->bringElementUpToSpeed(this);
</del><ins>+ m_mediaController->bringElementUpToSpeed(*this);
</ins><span class="cx">
</span><span class="cx"> if (m_paused) {
</span><span class="cx"> m_paused = false;
</span><span class="lines">@@ -3274,23 +3213,23 @@
</span><span class="cx"> return m_volume;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::setVolume(double vol, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLMediaElement::setVolume(double volume)
</ins><span class="cx"> {
</span><del>- LOG(Media, "HTMLMediaElement::setVolume(%p) - %f", this, vol);
</del><ins>+ LOG(Media, "HTMLMediaElement::setVolume(%p) - %f", this, volume);
</ins><span class="cx">
</span><del>- if (vol < 0.0f || vol > 1.0f) {
- ec = INDEX_SIZE_ERR;
- return;
- }
-
</del><ins>+ if (!(volume >= 0 && volume <= 1))
+ return Exception { INDEX_SIZE_ERR };
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>- if (m_volume != vol) {
- m_volume = vol;
- m_volumeInitialized = true;
- updateVolume();
- scheduleEvent(eventNames().volumechangeEvent);
- }
</del><ins>+ if (m_volume == volume)
+ return { };
+
+ m_volume = volume;
+ m_volumeInitialized = true;
+ updateVolume();
+ scheduleEvent(eventNames().volumechangeEvent);
</ins><span class="cx"> #endif
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::muted() const
</span><span class="lines">@@ -3523,19 +3462,19 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidAddAudioTrack(AudioTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> if (isPlaying() && !m_mediaSession->playbackPermitted(*this))
</span><span class="cx"> pauseInternal();
</span><span class="cx">
</span><del>- addAudioTrack(AudioTrack::create(this, prpTrack));
</del><ins>+ addAudioTrack(AudioTrack::create(this, &track));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidAddTextTrack(PassRefPtr<InbandTextTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidAddTextTrack(InbandTextTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> // 4.8.10.12.2 Sourcing in-band text tracks
</span><span class="cx"> // 1. Associate the relevant data with a new text track and its corresponding new TextTrack object.
</span><del>- RefPtr<InbandTextTrack> textTrack = InbandTextTrack::create(ActiveDOMObject::scriptExecutionContext(), this, prpTrack);
</del><ins>+ RefPtr<InbandTextTrack> textTrack = InbandTextTrack::create(ActiveDOMObject::scriptExecutionContext(), this, &track);
</ins><span class="cx"> textTrack->setMediaElement(this);
</span><span class="cx">
</span><span class="cx"> // 2. Set the new text track's kind, label, and language based on the semantics of the relevant data,
</span><span class="lines">@@ -3564,24 +3503,24 @@
</span><span class="cx"> addTextTrack(textTrack.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidAddVideoTrack(PassRefPtr<VideoTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidAddVideoTrack(VideoTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- addVideoTrack(VideoTrack::create(this, prpTrack));
</del><ins>+ addVideoTrack(VideoTrack::create(this, &track));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidRemoveAudioTrack(PassRefPtr<AudioTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidRemoveAudioTrack(AudioTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- prpTrack->willBeRemoved();
</del><ins>+ track.willBeRemoved();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidRemoveTextTrack(PassRefPtr<InbandTextTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidRemoveTextTrack(InbandTextTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- prpTrack->willBeRemoved();
</del><ins>+ track.willBeRemoved();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaPlayerDidRemoveVideoTrack(PassRefPtr<VideoTrackPrivate> prpTrack)
</del><ins>+void HTMLMediaElement::mediaPlayerDidRemoveVideoTrack(VideoTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- prpTrack->willBeRemoved();
</del><ins>+ track.willBeRemoved();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::closeCaptionTracksChanged()
</span><span class="lines">@@ -3655,16 +3594,14 @@
</span><span class="cx"> removeVideoTrack(*m_videoTracks->lastItem());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<TextTrack> HTMLMediaElement::addTextTrack(const String& kind, const String& label, const String& language, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<TextTrack>> HTMLMediaElement::addTextTrack(const String& kind, const String& label, const String& language)
</ins><span class="cx"> {
</span><span class="cx"> // 4.8.10.12.4 Text track API
</span><span class="cx"> // The addTextTrack(kind, label, language) method of media elements, when invoked, must run the following steps:
</span><span class="cx">
</span><span class="cx"> // 1. If kind is not one of the following strings, then throw a SyntaxError exception and abort these steps
</span><del>- if (!TextTrack::isValidKindKeyword(kind)) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (!TextTrack::isValidKindKeyword(kind))
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> // 2. If the label argument was omitted, let label be the empty string.
</span><span class="cx"> // 3. If the language argument was omitted, let language be the empty string.
</span><span class="lines">@@ -3713,20 +3650,16 @@
</span><span class="cx"> return *m_videoTracks;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::didAddTextTrack(HTMLTrackElement* trackElement)
</del><ins>+void HTMLMediaElement::didAddTextTrack(HTMLTrackElement& trackElement)
</ins><span class="cx"> {
</span><del>- ASSERT(trackElement->hasTagName(trackTag));
</del><ins>+ ASSERT(trackElement.hasTagName(trackTag));
</ins><span class="cx">
</span><span class="cx"> // 4.8.10.12.3 Sourcing out-of-band text tracks
</span><span class="cx"> // When a track element's parent element changes and the new parent is a media element,
</span><span class="cx"> // then the user agent must add the track element's corresponding text track to the
</span><span class="cx"> // media element's list of text tracks ... [continues in TextTrackList::append]
</span><del>- RefPtr<TextTrack> textTrack = trackElement->track();
- if (!textTrack)
- return;
-
- addTextTrack(textTrack.releaseNonNull());
-
</del><ins>+ addTextTrack(trackElement.track());
+
</ins><span class="cx"> // Do not schedule the track loading until parsing finishes so we don't start before all tracks
</span><span class="cx"> // in the markup have been added.
</span><span class="cx"> if (!m_parsingInProgress)
</span><span class="lines">@@ -3736,23 +3669,21 @@
</span><span class="cx"> mediaControls()->closedCaptionTracksChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::didRemoveTextTrack(HTMLTrackElement* trackElement)
</del><ins>+void HTMLMediaElement::didRemoveTextTrack(HTMLTrackElement& trackElement)
</ins><span class="cx"> {
</span><del>- ASSERT(trackElement->hasTagName(trackTag));
</del><ins>+ ASSERT(trackElement.hasTagName(trackTag));
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- if (trackElement->hasTagName(trackTag)) {
- URL url = trackElement->getNonEmptyURLAttribute(srcAttr);
</del><ins>+ if (trackElement.hasTagName(trackTag)) {
+ URL url = trackElement.getNonEmptyURLAttribute(srcAttr);
</ins><span class="cx"> LOG(Media, "HTMLMediaElement::didRemoveTrack(%p) - 'src' is %s", this, urlForLoggingMedia(url).utf8().data());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<TextTrack> textTrack = trackElement->track();
- if (!textTrack)
- return;
-
- textTrack->setHasBeenConfigured(false);
</del><ins>+ auto& textTrack = trackElement.track();
</ins><span class="cx">
</span><ins>+ textTrack.setHasBeenConfigured(false);
+
</ins><span class="cx"> if (!m_textTracks)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3760,11 +3691,9 @@
</span><span class="cx"> // When a track element's parent element changes and the old parent was a media element,
</span><span class="cx"> // then the user agent must remove the track element's corresponding text track from the
</span><span class="cx"> // media element's list of text tracks.
</span><del>- removeTextTrack(*textTrack);
</del><ins>+ removeTextTrack(textTrack);
</ins><span class="cx">
</span><del>- size_t index = m_textTracksWhenResourceSelectionBegan.find(textTrack.get());
- if (index != notFound)
- m_textTracksWhenResourceSelectionBegan.remove(index);
</del><ins>+ m_textTracksWhenResourceSelectionBegan.removeFirst(&textTrack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::configureTextTrackGroup(const TrackGroup& group)
</span><span class="lines">@@ -4212,7 +4141,7 @@
</span><span class="cx"> // A 'beforeload' event handler can mutate the DOM, so check to see if the source element is still a child node.
</span><span class="cx"> if (node.parentNode() != this) {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'beforeload' removed current element", this);
</span><del>- source = 0;
</del><ins>+ source = nullptr;
</ins><span class="cx"> goto CheckAgain;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4703,12 +4632,11 @@
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::maxBufferedTime() const
</span><span class="cx"> {
</span><del>- RefPtr<TimeRanges> bufferedRanges = buffered();
</del><ins>+ auto bufferedRanges = buffered();
</ins><span class="cx"> unsigned numRanges = bufferedRanges->length();
</span><span class="cx"> if (!numRanges)
</span><span class="cx"> return 0;
</span><del>-
- return bufferedRanges->end(numRanges - 1, ASSERT_NO_EXCEPTION);
</del><ins>+ return bufferedRanges.get().ranges().end(numRanges - 1).toDouble();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<TimeRanges> HTMLMediaElement::played()
</span><span class="lines">@@ -6068,7 +5996,7 @@
</span><span class="cx"> // attribute is set, changed, or removed, the user agent must run the following steps:
</span><span class="cx"> // 1. Let m [this] be the media element in question.
</span><span class="cx"> // 2. Let m have no current media controller, if it currently has one.
</span><del>- setController(0);
</del><ins>+ setController(nullptr);
</ins><span class="cx">
</span><span class="cx"> // 3. If m's mediagroup attribute is being removed, then abort these steps.
</span><span class="cx"> if (group.isEmpty())
</span><span class="lines">@@ -6102,12 +6030,12 @@
</span><span class="cx"> void HTMLMediaElement::setController(PassRefPtr<MediaController> controller)
</span><span class="cx"> {
</span><span class="cx"> if (m_mediaController)
</span><del>- m_mediaController->removeMediaElement(this);
</del><ins>+ m_mediaController->removeMediaElement(*this);
</ins><span class="cx">
</span><span class="cx"> m_mediaController = controller;
</span><span class="cx">
</span><span class="cx"> if (m_mediaController)
</span><del>- m_mediaController->addMediaElement(this);
</del><ins>+ m_mediaController->addMediaElement(*this);
</ins><span class="cx">
</span><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->setMediaController(m_mediaController ? m_mediaController.get() : static_cast<MediaControllerInterface*>(this));
</span><span class="lines">@@ -6268,7 +6196,7 @@
</span><span class="cx"> if (!isAllowedToLoadMediaURL(*this, url, trackElement.isInUserAgentShadowTree()))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- auto& track = *trackElement.track();
</del><ins>+ auto& track = trackElement.track();
</ins><span class="cx"> auto kind = track.kind();
</span><span class="cx">
</span><span class="cx"> // FIXME: The switch statement below preserves existing behavior where we ignore chapters and metadata tracks.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -83,14 +83,12 @@
</span><span class="cx"> class VideoPlaybackQuality;
</span><span class="cx"> class VideoTrackList;
</span><span class="cx"> class VideoTrackPrivate;
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><span class="cx"> class WebKitMediaKeys;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-typedef PODIntervalTree<MediaTime, TextTrackCue*> CueIntervalTree;
-typedef CueIntervalTree::IntervalType CueInterval;
-typedef Vector<CueInterval> CueList;
</del><ins>+using CueIntervalTree = PODIntervalTree<MediaTime, TextTrackCue*>;
+using CueInterval = CueIntervalTree::IntervalType;
+using CueList = Vector<CueInterval>;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class HTMLMediaElement
</span><span class="lines">@@ -192,8 +190,9 @@
</span><span class="cx"> // playback state
</span><span class="cx"> WEBCORE_EXPORT double currentTime() const override;
</span><span class="cx"> void setCurrentTime(double) override;
</span><del>- virtual void setCurrentTime(double, ExceptionCode&);
- virtual double getStartDate() const;
</del><ins>+ double currentTimeForBindings() const { return currentTime(); }
+ WEBCORE_EXPORT ExceptionOr<void> setCurrentTimeForBindings(double);
+ WEBCORE_EXPORT double getStartDate() const;
</ins><span class="cx"> WEBCORE_EXPORT double duration() const override;
</span><span class="cx"> WEBCORE_EXPORT bool paused() const override;
</span><span class="cx"> double defaultPlaybackRate() const override;
</span><span class="lines">@@ -261,7 +260,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool controls() const;
</span><span class="cx"> WEBCORE_EXPORT void setControls(bool);
</span><span class="cx"> WEBCORE_EXPORT double volume() const override;
</span><del>- void setVolume(double, ExceptionCode&) override;
</del><ins>+ ExceptionOr<void> setVolume(double) override;
</ins><span class="cx"> WEBCORE_EXPORT bool muted() const override;
</span><span class="cx"> WEBCORE_EXPORT void setMuted(bool) override;
</span><span class="cx">
</span><span class="lines">@@ -278,7 +277,7 @@
</span><span class="cx"> double percentLoaded() const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- RefPtr<TextTrack> addTextTrack(const String& kind, const String& label, const String& language, ExceptionCode&);
</del><ins>+ ExceptionOr<Ref<TextTrack>> addTextTrack(const String& kind, const String& label, const String& language);
</ins><span class="cx">
</span><span class="cx"> AudioTrackList& audioTracks();
</span><span class="cx"> TextTrackList& textTracks();
</span><span class="lines">@@ -296,18 +295,18 @@
</span><span class="cx"> void closeCaptionTracksChanged();
</span><span class="cx"> void notifyMediaPlayerOfTextTrackChanges();
</span><span class="cx">
</span><del>- virtual void didAddTextTrack(HTMLTrackElement*);
- virtual void didRemoveTextTrack(HTMLTrackElement*);
</del><ins>+ virtual void didAddTextTrack(HTMLTrackElement&);
+ virtual void didRemoveTextTrack(HTMLTrackElement&);
</ins><span class="cx">
</span><del>- void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) override;
- void mediaPlayerDidAddTextTrack(PassRefPtr<InbandTextTrackPrivate>) override;
- void mediaPlayerDidAddVideoTrack(PassRefPtr<VideoTrackPrivate>) override;
- void mediaPlayerDidRemoveAudioTrack(PassRefPtr<AudioTrackPrivate>) override;
- void mediaPlayerDidRemoveTextTrack(PassRefPtr<InbandTextTrackPrivate>) override;
- void mediaPlayerDidRemoveVideoTrack(PassRefPtr<VideoTrackPrivate>) override;
</del><ins>+ void mediaPlayerDidAddAudioTrack(AudioTrackPrivate&) final;
+ void mediaPlayerDidAddTextTrack(InbandTextTrackPrivate&) final;
+ void mediaPlayerDidAddVideoTrack(VideoTrackPrivate&) final;
+ void mediaPlayerDidRemoveAudioTrack(AudioTrackPrivate&) final;
+ void mediaPlayerDidRemoveTextTrack(InbandTextTrackPrivate&) final;
+ void mediaPlayerDidRemoveVideoTrack(VideoTrackPrivate&) final;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><del>- Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() override;
</del><ins>+ Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> struct TrackGroup;
</span><span class="lines">@@ -325,8 +324,9 @@
</span><span class="cx"> // AudioTrackClient
</span><span class="cx"> void audioTrackEnabledChanged(AudioTrack*) override;
</span><span class="cx">
</span><ins>+ void textTrackReadyStateChanged(TextTrack*);
+
</ins><span class="cx"> // TextTrackClient
</span><del>- virtual void textTrackReadyStateChanged(TextTrack*);
</del><span class="cx"> void textTrackKindChanged(TextTrack*) override;
</span><span class="cx"> void textTrackModeChanged(TextTrack*) override;
</span><span class="cx"> void textTrackAddCues(TextTrack*, const TextTrackCueList*) override;
</span><span class="lines">@@ -823,13 +823,13 @@
</span><span class="cx">
</span><span class="cx"> Vector<PlayPromise> m_pendingPlayPromises;
</span><span class="cx">
</span><del>- double m_requestedPlaybackRate;
- double m_reportedPlaybackRate;
- double m_defaultPlaybackRate;
- bool m_webkitPreservesPitch;
- NetworkState m_networkState;
- ReadyState m_readyState;
- ReadyState m_readyStateMaximum;
</del><ins>+ double m_requestedPlaybackRate { 1 };
+ double m_reportedPlaybackRate { 1 };
+ double m_defaultPlaybackRate { 1 };
+ bool m_webkitPreservesPitch { true };
+ NetworkState m_networkState { NETWORK_EMPTY };
+ ReadyState m_readyState { HAVE_NOTHING };
+ ReadyState m_readyStateMaximum { HAVE_NOTHING };
</ins><span class="cx"> URL m_currentSrc;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaError> m_error;
</span><span class="lines">@@ -850,15 +850,15 @@
</span><span class="cx"> std::unique_ptr<PendingSeek> m_pendingSeek;
</span><span class="cx"> SeekType m_pendingSeekType { NoSeek };
</span><span class="cx">
</span><del>- double m_volume;
- bool m_volumeInitialized;
</del><ins>+ double m_volume { 1 };
+ bool m_volumeInitialized { false };
</ins><span class="cx"> MediaTime m_lastSeekTime;
</span><span class="cx">
</span><del>- double m_previousProgressTime;
</del><ins>+ double m_previousProgressTime { std::numeric_limits<double>::max() };
</ins><span class="cx"> double m_playbackStartedTime { 0 };
</span><span class="cx">
</span><span class="cx"> // The last time a timeupdate event was sent (based on monotonic clock).
</span><del>- double m_clockTimeAtLastUpdateEvent;
</del><ins>+ double m_clockTimeAtLastUpdateEvent { 0 };
</ins><span class="cx">
</span><span class="cx"> // The last time a timeupdate event was sent in movie time.
</span><span class="cx"> MediaTime m_lastTimeUpdateEventMovieTime;
</span><span class="lines">@@ -865,11 +865,11 @@
</span><span class="cx">
</span><span class="cx"> // Loading state.
</span><span class="cx"> enum LoadState { WaitingForSource, LoadingFromSrcAttr, LoadingFromSourceElement };
</span><del>- LoadState m_loadState;
</del><ins>+ LoadState m_loadState { WaitingForSource };
</ins><span class="cx"> RefPtr<HTMLSourceElement> m_currentSourceNode;
</span><span class="cx"> RefPtr<Node> m_nextChildNodeToConsider;
</span><span class="cx">
</span><del>- VideoFullscreenMode m_videoFullscreenMode;
</del><ins>+ VideoFullscreenMode m_videoFullscreenMode { VideoFullscreenModeNone };
</ins><span class="cx"> bool m_preparedForInline;
</span><span class="cx"> std::function<void()> m_preparedForInlineCompletionHandler;
</span><span class="cx">
</span><span class="lines">@@ -876,18 +876,18 @@
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoFullscreenLayer;
</span><span class="cx"> FloatRect m_videoFullscreenFrame;
</span><del>- MediaPlayerEnums::VideoGravity m_videoFullscreenGravity;
</del><ins>+ MediaPlayerEnums::VideoGravity m_videoFullscreenGravity { MediaPlayer::VideoGravityResizeAspect };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MediaPlayer> m_player;
</span><span class="cx">
</span><del>- MediaPlayerEnums::Preload m_preload;
</del><ins>+ MediaPlayerEnums::Preload m_preload { MediaPlayer::Auto };
</ins><span class="cx">
</span><del>- DisplayMode m_displayMode;
</del><ins>+ DisplayMode m_displayMode { Unknown };
</ins><span class="cx">
</span><span class="cx"> // Counter incremented while processing a callback from the media player, so we can avoid
</span><span class="cx"> // calling the media engine recursively.
</span><del>- int m_processingMediaPlayerCallback;
</del><ins>+ int m_processingMediaPlayerCallback { 0 };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> String m_kind;
</span><span class="lines">@@ -898,27 +898,25 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> RefPtr<MediaSource> m_mediaSource;
</span><del>- unsigned long m_droppedVideoFrames;
</del><ins>+ unsigned m_droppedVideoFrames { 0 };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> mutable MediaTime m_cachedTime;
</span><del>- mutable double m_clockTimeAtLastCachedTimeUpdate;
- mutable double m_minimumClockTimeToUpdateCachedTime;
</del><ins>+ mutable double m_clockTimeAtLastCachedTimeUpdate { 0 };
+ mutable double m_minimumClockTimeToUpdateCachedTime { 0 };
</ins><span class="cx">
</span><span class="cx"> MediaTime m_fragmentStartTime;
</span><span class="cx"> MediaTime m_fragmentEndTime;
</span><span class="cx">
</span><del>- typedef unsigned PendingActionFlags;
- PendingActionFlags m_pendingActionFlags;
</del><ins>+ using PendingActionFlags = unsigned;
+ PendingActionFlags m_pendingActionFlags { 0 };
</ins><span class="cx">
</span><del>- enum ActionAfterScanType {
- Nothing, Play, Pause
- };
- ActionAfterScanType m_actionAfterScan;
</del><ins>+ enum ActionAfterScanType { Nothing, Play, Pause };
+ ActionAfterScanType m_actionAfterScan { Nothing };
</ins><span class="cx">
</span><span class="cx"> enum ScanType { Seek, Scan };
</span><del>- ScanType m_scanType;
- ScanDirection m_scanDirection;
</del><ins>+ ScanType m_scanType { Scan };
+ ScanDirection m_scanDirection { Forward };
</ins><span class="cx">
</span><span class="cx"> bool m_firstTimePlaying : 1;
</span><span class="cx"> bool m_playing : 1;
</span><span class="lines">@@ -971,9 +969,9 @@
</span><span class="cx"> bool m_processingPreferenceChange : 1;
</span><span class="cx">
</span><span class="cx"> String m_subtitleTrackLanguage;
</span><del>- MediaTime m_lastTextTrackUpdateTime;
</del><ins>+ MediaTime m_lastTextTrackUpdateTime { -1, 1 };
</ins><span class="cx">
</span><del>- CaptionUserPreferences::CaptionDisplayMode m_captionDisplayMode;
</del><ins>+ CaptionUserPreferences::CaptionDisplayMode m_captionDisplayMode { CaptionUserPreferences::Automatic };
</ins><span class="cx">
</span><span class="cx"> RefPtr<AudioTrackList> m_audioTracks;
</span><span class="cx"> RefPtr<TextTrackList> m_textTracks;
</span><span class="lines">@@ -983,7 +981,7 @@
</span><span class="cx"> CueIntervalTree m_cueTree;
</span><span class="cx">
</span><span class="cx"> CueList m_currentlyActiveCues;
</span><del>- int m_ignoreTrackDisplayUpdate;
</del><ins>+ int m_ignoreTrackDisplayUpdate { 0 };
</ins><span class="cx">
</span><span class="cx"> bool m_requireCaptionPreferencesChangedCallbacks { false };
</span><span class="cx"> #endif
</span><span class="lines">@@ -992,7 +990,7 @@
</span><span class="cx"> // This is a weak reference, since m_audioSourceNode holds a reference to us.
</span><span class="cx"> // The value is set just after the MediaElementAudioSourceNode is created.
</span><span class="cx"> // The value is cleared in MediaElementAudioSourceNode::~MediaElementAudioSourceNode().
</span><del>- MediaElementAudioSourceNode* m_audioSourceNode;
</del><ins>+ MediaElementAudioSourceNode* m_audioSourceNode { nullptr };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String m_mediaGroup;
</span><span class="lines">@@ -1009,7 +1007,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MediaElementSession> m_mediaSession;
</span><span class="cx"> PageActivityAssertionToken m_audioActivityToken;
</span><del>- size_t m_reportedExtraMemoryCost;
</del><ins>+ size_t m_reportedExtraMemoryCost { 0 };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> friend class MediaControlsHost;
</span><span class="lines">@@ -1029,11 +1027,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK)
-#ifndef NDEBUG
</del><ins>+#if ENABLE(VIDEO_TRACK) && !defined(NDEBUG)
+
</ins><span class="cx"> // Template specialization required by PodIntervalTree in debug mode.
</span><del>-template <>
-struct ValueToString<TextTrackCue*> {
</del><ins>+template <> struct ValueToString<TextTrackCue*> {
</ins><span class="cx"> static String string(TextTrackCue* const& cue)
</span><span class="cx"> {
</span><span class="cx"> String text;
</span><span class="lines">@@ -1042,17 +1039,18 @@
</span><span class="cx"> return String::format("%p id=%s interval=%s-->%s cue=%s)", cue, cue->id().utf8().data(), toString(cue->startTime()).utf8().data(), toString(cue->endTime()).utf8().data(), text.utf8().data());
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>-template<>
-struct ValueToString<MediaTime> {
</del><ins>+
+template<> struct ValueToString<MediaTime> {
</ins><span class="cx"> static String string(const MediaTime& time)
</span><span class="cx"> {
</span><span class="cx"> return toString(time);
</span><span class="cx"> }
</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="trunkSourceWebCorehtmlHTMLMediaElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> readonly attribute boolean seeking;
</span><span class="cx">
</span><span class="cx"> // playback state
</span><del>- [SetterMayThrowLegacyException] attribute unrestricted double currentTime;
</del><ins>+ [ImplementedAs=currentTimeForBindings, SetterMayThrowException] attribute unrestricted double currentTime;
</ins><span class="cx"> readonly attribute unrestricted double duration;
</span><span class="cx"> Date getStartDate();
</span><span class="cx"> readonly attribute boolean paused;
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> // controls
</span><span class="cx"> attribute boolean controls;
</span><del>- [SetterMayThrowLegacyException] attribute double volume;
</del><ins>+ [SetterMayThrowException] attribute double volume;
</ins><span class="cx"> attribute boolean muted;
</span><span class="cx"> [Reflect=muted] attribute boolean defaultMuted;
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> [Conditional=LEGACY_ENCRYPTED_MEDIA] readonly attribute WebKitMediaKeys webkitKeys;
</span><span class="cx"> [Conditional=LEGACY_ENCRYPTED_MEDIA] void webkitSetMediaKeys(WebKitMediaKeys? mediaKeys);
</span><span class="cx">
</span><del>- [Conditional=VIDEO_TRACK, MayThrowLegacyException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");
</del><ins>+ [Conditional=VIDEO_TRACK, MayThrowException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");
</ins><span class="cx"> [Conditional=VIDEO_TRACK] readonly attribute AudioTrackList audioTracks;
</span><span class="cx"> [Conditional=VIDEO_TRACK] readonly attribute TextTrackList textTracks;
</span><span class="cx"> [Conditional=VIDEO_TRACK] readonly attribute VideoTrackList videoTracks;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ CustomCall,
</ins><span class="cx"> CustomNamedSetter,
</span><span class="cx"> JSCustomGetOwnPropertySlotAndDescriptor,
</span><del>- CustomCall,
</del><span class="cx"> ] interface HTMLObjectElement : HTMLElement {
</span><span class="cx"> readonly attribute HTMLFormElement form;
</span><span class="cx"> [Reflect] attribute DOMString code;
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx"> [EnabledAtRuntime=InteractiveFormValidation] boolean reportValidity();
</span><span class="cx"> void setCustomValidity(DOMString? error);
</span><span class="cx">
</span><del>- // Introduced in DOM Level 2:
</del><span class="cx"> [CheckSecurityForNode] readonly attribute Document contentDocument;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowException] Document getSVGDocument();
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -66,17 +66,17 @@
</span><span class="cx"> return adoptRef(*new HTMLOptionElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<HTMLOptionElement> HTMLOptionElement::createForJSConstructor(Document& document, const String& data, const String& value,
- bool defaultSelected, bool selected, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<HTMLOptionElement>> HTMLOptionElement::createForJSConstructor(Document& document,
+ const String& data, const String& value, bool defaultSelected, bool selected)
</ins><span class="cx"> {
</span><span class="cx"> Ref<HTMLOptionElement> element = adoptRef(*new HTMLOptionElement(optionTag, document));
</span><span class="cx">
</span><span class="cx"> auto text = Text::create(document, data.isNull() ? emptyString() : data);
</span><span class="cx">
</span><del>- ec = 0;
</del><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> element->appendChild(text, ec);
</span><span class="cx"> if (ec)
</span><del>- return nullptr;
</del><ins>+ return Exception { ec };
</ins><span class="cx">
</span><span class="cx"> if (!value.isNull())
</span><span class="cx"> element->setValue(value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -35,8 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLOptionElement> create(Document&);
</span><span class="cx"> static Ref<HTMLOptionElement> create(const QualifiedName&, Document&);
</span><del>- static RefPtr<HTMLOptionElement> createForJSConstructor(Document&, const String& data, const String& value,
- bool defaultSelected, bool selected, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<HTMLOptionElement>> createForJSConstructor(Document&, const String& data, const String& value, bool defaultSelected, bool selected);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String text() const;
</span><span class="cx"> void setText(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> NamedConstructor=Option(optional DOMString data, optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false),
</span><span class="cx"> ] interface HTMLOptionElement : HTMLElement {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> selectElement().setSelectedIndex(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLOptionsCollection::setLength(unsigned length, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLOptionsCollection::setLength(unsigned length)
</ins><span class="cx"> {
</span><del>- selectElement().setLength(length, ec);
</del><ins>+ return selectElement().setLength(length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><span class="cx"> class HTMLOptionsCollection final : public CachedHTMLCollection<HTMLOptionsCollection, CollectionTypeTraits<SelectOptions>::traversalType> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLOptionsCollection> create(HTMLSelectElement&, CollectionType);
</span><span class="lines">@@ -50,7 +48,7 @@
</span><span class="cx"> WEBCORE_EXPORT int selectedIndex() const;
</span><span class="cx"> WEBCORE_EXPORT void setSelectedIndex(int);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setLength(unsigned, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setLength(unsigned);
</ins><span class="cx">
</span><span class="cx"> // For CachedHTMLCollection.
</span><span class="cx"> bool elementMatches(Element&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> ] interface HTMLOptionsCollection : HTMLCollection {
</span><span class="cx"> attribute long selectedIndex;
</span><del>- [CEReactions, CustomSetter, SetterMayThrowLegacyException] attribute unsigned long length;
</del><ins>+ [CEReactions, CustomSetter, SetterMayThrowException] attribute unsigned long length;
</ins><span class="cx">
</span><span class="cx"> getter HTMLOptionElement? item(unsigned long index);
</span><span class="cx"> getter HTMLOptionElement? namedItem(DOMString name);
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx">
</span><span class="cx"> [CEReactions, MayThrowException] void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
</span><span class="cx">
</span><del>- [CEReactions] void remove(long index);
- // FIXME: This overload is not in the specification and has been dropped in Blink.
</del><ins>+ void remove(long index);
+
+ // FIXME: This overload is not in the specification and has been dropped from Blink.
</ins><span class="cx"> [CEReactions] void remove(HTMLOptionElement option);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLProgressElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -98,12 +98,8 @@
</span><span class="cx"> return !std::isfinite(value) || value < 0 ? 0 : std::min(value, max());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLProgressElement::setValue(double value, ExceptionCode& ec)
</del><ins>+void HTMLProgressElement::setValue(double value)
</ins><span class="cx"> {
</span><del>- if (!std::isfinite(value)) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
</del><span class="cx"> setAttributeWithoutSynchronization(valueAttr, AtomicString::number(value >= 0 ? value : 0));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,12 +109,8 @@
</span><span class="cx"> return !std::isfinite(max) || max <= 0 ? 1 : max;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLProgressElement::setMax(double max, ExceptionCode& ec)
</del><ins>+void HTMLProgressElement::setMax(double max)
</ins><span class="cx"> {
</span><del>- if (!std::isfinite(max)) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
</del><span class="cx"> setAttributeWithoutSynchronization(maxAttr, AtomicString::number(max > 0 ? max : 1));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLProgressElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLProgressElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLProgressElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLProgressElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLProgressElement_h
-#define HTMLProgressElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "LabelableElement.h"
</span><span class="cx">
</span><span class="lines">@@ -36,15 +35,13 @@
</span><span class="cx"> static Ref<HTMLProgressElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> double value() const;
</span><del>- void setValue(double, ExceptionCode&);
</del><ins>+ void setValue(double);
</ins><span class="cx">
</span><span class="cx"> double max() const;
</span><del>- void setMax(double, ExceptionCode&);
</del><ins>+ void setMax(double);
</ins><span class="cx">
</span><span class="cx"> double position() const;
</span><span class="cx">
</span><del>- bool canContainRangeEndPoint() const final { return false; }
-
</del><span class="cx"> private:
</span><span class="cx"> HTMLProgressElement(const QualifiedName&, Document&);
</span><span class="cx"> virtual ~HTMLProgressElement();
</span><span class="lines">@@ -64,9 +61,9 @@
</span><span class="cx"> void didAddUserAgentShadowRoot(ShadowRoot*) final;
</span><span class="cx"> bool isDeterminate() const;
</span><span class="cx">
</span><ins>+ bool canContainRangeEndPoint() const final { return false; }
+
</ins><span class="cx"> ProgressValueElement* m_value;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLProgressElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLProgressElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLProgressElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLProgressElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -18,9 +18,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> interface HTMLProgressElement : HTMLElement {
</span><del>- [SetterMayThrowLegacyException] attribute unrestricted double value;
- [SetterMayThrowLegacyException] attribute unrestricted double max;
- readonly attribute unrestricted double position;
- readonly attribute NodeList labels;
</del><ins>+ attribute double value;
+ attribute double max;
+ readonly attribute double position;
+ readonly attribute NodeList labels;
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -246,15 +246,15 @@
</span><span class="cx"> if (listIndex < 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- listItems()[listIndex]->remove(IGNORE_EXCEPTION);
</del><ins>+ listItems()[listIndex]->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::remove(HTMLOptionElement& option)
</del><ins>+ExceptionOr<void> HTMLSelectElement::remove(HTMLOptionElement& option)
</ins><span class="cx"> {
</span><span class="cx"> if (option.ownerSelectElement() != this)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- option.remove(IGNORE_EXCEPTION);
</del><ins>+ return option.remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String HTMLSelectElement::value() const
</span><span class="lines">@@ -430,9 +430,8 @@
</span><span class="cx"> return options()->item(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::setOption(unsigned index, HTMLOptionElement& option, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLSelectElement::setOption(unsigned index, HTMLOptionElement& option)
</ins><span class="cx"> {
</span><del>- ec = 0;
</del><span class="cx"> if (index > maxSelectItems - 1)
</span><span class="cx"> index = maxSelectItems - 1;
</span><span class="cx"> int diff = index - length();
</span><span class="lines">@@ -439,7 +438,9 @@
</span><span class="cx"> RefPtr<HTMLOptionElement> before;
</span><span class="cx"> // Out of array bounds? First insert empty dummies.
</span><span class="cx"> if (diff > 0) {
</span><del>- setLength(index, ec);
</del><ins>+ auto result = setLength(index);
+ if (result.hasException())
+ return result;
</ins><span class="cx"> // Replace an existing entry?
</span><span class="cx"> } else if (diff < 0) {
</span><span class="cx"> before = item(index + 1);
</span><span class="lines">@@ -446,18 +447,16 @@
</span><span class="cx"> removeByIndex(index);
</span><span class="cx"> }
</span><span class="cx"> // Finally add the new element.
</span><del>- if (!ec) {
- auto exception = add(&option, HTMLElementOrInt(before.get()));
- if (exception.hasException())
- ec = exception.releaseException().code();
- if (diff >= 0 && option.selected())
- optionSelectionStateChanged(option, true);
- }
</del><ins>+ auto result = add(&option, HTMLElementOrInt { before.get() });
+ if (result.hasException())
+ return result;
+ if (diff >= 0 && option.selected())
+ optionSelectionStateChanged(option, true);
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::setLength(unsigned newLength, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLSelectElement::setLength(unsigned newLength)
</ins><span class="cx"> {
</span><del>- ec = 0;
</del><span class="cx"> if (newLength > maxSelectItems)
</span><span class="cx"> newLength = maxSelectItems;
</span><span class="cx"> int diff = length() - newLength;
</span><span class="lines">@@ -465,11 +464,9 @@
</span><span class="cx"> if (diff < 0) { // Add dummy elements.
</span><span class="cx"> do {
</span><span class="cx"> auto option = document().createElement(optionTag, false);
</span><del>- auto exception = add(downcast<HTMLOptionElement>(option.ptr()), Nullopt);
- if (exception.hasException()) {
- ec = exception.releaseException().code();
- break;
- }
</del><ins>+ auto result = add(downcast<HTMLOptionElement>(option.ptr()), Nullopt);
+ if (result.hasException())
+ return result;
</ins><span class="cx"> } while (++diff);
</span><span class="cx"> } else {
</span><span class="cx"> auto& items = listItems();
</span><span class="lines">@@ -476,21 +473,22 @@
</span><span class="cx">
</span><span class="cx"> // Removing children fires mutation events, which might mutate the DOM further, so we first copy out a list
</span><span class="cx"> // of elements that we intend to remove then attempt to remove them one at a time.
</span><del>- Vector<Ref<Element>> itemsToRemove;
</del><ins>+ Vector<Ref<HTMLOptionElement>> itemsToRemove;
</ins><span class="cx"> size_t optionIndex = 0;
</span><span class="cx"> for (auto& item : items) {
</span><span class="cx"> if (is<HTMLOptionElement>(*item) && optionIndex++ >= newLength) {
</span><span class="cx"> ASSERT(item->parentNode());
</span><del>- itemsToRemove.append(*item);
</del><ins>+ itemsToRemove.append(downcast<HTMLOptionElement>(*item));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto& item : itemsToRemove) {
- if (item->parentNode())
- item->parentNode()->removeChild(item.get(), ec);
- }
</del><ins>+ // FIXME: Clients can detect what order we remove the options in; is it good to remove them in ascending order?
+ // FIXME: This ignores exceptions. A previous version passed through the exception only for the last item removed.
+ // What exception behavior do we want?
+ for (auto& item : itemsToRemove)
+ item->remove();
</ins><span class="cx"> }
</span><del>- updateValidity();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLSelectElement::isRequiredFormControl() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> WEBCORE_EXPORT ExceptionOr<void> add(const OptionOrOptGroupElement&, Optional<HTMLElementOrInt> before);
</span><span class="cx">
</span><span class="cx"> using Node::remove;
</span><del>- void remove(HTMLOptionElement&);
</del><ins>+ ExceptionOr<void> remove(HTMLOptionElement&);
</ins><span class="cx"> WEBCORE_EXPORT void removeByIndex(int); // Should be remove(int) but that conflicts with Node::remove(ExceptionCode&).
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String value() const;
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setSize(unsigned);
</span><span class="cx">
</span><del>- void setOption(unsigned index, HTMLOptionElement&, ExceptionCode&);
- void setLength(unsigned, ExceptionCode&);
</del><ins>+ ExceptionOr<void> setOption(unsigned index, HTMLOptionElement&);
+ ExceptionOr<void> setLength(unsigned);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT HTMLOptionElement* namedItem(const AtomicString& name);
</span><span class="cx"> WEBCORE_EXPORT HTMLOptionElement* item(unsigned index);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> readonly attribute DOMString type;
</span><span class="cx">
</span><span class="cx"> readonly attribute HTMLOptionsCollection options;
</span><del>- [CEReactions, SetterMayThrowLegacyException] attribute unsigned long length;
</del><ins>+ [CEReactions, SetterMayThrowException] attribute unsigned long length;
</ins><span class="cx">
</span><span class="cx"> getter HTMLOptionElement? item(unsigned long index);
</span><span class="cx"> HTMLOptionElement? namedItem(DOMString name);
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> [CEReactions, MayThrowException] void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void remove(); // ChildNode overload
</del><ins>+ [MayThrowException] void remove(); // ChildNode overload
</ins><span class="cx"> // FIXME: This overload is not in the specification and was dropped in Blink.
</span><span class="cx"> [CEReactions] void remove(HTMLOptionElement option);
</span><span class="cx"> [CEReactions, ImplementedAs=removeByIndex] void remove(long index);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -78,11 +78,16 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableElement::setCaption(RefPtr<HTMLTableCaptionElement>&& newCaption, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableElement::setCaption(RefPtr<HTMLTableCaptionElement>&& newCaption)
</ins><span class="cx"> {
</span><span class="cx"> deleteCaption();
</span><del>- if (newCaption)
</del><ins>+ if (newCaption) {
+ ExceptionCode ec = 0;
</ins><span class="cx"> insertBefore(*newCaption, firstChild(), ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ }
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTableSectionElement* HTMLTableElement::tHead() const
</span><span class="lines">@@ -94,17 +99,15 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableElement::setTHead(RefPtr<HTMLTableSectionElement>&& newHead, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableElement::setTHead(RefPtr<HTMLTableSectionElement>&& newHead)
</ins><span class="cx"> {
</span><del>- if (UNLIKELY(newHead && !newHead->hasTagName(theadTag))) {
- ec = HIERARCHY_REQUEST_ERR;
- return;
- }
</del><ins>+ if (UNLIKELY(newHead && !newHead->hasTagName(theadTag)))
+ return Exception { HIERARCHY_REQUEST_ERR };
</ins><span class="cx">
</span><span class="cx"> deleteTHead();
</span><span class="cx">
</span><span class="cx"> if (!newHead)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> Node* child;
</span><span class="cx"> for (child = firstChild(); child; child = child->nextSibling()) {
</span><span class="lines">@@ -112,7 +115,11 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> insertBefore(*newHead, child, ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTableSectionElement* HTMLTableElement::tFoot() const
</span><span class="lines">@@ -124,54 +131,56 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableElement::setTFoot(RefPtr<HTMLTableSectionElement>&& newFoot, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableElement::setTFoot(RefPtr<HTMLTableSectionElement>&& newFoot)
</ins><span class="cx"> {
</span><del>- if (UNLIKELY(newFoot && !newFoot->hasTagName(tfootTag))) {
- ec = HIERARCHY_REQUEST_ERR;
- return;
- }
</del><ins>+ if (UNLIKELY(newFoot && !newFoot->hasTagName(tfootTag)))
+ return Exception { HIERARCHY_REQUEST_ERR };
</ins><span class="cx">
</span><span class="cx"> deleteTFoot();
</span><span class="cx">
</span><span class="cx"> if (!newFoot)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> appendChild(*newFoot, ec);
</span><ins>+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLTableSectionElement> HTMLTableElement::createTHead()
</span><span class="cx"> {
</span><del>- if (HTMLTableSectionElement* existingHead = tHead())
</del><ins>+ if (auto* existingHead = tHead())
</ins><span class="cx"> return *existingHead;
</span><del>- Ref<HTMLTableSectionElement> head = HTMLTableSectionElement::create(theadTag, document());
- setTHead(head.copyRef(), IGNORE_EXCEPTION);
</del><ins>+ auto head = HTMLTableSectionElement::create(theadTag, document());
+ setTHead(head.copyRef());
</ins><span class="cx"> return head;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTableElement::deleteTHead()
</span><span class="cx"> {
</span><del>- if (auto* tHead = this->tHead())
- removeChild(*tHead, IGNORE_EXCEPTION);
</del><ins>+ if (auto* head = tHead())
+ removeChild(*head);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLTableSectionElement> HTMLTableElement::createTFoot()
</span><span class="cx"> {
</span><del>- if (HTMLTableSectionElement* existingFoot = tFoot())
</del><ins>+ if (auto* existingFoot = tFoot())
</ins><span class="cx"> return *existingFoot;
</span><del>- Ref<HTMLTableSectionElement> foot = HTMLTableSectionElement::create(tfootTag, document());
- setTFoot(foot.copyRef(), IGNORE_EXCEPTION);
</del><ins>+ auto foot = HTMLTableSectionElement::create(tfootTag, document());
+ setTFoot(foot.copyRef());
</ins><span class="cx"> return foot;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTableElement::deleteTFoot()
</span><span class="cx"> {
</span><del>- if (auto* tFoot = this->tFoot())
- removeChild(*tFoot, IGNORE_EXCEPTION);
</del><ins>+ if (auto* foot = tFoot())
+ removeChild(*foot, IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLTableSectionElement> HTMLTableElement::createTBody()
</span><span class="cx"> {
</span><del>- Ref<HTMLTableSectionElement> body = HTMLTableSectionElement::create(tbodyTag, document());
</del><ins>+ auto body = HTMLTableSectionElement::create(tbodyTag, document());
</ins><span class="cx"> Node* referenceElement = lastBody() ? lastBody()->nextSibling() : nullptr;
</span><span class="cx"> insertBefore(body, referenceElement, ASSERT_NO_EXCEPTION);
</span><span class="cx"> return body;
</span><span class="lines">@@ -179,10 +188,10 @@
</span><span class="cx">
</span><span class="cx"> Ref<HTMLTableCaptionElement> HTMLTableElement::createCaption()
</span><span class="cx"> {
</span><del>- if (HTMLTableCaptionElement* existingCaption = caption())
</del><ins>+ if (auto* existingCaption = caption())
</ins><span class="cx"> return *existingCaption;
</span><del>- Ref<HTMLTableCaptionElement> caption = HTMLTableCaptionElement::create(captionTag, document());
- setCaption(caption.copyRef(), IGNORE_EXCEPTION);
</del><ins>+ auto caption = HTMLTableCaptionElement::create(captionTag, document());
+ setCaption(caption.copyRef());
</ins><span class="cx"> return caption;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -201,17 +210,15 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<HTMLElement> HTMLTableElement::insertRow(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<HTMLElement>> HTMLTableElement::insertRow(int index)
</ins><span class="cx"> {
</span><del>- if (index < -1) {
- ec = INDEX_SIZE_ERR;
- return 0;
- }
</del><ins>+ if (index < -1)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> Ref<HTMLTableElement> protectedThis(*this);
</span><span class="cx">
</span><del>- RefPtr<HTMLTableRowElement> lastRow = 0;
- RefPtr<HTMLTableRowElement> row = 0;
</del><ins>+ RefPtr<HTMLTableRowElement> lastRow;
+ RefPtr<HTMLTableRowElement> row;
</ins><span class="cx"> if (index == -1)
</span><span class="cx"> lastRow = HTMLTableRowsCollection::lastRow(*this);
</span><span class="cx"> else {
</span><span class="lines">@@ -218,10 +225,8 @@
</span><span class="cx"> for (int i = 0; i <= index; ++i) {
</span><span class="cx"> row = HTMLTableRowsCollection::rowAfter(*this, lastRow.get());
</span><span class="cx"> if (!row) {
</span><del>- if (i != index) {
- ec = INDEX_SIZE_ERR;
- return 0;
- }
</del><ins>+ if (i != index)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> lastRow = row;
</span><span class="lines">@@ -236,24 +241,31 @@
</span><span class="cx"> if (!parent) {
</span><span class="cx"> auto newBody = HTMLTableSectionElement::create(tbodyTag, document());
</span><span class="cx"> auto newRow = HTMLTableRowElement::create(document());
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> newBody->appendChild(newRow, ec);
</span><ins>+ // FIXME: Why ignore the exception if the first appendChild failed?
</ins><span class="cx"> appendChild(newBody, ec);
</span><del>- return WTFMove(newRow);
</del><ins>+ if (ec)
+ return Exception { ec };
+ return Ref<HTMLElement> { WTFMove(newRow) };
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto newRow = HTMLTableRowElement::create(document());
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> parent->insertBefore(newRow, row.get(), ec);
</span><del>- return WTFMove(newRow);
</del><ins>+ if (ec)
+ return Exception { ec };
+ return Ref<HTMLElement> { WTFMove(newRow) };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableElement::deleteRow(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableElement::deleteRow(int index)
</ins><span class="cx"> {
</span><span class="cx"> HTMLTableRowElement* row = nullptr;
</span><span class="cx"> if (index == -1) {
</span><span class="cx"> row = HTMLTableRowsCollection::lastRow(*this);
</span><span class="cx"> if (!row)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> } else {
</span><span class="cx"> for (int i = 0; i <= index; ++i) {
</span><span class="cx"> row = HTMLTableRowsCollection::rowAfter(*this, row);
</span><span class="lines">@@ -260,12 +272,10 @@
</span><span class="cx"> if (!row)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if (!row) {
- ec = INDEX_SIZE_ERR;
- return;
- }
</del><ins>+ if (!row)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> }
</span><del>- row->remove(ec);
</del><ins>+ return row->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isTableCellAncestor(const Element& element)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> static Ref<HTMLTableElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT HTMLTableCaptionElement* caption() const;
</span><del>- WEBCORE_EXPORT void setCaption(RefPtr<HTMLTableCaptionElement>&&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setCaption(RefPtr<HTMLTableCaptionElement>&&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT HTMLTableSectionElement* tHead() const;
</span><del>- WEBCORE_EXPORT void setTHead(RefPtr<HTMLTableSectionElement>&&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setTHead(RefPtr<HTMLTableSectionElement>&&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT HTMLTableSectionElement* tFoot() const;
</span><del>- WEBCORE_EXPORT void setTFoot(RefPtr<HTMLTableSectionElement>&&, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> setTFoot(RefPtr<HTMLTableSectionElement>&&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLTableSectionElement> createTHead();
</span><span class="cx"> WEBCORE_EXPORT void deleteTHead();
</span><span class="lines">@@ -55,9 +55,8 @@
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLTableSectionElement> createTBody();
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLTableCaptionElement> createCaption();
</span><span class="cx"> WEBCORE_EXPORT void deleteCaption();
</span><del>- RefPtr<HTMLElement> insertRow(ExceptionCode& ec) { return insertRow(-1, ec); }
- WEBCORE_EXPORT RefPtr<HTMLElement> insertRow(int index, ExceptionCode&);
- WEBCORE_EXPORT void deleteRow(int index, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<Ref<HTMLElement>> insertRow(int index = -1);
+ WEBCORE_EXPORT ExceptionOr<void> deleteRow(int index);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLCollection> rows();
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLCollection> tBodies();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> interface HTMLTableElement : HTMLElement {
</span><del>- [CEReactions, SetterMayThrowLegacyException] attribute HTMLTableCaptionElement? caption;
- [CEReactions, SetterMayThrowLegacyException] attribute HTMLTableSectionElement? tHead;
- [CEReactions, SetterMayThrowLegacyException] attribute HTMLTableSectionElement? tFoot;
</del><ins>+ [CEReactions, SetterMayThrowException] attribute HTMLTableCaptionElement? caption;
+ [CEReactions, SetterMayThrowException] attribute HTMLTableSectionElement? tHead;
+ [CEReactions, SetterMayThrowException] attribute HTMLTableSectionElement? tFoot;
</ins><span class="cx">
</span><span class="cx"> readonly attribute HTMLCollection rows;
</span><span class="cx"> readonly attribute HTMLCollection tBodies;
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> HTMLElement createCaption();
</span><span class="cx"> [CEReactions] void deleteCaption();
</span><span class="cx">
</span><del>- [MayThrowLegacyException] HTMLElement insertRow(optional long index = -1);
- [CEReactions, MayThrowLegacyException] void deleteRow(long index);
</del><ins>+ [MayThrowException] HTMLElement insertRow(optional long index = -1);
+ [CEReactions, MayThrowException] void deleteRow(long index);
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-HTMLTableRowElement::HTMLTableRowElement(const QualifiedName& tagName, Document& document)
</del><ins>+inline HTMLTableRowElement::HTMLTableRowElement(const QualifiedName& tagName, Document& document)
</ins><span class="cx"> : HTMLTablePartElement(tagName, document)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(trTag));
</span><span class="lines">@@ -55,21 +55,25 @@
</span><span class="cx"> return adoptRef(*new HTMLTableRowElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline HTMLTableElement* findTable(const HTMLTableRowElement& row)
+{
+ auto* parent = row.parentNode();
+ if (is<HTMLTableElement>(parent))
+ return downcast<HTMLTableElement>(parent);
+ if (is<HTMLTableSectionElement>(parent)) {
+ auto* grandparent = parent->parentNode();
+ if (is<HTMLTableElement>(grandparent))
+ return downcast<HTMLTableElement>(grandparent);
+ }
+ return nullptr;
+}
+
</ins><span class="cx"> int HTMLTableRowElement::rowIndex() const
</span><span class="cx"> {
</span><del>- auto* parent = parentNode();
- if (!parent)
</del><ins>+ auto* table = findTable(*this);
+ if (!table)
</ins><span class="cx"> return -1;
</span><span class="cx">
</span><del>- HTMLTableElement* table;
- if (is<HTMLTableElement>(*parent))
- table = downcast<HTMLTableElement>(parent);
- else {
- if (!is<HTMLTableSectionElement>(*parent) || !is<HTMLTableElement>(parent->parentNode()))
- return -1;
- table = downcast<HTMLTableElement>(parent->parentNode());
- }
-
</del><span class="cx"> auto rows = table->rows();
</span><span class="cx"> unsigned length = rows->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="lines">@@ -80,20 +84,22 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline RefPtr<HTMLCollection> findRows(const HTMLTableRowElement& row)
+{
+ auto* parent = row.parentNode();
+ if (is<HTMLTableSectionElement>(parent))
+ return downcast<HTMLTableSectionElement>(*parent).rows();
+ if (is<HTMLTableElement>(parent))
+ return downcast<HTMLTableElement>(*parent).rows();
+ return nullptr;
+}
+
</ins><span class="cx"> int HTMLTableRowElement::sectionRowIndex() const
</span><span class="cx"> {
</span><del>- auto* parent = parentNode();
- if (!parent)
</del><ins>+ auto rows = findRows(*this);
+ if (!rows)
</ins><span class="cx"> return -1;
</span><span class="cx">
</span><del>- RefPtr<HTMLCollection> rows;
- if (is<HTMLTableSectionElement>(*parent))
- rows = downcast<HTMLTableSectionElement>(*parent).rows();
- else if (is<HTMLTableElement>(*parent))
- rows = downcast<HTMLTableElement>(*parent).rows();
- else
- return -1;
-
</del><span class="cx"> unsigned length = rows->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (rows->item(i) == this)
</span><span class="lines">@@ -103,16 +109,16 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<HTMLTableCellElement> HTMLTableRowElement::insertCell(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<HTMLTableCellElement>> HTMLTableRowElement::insertCell(int index)
</ins><span class="cx"> {
</span><del>- Ref<HTMLCollection> children = cells();
</del><ins>+ if (index < -1)
+ return Exception { INDEX_SIZE_ERR };
+ auto children = cells();
</ins><span class="cx"> int numCells = children->length();
</span><del>- if (index < -1 || index > numCells) {
- ec = INDEX_SIZE_ERR;
- return nullptr;
- }
-
</del><ins>+ if (index > numCells)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> auto cell = HTMLTableCellElement::create(tdTag, document());
</span><ins>+ ExceptionCode ec = 0;
</ins><span class="cx"> if (index < 0 || index >= numCells)
</span><span class="cx"> appendChild(cell, ec);
</span><span class="cx"> else {
</span><span class="lines">@@ -123,23 +129,27 @@
</span><span class="cx"> n = children->item(index);
</span><span class="cx"> insertBefore(cell, n, ec);
</span><span class="cx"> }
</span><ins>+ if (ec)
+ return Exception { ec };
</ins><span class="cx"> return WTFMove(cell);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableRowElement::deleteCell(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableRowElement::deleteCell(int index)
</ins><span class="cx"> {
</span><del>- Ref<HTMLCollection> children = cells();
</del><ins>+ auto children = cells();
</ins><span class="cx"> int numCells = children->length();
</span><span class="cx"> if (index == -1) {
</span><span class="cx"> if (!numCells)
</span><del>- return;
-
</del><ins>+ return { };
</ins><span class="cx"> index = numCells - 1;
</span><span class="cx"> }
</span><del>- if (index >= 0 && index < numCells)
- HTMLElement::removeChild(*children->item(index), ec);
- else
- ec = INDEX_SIZE_ERR;
</del><ins>+ if (index < 0 || index >= numCells)
+ return Exception { INDEX_SIZE_ERR };
+ ExceptionCode ec = 0;
+ removeChild(*children->item(index), ec);
+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLCollection> HTMLTableRowElement::cells()
</span><span class="lines">@@ -147,9 +157,4 @@
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCachedCollection<GenericCachedHTMLCollection<CollectionTypeTraits<TRCells>::traversalType>>(*this, TRCells);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableRowElement::setCells(HTMLCollection*, ExceptionCode& ec)
-{
- ec = NO_MODIFICATION_ALLOWED_ERR;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -41,12 +41,10 @@
</span><span class="cx"> WEBCORE_EXPORT int sectionRowIndex() const;
</span><span class="cx"> void setSectionRowIndex(int);
</span><span class="cx">
</span><del>- RefPtr<HTMLTableCellElement> insertCell(ExceptionCode& ec) { return insertCell(-1, ec); }
- WEBCORE_EXPORT RefPtr<HTMLTableCellElement> insertCell(int index, ExceptionCode&);
- WEBCORE_EXPORT void deleteCell(int index, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<Ref<HTMLTableCellElement>> insertCell(int index = -1);
+ WEBCORE_EXPORT ExceptionOr<void> deleteCell(int index);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<HTMLCollection> cells();
</span><del>- void setCells(HTMLCollection *, ExceptionCode&);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLTableRowElement(const QualifiedName&, Document&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> [Reflect=char] attribute DOMString ch;
</span><span class="cx"> [Reflect=charoff] attribute DOMString chOff;
</span><span class="cx"> [Reflect] attribute DOMString vAlign;
</span><del>- [MayThrowLegacyException] HTMLElement insertCell(optional long index = -1);
- [CEReactions, MayThrowLegacyException] void deleteCell(long index);
</del><ins>+ [MayThrowException] HTMLElement insertCell(optional long index = -1);
+ [CEReactions, MayThrowException] void deleteCell(long index);
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -51,105 +51,61 @@
</span><span class="cx">
</span><span class="cx"> const StyleProperties* HTMLTableSectionElement::additionalPresentationAttributeStyle() const
</span><span class="cx"> {
</span><del>- if (HTMLTableElement* table = findParentTable())
- return table->additionalGroupStyle(true);
- return 0;
</del><ins>+ auto* table = findParentTable();
+ if (!table)
+ return nullptr;
+ return table->additionalGroupStyle(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// these functions are rather slow, since we need to get the row at
-// the index... but they aren't used during usual HTML parsing anyway
-RefPtr<HTMLElement> HTMLTableSectionElement::insertRow(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<HTMLElement>> HTMLTableSectionElement::insertRow(int index)
</ins><span class="cx"> {
</span><del>- RefPtr<HTMLTableRowElement> row;
- Ref<HTMLCollection> children = rows();
</del><ins>+ if (index < -1)
+ return Exception { INDEX_SIZE_ERR };
+ auto children = rows();
</ins><span class="cx"> int numRows = children->length();
</span><del>- if (index < -1 || index > numRows)
- ec = INDEX_SIZE_ERR; // per the DOM
</del><ins>+ if (index > numRows)
+ return Exception { INDEX_SIZE_ERR };
+ auto row = HTMLTableRowElement::create(trTag, document());
+ ExceptionCode ec = 0;
+ if (numRows == index || index == -1)
+ appendChild(row, ec);
</ins><span class="cx"> else {
</span><del>- row = HTMLTableRowElement::create(trTag, document());
- if (numRows == index || index == -1)
- appendChild(*row, ec);
- else {
- Node* n;
- if (index < 1)
- n = firstChild();
- else
- n = children->item(index);
- insertBefore(*row, n, ec);
- }
</del><ins>+ Node* n;
+ if (index < 1)
+ n = firstChild();
+ else
+ n = children->item(index);
+ insertBefore(row, n, ec);
</ins><span class="cx"> }
</span><del>- return row;
</del><ins>+ if (ec)
+ return Exception { ec };
+ return Ref<HTMLElement> { WTFMove(row) };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableSectionElement::deleteRow(int index, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTableSectionElement::deleteRow(int index)
</ins><span class="cx"> {
</span><del>- Ref<HTMLCollection> children = rows();
</del><ins>+ auto children = rows();
</ins><span class="cx"> int numRows = children->length();
</span><span class="cx"> if (index == -1) {
</span><span class="cx"> if (!numRows)
</span><del>- return;
-
</del><ins>+ return { };
</ins><span class="cx"> index = numRows - 1;
</span><span class="cx"> }
</span><del>- if (index >= 0 && index < numRows)
- HTMLElement::removeChild(*children->item(index), ec);
- else
- ec = INDEX_SIZE_ERR;
</del><ins>+ if (index < 0 || index >= numRows)
+ return Exception { INDEX_SIZE_ERR };
+ ExceptionCode ec = 0;
+ removeChild(*children->item(index), ec);
+ if (ec)
+ return Exception { ec };
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLTableSectionElement::numRows() const
</span><span class="cx"> {
</span><del>- int rows = 0;
- const Node *n = firstChild();
- while (n) {
- if (n->hasTagName(trTag))
- rows++;
- n = n->nextSibling();
- }
-
- return rows;
</del><ins>+ auto rows = childrenOfType<HTMLTableRowElement>(*this);
+ return std::distance(rows.begin(), rows.end());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& HTMLTableSectionElement::align() const
-{
- return attributeWithoutSynchronization(alignAttr);
-}
-
-void HTMLTableSectionElement::setAlign(const AtomicString& value)
-{
- setAttributeWithoutSynchronization(alignAttr, value);
-}
-
-const AtomicString& HTMLTableSectionElement::ch() const
-{
- return attributeWithoutSynchronization(charAttr);
-}
-
-void HTMLTableSectionElement::setCh(const AtomicString& value)
-{
- setAttributeWithoutSynchronization(charAttr, value);
-}
-
-const AtomicString& HTMLTableSectionElement::chOff() const
-{
- return attributeWithoutSynchronization(charoffAttr);
-}
-
-void HTMLTableSectionElement::setChOff(const AtomicString& value)
-{
- setAttributeWithoutSynchronization(charoffAttr, value);
-}
-
-const AtomicString& HTMLTableSectionElement::vAlign() const
-{
- return attributeWithoutSynchronization(valignAttr);
-}
-
-void HTMLTableSectionElement::setVAlign(const AtomicString& value)
-{
- setAttributeWithoutSynchronization(valignAttr, value);
-}
-
</del><span class="cx"> Ref<HTMLCollection> HTMLTableSectionElement::rows()
</span><span class="cx"> {
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCachedCollection<GenericCachedHTMLCollection<CollectionTypeTraits<TSectionRows>::traversalType>>(*this, TSectionRows);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -34,24 +34,11 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLTableSectionElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><del>- RefPtr<HTMLElement> insertRow(ExceptionCode& ec) { return insertRow(-1, ec); }
- WEBCORE_EXPORT RefPtr<HTMLElement> insertRow(int index, ExceptionCode&);
- WEBCORE_EXPORT void deleteRow(int index, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<Ref<HTMLElement>> insertRow(int index = -1);
+ WEBCORE_EXPORT ExceptionOr<void> deleteRow(int index);
</ins><span class="cx">
</span><span class="cx"> int numRows() const;
</span><span class="cx">
</span><del>- const AtomicString& align() const;
- void setAlign(const AtomicString&);
-
- const AtomicString& ch() const;
- void setCh(const AtomicString&);
-
- const AtomicString& chOff() const;
- void setChOff(const AtomicString&);
-
- const AtomicString& vAlign() const;
- void setVAlign(const AtomicString&);
-
</del><span class="cx"> WEBCORE_EXPORT Ref<HTMLCollection> rows();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> [Reflect=charoff] attribute DOMString chOff;
</span><span class="cx"> [Reflect] attribute DOMString vAlign;
</span><span class="cx"> readonly attribute HTMLCollection rows;
</span><del>- [MayThrowLegacyException] HTMLElement insertRow(optional long index = -1);
- [CEReactions, MayThrowLegacyException] void deleteRow(long index);
</del><ins>+ [MayThrowException] HTMLElement insertRow(optional long index = -1);
+ [CEReactions, MayThrowException] void deleteRow(long index);
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -205,21 +205,13 @@
</span><span class="cx">
</span><span class="cx"> void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><del>- if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
- setMaxLength(maxLength.value());
- else
- setMaxLength(-1);
-
</del><ins>+ internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</ins><span class="cx"> updateValidity();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextAreaElement::minLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><del>- if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
- setMinLength(minLength.value());
- else
- setMinLength(-1);
-
</del><ins>+ internalSetMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</ins><span class="cx"> updateValidity();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -563,7 +555,7 @@
</span><span class="cx"> m_placeholder = TextControlPlaceholderElement::create(document());
</span><span class="cx"> userAgentShadowRoot()->insertBefore(*m_placeholder, innerTextElement()->nextSibling());
</span><span class="cx"> }
</span><del>- m_placeholder->setInnerText(placeholderText, ASSERT_NO_EXCEPTION);
</del><ins>+ m_placeholder->setInnerText(placeholderText);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLTextAreaElement::willRespondToMouseClickEvents()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> [Reflect] attribute DOMString dirName;
</span><span class="cx"> [Reflect] attribute boolean disabled;
</span><span class="cx"> readonly attribute HTMLFormElement form;
</span><del>- [SetterMayThrowLegacyException] attribute long minLength;
- [SetterMayThrowLegacyException] attribute long maxLength;
</del><ins>+ [SetterMayThrowException] attribute long minLength;
+ [SetterMayThrowException] attribute long maxLength;
</ins><span class="cx"> [Reflect] attribute DOMString name;
</span><span class="cx"> [Reflect] attribute DOMString placeholder;
</span><span class="cx"> [Reflect] attribute boolean readOnly;
</span><span class="lines">@@ -53,19 +53,12 @@
</span><span class="cx"> attribute long selectionEnd;
</span><span class="cx"> attribute DOMString selectionDirection;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void setRangeText(DOMString replacement);
- [MayThrowLegacyException] void setRangeText(DOMString replacement,
- unsigned long start,
- unsigned long end,
- optional DOMString selectionMode);
</del><ins>+ [MayThrowException] void setRangeText(DOMString replacement);
+ [MayThrowException] void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional DOMString selectionMode);
</ins><span class="cx">
</span><del>- void setSelectionRange(optional long start = 0,
- optional long end = 0,
- optional DOMString direction);
</del><ins>+ void setSelectionRange(optional long start = 0, optional long end = 0, optional DOMString direction);
</ins><span class="cx">
</span><span class="cx"> [Conditional=IOS_AUTOCORRECT_AND_AUTOCAPITALIZE] attribute boolean autocorrect;
</span><del>-
</del><span class="cx"> [Conditional=IOS_AUTOCORRECT_AND_AUTOCAPITALIZE, TreatNullAs=EmptyString] attribute DOMString autocapitalize;
</span><del>-
</del><span class="cx"> attribute DOMString autocomplete;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -213,17 +213,15 @@
</span><span class="cx"> setChangedSinceLastFormControlChangeEvent(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::setRangeText(const String& replacement, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTextFormControlElement::setRangeText(const String& replacement)
</ins><span class="cx"> {
</span><del>- setRangeText(replacement, selectionStart(), selectionEnd(), String(), ec);
</del><ins>+ return setRangeText(replacement, selectionStart(), selectionEnd(), String());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTextFormControlElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode)
</ins><span class="cx"> {
</span><del>- if (start > end) {
- ec = INDEX_SIZE_ERR;
- return;
- }
</del><ins>+ if (start > end)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> String text = innerTextValue();
</span><span class="cx"> unsigned textLength = text.length();
</span><span class="lines">@@ -243,7 +241,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: What should happen to the value (as in value()) if there's no renderer?
</span><span class="cx"> if (!renderer())
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> subtreeHasChanged();
</span><span class="cx">
</span><span class="lines">@@ -270,6 +268,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setSelectionRange(newSelectionStart, newSelectionEnd, SelectionHasNoDirection);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextFormControlElement::setSelectionRange(int start, int end, const String& directionString, const AXTextStateChangeIntent& intent)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> cache->postNotification(this, AXObjectCache::AXValueChanged, TargetObservableParent);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- innerText->setInnerText(value, ASSERT_NO_EXCEPTION);
</del><ins>+ innerText->setInnerText(value);
</ins><span class="cx">
</span><span class="cx"> if (value.endsWith('\n') || value.endsWith('\r'))
</span><span class="cx"> innerText->appendChild(HTMLBRElement::create(document()), ASSERT_NO_EXCEPTION);
</span><span class="lines">@@ -761,20 +761,20 @@
</span><span class="cx"> return "ltr";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::setMaxLength(int maxLength, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTextFormControlElement::setMaxLength(int maxLength)
</ins><span class="cx"> {
</span><span class="cx"> if (maxLength < 0 || (m_minLength >= 0 && maxLength < m_minLength))
</span><del>- ec = INDEX_SIZE_ERR;
- else
- setIntegralAttribute(maxlengthAttr, maxLength);
</del><ins>+ return Exception { INDEX_SIZE_ERR };
+ setIntegralAttribute(maxlengthAttr, maxLength);
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::setMinLength(int minLength, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLTextFormControlElement::setMinLength(int minLength)
</ins><span class="cx"> {
</span><span class="cx"> if (minLength < 0 || (m_maxLength >= 0 && minLength > m_maxLength))
</span><del>- ec = INDEX_SIZE_ERR;
- else
- setIntegralAttribute(minlengthAttr, minLength);
</del><ins>+ return Exception { INDEX_SIZE_ERR };
+ setIntegralAttribute(minlengthAttr, minLength);
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextFormControlElement::adjustInnerTextStyle(const RenderStyle& parentStyle, RenderStyle& textBlockStyle) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLTextFormControlElement_h
-#define HTMLTextFormControlElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "HTMLFormControlElementWithState.h"
</span><span class="cx">
</span><span class="lines">@@ -48,12 +47,10 @@
</span><span class="cx"> void didEditInnerTextValue();
</span><span class="cx"> void forwardEvent(Event&);
</span><span class="cx">
</span><del>- long maxLength() const { return m_maxLength; }
- WEBCORE_EXPORT void setMaxLength(int, ExceptionCode&);
- void setMaxLength(int maxLength) { m_maxLength = maxLength; }
- long minLength() const { return m_minLength; }
- void setMinLength(int, ExceptionCode&);
- void setMinLength(int minLength) { m_minLength = minLength; }
</del><ins>+ int maxLength() const { return m_maxLength; }
+ WEBCORE_EXPORT ExceptionOr<void> setMaxLength(int);
+ int minLength() const { return m_minLength; }
+ ExceptionOr<void> setMinLength(int);
</ins><span class="cx">
</span><span class="cx"> InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><span class="cx">
</span><span class="lines">@@ -73,8 +70,8 @@
</span><span class="cx"> WEBCORE_EXPORT void setSelectionEnd(int);
</span><span class="cx"> WEBCORE_EXPORT void setSelectionDirection(const String&);
</span><span class="cx"> WEBCORE_EXPORT void select(const AXTextStateChangeIntent& = AXTextStateChangeIntent());
</span><del>- WEBCORE_EXPORT virtual void setRangeText(const String& replacement, ExceptionCode&);
- WEBCORE_EXPORT virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT virtual ExceptionOr<void> setRangeText(const String& replacement);
+ WEBCORE_EXPORT virtual ExceptionOr<void> setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode);
</ins><span class="cx"> void setSelectionRange(int start, int end, const String& direction, const AXTextStateChangeIntent& = AXTextStateChangeIntent());
</span><span class="cx"> WEBCORE_EXPORT void setSelectionRange(int start, int end, TextFieldSelectionDirection = SelectionHasNoDirection, const AXTextStateChangeIntent& = AXTextStateChangeIntent());
</span><span class="cx"> PassRefPtr<Range> selection() const;
</span><span class="lines">@@ -129,6 +126,9 @@
</span><span class="cx">
</span><span class="cx"> void adjustInnerTextStyle(const RenderStyle& parentStyle, RenderStyle& textBlockStyle) const;
</span><span class="cx">
</span><ins>+ void internalSetMaxLength(int maxLength) { m_maxLength = maxLength; }
+ void internalSetMinLength(int minLength) { m_minLength = minLength; }
+
</ins><span class="cx"> private:
</span><span class="cx"> TextFieldSelectionDirection cachedSelectionDirection() const { return static_cast<TextFieldSelectionDirection>(m_cachedSelectionDirection); }
</span><span class="cx">
</span><span class="lines">@@ -172,5 +172,3 @@
</span><span class="cx"> static bool isType(const WebCore::Element& element) { return element.isTextFormControl(); }
</span><span class="cx"> static bool isType(const WebCore::Node& node) { return is<WebCore::Element>(node) && isType(downcast<WebCore::Element>(node)); }
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,9 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(VIDEO_TRACK)
</del><span class="cx"> #include "HTMLTrackElement.h"
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
+
</ins><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="lines">@@ -61,8 +62,10 @@
</span><span class="cx">
</span><span class="cx"> HTMLTrackElement::~HTMLTrackElement()
</span><span class="cx"> {
</span><del>- if (m_track)
</del><ins>+ if (m_track) {
+ m_track->clearElement();
</ins><span class="cx"> m_track->clearClient();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLTrackElement> HTMLTrackElement::create(const QualifiedName& tagName, Document& document)
</span><span class="lines">@@ -72,23 +75,23 @@
</span><span class="cx">
</span><span class="cx"> Node::InsertionNotificationRequest HTMLTrackElement::insertedInto(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><ins>+ HTMLElement::insertedInto(insertionPoint);
+
+ if (is<HTMLMediaElement>(insertionPoint))
+ downcast<HTMLMediaElement>(insertionPoint).didAddTextTrack(*this);
+
</ins><span class="cx"> // Since we've moved to a new parent, we may now be able to load.
</span><span class="cx"> scheduleLoad();
</span><span class="cx">
</span><del>- HTMLElement::insertedInto(insertionPoint);
- HTMLMediaElement* parent = mediaElement();
- if (&insertionPoint == parent) {
- ensureTrack();
- parent->didAddTextTrack(this);
- }
</del><span class="cx"> return InsertionDone;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::removedFrom(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><del>- if (!parentNode() && is<HTMLMediaElement>(insertionPoint))
- downcast<HTMLMediaElement>(insertionPoint).didRemoveTextTrack(this);
</del><span class="cx"> HTMLElement::removedFrom(insertionPoint);
</span><ins>+
+ if (is<HTMLMediaElement>(insertionPoint))
+ downcast<HTMLMediaElement>(insertionPoint).didRemoveTextTrack(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="lines">@@ -102,13 +105,13 @@
</span><span class="cx"> // 4.8.10.12.3 Sourcing out-of-band text tracks
</span><span class="cx"> // As the kind, label, and srclang attributes are set, changed, or removed, the text track must update accordingly...
</span><span class="cx"> } else if (name == kindAttr)
</span><del>- ensureTrack().setKindKeywordIgnoringASCIICase(value.string());
</del><ins>+ track().setKindKeywordIgnoringASCIICase(value.string());
</ins><span class="cx"> else if (name == labelAttr)
</span><del>- ensureTrack().setLabel(value);
</del><ins>+ track().setLabel(value);
</ins><span class="cx"> else if (name == srclangAttr)
</span><del>- ensureTrack().setLanguage(value);
</del><ins>+ track().setLanguage(value);
</ins><span class="cx"> else if (name == defaultAttr)
</span><del>- ensureTrack().setIsDefault(!value.isNull());
</del><ins>+ track().setIsDefault(!value.isNull());
</ins><span class="cx">
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="lines">@@ -115,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& HTMLTrackElement::kind()
</span><span class="cx"> {
</span><del>- return ensureTrack().kindKeyword();
</del><ins>+ return track().kindKeyword();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::setKind(const AtomicString& kind)
</span><span class="lines">@@ -138,25 +141,22 @@
</span><span class="cx"> return hasAttributeWithoutSynchronization(defaultAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LoadableTextTrack& HTMLTrackElement::ensureTrack()
</del><ins>+LoadableTextTrack& HTMLTrackElement::track()
</ins><span class="cx"> {
</span><ins>+ // FIXME: There is no practical value in lazily initializing this.
+ // Instead this should be created in the constructor.
</ins><span class="cx"> if (!m_track) {
</span><span class="cx"> // The kind attribute is an enumerated attribute, limited only to known values. It defaults to 'subtitles' if missing or invalid.
</span><span class="cx"> String kind = attributeWithoutSynchronization(kindAttr).convertToASCIILowercase();
</span><span class="cx"> if (!TextTrack::isValidKindKeyword(kind))
</span><span class="cx"> kind = TextTrack::subtitlesKeyword();
</span><del>- m_track = LoadableTextTrack::create(this, kind, label(), srclang());
- } else
- m_track->setTrackElement(this);
</del><ins>+ m_track = LoadableTextTrack::create(*this, kind, label(), srclang());
+ }
+ ASSERT(m_track->trackElement() == this);
</ins><span class="cx">
</span><span class="cx"> return *m_track;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextTrack* HTMLTrackElement::track()
-{
- return &ensureTrack();
-}
-
</del><span class="cx"> bool HTMLTrackElement::isURLAttribute(const Attribute& attribute) const
</span><span class="cx"> {
</span><span class="cx"> return attribute.name() == srcAttr || HTMLElement::isURLAttribute(attribute);
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 2. If the text track's text track mode is not set to one of hidden or showing, abort these steps.
</span><del>- if (ensureTrack().mode() != TextTrack::Mode::Hidden && ensureTrack().mode() != TextTrack::Mode::Showing)
</del><ins>+ if (track().mode() != TextTrack::Mode::Hidden && track().mode() != TextTrack::Mode::Showing)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 3. If the text track's track element does not have a media element as a parent, abort these steps.
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ensureTrack().scheduleLoad(url);
</del><ins>+ track().scheduleLoad(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLTrackElement::canLoadURL(const URL& url)
</span><span class="lines">@@ -262,14 +262,14 @@
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::setReadyState(ReadyState state)
</span><span class="cx"> {
</span><del>- ensureTrack().setReadinessState(static_cast<TextTrack::ReadinessState>(state));
</del><ins>+ track().setReadinessState(static_cast<TextTrack::ReadinessState>(state));
</ins><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackReadyStateChanged(m_track.get());
</del><ins>+ parent->textTrackReadyStateChanged(m_track.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTrackElement::ReadyState HTMLTrackElement::readyState()
</span><span class="cx"> {
</span><del>- return static_cast<ReadyState>(ensureTrack().readinessState());
</del><ins>+ return static_cast<ReadyState>(track().readinessState());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& HTMLTrackElement::mediaElementCrossOriginAttribute() const
</span><span class="lines">@@ -276,7 +276,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><span class="cx"> return parent->attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
</span><del>-
</del><span class="cx"> return nullAtom;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -283,7 +282,7 @@
</span><span class="cx"> void HTMLTrackElement::textTrackKindChanged(TextTrack* track)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackKindChanged(track);
</del><ins>+ parent->textTrackKindChanged(track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::textTrackModeChanged(TextTrack* track)
</span><span class="lines">@@ -293,40 +292,39 @@
</span><span class="cx"> scheduleLoad();
</span><span class="cx">
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackModeChanged(track);
</del><ins>+ parent->textTrackModeChanged(track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::textTrackAddCues(TextTrack* track, const TextTrackCueList* cues)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackAddCues(track, cues);
</del><ins>+ parent->textTrackAddCues(track, cues);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::textTrackRemoveCues(TextTrack* track, const TextTrackCueList* cues)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackRemoveCues(track, cues);
</del><ins>+ parent->textTrackRemoveCues(track, cues);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::textTrackAddCue(TextTrack* track, TextTrackCue& cue)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackAddCue(track, cue);
</del><ins>+ parent->textTrackAddCue(track, cue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTrackElement::textTrackRemoveCue(TextTrack* track, TextTrackCue& cue)
</span><span class="cx"> {
</span><span class="cx"> if (HTMLMediaElement* parent = mediaElement())
</span><del>- return parent->textTrackRemoveCue(track, cue);
</del><ins>+ parent->textTrackRemoveCue(track, cue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement* HTMLTrackElement::mediaElement() const
</span><span class="cx"> {
</span><del>- Element* parent = parentElement();
- if (is<HTMLMediaElement>(parent))
- return downcast<HTMLMediaElement>(parentNode());
-
- return nullptr;
</del><ins>+ auto* parent = parentElement();
+ if (!is<HTMLMediaElement>(parent))
+ return nullptr;
+ return downcast<HTMLMediaElement>(parent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> ReadyState readyState();
</span><span class="cx"> void setReadyState(ReadyState);
</span><span class="cx">
</span><del>- TextTrack* track();
</del><ins>+ LoadableTextTrack& track();
</ins><span class="cx">
</span><span class="cx"> void scheduleLoad();
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> void textTrackAddCue(TextTrack*, TextTrackCue&) final;
</span><span class="cx"> void textTrackRemoveCue(TextTrack*, TextTrackCue&) final;
</span><span class="cx">
</span><del>- LoadableTextTrack& ensureTrack();
</del><span class="cx"> bool canLoadURL(const URL&);
</span><span class="cx">
</span><span class="cx"> RefPtr<LoadableTextTrack> m_track;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -295,19 +295,18 @@
</span><span class="cx"> return player()->nativeImageForCurrentTime();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLVideoElement::webkitEnterFullscreen(ExceptionCode& ec)
</del><ins>+ExceptionOr<void> HTMLVideoElement::webkitEnterFullscreen()
</ins><span class="cx"> {
</span><span class="cx"> if (isFullscreen())
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> // Generate an exception if this isn't called in response to a user gesture, or if the
</span><span class="cx"> // element does not support fullscreen.
</span><del>- if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard))
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> enterFullscreen();
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLVideoElement::webkitExitFullscreen()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -42,17 +42,12 @@
</span><span class="cx"> WEBCORE_EXPORT unsigned videoWidth() const;
</span><span class="cx"> WEBCORE_EXPORT unsigned videoHeight() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void webkitEnterFullscreen(ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> webkitEnterFullscreen();
</ins><span class="cx"> WEBCORE_EXPORT void webkitExitFullscreen();
</span><span class="cx"> WEBCORE_EXPORT bool webkitSupportsFullscreen();
</span><span class="cx"> WEBCORE_EXPORT bool webkitDisplayingFullscreen();
</span><span class="cx">
</span><span class="cx"> void ancestorWillEnterFullscreen() final;
</span><del>-
- // FIXME: Maintain "FullScreen" capitalization scheme for backwards compatibility.
- // https://bugs.webkit.org/show_bug.cgi?id=36081
- void webkitEnterFullScreen(ExceptionCode& ec) { webkitEnterFullscreen(ec); }
- void webkitExitFullScreen() { webkitExitFullscreen(); }
</del><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> bool webkitWirelessVideoPlaybackDisabled() const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -37,12 +37,13 @@
</span><span class="cx"> readonly attribute boolean webkitSupportsFullscreen;
</span><span class="cx"> readonly attribute boolean webkitDisplayingFullscreen;
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void webkitEnterFullscreen();
</del><ins>+ [MayThrowException] void webkitEnterFullscreen();
</ins><span class="cx"> void webkitExitFullscreen();
</span><span class="cx">
</span><del>- // Note the different capitalization of the "S" in FullScreen.
- [MayThrowLegacyException] void webkitEnterFullScreen();
- void webkitExitFullScreen();
</del><ins>+ // Maintain "FullScreen" capitalization scheme for backwards compatibility.
+ // https://bugs.webkit.org/show_bug.cgi?id=36081
+ [ImplementedAs=webkitEnterFullscreen, MayThrowException] void webkitEnterFullScreen();
+ [ImplementedAs=webkitExitFullscreen] void webkitExitFullScreen();
</ins><span class="cx">
</span><span class="cx"> [Conditional=WIRELESS_PLAYBACK_TARGET] attribute boolean webkitWirelessVideoPlaybackDisabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageData.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageData.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/ImageData.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -36,20 +36,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<ImageData> ImageData::create(unsigned sw, unsigned sh, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<ImageData>> ImageData::create(unsigned sw, unsigned sh)
</ins><span class="cx"> {
</span><del>- if (!sw || !sh) {
- ec = INDEX_SIZE_ERR;
- return nullptr;
- }
</del><ins>+ if (!sw || !sh)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> Checked<int, RecordOverflow> dataSize = 4;
</span><span class="cx"> dataSize *= sw;
</span><span class="cx"> dataSize *= sh;
</span><del>- if (dataSize.hasOverflowed()) {
- ec = TypeError;
- return nullptr;
- }
</del><ins>+ if (dataSize.hasOverflowed())
+ return Exception { TypeError }; // FIXME: Seems a peculiar choice of exception here.
</ins><span class="cx">
</span><span class="cx"> IntSize size(sw, sh);
</span><span class="cx"> auto data = adoptRef(*new ImageData(size));
</span><span class="lines">@@ -76,37 +72,28 @@
</span><span class="cx"> if (dataSize.hasOverflowed())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (dataSize.unsafeGet() < 0
- || static_cast<unsigned>(dataSize.unsafeGet()) > byteArray->length())
</del><ins>+ if (dataSize.unsafeGet() < 0 || static_cast<unsigned>(dataSize.unsafeGet()) > byteArray->length())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return adoptRef(*new ImageData(size, WTFMove(byteArray)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<ImageData> ImageData::create(Ref<Uint8ClampedArray>&& byteArray, unsigned sw, unsigned sh, ExceptionCode& ec)
</del><ins>+ExceptionOr<RefPtr<ImageData>> ImageData::create(Ref<Uint8ClampedArray>&& byteArray, unsigned sw, unsigned sh)
</ins><span class="cx"> {
</span><span class="cx"> unsigned length = byteArray->length();
</span><del>- if (!length || length % 4 != 0) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (!length || length % 4 != 0)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><del>- if (!sw) {
- ec = INDEX_SIZE_ERR;
- return nullptr;
- }
</del><ins>+ if (!sw)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> length /= 4;
</span><del>- if (length % sw != 0) {
- ec = INVALID_STATE_ERR;
- return nullptr;
- }
</del><ins>+ if (length % sw != 0)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> unsigned height = length / sw;
</span><del>- if (sh && sh != height) {
- ec = INDEX_SIZE_ERR;
- return nullptr;
- }
</del><ins>+ if (sh && sh != height)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx">
</span><span class="cx"> return create(IntSize(sw, height), WTFMove(byteArray));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageData.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageData.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/ImageData.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,13 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ImageData_h
-#define ImageData_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include <runtime/Uint8ClampedArray.h>
</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">@@ -40,10 +38,10 @@
</span><span class="cx">
</span><span class="cx"> class ImageData : public RefCounted<ImageData> {
</span><span class="cx"> public:
</span><del>- static RefPtr<ImageData> create(unsigned sw, unsigned sh, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<ImageData>> create(unsigned sw, unsigned sh);
</ins><span class="cx"> static RefPtr<ImageData> create(const IntSize&);
</span><span class="cx"> static RefPtr<ImageData> create(const IntSize&, Ref<Uint8ClampedArray>&&);
</span><del>- static RefPtr<ImageData> create(Ref<Uint8ClampedArray>&&, unsigned sw, unsigned sh, ExceptionCode&);
</del><ins>+ static ExceptionOr<RefPtr<ImageData>> create(Ref<Uint8ClampedArray>&&, unsigned sw, unsigned sh);
</ins><span class="cx">
</span><span class="cx"> IntSize size() const { return m_size; }
</span><span class="cx"> int width() const { return m_size.width(); }
</span><span class="lines">@@ -60,5 +58,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ImageData_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDataidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageData.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageData.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/ImageData.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> [
</span><span class="cx"> Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh = 0),
</span><span class="cx"> Constructor(unsigned long sw, unsigned long sh),
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
</ins><span class="cx"> CustomToJSObject,
</span><span class="cx"> Exposed=(Window,Worker),
</span><span class="cx"> ImplementationLacksVTable,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/InputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -227,9 +227,9 @@
</span><span class="cx"> return DateComponents::invalidMilliseconds();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InputType::setValueAsDate(double, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> InputType::setValueAsDate(double) const
</ins><span class="cx"> {
</span><del>- ec = INVALID_STATE_ERR;
</del><ins>+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double InputType::valueAsDouble() const
</span><span class="lines">@@ -237,14 +237,14 @@
</span><span class="cx"> return std::numeric_limits<double>::quiet_NaN();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InputType::setValueAsDouble(double doubleValue, TextFieldEventBehavior eventBehavior, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> InputType::setValueAsDouble(double doubleValue, TextFieldEventBehavior eventBehavior) const
</ins><span class="cx"> {
</span><del>- setValueAsDecimal(Decimal::fromDouble(doubleValue), eventBehavior, ec);
</del><ins>+ return setValueAsDecimal(Decimal::fromDouble(doubleValue), eventBehavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InputType::setValueAsDecimal(const Decimal&, TextFieldEventBehavior, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> InputType::setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const
</ins><span class="cx"> {
</span><del>- ec = INVALID_STATE_ERR;
</del><ins>+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InputType::supportsValidation() const
</span><span class="lines">@@ -988,30 +988,22 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InputType::applyStep(int count, AnyStepHandling anyStepHandling, TextFieldEventBehavior eventBehavior, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> InputType::applyStep(int count, AnyStepHandling anyStepHandling, TextFieldEventBehavior eventBehavior)
</ins><span class="cx"> {
</span><span class="cx"> StepRange stepRange(createStepRange(anyStepHandling));
</span><del>- if (!stepRange.hasStep()) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!stepRange.hasStep())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> const Decimal current = parseToNumberOrNaN(element().value());
</span><del>- if (!current.isFinite()) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!current.isFinite())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> Decimal newValue = current + stepRange.step() * count;
</span><del>- if (!newValue.isFinite()) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (!newValue.isFinite())
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx">
</span><span class="cx"> const Decimal acceptableErrorValue = stepRange.acceptableError();
</span><del>- if (newValue - stepRange.minimum() < -acceptableErrorValue) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (newValue - stepRange.minimum() < -acceptableErrorValue)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> if (newValue < stepRange.minimum())
</span><span class="cx"> newValue = stepRange.minimum();
</span><span class="cx">
</span><span class="lines">@@ -1018,17 +1010,19 @@
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(element().attributeWithoutSynchronization(stepAttr), "any"))
</span><span class="cx"> newValue = stepRange.alignValueForStep(current, newValue);
</span><span class="cx">
</span><del>- if (newValue - stepRange.maximum() > acceptableErrorValue) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (newValue - stepRange.maximum() > acceptableErrorValue)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> if (newValue > stepRange.maximum())
</span><span class="cx"> newValue = stepRange.maximum();
</span><span class="cx">
</span><del>- setValueAsDecimal(newValue, eventBehavior, ec);
</del><ins>+ auto result = setValueAsDecimal(newValue, eventBehavior);
+ if (result.hasException())
+ return result;
</ins><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = element().document().existingAXObjectCache())
</span><span class="cx"> cache->postNotification(&element(), AXObjectCache::AXValueChanged);
</span><ins>+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InputType::getAllowedValueStep(Decimal* step) const
</span><span class="lines">@@ -1044,13 +1038,11 @@
</span><span class="cx"> return StepRange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InputType::stepUp(int n, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> InputType::stepUp(int n)
</ins><span class="cx"> {
</span><del>- if (!isSteppable()) {
- ec = INVALID_STATE_ERR;
- return;
- }
- applyStep(n, RejectAny, DispatchNoEvent, ec);
</del><ins>+ if (!isSteppable())
+ return Exception { INVALID_STATE_ERR };
+ return applyStep(n, RejectAny, DispatchNoEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InputType::stepUpFromRenderer(int n)
</span><span class="lines">@@ -1124,10 +1116,10 @@
</span><span class="cx"> current = stepRange.minimum() - nextDiff;
</span><span class="cx"> if (current > stepRange.maximum() - nextDiff)
</span><span class="cx"> current = stepRange.maximum() - nextDiff;
</span><del>- setValueAsDecimal(current, DispatchNoEvent, IGNORE_EXCEPTION);
</del><ins>+ setValueAsDecimal(current, DispatchNoEvent);
</ins><span class="cx"> }
</span><span class="cx"> if ((sign > 0 && current < stepRange.minimum()) || (sign < 0 && current > stepRange.maximum()))
</span><del>- setValueAsDecimal(sign > 0 ? stepRange.minimum() : stepRange.maximum(), DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
</del><ins>+ setValueAsDecimal(sign > 0 ? stepRange.minimum() : stepRange.maximum(), DispatchInputAndChangeEvent);
</ins><span class="cx"> else {
</span><span class="cx"> if (stepMismatch(element().value())) {
</span><span class="cx"> ASSERT(!step.isZero());
</span><span class="lines">@@ -1145,13 +1137,13 @@
</span><span class="cx"> if (newValue > stepRange.maximum())
</span><span class="cx"> newValue = stepRange.maximum();
</span><span class="cx">
</span><del>- setValueAsDecimal(newValue, n == 1 || n == -1 ? DispatchInputAndChangeEvent : DispatchNoEvent, IGNORE_EXCEPTION);
</del><ins>+ setValueAsDecimal(newValue, n == 1 || n == -1 ? DispatchInputAndChangeEvent : DispatchNoEvent);
</ins><span class="cx"> if (n > 1)
</span><del>- applyStep(n - 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
</del><ins>+ applyStep(n - 1, AnyIsDefaultStep, DispatchInputAndChangeEvent);
</ins><span class="cx"> else if (n < -1)
</span><del>- applyStep(n + 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
</del><ins>+ applyStep(n + 1, AnyIsDefaultStep, DispatchInputAndChangeEvent);
</ins><span class="cx"> } else
</span><del>- applyStep(n, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
</del><ins>+ applyStep(n, AnyIsDefaultStep, DispatchInputAndChangeEvent);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/InputType.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -30,8 +30,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 InputType_h
-#define InputType_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "HTMLTextFormControlElement.h"
</span><span class="cx"> #include "RenderPtr.h"
</span><span class="lines">@@ -131,10 +130,10 @@
</span><span class="cx"> virtual String fallbackValue() const; // Checked last, if both internal storage and value attribute are missing.
</span><span class="cx"> virtual String defaultValue() const; // Checked after even fallbackValue, only when the valueWithDefault function is called.
</span><span class="cx"> virtual double valueAsDate() const;
</span><del>- virtual void setValueAsDate(double, ExceptionCode&) const;
</del><ins>+ virtual ExceptionOr<void> setValueAsDate(double) const;
</ins><span class="cx"> virtual double valueAsDouble() const;
</span><del>- virtual void setValueAsDouble(double, TextFieldEventBehavior, ExceptionCode&) const;
- virtual void setValueAsDecimal(const Decimal&, TextFieldEventBehavior, ExceptionCode&) const;
</del><ins>+ virtual ExceptionOr<void> setValueAsDouble(double, TextFieldEventBehavior) const;
+ virtual ExceptionOr<void> setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const;
</ins><span class="cx">
</span><span class="cx"> // Validation functions.
</span><span class="cx">
</span><span class="lines">@@ -157,7 +156,7 @@
</span><span class="cx"> bool stepMismatch(const String&) const;
</span><span class="cx"> virtual bool getAllowedValueStep(Decimal*) const;
</span><span class="cx"> virtual StepRange createStepRange(AnyStepHandling) const;
</span><del>- virtual void stepUp(int, ExceptionCode&);
</del><ins>+ virtual ExceptionOr<void> stepUp(int);
</ins><span class="cx"> virtual void stepUpFromRenderer(int);
</span><span class="cx"> virtual String badInputText() const;
</span><span class="cx"> virtual String typeMismatchText() const;
</span><span class="lines">@@ -318,7 +317,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // Helper for stepUp()/stepDown(). Adds step value * count to the current value.
</span><del>- void applyStep(int count, AnyStepHandling, TextFieldEventBehavior, ExceptionCode&);
</del><ins>+ ExceptionOr<void> applyStep(int count, AnyStepHandling, TextFieldEventBehavior);
</ins><span class="cx">
</span><span class="cx"> // Raw pointer because the HTMLInputElement object owns this InputType object.
</span><span class="cx"> HTMLInputElement& m_element;
</span><span class="lines">@@ -325,5 +324,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/MediaController.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -65,25 +65,23 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaController::addMediaElement(HTMLMediaElement* element)
</del><ins>+void MediaController::addMediaElement(HTMLMediaElement& element)
</ins><span class="cx"> {
</span><del>- ASSERT(element);
- ASSERT(!m_mediaElements.contains(element));
</del><ins>+ ASSERT(!m_mediaElements.contains(&element));
</ins><span class="cx">
</span><del>- m_mediaElements.append(element);
</del><ins>+ m_mediaElements.append(&element);
</ins><span class="cx"> bringElementUpToSpeed(element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaController::removeMediaElement(HTMLMediaElement* element)
</del><ins>+void MediaController::removeMediaElement(HTMLMediaElement& element)
</ins><span class="cx"> {
</span><del>- ASSERT(element);
- ASSERT(m_mediaElements.contains(element));
- m_mediaElements.remove(m_mediaElements.find(element));
</del><ins>+ ASSERT(m_mediaElements.contains(&element));
+ m_mediaElements.remove(m_mediaElements.find(&element));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaController::containsMediaElement(HTMLMediaElement* element) const
</del><ins>+bool MediaController::containsMediaElement(HTMLMediaElement& element) const
</ins><span class="cx"> {
</span><del>- return m_mediaElements.contains(element);
</del><ins>+ return m_mediaElements.contains(&element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<TimeRanges> MediaController::buffered() const
</span><span class="lines">@@ -250,18 +248,16 @@
</span><span class="cx"> scheduleEvent(eventNames().ratechangeEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaController::setVolume(double level, ExceptionCode& code)
</del><ins>+ExceptionOr<void> MediaController::setVolume(double level)
</ins><span class="cx"> {
</span><span class="cx"> if (m_volume == level)
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><span class="cx"> // If the new value is outside the range 0.0 to 1.0 inclusive, then, on setting, an
</span><span class="cx"> // IndexSizeError exception must be raised instead.
</span><del>- if (level < 0 || level > 1) {
- code = INDEX_SIZE_ERR;
- return;
- }
-
</del><ins>+ if (!(level >= 0 && level <= 1))
+ return Exception { INDEX_SIZE_ERR };
+
</ins><span class="cx"> // The volume attribute, on setting, if the new value is in the range 0.0 to 1.0 inclusive,
</span><span class="cx"> // must set the MediaController's media controller volume multiplier to the new value
</span><span class="cx"> m_volume = level;
</span><span class="lines">@@ -271,6 +267,8 @@
</span><span class="cx">
</span><span class="cx"> for (auto& mediaElement : m_mediaElements)
</span><span class="cx"> mediaElement->updateVolume();
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaController::setMuted(bool flag)
</span><span class="lines">@@ -477,15 +475,14 @@
</span><span class="cx"> mediaElement->updatePlayState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaController::bringElementUpToSpeed(HTMLMediaElement* element)
</del><ins>+void MediaController::bringElementUpToSpeed(HTMLMediaElement& element)
</ins><span class="cx"> {
</span><del>- ASSERT(element);
- ASSERT(m_mediaElements.contains(element));
</del><ins>+ ASSERT(m_mediaElements.contains(&element));
</ins><span class="cx">
</span><span class="cx"> // When the user agent is to bring a media element up to speed with its new media controller,
</span><span class="cx"> // it must seek that media element to the MediaController's media controller position relative
</span><span class="cx"> // to the media element's timeline.
</span><del>- element->seekInternal(MediaTime::createWithDouble(currentTime()));
</del><ins>+ element.seekInternal(MediaTime::createWithDouble(currentTime()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaController::isBlocked() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/MediaController.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -23,8 +23,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 MediaController_h
-#define MediaController_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><span class="lines">@@ -32,7 +31,6 @@
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "MediaControllerInterface.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#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">@@ -39,8 +37,6 @@
</span><span class="cx">
</span><span class="cx"> class Clock;
</span><span class="cx"> class HTMLMediaElement;
</span><del>-class Event;
-class ScriptExecutionContext;
</del><span class="cx">
</span><span class="cx"> class MediaController final : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
</span><span class="cx"> public:
</span><span class="lines">@@ -47,80 +43,44 @@
</span><span class="cx"> static Ref<MediaController> create(ScriptExecutionContext&);
</span><span class="cx"> virtual ~MediaController();
</span><span class="cx">
</span><del>- void addMediaElement(HTMLMediaElement*);
- void removeMediaElement(HTMLMediaElement*);
- bool containsMediaElement(HTMLMediaElement*) const;
</del><ins>+ Ref<TimeRanges> buffered() const final;
+ Ref<TimeRanges> seekable() const final;
+ Ref<TimeRanges> played() final;
</ins><span class="cx">
</span><del>- const String& mediaGroup() const { return m_mediaGroup; }
-
- Ref<TimeRanges> buffered() const override;
- Ref<TimeRanges> seekable() const override;
- Ref<TimeRanges> played() override;
-
- double duration() const override;
- double currentTime() const override;
- void setCurrentTime(double) override;
-
- bool paused() const override { return m_paused; }
- void play() override;
- void pause() override;
</del><ins>+ double duration() const final;
+ double currentTime() const final;
+ void setCurrentTime(double) final;
+
+ bool paused() const final { return m_paused; }
+ void play() final;
+ void pause() final;
</ins><span class="cx"> void unpause();
</span><ins>+
+ double defaultPlaybackRate() const final { return m_defaultPlaybackRate; }
+ void setDefaultPlaybackRate(double) final;
</ins><span class="cx">
</span><del>- double defaultPlaybackRate() const override { return m_defaultPlaybackRate; }
- void setDefaultPlaybackRate(double) override;
-
- double playbackRate() const override;
- void setPlaybackRate(double) override;
-
- double volume() const override { return m_volume; }
- void setVolume(double, ExceptionCode&) override;
-
- bool muted() const override { return m_muted; }
- void setMuted(bool) override;
-
- ReadyState readyState() const override { return m_readyState; }
</del><ins>+ double playbackRate() const final;
+ void setPlaybackRate(double) final;
</ins><span class="cx">
</span><del>- enum PlaybackState { WAITING, PLAYING, ENDED };
- const AtomicString& playbackState() const;
</del><ins>+ double volume() const final { return m_volume; }
+ ExceptionOr<void> setVolume(double) final;
</ins><span class="cx">
</span><del>- bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override { return false; }
- bool isFullscreen() const override { return false; }
- void enterFullscreen() override { }
</del><ins>+ bool muted() const final { return m_muted; }
+ void setMuted(bool) final;
</ins><span class="cx">
</span><del>- bool hasAudio() const override;
- bool hasVideo() const override;
- bool hasClosedCaptions() const override;
- void setClosedCaptionsVisible(bool) override;
- bool closedCaptionsVisible() const override { return m_closedCaptionsVisible; }
-
- bool supportsScanning() const override;
-
- void beginScrubbing() override;
- void endScrubbing() override;
- void beginScanning(ScanDirection) override;
- void endScanning() override;
-
- bool canPlay() const override;
-
- bool isLiveStream() const override;
-
- bool hasCurrentSrc() const override;
-
- void returnToRealtime() override;
</del><ins>+ const AtomicString& playbackState() const;
</ins><span class="cx">
</span><del>- bool isBlocked() const;
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><del>- // EventTarget
- using RefCounted<MediaController>::ref;
- using RefCounted<MediaController>::deref;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit MediaController(ScriptExecutionContext&);
</span><ins>+
</ins><span class="cx"> void reportControllerState();
</span><span class="cx"> void updateReadyState();
</span><span class="cx"> void updatePlaybackState();
</span><span class="cx"> void updateMediaElements();
</span><del>- void bringElementUpToSpeed(HTMLMediaElement*);
</del><ins>+ void bringElementUpToSpeed(HTMLMediaElement&);
</ins><span class="cx"> void scheduleEvent(const AtomicString& eventName);
</span><span class="cx"> void asyncEventTimerFired();
</span><span class="cx"> void clearPositionTimerFired();
</span><span class="lines">@@ -128,14 +88,47 @@
</span><span class="cx"> void scheduleTimeupdateEvent();
</span><span class="cx"> void startTimeupdateTimer();
</span><span class="cx">
</span><del>- // EventTarget
- void refEventTarget() override { ref(); }
- void derefEventTarget() override { deref(); }
- EventTargetInterface eventTargetInterface() const override { return MediaControllerEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const override { return &m_scriptExecutionContext; };
</del><ins>+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
+ EventTargetInterface eventTargetInterface() const final { return MediaControllerEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final { return &m_scriptExecutionContext; };
</ins><span class="cx">
</span><ins>+ void addMediaElement(HTMLMediaElement&);
+ void removeMediaElement(HTMLMediaElement&);
+ bool containsMediaElement(HTMLMediaElement&) const;
+
+ const String& mediaGroup() const { return m_mediaGroup; }
+
+ bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const final { return false; }
+ bool isFullscreen() const final { return false; }
+ void enterFullscreen() final { }
+
+ bool hasAudio() const final;
+ bool hasVideo() const final;
+ bool hasClosedCaptions() const final;
+ void setClosedCaptionsVisible(bool) final;
+ bool closedCaptionsVisible() const final { return m_closedCaptionsVisible; }
+
+ bool supportsScanning() const final;
+ void beginScrubbing() final;
+ void endScrubbing() final;
+ void beginScanning(ScanDirection) final;
+ void endScanning() final;
+
+ bool canPlay() const final;
+ bool isLiveStream() const final;
+ bool hasCurrentSrc() const final;
+ bool isBlocked() const;
+
+ void returnToRealtime() final;
+
+ ReadyState readyState() const final { return m_readyState; }
+
+ enum PlaybackState { WAITING, PLAYING, ENDED };
+
</ins><span class="cx"> friend class HTMLMediaElement;
</span><span class="cx"> friend class MediaControllerEventListener;
</span><ins>+
</ins><span class="cx"> Vector<HTMLMediaElement*> m_mediaElements;
</span><span class="cx"> bool m_paused;
</span><span class="cx"> double m_defaultPlaybackRate;
</span><span class="lines">@@ -159,4 +152,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControlleridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/MediaController.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -44,6 +44,6 @@
</span><span class="cx"> attribute unrestricted double defaultPlaybackRate;
</span><span class="cx"> attribute unrestricted double playbackRate;
</span><span class="cx">
</span><del>- [SetterMayThrowLegacyException] attribute unrestricted double volume;
</del><ins>+ [SetterMayThrowException] attribute unrestricted double volume;
</ins><span class="cx"> attribute boolean muted;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaControllerInterface.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaControllerInterface.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/MediaControllerInterface.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -23,11 +23,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 MediaControllerInterface_h
-#define MediaControllerInterface_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "HTMLMediaElementEnums.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx">
</span><span class="cx"> class TimeRanges;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><span class="cx"> class MediaControllerInterface : public HTMLMediaElementEnums {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaControllerInterface() { };
</span><span class="lines">@@ -60,7 +58,7 @@
</span><span class="cx"> virtual void setPlaybackRate(double) = 0;
</span><span class="cx">
</span><span class="cx"> virtual double volume() const = 0;
</span><del>- virtual void setVolume(double, ExceptionCode&) = 0;
</del><ins>+ virtual ExceptionOr<void> setVolume(double) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool muted() const = 0;
</span><span class="cx"> virtual void setMuted(bool) = 0;
</span><span class="lines">@@ -84,10 +82,7 @@
</span><span class="cx"> virtual void beginScrubbing() = 0;
</span><span class="cx"> virtual void endScrubbing() = 0;
</span><span class="cx">
</span><del>- enum ScanDirection {
- Backward,
- Forward,
- };
</del><ins>+ enum ScanDirection { Backward, Forward };
</ins><span class="cx"> virtual void beginScanning(ScanDirection) = 0;
</span><span class="cx"> virtual void endScanning() = 0;
</span><span class="cx">
</span><span class="lines">@@ -103,4 +98,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlNumberInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/NumberInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/NumberInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/NumberInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -57,17 +57,12 @@
</span><span class="cx"> unsigned sizeBeforeDecimalPoint;
</span><span class="cx"> unsigned sizeAfteDecimalPoint;
</span><span class="cx">
</span><del>- RealNumberRenderSize(unsigned before, unsigned after)
- : sizeBeforeDecimalPoint(before)
- , sizeAfteDecimalPoint(after)
- {
- }
-
</del><span class="cx"> RealNumberRenderSize max(const RealNumberRenderSize& other) const
</span><span class="cx"> {
</span><del>- return RealNumberRenderSize(
</del><ins>+ return {
</ins><span class="cx"> std::max(sizeBeforeDecimalPoint, other.sizeBeforeDecimalPoint),
</span><del>- std::max(sizeAfteDecimalPoint, other.sizeAfteDecimalPoint));
</del><ins>+ std::max(sizeAfteDecimalPoint, other.sizeAfteDecimalPoint)
+ };
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -78,18 +73,18 @@
</span><span class="cx"> const unsigned sizeOfSign = value.isNegative() ? 1 : 0;
</span><span class="cx"> const int exponent = value.exponent();
</span><span class="cx"> if (exponent >= 0)
</span><del>- return RealNumberRenderSize(sizeOfSign + sizeOfDigits, 0);
</del><ins>+ return { sizeOfSign + sizeOfDigits, 0 };
</ins><span class="cx">
</span><span class="cx"> const int sizeBeforeDecimalPoint = exponent + sizeOfDigits;
</span><span class="cx"> if (sizeBeforeDecimalPoint > 0) {
</span><span class="cx"> // In case of "123.456"
</span><del>- return RealNumberRenderSize(sizeOfSign + sizeBeforeDecimalPoint, sizeOfDigits - sizeBeforeDecimalPoint);
</del><ins>+ return { sizeOfSign + sizeBeforeDecimalPoint, sizeOfDigits - sizeBeforeDecimalPoint };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // In case of "0.00012345"
</span><span class="cx"> const unsigned sizeOfZero = 1;
</span><span class="cx"> const unsigned numberOfZeroAfterDecimalPoint = -sizeBeforeDecimalPoint;
</span><del>- return RealNumberRenderSize(sizeOfSign + sizeOfZero , numberOfZeroAfterDecimalPoint + sizeOfDigits);
</del><ins>+ return { sizeOfSign + sizeOfZero , numberOfZeroAfterDecimalPoint + sizeOfDigits };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& NumberInputType::formControlType() const
</span><span class="lines">@@ -109,34 +104,24 @@
</span><span class="cx"> return parseToDoubleForNumberType(element().value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NumberInputType::setValueAsDouble(double newValue, TextFieldEventBehavior eventBehavior, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> NumberInputType::setValueAsDouble(double newValue, TextFieldEventBehavior eventBehavior) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should use numeric_limits<double>::max for number input type.
</span><span class="cx"> const double floatMax = std::numeric_limits<float>::max();
</span><del>- if (newValue < -floatMax) {
- ec = INVALID_STATE_ERR;
- return;
- }
- if (newValue > floatMax) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (newValue < -floatMax || newValue > floatMax)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> element().setValue(serializeForNumberType(newValue), eventBehavior);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NumberInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior, ExceptionCode& ec) const
</del><ins>+ExceptionOr<void> NumberInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should use numeric_limits<double>::max for number input type.
</span><span class="cx"> const Decimal floatMax = Decimal::fromDouble(std::numeric_limits<float>::max());
</span><del>- if (newValue < -floatMax) {
- ec = INVALID_STATE_ERR;
- return;
- }
- if (newValue > floatMax) {
- ec = INVALID_STATE_ERR;
- return;
- }
</del><ins>+ if (newValue < -floatMax || newValue > floatMax)
+ return Exception { INVALID_STATE_ERR };
</ins><span class="cx"> element().setValue(serializeForNumberType(newValue), eventBehavior);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NumberInputType::typeMismatchFor(const String& value) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlNumberInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/NumberInputType.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/NumberInputType.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/NumberInputType.h 2016-10-29 02:32:20 UTC (rev 208096)
</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 NumberInputType_h
-#define NumberInputType_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "TextFieldInputType.h"
</span><span class="cx">
</span><span class="lines">@@ -40,32 +39,30 @@
</span><span class="cx"> explicit NumberInputType(HTMLInputElement& element) : TextFieldInputType(element) { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- const AtomicString& formControlType() const override;
- void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override;
- double valueAsDouble() const override;
- void setValueAsDouble(double, TextFieldEventBehavior, ExceptionCode&) const override;
- void setValueAsDecimal(const Decimal&, TextFieldEventBehavior, ExceptionCode&) const override;
- bool typeMismatchFor(const String&) const override;
- bool typeMismatch() const override;
- bool sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const override;
- float decorationWidth() const override;
- bool isSteppable() const override;
- StepRange createStepRange(AnyStepHandling) const override;
- void handleKeydownEvent(KeyboardEvent&) override;
- Decimal parseToNumber(const String&, const Decimal&) const override;
- String serialize(const Decimal&) const override;
- String localizeValue(const String&) const override;
- String visibleValue() const override;
- String convertFromVisibleValue(const String&) const override;
- String sanitizeValue(const String&) const override;
- bool hasBadInput() const override;
- String badInputText() const override;
- bool supportsPlaceholder() const override;
- bool isNumberField() const override;
- void minOrMaxAttributeChanged() override;
- void stepAttributeChanged() override;
</del><ins>+ const AtomicString& formControlType() const final;
+ void setValue(const String&, bool valueChanged, TextFieldEventBehavior) final;
+ double valueAsDouble() const final;
+ ExceptionOr<void> setValueAsDouble(double, TextFieldEventBehavior) const final;
+ ExceptionOr<void> setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const final;
+ bool typeMismatchFor(const String&) const final;
+ bool typeMismatch() const final;
+ bool sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const final;
+ float decorationWidth() const final;
+ bool isSteppable() const final;
+ StepRange createStepRange(AnyStepHandling) const final;
+ void handleKeydownEvent(KeyboardEvent&) final;
+ Decimal parseToNumber(const String&, const Decimal&) const final;
+ String serialize(const Decimal&) const final;
+ String localizeValue(const String&) const final;
+ String visibleValue() const final;
+ String convertFromVisibleValue(const String&) const final;
+ String sanitizeValue(const String&) const final;
+ bool hasBadInput() const final;
+ String badInputText() const final;
+ bool supportsPlaceholder() const final;
+ bool isNumberField() const final;
+ void minOrMaxAttributeChanged() final;
+ void stepAttributeChanged() final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // NumberInputType_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlRangeInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RangeInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RangeInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/RangeInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -77,9 +77,6 @@
</span><span class="cx">
</span><span class="cx"> RangeInputType::RangeInputType(HTMLInputElement& element)
</span><span class="cx"> : InputType(element)
</span><del>-#if ENABLE(DATALIST_ELEMENT)
- , m_tickMarkValuesDirty(true)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,9 +95,10 @@
</span><span class="cx"> return parseToDoubleForNumberType(element().value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RangeInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior, ExceptionCode&) const
</del><ins>+ExceptionOr<void> RangeInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior) const
</ins><span class="cx"> {
</span><span class="cx"> element().setValue(serialize(newValue), eventBehavior);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RangeInputType::typeMismatchFor(const String& value) const
</span><span class="lines">@@ -241,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> if (newValue != current) {
</span><span class="cx"> EventQueueScope scope;
</span><del>- setValueAsDecimal(newValue, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
</del><ins>+ setValueAsDecimal(newValue, DispatchInputAndChangeEvent);
</ins><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = element().document().existingAXObjectCache())
</span><span class="cx"> cache->postNotification(&element(), AXObjectCache::AXValueChanged);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRangeInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RangeInputType.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RangeInputType.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/RangeInputType.h 2016-10-29 02:32:20 UTC (rev 208096)
</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 RangeInputType_h
-#define RangeInputType_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "InputType.h"
</span><span class="cx">
</span><span class="lines">@@ -42,56 +41,53 @@
</span><span class="cx"> explicit RangeInputType(HTMLInputElement&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool isRangeControl() const override;
- const AtomicString& formControlType() const override;
- double valueAsDouble() const override;
- void setValueAsDecimal(const Decimal&, TextFieldEventBehavior, ExceptionCode&) const override;
- bool typeMismatchFor(const String&) const override;
- bool supportsRequired() const override;
- StepRange createStepRange(AnyStepHandling) const override;
- bool isSteppable() const override;
</del><ins>+ bool isRangeControl() const final;
+ const AtomicString& formControlType() const final;
+ double valueAsDouble() const final;
+ ExceptionOr<void> setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const final;
+ bool typeMismatchFor(const String&) const final;
+ bool supportsRequired() const final;
+ StepRange createStepRange(AnyStepHandling) const final;
+ bool isSteppable() const final;
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>- void handleMouseDownEvent(MouseEvent&) override;
</del><ins>+ void handleMouseDownEvent(MouseEvent&) final;
</ins><span class="cx"> #endif
</span><del>- void handleKeydownEvent(KeyboardEvent&) override;
- RenderPtr<RenderElement> createInputRenderer(RenderStyle&&) override;
- void createShadowSubtree() override;
- Decimal parseToNumber(const String&, const Decimal&) const override;
- String serialize(const Decimal&) const override;
- void accessKeyAction(bool sendMouseEvents) override;
- void minOrMaxAttributeChanged() override;
- void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override;
- String fallbackValue() const override;
- String sanitizeValue(const String& proposedValue) const override;
- bool shouldRespectListAttribute() override;
- HTMLElement* sliderThumbElement() const override;
- HTMLElement* sliderTrackElement() const override;
</del><ins>+ void handleKeydownEvent(KeyboardEvent&) final;
+ RenderPtr<RenderElement> createInputRenderer(RenderStyle&&) final;
+ void createShadowSubtree() final;
+ Decimal parseToNumber(const String&, const Decimal&) const final;
+ String serialize(const Decimal&) const final;
+ void accessKeyAction(bool sendMouseEvents) final;
+ void minOrMaxAttributeChanged() final;
+ void setValue(const String&, bool valueChanged, TextFieldEventBehavior) final;
+ String fallbackValue() const final;
+ String sanitizeValue(const String& proposedValue) const final;
+ bool shouldRespectListAttribute() final;
+ HTMLElement* sliderThumbElement() const final;
+ HTMLElement* sliderTrackElement() const final;
</ins><span class="cx">
</span><span class="cx"> SliderThumbElement& typedSliderThumbElement() const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><del>- void listAttributeTargetChanged() override;
</del><ins>+ void listAttributeTargetChanged() final;
</ins><span class="cx"> void updateTickMarkValues();
</span><del>- Optional<Decimal> findClosestTickMarkValue(const Decimal&) override;
</del><ins>+ Optional<Decimal> findClosestTickMarkValue(const Decimal&) final;
</ins><span class="cx">
</span><del>- bool m_tickMarkValuesDirty;
</del><ins>+ bool m_tickMarkValuesDirty { true };
</ins><span class="cx"> Vector<Decimal> m_tickMarkValues;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- void handleTouchEvent(TouchEvent&) override;
</del><ins>+ void handleTouchEvent(TouchEvent&) final;
+#endif
</ins><span class="cx">
</span><del>-#if PLATFORM(IOS)
- void disabledAttributeChanged() override;
-#else
-#if ENABLE(TOUCH_SLIDER)
- bool hasTouchEventHandler() const override;
</del><ins>+#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
+ void disabledAttributeChanged() final;
</ins><span class="cx"> #endif
</span><del>-#endif // PLATFORM(IOS)
-#endif // ENABLE(TOUCH_EVENTS)
</del><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS) && ENABLE(TOUCH_SLIDER)
+ bool hasTouchEventHandler() const final;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // RangeInputType_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> m_placeholder = TextControlPlaceholderElement::create(element().document());
</span><span class="cx"> element().userAgentShadowRoot()->insertBefore(*m_placeholder, m_container ? m_container.get() : innerTextElement(), ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span><del>- m_placeholder->setInnerText(placeholderText, ASSERT_NO_EXCEPTION);
</del><ins>+ m_placeholder->setInnerText(placeholderText);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextFieldInputType::appendFormData(FormDataList& list, bool multipart) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTimeRangescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TimeRanges.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TimeRanges.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/TimeRanges.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,11 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "TimeRanges.h"
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "ExceptionCodePlaceholder.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,27 +59,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double TimeRanges::start(unsigned index, ExceptionCode& ec) const
</del><ins>+ExceptionOr<double> TimeRanges::start(unsigned index) const
</ins><span class="cx"> {
</span><span class="cx"> bool valid;
</span><span class="cx"> MediaTime result = m_ranges.start(index, valid);
</span><del>-
- if (!valid) {
- ec = INDEX_SIZE_ERR;
- return 0;
- }
</del><ins>+ if (!valid)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> return result.toDouble();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double TimeRanges::end(unsigned index, ExceptionCode& ec) const
</del><ins>+ExceptionOr<double> TimeRanges::end(unsigned index) const
</ins><span class="cx"> {
</span><span class="cx"> bool valid;
</span><span class="cx"> MediaTime result = m_ranges.end(index, valid);
</span><del>-
- if (!valid) {
- ec = INDEX_SIZE_ERR;
- return 0;
- }
</del><ins>+ if (!valid)
+ return Exception { INDEX_SIZE_ERR };
</ins><span class="cx"> return result.toDouble();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTimeRangesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TimeRanges.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TimeRanges.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/TimeRanges.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -23,17 +23,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 TimeRanges_h
-#define TimeRanges_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "PlatformTimeRanges.h"
</span><del>-#include <algorithm>
-#include <wtf/RefCounted.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
-
</del><span class="cx"> class TimeRanges : public RefCounted<TimeRanges> {
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static Ref<TimeRanges> create();
</span><span class="lines">@@ -40,8 +36,8 @@
</span><span class="cx"> WEBCORE_EXPORT static Ref<TimeRanges> create(double start, double end);
</span><span class="cx"> static Ref<TimeRanges> create(const PlatformTimeRanges&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT double start(unsigned index, ExceptionCode&) const;
- WEBCORE_EXPORT double end(unsigned index, ExceptionCode&) const;
</del><ins>+ WEBCORE_EXPORT ExceptionOr<double> start(unsigned index) const;
+ WEBCORE_EXPORT ExceptionOr<double> end(unsigned index) const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<TimeRanges> copy() const;
</span><span class="cx"> void invert();
</span><span class="lines">@@ -61,14 +57,11 @@
</span><span class="cx"> PlatformTimeRanges& ranges() { return m_ranges; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WEBCORE_EXPORT explicit TimeRanges();
</del><ins>+ WEBCORE_EXPORT TimeRanges();
</ins><span class="cx"> WEBCORE_EXPORT TimeRanges(double start, double end);
</span><del>- TimeRanges(const PlatformTimeRanges&);
</del><ins>+ explicit TimeRanges(const PlatformTimeRanges&);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> PlatformTimeRanges m_ranges;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlTimeRangesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TimeRanges.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TimeRanges.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/TimeRanges.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -25,11 +25,10 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=VIDEO,
</span><ins>+ ExportMacro=WEBCORE_EXPORT,
</ins><span class="cx"> ImplementationLacksVTable,
</span><del>- ExportMacro=WEBCORE_EXPORT,
</del><span class="cx"> ] interface TimeRanges {
</span><span class="cx"> readonly attribute unsigned long length;
</span><del>- [MayThrowLegacyException] unrestricted double start(unsigned long index);
- [MayThrowLegacyException] unrestricted double end(unsigned long index);
</del><ins>+ [MayThrowException] unrestricted double start(unsigned long index);
+ [MayThrowException] unrestricted double end(unsigned long index);
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlURLUtilsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLUtils.idl (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLUtils.idl 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/URLUtils.idl 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [NoInterfaceObject] interface URLUtils {
</span><del>- [SetterMayThrowLegacyException, URL] attribute USVString href;
</del><ins>+ [SetterMayThrowException, URL] attribute USVString href;
</ins><span class="cx">
</span><span class="cx"> [NotEnumerable] DOMString toString();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlValidationMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ValidationMessage.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ValidationMessage.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/ValidationMessage.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> if (i < lines.size() - 1)
</span><span class="cx"> m_messageBody->appendChild(HTMLBRElement::create(document), ASSERT_NO_EXCEPTION);
</span><span class="cx"> } else
</span><del>- m_messageHeading->setInnerText(lines[i], ASSERT_NO_EXCEPTION);
</del><ins>+ m_messageHeading->setInnerText(lines[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int magnification = document.page() ? document.page()->settings().validationMessageTimerMagnification() : -1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!m_framesetOk)
</span><span class="cx"> return;
</span><del>- m_tree.openElements().bodyElement().remove(ASSERT_NO_EXCEPTION);
</del><ins>+ m_tree.openElements().bodyElement().remove();
</ins><span class="cx"> m_tree.openElements().popUntil(m_tree.openElements().bodyElement());
</span><span class="cx"> m_tree.openElements().popHTMLBodyElement();
</span><span class="cx"> ASSERT(&m_tree.openElements().top() == &m_tree.openElements().htmlElement());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementTypescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> double volume = value().toDouble();
</span><span class="cx"> if (volume != mediaController()->volume())
</span><del>- mediaController()->setVolume(volume, ASSERT_NO_EXCEPTION);
</del><ins>+ mediaController()->setVolume(volume);
</ins><span class="cx"> if (m_clearMutedOnUserInteraction)
</span><span class="cx"> mediaController()->setMuted(false);
</span><span class="cx"> event.setDefaultHandled();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX);
</span><span class="cx">
</span><del>- classList().add("dragged", IGNORE_EXCEPTION);
</del><ins>+ classList().add("dragged");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaControlPanelElement::resetPosition()
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> removeInlineStyleProperty(CSSPropertyMarginLeft);
</span><span class="cx"> removeInlineStyleProperty(CSSPropertyMarginTop);
</span><span class="cx">
</span><del>- classList().remove("dragged", IGNORE_EXCEPTION);
</del><ins>+ classList().remove("dragged");
</ins><span class="cx">
</span><span class="cx"> m_cumulativeDragOffset.setX(0);
</span><span class="cx"> m_cumulativeDragOffset.setY(0);
</span><span class="lines">@@ -388,13 +388,13 @@
</span><span class="cx">
</span><span class="cx"> switch (m_stateBeingDisplayed) {
</span><span class="cx"> case Nothing:
</span><del>- setInnerText(emptyString(), IGNORE_EXCEPTION);
</del><ins>+ setInnerText(emptyString());
</ins><span class="cx"> break;
</span><span class="cx"> case Loading:
</span><del>- setInnerText(mediaElementLoadingStateText(), IGNORE_EXCEPTION);
</del><ins>+ setInnerText(mediaElementLoadingStateText());
</ins><span class="cx"> break;
</span><span class="cx"> case LiveBroadcast:
</span><del>- setInnerText(mediaElementLiveBroadcastStateText(), IGNORE_EXCEPTION);
</del><ins>+ setInnerText(mediaElementLiveBroadcastStateText());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -759,24 +759,24 @@
</span><span class="cx">
</span><span class="cx"> if (textTrack == TextTrack::captionMenuAutomaticItem()) {
</span><span class="cx"> if (displayMode == CaptionUserPreferences::Automatic)
</span><del>- trackItem->classList().add(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ trackItem->classList().add(selectedClassValue);
</ins><span class="cx"> else
</span><del>- trackItem->classList().remove(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ trackItem->classList().remove(selectedClassValue);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (displayMode != CaptionUserPreferences::Automatic && textTrack->mode() == TextTrack::Mode::Showing) {
</span><span class="cx"> trackMenuItemSelected = true;
</span><del>- trackItem->classList().add(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ trackItem->classList().add(selectedClassValue);
</ins><span class="cx"> } else
</span><del>- trackItem->classList().remove(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ trackItem->classList().remove(selectedClassValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (offMenuItem) {
</span><span class="cx"> if (displayMode == CaptionUserPreferences::ForcedOnly && !trackMenuItemSelected)
</span><del>- offMenuItem->classList().add(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ offMenuItem->classList().add(selectedClassValue);
</ins><span class="cx"> else
</span><del>- offMenuItem->classList().remove(selectedClassValue, ASSERT_NO_EXCEPTION);
</del><ins>+ offMenuItem->classList().remove(selectedClassValue);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -990,8 +990,7 @@
</span><span class="cx"> void MediaControlFullscreenVolumeMinButtonElement::defaultEventHandler(Event& event)
</span><span class="cx"> {
</span><span class="cx"> if (event.type() == eventNames().clickEvent) {
</span><del>- ExceptionCode code = 0;
- mediaController()->setVolume(0, code);
</del><ins>+ mediaController()->setVolume(0);
</ins><span class="cx"> event.setDefaultHandled();
</span><span class="cx"> }
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="lines">@@ -1016,8 +1015,7 @@
</span><span class="cx"> void MediaControlFullscreenVolumeMaxButtonElement::defaultEventHandler(Event& event)
</span><span class="cx"> {
</span><span class="cx"> if (event.type() == eventNames().clickEvent) {
</span><del>- ExceptionCode code = 0;
- mediaController()->setVolume(1, code);
</del><ins>+ mediaController()->setVolume(1);
</ins><span class="cx"> event.setDefaultHandled();
</span><span class="cx"> }
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsTime(now), IGNORE_EXCEPTION);
</del><ins>+ m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsTime(now));
</ins><span class="cx"> m_currentTimeDisplay->setCurrentValue(now);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsApplecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -380,9 +380,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Allow the theme to format the time.
</span><del>- m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
</del><ins>+ m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsCurrentTime(now, duration));
</ins><span class="cx"> m_currentTimeDisplay->setCurrentValue(now);
</span><del>- m_timeRemainingDisplay->setInnerText(page->theme().formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
</del><ins>+ m_timeRemainingDisplay->setInnerText(page->theme().formatMediaControlsRemainingTime(now, duration));
</ins><span class="cx"> m_timeRemainingDisplay->setCurrentValue(now - duration);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -37,24 +37,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track, const String& kind, const String& label, const String& language)
- : TextTrack(&track->document(), track, kind, emptyString(), label, language, TrackElement)
- , m_trackElement(track)
</del><ins>+LoadableTextTrack::LoadableTextTrack(HTMLTrackElement& track, const String& kind, const String& label, const String& language)
+ : TextTrack(&track.document(), &track, kind, emptyString(), label, language, TrackElement)
+ , m_trackElement(&track)
</ins><span class="cx"> , m_loadTimer(*this, &LoadableTextTrack::loadTimerFired)
</span><span class="cx"> , m_isDefault(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LoadableTextTrack::~LoadableTextTrack()
-{
-}
-
-void LoadableTextTrack::clearClient()
-{
- m_trackElement = 0;
- TextTrack::clearClient();
-}
-
</del><span class="cx"> void LoadableTextTrack::scheduleLoad(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> if (url == m_url)
</span><span class="lines">@@ -75,12 +65,6 @@
</span><span class="cx"> {
</span><span class="cx"> return m_trackElement;
</span><span class="cx"> }
</span><del>-
-void LoadableTextTrack::setTrackElement(HTMLTrackElement* element)
-{
- ASSERT(!m_trackElement || m_trackElement == element);
- m_trackElement = element;
-}
</del><span class="cx">
</span><span class="cx"> void LoadableTextTrack::loadTimerFired()
</span><span class="cx"> {
</span><span class="lines">@@ -144,9 +128,9 @@
</span><span class="cx">
</span><span class="cx"> AtomicString LoadableTextTrack::id() const
</span><span class="cx"> {
</span><del>- if (m_trackElement)
- return m_trackElement->getAttribute("id");
- return emptyString();
</del><ins>+ if (!m_trackElement)
+ return emptyAtom;
+ return m_trackElement->attributeWithoutSynchronization(idAttr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t LoadableTextTrack::trackElementIndex()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -23,8 +23,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 LoadableTextTrack_h
-#define LoadableTextTrack_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="lines">@@ -39,34 +38,30 @@
</span><span class="cx">
</span><span class="cx"> class LoadableTextTrack final : public TextTrack, private TextTrackLoaderClient {
</span><span class="cx"> public:
</span><del>- static Ref<LoadableTextTrack> create(HTMLTrackElement* track, const String& kind, const String& label, const String& language)
</del><ins>+ static Ref<LoadableTextTrack> create(HTMLTrackElement& track, const String& kind, const String& label, const String& language)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new LoadableTextTrack(track, kind, label, language));
</span><span class="cx"> }
</span><del>- virtual ~LoadableTextTrack();
</del><span class="cx">
</span><span class="cx"> void scheduleLoad(const URL&);
</span><span class="cx">
</span><del>- void clearClient() override;
-
- AtomicString id() const override;
-
</del><span class="cx"> size_t trackElementIndex();
</span><del>- HTMLTrackElement* trackElement() { return m_trackElement; }
- void setTrackElement(HTMLTrackElement*);
- Element* element() override;
</del><ins>+ HTMLTrackElement* trackElement() const { return m_trackElement; }
+ void clearElement() { m_trackElement = nullptr; }
</ins><span class="cx">
</span><del>- bool isDefault() const override { return m_isDefault; }
- void setIsDefault(bool isDefault) override { m_isDefault = isDefault; }
</del><ins>+ void setIsDefault(bool isDefault) final { m_isDefault = isDefault; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- // TextTrackLoaderClient
- void newCuesAvailable(TextTrackLoader*) override;
- void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
- void newRegionsAvailable(TextTrackLoader*) override;
</del><ins>+ LoadableTextTrack(HTMLTrackElement&, const String& kind, const String& label, const String& language);
</ins><span class="cx">
</span><del>- LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);
</del><ins>+ void newCuesAvailable(TextTrackLoader*) final;
+ void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) final;
+ void newRegionsAvailable(TextTrackLoader*) final;
</ins><span class="cx">
</span><ins>+ AtomicString id() const final;
+ bool isDefault() const final { return m_isDefault; }
+ Element* element() final;
+
</ins><span class="cx"> void loadTimerFired();
</span><span class="cx">
</span><span class="cx"> HTMLTrackElement* m_trackElement;
</span><span class="lines">@@ -75,6 +70,7 @@
</span><span class="cx"> URL m_url;
</span><span class="cx"> bool m_isDefault;
</span><span class="cx"> };
</span><ins>+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::LoadableTextTrack)
</span><span class="lines">@@ -82,5 +78,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><del>-
-#endif // LoadableTextTrack_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We should set m_cue in VTTCueBox to nullptr instead.
</span><span class="cx"> if (m_displayTree && m_displayTree->document().refCount())
</span><del>- m_displayTree->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ m_displayTree->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VTTCue::initialize(ScriptExecutionContext& context)
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx">
</span><span class="cx"> if (!hasDisplayTree())
</span><span class="cx"> return;
</span><del>- displayTreeInternal().remove(ASSERT_NO_EXCEPTION);
</del><ins>+ displayTreeInternal().remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::pair<double, double> VTTCue::getPositionCoordinates() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTRegion.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/html/track/VTTRegion.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx">
</span><span class="cx"> // If it's a scrolling region, add the scrolling class.
</span><span class="cx"> if (isScrollingRegion())
</span><del>- m_cueContainer->classList().add(textTrackCueContainerScrollingClass(), IGNORE_EXCEPTION);
</del><ins>+ m_cueContainer->classList().add(textTrackCueContainerScrollingClass());
</ins><span class="cx">
</span><span class="cx"> float regionBottom = m_regionDisplayTree->getBoundingClientRect()->bottom();
</span><span class="cx">
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> double boxHeight = box->getBoundingClientRect()->bottom() - box->getBoundingClientRect()->top();
</span><span class="cx">
</span><del>- m_cueContainer->classList().remove(textTrackCueContainerScrollingClass(), IGNORE_EXCEPTION);
</del><ins>+ m_cueContainer->classList().remove(textTrackCueContainerScrollingClass());
</ins><span class="cx">
</span><span class="cx"> m_currentTop += boxHeight;
</span><span class="cx"> m_cueContainer->setInlineStyleProperty(CSSPropertyTop, m_currentTop, CSSPrimitiveValue::CSS_PX);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -2172,17 +2172,21 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::pushNodeByBackendIdToFrontend(ErrorString& errorString, BackendNodeId backendNodeId, int* nodeId)
</span><span class="cx"> {
</span><del>- if (!m_backendIdToNode.contains(backendNodeId)) {
</del><ins>+ auto iterator = m_backendIdToNode.find(backendNodeId);
+ if (iterator == m_backendIdToNode.end()) {
</ins><span class="cx"> errorString = ASCIILiteral("No node with given backend id found");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Node* node = m_backendIdToNode.get(backendNodeId).first;
- String nodeGroup = m_backendIdToNode.get(backendNodeId).second;
</del><ins>+ Node* node = iterator->value.first;
+ String nodeGroup = iterator->value.second;
+
</ins><span class="cx"> *nodeId = pushNodePathToFrontend(node);
</span><span class="cx">
</span><del>- if (nodeGroup == "") {
- m_backendIdToNode.remove(backendNodeId);
</del><ins>+ if (nodeGroup.isEmpty()) {
+ m_backendIdToNode.remove(iterator);
+ // FIXME: We really do the following only when nodeGroup is the empty string? Seems wrong.
+ ASSERT(m_nodeGroupToBackendIdMap.contains(nodeGroup));
</ins><span class="cx"> m_nodeGroupToBackendIdMap.find(nodeGroup)->value.remove(node);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2189,16 +2193,16 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
</span><span class="cx"> {
</span><del>- Frame* frame = node->document().frame();
</del><ins>+ auto* frame = node->document().frame();
</ins><span class="cx"> if (!frame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- JSC::ExecState* scriptState = mainWorldExecState(frame);
- InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(scriptState);
</del><ins>+ auto& state = *mainWorldExecState(frame);
+ auto injectedScript = m_injectedScriptManager.injectedScriptFor(&state);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- return injectedScript.wrapObject(nodeAsScriptValue(*scriptState, node), objectGroup);
</del><ins>+ return injectedScript.wrapObject(nodeAsScriptValue(state, node), objectGroup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
</span><span class="lines">@@ -2210,11 +2214,8 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue InspectorDOMAgent::nodeAsScriptValue(JSC::ExecState& state, Node* node)
</span><span class="cx"> {
</span><del>- if (!shouldAllowAccessToNode(&state, node))
- return JSC::jsNull();
-
</del><span class="cx"> JSC::JSLockHolder lock(&state);
</span><del>- return toJS(&state, deprecatedGlobalObjectForPrototype(&state), node);
</del><ins>+ return toJS(&state, deprecatedGlobalObjectForPrototype(&state), BindingSecurity::checkSecurityForNode(state, node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> void convertToLuminanceMask();
</span><span class="cx">
</span><del>- String toDataURL(const String& mimeType, const double* quality = 0, CoordinateSystem = LogicalCoordinateSystem) const;
</del><ins>+ String toDataURL(const String& mimeType, Optional<double> quality = Nullopt, CoordinateSystem = LogicalCoordinateSystem) const;
</ins><span class="cx"> #if !USE(CG)
</span><span class="cx"> AffineTransform baseTransform() const { return AffineTransform(); }
</span><span class="cx"> void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><del>-String ImageDataToDataURL(const ImageData&, const String& mimeType, const double* quality);
</del><ins>+String dataURL(const ImageData&, const String& mimeType, Optional<double> quality);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1235,32 +1235,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-void MediaPlayer::addAudioTrack(PassRefPtr<AudioTrackPrivate> track)
</del><ins>+
+void MediaPlayer::addAudioTrack(AudioTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidAddAudioTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::removeAudioTrack(PassRefPtr<AudioTrackPrivate> track)
</del><ins>+void MediaPlayer::removeAudioTrack(AudioTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidRemoveAudioTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::addTextTrack(PassRefPtr<InbandTextTrackPrivate> track)
</del><ins>+void MediaPlayer::addTextTrack(InbandTextTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidAddTextTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::removeTextTrack(PassRefPtr<InbandTextTrackPrivate> track)
</del><ins>+void MediaPlayer::removeTextTrack(InbandTextTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidRemoveTextTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::addVideoTrack(PassRefPtr<VideoTrackPrivate> track)
</del><ins>+void MediaPlayer::addVideoTrack(VideoTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidAddVideoTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::removeVideoTrack(PassRefPtr<VideoTrackPrivate> track)
</del><ins>+void MediaPlayer::removeVideoTrack(VideoTrackPrivate& track)
</ins><span class="cx"> {
</span><span class="cx"> m_client.mediaPlayerDidRemoveVideoTrack(track);
</span><span class="cx"> }
</span><span class="lines">@@ -1286,6 +1287,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><ins>+
</ins><span class="cx"> void MediaPlayer::notifyTrackModeChanged()
</span><span class="cx"> {
</span><span class="cx"> if (m_private)
</span><span class="lines">@@ -1296,6 +1298,7 @@
</span><span class="cx"> {
</span><span class="cx"> return m_client.outOfBandTrackSources();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -236,12 +236,12 @@
</span><span class="cx"> virtual const String& mediaPlayerMediaCacheDirectory() const { return emptyString(); }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
- virtual void mediaPlayerDidAddTextTrack(PassRefPtr<InbandTextTrackPrivate>) { }
- virtual void mediaPlayerDidAddVideoTrack(PassRefPtr<VideoTrackPrivate>) { }
- virtual void mediaPlayerDidRemoveAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
- virtual void mediaPlayerDidRemoveTextTrack(PassRefPtr<InbandTextTrackPrivate>) { }
- virtual void mediaPlayerDidRemoveVideoTrack(PassRefPtr<VideoTrackPrivate>) { }
</del><ins>+ virtual void mediaPlayerDidAddAudioTrack(AudioTrackPrivate&) { }
+ virtual void mediaPlayerDidAddTextTrack(InbandTextTrackPrivate&) { }
+ virtual void mediaPlayerDidAddVideoTrack(VideoTrackPrivate&) { }
+ virtual void mediaPlayerDidRemoveAudioTrack(AudioTrackPrivate&) { }
+ virtual void mediaPlayerDidRemoveTextTrack(InbandTextTrackPrivate&) { }
+ virtual void mediaPlayerDidRemoveVideoTrack(VideoTrackPrivate&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void textTrackRepresentationBoundsChanged(const IntRect&) { }
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="lines">@@ -528,12 +528,12 @@
</span><span class="cx"> PassRefPtr<PlatformMediaResourceLoader> createResourceLoader();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- void addAudioTrack(PassRefPtr<AudioTrackPrivate>);
- void addTextTrack(PassRefPtr<InbandTextTrackPrivate>);
- void addVideoTrack(PassRefPtr<VideoTrackPrivate>);
- void removeAudioTrack(PassRefPtr<AudioTrackPrivate>);
- void removeTextTrack(PassRefPtr<InbandTextTrackPrivate>);
- void removeVideoTrack(PassRefPtr<VideoTrackPrivate>);
</del><ins>+ void addAudioTrack(AudioTrackPrivate&);
+ void addTextTrack(InbandTextTrackPrivate&);
+ void addVideoTrack(VideoTrackPrivate&);
+ void removeAudioTrack(AudioTrackPrivate&);
+ void removeTextTrack(InbandTextTrackPrivate&);
+ void removeVideoTrack(VideoTrackPrivate&);
</ins><span class="cx">
</span><span class="cx"> bool requiresTextTrackRepresentation() const;
</span><span class="cx"> void setTextTrackRepresentation(TextTrackRepresentation*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformTimeRangesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformTimeRanges.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformTimeRanges.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/PlatformTimeRanges.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> explicit PlatformTimeRanges() { }
</span><span class="cx"> PlatformTimeRanges(const MediaTime& start, const MediaTime& end);
</span><span class="cx">
</span><del>- MediaTime start(unsigned index) const;
</del><ins>+ WEBCORE_EXPORT MediaTime start(unsigned index) const;
</ins><span class="cx"> MediaTime start(unsigned index, bool& valid) const;
</span><del>- MediaTime end(unsigned index) const;
</del><ins>+ WEBCORE_EXPORT MediaTime end(unsigned index) const;
</ins><span class="cx"> MediaTime end(unsigned index, bool& valid) const;
</span><span class="cx"> MediaTime duration(unsigned index) const;
</span><span class="cx"> MediaTime maximumBufferedTime() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -966,9 +966,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundation::clearTextTracks()
</span><span class="cx"> {
</span><del>- for (unsigned i = 0; i < m_textTracks.size(); ++i) {
- RefPtr<InbandTextTrackPrivateAVF> track = m_textTracks[i];
- player()->removeTextTrack(track);
</del><ins>+ for (auto& track : m_textTracks) {
+ player()->removeTextTrack(*track);
</ins><span class="cx"> track->disconnect();
</span><span class="cx"> }
</span><span class="cx"> m_textTracks.clear();
</span><span class="lines">@@ -977,11 +976,12 @@
</span><span class="cx"> void MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(const Vector<RefPtr<InbandTextTrackPrivateAVF>>& removedTextTracks)
</span><span class="cx"> {
</span><span class="cx"> if (removedTextTracks.size()) {
</span><del>- for (unsigned i = 0; i < m_textTracks.size(); ++i) {
- if (!removedTextTracks.contains(m_textTracks[i]))
</del><ins>+ for (unsigned i = 0; i < m_textTracks.size(); ) {
+ if (!removedTextTracks.contains(m_textTracks[i])) {
+ ++i;
</ins><span class="cx"> continue;
</span><del>-
- player()->removeTextTrack(removedTextTracks[i].get());
</del><ins>+ }
+ player()->removeTextTrack(*m_textTracks[i]);
</ins><span class="cx"> m_textTracks.remove(i);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1001,20 +1001,23 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> track->setHasBeenReported(true);
</span><del>- player()->addTextTrack(track.get());
</del><ins>+ player()->addTextTrack(*track);
</ins><span class="cx"> }
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(%p) - found %lu text tracks", this, m_textTracks.size());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><ins>+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundation::playbackTargetIsWirelessChanged()
</span><span class="cx"> {
</span><span class="cx"> if (m_player)
</span><span class="cx"> m_player->currentPlaybackTargetIsWirelessChanged();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><ins>+
</ins><span class="cx"> bool MediaPlayerPrivateAVFoundation::extractKeyURIKeyIDAndCertificateFromInitData(Uint8Array* initData, String& keyURI, String& keyID, RefPtr<Uint8Array>& certificate)
</span><span class="cx"> {
</span><span class="cx"> // initData should have the following layout:
</span><span class="lines">@@ -1064,6 +1067,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> URL MediaPlayerPrivateAVFoundation::resolvedURL() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><ins>+#import "MediaPlayerPrivateAVFoundationObjC.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && USE(AVFOUNDATION)
</span><del>-#import "MediaPlayerPrivateAVFoundationObjC.h"
</del><span class="cx">
</span><span class="cx"> #import "AVFoundationMIMETypeCache.h"
</span><span class="cx"> #import "AVFoundationSPI.h"
</span><span class="lines">@@ -1983,6 +1983,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> template <typename RefT, typename PassRefT>
</span><span class="cx"> void determineChangedTracksFromNewTracksAndOldItems(NSArray* tracks, NSString* trackType, Vector<RefT>& oldItems, RefT (*itemFactory)(AVPlayerItemTrack*), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT))
</span><span class="cx"> {
</span><span class="lines">@@ -2021,13 +2022,14 @@
</span><span class="cx"> oldItems.swap(replacementItems);
</span><span class="cx">
</span><span class="cx"> for (auto& removedItem : removedItems)
</span><del>- (player->*removedFunction)(removedItem);
</del><ins>+ (player->*removedFunction)(*removedItem);
</ins><span class="cx">
</span><span class="cx"> for (auto& addedItem : addedItems)
</span><del>- (player->*addedFunction)(addedItem);
</del><ins>+ (player->*addedFunction)(*addedItem);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span><ins>+
</ins><span class="cx"> template <typename RefT, typename PassRefT>
</span><span class="cx"> void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* group, Vector<RefT>& oldItems, const Vector<String>& characteristics, RefT (*itemFactory)(MediaSelectionOptionAVFObjC&), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT))
</span><span class="cx"> {
</span><span class="lines">@@ -2082,11 +2084,12 @@
</span><span class="cx"> oldItems.swap(replacementItems);
</span><span class="cx">
</span><span class="cx"> for (auto& removedItem : removedItems)
</span><del>- (player->*removedFunction)(removedItem);
-
</del><ins>+ (player->*removedFunction)(*removedItem);
+
</ins><span class="cx"> for (auto& addedItem : addedItems)
</span><del>- (player->*addedFunction)(addedItem);
</del><ins>+ (player->*addedFunction)(*addedItem);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::updateAudioTracks()
</span><span class="lines">@@ -2186,9 +2189,11 @@
</span><span class="cx"> UNUSED_PARAM(representation);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
</span><ins>+
</ins><span class="cx"> AudioSourceProvider* MediaPlayerPrivateAVFoundationObjC::audioSourceProvider()
</span><span class="cx"> {
</span><span class="cx"> if (!m_provider) {
</span><span class="lines">@@ -2195,9 +2200,9 @@
</span><span class="cx"> m_provider = AudioSourceProviderAVFObjC::create(m_avPlayerItem.get());
</span><span class="cx"> m_provider->setAudioTrack(firstEnabledTrack(safeAVAssetTracksForAudibleMedia()));
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return m_provider.get();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::sizeChanged()
</span><span class="lines">@@ -2234,6 +2239,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><ins>+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::createVideoOutput()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoOutput(%p)", this);
</span><span class="lines">@@ -2244,8 +2250,7 @@
</span><span class="cx"> #if USE(VIDEOTOOLBOX)
</span><span class="cx"> NSDictionary* attributes = nil;
</span><span class="cx"> #else
</span><del>- NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey,
- nil];
</del><ins>+ NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey, nil];
</ins><span class="cx"> #endif
</span><span class="cx"> m_videoOutput = adoptNS([[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:attributes]);
</span><span class="cx"> ASSERT(m_videoOutput);
</span><span class="lines">@@ -2459,9 +2464,11 @@
</span><span class="cx"> {
</span><span class="cx"> dispatch_semaphore_signal(m_videoOutputSemaphore);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><ins>+
</ins><span class="cx"> RetainPtr<AVAssetResourceLoadingRequest> MediaPlayerPrivateAVFoundationObjC::takeRequestForKeyURI(const String& keyURI)
</span><span class="cx"> {
</span><span class="cx"> return m_keyURIToRequestMap.take(keyURI);
</span><span class="lines">@@ -2507,9 +2514,11 @@
</span><span class="cx"> if (m_session && newValue)
</span><span class="cx"> m_session->playerDidReceiveError([NSError errorWithDomain:@"com.apple.WebKit" code:'HDCP' userInfo:nil]);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><ins>+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::processLegacyClosedCaptionsTracks()
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span><span class="lines">@@ -2544,6 +2553,7 @@
</span><span class="cx">
</span><span class="cx"> processNewAndRemovedTextTracks(removedTextTracks);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NSArray* MediaPlayerPrivateAVFoundationObjC::safeAVAssetTracksForAudibleMedia()
</span><span class="lines">@@ -2558,6 +2568,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span><ins>+
</ins><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::hasLoadedMediaSelectionGroups()
</span><span class="cx"> {
</span><span class="cx"> if (!m_avAsset)
</span><span class="lines">@@ -2656,7 +2667,7 @@
</span><span class="cx">
</span><span class="cx"> m_metadataTrack = InbandMetadataTextTrackPrivateAVF::create(InbandTextTrackPrivate::Metadata, InbandTextTrackPrivate::Data);
</span><span class="cx"> m_metadataTrack->setInBandMetadataTrackDispatchType("com.apple.streaming");
</span><del>- player()->addTextTrack(m_metadataTrack);
</del><ins>+ player()->addTextTrack(*m_metadataTrack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::processCue(NSArray *attributedStrings, NSArray *nativeSamples, const MediaTime& time)
</span><span class="lines">@@ -2678,6 +2689,7 @@
</span><span class="cx">
</span><span class="cx"> m_currentTextTrack->resetCueValues();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack(InbandTextTrackPrivateAVF *track)
</span><span class="lines">@@ -2836,6 +2848,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> m_playbackTarget = WTFMove(target);
</span><span class="lines">@@ -2890,17 +2903,19 @@
</span><span class="cx"> }));
</span><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (!m_avPlayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> [m_avPlayer setUsesExternalPlaybackWhileExternalScreenIsActive:player()->fullscreenMode() & MediaPlayer::VideoFullscreenModeStandard];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::playerItemStatusDidChange(int status)
</span><span class="lines">@@ -2997,6 +3012,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><ins>+
</ins><span class="cx"> static const AtomicString& metadataType(NSString *avMetadataKeySpace)
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<const AtomicString> quickTimeUserData("com.apple.quicktime.udta", AtomicString::ConstructFromLiteral);
</span><span class="lines">@@ -3018,6 +3034,7 @@
</span><span class="cx">
</span><span class="cx"> return emptyAtom;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata, const MediaTime& mediaTime)
</span><span class="lines">@@ -3130,12 +3147,14 @@
</span><span class="cx"> updateStates();
</span><span class="cx"> rateChanged();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><ins>+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange()
</span><span class="cx"> {
</span><span class="cx"> playbackTargetIsWirelessChanged();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::canPlayFastForwardDidChange(bool newValue)
</span><span class="lines">@@ -3158,42 +3177,38 @@
</span><span class="cx">
</span><span class="cx"> NSArray* assetMetadataKeyNames()
</span><span class="cx"> {
</span><del>- static NSArray* keys;
- if (!keys) {
- keys = [[NSArray alloc] initWithObjects:@"duration",
- @"naturalSize",
- @"preferredTransform",
- @"preferredVolume",
- @"preferredRate",
- @"playable",
- @"resolvedURL",
- @"tracks",
- @"availableMediaCharacteristicsWithMediaSelectionOptions",
- nil];
- }
</del><ins>+ static NSArray* keys = [[NSArray alloc] initWithObjects:
+ @"duration",
+ @"naturalSize",
+ @"preferredTransform",
+ @"preferredVolume",
+ @"preferredRate",
+ @"playable",
+ @"resolvedURL",
+ @"tracks",
+ @"availableMediaCharacteristicsWithMediaSelectionOptions",
+ nil];
</ins><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSArray* itemKVOProperties()
</span><span class="cx"> {
</span><del>- static NSArray* keys;
- if (!keys) {
- keys = [[NSArray alloc] initWithObjects:@"presentationSize",
- @"status",
- @"asset",
- @"tracks",
- @"seekableTimeRanges",
- @"loadedTimeRanges",
- @"playbackLikelyToKeepUp",
- @"playbackBufferFull",
- @"playbackBufferEmpty",
- @"duration",
- @"hasEnabledAudio",
- @"timedMetadata",
- @"canPlayFastForward",
- @"canPlayFastReverse",
- nil];
- }
</del><ins>+ static NSArray* keys = [[NSArray alloc] initWithObjects:
+ @"presentationSize",
+ @"status",
+ @"asset",
+ @"tracks",
+ @"seekableTimeRanges",
+ @"loadedTimeRanges",
+ @"playbackLikelyToKeepUp",
+ @"playbackBufferFull",
+ @"playbackBufferEmpty",
+ @"duration",
+ @"hasEnabledAudio",
+ @"timedMetadata",
+ @"canPlayFastForward",
+ @"canPlayFastReverse",
+ nil];
</ins><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3205,14 +3220,16 @@
</span><span class="cx">
</span><span class="cx"> NSArray* playerKVOProperties()
</span><span class="cx"> {
</span><del>- static NSArray* keys = [[NSArray alloc] initWithObjects:@"rate",
</del><ins>+ static NSArray* keys = [[NSArray alloc] initWithObjects:
+ @"rate",
</ins><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- @"externalPlaybackActive", @"allowsExternalPlayback",
</del><ins>+ @"externalPlaybackActive",
+ @"allowsExternalPlayback",
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><del>- @"outputObscuredDueToInsufficientExternalProtection",
</del><ins>+ @"outputObscuredDueToInsufficientExternalProtection",
</ins><span class="cx"> #endif
</span><del>- nil];
</del><ins>+ nil];
</ins><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx"> } // namespace WebCore
</span><span class="lines">@@ -3231,7 +3248,7 @@
</span><span class="cx"> - (void)disconnect
</span><span class="cx"> {
</span><span class="cx"> [NSObject cancelPreviousPerformRequestsWithTarget:self];
</span><del>- m_callback = 0;
</del><ins>+ m_callback = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)metadataLoaded
</span><span class="lines">@@ -3238,7 +3255,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> m_callback->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::AssetMetadataLoaded);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3354,6 +3370,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span><ins>+
</ins><span class="cx"> - (void)legibleOutput:(id)output didOutputAttributedStrings:(NSArray *)strings nativeSampleBuffers:(NSArray *)nativeSamples forItemTime:(CMTime)itemTime
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(output);
</span><span class="lines">@@ -3386,11 +3403,13 @@
</span><span class="cx"> callback->flushCues();
</span><span class="cx"> });
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><ins>+
</ins><span class="cx"> @implementation WebCoreAVFLoaderDelegate
</span><span class="cx">
</span><span class="cx"> - (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC*)callback
</span><span class="lines">@@ -3469,10 +3488,13 @@
</span><span class="cx"> m_callback = callback;
</span><span class="cx"> }
</span><span class="cx"> @end
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><ins>+
</ins><span class="cx"> @implementation WebCoreAVFPullDelegate
</span><ins>+
</ins><span class="cx"> - (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC *)callback
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="lines">@@ -3497,7 +3519,9 @@
</span><span class="cx"> UNUSED_PARAM(output);
</span><span class="cx"> // No-op.
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> @end
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -581,12 +581,12 @@
</span><span class="cx"> configureCallback(track, index++);
</span><span class="cx">
</span><span class="cx"> for (auto& track : removedTracks) {
</span><del>- (player->*removedFunction)(track);
</del><ins>+ (player->*removedFunction)(*track);
</ins><span class="cx"> track->streamTrack()->removeObserver(*trackObserver);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& track : addedTracks) {
</span><del>- (player->*addedFunction)(track);
</del><ins>+ (player->*addedFunction)(*track);
</ins><span class="cx"> track->streamTrack()->addObserver(*trackObserver);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> return cairo_surface_write_to_png_stream(image, writeFunction, output) == CAIRO_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageBuffer::toDataURL(const String& mimeType, const double*, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, Optional<double>, CoordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -241,10 +241,8 @@
</span><span class="cx">
</span><span class="cx"> static RetainPtr<CGImageRef> createCroppedImageIfNecessary(CGImageRef image, const IntSize& bounds)
</span><span class="cx"> {
</span><del>- if (image && (CGImageGetWidth(image) != static_cast<size_t>(bounds.width())
- || CGImageGetHeight(image) != static_cast<size_t>(bounds.height()))) {
</del><ins>+ if (image && (CGImageGetWidth(image) != static_cast<size_t>(bounds.width()) || CGImageGetHeight(image) != static_cast<size_t>(bounds.height())))
</ins><span class="cx"> return adoptCF(CGImageCreateWithImageInRect(image, CGRectMake(0, 0, bounds.width(), bounds.height())));
</span><del>- }
</del><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -253,7 +251,7 @@
</span><span class="cx"> if (resolutionScale == 1 || scaleBehavior == Unscaled)
</span><span class="cx"> image = createCroppedImageIfNecessary(image.get(), internalSize);
</span><span class="cx"> else {
</span><del>- RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize.width(), logicalSize.height(), 8, 4 * logicalSize.width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</del><ins>+ auto context = adoptCF(CGBitmapContextCreate(0, logicalSize.width(), logicalSize.height(), 8, 4 * logicalSize.width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</ins><span class="cx"> CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextClipToRect(context.get(), FloatRect(FloatPoint::zero(), logicalSize));
</span><span class="cx"> FloatSize imageSizeInUserSpace = scaleSizeToUserSpace(logicalSize, backingStoreSize, internalSize);
</span><span class="lines">@@ -460,19 +458,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool CGImageEncodeToData(CGImageRef image, CFStringRef uti, const double* quality, CFMutableDataRef data)
</del><ins>+static bool encodeImage(CGImageRef image, CFStringRef uti, Optional<double> quality, CFMutableDataRef data)
</ins><span class="cx"> {
</span><span class="cx"> if (!image || !uti || !data)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data, uti, 1, 0));
</del><ins>+ auto destination = adoptCF(CGImageDestinationCreateWithData(data, uti, 1, 0));
</ins><span class="cx"> if (!destination)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RetainPtr<CFDictionaryRef> imageProperties = 0;
</del><ins>+ RetainPtr<CFDictionaryRef> imageProperties;
</ins><span class="cx"> if (CFEqual(uti, jpegUTI()) && quality && *quality >= 0.0 && *quality <= 1.0) {
</span><span class="cx"> // Apply the compression quality to the JPEG image destination.
</span><del>- RetainPtr<CFNumberRef> compressionQuality = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, quality));
</del><ins>+ auto compressionQuality = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &*quality));
</ins><span class="cx"> const void* key = kCGImageDestinationLossyCompressionQuality;
</span><span class="cx"> const void* value = compressionQuality.get();
</span><span class="cx"> imageProperties = adoptCF(CFDictionaryCreate(0, &key, &value, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="lines">@@ -485,13 +483,13 @@
</span><span class="cx"> return CGImageDestinationFinalize(destination.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String CGImageToDataURL(CGImageRef image, const String& mimeType, const double* quality)
</del><ins>+static String dataURL(CGImageRef image, const String& mimeType, Optional<double> quality)
</ins><span class="cx"> {
</span><del>- RetainPtr<CFStringRef> uti = utiFromMIMEType(mimeType);
</del><ins>+ auto uti = utiFromMIMEType(mimeType);
</ins><span class="cx"> ASSERT(uti);
</span><span class="cx">
</span><del>- RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
- if (!CGImageEncodeToData(image, uti.get(), quality, data.get()))
</del><ins>+ auto data = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
+ if (!encodeImage(image, uti.get(), quality, data.get()))
</ins><span class="cx"> return ASCIILiteral("data:,");
</span><span class="cx">
</span><span class="cx"> Vector<char> base64Data;
</span><span class="lines">@@ -500,7 +498,7 @@
</span><span class="cx"> return "data:" + mimeType + ";base64," + base64Data;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageBuffer::toDataURL(const String& mimeType, const double* quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, Optional<double> quality, CoordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><span class="lines">@@ -507,7 +505,7 @@
</span><span class="cx"> if (context().isAcceleratedContext())
</span><span class="cx"> flushContext();
</span><span class="cx">
</span><del>- RetainPtr<CFStringRef> uti = utiFromMIMEType(mimeType);
</del><ins>+ auto uti = utiFromMIMEType(mimeType);
</ins><span class="cx"> ASSERT(uti);
</span><span class="cx">
</span><span class="cx"> RefPtr<Uint8ClampedArray> premultipliedData;
</span><span class="lines">@@ -519,20 +517,18 @@
</span><span class="cx"> if (!premultipliedData)
</span><span class="cx"> return ASCIILiteral("data:,");
</span><span class="cx">
</span><del>- RetainPtr<CGDataProviderRef> dataProvider;
- dataProvider = adoptCF(CGDataProviderCreateWithData(0, premultipliedData->data(), 4 * logicalSize().width() * logicalSize().height(), 0));
</del><ins>+ auto dataProvider = adoptCF(CGDataProviderCreateWithData(0, premultipliedData->data(), 4 * logicalSize().width() * logicalSize().height(), 0));
</ins><span class="cx"> if (!dataProvider)
</span><span class="cx"> return ASCIILiteral("data:,");
</span><span class="cx">
</span><span class="cx"> image = adoptCF(CGImageCreate(logicalSize().width(), logicalSize().height(), 8, 32, 4 * logicalSize().width(),
</span><del>- sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast,
- dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</del><ins>+ sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</ins><span class="cx"> } else if (m_resolutionScale == 1) {
</span><span class="cx"> image = copyNativeImage(CopyBackingStore);
</span><span class="cx"> image = createCroppedImageIfNecessary(image.get(), internalSize());
</span><span class="cx"> } else {
</span><span class="cx"> image = copyNativeImage(DontCopyBackingStore);
</span><del>- RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</del><ins>+ auto context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</ins><span class="cx"> CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextClipToRect(context.get(), CGRectMake(0, 0, logicalSize().width(), logicalSize().height()));
</span><span class="cx"> FloatSize imageSizeInUserSpace = sizeForDestinationSize(logicalSize());
</span><span class="lines">@@ -540,14 +536,14 @@
</span><span class="cx"> image = adoptCF(CGBitmapContextCreateImage(context.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return CGImageToDataURL(image.get(), mimeType, quality);
</del><ins>+ return dataURL(image.get(), mimeType, quality);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageDataToDataURL(const ImageData& source, const String& mimeType, const double* quality)
</del><ins>+String dataURL(const ImageData& source, const String& mimeType, Optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><del>- RetainPtr<CFStringRef> uti = utiFromMIMEType(mimeType);
</del><ins>+ auto uti = utiFromMIMEType(mimeType);
</ins><span class="cx"> ASSERT(uti);
</span><span class="cx">
</span><span class="cx"> CGImageAlphaInfo dataAlphaInfo = kCGImageAlphaLast;
</span><span class="lines">@@ -579,17 +575,13 @@
</span><span class="cx"> data = premultipliedData.data();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<CGDataProviderRef> dataProvider;
- dataProvider = adoptCF(CGDataProviderCreateWithData(0, data, 4 * source.width() * source.height(), 0));
</del><ins>+ auto dataProvider = adoptCF(CGDataProviderCreateWithData(0, data, 4 * source.width() * source.height(), 0));
</ins><span class="cx"> if (!dataProvider)
</span><span class="cx"> return ASCIILiteral("data:,");
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> image;
- image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(),
- sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo,
- dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-
- return CGImageToDataURL(image.get(), mimeType, quality);
</del><ins>+ auto image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(),
+ sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
+ return dataURL(image.get(), mimeType, quality);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> return cairo_surface_write_to_png_stream(image, writeFunction, output) == CAIRO_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool encodeImageJPEG(unsigned char* data, IntSize size, Vector<char>* output, const double* quality)
</del><ins>+static bool encodeImageJPEG(unsigned char* data, IntSize size, Vector<char>* output, Optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> return compressRGBABigEndianToJPEG(data, size, *output, quality);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageBuffer::toDataURL(const String& mimeType, const double* quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, Optional<double> quality, CoordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -655,7 +655,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<VideoTrackPrivateGStreamer> track = VideoTrackPrivateGStreamer::create(m_pipeline, i, pad);
</span><span class="cx"> m_videoTracks.append(track);
</span><del>- m_player->addVideoTrack(track.release());
</del><ins>+ m_player->addVideoTrack(*track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (static_cast<gint>(m_videoTracks.size()) > numTracks) {
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> RefPtr<VideoTrackPrivateGStreamer> track = m_videoTracks.last();
</span><span class="cx"> track->disconnect();
</span><span class="cx"> m_videoTracks.removeLast();
</span><del>- m_player->removeVideoTrack(track.release());
</del><ins>+ m_player->removeVideoTrack(*track);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AudioTrackPrivateGStreamer> track = AudioTrackPrivateGStreamer::create(m_pipeline, i, pad);
</span><span class="cx"> m_audioTracks.insert(i, track);
</span><del>- m_player->addAudioTrack(track.release());
</del><ins>+ m_player->addAudioTrack(*track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (static_cast<gint>(m_audioTracks.size()) > numTracks) {
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> RefPtr<AudioTrackPrivateGStreamer> track = m_audioTracks.last();
</span><span class="cx"> track->disconnect();
</span><span class="cx"> m_audioTracks.removeLast();
</span><del>- m_player->removeAudioTrack(track.release());
</del><ins>+ m_player->removeAudioTrack(*track);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -767,7 +767,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> track = InbandTextTrackPrivateGStreamer::create(i, pad);
</span><span class="cx"> m_textTracks.insert(i, track);
</span><del>- m_player->addTextTrack(track.release());
</del><ins>+ m_player->addTextTrack(*track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (static_cast<gint>(m_textTracks.size()) > numTracks) {
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> track = m_textTracks.last();
</span><span class="cx"> track->disconnect();
</span><span class="cx"> m_textTracks.removeLast();
</span><del>- m_player->removeTextTrack(track.release());
</del><ins>+ m_player->removeTextTrack(*track);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1129,7 +1129,7 @@
</span><span class="cx"> track->setInBandMetadataTrackDispatchType(inbandMetadataTrackDispatchType);
</span><span class="cx">
</span><span class="cx"> m_metadataTracks.add(pid, track);
</span><del>- m_player->addTextTrack(track);
</del><ins>+ m_player->addTextTrack(*track);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -1151,10 +1151,10 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::processTableOfContents(GstMessage* message)
</span><span class="cx"> {
</span><span class="cx"> if (m_chaptersTrack)
</span><del>- m_player->removeTextTrack(m_chaptersTrack);
</del><ins>+ m_player->removeTextTrack(*m_chaptersTrack);
</ins><span class="cx">
</span><span class="cx"> m_chaptersTrack = InbandMetadataTextTrackPrivateGStreamer::create(InbandTextTrackPrivate::Chapters, InbandTextTrackPrivate::Generic);
</span><del>- m_player->addTextTrack(m_chaptersTrack);
</del><ins>+ m_player->addTextTrack(*m_chaptersTrack);
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GstToc> toc;
</span><span class="cx"> gboolean updated;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool encodeImage(cairo_surface_t* surface, const String& mimeType, const double* quality, GUniqueOutPtr<gchar>& buffer, gsize& bufferSize)
</del><ins>+static bool encodeImage(cairo_surface_t* surface, const String& mimeType, Optional<double> quality, GUniqueOutPtr<gchar>& buffer, gsize& bufferSize)
</ins><span class="cx"> {
</span><span class="cx"> // List of supported image encoding types comes from the GdkPixbuf documentation.
</span><span class="cx"> // http://developer.gnome.org/gdk-pixbuf/stable/gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-bufferv
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> return !error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageBuffer::toDataURL(const String& mimeType, const double* quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, Optional<double> quality, CoordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> m_data.putData(source, scaledSourceSize, scaledSourceRect, destPoint, internalSize(), context().isAcceleratedContext(), multiplied == Unmultiplied, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ImageBuffer::toDataURL(const String& mimeType, const double* quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String&, Optional<double>, CoordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return ASCIILiteral("data:,");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimageencodersJPEGImageEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> longjmp(err->m_setjmpBuffer, -1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize& size, Vector<char>& jpegData, const double* quality)
</del><ins>+bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize& size, Vector<char>& jpegData, Optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> struct jpeg_compress_struct compressData;
</span><span class="cx"> JPEGCompressErrorMgr err;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimageencodersJPEGImageEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -18,16 +18,15 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef JPEGImageEncoder_h
-#define JPEGImageEncoder_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class IntSize;
</span><del>-bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize&, Vector<char>& jpegData, const double* quality = 0);
</del><span class="cx">
</span><ins>+bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize&, Vector<char>& jpegData, Optional<double> quality = Nullopt);
+
</ins><span class="cx"> }
</span><del>-
-#endif // JPEGImageEncoder_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebPlaybackSessionInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -154,11 +154,10 @@
</span><span class="cx"> void WebPlaybackSessionInterfaceAVKit::seekableRangesChanged(const TimeRanges& timeRanges)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMutableArray> seekableRanges = adoptNS([[NSMutableArray alloc] init]);
</span><del>- ExceptionCode exceptionCode;
</del><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < timeRanges.length(); i++) {
</span><del>- double start = timeRanges.start(i, exceptionCode);
- double end = timeRanges.end(i, exceptionCode);
</del><ins>+ double start = timeRanges.start(i).releaseReturnValue();
+ double end = timeRanges.end(i).releaseReturnValue();
</ins><span class="cx">
</span><span class="cx"> CMTimeRange range = CMTimeRangeMake(CMTimeMakeWithSeconds(start, 1000), CMTimeMakeWithSeconds(end-start, 1000));
</span><span class="cx"> [seekableRanges addObject:[NSValue valueWithCMTimeRange:range]];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if ([_delegate videoElement]->muted())
</span><span class="cx"> [_delegate videoElement]->setMuted(false);
</span><del>- [_delegate videoElement]->setVolume(volume / [self maxVolume], IGNORE_EXCEPTION);
</del><ins>+ [_delegate videoElement]->setVolume(volume / [self maxVolume]);
</ins><span class="cx"> [self updateVolume];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "RenderThemeGtk.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><del>-#include "ExceptionCodePlaceholder.h"
</del><span class="cx"> #include "FileList.h"
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "FontDescription.h"
</span><span class="lines">@@ -2036,8 +2035,8 @@
</span><span class="cx"> auto& style = o.style();
</span><span class="cx"> RefPtr<TimeRanges> timeRanges = mediaElement->buffered();
</span><span class="cx"> for (unsigned index = 0; index < timeRanges->length(); ++index) {
</span><del>- float start = timeRanges->start(index, IGNORE_EXCEPTION);
- float end = timeRanges->end(index, IGNORE_EXCEPTION);
</del><ins>+ float start = timeRanges->start(index).releaseReturnValue();
+ float end = timeRanges->end(index).releaseReturnValue();
</ins><span class="cx"> float startRatio = start / mediaDuration;
</span><span class="cx"> float lengthRatio = (end - start) / mediaDuration;
</span><span class="cx"> if (!lengthRatio)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx">
</span><span class="cx"> if (!scriptingContentIsAllowed(parserContentPolicy()) && is<Element>(*node) && toScriptElementIfPossible(downcast<Element>(node.get()))) {
</span><span class="cx"> popCurrentNode();
</span><del>- node->remove(IGNORE_EXCEPTION);
</del><ins>+ node->remove();
</ins><span class="cx"> return;
</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 (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * DOM/DOMCharacterData.mm:
+ (-[DOMCharacterData remove]): Updated exception handling.
+ * DOM/DOMDOMTokenList.mm:
+ (-[DOMDOMTokenList toggle:force:]): Ditto.
+ * DOM/DOMDocumentType.mm:
+ (-[DOMDocumentType remove]): Ditto.
+ * DOM/DOMElement.mm:
+ (-[DOMElement remove]): Ditto.
+ * DOM/DOMHTML.mm:
+ (-[DOMHTMLInputElement setValueAsNumberWithChangeEvent:]): Ditto.
+ * DOM/DOMHTMLCanvasElement.mm:
+ (-[DOMHTMLCanvasElement toDataURL:]): Ditto.
+ * DOM/DOMHTMLElement.mm:
+ (-[DOMHTMLElement setInnerText:]): Ditto.
+ (-[DOMHTMLElement setOuterText:]): Ditto.
+ (-[DOMHTMLElement setContentEditable:]): Ditto.
+ * DOM/DOMHTMLInputElement.mm:
+ (-[DOMHTMLInputElement setMaxLength:]): Ditto.
+ (-[DOMHTMLInputElement setValueAsDate:]): Ditto.
+ (-[DOMHTMLInputElement setValueAsNumber:]): Ditto.
+ (-[DOMHTMLInputElement stepUp:]): Ditto.
+ (-[DOMHTMLInputElement stepDown:]): Ditto.
+ (-[DOMHTMLInputElement setRangeText:]): Ditto.
+ (-[DOMHTMLInputElement setRangeText:start:end:selectionMode:]): Ditto.
+ * DOM/DOMHTMLMarqueeElement.mm:
+ (-[DOMHTMLMarqueeElement setLoop:]): Ditto.
+ * DOM/DOMHTMLMediaElement.mm:
+ (-[DOMHTMLMediaElement setCurrentTime:]): Ditto.
+ (-[DOMHTMLMediaElement setVolume:]): Ditto.
+ * DOM/DOMHTMLOptionsCollection.mm:
+ (-[DOMHTMLOptionsCollection setLength:]): Ditto.
+ * DOM/DOMHTMLTableElement.mm:
+ (-[DOMHTMLTableElement setCaption:]): Ditto.
+ (-[DOMHTMLTableElement setTHead:]): Ditto.
+ (-[DOMHTMLTableElement setTFoot:]): Ditto.
+ (-[DOMHTMLTableElement insertRow:]): Ditto.
+ (-[DOMHTMLTableElement deleteRow:]): Ditto.
+ * DOM/DOMHTMLTableRowElement.mm:
+ (-[DOMHTMLTableRowElement insertCell:]): Ditto.
+ (-[DOMHTMLTableRowElement deleteCell:]): Ditto.
+ * DOM/DOMHTMLTableSectionElement.mm:
+ (-[DOMHTMLTableSectionElement insertRow:]): Ditto.
+ (-[DOMHTMLTableSectionElement deleteRow:]): Ditto.
+ * DOM/DOMHTMLTextAreaElement.mm:
+ (-[DOMHTMLTextAreaElement setMaxLength:]): Ditto.
+ (-[DOMHTMLTextAreaElement setRangeText:]): Ditto.
+ (-[DOMHTMLTextAreaElement setRangeText:start:end:selectionMode:]): Ditto.
+ * DOM/DOMHTMLVideoElement.mm:
+ (-[DOMHTMLVideoElement webkitEnterFullscreen]): Ditto.
+ (-[DOMHTMLVideoElement webkitEnterFullScreen]): Changed to call the other named
+ version (lowercase S) instead of repeating the logic from that method.
+ (-[DOMHTMLVideoElement webkitExitFullScreen]): Ditto.
+ * DOM/DOMTimeRanges.mm:
+ (-[DOMTimeRanges start:]): Updated exception handling.
+ (-[DOMTimeRanges end:]): Ditto.
+
</ins><span class="cx"> 2016-10-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r203601): Caused crashes in iBooks
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCharacterDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMCharacterData.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -112,9 +112,7 @@
</span><span class="cx"> - (void)remove
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->remove(ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->remove());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMDOMTokenListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMDOMTokenList.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMDOMTokenList.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMDOMTokenList.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -84,10 +84,7 @@
</span><span class="cx"> - (BOOL)toggle:(NSString *)token force:(BOOL)force
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- BOOL result = IMPL->toggle(token, force, ec);
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return raiseOnDOMError(IMPL->toggle(token, force));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMDocumentTypemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMDocumentType.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMDocumentType.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMDocumentType.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -76,9 +76,7 @@
</span><span class="cx"> - (void)remove
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->remove(ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->remove());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -492,9 +492,7 @@
</span><span class="cx"> - (void)remove
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- ExceptionCode ec = 0;
- unwrap(*self).remove(ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(unwrap(*self).remove());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMElement *)querySelector:(NSString *)selectors
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTML.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTML.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTML.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> #import <WebCore/markup.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#import "DOMHTMLElementInternal.h"
</ins><span class="cx"> #import <WebCore/Autocapitalize.h>
</span><del>-#import "DOMHTMLElementInternal.h"
</del><span class="cx"> #import <WebCore/HTMLTextFormControlElement.h>
</span><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><span class="cx"> #import <WebCore/RenderLayer.h>
</span><span class="lines">@@ -58,6 +58,10 @@
</span><span class="cx"> #import <WebCore/WebCoreThreadMessage.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// FIXME: We should move all these into the various specific element source files.
+// These were originally here because they were hand written and the rest generated,
+// but that is no longer true.
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -180,6 +184,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> - (BOOL)_isAutofilled
</span><span class="cx"> {
</span><span class="cx"> return core(self)->isAutoFilled();
</span><span class="lines">@@ -267,11 +272,11 @@
</span><span class="cx"> - (void)setValueAsNumberWithChangeEvent:(double)newValueAsNumber
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- core(self)->setValueAsNumber(newValueAsNumber, ec, DispatchInputAndChangeEvent);
</del><ins>+ core(self)->setValueAsNumber(newValueAsNumber, DispatchInputAndChangeEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Class kitClass(WebCore::HTMLCollection* collection)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLCanvasElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLCanvasElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLCanvasElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLCanvasElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -65,10 +65,7 @@
</span><span class="cx"> - (NSString *)toDataURL:(NSString *)type
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- NSString *result = IMPL->toDataURL(type, ec);
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return raiseOnDOMError(IMPL->toDataURL(type));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -161,9 +161,7 @@
</span><span class="cx"> - (void)setInnerText:(NSString *)newInnerText
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setInnerText(newInnerText, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setInnerText(newInnerText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)outerText
</span><span class="lines">@@ -175,9 +173,7 @@
</span><span class="cx"> - (void)setOuterText:(NSString *)newOuterText
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setOuterText(newOuterText, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setOuterText(newOuterText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)contentEditable
</span><span class="lines">@@ -189,9 +185,7 @@
</span><span class="cx"> - (void)setContentEditable:(NSString *)newContentEditable
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setContentEditable(newContentEditable, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setContentEditable(newContentEditable));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isContentEditable
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLInputElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLInputElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLInputElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLInputElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -281,9 +281,7 @@
</span><span class="cx"> - (void)setMaxLength:(int)newMaxLength
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setMaxLength(newMaxLength, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setMaxLength(newMaxLength));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)min
</span><span class="lines">@@ -451,9 +449,7 @@
</span><span class="cx"> - (void)setValueAsDate:(NSTimeInterval)newValueAsDate
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setValueAsDate(core(newValueAsDate), ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setValueAsDate(core(newValueAsDate)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)valueAsNumber
</span><span class="lines">@@ -465,9 +461,7 @@
</span><span class="cx"> - (void)setValueAsNumber:(double)newValueAsNumber
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setValueAsNumber(newValueAsNumber, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setValueAsNumber(newValueAsNumber));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned)width
</span><span class="lines">@@ -643,17 +637,13 @@
</span><span class="cx"> - (void)stepUp:(int)n
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->stepUp(n, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->stepUp(n));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stepDown:(int)n
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->stepDown(n, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->stepDown(n));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)checkValidity
</span><span class="lines">@@ -677,17 +667,13 @@
</span><span class="cx"> - (void)setRangeText:(NSString *)replacement
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setRangeText(replacement, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setRangeText(replacement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setRangeText:(NSString *)replacement start:(unsigned)start end:(unsigned)end selectionMode:(NSString *)selectionMode
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setRangeText(replacement, start, end, selectionMode, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setRangeText(replacement, start, end, selectionMode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setSelectionRange:(int)start end:(int)end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLMarqueeElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLMarqueeElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLMarqueeElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLMarqueeElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -108,9 +108,7 @@
</span><span class="cx"> - (void)setLoop:(int)newLoop
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setLoop(newLoop, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setLoop(newLoop));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned)scrollAmount
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLMediaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -127,9 +127,7 @@
</span><span class="cx"> - (void)setCurrentTime:(double)newCurrentTime
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setCurrentTime(newCurrentTime, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setCurrentTimeForBindings(newCurrentTime));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)duration
</span><span class="lines">@@ -231,9 +229,7 @@
</span><span class="cx"> - (void)setVolume:(double)newVolume
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setVolume(newVolume, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setVolume(newVolume));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)muted
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLOptionsCollectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -76,9 +76,7 @@
</span><span class="cx"> - (void)setLength:(unsigned)newLength
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setLength(newLength, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setLength(newLength));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMNode *)namedItem:(NSString *)name
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLTableElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLTableElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLTableElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLTableElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -56,11 +56,7 @@
</span><span class="cx"> - (void)setCaption:(DOMHTMLTableCaptionElement *)newCaption
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- ASSERT(newCaption);
-
- WebCore::ExceptionCode ec = 0;
- IMPL->setCaption(core(newCaption), ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setCaption(core(newCaption)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMHTMLTableSectionElement *)tHead
</span><span class="lines">@@ -72,11 +68,7 @@
</span><span class="cx"> - (void)setTHead:(DOMHTMLTableSectionElement *)newTHead
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- ASSERT(newTHead);
-
- WebCore::ExceptionCode ec = 0;
- IMPL->setTHead(core(newTHead), ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setTHead(core(newTHead)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMHTMLTableSectionElement *)tFoot
</span><span class="lines">@@ -88,11 +80,7 @@
</span><span class="cx"> - (void)setTFoot:(DOMHTMLTableSectionElement *)newTFoot
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- ASSERT(newTFoot);
-
- WebCore::ExceptionCode ec = 0;
- IMPL->setTFoot(core(newTFoot), ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->setTFoot(core(newTFoot)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMHTMLCollection *)rows
</span><span class="lines">@@ -260,18 +248,13 @@
</span><span class="cx"> - (DOMHTMLElement *)insertRow:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMHTMLElement *result = kit(WTF::getPtr(IMPL->insertRow(index, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(raiseOnDOMError(IMPL->insertRow(index)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)deleteRow:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->deleteRow(index, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->deleteRow(index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLTableRowElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLTableRowElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLTableRowElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLTableRowElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -124,18 +124,13 @@
</span><span class="cx"> - (DOMHTMLElement *)insertCell:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMHTMLElement *result = kit(WTF::getPtr(IMPL->insertCell(index, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(raiseOnDOMError(IMPL->insertCell(index)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)deleteCell:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->deleteCell(index, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->deleteCell(index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLTableSectionElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLTableSectionElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLTableSectionElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLTableSectionElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -100,18 +100,13 @@
</span><span class="cx"> - (DOMHTMLElement *)insertRow:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMHTMLElement *result = kit(WTF::getPtr(IMPL->insertRow(index, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(raiseOnDOMError(IMPL->insertRow(index)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)deleteRow:(int)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->deleteRow(index, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->deleteRow(index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLTextAreaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLTextAreaElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLTextAreaElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLTextAreaElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -106,9 +106,7 @@
</span><span class="cx"> - (void)setMaxLength:(int)newMaxLength
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- ExceptionCode ec = 0;
- unwrap(*self).setMaxLength(newMaxLength, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(unwrap(*self).setMaxLength(newMaxLength));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)name
</span><span class="lines">@@ -312,17 +310,13 @@
</span><span class="cx"> - (void)setRangeText:(NSString *)replacement
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- ExceptionCode ec = 0;
- unwrap(*self).setRangeText(replacement, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(unwrap(*self).setRangeText(replacement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setRangeText:(NSString *)replacement start:(unsigned)start end:(unsigned)end selectionMode:(NSString *)selectionMode
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- ExceptionCode ec = 0;
- unwrap(*self).setRangeText(replacement, start, end, selectionMode, ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(unwrap(*self).setRangeText(replacement, start, end, selectionMode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setSelectionRange:(int)start end:(int)end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLVideoElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLVideoElement.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLVideoElement.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLVideoElement.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -117,9 +117,7 @@
</span><span class="cx"> - (void)webkitEnterFullscreen
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->webkitEnterFullscreen(ec);
- raiseOnDOMError(ec);
</del><ins>+ raiseOnDOMError(IMPL->webkitEnterFullscreen());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webkitExitFullscreen
</span><span class="lines">@@ -130,16 +128,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)webkitEnterFullScreen
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- IMPL->webkitEnterFullScreen(ec);
- raiseOnDOMError(ec);
</del><ins>+ [self webkitEnterFullscreen];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webkitExitFullScreen
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- IMPL->webkitExitFullScreen();
</del><ins>+ [self webkitExitFullscreen];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMTimeRangesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMTimeRanges.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMTimeRanges.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/mac/DOM/DOMTimeRanges.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -63,19 +63,13 @@
</span><span class="cx"> - (double)start:(unsigned)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- double result = IMPL->start(index, ec);
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return raiseOnDOMError(IMPL->start(index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)end:(unsigned)index
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- double result = IMPL->end(index, ec);
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return raiseOnDOMError(IMPL->end(index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/win/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLElement::setInnerText): Update exception handling.
+ * FullscreenVideoController.cpp:
+ (FullscreenVideoController::setVolume): Ditto.
+
</ins><span class="cx"> 2016-10-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMHTMLClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMHTMLClasses.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -534,8 +534,7 @@
</span><span class="cx"> ASSERT(is<HTMLElement>(m_element));
</span><span class="cx"> HTMLElement* htmlElement = downcast<HTMLElement>(m_element);
</span><span class="cx"> WTF::String textString(text, SysStringLen(text));
</span><del>- WebCore::ExceptionCode ec = 0;
- htmlElement->setInnerText(textString, ec);
</del><ins>+ htmlElement->setInnerText(textString);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -39,15 +39,16 @@
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/HWndDC.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><del>-#if USE(CA)
-#include <WebCore/PlatformCALayerClient.h>
-#include <WebCore/PlatformCALayerWin.h>
-#endif
</del><span class="cx"> #include <WebCore/TextRun.h>
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #include <windowsx.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><ins>+#if USE(CA)
+#include <WebCore/PlatformCALayerClient.h>
+#include <WebCore/PlatformCALayerWin.h>
+#endif
+
</ins><span class="cx"> using namespace std;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -347,10 +348,8 @@
</span><span class="cx">
</span><span class="cx"> void FullscreenVideoController::setVolume(float volume)
</span><span class="cx"> {
</span><del>- if (m_videoElement) {
- ExceptionCode ec;
- m_videoElement->setVolume(volume, ec);
- }
</del><ins>+ if (m_videoElement)
+ m_videoElement->setVolume(volume);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float FullscreenVideoController::currentTime() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp:
+ (webkit_dom_dom_token_list_add): Updated exception handling.
+ (webkit_dom_dom_token_list_remove): Ditto.
+ (webkit_dom_dom_token_list_toggle): Ditto.
+ (webkit_dom_dom_token_list_replace): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp:
+ (webkit_dom_element_remove): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp:
+ (webkit_dom_html_element_set_inner_text): Ditto.
+ (webkit_dom_html_element_set_outer_text): Ditto.
+ (webkit_dom_html_element_set_content_editable): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp:
+ (webkit_dom_html_input_element_set_max_length): Ditto.
+ (webkit_dom_html_input_element_set_size): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp:
+ (webkit_dom_html_select_element_set_length): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp:
+ (webkit_dom_html_table_element_insert_row): Ditto.
+ (webkit_dom_html_table_element_delete_row): Ditto.
+ (webkit_dom_html_table_element_set_caption): Ditto.
+ (webkit_dom_html_table_element_set_t_head): Ditto.
+ (webkit_dom_html_table_element_set_t_foot): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp:
+ (webkit_dom_html_table_row_element_insert_cell): Ditto.
+ (webkit_dom_html_table_row_element_delete_cell): Ditto.
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp:
+ (webkit_dom_html_table_section_element_insert_row): Ditto.
+ (webkit_dom_html_table_section_element_delete_row): Ditto.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState): Removed ASSERT_NO_EXCEPTION.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::setAssistedNodeValueAsNumber): Removed ASSERT_NO_EXCEPTION.
+
+ * WebProcess/cocoa/WebPlaybackSessionManager.mm:
+ (WebKit::WebPlaybackSessionManager::seekableRangesChanged):
+ Changed the code to use a different interface to TimeRange that does
+ not involve exceptions.
+
</ins><span class="cx"> 2016-10-28 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS autocorrection does not trigger an input event of inputType "insertReplacementText"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -193,10 +193,9 @@
</span><span class="cx"> while (gchar* variadicParameter = va_arg(variadicParameterList, gchar*))
</span><span class="cx"> convertedTokens.append(WTF::String::fromUTF8(variadicParameter));
</span><span class="cx"> va_end(variadicParameterList);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->add(WTFMove(convertedTokens), ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->add(WTFMove(convertedTokens));
+ 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">@@ -213,10 +212,9 @@
</span><span class="cx"> while (gchar* variadicParameter = va_arg(variadicParameterList, gchar*))
</span><span class="cx"> convertedTokens.append(WTF::String::fromUTF8(variadicParameter));
</span><span class="cx"> va_end(variadicParameterList);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->remove(WTFMove(convertedTokens), ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->remove(WTFMove(convertedTokens));
+ 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">@@ -229,13 +227,13 @@
</span><span class="cx"> g_return_val_if_fail(!error || !*error, FALSE);
</span><span class="cx"> WebCore::DOMTokenList* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedToken = WTF::String::fromUTF8(token);
</span><del>- WebCore::ExceptionCode ec = 0;
- gboolean result = item->toggle(convertedToken, force, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->toggle(convertedToken, force);
+ 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 false;
</ins><span class="cx"> }
</span><del>- return result;
</del><ins>+ return result.releaseReturnValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_dom_token_list_replace(WebKitDOMDOMTokenList* self, const gchar* token, const gchar* newToken, GError** error)
</span><span class="lines">@@ -248,10 +246,9 @@
</span><span class="cx"> WebCore::DOMTokenList* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedToken = WTF::String::fromUTF8(token);
</span><span class="cx"> WTF::String convertedNewToken = WTF::String::fromUTF8(newToken);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->replace(convertedToken, convertedNewToken, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->replace(convertedToken, convertedNewToken);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -999,10 +999,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::Element* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->remove(ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->remove();
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -557,10 +557,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLElement* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedValue = WTF::String::fromUTF8(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setInnerText(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setInnerText(convertedValue);
+ 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">@@ -582,10 +581,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLElement* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedValue = WTF::String::fromUTF8(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setOuterText(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setOuterText(convertedValue);
+ 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">@@ -607,10 +605,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLElement* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedValue = WTF::String::fromUTF8(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setContentEditable(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setContentEditable(convertedValue);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -727,10 +727,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_INPUT_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLInputElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setMaxLength(value, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setMaxLength(value);
+ 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">@@ -803,10 +802,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_INPUT_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLInputElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setSize(value, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setSize(value);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -515,10 +515,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_SELECT_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLSelectElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setLength(value, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setLength(value);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -400,13 +400,13 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_HTML_TABLE_ELEMENT(self), 0);
</span><span class="cx"> g_return_val_if_fail(!error || !*error, 0);
</span><span class="cx"> WebCore::HTMLTableElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::HTMLElement> gobjectResult = WTF::getPtr(item->insertRow(index, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->insertRow(index);
+ 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"> void webkit_dom_html_table_element_delete_row(WebKitDOMHTMLTableElement* self, glong index, GError** error)
</span><span class="lines">@@ -415,10 +415,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_TABLE_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->deleteRow(index, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->deleteRow(index);
+ 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">@@ -440,10 +439,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableElement* item = WebKit::core(self);
</span><span class="cx"> WebCore::HTMLTableCaptionElement* convertedValue = WebKit::core(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setCaption(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setCaption(convertedValue);
+ 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">@@ -465,10 +463,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableElement* item = WebKit::core(self);
</span><span class="cx"> WebCore::HTMLTableSectionElement* convertedValue = WebKit::core(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setTHead(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setTHead(convertedValue);
+ 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">@@ -490,10 +487,9 @@
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableElement* item = WebKit::core(self);
</span><span class="cx"> WebCore::HTMLTableSectionElement* convertedValue = WebKit::core(value);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->setTFoot(convertedValue, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->setTFoot(convertedValue);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableRowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -268,13 +268,13 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_HTML_TABLE_ROW_ELEMENT(self), 0);
</span><span class="cx"> g_return_val_if_fail(!error || !*error, 0);
</span><span class="cx"> WebCore::HTMLTableRowElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::HTMLElement> gobjectResult = WTF::getPtr(item->insertCell(index, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->insertCell(index);
+ 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"> void webkit_dom_html_table_row_element_delete_cell(WebKitDOMHTMLTableRowElement* self, glong index, GError** error)
</span><span class="lines">@@ -283,10 +283,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_TABLE_ROW_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableRowElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->deleteCell(index, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->deleteCell(index);
+ 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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMHTMLTableSectionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -223,13 +223,12 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_HTML_TABLE_SECTION_ELEMENT(self), 0);
</span><span class="cx"> g_return_val_if_fail(!error || !*error, 0);
</span><span class="cx"> WebCore::HTMLTableSectionElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::HTMLElement> gobjectResult = WTF::getPtr(item->insertRow(index, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->insertRow(index);
+ 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><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"> void webkit_dom_html_table_section_element_delete_row(WebKitDOMHTMLTableSectionElement* self, glong index, GError** error)
</span><span class="lines">@@ -238,10 +237,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_HTML_TABLE_SECTION_ELEMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><span class="cx"> WebCore::HTMLTableSectionElement* item = WebKit::core(self);
</span><del>- WebCore::ExceptionCode ec = 0;
- item->deleteRow(index, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->deleteRow(index);
+ 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="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> postLayoutData.enclosingListType = NoList;
</span><span class="cx">
</span><span class="cx"> if (nodeToRemove)
</span><del>- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ nodeToRemove->remove();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -753,27 +753,21 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setAssistedNodeValue(const String& value)
</span><span class="cx"> {
</span><del>- if (is<HTMLInputElement>(m_assistedNode.get())) {
- HTMLInputElement& element = downcast<HTMLInputElement>(*m_assistedNode);
- element.setValue(value, DispatchInputAndChangeEvent);
- }
</del><span class="cx"> // FIXME: should also handle the case of HTMLSelectElement.
</span><ins>+ if (is<HTMLInputElement>(m_assistedNode.get()))
+ downcast<HTMLInputElement>(*m_assistedNode).setValue(value, DispatchInputAndChangeEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setAssistedNodeValueAsNumber(double value)
</span><span class="cx"> {
</span><del>- if (is<HTMLInputElement>(m_assistedNode.get())) {
- HTMLInputElement& element = downcast<HTMLInputElement>(*m_assistedNode);
- element.setValueAsNumber(value, ASSERT_NO_EXCEPTION, DispatchInputAndChangeEvent);
- }
</del><ins>+ if (is<HTMLInputElement>(m_assistedNode.get()))
+ downcast<HTMLInputElement>(*m_assistedNode).setValueAsNumber(value, DispatchInputAndChangeEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
</span><span class="cx"> {
</span><del>- if (!is<HTMLSelectElement>(m_assistedNode.get()))
- return;
- HTMLSelectElement& select = downcast<HTMLSelectElement>(*m_assistedNode);
- select.optionSelectedByUser(index, true, allowMultipleSelection);
</del><ins>+ if (is<HTMLSelectElement>(m_assistedNode.get()))
+ downcast<HTMLSelectElement>(*m_assistedNode).optionSelectedByUser(index, true, allowMultipleSelection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::showInspectorHighlight(const WebCore::Highlight& highlight)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -316,14 +316,11 @@
</span><span class="cx"> void WebPlaybackSessionManager::seekableRangesChanged(uint64_t contextId, const WebCore::TimeRanges& timeRanges)
</span><span class="cx"> {
</span><span class="cx"> Vector<std::pair<double, double>> rangesVector;
</span><del>-
</del><span class="cx"> for (unsigned i = 0; i < timeRanges.length(); i++) {
</span><del>- ExceptionCode exceptionCode;
- double start = timeRanges.start(i, exceptionCode);
- double end = timeRanges.end(i, exceptionCode);
- rangesVector.append(std::pair<double, double>(start, end));
</del><ins>+ double start = timeRanges.ranges().start(i).toDouble();
+ double end = timeRanges.ranges().end(i).toDouble();
+ rangesVector.append({ start, end });
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> m_page->send(Messages::WebPlaybackSessionManagerProxy::SetSeekableRangesVector(contextId, WTFMove(rangesVector)), m_page->pageID());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Tools/ChangeLog 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-28 Darin Adler <darin@apple.com>
+
+ Move all classes in the HTML directory from ExceptionCode to Exception
+ https://bugs.webkit.org/show_bug.cgi?id=163876
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Tests/WebCore/TimeRanges.cpp:
+ (TestWebKitAPI::ToString): Updated for changes to the TimeRanges class.
+ (TestWebKitAPI::TEST): Ditto.
+
</ins><span class="cx"> 2016-10-28 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, changed Devin Rousso's email and nick.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreTimeRangescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/TimeRanges.cpp (208095 => 208096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/TimeRanges.cpp 2016-10-29 02:12:41 UTC (rev 208095)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/TimeRanges.cpp 2016-10-29 02:32:20 UTC (rev 208096)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include <WebCore/TimeRanges.h>
</span><span class="cx">
</span><del>-#include <WebCore/ExceptionCodePlaceholder.h>
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="lines">@@ -42,7 +40,7 @@
</span><span class="cx"> std::stringstream ss;
</span><span class="cx"> ss << "{";
</span><span class="cx"> for (unsigned i = 0; i < ranges.length(); ++i)
</span><del>- ss << " [" << ranges.start(i, IGNORE_EXCEPTION) << "," << ranges.end(i, IGNORE_EXCEPTION) << ")";
</del><ins>+ ss << " [" << ranges.start(i).releaseReturnValue() << "," << ranges.end(i).releaseReturnValue() << ")";
</ins><span class="cx"> ss << " }";
</span><span class="cx">
</span><span class="cx"> return ss.str();
</span><span class="lines">@@ -74,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> // Add the values in rangeA to rangeB in reverse order.
</span><span class="cx"> for (int i = rangeA->length() - 1; i >= 0; --i)
</span><del>- rangeB->add(rangeA->start(i, IGNORE_EXCEPTION), rangeA->end(i, IGNORE_EXCEPTION));
</del><ins>+ rangeB->add(rangeA->start(i).releaseReturnValue(), rangeA->end(i).releaseReturnValue());
</ins><span class="cx">
</span><span class="cx"> ASSERT_RANGE(expected, rangeB);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>