<!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>[208985] 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/208985">208985</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-11-26 22:08:16 -0800 (Sat, 26 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WTF] Import std::optional reference implementation as WTF::Optional
https://bugs.webkit.org/show_bug.cgi?id=164199
Reviewed by Saam Barati and Sam Weinig.
Source/JavaScriptCore:
Previous WTF::Optional::operator= is not compatible to std::optional::operator=.
std::optional::emplace has the same semantics to the previous one.
So we change the code to use it.
* Scripts/builtins/builtins_templates.py:
* Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result:
* Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result:
* Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::commuteCompareToZeroIntoTest):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::commuteCompareToZeroIntoTest):
* b3/B3CheckSpecial.cpp:
(JSC::B3::CheckSpecial::forEachArg):
(JSC::B3::CheckSpecial::shouldTryAliasingDef):
* b3/B3CheckSpecial.h:
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::scaleForShl):
(JSC::B3::Air::LowerToAir::effectiveAddr):
(JSC::B3::Air::LowerToAir::tryAppendLea):
* b3/B3Opcode.cpp:
(JSC::B3::invertedCompare):
* b3/B3Opcode.h:
* b3/B3PatchpointSpecial.cpp:
(JSC::B3::PatchpointSpecial::forEachArg):
* b3/B3StackmapSpecial.cpp:
(JSC::B3::StackmapSpecial::forEachArgImpl):
* b3/B3StackmapSpecial.h:
* b3/B3Value.cpp:
(JSC::B3::Value::invertedCompare):
* b3/air/AirArg.h:
(JSC::B3::Air::Arg::isValidScale):
(JSC::B3::Air::Arg::isValidAddrForm):
(JSC::B3::Air::Arg::isValidIndexForm):
(JSC::B3::Air::Arg::isValidForm):
* b3/air/AirCustom.h:
(JSC::B3::Air::PatchCustom::shouldTryAliasingDef):
* b3/air/AirFixObviousSpills.cpp:
* b3/air/AirInst.h:
* b3/air/AirInstInlines.h:
(JSC::B3::Air::Inst::shouldTryAliasingDef):
* b3/air/AirIteratedRegisterCoalescing.cpp:
* b3/air/AirSpecial.cpp:
(JSC::B3::Air::Special::shouldTryAliasingDef):
* b3/air/AirSpecial.h:
* bytecode/BytecodeGeneratorification.cpp:
(JSC::BytecodeGeneratorification::storageForGeneratorLocal):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::findPC):
(JSC::CodeBlock::bytecodeOffsetFromCallSiteIndex):
* bytecode/CodeBlock.h:
* bytecode/UnlinkedFunctionExecutable.cpp:
(JSC::UnlinkedFunctionExecutable::link):
* bytecode/UnlinkedFunctionExecutable.h:
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::PropertyListNode::emitPutConstantProperty):
(JSC::ObjectPatternNode::bindValue):
* debugger/Debugger.cpp:
(JSC::Debugger::resolveBreakpoint):
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::currentPosition):
* debugger/DebuggerParseData.cpp:
(JSC::DebuggerPausePositions::breakpointLocationForLineColumn):
* debugger/DebuggerParseData.h:
* debugger/ScriptProfilingScope.h:
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeDoubleUnaryOpEffects):
* dfg/DFGJITCode.cpp:
(JSC::DFG::JITCode::findPC):
* dfg/DFGJITCode.h:
* dfg/DFGOperations.cpp:
(JSC::DFG::operationPutByValInternal):
* dfg/DFGSlowPathGenerator.h:
(JSC::DFG::SlowPathGenerator::generate):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::runSlowPathGenerators):
(JSC::DFG::SpeculativeJIT::emitUntypedBitOp):
(JSC::DFG::SpeculativeJIT::emitUntypedRightShiftBitOp):
(JSC::DFG::SpeculativeJIT::compileMathIC):
(JSC::DFG::SpeculativeJIT::compileArithDiv):
(JSC::DFG::SpeculativeJIT::compileCallDOMGetter):
* dfg/DFGSpeculativeJIT.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compileLogicalNot):
(JSC::DFG::SpeculativeJIT::emitBranch):
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):
* ftl/FTLJITCode.cpp:
(JSC::FTL::JITCode::findPC):
* ftl/FTLJITCode.h:
* heap/Heap.cpp:
(JSC::Heap::collectAsync):
(JSC::Heap::collectSync):
(JSC::Heap::collectInThread):
(JSC::Heap::requestCollection):
(JSC::Heap::willStartCollection):
(JSC::Heap::didFinishCollection):
(JSC::Heap::shouldDoFullCollection):
* heap/Heap.h:
(JSC::Heap::collectionScope):
* heap/HeapSnapshot.cpp:
(JSC::HeapSnapshot::nodeForCell):
(JSC::HeapSnapshot::nodeForObjectIdentifier):
* heap/HeapSnapshot.h:
* inspector/InspectorBackendDispatcher.cpp:
(Inspector::BackendDispatcher::dispatch):
(Inspector::BackendDispatcher::sendPendingErrors):
(Inspector::BackendDispatcher::reportProtocolError):
* inspector/InspectorBackendDispatcher.h:
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::nodeForHeapObjectIdentifier):
(Inspector::InspectorHeapAgent::getPreview):
(Inspector::InspectorHeapAgent::getRemoteObject):
* inspector/agents/InspectorHeapAgent.h:
* inspector/remote/RemoteConnectionToTarget.h:
* inspector/remote/RemoteConnectionToTarget.mm:
(Inspector::RemoteConnectionToTarget::targetIdentifier):
(Inspector::RemoteConnectionToTarget::setup):
* inspector/remote/RemoteInspector.h:
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::updateClientCapabilities):
* inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
(_generate_declarations_for_enum_conversion_methods):
(_generate_declarations_for_enum_conversion_methods.return_type_with_export_macro):
* inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
(CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.generate_conversion_method_body):
* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/enum-values.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-array-type.json-result:
* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
* jit/JITCode.h:
(JSC::JITCode::findPC):
* jit/JITDivGenerator.cpp:
(JSC::JITDivGenerator::generateFastPath):
* jit/JITOperations.cpp:
* jit/PCToCodeOriginMap.cpp:
(JSC::PCToCodeOriginMap::findPC):
* jit/PCToCodeOriginMap.h:
* jsc.cpp:
(WTF::RuntimeArray::getOwnPropertySlot):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* parser/ModuleAnalyzer.cpp:
(JSC::ModuleAnalyzer::exportVariable):
* runtime/ConcurrentJSLock.h:
(JSC::ConcurrentJSLocker::ConcurrentJSLocker):
* runtime/DefinePropertyAttributes.h:
(JSC::DefinePropertyAttributes::writable):
(JSC::DefinePropertyAttributes::configurable):
(JSC::DefinePropertyAttributes::enumerable):
* runtime/GenericArgumentsInlines.h:
(JSC::GenericArguments<Type>::getOwnPropertySlot):
(JSC::GenericArguments<Type>::put):
(JSC::GenericArguments<Type>::deleteProperty):
(JSC::GenericArguments<Type>::defineOwnProperty):
* runtime/HasOwnPropertyCache.h:
(JSC::HasOwnPropertyCache::get):
* runtime/HashMapImpl.h:
(JSC::concurrentJSMapHash):
* runtime/Identifier.h:
(JSC::parseIndex):
* runtime/JSArray.cpp:
(JSC::JSArray::defineOwnProperty):
* runtime/JSCJSValue.cpp:
(JSC::JSValue::toNumberFromPrimitive):
(JSC::JSValue::putToPrimitive):
* runtime/JSCJSValue.h:
* runtime/JSGenericTypedArrayView.h:
(JSC::JSGenericTypedArrayView::toAdaptorNativeFromValueWithoutCoercion):
* runtime/JSGenericTypedArrayViewConstructorInlines.h:
(JSC::constructGenericTypedArrayViewWithArguments):
(JSC::constructGenericTypedArrayView):
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertySlot):
(JSC::JSGenericTypedArrayView<Adaptor>::put):
* runtime/JSModuleRecord.cpp:
* runtime/JSModuleRecord.h:
* runtime/JSObject.cpp:
(JSC::JSObject::putDirectAccessor):
(JSC::JSObject::deleteProperty):
(JSC::JSObject::putDirectMayBeIndex):
(JSC::JSObject::defineOwnProperty):
* runtime/JSObject.h:
(JSC::JSObject::getOwnPropertySlot):
(JSC::JSObject::getPropertySlot):
(JSC::JSObject::putOwnDataPropertyMayBeIndex):
* runtime/JSObjectInlines.h:
(JSC::JSObject::putInline):
* runtime/JSString.cpp:
(JSC::JSString::getStringPropertyDescriptor):
* runtime/JSString.h:
(JSC::JSString::getStringPropertySlot):
* runtime/LiteralParser.cpp:
(JSC::LiteralParser<CharType>::parse):
* runtime/MathCommon.h:
(JSC::safeReciprocalForDivByConst):
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncHasOwnProperty):
* runtime/PropertyDescriptor.h:
(JSC::toPropertyDescriptor):
* runtime/PropertyName.h:
(JSC::parseIndex):
* runtime/SamplingProfiler.cpp:
(JSC::SamplingProfiler::processUnverifiedStackTraces):
* runtime/StringObject.cpp:
(JSC::StringObject::put):
(JSC::isStringOwnProperty):
(JSC::StringObject::deleteProperty):
* runtime/ToNativeFromValue.h:
(JSC::toNativeFromValueWithoutCoercion):
* runtime/TypedArrayAdaptors.h:
(JSC::IntegralTypedArrayAdaptor::toNativeFromInt32WithoutCoercion):
(JSC::IntegralTypedArrayAdaptor::toNativeFromUint32WithoutCoercion):
(JSC::IntegralTypedArrayAdaptor::toNativeFromDoubleWithoutCoercion):
(JSC::FloatTypedArrayAdaptor::toNativeFromInt32WithoutCoercion):
(JSC::FloatTypedArrayAdaptor::toNativeFromDoubleWithoutCoercion):
(JSC::Uint8ClampedAdaptor::toNativeFromInt32WithoutCoercion):
(JSC::Uint8ClampedAdaptor::toNativeFromDoubleWithoutCoercion):
Source/WebCore:
Rename valueOr to value_or. This is specified in C++17 proposal.
Use Optional::emplace. C++17 Optional::operator=(Optional&&) requires
either copy assignment operator or move assignment operator. But
DFG::JSValueOperand etc. only defines move constructors and drop
implicit copy assignment operators.
It was OK in the previous WTF::Optional since it always uses move
constructors. But it is not valid in C++17 Optional. We use Optional::emplace
instead. This function has the same semantics to the previous WTF::Optional's
operator=.
No behavior change.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::parseAmount):
(WebCore::createContactFields):
(WebCore::toLineItemType):
(WebCore::createLineItem):
(WebCore::createLineItems):
(WebCore::createMerchantCapabilities):
(WebCore::createSupportedNetworks):
(WebCore::toShippingType):
(WebCore::createShippingMethod):
(WebCore::createShippingMethods):
(WebCore::createPaymentRequest):
(WebCore::toPaymentAuthorizationStatus):
* Modules/applepay/PaymentContact.h:
* Modules/applepay/PaymentCoordinator.cpp:
(WebCore::PaymentCoordinator::completeShippingMethodSelection):
(WebCore::PaymentCoordinator::completeShippingContactSelection):
(WebCore::PaymentCoordinator::completePaymentMethodSelection):
* Modules/applepay/PaymentCoordinator.h:
* Modules/applepay/PaymentCoordinatorClient.h:
* Modules/applepay/PaymentMerchantSession.h:
* Modules/applepay/PaymentRequest.h:
* Modules/applepay/cocoa/PaymentContactCocoa.mm:
(WebCore::PaymentContact::fromJS):
* Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm:
(WebCore::PaymentMerchantSession::fromJS):
* Modules/encryptedmedia/MediaKeyStatusMap.cpp:
(WebCore::MediaKeyStatusMap::Iterator::next):
* Modules/encryptedmedia/MediaKeyStatusMap.h:
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::extract):
* Modules/fetch/FetchBody.h:
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::FetchBodyOwner):
(WebCore::FetchBodyOwner::loadBlob):
(WebCore::FetchBodyOwner::finishBlobLoading):
* Modules/fetch/FetchBodyOwner.h:
* Modules/fetch/FetchHeaders.cpp:
(WebCore::FetchHeaders::Iterator::next):
* Modules/fetch/FetchHeaders.h:
* Modules/fetch/FetchRequest.cpp:
(WebCore::setReferrerPolicy):
(WebCore::setMode):
(WebCore::setCredentials):
(WebCore::setCache):
(WebCore::setRedirect):
(WebCore::setMethod):
(WebCore::setReferrer):
(WebCore::buildOptions):
(WebCore::FetchRequest::clone):
* Modules/fetch/FetchRequest.h:
(WebCore::FetchRequest::FetchRequest):
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::FetchResponse):
(WebCore::FetchResponse::cloneForJS):
(WebCore::FetchResponse::fetch):
(WebCore::FetchResponse::BodyLoader::didSucceed):
(WebCore::FetchResponse::BodyLoader::didFail):
(WebCore::FetchResponse::BodyLoader::didReceiveResponse):
(WebCore::FetchResponse::BodyLoader::stop):
* Modules/fetch/FetchResponse.h:
* Modules/geolocation/Coordinates.cpp:
(WebCore::Coordinates::altitude):
(WebCore::Coordinates::altitudeAccuracy):
(WebCore::Coordinates::heading):
(WebCore::Coordinates::speed):
* Modules/geolocation/Coordinates.h:
* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::stringToDirection):
* Modules/indexeddb/IDBCursor.h:
* Modules/indexeddb/IDBDatabase.h:
* Modules/indexeddb/IDBDatabaseIdentifier.h:
(WebCore::IDBDatabaseIdentifier::hash):
* Modules/indexeddb/IDBFactory.cpp:
(WebCore::IDBFactory::open):
* Modules/indexeddb/IDBFactory.h:
* Modules/indexeddb/IDBIndex.cpp:
(WebCore::IDBIndex::getAll):
(WebCore::IDBIndex::getAllKeys):
* Modules/indexeddb/IDBIndex.h:
* Modules/indexeddb/IDBKeyPath.h:
(WebCore::isolatedCopy):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::keyPath):
(WebCore::IDBObjectStore::getAll):
(WebCore::IDBObjectStore::getAllKeys):
* Modules/indexeddb/IDBObjectStore.h:
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::requestGetAllObjectStoreRecords):
(WebCore::IDBTransaction::requestGetAllIndexRecords):
* Modules/indexeddb/IDBTransaction.h:
* Modules/indexeddb/IDBVersionChangeEvent.cpp:
(WebCore::IDBVersionChangeEvent::IDBVersionChangeEvent):
* Modules/indexeddb/IDBVersionChangeEvent.h:
* Modules/indexeddb/server/IDBSerialization.cpp:
(WebCore::serializeIDBKeyPath):
(WebCore::deserializeIDBKeyPath):
* Modules/indexeddb/server/IDBSerialization.h:
* Modules/indexeddb/server/MemoryIndex.cpp:
(WebCore::IDBServer::MemoryIndex::getAllRecords):
* Modules/indexeddb/server/MemoryIndex.h:
* Modules/indexeddb/server/MemoryObjectStore.cpp:
(WebCore::IDBServer::MemoryObjectStore::getAllRecords):
* Modules/indexeddb/server/MemoryObjectStore.h:
* Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
(WebCore::IDBServer::MemoryObjectStoreCursor::objectStoreCleared):
(WebCore::IDBServer::MemoryObjectStoreCursor::keyDeleted):
(WebCore::IDBServer::MemoryObjectStoreCursor::setFirstInRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
(WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):
* Modules/indexeddb/server/MemoryObjectStoreCursor.h:
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::extractExistingDatabaseInfo):
* Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
(WebCore::IDBDatabaseInfo::createNewObjectStore):
* Modules/indexeddb/shared/IDBDatabaseInfo.h:
* Modules/indexeddb/shared/IDBGetAllRecordsData.h:
* Modules/indexeddb/shared/IDBObjectStoreInfo.cpp:
(WebCore::IDBObjectStoreInfo::IDBObjectStoreInfo):
* Modules/indexeddb/shared/IDBObjectStoreInfo.h:
(WebCore::IDBObjectStoreInfo::keyPath):
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::displayNameForTrack):
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::endOfStream):
(WebCore::MediaSource::streamEndedWithError):
* Modules/mediasource/MediaSource.h:
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::createOfferSucceeded):
(WebCore::PeerConnectionBackend::createOfferFailed):
(WebCore::PeerConnectionBackend::createAnswerSucceeded):
(WebCore::PeerConnectionBackend::createAnswerFailed):
(WebCore::PeerConnectionBackend::setLocalDescriptionSucceeded):
(WebCore::PeerConnectionBackend::setLocalDescriptionFailed):
(WebCore::PeerConnectionBackend::setRemoteDescriptionSucceeded):
(WebCore::PeerConnectionBackend::setRemoteDescriptionFailed):
(WebCore::PeerConnectionBackend::addIceCandidateSucceeded):
(WebCore::PeerConnectionBackend::addIceCandidateFailed):
(WebCore::PeerConnectionBackend::stop):
* Modules/mediastream/PeerConnectionBackend.h:
* Modules/mediastream/RTCDTMFSender.cpp:
(WebCore::RTCDTMFSender::insertDTMF):
* Modules/mediastream/RTCDTMFSender.h:
* Modules/mediastream/RTCIceCandidate.cpp:
(WebCore::RTCIceCandidate::create):
(WebCore::RTCIceCandidate::RTCIceCandidate):
* Modules/mediastream/RTCIceCandidate.h:
(WebCore::RTCIceCandidate::sdpMLineIndex):
* Modules/mediastream/SDPProcessor.cpp:
(WebCore::iceCandidateFromJSON):
* Modules/proximity/DeviceProximityEvent.h:
* Modules/streams/ReadableStreamSource.h:
(WebCore::ReadableStreamSource::startFinished):
(WebCore::ReadableStreamSource::pullFinished):
(WebCore::ReadableStreamSource::clean):
* Modules/webaudio/AudioBufferSourceNode.cpp:
(WebCore::AudioBufferSourceNode::start):
* Modules/webaudio/AudioBufferSourceNode.h:
* Modules/webdatabase/SQLResultSet.h:
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::close):
* Modules/websockets/WebSocket.h:
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::didReceiveSocketStreamData):
* Modules/websockets/WebSocketChannel.h:
* bindings/generic/IDLTypes.h:
(WebCore::IDLType::nullValue):
* bindings/js/CachedModuleScript.h:
(WebCore::CachedModuleScript::error):
* bindings/js/Dictionary.h:
(WebCore::Dictionary::get):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::toJS):
* bindings/js/IDBBindingUtilities.h:
* bindings/js/JSCryptoKeySerializationJWK.cpp:
(WebCore::JSCryptoKeySerializationJWK::reconcileAlgorithm):
* bindings/js/JSCryptoKeySerializationJWK.h:
* bindings/js/JSDOMConvert.h:
(WebCore::Detail::VariadicConverterBase::convert):
(WebCore::Detail::VariadicConverterBase<IDLInterface<T>>::convert):
(WebCore::convertVariadicArguments):
* bindings/js/JSDOMIterator.h:
(WebCore::IteratorTraits>::next):
* bindings/js/JSDOMPromise.h:
(WebCore::DOMPromise::DOMPromise):
(WebCore::DOMPromise::operator=):
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::getOwnPropertySlot):
* bindings/js/JSDictionary.h:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSFileCustom.cpp:
(WebCore::constructJSFile):
* bindings/js/JSHTMLAllCollectionCustom.cpp:
(WebCore::callHTMLAllCollection):
(WebCore::JSHTMLAllCollection::item):
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::JSHTMLCanvasElement::toDataURL):
* bindings/js/JSImageConstructor.cpp:
(WebCore::JSImageConstructor::construct):
* bindings/js/JSMediaDevicesCustom.cpp:
(WebCore::createStringConstraint):
(WebCore::createBooleanConstraint):
(WebCore::createDoubleConstraint):
(WebCore::createIntConstraint):
* bindings/js/JSWebKitSubtleCryptoCustom.cpp:
(WebCore::importKey):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::setupModuleScriptHandlers):
(WebCore::ScriptController::executeScriptInWorld):
(WebCore::ScriptController::executeScript):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
(GenerateEnumerationImplementationContent):
(GenerateEnumerationHeaderContent):
(GenerateDefaultValue):
(GenerateImplementation):
(GenerateParametersCheck):
* bindings/scripts/test/JS/JSFloat64Array.cpp:
(WebCore::JSFloat64Array::getOwnPropertySlot):
(WebCore::JSFloat64Array::getOwnPropertyDescriptor):
(WebCore::JSFloat64Array::put):
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
(WebCore::JSTestEventTarget::getOwnPropertySlot):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::parseEnumeration<TestObj::EnumType>):
(WebCore::parseEnumeration<TestObj::Optional>):
(WebCore::parseEnumeration<AlternateEnumName>):
(WebCore::parseEnumeration<TestObj::EnumA>):
(WebCore::parseEnumeration<TestObj::EnumB>):
(WebCore::parseEnumeration<TestObj::EnumC>):
(WebCore::parseEnumeration<TestObj::Kind>):
(WebCore::parseEnumeration<TestObj::Size>):
(WebCore::parseEnumeration<TestObj::Confidence>):
(WebCore::convertDictionary<TestObj::Dictionary>):
(WebCore::JSTestObj::getOwnPropertySlot):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArgCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArgCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArgCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgsCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLongCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequenceCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBooleanCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalRecordCaller):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod2Caller):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2Caller):
(WebCore::jsTestObjConstructorFunctionClassMethodWithOptional):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentCaller):
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp:
(WebCore::parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>):
* bindings/scripts/test/JS/JSTestStandaloneDictionary.h:
* bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp:
(WebCore::parseEnumeration<TestStandaloneEnumeration>):
* bindings/scripts/test/JS/JSTestStandaloneEnumeration.h:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::jsTestTypedefsPrototypeFunctionSetShadowCaller):
(WebCore::jsTestTypedefsPrototypeFunctionFuncWithClampCaller):
* bridge/runtime_array.cpp:
(JSC::RuntimeArray::getOwnPropertySlot):
(JSC::RuntimeArray::put):
* crypto/CryptoAlgorithmRegistry.cpp:
(WebCore::CryptoAlgorithmRegistry::identifier):
* crypto/CryptoAlgorithmRegistry.h:
* crypto/CryptoKeySerialization.h:
* crypto/JsonWebKey.h:
* crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
(WebCore::CryptoAlgorithmAES_CBC::importKey):
* crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
(WebCore::CryptoAlgorithmAES_KW::importKey):
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
(WebCore::CryptoAlgorithmHMAC::generateKey):
(WebCore::CryptoAlgorithmHMAC::importKey):
* crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
(WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::importKey):
* crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
(WebCore::calculateSignature):
* crypto/keys/CryptoKeyAES.h:
* crypto/keys/CryptoKeyHMAC.h:
* crypto/keys/CryptoKeyRSA.cpp:
(WebCore::CryptoKeyRSA::importJwk):
* crypto/keys/CryptoKeyRSA.h:
* crypto/keys/CryptoKeySerializationRaw.cpp:
(WebCore::CryptoKeySerializationRaw::reconcileAlgorithm):
* crypto/keys/CryptoKeySerializationRaw.h:
* crypto/mac/CryptoAlgorithmHMACMac.cpp:
(WebCore::commonCryptoHMACAlgorithm):
* crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
(WebCore::cryptoDigestAlgorithm):
* crypto/parameters/CryptoAlgorithmHmacKeyParams.h:
* crypto/parameters/CryptoAlgorithmRsaOaepParams.h:
* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::calculateStyleMask):
(WebCore::CSSFontFace::calculateWeightMask):
* css/CSSFontFace.h:
* css/CSSFontFaceSet.cpp:
(WebCore::computeFontTraitsMask):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::doubleValue):
(WebCore::CSSPrimitiveValue::doubleValueInternal):
* css/CSSPrimitiveValue.h:
* css/CSSPropertyNames.in:
* css/CSSSegmentedFontFace.cpp:
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::create):
(WebCore::CSSStyleSheet::CSSStyleSheet):
(WebCore::CSSStyleSheet::addRule):
* css/CSSStyleSheet.h:
* css/FontFace.cpp:
(WebCore::FontFace::fontStateChanged):
* css/FontFace.h:
* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::completedLoading):
* css/FontFaceSet.h:
* css/MediaQueryEvaluator.cpp:
(WebCore::doubleValue):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertGridPosition):
(WebCore::StyleBuilderConverter::convertWordSpacing):
(WebCore::StyleBuilderConverter::convertPerspective):
(WebCore::StyleBuilderConverter::convertMarqueeIncrement):
(WebCore::StyleBuilderConverter::convertFilterOperations):
(WebCore::StyleBuilderConverter::convertLineHeight):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueLineHeight):
* css/StyleRuleImport.cpp:
(WebCore::StyleRuleImport::requestStyleSheet):
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseCubicBezierTimingFunctionValue):
(WebCore::CSSParser::parseSpringTimingFunctionValue):
(WebCore::CSSParser::parseColorFunctionParameters):
(WebCore::CSSParser::parseColorFromValue):
* css/parser/CSSParser.h:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateAddStyleRelationIfResolvingStyle):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateAddStyleRelation):
* dom/CustomElementReactionQueue.cpp:
* dom/Document.cpp:
(WebCore::Document::lastModified):
* dom/Element.cpp:
(WebCore::Element::scrollBy):
(WebCore::Element::getIntegralAttribute):
(WebCore::Element::getUnsignedIntegralAttribute):
(WebCore::Element::resolveCustomStyle):
* dom/Element.h:
* dom/ElementIteratorAssertions.h:
(WebCore::ElementIteratorAssertions::dropEventDispatchAssertion):
(WebCore::ElementIteratorAssertions::clear):
* dom/ExceptionOr.h:
* dom/InlineStyleSheetOwner.cpp:
(WebCore::makeInlineStyleSheetCacheKey):
* dom/KeyboardEvent.h:
* dom/LoadableClassicScript.cpp:
(WebCore::LoadableClassicScript::error):
* dom/LoadableClassicScript.h:
* dom/LoadableModuleScript.cpp:
(WebCore::LoadableModuleScript::error):
* dom/LoadableModuleScript.h:
* dom/LoadableScript.h:
* dom/MessageEvent.cpp:
(WebCore::MessageEvent::MessageEvent):
(WebCore::MessageEvent::create):
(WebCore::MessageEvent::initMessageEvent):
* dom/MessageEvent.h:
* dom/MutationObserver.cpp:
(WebCore::MutationObserver::observe):
* dom/MutationObserver.h:
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::checkStyleSheet):
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::resolveCustomStyle):
* dom/PseudoElement.h:
* dom/RangeBoundaryPoint.h:
(WebCore::RangeBoundaryPoint::setToBeforeChild):
(WebCore::RangeBoundaryPoint::setToAfterChild):
(WebCore::RangeBoundaryPoint::setToEndOfNode):
(WebCore::RangeBoundaryPoint::invalidateOffset):
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::determineScriptType):
(WebCore::ScriptElement::prepareScript):
(WebCore::ScriptElement::executeScriptAndDispatchEvent):
* dom/ScriptElement.h:
* dom/TextDecoder.cpp:
(WebCore::TextDecoder::decode):
* dom/TextDecoder.h:
* dom/UserGestureIndicator.cpp:
(WebCore::UserGestureIndicator::UserGestureIndicator):
* dom/UserGestureIndicator.h:
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::moveParagraphs):
* editing/CompositeEditCommand.h:
* fileapi/File.h:
* history/CachedFrame.h:
(WebCore::CachedFrame::hasInsecureContent):
* html/DOMTokenList.cpp:
(WebCore::DOMTokenList::toggle):
* html/DOMTokenList.h:
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::handleClick):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::toDataURL):
* html/HTMLCanvasElement.h:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::parseBorderWidthAttribute):
(WebCore::HTMLElement::parseAttribute):
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::createForJSConstructor):
(WebCore::HTMLImageElement::width):
(WebCore::HTMLImageElement::height):
* html/HTMLImageElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::findClosestTickMarkValue):
(WebCore::HTMLInputElement::maxLengthAttributeChanged):
(WebCore::HTMLInputElement::minLengthAttributeChanged):
* html/HTMLInputElement.h:
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process):
(WebCore::HTMLLinkElement::initializeStyleSheet):
(WebCore::HTMLLinkElement::iconType):
* html/HTMLLinkElement.h:
* html/HTMLOListElement.h:
* html/HTMLOptionsCollection.cpp:
(WebCore::HTMLOptionsCollection::add):
* html/HTMLOptionsCollection.h:
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::add):
(WebCore::HTMLSelectElement::setLength):
* html/HTMLSelectElement.h:
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::maxLengthAttributeChanged):
(WebCore::HTMLTextAreaElement::minLengthAttributeChanged):
* html/ImageInputType.cpp:
(WebCore::ImageInputType::height):
(WebCore::ImageInputType::width):
* html/InputType.cpp:
(WebCore::InputType::findClosestTickMarkValue):
* html/InputType.h:
* html/LinkIconCollector.cpp:
* html/LinkRelAttribute.h:
* html/RangeInputType.cpp:
(WebCore::RangeInputType::findClosestTickMarkValue):
* html/RangeInputType.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::restore):
(WebCore::CanvasRenderingContext2D::setStrokeColor):
(WebCore::CanvasRenderingContext2D::setFillColor):
(WebCore::CanvasRenderingContext2D::isPointInPathInternal):
(WebCore::CanvasRenderingContext2D::isPointInStrokeInternal):
(WebCore::CanvasRenderingContext2D::setShadow):
(WebCore::CanvasRenderingContext2D::fillText):
(WebCore::CanvasRenderingContext2D::strokeText):
(WebCore::CanvasRenderingContext2D::drawTextInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/WebGL2RenderingContext.cpp:
(WebCore::arrayBufferViewElementSize):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::bufferData):
(WebCore::WebGLRenderingContextBase::bufferSubData):
(WebCore::WebGLRenderingContextBase::texSubImage2D):
(WebCore::WebGLRenderingContextBase::validateArrayBufferType):
(WebCore::WebGLRenderingContextBase::validateTexFuncData):
(WebCore::WebGLRenderingContextBase::texImage2D):
* html/canvas/WebGLRenderingContextBase.h:
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::indexOfFirstUnopenFormattingElement):
(WebCore::HTMLConstructionSite::reconstructTheActiveFormattingElements):
* html/parser/HTMLConstructionSite.h:
* html/parser/HTMLParserIdioms.cpp:
(WebCore::parseHTMLIntegerInternal):
(WebCore::parseHTMLInteger):
(WebCore::parseHTMLNonNegativeInteger):
(WebCore::parseValidHTMLNonNegativeIntegerInternal):
(WebCore::parseValidHTMLNonNegativeInteger):
(WebCore::parseValidHTMLFloatingPointNumberInternal):
(WebCore::parseValidHTMLFloatingPointNumber):
(WebCore::parseHTTPRefreshInternal):
* html/parser/HTMLParserIdioms.h:
(WebCore::limitToOnlyHTMLNonNegative):
* html/parser/HTMLSrcsetParser.cpp:
(WebCore::parseDescriptors):
* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::setPositionFromPoint):
(WebCore::SliderThumbElement::resolveCustomStyle):
(WebCore::SliderContainerElement::resolveCustomStyle):
* html/shadow/SliderThumbElement.h:
* html/shadow/TextControlInnerElements.cpp:
(WebCore::TextControlInnerElement::resolveCustomStyle):
(WebCore::TextControlInnerTextElement::resolveCustomStyle):
(WebCore::TextControlPlaceholderElement::resolveCustomStyle):
* html/shadow/TextControlInnerElements.h:
* html/track/TrackEvent.h:
* inspector/InspectorIndexedDBAgent.cpp:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didFinishXHRLoading):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::addRule):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::setInstruments):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::startIconLoading):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequestWithPreflight):
(WebCore::DocumentThreadableLoader::clearResource):
(WebCore::DocumentThreadableLoader::preflightSuccess):
(WebCore::DocumentThreadableLoader::preflightFailure):
* loader/DocumentThreadableLoader.h:
* loader/EmptyClients.cpp:
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::urlSelected):
(WebCore::FrameLoader::receivedFirstData):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::open):
(WebCore::FrameLoader::dispatchDidCommitLoad):
(WebCore::FrameLoader::clearTestingOverrides):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::resourceTypeFromAsAttribute):
(WebCore::LinkLoader::loadLink):
* loader/LinkLoader.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::SubresourceLoader):
(WebCore::SubresourceLoader::didReceiveResponse):
(WebCore::SubresourceLoader::notifyDone):
* loader/SubresourceLoader.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::setLoadPriority):
* loader/cache/CachedResource.h:
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::CachedResourceRequest):
* loader/cache/CachedResourceRequest.h:
(WebCore::CachedResourceRequest::priority):
* mathml/MathMLElement.h:
(WebCore::MathMLElement::specifiedDisplayStyle):
(WebCore::MathMLElement::specifiedMathVariant):
* mathml/MathMLFractionElement.cpp:
(WebCore::MathMLFractionElement::cachedFractionAlignment):
(WebCore::MathMLFractionElement::parseAttribute):
* mathml/MathMLFractionElement.h:
* mathml/MathMLMathElement.cpp:
(WebCore::MathMLMathElement::specifiedDisplayStyle):
(WebCore::MathMLMathElement::parseAttribute):
* mathml/MathMLMathElement.h:
* mathml/MathMLMencloseElement.cpp:
(WebCore::MathMLMencloseElement::parseAttribute):
* mathml/MathMLMencloseElement.h:
* mathml/MathMLOperatorDictionary.cpp:
(WebCore::MathMLOperatorDictionary::search):
* mathml/MathMLOperatorDictionary.h:
* mathml/MathMLOperatorElement.cpp:
(WebCore::MathMLOperatorElement::computeOperatorFlag):
(WebCore::MathMLOperatorElement::childrenChanged):
(WebCore::attributeNameToPropertyFlag):
(WebCore::MathMLOperatorElement::parseAttribute):
* mathml/MathMLOperatorElement.h:
* mathml/MathMLPaddedElement.cpp:
(WebCore::MathMLPaddedElement::parseAttribute):
* mathml/MathMLPaddedElement.h:
* mathml/MathMLPresentationElement.cpp:
(WebCore::MathMLPresentationElement::cachedBooleanAttribute):
(WebCore::MathMLPresentationElement::cachedMathMLLength):
(WebCore::MathMLPresentationElement::specifiedDisplayStyle):
(WebCore::MathMLPresentationElement::specifiedMathVariant):
(WebCore::MathMLPresentationElement::parseAttribute):
* mathml/MathMLPresentationElement.h:
(WebCore::MathMLPresentationElement::toOptionalBool):
* mathml/MathMLScriptsElement.cpp:
(WebCore::MathMLScriptsElement::parseAttribute):
* mathml/MathMLScriptsElement.h:
* mathml/MathMLSpaceElement.cpp:
(WebCore::MathMLSpaceElement::parseAttribute):
* mathml/MathMLSpaceElement.h:
* mathml/MathMLTokenElement.cpp:
(WebCore::MathMLTokenElement::convertToSingleCodePoint):
* mathml/MathMLTokenElement.h:
* mathml/MathMLUnderOverElement.cpp:
(WebCore::MathMLUnderOverElement::parseAttribute):
* mathml/MathMLUnderOverElement.h:
* page/ChromeClient.h:
* page/DOMTimer.cpp:
(WebCore::DOMTimer::alignedFireTime):
* page/DOMTimer.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::scrollBy):
* page/DOMWindow.h:
* page/EventSource.cpp:
(WebCore::EventSource::parseEventStream):
(WebCore::EventSource::parseEventStreamLine):
* page/EventSource.h:
* page/FrameView.cpp:
(WebCore::FrameView::recalculateScrollbarOverlayStyle):
(WebCore::FrameView::setLayoutViewportOverrideRect):
(WebCore::FrameView::setViewExposedRect):
* page/FrameView.h:
* page/Page.cpp:
(WebCore::Page::takeAnyMediaCanStartListener):
* page/Page.h:
(WebCore::Page::eventThrottlingBehaviorOverride):
(WebCore::Page::setEventThrottlingBehaviorOverride):
* page/ScrollToOptions.h:
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::SecurityOrigin):
(WebCore::SecurityOrigin::create):
* page/SecurityOrigin.h:
(WebCore::SecurityOrigin::port):
* page/SecurityOriginData.cpp:
(WebCore::SecurityOriginData::debugString):
(WebCore::SecurityOriginData::databaseIdentifier):
(WebCore::SecurityOriginData::fromDatabaseIdentifier):
* page/SecurityOriginData.h:
(WebCore::SecurityOriginData::SecurityOriginData):
(WebCore::SecurityOriginData::isEmpty):
(WebCore::SecurityOriginDataHash::hash):
* page/SecurityOriginHash.h:
(WebCore::SecurityOriginHash::hash):
* page/WindowFeatures.cpp:
(WebCore::parseDialogFeatures):
(WebCore::boolFeature):
(WebCore::floatFeature):
* page/WindowFeatures.h:
* page/csp/ContentSecurityPolicySource.cpp:
(WebCore::ContentSecurityPolicySource::ContentSecurityPolicySource):
(WebCore::ContentSecurityPolicySource::portMatches):
* page/csp/ContentSecurityPolicySource.h:
* page/csp/ContentSecurityPolicySourceList.cpp:
(WebCore::ContentSecurityPolicySourceList::parse):
(WebCore::ContentSecurityPolicySourceList::parseSource):
(WebCore::ContentSecurityPolicySourceList::parsePort):
* page/csp/ContentSecurityPolicySourceList.h:
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
(WebCore::AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll):
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
(WebCore::AsyncScrollingCoordinator::reconcileScrollingState):
* page/scrolling/AsyncScrollingCoordinator.h:
(WebCore::AsyncScrollingCoordinator::ScheduledScrollUpdate::ScheduledScrollUpdate):
* page/scrolling/ScrollingCoordinator.h:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::scrollPositionChangedViaDelegatedScrolling):
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::setScrollPositionWithoutContentEdgeConstraints):
* page/scrolling/ThreadedScrollingTree.cpp:
(WebCore::ThreadedScrollingTree::scrollingTreeNodeDidScroll):
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::setScrollPositionWithoutContentEdgeConstraints):
* page/scrolling/ios/ScrollingTreeIOS.cpp:
(WebCore::ScrollingTreeIOS::scrollingTreeNodeDidScroll):
* page/scrolling/ios/ScrollingTreeIOS.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollPositionWithoutContentEdgeConstraints):
* platform/DragImage.cpp:
* platform/LinkIcon.h:
* platform/MemoryPressureHandler.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::handleDeferredScrollUpdateAfterContentSizeChange):
* platform/ScrollView.h:
* platform/Theme.h:
(WebCore::Theme::controlFont):
* platform/Timer.h:
(WebCore::TimerBase::alignedFireTime):
* platform/URL.cpp:
(WebCore::URL::port):
(WebCore::defaultPortForProtocol):
(WebCore::portAllowed):
* platform/URL.h:
* platform/URLParser.cpp:
(WebCore::URLParser::defaultPortForProtocol):
(WebCore::findLongestZeroSequence):
(WebCore::URLParser::parseIPv4Piece):
(WebCore::URLParser::parseIPv4Host):
(WebCore::URLParser::parseIPv4PieceInsideIPv6):
(WebCore::URLParser::parseIPv4AddressInsideIPv6):
(WebCore::URLParser::parseIPv6Host):
(WebCore::URLParser::domainToASCII):
(WebCore::URLParser::formURLDecode):
* platform/URLParser.h:
* platform/graphics/BitmapImage.h:
* platform/graphics/Color.h:
(WebCore::colorWithOverrideAlpha):
* platform/graphics/DisplayRefreshMonitorClient.h:
* platform/graphics/Font.h:
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::drawText):
(WebCore::FontCascade::drawEmphasisMarks):
(WebCore::FontCascade::adjustSelectionRectForText):
(WebCore::FontCascade::getEmphasisMarkGlyphData):
(WebCore::FontCascade::emphasisMarkAscent):
(WebCore::FontCascade::emphasisMarkDescent):
(WebCore::FontCascade::emphasisMarkHeight):
* platform/graphics/FontCascade.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::drawText):
(WebCore::GraphicsContext::drawEmphasisMarks):
(WebCore::GraphicsContext::drawBidiText):
* platform/graphics/GraphicsContext.h:
(WebCore::InterpolationQualityMaintainer::InterpolationQualityMaintainer):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setPosition):
(WebCore::GraphicsLayer::setApproximatePosition):
* platform/graphics/Image.h:
(WebCore::Image::hotSpot):
* platform/graphics/ImageBuffer.h:
* platform/graphics/ImageFrameCache.cpp:
(WebCore::ImageFrameCache::clearMetadata):
(WebCore::ImageFrameCache::metadata):
(WebCore::ImageFrameCache::frameMetadataAtIndex):
(WebCore::ImageFrameCache::hotSpot):
* platform/graphics/ImageFrameCache.h:
* platform/graphics/ImageSource.h:
(WebCore::ImageSource::hotSpot):
* platform/graphics/PathUtilities.cpp:
(WebCore::rectFromPolygon):
(WebCore::PathUtilities::pathWithShrinkWrappedRectsForOutline):
* platform/graphics/ShadowBlur.cpp:
(WebCore::ShadowBlur::calculateLayerBoundingRect):
* platform/graphics/TiledBacking.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::flush):
(WebCore::SourceBufferPrivateAVFObjC::naturalSize):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::computeVisibleAndCoverageRect):
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::setLayoutViewportRect):
* platform/graphics/ca/TileController.h:
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::encodeImage):
(WebCore::dataURL):
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/cg/ImageDecoderCG.cpp:
(WebCore::ImageDecoder::hotSpot):
* platform/graphics/cg/ImageDecoderCG.h:
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::openTypeFeature):
(WebCore::advanceForColorBitmapFont):
* platform/graphics/displaylists/DisplayListItems.cpp:
(WebCore::DisplayList::DrawGlyphs::localBounds):
(WebCore::DisplayList::DrawLine::localBounds):
(WebCore::DisplayList::DrawLinesForText::localBounds):
(WebCore::DisplayList::DrawLineForDocumentMarker::localBounds):
(WebCore::DisplayList::DrawFocusRingPath::localBounds):
(WebCore::DisplayList::DrawFocusRingRects::localBounds):
(WebCore::DisplayList::StrokeRect::localBounds):
(WebCore::DisplayList::StrokePath::localBounds):
(WebCore::DisplayList::StrokeEllipse::localBounds):
* platform/graphics/displaylists/DisplayListItems.h:
(WebCore::DisplayList::DrawingItem::localBounds):
* platform/graphics/displaylists/DisplayListRecorder.cpp:
(WebCore::DisplayList::Recorder::updateItemExtent):
(WebCore::DisplayList::Recorder::ContextState::rotate):
(WebCore::DisplayList::Recorder::ContextState::concatCTM):
* platform/graphics/efl/ImageBufferEfl.cpp:
(WebCore::encodeImageJPEG):
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/filters/Filter.h:
(WebCore::Filter::mapAbsolutePointToLocalPoint):
* platform/graphics/gtk/ImageBufferGtk.cpp:
(WebCore::encodeImage):
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
(WebCore::HarfBuzzShaper::selectionRect):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::capitalized):
(WebCore::shouldSynthesize):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
(WebCore::TextureMapperLayer::replicaTransform):
(WebCore::TextureMapperLayer::mapScrollOffset):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::transformedVisibleRect):
(WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
* platform/graphics/transforms/AffineTransform.cpp:
(WebCore::AffineTransform::inverse):
* platform/graphics/transforms/AffineTransform.h:
* platform/graphics/transforms/TransformState.cpp:
(WebCore::TransformState::mappedPoint):
(WebCore::TransformState::mappedSecondaryQuad):
(WebCore::TransformState::mapQuad):
(WebCore::TransformState::flattenWithTransform):
* platform/graphics/transforms/TransformState.h:
* platform/graphics/transforms/TransformationMatrix.cpp:
(WebCore::TransformationMatrix::inverse):
* platform/graphics/transforms/TransformationMatrix.h:
* platform/graphics/win/ImageBufferDirect2D.cpp:
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/win/ImageDecoderDirect2D.cpp:
(WebCore::ImageDecoder::hotSpot):
* platform/graphics/win/ImageDecoderDirect2D.h:
* platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::supportsXDamage):
* platform/graphics/x11/PlatformDisplayX11.h:
* platform/image-decoders/ImageDecoder.h:
(WebCore::ImageDecoder::hotSpot):
* platform/image-decoders/ico/ICOImageDecoder.cpp:
(WebCore::ICOImageDecoder::hotSpot):
(WebCore::ICOImageDecoder::hotSpotAtIndex):
* platform/image-decoders/ico/ICOImageDecoder.h:
* platform/image-encoders/JPEGImageEncoder.cpp:
(WebCore::compressRGBABigEndianToJPEG):
* platform/image-encoders/JPEGImageEncoder.h:
* platform/ios/LegacyTileCache.h:
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::setOverrideVisibleRect):
* platform/ios/LegacyTileLayer.mm:
(-[LegacyTileHostLayer renderInContext:]):
* platform/linux/MemoryPressureHandlerLinux.cpp:
* platform/mac/ThemeMac.h:
* platform/mac/ThemeMac.mm:
(WebCore::ThemeMac::controlFont):
* platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::set):
* platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::width):
(WebCore::MediaTrackConstraintSetMap::height):
(WebCore::MediaTrackConstraintSetMap::sampleRate):
(WebCore::MediaTrackConstraintSetMap::sampleSize):
(WebCore::MediaTrackConstraintSetMap::aspectRatio):
(WebCore::MediaTrackConstraintSetMap::frameRate):
(WebCore::MediaTrackConstraintSetMap::volume):
(WebCore::MediaTrackConstraintSetMap::echoCancellation):
(WebCore::MediaTrackConstraintSetMap::facingMode):
(WebCore::MediaTrackConstraintSetMap::deviceId):
(WebCore::MediaTrackConstraintSetMap::groupId):
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::supportsSizeAndFrameRate):
(WebCore::RealtimeMediaSource::applySizeAndFrameRate):
(WebCore::RealtimeMediaSource::applyConstraints):
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/mac/AVVideoCaptureSource.h:
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::applySizeAndFrameRate):
(WebCore::AVVideoCaptureSource::bestSessionPresetForVideoDimensions):
(WebCore::AVVideoCaptureSource::supportsSizeAndFrameRate):
* platform/mediastream/openwebrtc/MediaEndpointOwr.h:
* platform/network/CacheValidation.cpp:
(WebCore::computeCurrentAge):
(WebCore::computeFreshnessLifetimeForHTTPFamily):
* platform/network/CacheValidation.h:
* platform/network/DataURLDecoder.h:
* platform/network/HTTPHeaderMap.h:
(WebCore::HTTPHeaderMap::HTTPHeaderMapConstIterator::updateKeyValue):
* platform/network/HTTPParsers.cpp:
(WebCore::parseHTTPDate):
* platform/network/HTTPParsers.h:
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::didReceiveResponse):
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::cacheControlMaxAge):
(WebCore::parseDateValueInHeader):
(WebCore::ResourceResponseBase::date):
(WebCore::ResourceResponseBase::age):
(WebCore::ResourceResponseBase::expires):
(WebCore::ResourceResponseBase::lastModified):
* platform/network/ResourceResponseBase.h:
(WebCore::ResourceResponseBase::certificateInfo):
* platform/network/SocketStreamHandle.h:
* platform/network/SocketStreamHandleClient.h:
* platform/network/cf/SocketStreamHandleImpl.h:
* platform/network/cf/SocketStreamHandleImplCFNet.cpp:
(WebCore::SocketStreamHandleImpl::readStreamCallback):
(WebCore::SocketStreamHandleImpl::platformSend):
* platform/network/curl/SocketStreamHandleImpl.h:
* platform/network/curl/SocketStreamHandleImplCurl.cpp:
(WebCore::SocketStreamHandleImpl::platformSend):
* platform/network/mac/CookieJarMac.mm:
(WebCore::cookiesInPartitionForURL):
* platform/network/soup/SocketStreamHandleImpl.h:
* platform/network/soup/SocketStreamHandleImplSoup.cpp:
(WebCore::SocketStreamHandleImpl::readBytes):
(WebCore::SocketStreamHandleImpl::platformSend):
* rendering/BreakLines.h:
(WebCore::nextBreakablePositionNonLoosely):
(WebCore::nextBreakablePositionLoosely):
(WebCore::isBreakable):
* rendering/HitTestingTransformState.cpp:
(WebCore::HitTestingTransformState::flattenWithTransform):
* rendering/ImageQualityController.cpp:
(WebCore::ImageQualityController::interpolationQualityFromStyle):
(WebCore::ImageQualityController::chooseInterpolationQuality):
* rendering/ImageQualityController.h:
* rendering/InlineIterator.h:
(WebCore::InlineIterator::moveTo):
(WebCore::InlineIterator::nextBreakablePosition):
(WebCore::InlineIterator::setNextBreakablePosition):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::substringToRender):
(WebCore::InlineTextBox::hyphenatedStringForTextRun):
(WebCore::InlineTextBox::constructTextRun):
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::substringToRender):
(WebCore::InlineTextBox::hyphenatedStringForTextRun):
(WebCore::InlineTextBox::constructTextRun):
* rendering/OrderIterator.cpp:
(WebCore::OrderIterator::reset):
* rendering/OrderIterator.h:
* rendering/PaintInfo.h:
(WebCore::PaintInfo::applyTransform):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlockRareData::RenderBlockRareData):
(WebCore::RenderBlock::baselinePosition):
(WebCore::RenderBlock::firstLineBaseline):
(WebCore::RenderBlock::inlineBlockBaseline):
(WebCore::RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::firstLineBaseline):
(WebCore::RenderBlockFlow::inlineBlockBaseline):
* rendering/RenderBlockFlow.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::constrainLogicalHeightByMinMax):
(WebCore::RenderBox::constrainContentBoxLogicalHeightByMinMax):
(WebCore::RenderBox::overrideContainingBlockContentLogicalWidth):
(WebCore::RenderBox::overrideContainingBlockContentLogicalHeight):
(WebCore::RenderBox::setOverrideContainingBlockContentLogicalWidth):
(WebCore::RenderBox::setOverrideContainingBlockContentLogicalHeight):
(WebCore::RenderBox::adjustContentBoxLogicalHeightForBoxSizing):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computeLogicalHeightUsing):
(WebCore::RenderBox::computeContentLogicalHeight):
(WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing):
(WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
(WebCore::RenderBox::availableLogicalHeight):
(WebCore::RenderBox::availableLogicalHeightUsing):
* rendering/RenderBox.h:
(WebCore::RenderBox::firstLineBaseline):
(WebCore::RenderBox::inlineBlockBaseline):
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::computeTextOrigin):
* rendering/RenderCombineText.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::baselinePosition):
(WebCore::RenderFlexibleBox::firstLineBaseline):
(WebCore::RenderFlexibleBox::inlineBlockBaseline):
(WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):
(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
(WebCore::RenderFlexibleBox::marginBoxAscentForChild):
(WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing):
(WebCore::RenderFlexibleBox::adjustChildSizeForAspectRatioCrossAxisMinAndMax):
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
* rendering/RenderFlexibleBox.h:
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::addForcedRegionBreak):
* rendering/RenderGrid.cpp:
(WebCore::GridTrack::setGrowthLimit):
(WebCore::GridTrack::setGrowthLimitCap):
(WebCore::GridTrack::growthLimitCap):
(WebCore::RenderGrid::GridSizingData::freeSpace):
(WebCore::RenderGrid::GridSizingData::availableSpace):
(WebCore::RenderGrid::GridSizingData::setAvailableSpace):
(WebCore::RenderGrid::GridSizingData::setFreeSpace):
(WebCore::RenderGrid::layoutBlock):
(WebCore::RenderGrid::computeIntrinsicLogicalWidths):
(WebCore::RenderGrid::computeIntrinsicLogicalHeight):
(WebCore::RenderGrid::computeIntrinsicLogicalContentHeightUsing):
(WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
(WebCore::overrideContainingBlockContentSizeForChild):
(WebCore::setOverrideContainingBlockContentSizeForChild):
(WebCore::RenderGrid::logicalHeightForChild):
(WebCore::RenderGrid::minSizeForChild):
(WebCore::RenderGrid::minContentForChild):
(WebCore::RenderGrid::maxContentForChild):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
(WebCore::sortByGridTrackGrowthPotential):
(WebCore::RenderGrid::tracksAreWiderThanMinTrackBreadth):
(WebCore::RenderGrid::computeAutoRepeatTracksCount):
(WebCore::RenderGrid::applyStretchAlignmentToTracksIfNeeded):
(WebCore::RenderGrid::layoutGridItems):
* rendering/RenderGrid.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayerByApplyingTransform):
(WebCore::RenderLayer::hitTestLayer):
* rendering/RenderLayerBacking.cpp:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintItem):
(WebCore::RenderListBox::listIndexIsVisible):
(WebCore::RenderListBox::computeFirstIndexesVisibleInPaddingTopBottomAreas):
* rendering/RenderListBox.h:
* rendering/RenderMenuList.h:
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::calculateMaxColumnHeight):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
(WebCore::RenderTable::baselinePosition):
(WebCore::RenderTable::inlineBlockBaseline):
(WebCore::RenderTable::firstLineBaseline):
* rendering/RenderTable.h:
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::cellBaselinePosition):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::firstLineBaseline):
* rendering/RenderTableSection.h:
* rendering/RenderText.cpp:
(WebCore::RenderText::computePreferredLogicalWidths):
(WebCore::RenderText::stringView):
* rendering/RenderText.h:
* rendering/RenderTextControl.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::setSelection):
(WebCore::RenderView::splitSelectionBetweenSubtrees):
(WebCore::RenderView::getSelection):
(WebCore::RenderView::clearSelection):
* rendering/RenderView.h:
* rendering/SelectionSubtreeRoot.h:
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::SelectionSubtreeData):
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::selectionStartPos):
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::selectionEndPos):
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::setSelectionStartPos):
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::setSelectionEndPos):
(WebCore::SelectionSubtreeRoot::SelectionSubtreeData::clearSelection):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::LineState::lastFragment):
(WebCore::SimpleLineLayout::closeLineEndingAndAdjustRuns):
(WebCore::SimpleLineLayout::createTextRuns):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
* rendering/line/BreakingContext.h:
(WebCore::WordTrailingSpace::width):
(WebCore::BreakingContext::commitLineBreakAtCurrentWidth):
(WebCore::BreakingContext::InlineIteratorHistory::nextBreakablePosition):
(WebCore::BreakingContext::InlineIteratorHistory::moveTo):
(WebCore::tryHyphenating):
(WebCore::BreakingContext::computeAdditionalBetweenWordsWidth):
(WebCore::BreakingContext::handleText):
(WebCore::BreakingContext::optimalLineBreakLocationForTrailingWord):
* rendering/mathml/MathMLStyle.cpp:
(WebCore::MathMLStyle::resolveMathMLStyle):
* rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::baselinePosition):
(WebCore::RenderMathMLTable::firstLineBaseline):
* rendering/mathml/RenderMathMLBlock.h:
(WebCore::RenderMathMLBlock::ascentForChild):
* rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::firstLineBaseline):
* rendering/mathml/RenderMathMLFraction.h:
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::firstLineBaseline):
* rendering/mathml/RenderMathMLOperator.h:
* rendering/mathml/RenderMathMLPadded.cpp:
(WebCore::RenderMathMLPadded::firstLineBaseline):
* rendering/mathml/RenderMathMLPadded.h:
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::firstLineBaseline):
* rendering/mathml/RenderMathMLRow.h:
* rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::RenderMathMLScripts::validateAndGetReferenceChildren):
(WebCore::RenderMathMLScripts::firstLineBaseline):
* rendering/mathml/RenderMathMLScripts.h:
* rendering/mathml/RenderMathMLSpace.cpp:
(WebCore::RenderMathMLSpace::firstLineBaseline):
* rendering/mathml/RenderMathMLSpace.h:
* rendering/mathml/RenderMathMLToken.cpp:
(WebCore::RenderMathMLToken::updateMathVariantGlyph):
(WebCore::RenderMathMLToken::firstLineBaseline):
* rendering/mathml/RenderMathMLToken.h:
* rendering/svg/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::nodeAtFloatPoint):
* rendering/svg/RenderSVGForeignObject.cpp:
(WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::nodeAtFloatPoint):
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::hitTestClipContent):
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::postApplyResource):
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::nodeAtPoint):
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::setupNonScalingStrokeContext):
(WebCore::RenderSVGShape::nodeAtFloatPoint):
(WebCore::RenderSVGShape::calculateStrokeBoundingBox):
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::nodeAtFloatPoint):
* rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::intersectRepaintRectWithShadows):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::clipToImageBuffer):
* rendering/svg/SVGTextQuery.cpp:
(WebCore::SVGTextQuery::modifyStartEndPositionsRespectingLigatures):
* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::Parent::Parent):
* style/RenderTreeUpdater.h:
* style/StyleScope.h:
* svg/SVGElement.cpp:
(WebCore::SVGElement::parseAttribute):
(WebCore::SVGElement::resolveCustomStyle):
* svg/SVGElement.h:
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::transcodeGlyphPaths):
(WebCore::SVGToOTFFontConverter::processGlyphElement):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
(WebCore::convertSVGToOTFFont):
* svg/SVGToOTFFontConversion.h:
* testing/Internals.cpp:
(WebCore::Internals::setEventThrottlingBehaviorOverride):
(WebCore::Internals::eventThrottlingBehaviorOverride):
* testing/Internals.h:
* workers/Worker.h:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::prepareToSend):
(WebCore::XMLHttpRequest::didFinishLoading):
* xml/XMLHttpRequest.h:
Source/WebKit/mac:
Use WTF::Optional::value_or.
* DOM/DOMHTMLOptionsCollection.mm:
(-[DOMHTMLOptionsCollection add:index:]):
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::evaluate):
* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView sendEvent:isDrawRect:]):
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidCommitLoad):
* WebCoreSupport/WebPaymentCoordinatorClient.h:
* WebCoreSupport/WebPaymentCoordinatorClient.mm:
(WebPaymentCoordinatorClient::completeShippingMethodSelection):
(WebPaymentCoordinatorClient::completeShippingContactSelection):
(WebPaymentCoordinatorClient::completePaymentMethodSelection):
* WebCoreSupport/WebSecurityOrigin.mm:
(-[WebSecurityOrigin port]):
* WebView/WebHTMLView.mm:
(toAction):
(toTag):
Source/WebKit/win:
Use WTF::Optional::value_or.
* Plugins/PluginView.cpp:
(WebCore::PluginView::performRequest):
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDidCommitLoad):
* WebCoreSupport/WebFrameLoaderClient.h:
* WebSecurityOrigin.cpp:
(WebSecurityOrigin::port):
Source/WebKit2:
* NetworkProcess/NetworkDataTask.cpp:
(WebKit::NetworkDataTask::didReceiveResponse):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::responseHasExpired):
* NetworkProcess/cache/NetworkCacheCoders.h:
(WebKit::NetworkCache::Coder<std::optional<T>>::encode):
(WebKit::NetworkCache::Coder<std::optional<T>>::decode):
(WebKit::NetworkCache::Coder<Optional<T>>::encode): Deleted.
(WebKit::NetworkCache::Coder<Optional<T>>::decode): Deleted.
* NetworkProcess/cache/NetworkCacheData.cpp:
(WebKit::NetworkCache::readOrMakeSalt):
* NetworkProcess/cache/NetworkCacheData.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::PreloadedEntry):
(WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::revalidationRequest):
(WebKit::NetworkCache::SpeculativeLoadManager::addPreloadedEntry):
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
(WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
(WebKit::NetworkCache::Statistics::recordRetrievalFailure):
(WebKit::NetworkCache::Statistics::queryWasEverRequested):
* NetworkProcess/cache/NetworkCacheStatistics.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::storeBodyAsBlob):
(WebKit::NetworkCache::Storage::encodeRecord):
(WebKit::NetworkCache::Storage::dispatchWriteOperation):
* NetworkProcess/cache/NetworkCacheStorage.h:
* Platform/IPC/ArgumentCoders.h:
(IPC::ArgumentCoder<std::optional<T>>::encode):
(IPC::ArgumentCoder<std::optional<T>>::decode):
(IPC::ArgumentCoder<WTF::Optional<T>>::encode): Deleted.
(IPC::ArgumentCoder<WTF::Optional<T>>::decode): Deleted.
* Platform/IPC/Connection.h:
(IPC::Connection::sendWithReply):
* Platform/SharedMemory.h:
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::map):
* Scripts/webkit/messages.py:
(class_template_headers):
* Shared/API/APISecurityOrigin.h:
(API::SecurityOrigin::create):
* Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
* Shared/API/c/WKSecurityOriginRef.cpp:
(WKSecurityOriginGetPort):
* Shared/SessionState.h:
* Shared/WebPageCreationParameters.h:
* Shared/mac/ObjCObjectGraph.mm:
(WebKit::typeFromObject):
* Shared/mac/SecItemShim.cpp:
(WebKit::sendSecItemRequest):
* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):
* UIProcess/API/Cocoa/WKSecurityOrigin.mm:
(-[WKSecurityOrigin port]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _didCommitLayerTree:]):
(-[WKWebView _navigationGestureDidEnd]):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataType):
* UIProcess/API/efl/EwkView.cpp:
(EwkView::setCursor):
* UIProcess/API/mac/WKView.mm:
(toCoreScrollbarStyle):
(toAPIScrollbarStyle):
* UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
(WebKit::WebPaymentCoordinatorProxy::completeShippingMethodSelection):
(WebKit::WebPaymentCoordinatorProxy::completeShippingContactSelection):
(WebKit::WebPaymentCoordinatorProxy::completePaymentMethodSelection):
* UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
* UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::toPKPaymentSummaryItem):
(WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection):
(WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection):
(WebKit::WebPaymentCoordinatorProxy::platformCompletePaymentMethodSelection):
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::webFrameIDForHandle):
(WebKit::WebAutomationSession::switchToBrowsingContext):
(WebKit::WebAutomationSession::evaluateJavaScriptFunction):
(WebKit::WebAutomationSession::resolveChildFrameHandle):
(WebKit::WebAutomationSession::resolveParentFrameHandle):
(WebKit::WebAutomationSession::computeElementLayout):
* UIProcess/Automation/WebAutomationSession.h:
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateViewExposedRect):
(WebKit::WebViewImpl::setOverlayScrollbarStyle):
(WebKit::WebViewImpl::overlayScrollbarStyle):
* UIProcess/DrawingAreaProxy.cpp:
(WebKit::DrawingAreaProxy::setViewExposedRect):
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::viewExposedRect):
* UIProcess/InspectorServer/WebSocketServerConnection.cpp:
(WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
* UIProcess/InspectorServer/WebSocketServerConnection.h:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/RemoteScrollingTree.cpp:
(WebKit::RemoteScrollingTree::scrollingTreeNodeDidScroll):
* UIProcess/Scrolling/RemoteScrollingTree.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::fileCreationTime):
(WebKit::fileModificationTime):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::backForwardListState):
(WebKit::WebBackForwardList::restoreFromState):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::creationParameters):
(WebKit::WebPageProxy::setOverlayScrollbarStyle):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::overlayScrollbarStyle):
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataRecord.h:
* UIProcess/efl/WebView.cpp:
(WebKit::WebView::transformFromScene):
* UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _scrollOffsetForEvent:]):
(-[WKContentView _interpretKeyEvent:isCharEvent:]):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeFormDataElement):
(WebKit::decodeFormDataElement):
(WebKit::decodeV1SessionHistory):
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::setViewExposedRect):
* WebProcess/ApplePay/WebPaymentCoordinator.cpp:
(WebKit::WebPaymentCoordinator::completeShippingMethodSelection):
(WebKit::WebPaymentCoordinator::completeShippingContactSelection):
(WebKit::WebPaymentCoordinator::completePaymentMethodSelection):
* WebProcess/ApplePay/WebPaymentCoordinator.h:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetEventThrottlingBehaviorOverride):
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(WebKit::PDFPlugin::convertFromPDFViewToRootView):
(WebKit::PDFPlugin::convertFromPDFViewToScreen):
(WebKit::PDFPlugin::boundsOnScreen):
(WebKit::PDFPlugin::geometryDidChange):
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::geometryDidChange):
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::performFrameLoadURLRequest):
(WebKit::PluginView::evaluate):
* WebProcess/Plugins/WebPluginInfoProvider.cpp:
(WebKit::WebPluginInfoProvider::pluginLoadClientPolicyForHost):
* WebProcess/Plugins/WebPluginInfoProvider.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
(WebKit::RemoteScrollingCoordinator::scrollPositionChangedForNode):
* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toFormData):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::preferredScrollbarOverlayStyle):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/DrawingArea.messages.in:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::certificateInfo):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_userInterfaceLayoutDirection):
(WebKit::WebPage::setScrollbarOverlayStyle):
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::scrollbarOverlayStyle):
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::setViewExposedRect):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::setViewExposedRect):
Source/WTF:
Import std::optional reference implementation offered by the C++17
original proposal paper. It has the same interface and functionality
to the C++17's one. Previous WTF::Optional lacks several functionalities.
The largest one is the correct constexpr constructors. This fact prevents
us from using Optional<literal type> in constexpr context in WebKit.
In WebKit, we do not allow global constructors. So only the constexpr
constructor is the way to use WTF::Optional in the static const
global variables. WTF::Optional is used in DOMJIT::Effect and
we would like to emit static const global variables that includes
this DOMJIT::Effect. That is the main motivation of this work.
This functionality allows the IDL code generator to emit DOMJIT
signatures as static const global variables.
We import the reference implementation one instead of LLVM libc++'s one.
This is because LLVM libc++'s one depends on many macro and type_traits
offered by libc++ implementation. And adopting it to WebKit requires
large modification compared to this reference implementation one.
Furthermore, it is difficult to compile libc++'s optional in old GCC and VC++.
It also requires some more modifications. To keep the thing simple,
we import the reference implementation one now. Once C++17 is released
and we update the compiler baseline, we can smoothly switch to the standard
library's std::optional.
We also add support for the environment that does not use exceptions to this
reference implementation.
And we also add valueOrCompute helper function. That keeps the extended
functionality that previous WTF::Optional has.
* wtf/CrossThreadQueue.h:
(WTF::CrossThreadQueue<DataType>::tryGetMessage):
* wtf/Expected.h:
(WTF::makeExpected):
* wtf/Forward.h:
* wtf/HashTraits.h:
(WTF::HashTraits<Ref<P>>::take):
* wtf/MainThread.cpp:
(WTF::initializeGCThreads):
(WTF::mayBeGCThread):
* wtf/MainThread.h:
* wtf/Optional.h:
(std::detail_::is_assignable::has_assign):
(std::detail_::has_overloaded_addressof::has_overload):
(std::detail_::static_addressof):
(std::detail_::convert):
(std::nullopt_t::nullopt_t):
(std::bad_optional_access::bad_optional_access):
(std::optional_base::optional_base):
(std::optional_base::~optional_base):
(std::constexpr_optional_base::constexpr_optional_base):
(std::optional::dataptr):
(std::optional::contained_val):
(std::optional::__NOEXCEPT_):
(std::optional::optional):
(std::optional::operator=):
(std::optional::emplace):
(std::optional::operator ->):
(std::optional::operator *):
(std::optional::value):
(std::optional::value_or):
(std::operator==):
(std::operator!=):
(std::operator<):
(std::operator>):
(std::operator<=):
(std::operator>=):
(std::__NOEXCEPT_):
(std::make_optional):
(std::hash<std::optional<T>>::operator()):
(WTF::NulloptTag::NulloptTag): Deleted.
(WTF::Optional::Optional): Deleted.
(WTF::Optional::~Optional): Deleted.
(WTF::Optional::operator=): Deleted.
(WTF::Optional::operator bool): Deleted.
(WTF::Optional::operator->): Deleted.
(WTF::Optional::operator*): Deleted.
(WTF::Optional::value): Deleted.
(WTF::Optional::valueOr): Deleted.
(WTF::Optional::valueOrCompute): Deleted.
(WTF::Optional::asPtr): Deleted.
(WTF::Optional::destroy): Deleted.
(WTF::operator==): Deleted.
(WTF::operator!=): Deleted.
(WTF::makeOptional): Deleted.
(WTF::printInternal): Deleted.
* wtf/text/StringView.cpp:
(WTF::StringView::GraphemeClusters::Iterator::Impl::Impl):
(WTF::StringView::GraphemeClusters::Iterator::Iterator):
* wtf/text/StringView.h:
Tools:
Use WTF::Optional::value_or.
* DumpRenderTree/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::stableStateOverride):
(WTR::UIScriptController::setStableStateOverride):
* TestRunnerShared/Bindings/JSWrappable.h:
(WTR::JSValueMakeBooleanOrNull):
(WTR::JSValueToNullableBoolean):
* TestRunnerShared/UIScriptContext/UIScriptController.cpp:
(WTR::UIScriptController::stableStateOverride):
(WTR::UIScriptController::setStableStateOverride):
* TestRunnerShared/UIScriptContext/UIScriptController.h:
* TestWebKitAPI/Tests/WTF/Optional.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp:
(TestWebKitAPI::testParseHTMLInteger):
(TestWebKitAPI::testParseHTMLNonNegativeInteger):
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::checkURL):
(TestWebKitAPI::checkRelativeURL):
(TestWebKitAPI::checkURLDifferences):
(TestWebKitAPI::checkRelativeURLDifferences):
* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::stableStateOverride):
(WTR::UIScriptController::setStableStateOverride):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_templatespy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinPromiseCombinedjsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinPromiseSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinprototypeCombinedjsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinprototypeSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinConstructorCombinedjsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinConstructorSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreInternalClashingNamesCombinedjsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreAnotherGuardedInternalBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3CheckSpecialcpp">trunk/Source/JavaScriptCore/b3/B3CheckSpecial.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3CheckSpecialh">trunk/Source/JavaScriptCore/b3/B3CheckSpecial.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Opcodecpp">trunk/Source/JavaScriptCore/b3/B3Opcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Opcodeh">trunk/Source/JavaScriptCore/b3/B3Opcode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3PatchpointSpecialcpp">trunk/Source/JavaScriptCore/b3/B3PatchpointSpecial.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3StackmapSpecialcpp">trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3StackmapSpecialh">trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valuecpp">trunk/Source/JavaScriptCore/b3/B3Value.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirArgh">trunk/Source/JavaScriptCore/b3/air/AirArg.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirCustomh">trunk/Source/JavaScriptCore/b3/air/AirCustom.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirFixObviousSpillscpp">trunk/Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirInsth">trunk/Source/JavaScriptCore/b3/air/AirInst.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirInstInlinesh">trunk/Source/JavaScriptCore/b3/air/AirInstInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirIteratedRegisterCoalescingcpp">trunk/Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirSpecialcpp">trunk/Source/JavaScriptCore/b3/air/AirSpecial.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirSpecialh">trunk/Source/JavaScriptCore/b3/air/AirSpecial.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeGeneratorificationcpp">trunk/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutablecpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh">trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerParseDatacpp">trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerParseDatah">trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerScriptProfilingScopeh">trunk/Source/JavaScriptCore/debugger/ScriptProfilingScope.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCodecpp">trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCodeh">trunk/Source/JavaScriptCore/dfg/DFGJITCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSlowPathGeneratorh">trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLJITCodecpp">trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLJITCodeh">trunk/Source/JavaScriptCore/ftl/FTLJITCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapSnapshotcpp">trunk/Source/JavaScriptCore/heap/HeapSnapshot.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapSnapshoth">trunk/Source/JavaScriptCore/heap/HeapSnapshot.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteConnectionToTargeth">trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteConnectionToTargetmm">trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCodeh">trunk/Source/JavaScriptCore/jit/JITCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITDivGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITDivGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitPCToCodeOriginMapcpp">trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitPCToCodeOriginMaph">trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserModuleAnalyzercpp">trunk/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConcurrentJSLockh">trunk/Source/JavaScriptCore/runtime/ConcurrentJSLock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDefinePropertyAttributesh">trunk/Source/JavaScriptCore/runtime/DefinePropertyAttributes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGenericArgumentsInlinesh">trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeHasOwnPropertyCacheh">trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeHashMapImplh">trunk/Source/JavaScriptCore/runtime/HashMapImpl.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValuecpp">trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValueh">trunk/Source/JavaScriptCore/runtime/JSCJSValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp">trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleRecordh">trunk/Source/JavaScriptCore/runtime/JSModuleRecord.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectInlinesh">trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringcpp">trunk/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLiteralParsercpp">trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMathCommonh">trunk/Source/JavaScriptCore/runtime/MathCommon.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyDescriptorh">trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyNameh">trunk/Source/JavaScriptCore/runtime/PropertyName.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilercpp">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringObjectcpp">trunk/Source/JavaScriptCore/runtime/StringObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeToNativeFromValueh">trunk/Source/JavaScriptCore/runtime/ToNativeFromValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypedArrayAdaptorsh">trunk/Source/JavaScriptCore/runtime/TypedArrayAdaptors.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCrossThreadQueueh">trunk/Source/WTF/wtf/CrossThreadQueue.h</a></li>
<li><a href="#trunkSourceWTFwtfExpectedh">trunk/Source/WTF/wtf/Expected.h</a></li>
<li><a href="#trunkSourceWTFwtfForwardh">trunk/Source/WTF/wtf/Forward.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTraitsh">trunk/Source/WTF/wtf/HashTraits.h</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadcpp">trunk/Source/WTF/wtf/MainThread.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadh">trunk/Source/WTF/wtf/MainThread.h</a></li>
<li><a href="#trunkSourceWTFwtfOptionalh">trunk/Source/WTF/wtf/Optional.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewcpp">trunk/Source/WTF/wtf/text/StringView.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentContacth">trunk/Source/WebCore/Modules/applepay/PaymentContact.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentCoordinatorcpp">trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentCoordinatorh">trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentCoordinatorClienth">trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentMerchantSessionh">trunk/Source/WebCore/Modules/applepay/PaymentMerchantSession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentRequesth">trunk/Source/WebCore/Modules/applepay/PaymentRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaycocoaPaymentContactCocoamm">trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaycocoaPaymentMerchantSessionCocoamm">trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyStatusMapcpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyStatusMaph">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnerh">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeaderscpp">trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeadersh">trunk/Source/WebCore/Modules/fetch/FetchHeaders.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequesth">trunk/Source/WebCore/Modules/fetch/FetchRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationCoordinatescpp">trunk/Source/WebCore/Modules/geolocation/Coordinates.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationCoordinatesh">trunk/Source/WebCore/Modules/geolocation/Coordinates.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorh">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifierh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBFactorycpp">trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBFactoryh">trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBIndexcpp">trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBIndexh">trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStoreh">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventcpp">trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventh">trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBSerializationh">trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIndexcpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIndexh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBGetAllRecordsDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceh">trunk/Source/WebCore/Modules/mediasource/MediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateh">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamSDPProcessorcpp">trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesproximityDeviceProximityEventh">trunk/Source/WebCore/Modules/proximity/DeviceProximityEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceh">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodeh">trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSeth">trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericIDLTypesh">trunk/Source/WebCore/bindings/generic/IDLTypes.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsCachedModuleScripth">trunk/Source/WebCore/bindings/js/CachedModuleScript.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDictionaryh">trunk/Source/WebCore/bindings/js/Dictionary.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiesh">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp">trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKh">trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMIteratorh">trunk/Source/WebCore/bindings/js/JSDOMIterator.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFileCustomcpp">trunk/Source/WebCore/bindings/js/JSFileCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSImageConstructorcpp">trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp">trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.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="#trunkSourceWebCorebindingsscriptstestJSJSFloat64Arraycpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneDictionarycpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneDictionaryh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneEnumerationcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneEnumerationh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_arraycpp">trunk/Source/WebCore/bridge/runtime_array.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistryh">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoKeySerializationh">trunk/Source/WebCore/crypto/CryptoKeySerialization.h</a></li>
<li><a href="#trunkSourceWebCorecryptoJsonWebKeyh">trunk/Source/WebCore/crypto/JsonWebKey.h</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_CBCcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSAES_PKCS1_v1_5cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptogcryptCryptoAlgorithmHMACGCryptcpp">trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyAESh">trunk/Source/WebCore/crypto/keys/CryptoKeyAES.h</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyHMACh">trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.h</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyRSAcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyRSAh">trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeySerializationRawcpp">trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeySerializationRawh">trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmHMACMaccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmRSASSA_PKCS1_v1_5Maccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoparametersCryptoAlgorithmHmacKeyParamsh">trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h</a></li>
<li><a href="#trunkSourceWebCorecryptoparametersCryptoAlgorithmRsaOaepParamsh">trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceh">trunk/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSetcpp">trunk/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSSegmentedFontFacecpp">trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheeth">trunk/Source/WebCore/css/CSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceh">trunk/Source/WebCore/css/FontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceSetcpp">trunk/Source/WebCore/css/FontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceSeth">trunk/Source/WebCore/css/FontFaceSet.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleImportcpp">trunk/Source/WebCore/css/StyleRuleImport.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserh">trunk/Source/WebCore/css/parser/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementReactionQueuecpp">trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementIteratorAssertionsh">trunk/Source/WebCore/dom/ElementIteratorAssertions.h</a></li>
<li><a href="#trunkSourceWebCoredomExceptionOrh">trunk/Source/WebCore/dom/ExceptionOr.h</a></li>
<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoredomKeyboardEventh">trunk/Source/WebCore/dom/KeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomLoadableClassicScriptcpp">trunk/Source/WebCore/dom/LoadableClassicScript.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLoadableClassicScripth">trunk/Source/WebCore/dom/LoadableClassicScript.h</a></li>
<li><a href="#trunkSourceWebCoredomLoadableModuleScriptcpp">trunk/Source/WebCore/dom/LoadableModuleScript.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLoadableModuleScripth">trunk/Source/WebCore/dom/LoadableModuleScript.h</a></li>
<li><a href="#trunkSourceWebCoredomLoadableScripth">trunk/Source/WebCore/dom/LoadableScript.h</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventcpp">trunk/Source/WebCore/dom/MessageEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventh">trunk/Source/WebCore/dom/MessageEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObservercpp">trunk/Source/WebCore/dom/MutationObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverh">trunk/Source/WebCore/dom/MutationObserver.h</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementcpp">trunk/Source/WebCore/dom/PseudoElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementh">trunk/Source/WebCore/dom/PseudoElement.h</a></li>
<li><a href="#trunkSourceWebCoredomRangeBoundaryPointh">trunk/Source/WebCore/dom/RangeBoundaryPoint.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementh">trunk/Source/WebCore/dom/ScriptElement.h</a></li>
<li><a href="#trunkSourceWebCoredomTextDecodercpp">trunk/Source/WebCore/dom/TextDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTextDecoderh">trunk/Source/WebCore/dom/TextDecoder.h</a></li>
<li><a href="#trunkSourceWebCoredomUserGestureIndicatorcpp">trunk/Source/WebCore/dom/UserGestureIndicator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomUserGestureIndicatorh">trunk/Source/WebCore/dom/UserGestureIndicator.h</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileh">trunk/Source/WebCore/fileapi/File.h</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFrameh">trunk/Source/WebCore/history/CachedFrame.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="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.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="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementh">trunk/Source/WebCore/html/HTMLImageElement.h</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="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementh">trunk/Source/WebCore/html/HTMLLinkElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOListElementh">trunk/Source/WebCore/html/HTMLOListElement.h</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="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageInputTypecpp">trunk/Source/WebCore/html/ImageInputType.cpp</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="#trunkSourceWebCorehtmlLinkIconCollectorcpp">trunk/Source/WebCore/html/LinkIconCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLinkRelAttributeh">trunk/Source/WebCore/html/LinkRelAttribute.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="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSitecpp">trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSiteh">trunk/Source/WebCore/html/parser/HTMLConstructionSite.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomsh">trunk/Source/WebCore/html/parser/HTMLParserIdioms.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLSrcsetParsercpp">trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementh">trunk/Source/WebCore/html/shadow/SliderThumbElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementscpp">trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementsh">trunk/Source/WebCore/html/shadow/TextControlInnerElements.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTrackEventh">trunk/Source/WebCore/html/track/TrackEvent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoaderh">trunk/Source/WebCore/loader/DocumentThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoaderh">trunk/Source/WebCore/loader/LinkLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoaderh">trunk/Source/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestcpp">trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLFractionElementcpp">trunk/Source/WebCore/mathml/MathMLFractionElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLFractionElementh">trunk/Source/WebCore/mathml/MathMLFractionElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMathElementcpp">trunk/Source/WebCore/mathml/MathMLMathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMathElementh">trunk/Source/WebCore/mathml/MathMLMathElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMencloseElementcpp">trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMencloseElementh">trunk/Source/WebCore/mathml/MathMLMencloseElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorDictionarycpp">trunk/Source/WebCore/mathml/MathMLOperatorDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorDictionaryh">trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementcpp">trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLOperatorElementh">trunk/Source/WebCore/mathml/MathMLOperatorElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPaddedElementcpp">trunk/Source/WebCore/mathml/MathMLPaddedElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPaddedElementh">trunk/Source/WebCore/mathml/MathMLPaddedElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPresentationElementcpp">trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPresentationElementh">trunk/Source/WebCore/mathml/MathMLPresentationElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLScriptsElementcpp">trunk/Source/WebCore/mathml/MathMLScriptsElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLScriptsElementh">trunk/Source/WebCore/mathml/MathMLScriptsElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSpaceElementcpp">trunk/Source/WebCore/mathml/MathMLSpaceElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSpaceElementh">trunk/Source/WebCore/mathml/MathMLSpaceElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTokenElementcpp">trunk/Source/WebCore/mathml/MathMLTokenElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLTokenElementh">trunk/Source/WebCore/mathml/MathMLTokenElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLUnderOverElementcpp">trunk/Source/WebCore/mathml/MathMLUnderOverElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLUnderOverElementh">trunk/Source/WebCore/mathml/MathMLUnderOverElement.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventSourceh">trunk/Source/WebCore/page/EventSource.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepageScrollToOptionsh">trunk/Source/WebCore/page/ScrollToOptions.h</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginh">trunk/Source/WebCore/page/SecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatacpp">trunk/Source/WebCore/page/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatah">trunk/Source/WebCore/page/SecurityOriginData.h</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginHashh">trunk/Source/WebCore/page/SecurityOriginHash.h</a></li>
<li><a href="#trunkSourceWebCorepageWindowFeaturescpp">trunk/Source/WebCore/page/WindowFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorepageWindowFeaturesh">trunk/Source/WebCore/page/WindowFeatures.h</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourcecpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.cpp</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourceh">trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.h</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourceListh">trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImagecpp">trunk/Source/WebCore/platform/DragImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLinkIconh">trunk/Source/WebCore/platform/LinkIcon.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlerh">trunk/Source/WebCore/platform/MemoryPressureHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformThemeh">trunk/Source/WebCore/platform/Theme.h</a></li>
<li><a href="#trunkSourceWebCoreplatformTimerh">trunk/Source/WebCore/platform/Timer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorClienth">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageFrameCachecpp">trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageFrameCacheh">trunk/Source/WebCore/platform/graphics/ImageFrameCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageSourceh">trunk/Source/WebCore/platform/graphics/ImageSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathUtilitiescpp">trunk/Source/WebCore/platform/graphics/PathUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</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="#trunkSourceWebCoreplatformgraphicscgImageDecoderCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageDecoderCGh">trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemsh">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp">trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterh">trunk/Source/WebCore/platform/graphics/filters/Filter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsharfbuzzHarfBuzzShapercpp">trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformh">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformStatecpp">trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformStateh">trunk/Source/WebCore/platform/graphics/transforms/TransformState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageDecoderDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageDecoderDirect2Dh">trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp">trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsx11PlatformDisplayX11h">trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h</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="#trunkSourceWebCoreplatformiosLegacyTileCacheh">trunk/Source/WebCore/platform/ios/LegacyTileCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileLayermm">trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp">trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMach">trunk/Source/WebCore/platform/mac/ThemeMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintscpp">trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintsh">trunk/Source/WebCore/platform/mediastream/MediaConstraints.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrh">trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationh">trunk/Source/WebCore/platform/network/CacheValidation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLDecoderh">trunk/Source/WebCore/platform/network/DataURLDecoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMaph">trunk/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParsersh">trunk/Source/WebCore/platform/network/HTTPParsers.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandlecpp">trunk/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleh">trunk/Source/WebCore/platform/network/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth">trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplCurlcpp">trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieJarMacmm">trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingBreakLinesh">trunk/Source/WebCore/rendering/BreakLines.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestingTransformStatecpp">trunk/Source/WebCore/rendering/HitTestingTransformState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllercpp">trunk/Source/WebCore/rendering/ImageQualityController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllerh">trunk/Source/WebCore/rendering/ImageQualityController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineIteratorh">trunk/Source/WebCore/rendering/InlineIterator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingOrderIteratorcpp">trunk/Source/WebCore/rendering/OrderIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingOrderIteratorh">trunk/Source/WebCore/rendering/OrderIterator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingPaintInfoh">trunk/Source/WebCore/rendering/PaintInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTextcpp">trunk/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTexth">trunk/Source/WebCore/rendering/RenderCombineText.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxh">trunk/Source/WebCore/rendering/RenderFlexibleBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListh">trunk/Source/WebCore/rendering/RenderMenuList.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectionh">trunk/Source/WebCore/rendering/RenderTableSection.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSelectionSubtreeRooth">trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContexth">trunk/Source/WebCore/rendering/line/BreakingContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlMathMLStylecpp">trunk/Source/WebCore/rendering/mathml/MathMLStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLBlockcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLBlockh">trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractionh">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLPaddedcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh">trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowh">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLSpacecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh">trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLTokencpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLTokenh">trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGForeignObjectcpp">trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImagecpp">trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRootcpp">trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGTextcpp">trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupportcpp">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextQuerycpp">trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdaterh">trunk/Source/WebCore/style/RenderTreeUpdater.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopeh">trunk/Source/WebCore/style/StyleScope.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversionh">trunk/Source/WebCore/svg/SVGToOTFFontConversion.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerh">trunk/Source/WebCore/workers/Worker.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequesth">trunk/Source/WebCore/xml/XMLHttpRequest.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLOptionsCollectionmm">trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSecurityOriginmm">trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebSecurityOrigincpp">trunk/Source/WebKit/win/WebSecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatacpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticsh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCodersh">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformSharedMemoryh">trunk/Source/WebKit2/Platform/SharedMemory.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp">trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPISecurityOriginh">trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfacemm">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOriginRefcpp">trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStateh">trunk/Source/WebKit2/Shared/SessionState.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacObjCObjectGraphmm">trunk/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKSecurityOriginmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewcpp">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxyh">trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxymessagesin">trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm">trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectioncpp">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectionh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebViewcpp">trunk/Source/WebKit2/UIProcess/efl/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkAcceleratedBackingStoreX11cpp">trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPreferencesGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplePayWebPaymentCoordinatorcpp">trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplePayWebPaymentCoordinatorh">trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsWebPluginInfoProvidercpp">trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsWebPluginInfoProviderh">trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm">trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#trunkToolsTestRunnerSharedBindingsJSWrappableh">trunk/Tools/TestRunnerShared/Bindings/JSWrappable.h</a></li>
<li><a href="#trunkToolsTestRunnerSharedUIScriptContextUIScriptControllercpp">trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp</a></li>
<li><a href="#trunkToolsTestRunnerSharedUIScriptContextUIScriptControllerh">trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFOptionalcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Optional.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreHTMLParserIdiomscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,247 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Previous WTF::Optional::operator= is not compatible to std::optional::operator=.
+ std::optional::emplace has the same semantics to the previous one.
+ So we change the code to use it.
+
+ * Scripts/builtins/builtins_templates.py:
+ * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result:
+ * Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result:
+ * Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::commuteCompareToZeroIntoTest):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::commuteCompareToZeroIntoTest):
+ * b3/B3CheckSpecial.cpp:
+ (JSC::B3::CheckSpecial::forEachArg):
+ (JSC::B3::CheckSpecial::shouldTryAliasingDef):
+ * b3/B3CheckSpecial.h:
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::scaleForShl):
+ (JSC::B3::Air::LowerToAir::effectiveAddr):
+ (JSC::B3::Air::LowerToAir::tryAppendLea):
+ * b3/B3Opcode.cpp:
+ (JSC::B3::invertedCompare):
+ * b3/B3Opcode.h:
+ * b3/B3PatchpointSpecial.cpp:
+ (JSC::B3::PatchpointSpecial::forEachArg):
+ * b3/B3StackmapSpecial.cpp:
+ (JSC::B3::StackmapSpecial::forEachArgImpl):
+ * b3/B3StackmapSpecial.h:
+ * b3/B3Value.cpp:
+ (JSC::B3::Value::invertedCompare):
+ * b3/air/AirArg.h:
+ (JSC::B3::Air::Arg::isValidScale):
+ (JSC::B3::Air::Arg::isValidAddrForm):
+ (JSC::B3::Air::Arg::isValidIndexForm):
+ (JSC::B3::Air::Arg::isValidForm):
+ * b3/air/AirCustom.h:
+ (JSC::B3::Air::PatchCustom::shouldTryAliasingDef):
+ * b3/air/AirFixObviousSpills.cpp:
+ * b3/air/AirInst.h:
+ * b3/air/AirInstInlines.h:
+ (JSC::B3::Air::Inst::shouldTryAliasingDef):
+ * b3/air/AirIteratedRegisterCoalescing.cpp:
+ * b3/air/AirSpecial.cpp:
+ (JSC::B3::Air::Special::shouldTryAliasingDef):
+ * b3/air/AirSpecial.h:
+ * bytecode/BytecodeGeneratorification.cpp:
+ (JSC::BytecodeGeneratorification::storageForGeneratorLocal):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::findPC):
+ (JSC::CodeBlock::bytecodeOffsetFromCallSiteIndex):
+ * bytecode/CodeBlock.h:
+ * bytecode/UnlinkedFunctionExecutable.cpp:
+ (JSC::UnlinkedFunctionExecutable::link):
+ * bytecode/UnlinkedFunctionExecutable.h:
+ * bytecompiler/BytecodeGenerator.h:
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::PropertyListNode::emitPutConstantProperty):
+ (JSC::ObjectPatternNode::bindValue):
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::resolveBreakpoint):
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::currentPosition):
+ * debugger/DebuggerParseData.cpp:
+ (JSC::DebuggerPausePositions::breakpointLocationForLineColumn):
+ * debugger/DebuggerParseData.h:
+ * debugger/ScriptProfilingScope.h:
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeDoubleUnaryOpEffects):
+ * dfg/DFGJITCode.cpp:
+ (JSC::DFG::JITCode::findPC):
+ * dfg/DFGJITCode.h:
+ * dfg/DFGOperations.cpp:
+ (JSC::DFG::operationPutByValInternal):
+ * dfg/DFGSlowPathGenerator.h:
+ (JSC::DFG::SlowPathGenerator::generate):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::runSlowPathGenerators):
+ (JSC::DFG::SpeculativeJIT::emitUntypedBitOp):
+ (JSC::DFG::SpeculativeJIT::emitUntypedRightShiftBitOp):
+ (JSC::DFG::SpeculativeJIT::compileMathIC):
+ (JSC::DFG::SpeculativeJIT::compileArithDiv):
+ (JSC::DFG::SpeculativeJIT::compileCallDOMGetter):
+ * dfg/DFGSpeculativeJIT.h:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compileLogicalNot):
+ (JSC::DFG::SpeculativeJIT::emitBranch):
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGStrengthReductionPhase.cpp:
+ (JSC::DFG::StrengthReductionPhase::handleNode):
+ * ftl/FTLJITCode.cpp:
+ (JSC::FTL::JITCode::findPC):
+ * ftl/FTLJITCode.h:
+ * heap/Heap.cpp:
+ (JSC::Heap::collectAsync):
+ (JSC::Heap::collectSync):
+ (JSC::Heap::collectInThread):
+ (JSC::Heap::requestCollection):
+ (JSC::Heap::willStartCollection):
+ (JSC::Heap::didFinishCollection):
+ (JSC::Heap::shouldDoFullCollection):
+ * heap/Heap.h:
+ (JSC::Heap::collectionScope):
+ * heap/HeapSnapshot.cpp:
+ (JSC::HeapSnapshot::nodeForCell):
+ (JSC::HeapSnapshot::nodeForObjectIdentifier):
+ * heap/HeapSnapshot.h:
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::BackendDispatcher::dispatch):
+ (Inspector::BackendDispatcher::sendPendingErrors):
+ (Inspector::BackendDispatcher::reportProtocolError):
+ * inspector/InspectorBackendDispatcher.h:
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::InspectorHeapAgent::nodeForHeapObjectIdentifier):
+ (Inspector::InspectorHeapAgent::getPreview):
+ (Inspector::InspectorHeapAgent::getRemoteObject):
+ * inspector/agents/InspectorHeapAgent.h:
+ * inspector/remote/RemoteConnectionToTarget.h:
+ * inspector/remote/RemoteConnectionToTarget.mm:
+ (Inspector::RemoteConnectionToTarget::targetIdentifier):
+ (Inspector::RemoteConnectionToTarget::setup):
+ * inspector/remote/RemoteInspector.h:
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::updateClientCapabilities):
+ * inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
+ (_generate_declarations_for_enum_conversion_methods):
+ (_generate_declarations_for_enum_conversion_methods.return_type_with_export_macro):
+ * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
+ (CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.generate_conversion_method_body):
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ * jit/JITCode.h:
+ (JSC::JITCode::findPC):
+ * jit/JITDivGenerator.cpp:
+ (JSC::JITDivGenerator::generateFastPath):
+ * jit/JITOperations.cpp:
+ * jit/PCToCodeOriginMap.cpp:
+ (JSC::PCToCodeOriginMap::findPC):
+ * jit/PCToCodeOriginMap.h:
+ * jsc.cpp:
+ (WTF::RuntimeArray::getOwnPropertySlot):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * parser/ModuleAnalyzer.cpp:
+ (JSC::ModuleAnalyzer::exportVariable):
+ * runtime/ConcurrentJSLock.h:
+ (JSC::ConcurrentJSLocker::ConcurrentJSLocker):
+ * runtime/DefinePropertyAttributes.h:
+ (JSC::DefinePropertyAttributes::writable):
+ (JSC::DefinePropertyAttributes::configurable):
+ (JSC::DefinePropertyAttributes::enumerable):
+ * runtime/GenericArgumentsInlines.h:
+ (JSC::GenericArguments<Type>::getOwnPropertySlot):
+ (JSC::GenericArguments<Type>::put):
+ (JSC::GenericArguments<Type>::deleteProperty):
+ (JSC::GenericArguments<Type>::defineOwnProperty):
+ * runtime/HasOwnPropertyCache.h:
+ (JSC::HasOwnPropertyCache::get):
+ * runtime/HashMapImpl.h:
+ (JSC::concurrentJSMapHash):
+ * runtime/Identifier.h:
+ (JSC::parseIndex):
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::defineOwnProperty):
+ * runtime/JSCJSValue.cpp:
+ (JSC::JSValue::toNumberFromPrimitive):
+ (JSC::JSValue::putToPrimitive):
+ * runtime/JSCJSValue.h:
+ * runtime/JSGenericTypedArrayView.h:
+ (JSC::JSGenericTypedArrayView::toAdaptorNativeFromValueWithoutCoercion):
+ * runtime/JSGenericTypedArrayViewConstructorInlines.h:
+ (JSC::constructGenericTypedArrayViewWithArguments):
+ (JSC::constructGenericTypedArrayView):
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertySlot):
+ (JSC::JSGenericTypedArrayView<Adaptor>::put):
+ * runtime/JSModuleRecord.cpp:
+ * runtime/JSModuleRecord.h:
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::putDirectAccessor):
+ (JSC::JSObject::deleteProperty):
+ (JSC::JSObject::putDirectMayBeIndex):
+ (JSC::JSObject::defineOwnProperty):
+ * runtime/JSObject.h:
+ (JSC::JSObject::getOwnPropertySlot):
+ (JSC::JSObject::getPropertySlot):
+ (JSC::JSObject::putOwnDataPropertyMayBeIndex):
+ * runtime/JSObjectInlines.h:
+ (JSC::JSObject::putInline):
+ * runtime/JSString.cpp:
+ (JSC::JSString::getStringPropertyDescriptor):
+ * runtime/JSString.h:
+ (JSC::JSString::getStringPropertySlot):
+ * runtime/LiteralParser.cpp:
+ (JSC::LiteralParser<CharType>::parse):
+ * runtime/MathCommon.h:
+ (JSC::safeReciprocalForDivByConst):
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncHasOwnProperty):
+ * runtime/PropertyDescriptor.h:
+ (JSC::toPropertyDescriptor):
+ * runtime/PropertyName.h:
+ (JSC::parseIndex):
+ * runtime/SamplingProfiler.cpp:
+ (JSC::SamplingProfiler::processUnverifiedStackTraces):
+ * runtime/StringObject.cpp:
+ (JSC::StringObject::put):
+ (JSC::isStringOwnProperty):
+ (JSC::StringObject::deleteProperty):
+ * runtime/ToNativeFromValue.h:
+ (JSC::toNativeFromValueWithoutCoercion):
+ * runtime/TypedArrayAdaptors.h:
+ (JSC::IntegralTypedArrayAdaptor::toNativeFromInt32WithoutCoercion):
+ (JSC::IntegralTypedArrayAdaptor::toNativeFromUint32WithoutCoercion):
+ (JSC::IntegralTypedArrayAdaptor::toNativeFromDoubleWithoutCoercion):
+ (JSC::FloatTypedArrayAdaptor::toNativeFromInt32WithoutCoercion):
+ (JSC::FloatTypedArrayAdaptor::toNativeFromDoubleWithoutCoercion):
+ (JSC::Uint8ClampedAdaptor::toNativeFromInt32WithoutCoercion):
+ (JSC::Uint8ClampedAdaptor::toNativeFromDoubleWithoutCoercion):
+
</ins><span class="cx"> 2016-11-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert IntersectionObserver over to using RuntimeEnabledFeatures so it can be properly excluded from script
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
</span><span class="cx"> {\\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> ${macroPrefix}_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
</span><span class="cx"> {\\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> ${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
</span><span class="cx"> {\\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
</span><del>- return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \\
</del><ins>+ return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
</ins><span class="cx"> }
</span><span class="cx"> ${macroPrefix}_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
</span><span class="cx"> {\\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
</span><del>- return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \\
</del><ins>+ return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
</ins><span class="cx"> }
</span><span class="cx"> ${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinPromiseCombinedjsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinPromiseSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN.PROMISE_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinprototypeCombinedjsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinprototypeSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN.PROTOTYPE_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinConstructorCombinedjsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreBuiltinConstructorSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTINCONSTRUCTOR_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedJavaScriptCoreInternalClashingNamesCombinedjsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> #define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><del>- return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), Nullopt, s_##codeName##Intrinsic); }
</del><ins>+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); }
</ins><span class="cx"> JSC_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreAnotherGuardedInternalBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_UNGUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
</span><span class="cx"> {\
</span><span class="cx"> JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
</span><del>- return clientData->builtinFunctions().xmlCasingTestBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().xmlCasingTestBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
</del><ins>+ return clientData->builtinFunctions().xmlCasingTestBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().xmlCasingTestBuiltins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -3292,7 +3292,7 @@
</span><span class="cx"> return static_cast<RelationalCondition>(ARM64Assembler::invert(static_cast<ARM64Assembler::Condition>(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<ResultCondition> commuteCompareToZeroIntoTest(RelationalCondition cond)
</del><ins>+ static std::optional<ResultCondition> commuteCompareToZeroIntoTest(RelationalCondition cond)
</ins><span class="cx"> {
</span><span class="cx"> switch (cond) {
</span><span class="cx"> case Equal:
</span><span class="lines">@@ -3305,7 +3305,7 @@
</span><span class="cx"> return PositiveOrZero;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -2656,7 +2656,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<ResultCondition> commuteCompareToZeroIntoTest(RelationalCondition cond)
</del><ins>+ static std::optional<ResultCondition> commuteCompareToZeroIntoTest(RelationalCondition cond)
</ins><span class="cx"> {
</span><span class="cx"> switch (cond) {
</span><span class="cx"> case Equal:
</span><span class="lines">@@ -2669,7 +2669,7 @@
</span><span class="cx"> return PositiveOrZero;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3CheckSpecialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3CheckSpecial.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3CheckSpecial.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3CheckSpecial.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> callback(inst.args[1 + index], role, type, width);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- Optional<unsigned> firstRecoverableIndex;
</del><ins>+ std::optional<unsigned> firstRecoverableIndex;
</ins><span class="cx"> if (m_checkKind.opcode == BranchAdd32 || m_checkKind.opcode == BranchAdd64)
</span><span class="cx"> firstRecoverableIndex = 1;
</span><span class="cx"> forEachArgImpl(numB3Args(inst), m_numCheckArgs + 1, inst, m_stackmapRole, firstRecoverableIndex, callback);
</span><span class="lines">@@ -135,11 +135,11 @@
</span><span class="cx"> return admitsStackImpl(numB3Args(inst), m_numCheckArgs + 1, inst, argIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<unsigned> CheckSpecial::shouldTryAliasingDef(Inst& inst)
</del><ins>+std::optional<unsigned> CheckSpecial::shouldTryAliasingDef(Inst& inst)
</ins><span class="cx"> {
</span><del>- if (Optional<unsigned> branchDef = hiddenBranch(inst).shouldTryAliasingDef())
</del><ins>+ if (std::optional<unsigned> branchDef = hiddenBranch(inst).shouldTryAliasingDef())
</ins><span class="cx"> return *branchDef + 1;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CCallHelpers::Jump CheckSpecial::generate(Inst& inst, CCallHelpers& jit, GenerationContext& context)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3CheckSpecialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3CheckSpecial.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3CheckSpecial.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3CheckSpecial.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> void forEachArg(Air::Inst&, const ScopedLambda<Air::Inst::EachArgCallback>&) override;
</span><span class="cx"> bool isValid(Air::Inst&) override;
</span><span class="cx"> bool admitsStack(Air::Inst&, unsigned argIndex) override;
</span><del>- Optional<unsigned> shouldTryAliasingDef(Air::Inst&) override;
</del><ins>+ std::optional<unsigned> shouldTryAliasingDef(Air::Inst&) override;
</ins><span class="cx">
</span><span class="cx"> // NOTE: the generate method will generate the hidden branch and then register a LatePath that
</span><span class="cx"> // generates the stackmap. Super crazy dude!
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -427,12 +427,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<unsigned> scaleForShl(Value* shl, int32_t offset, Optional<Arg::Width> width = Nullopt)
</del><ins>+ std::optional<unsigned> scaleForShl(Value* shl, int32_t offset, std::optional<Arg::Width> width = std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> if (shl->opcode() != Shl)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (!shl->child(1)->hasInt32())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> unsigned logScale = shl->child(1)->asInt32();
</span><span class="cx"> if (shl->type() == Int32)
</span><span class="cx"> logScale &= 31;
</span><span class="lines">@@ -442,10 +442,10 @@
</span><span class="cx"> // to signed since that's what all of our APIs want.
</span><span class="cx"> int64_t bigScale = static_cast<uint64_t>(1) << static_cast<uint64_t>(logScale);
</span><span class="cx"> if (!isRepresentableAs<int32_t>(bigScale))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> unsigned scale = static_cast<int32_t>(bigScale);
</span><span class="cx"> if (!Arg::isValidIndexForm(scale, offset, width))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return scale;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> Value* right = address->child(1);
</span><span class="cx">
</span><span class="cx"> auto tryIndex = [&] (Value* index, Value* base) -> Arg {
</span><del>- Optional<unsigned> scale = scaleForShl(index, offset, width);
</del><ins>+ std::optional<unsigned> scale = scaleForShl(index, offset, width);
</ins><span class="cx"> if (!scale)
</span><span class="cx"> return Arg();
</span><span class="cx"> if (m_locked.contains(index->child(0)) || m_locked.contains(base))
</span><span class="lines">@@ -1934,7 +1934,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto tryShl = [&] (Value* shl, Value* other) -> bool {
</span><del>- Optional<unsigned> scale = scaleForShl(shl, offset);
</del><ins>+ std::optional<unsigned> scale = scaleForShl(shl, offset);
</ins><span class="cx"> if (!scale)
</span><span class="cx"> return false;
</span><span class="cx"> if (!canBeInternal(shl))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Opcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Opcode.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Opcode.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3Opcode.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace B3 {
</span><span class="cx">
</span><del>-Optional<Opcode> invertedCompare(Opcode opcode, Type type)
</del><ins>+std::optional<Opcode> invertedCompare(Opcode opcode, Type type)
</ins><span class="cx"> {
</span><span class="cx"> switch (opcode) {
</span><span class="cx"> case Equal:
</span><span class="lines">@@ -42,19 +42,19 @@
</span><span class="cx"> case LessThan:
</span><span class="cx"> if (isInt(type))
</span><span class="cx"> return GreaterEqual;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case GreaterThan:
</span><span class="cx"> if (isInt(type))
</span><span class="cx"> return LessEqual;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case LessEqual:
</span><span class="cx"> if (isInt(type))
</span><span class="cx"> return GreaterThan;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case GreaterEqual:
</span><span class="cx"> if (isInt(type))
</span><span class="cx"> return LessThan;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case Above:
</span><span class="cx"> return BelowEqual;
</span><span class="cx"> case Below:
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> case BelowEqual:
</span><span class="cx"> return Above;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Opcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Opcode.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Opcode.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3Opcode.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Opcode> invertedCompare(Opcode, Type);
</del><ins>+std::optional<Opcode> invertedCompare(Opcode, Type);
</ins><span class="cx">
</span><span class="cx"> inline Opcode constPtrOpcode()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3PatchpointSpecialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3PatchpointSpecial.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3PatchpointSpecial.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3PatchpointSpecial.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> callback(inst.args[argIndex++], role, inst.origin->airType(), inst.origin->airWidth());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- forEachArgImpl(0, argIndex, inst, SameAsRep, Nullopt, callback);
</del><ins>+ forEachArgImpl(0, argIndex, inst, SameAsRep, std::nullopt, callback);
</ins><span class="cx"> argIndex += inst.origin->numChildren();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = patchpoint->numGPScratchRegisters; i--;)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3StackmapSpecialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void StackmapSpecial::forEachArgImpl(
</span><span class="cx"> unsigned numIgnoredB3Args, unsigned numIgnoredAirArgs,
</span><del>- Inst& inst, RoleMode roleMode, Optional<unsigned> firstRecoverableIndex,
</del><ins>+ Inst& inst, RoleMode roleMode, std::optional<unsigned> firstRecoverableIndex,
</ins><span class="cx"> const ScopedLambda<Inst::EachArgCallback>& callback)
</span><span class="cx"> {
</span><span class="cx"> StackmapValue* value = inst.origin->as<StackmapValue>();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3StackmapSpecialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3StackmapSpecial.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // subclasses that implement that.
</span><span class="cx"> void forEachArgImpl(
</span><span class="cx"> unsigned numIgnoredB3Args, unsigned numIgnoredAirArgs,
</span><del>- Air::Inst&, RoleMode, Optional<unsigned> firstRecoverableIndex,
</del><ins>+ Air::Inst&, RoleMode, std::optional<unsigned> firstRecoverableIndex,
</ins><span class="cx"> const ScopedLambda<Air::Inst::EachArgCallback>&);
</span><span class="cx">
</span><span class="cx"> bool isValidImpl(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/B3Value.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!numChildren())
</span><span class="cx"> return nullptr;
</span><del>- if (Optional<Opcode> invertedOpcode = B3::invertedCompare(opcode(), child(0)->type())) {
</del><ins>+ if (std::optional<Opcode> invertedOpcode = B3::invertedCompare(opcode(), child(0)->type())) {
</ins><span class="cx"> ASSERT(!kind().hasExtraBits());
</span><span class="cx"> return proc.add<Value>(*invertedOpcode, type(), origin(), children());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirArgh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirArg.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirArg.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirArg.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If you don't pass a Width, this optimistically assumes that you're using the right width.
</span><del>- static bool isValidScale(unsigned scale, Optional<Width> width = Nullopt)
</del><ins>+ static bool isValidScale(unsigned scale, std::optional<Width> width = std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> switch (scale) {
</span><span class="cx"> case 1:
</span><span class="lines">@@ -1085,7 +1085,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static bool isValidAddrForm(int32_t offset, Optional<Width> width = Nullopt)
</del><ins>+ static bool isValidAddrForm(int32_t offset, std::optional<Width> width = std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> if (isX86())
</span><span class="cx"> return true;
</span><span class="lines">@@ -1110,7 +1110,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static bool isValidIndexForm(unsigned scale, int32_t offset, Optional<Width> width = Nullopt)
</del><ins>+ static bool isValidIndexForm(unsigned scale, int32_t offset, std::optional<Width> width = std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValidScale(scale, width))
</span><span class="cx"> return false;
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx"> // If you don't pass a width then this optimistically assumes that you're using the right width. But
</span><span class="cx"> // the width is relevant to validity, so passing a null width is only useful for assertions. Don't
</span><span class="cx"> // pass null widths when cascading through Args in the instruction selector!
</span><del>- bool isValidForm(Optional<Width> width = Nullopt) const
</del><ins>+ bool isValidForm(std::optional<Width> width = std::nullopt) const
</ins><span class="cx"> {
</span><span class="cx"> switch (kind()) {
</span><span class="cx"> case Invalid:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirCustom.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirCustom.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirCustom.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return inst.args[0].special()->admitsStack(inst, argIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<unsigned> shouldTryAliasingDef(Inst& inst)
</del><ins>+ static std::optional<unsigned> shouldTryAliasingDef(Inst& inst)
</ins><span class="cx"> {
</span><span class="cx"> return inst.args[0].special()->shouldTryAliasingDef(inst);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirFixObviousSpillscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -129,12 +129,12 @@
</span><span class="cx"> else if (isSpillSlot(inst.args[1]))
</span><span class="cx"> m_state.addAlias(SlotConst(inst.args[1].stackSlot(), inst.args[0].value()));
</span><span class="cx"> } else if (isSpillSlot(inst.args[0]) && inst.args[1].isReg()) {
</span><del>- if (Optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</del><ins>+ if (std::optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</ins><span class="cx"> m_state.addAlias(RegConst(inst.args[1].reg(), *constant));
</span><span class="cx"> m_state.addAlias(
</span><span class="cx"> RegSlot(inst.args[1].reg(), inst.args[0].stackSlot(), RegSlot::AllBits));
</span><span class="cx"> } else if (inst.args[0].isReg() && isSpillSlot(inst.args[1])) {
</span><del>- if (Optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</del><ins>+ if (std::optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</ins><span class="cx"> m_state.addAlias(SlotConst(inst.args[1].stackSlot(), *constant));
</span><span class="cx"> m_state.addAlias(
</span><span class="cx"> RegSlot(inst.args[0].reg(), inst.args[1].stackSlot(), RegSlot::AllBits));
</span><span class="lines">@@ -148,12 +148,12 @@
</span><span class="cx"> else if (isSpillSlot(inst.args[1]))
</span><span class="cx"> m_state.addAlias(SlotConst(inst.args[1].stackSlot(), static_cast<uint32_t>(inst.args[0].value())));
</span><span class="cx"> } else if (isSpillSlot(inst.args[0]) && inst.args[1].isReg()) {
</span><del>- if (Optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</del><ins>+ if (std::optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</ins><span class="cx"> m_state.addAlias(RegConst(inst.args[1].reg(), static_cast<uint32_t>(*constant)));
</span><span class="cx"> m_state.addAlias(
</span><span class="cx"> RegSlot(inst.args[1].reg(), inst.args[0].stackSlot(), RegSlot::ZExt32));
</span><span class="cx"> } else if (inst.args[0].isReg() && isSpillSlot(inst.args[1])) {
</span><del>- if (Optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</del><ins>+ if (std::optional<int64_t> constant = m_state.constantFor(inst.args[0]))
</ins><span class="cx"> m_state.addAlias(SlotConst(inst.args[1].stackSlot(), static_cast<int32_t>(*constant)));
</span><span class="cx"> m_state.addAlias(
</span><span class="cx"> RegSlot(inst.args[0].reg(), inst.args[1].stackSlot(), RegSlot::Match32));
</span><span class="lines">@@ -454,19 +454,19 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int64_t> constantFor(const Arg& arg)
</del><ins>+ std::optional<int64_t> constantFor(const Arg& arg)
</ins><span class="cx"> {
</span><span class="cx"> if (arg.isReg()) {
</span><span class="cx"> if (const RegConst* alias = getRegConst(arg.reg()))
</span><span class="cx"> return alias->constant;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> if (arg.isStack()) {
</span><span class="cx"> if (const SlotConst* alias = getSlotConst(arg.stackSlot()))
</span><span class="cx"> return alias->constant;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clobber(const Arg& arg)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirInsth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirInst.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirInst.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirInst.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> // For example,
</span><span class="cx"> // Add Tmp1, Tmp2, Tmp3
</span><span class="cx"> // returns 2 if 0 and 1 benefit from aliasing to Tmp3.
</span><del>- Optional<unsigned> shouldTryAliasingDef();
</del><ins>+ std::optional<unsigned> shouldTryAliasingDef();
</ins><span class="cx">
</span><span class="cx"> // This computes a hash for comparing this to JSAir's Inst.
</span><span class="cx"> unsigned jsHash() const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirInstInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirInstInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirInstInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirInstInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -111,10 +111,10 @@
</span><span class="cx"> return admitsStack(&arg - &args[0]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<unsigned> Inst::shouldTryAliasingDef()
</del><ins>+inline std::optional<unsigned> Inst::shouldTryAliasingDef()
</ins><span class="cx"> {
</span><span class="cx"> if (!isX86())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (kind.opcode) {
</span><span class="cx"> case Add32:
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> case MulFloat:
</span><span class="cx"> #if CPU(X86) || CPU(X86_64)
</span><span class="cx"> if (MacroAssembler::supportsAVX())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> #endif
</span><span class="cx"> if (args.size() == 3)
</span><span class="cx"> return 2;
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool isShiftValid(const Inst& inst)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirIteratedRegisterCoalescingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1007,7 +1007,7 @@
</span><span class="cx"> m_worklistMoves.startAddingLowPriorityMoves();
</span><span class="cx"> for (BasicBlock* block : m_code) {
</span><span class="cx"> for (Inst& inst : *block) {
</span><del>- if (Optional<unsigned> defArgIndex = inst.shouldTryAliasingDef()) {
</del><ins>+ if (std::optional<unsigned> defArgIndex = inst.shouldTryAliasingDef()) {
</ins><span class="cx"> Arg op1 = inst.args[*defArgIndex - 2];
</span><span class="cx"> Arg op2 = inst.args[*defArgIndex - 1];
</span><span class="cx"> Arg dest = inst.args[*defArgIndex];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirSpecialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirSpecial.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirSpecial.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirSpecial.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> return out.toCString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<unsigned> Special::shouldTryAliasingDef(Inst&)
</del><ins>+std::optional<unsigned> Special::shouldTryAliasingDef(Inst&)
</ins><span class="cx"> {
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Special::isTerminal(Inst&)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirSpecialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirSpecial.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirSpecial.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/b3/air/AirSpecial.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual void forEachArg(Inst&, const ScopedLambda<Inst::EachArgCallback>&) = 0;
</span><span class="cx"> virtual bool isValid(Inst&) = 0;
</span><span class="cx"> virtual bool admitsStack(Inst&, unsigned argIndex) = 0;
</span><del>- virtual Optional<unsigned> shouldTryAliasingDef(Inst&);
</del><ins>+ virtual std::optional<unsigned> shouldTryAliasingDef(Inst&);
</ins><span class="cx">
</span><span class="cx"> // This gets called on for each Inst that uses this Special. Note that there is no way to
</span><span class="cx"> // guarantee that a Special gets used from just one Inst, because Air might taildup late. So,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeGeneratorificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_storages.size() <= index)
</span><span class="cx"> m_storages.resize(index + 1);
</span><del>- if (Optional<Storage> storage = m_storages[index])
</del><ins>+ if (std::optional<Storage> storage = m_storages[index])
</ins><span class="cx"> return *storage;
</span><span class="cx">
</span><span class="cx"> UnlinkedCodeBlock* codeBlock = m_graph.codeBlock();
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_enterPoint { 0 };
</span><span class="cx"> BytecodeGraph<UnlinkedCodeBlock> m_graph;
</span><del>- Vector<Optional<Storage>> m_storages;
</del><ins>+ Vector<std::optional<Storage>> m_storages;
</ins><span class="cx"> Yields m_yields;
</span><span class="cx"> Strong<SymbolTable> m_generatorFrameSymbolTable;
</span><span class="cx"> int m_generatorFrameSymbolTableIndex;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -4512,10 +4512,10 @@
</span><span class="cx"> m_pcToCodeOriginMap = WTFMove(map);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CodeOrigin> CodeBlock::findPC(void* pc)
</del><ins>+std::optional<CodeOrigin> CodeBlock::findPC(void* pc)
</ins><span class="cx"> {
</span><span class="cx"> if (m_pcToCodeOriginMap) {
</span><del>- if (Optional<CodeOrigin> codeOrigin = m_pcToCodeOriginMap->findPC(pc))
</del><ins>+ if (std::optional<CodeOrigin> codeOrigin = m_pcToCodeOriginMap->findPC(pc))
</ins><span class="cx"> return codeOrigin;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4522,19 +4522,19 @@
</span><span class="cx"> for (Bag<StructureStubInfo>::iterator iter = m_stubInfos.begin(); !!iter; ++iter) {
</span><span class="cx"> StructureStubInfo* stub = *iter;
</span><span class="cx"> if (stub->containsPC(pc))
</span><del>- return Optional<CodeOrigin>(stub->codeOrigin);
</del><ins>+ return std::optional<CodeOrigin>(stub->codeOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (Optional<CodeOrigin> codeOrigin = m_jitCode->findPC(this, pc))
</del><ins>+ if (std::optional<CodeOrigin> codeOrigin = m_jitCode->findPC(this, pc))
</ins><span class="cx"> return codeOrigin;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx">
</span><del>-Optional<unsigned> CodeBlock::bytecodeOffsetFromCallSiteIndex(CallSiteIndex callSiteIndex)
</del><ins>+std::optional<unsigned> CodeBlock::bytecodeOffsetFromCallSiteIndex(CallSiteIndex callSiteIndex)
</ins><span class="cx"> {
</span><del>- Optional<unsigned> bytecodeOffset;
</del><ins>+ std::optional<unsigned> bytecodeOffset;
</ins><span class="cx"> JITCode::JITType jitType = this->jitType();
</span><span class="cx"> if (jitType == JITCode::InterpreterThunk || jitType == JITCode::BaselineJIT) {
</span><span class="cx"> #if USE(JSVALUE64)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot,
</span><span class="cx"> int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
</span><span class="cx">
</span><del>- Optional<unsigned> bytecodeOffsetFromCallSiteIndex(CallSiteIndex);
</del><ins>+ std::optional<unsigned> bytecodeOffsetFromCallSiteIndex(CallSiteIndex);
</ins><span class="cx">
</span><span class="cx"> void getStubInfoMap(const ConcurrentJSLocker&, StubInfoMap& result);
</span><span class="cx"> void getStubInfoMap(StubInfoMap& result);
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> void setPCToCodeOriginMap(std::unique_ptr<PCToCodeOriginMap>&&);
</span><del>- Optional<CodeOrigin> findPC(void* pc);
</del><ins>+ std::optional<CodeOrigin> findPC(void* pc);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_unlinkedCodeBlockForConstruct);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FunctionExecutable* UnlinkedFunctionExecutable::link(VM& vm, const SourceCode& ownerSource, Optional<int> overrideLineNumber, Intrinsic intrinsic)
</del><ins>+FunctionExecutable* UnlinkedFunctionExecutable::link(VM& vm, const SourceCode& ownerSource, std::optional<int> overrideLineNumber, Intrinsic intrinsic)
</ins><span class="cx"> {
</span><span class="cx"> SourceCode source = m_sourceOverride ? SourceCode(m_sourceOverride) : ownerSource;
</span><span class="cx"> unsigned firstLine = source.firstLine() + m_firstLineOffset;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> const Identifier&, ExecState&, const SourceCode&, JSObject*& exception,
</span><span class="cx"> int overrideLineNumber);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE FunctionExecutable* link(VM&, const SourceCode&, Optional<int> overrideLineNumber = Nullopt, Intrinsic = NoIntrinsic);
</del><ins>+ JS_EXPORT_PRIVATE FunctionExecutable* link(VM&, const SourceCode&, std::optional<int> overrideLineNumber = std::nullopt, Intrinsic = NoIntrinsic);
</ins><span class="cx">
</span><span class="cx"> void clearCode()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -910,7 +910,7 @@
</span><span class="cx"> };
</span><span class="cx"> typedef HashMap<RefPtr<UniquedStringImpl>, TDZNecessityLevel, IdentifierRepHash> TDZMap;
</span><span class="cx"> Vector<TDZMap> m_TDZStack;
</span><del>- Optional<size_t> m_varScopeSymbolTableIndex;
</del><ins>+ std::optional<size_t> m_varScopeSymbolTableIndex;
</ins><span class="cx"> void pushTDZVariables(const VariableEnvironment&, TDZCheckOptimization, TDZRequirement);
</span><span class="cx">
</span><span class="cx"> ScopeNode* const m_scopeNode;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (const auto* identifier = node.name()) {
</span><del>- Optional<uint32_t> optionalIndex = parseIndex(*identifier);
</del><ins>+ std::optional<uint32_t> optionalIndex = parseIndex(*identifier);
</ins><span class="cx"> if (!optionalIndex) {
</span><span class="cx"> generator.emitDirectPutById(newObj, *identifier, value.get(), node.putType());
</span><span class="cx"> return;
</span><span class="lines">@@ -3967,7 +3967,7 @@
</span><span class="cx"> RefPtr<RegisterID> temp = generator.newTemporary();
</span><span class="cx"> if (!target.propertyExpression) {
</span><span class="cx"> // Should not emit get_by_id for indexed ones.
</span><del>- Optional<uint32_t> optionalIndex = parseIndex(target.propertyName);
</del><ins>+ std::optional<uint32_t> optionalIndex = parseIndex(target.propertyName);
</ins><span class="cx"> if (!optionalIndex)
</span><span class="cx"> generator.emitGetById(temp.get(), rhs, target.propertyName);
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> unsigned column = breakpoint.column ? breakpoint.column : Breakpoint::unspecifiedColumn;
</span><span class="cx">
</span><span class="cx"> DebuggerParseData& parseData = debuggerParseData(breakpoint.sourceID, sourceProvider);
</span><del>- Optional<JSTextPosition> resolvedPosition = parseData.pausePositions.breakpointLocationForLineColumn((int)line, (int)column);
</del><ins>+ std::optional<JSTextPosition> resolvedPosition = parseData.pausePositions.breakpointLocationForLineColumn((int)line, (int)column);
</ins><span class="cx"> if (!resolvedPosition)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> if (isTailDeleted()) {
</span><span class="cx"> CodeBlock* codeBlock = m_shadowChickenFrame.codeBlock;
</span><del>- if (Optional<unsigned> bytecodeOffset = codeBlock->bytecodeOffsetFromCallSiteIndex(m_shadowChickenFrame.callSiteIndex)) {
</del><ins>+ if (std::optional<unsigned> bytecodeOffset = codeBlock->bytecodeOffsetFromCallSiteIndex(m_shadowChickenFrame.callSiteIndex)) {
</ins><span class="cx"> return TextPosition(OrdinalNumber::fromOneBasedInt(codeBlock->lineNumberForBytecodeOffset(*bytecodeOffset)),
</span><span class="cx"> OrdinalNumber::fromOneBasedInt(codeBlock->columnNumberForBytecodeOffset(*bytecodeOffset)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerParseDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-Optional<JSTextPosition> DebuggerPausePositions::breakpointLocationForLineColumn(int line, int column)
</del><ins>+std::optional<JSTextPosition> DebuggerPausePositions::breakpointLocationForLineColumn(int line, int column)
</ins><span class="cx"> {
</span><span class="cx"> unsigned start = 0;
</span><span class="cx"> unsigned end = m_positions.size();
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> // We are guarenteed to have a Leave for an Entry so we don't need to bounds check.
</span><span class="cx"> while (true) {
</span><span class="cx"> if (pausePosition.type != DebuggerPausePositionType::Enter)
</span><del>- return Optional<JSTextPosition>(pausePosition.position);
</del><ins>+ return std::optional<JSTextPosition>(pausePosition.position);
</ins><span class="cx"> pausePosition = m_positions[middle++];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> // Past the end, no possible pause locations.
</span><span class="cx"> if (start >= m_positions.size())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // If the next location is a function Entry we will need to decide if we should go into
</span><span class="cx"> // the function or go past the function. We decide to go into the function if the
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> // Valid pause location. Use it.
</span><span class="cx"> DebuggerPausePosition& firstSlidePosition = m_positions[start];
</span><span class="cx"> if (firstSlidePosition.type != DebuggerPausePositionType::Enter)
</span><del>- return Optional<JSTextPosition>(firstSlidePosition.position);
</del><ins>+ return std::optional<JSTextPosition>(firstSlidePosition.position);
</ins><span class="cx">
</span><span class="cx"> // Determine if we should enter this function or skip past it.
</span><span class="cx"> // If entryStackSize is > 0 we are skipping functions.
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Found pause position.
</span><del>- return Optional<JSTextPosition>(slidePosition.position);
</del><ins>+ return std::optional<JSTextPosition>(slidePosition.position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // No pause positions found.
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DebuggerPausePositions::sort()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerParseDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> m_positions.append({ DebuggerPausePositionType::Leave, position });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<JSTextPosition> breakpointLocationForLineColumn(int line, int column);
</del><ins>+ std::optional<JSTextPosition> breakpointLocationForLineColumn(int line, int column);
</ins><span class="cx">
</span><span class="cx"> void sort();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerScriptProfilingScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/ScriptProfilingScope.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/ScriptProfilingScope.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/debugger/ScriptProfilingScope.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* m_globalObject { nullptr };
</span><del>- Optional<double> m_startTime;
</del><ins>+ std::optional<double> m_startTime;
</ins><span class="cx"> ProfilingReason m_reason;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx">
</span><span class="cx"> case DoubleRep: {
</span><span class="cx"> JSValue child = forNode(node->child1()).value();
</span><del>- if (Optional<double> number = child.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = child.toNumberFromPrimitive()) {
</ins><span class="cx"> setConstant(node, jsDoubleNumber(*number));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx">
</span><span class="cx"> case ArithClz32: {
</span><span class="cx"> JSValue operand = forNode(node->child1()).value();
</span><del>- if (Optional<double> number = operand.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = operand.toNumberFromPrimitive()) {
</ins><span class="cx"> uint32_t value = toUInt32(*number);
</span><span class="cx"> setConstant(node, jsNumber(clz32(value)));
</span><span class="cx"> break;
</span><span class="lines">@@ -855,7 +855,7 @@
</span><span class="cx"> JSValue child = forNode(node->child1()).value();
</span><span class="cx"> switch (node->child1().useKind()) {
</span><span class="cx"> case Int32Use:
</span><del>- if (Optional<double> number = child.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = child.toNumberFromPrimitive()) {
</ins><span class="cx"> JSValue result = jsNumber(fabs(*number));
</span><span class="cx"> if (result.isInt32()) {
</span><span class="cx"> setConstant(node, result);
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> forNode(node).setType(SpecInt32Only);
</span><span class="cx"> break;
</span><span class="cx"> case DoubleRepUse:
</span><del>- if (Optional<double> number = child.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = child.toNumberFromPrimitive()) {
</ins><span class="cx"> setConstant(node, jsDoubleNumber(fabs(*number)));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> case ArithCeil:
</span><span class="cx"> case ArithTrunc: {
</span><span class="cx"> JSValue operand = forNode(node->child1()).value();
</span><del>- if (Optional<double> number = operand.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = operand.toNumberFromPrimitive()) {
</ins><span class="cx"> double roundedValue = 0;
</span><span class="cx"> if (node->op() == ArithRound)
</span><span class="cx"> roundedValue = jsRound(*number);
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx">
</span><span class="cx"> case MapHash: {
</span><span class="cx"> if (JSValue key = forNode(node->child1()).value()) {
</span><del>- if (Optional<uint32_t> hash = concurrentJSMapHash(key)) {
</del><ins>+ if (std::optional<uint32_t> hash = concurrentJSMapHash(key)) {
</ins><span class="cx"> // Although C++ code uses uint32_t for the hash, the closest type in DFG IR is Int32
</span><span class="cx"> // and that's what MapHash returns. So, we have to cast to int32_t to avoid large
</span><span class="cx"> // unsigned values becoming doubles. This casting between signed and unsigned
</span><span class="lines">@@ -3165,7 +3165,7 @@
</span><span class="cx"> void AbstractInterpreter<AbstractStateType>::executeDoubleUnaryOpEffects(Node* node, double(*equivalentFunction)(double))
</span><span class="cx"> {
</span><span class="cx"> JSValue child = forNode(node->child1()).value();
</span><del>- if (Optional<double> number = child.toNumberFromPrimitive()) {
</del><ins>+ if (std::optional<double> number = child.toNumberFromPrimitive()) {
</ins><span class="cx"> setConstant(node, jsDoubleNumber(equivalentFunction(*number)));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -215,16 +215,16 @@
</span><span class="cx"> minifiedDFG.validateReferences(trackedReferences);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CodeOrigin> JITCode::findPC(CodeBlock*, void* pc)
</del><ins>+std::optional<CodeOrigin> JITCode::findPC(CodeBlock*, void* pc)
</ins><span class="cx"> {
</span><span class="cx"> for (OSRExit& exit : osrExit) {
</span><span class="cx"> if (ExecutableMemoryHandle* handle = exit.m_code.executableMemory()) {
</span><span class="cx"> if (handle->start() <= pc && pc < handle->end())
</span><del>- return Optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
</del><ins>+ return std::optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCode.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCode.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCode.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t commonDataOffset() { return OBJECT_OFFSETOF(JITCode, common); }
</span><span class="cx">
</span><del>- Optional<CodeOrigin> findPC(CodeBlock*, void* pc) override;
</del><ins>+ std::optional<CodeOrigin> findPC(CodeBlock*, void* pc) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class JITCompiler; // Allow JITCompiler to call setCodeRef().
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> PutPropertySlot slot(baseValue, strict);
</span><span class="cx"> if (direct) {
</span><span class="cx"> RELEASE_ASSERT(baseValue.isObject());
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
</ins><span class="cx"> scope.release();
</span><span class="cx"> asObject(baseValue)->putDirectIndex(exec, index.value(), value, 0, strict ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
</span><span class="cx"> return;
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt8Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt8Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewInt16ArrayWithSize(
</span><span class="lines">@@ -1188,7 +1188,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt16Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt16Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewInt32ArrayWithSize(
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt32Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt32Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewUint8ArrayWithSize(
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewUint8ClampedArrayWithSize(
</span><span class="lines">@@ -1230,7 +1230,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8ClampedArray>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8ClampedArray>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewUint16ArrayWithSize(
</span><span class="lines">@@ -1244,7 +1244,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint16Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint16Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewUint32ArrayWithSize(
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint32Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint32Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewFloat32ArrayWithSize(
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat32Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat32Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION operationNewFloat64ArrayWithSize(
</span><span class="lines">@@ -1286,7 +1286,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat64Array>(exec, structure, encodedValue, 0, Nullopt));
</del><ins>+ return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat64Array>(exec, structure, encodedValue, 0, std::nullopt));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSCell* JIT_OPERATION operationCreateActivationDirect(ExecState* exec, Structure* structure, JSScope* scope, SymbolTable* table, EncodedJSValue initialValueEncoded)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSlowPathGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> jit->m_outOfLineStreamIndex = m_streamIndex;
</span><span class="cx"> jit->m_origin = m_origin;
</span><span class="cx"> generateInternal(jit);
</span><del>- jit->m_outOfLineStreamIndex = Nullopt;
</del><ins>+ jit->m_outOfLineStreamIndex = std::nullopt;
</ins><span class="cx"> if (!ASSERT_DISABLED)
</span><span class="cx"> jit->m_jit.abortWithReason(DFGSlowPathGeneratorFellThrough);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> m_outOfLineStreamIndex = slowPathLambda.streamIndex;
</span><span class="cx"> pcToCodeOriginMapBuilder.appendItem(m_jit.labelIgnoringWatchpoints(), currentNode->origin.semantic);
</span><span class="cx"> slowPathLambda.generator();
</span><del>- m_outOfLineStreamIndex = Nullopt;
</del><ins>+ m_outOfLineStreamIndex = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3188,8 +3188,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<JSValueOperand> left;
- Optional<JSValueOperand> right;
</del><ins>+ std::optional<JSValueOperand> left;
+ std::optional<JSValueOperand> right;
</ins><span class="cx">
</span><span class="cx"> JSValueRegs leftRegs;
</span><span class="cx"> JSValueRegs rightRegs;
</span><span class="lines">@@ -3219,11 +3219,11 @@
</span><span class="cx"> RELEASE_ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
</span><span class="cx">
</span><span class="cx"> if (!leftOperand.isConst()) {
</span><del>- left = JSValueOperand(this, leftChild);
</del><ins>+ left.emplace(this, leftChild);
</ins><span class="cx"> leftRegs = left->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx"> if (!rightOperand.isConst()) {
</span><del>- right = JSValueOperand(this, rightChild);
</del><ins>+ right.emplace(this, rightChild);
</ins><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3335,8 +3335,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<JSValueOperand> left;
- Optional<JSValueOperand> right;
</del><ins>+ std::optional<JSValueOperand> left;
+ std::optional<JSValueOperand> right;
</ins><span class="cx">
</span><span class="cx"> JSValueRegs leftRegs;
</span><span class="cx"> JSValueRegs rightRegs;
</span><span class="lines">@@ -3372,11 +3372,11 @@
</span><span class="cx"> RELEASE_ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
</span><span class="cx">
</span><span class="cx"> if (!leftOperand.isConst()) {
</span><del>- left = JSValueOperand(this, leftChild);
</del><ins>+ left.emplace(this, leftChild);
</ins><span class="cx"> leftRegs = left->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx"> if (!rightOperand.isConst()) {
</span><del>- right = JSValueOperand(this, rightChild);
</del><ins>+ right.emplace(this, rightChild);
</ins><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3497,8 +3497,8 @@
</span><span class="cx"> Edge& leftChild = node->child1();
</span><span class="cx"> Edge& rightChild = node->child2();
</span><span class="cx">
</span><del>- Optional<JSValueOperand> left;
- Optional<JSValueOperand> right;
</del><ins>+ std::optional<JSValueOperand> left;
+ std::optional<JSValueOperand> right;
</ins><span class="cx">
</span><span class="cx"> JSValueRegs leftRegs;
</span><span class="cx"> JSValueRegs rightRegs;
</span><span class="lines">@@ -3511,16 +3511,16 @@
</span><span class="cx"> GPRReg scratchGPR = InvalidGPRReg;
</span><span class="cx"> FPRReg scratchFPR = InvalidFPRReg;
</span><span class="cx">
</span><del>- Optional<FPRTemporary> fprScratch;
</del><ins>+ std::optional<FPRTemporary> fprScratch;
</ins><span class="cx"> if (needsScratchFPRReg) {
</span><del>- fprScratch = FPRTemporary(this);
</del><ins>+ fprScratch.emplace(this);
</ins><span class="cx"> scratchFPR = fprScratch->fpr();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><del>- Optional<GPRTemporary> gprScratch;
</del><ins>+ std::optional<GPRTemporary> gprScratch;
</ins><span class="cx"> if (needsScratchGPRReg) {
</span><del>- gprScratch = GPRTemporary(this);
</del><ins>+ gprScratch.emplace(this);
</ins><span class="cx"> scratchGPR = gprScratch->gpr();
</span><span class="cx"> }
</span><span class="cx"> GPRTemporary result(this);
</span><span class="lines">@@ -3547,11 +3547,11 @@
</span><span class="cx"> ASSERT(!(Generator::isLeftOperandValidConstant(leftOperand) && Generator::isRightOperandValidConstant(rightOperand)));
</span><span class="cx">
</span><span class="cx"> if (!Generator::isLeftOperandValidConstant(leftOperand)) {
</span><del>- left = JSValueOperand(this, leftChild);
</del><ins>+ left.emplace(this, leftChild);
</ins><span class="cx"> leftRegs = left->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx"> if (!Generator::isRightOperandValidConstant(rightOperand)) {
</span><del>- right = JSValueOperand(this, rightChild);
</del><ins>+ right.emplace(this, rightChild);
</ins><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3616,10 +3616,10 @@
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> if (Generator::isLeftOperandValidConstant(leftOperand)) {
</span><del>- left = JSValueOperand(this, leftChild);
</del><ins>+ left.emplace(this, leftChild);
</ins><span class="cx"> leftRegs = left->jsValueRegs();
</span><span class="cx"> } else if (Generator::isRightOperandValidConstant(rightOperand)) {
</span><del>- right = JSValueOperand(this, rightChild);
</del><ins>+ right.emplace(this, rightChild);
</ins><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4258,9 +4258,9 @@
</span><span class="cx"> void SpeculativeJIT::compileMathIC(Node* node, JITUnaryMathIC<Generator>* mathIC, bool needsScratchGPRReg, RepatchingFunction repatchingFunction, NonRepatchingFunction nonRepatchingFunction)
</span><span class="cx"> {
</span><span class="cx"> GPRReg scratchGPR = InvalidGPRReg;
</span><del>- Optional<GPRTemporary> gprScratch;
</del><ins>+ std::optional<GPRTemporary> gprScratch;
</ins><span class="cx"> if (needsScratchGPRReg) {
</span><del>- gprScratch = GPRTemporary(this);
</del><ins>+ gprScratch.emplace(this);
</ins><span class="cx"> scratchGPR = gprScratch->gpr();
</span><span class="cx"> }
</span><span class="cx"> JSValueOperand childOperand(this, node->child1());
</span><span class="lines">@@ -4687,8 +4687,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<JSValueOperand> left;
- Optional<JSValueOperand> right;
</del><ins>+ std::optional<JSValueOperand> left;
+ std::optional<JSValueOperand> right;
</ins><span class="cx">
</span><span class="cx"> JSValueRegs leftRegs;
</span><span class="cx"> JSValueRegs rightRegs;
</span><span class="lines">@@ -4735,11 +4735,11 @@
</span><span class="cx"> RELEASE_ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
</span><span class="cx">
</span><span class="cx"> if (!leftOperand.isConst()) {
</span><del>- left = JSValueOperand(this, leftChild);
</del><ins>+ left.emplace(this, leftChild);
</ins><span class="cx"> leftRegs = left->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx"> if (!rightOperand.isConst()) {
</span><del>- right = JSValueOperand(this, rightChild);
</del><ins>+ right.emplace(this, rightChild);
</ins><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7612,10 +7612,10 @@
</span><span class="cx"> SpeculateCellOperand base(this, baseEdge);
</span><span class="cx"> regs.append(DOMJIT::Value(base.gpr(), m_state.forNode(baseEdge).value()));
</span><span class="cx">
</span><del>- Optional<SpeculateCellOperand> globalObject;
</del><ins>+ std::optional<SpeculateCellOperand> globalObject;
</ins><span class="cx"> if (patchpoint->requireGlobalObject) {
</span><span class="cx"> Edge& globalObjectEdge = node->child2();
</span><del>- globalObject = SpeculateCellOperand(this, globalObjectEdge);
</del><ins>+ globalObject.emplace(this, globalObjectEdge);
</ins><span class="cx"> regs.append(DOMJIT::Value(globalObject->gpr(), m_state.forNode(globalObjectEdge).value()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -2928,7 +2928,7 @@
</span><span class="cx"> };
</span><span class="cx"> Vector<SlowPathLambda> m_slowPathLambdas;
</span><span class="cx"> Vector<SilentRegisterSavePlan> m_plans;
</span><del>- Optional<unsigned> m_outOfLineStreamIndex;
</del><ins>+ std::optional<unsigned> m_outOfLineStreamIndex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -5050,15 +5050,15 @@
</span><span class="cx"> GPRTemporary structureID(this);
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx">
</span><del>- Optional<SpeculateCellOperand> keyAsCell;
- Optional<JSValueOperand> keyAsValue;
</del><ins>+ std::optional<SpeculateCellOperand> keyAsCell;
+ std::optional<JSValueOperand> keyAsValue;
</ins><span class="cx"> JSValueRegs keyRegs;
</span><span class="cx"> if (node->child2().useKind() == UntypedUse) {
</span><del>- keyAsValue = JSValueOperand(this, node->child2());
</del><ins>+ keyAsValue.emplace(this, node->child2());
</ins><span class="cx"> keyRegs = keyAsValue->jsValueRegs();
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(node->child2().useKind() == StringUse || node->child2().useKind() == SymbolUse);
</span><del>- keyAsCell = SpeculateCellOperand(this, node->child2());
</del><ins>+ keyAsCell.emplace(this, node->child2());
</ins><span class="cx"> keyRegs = JSValueRegs::payloadOnly(keyAsCell->gpr());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1949,10 +1949,10 @@
</span><span class="cx">
</span><span class="cx"> bool shouldCheckMasqueradesAsUndefined = !masqueradesAsUndefinedWatchpointIsStillValid();
</span><span class="cx"> JSGlobalObject* globalObject = m_jit.graph().globalObjectFor(node->origin.semantic);
</span><del>- Optional<GPRTemporary> scratch;
</del><ins>+ std::optional<GPRTemporary> scratch;
</ins><span class="cx"> GPRReg scratchGPR = InvalidGPRReg;
</span><span class="cx"> if (shouldCheckMasqueradesAsUndefined) {
</span><del>- scratch = GPRTemporary(this);
</del><ins>+ scratch.emplace(this);
</ins><span class="cx"> scratchGPR = scratch->gpr();
</span><span class="cx"> }
</span><span class="cx"> bool negateResult = true;
</span><span class="lines">@@ -2103,12 +2103,12 @@
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx"> FPRTemporary fprValue(this);
</span><span class="cx"> FPRTemporary fprTemp(this);
</span><del>- Optional<GPRTemporary> scratch;
</del><ins>+ std::optional<GPRTemporary> scratch;
</ins><span class="cx">
</span><span class="cx"> GPRReg scratchGPR = InvalidGPRReg;
</span><span class="cx"> bool shouldCheckMasqueradesAsUndefined = !masqueradesAsUndefinedWatchpointIsStillValid();
</span><span class="cx"> if (shouldCheckMasqueradesAsUndefined) {
</span><del>- scratch = GPRTemporary(this);
</del><ins>+ scratch.emplace(this);
</ins><span class="cx"> scratchGPR = scratch->gpr();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4769,11 +4769,11 @@
</span><span class="cx"> case StringUse: {
</span><span class="cx"> SpeculateCellOperand input(this, node->child1());
</span><span class="cx"> GPRTemporary result(this);
</span><del>- Optional<GPRTemporary> temp;
</del><ins>+ std::optional<GPRTemporary> temp;
</ins><span class="cx">
</span><span class="cx"> GPRReg tempGPR = InvalidGPRReg;
</span><span class="cx"> if (node->child1().useKind() == CellUse) {
</span><del>- temp = GPRTemporary(this);
</del><ins>+ temp.emplace(this);
</ins><span class="cx"> tempGPR = temp->gpr();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5207,15 +5207,15 @@
</span><span class="cx"> GPRTemporary structureID(this);
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx">
</span><del>- Optional<SpeculateCellOperand> keyAsCell;
- Optional<JSValueOperand> keyAsValue;
</del><ins>+ std::optional<SpeculateCellOperand> keyAsCell;
+ std::optional<JSValueOperand> keyAsValue;
</ins><span class="cx"> GPRReg keyGPR;
</span><span class="cx"> if (node->child2().useKind() == UntypedUse) {
</span><del>- keyAsValue = JSValueOperand(this, node->child2());
</del><ins>+ keyAsValue.emplace(this, node->child2());
</ins><span class="cx"> keyGPR = keyAsValue->gpr();
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(node->child2().useKind() == StringUse || node->child2().useKind() == SymbolUse);
</span><del>- keyAsCell = SpeculateCellOperand(this, node->child2());
</del><ins>+ keyAsCell.emplace(this, node->child2());
</ins><span class="cx"> keyGPR = keyAsCell->gpr();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if (m_node->isBinaryUseKind(DoubleRepUse)
</span><span class="cx"> && m_node->child2()->isNumberConstant()) {
</span><span class="cx">
</span><del>- if (Optional<double> reciprocal = safeReciprocalForDivByConst(m_node->child2()->asNumber())) {
</del><ins>+ if (std::optional<double> reciprocal = safeReciprocalForDivByConst(m_node->child2()->asNumber())) {
</ins><span class="cx"> Node* reciprocalNode = m_insertionSet.insertConstant(m_nodeIndex, m_node->origin, jsDoubleNumber(*reciprocal), DoubleConstant);
</span><span class="cx"> m_node->setOp(ArithMul);
</span><span class="cx"> m_node->child2() = Edge(reciprocalNode, DoubleRepUse);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -146,12 +146,12 @@
</span><span class="cx"> return RegisterSet();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CodeOrigin> JITCode::findPC(CodeBlock* codeBlock, void* pc)
</del><ins>+std::optional<CodeOrigin> JITCode::findPC(CodeBlock* codeBlock, void* pc)
</ins><span class="cx"> {
</span><span class="cx"> for (OSRExit& exit : osrExit) {
</span><span class="cx"> if (ExecutableMemoryHandle* handle = exit.m_code.executableMemory()) {
</span><span class="cx"> if (handle->start() <= pc && pc < handle->end())
</span><del>- return Optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
</del><ins>+ return std::optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -158,11 +158,11 @@
</span><span class="cx"> for (std::unique_ptr<LazySlowPath>& lazySlowPath : lazySlowPaths) {
</span><span class="cx"> if (ExecutableMemoryHandle* handle = lazySlowPath->stub().executableMemory()) {
</span><span class="cx"> if (handle->start() <= pc && pc < handle->end())
</span><del>- return Optional<CodeOrigin>(codeBlock->codeOrigin(lazySlowPath->callSiteIndex()));
</del><ins>+ return std::optional<CodeOrigin>(codeBlock->codeOrigin(lazySlowPath->callSiteIndex()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJITCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJITCode.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJITCode.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/ftl/FTLJITCode.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> RegisterSet liveRegistersToPreserveAtExceptionHandlingCallSite(CodeBlock*, CallSiteIndex) override;
</span><span class="cx">
</span><del>- Optional<CodeOrigin> findPC(CodeBlock*, void* pc) override;
</del><ins>+ std::optional<CodeOrigin> findPC(CodeBlock*, void* pc) override;
</ins><span class="cx">
</span><span class="cx"> CodeRef b3Code() const { return m_b3Code; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> class TimingScope {
</span><span class="cx"> public:
</span><del>- TimingScope(Optional<CollectionScope> scope, const char* name)
</del><ins>+ TimingScope(std::optional<CollectionScope> scope, const char* name)
</ins><span class="cx"> : m_scope(scope)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setScope(Optional<CollectionScope> scope)
</del><ins>+ void setScope(std::optional<CollectionScope> scope)
</ins><span class="cx"> {
</span><span class="cx"> m_scope = scope;
</span><span class="cx"> }
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> private:
</span><del>- Optional<CollectionScope> m_scope;
</del><ins>+ std::optional<CollectionScope> m_scope;
</ins><span class="cx"> double m_before;
</span><span class="cx"> const char* m_name;
</span><span class="cx"> };
</span><span class="lines">@@ -1084,7 +1084,7 @@
</span><span class="cx"> sweepAllLogicallyEmptyWeakBlocks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::collectAsync(Optional<CollectionScope> scope)
</del><ins>+void Heap::collectAsync(std::optional<CollectionScope> scope)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isSafeToCollect)
</span><span class="cx"> return;
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> bool alreadyRequested = false;
</span><span class="cx"> {
</span><span class="cx"> LockHolder locker(*m_threadLock);
</span><del>- for (Optional<CollectionScope> request : m_requests) {
</del><ins>+ for (std::optional<CollectionScope> request : m_requests) {
</ins><span class="cx"> if (scope) {
</span><span class="cx"> if (scope == CollectionScope::Eden) {
</span><span class="cx"> alreadyRequested = true;
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> requestCollection(scope);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::collectSync(Optional<CollectionScope> scope)
</del><ins>+void Heap::collectSync(std::optional<CollectionScope> scope)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isSafeToCollect)
</span><span class="cx"> return;
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_currentGCStartTime = MonotonicTime::now();
</span><span class="cx">
</span><del>- Optional<CollectionScope> scope;
</del><ins>+ std::optional<CollectionScope> scope;
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(*m_threadLock);
</span><span class="cx"> RELEASE_ASSERT(!m_requests.isEmpty());
</span><span class="lines">@@ -1164,7 +1164,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_isSafeToCollect);
</span><span class="cx"> if (m_collectionScope) {
</span><del>- dataLog("Collection scope already set during GC: ", m_collectionScope, "\n");
</del><ins>+ dataLog("Collection scope already set during GC: ", *m_collectionScope, "\n");
</ins><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1542,7 +1542,7 @@
</span><span class="cx"> cache->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Heap::Ticket Heap::requestCollection(Optional<CollectionScope> scope)
</del><ins>+Heap::Ticket Heap::requestCollection(std::optional<CollectionScope> scope)
</ins><span class="cx"> {
</span><span class="cx"> stopIfNecessary();
</span><span class="cx">
</span><span class="lines">@@ -1582,7 +1582,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::willStartCollection(Optional<CollectionScope> scope)
</del><ins>+void Heap::willStartCollection(std::optional<CollectionScope> scope)
</ins><span class="cx"> {
</span><span class="cx"> if (Options::logGC())
</span><span class="cx"> dataLog("=> ");
</span><span class="lines">@@ -1789,7 +1789,7 @@
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(m_collectionScope);
</span><span class="cx"> m_lastCollectionScope = m_collectionScope;
</span><del>- m_collectionScope = Nullopt;
</del><ins>+ m_collectionScope = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (auto* observer : m_observers)
</span><span class="cx"> observer->didGarbageCollect(scope);
</span><span class="lines">@@ -1915,7 +1915,7 @@
</span><span class="cx"> m_writeBarrierBuffer.add(cell);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Heap::shouldDoFullCollection(Optional<CollectionScope> scope) const
</del><ins>+bool Heap::shouldDoFullCollection(std::optional<CollectionScope> scope) const
</ins><span class="cx"> {
</span><span class="cx"> if (!Options::useGenerationalGC())
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> void removeObserver(HeapObserver* observer) { m_observers.removeFirst(observer); }
</span><span class="cx">
</span><span class="cx"> MutatorState mutatorState() const { return m_mutatorState; }
</span><del>- Optional<CollectionScope> collectionScope() const { return m_collectionScope; }
</del><ins>+ std::optional<CollectionScope> collectionScope() const { return m_collectionScope; }
</ins><span class="cx"> bool hasHeapAccess() const;
</span><span class="cx"> bool mutatorIsStopped() const;
</span><span class="cx"> bool collectorBelievesThatTheWorldIsStopped() const;
</span><span class="lines">@@ -186,11 +186,11 @@
</span><span class="cx"> bool shouldCollect();
</span><span class="cx">
</span><span class="cx"> // Queue up a collection. Returns immediately. This will not queue a collection if a collection
</span><del>- // of equal or greater strength exists. Full collections are stronger than Nullopt collections
- // and Nullopt collections are stronger than Eden collections. Nullopt means that the GC can
</del><ins>+ // of equal or greater strength exists. Full collections are stronger than std::nullopt collections
+ // and std::nullopt collections are stronger than Eden collections. std::nullopt means that the GC can
</ins><span class="cx"> // choose Eden or Full. This implies that if you request a GC while that GC is ongoing, nothing
</span><span class="cx"> // will happen.
</span><del>- JS_EXPORT_PRIVATE void collectAsync(Optional<CollectionScope> = Nullopt);
</del><ins>+ JS_EXPORT_PRIVATE void collectAsync(std::optional<CollectionScope> = std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // Queue up a collection and wait for it to complete. This won't return until you get your own
</span><span class="cx"> // complete collection. For example, if there was an ongoing asynchronous collection at the time
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> // you called this, then this would wait for that one to complete and then trigger your
</span><span class="cx"> // collection and then return. In weird cases, there could be multiple GC requests in the backlog
</span><span class="cx"> // and this will wait for that backlog before running its GC and returning.
</span><del>- JS_EXPORT_PRIVATE void collectSync(Optional<CollectionScope> = Nullopt);
</del><ins>+ JS_EXPORT_PRIVATE void collectSync(std::optional<CollectionScope> = std::nullopt);
</ins><span class="cx">
</span><span class="cx"> bool collectIfNecessaryOrDefer(GCDeferralContext* = nullptr); // Returns true if it did collect.
</span><span class="cx"> void collectAccordingToDeferGCProbability();
</span><span class="lines">@@ -425,11 +425,11 @@
</span><span class="cx"> void notifyThreadStopping(const LockHolder&);
</span><span class="cx">
</span><span class="cx"> typedef uint64_t Ticket;
</span><del>- Ticket requestCollection(Optional<CollectionScope>);
</del><ins>+ Ticket requestCollection(std::optional<CollectionScope>);
</ins><span class="cx"> void waitForCollection(Ticket);
</span><span class="cx">
</span><span class="cx"> void suspendCompilerThreads();
</span><del>- void willStartCollection(Optional<CollectionScope>);
</del><ins>+ void willStartCollection(std::optional<CollectionScope>);
</ins><span class="cx"> void flushWriteBarrierBuffer();
</span><span class="cx"> void prepareForMarking();
</span><span class="cx">
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> void sweepAllLogicallyEmptyWeakBlocks();
</span><span class="cx"> bool sweepNextLogicallyEmptyWeakBlock();
</span><span class="cx">
</span><del>- bool shouldDoFullCollection(Optional<CollectionScope> requestedCollectionScope) const;
</del><ins>+ bool shouldDoFullCollection(std::optional<CollectionScope> requestedCollectionScope) const;
</ins><span class="cx">
</span><span class="cx"> void incrementDeferralDepth();
</span><span class="cx"> void decrementDeferralDepth();
</span><span class="lines">@@ -497,8 +497,8 @@
</span><span class="cx"> size_t m_totalBytesVisited;
</span><span class="cx"> size_t m_totalBytesVisitedThisCycle;
</span><span class="cx">
</span><del>- Optional<CollectionScope> m_collectionScope;
- Optional<CollectionScope> m_lastCollectionScope;
</del><ins>+ std::optional<CollectionScope> m_collectionScope;
+ std::optional<CollectionScope> m_lastCollectionScope;
</ins><span class="cx"> MutatorState m_mutatorState { MutatorState::Running };
</span><span class="cx"> StructureIDTable m_structureIDTable;
</span><span class="cx"> MarkedSpace m_objectSpace;
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> bool m_collectorBelievesThatTheWorldIsStopped { false };
</span><span class="cx"> MonotonicTime m_stopTime;
</span><span class="cx">
</span><del>- Deque<Optional<CollectionScope>> m_requests;
</del><ins>+ Deque<std::optional<CollectionScope>> m_requests;
</ins><span class="cx"> Ticket m_lastServedTicket { 0 };
</span><span class="cx"> Ticket m_lastGrantedTicket { 0 };
</span><span class="cx"> bool m_threadShouldStop { false };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapSnapshotcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapSnapshot.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapSnapshot.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/heap/HeapSnapshot.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<HeapSnapshotNode> HeapSnapshot::nodeForCell(JSCell* cell)
</del><ins>+std::optional<HeapSnapshotNode> HeapSnapshot::nodeForCell(JSCell* cell)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_finalized);
</span><span class="cx">
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> unsigned middle = start + ((end - start) / 2);
</span><span class="cx"> HeapSnapshotNode& node = m_nodes[middle];
</span><span class="cx"> if (cell == node.cell)
</span><del>- return Optional<HeapSnapshotNode>(node);
</del><ins>+ return std::optional<HeapSnapshotNode>(node);
</ins><span class="cx"> if (cell < node.cell)
</span><span class="cx"> end = middle;
</span><span class="cx"> else
</span><span class="lines">@@ -153,32 +153,32 @@
</span><span class="cx"> if (m_previous)
</span><span class="cx"> return m_previous->nodeForCell(cell);
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<HeapSnapshotNode> HeapSnapshot::nodeForObjectIdentifier(unsigned objectIdentifier)
</del><ins>+std::optional<HeapSnapshotNode> HeapSnapshot::nodeForObjectIdentifier(unsigned objectIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (isEmpty()) {
</span><span class="cx"> if (m_previous)
</span><span class="cx"> return m_previous->nodeForObjectIdentifier(objectIdentifier);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (objectIdentifier > m_lastObjectIdentifier)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (objectIdentifier < m_firstObjectIdentifier) {
</span><span class="cx"> if (m_previous)
</span><span class="cx"> return m_previous->nodeForObjectIdentifier(objectIdentifier);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& node : m_nodes) {
</span><span class="cx"> if (node.identifier == objectIdentifier)
</span><del>- return Optional<HeapSnapshotNode>(node);
</del><ins>+ return std::optional<HeapSnapshotNode>(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapSnapshoth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapSnapshot.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapSnapshot.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/heap/HeapSnapshot.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> void finalize();
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const { return m_nodes.isEmpty(); }
</span><del>- Optional<HeapSnapshotNode> nodeForCell(JSCell*);
- Optional<HeapSnapshotNode> nodeForObjectIdentifier(unsigned objectIdentifier);
</del><ins>+ std::optional<HeapSnapshotNode> nodeForCell(JSCell*);
+ std::optional<HeapSnapshotNode> nodeForObjectIdentifier(unsigned objectIdentifier);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class HeapSnapshotBuilder;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> {
</span><span class="cx"> // In case this is a re-entrant call from a nested run loop, we don't want to lose
</span><span class="cx"> // the outer request's id just because the inner request is bogus.
</span><del>- SetForScope<Optional<long>> scopedRequestId(m_currentRequestId, Nullopt);
</del><ins>+ SetForScope<std::optional<long>> scopedRequestId(m_currentRequestId, std::nullopt);
</ins><span class="cx">
</span><span class="cx"> RefPtr<InspectorValue> parsedMessage;
</span><span class="cx"> if (!InspectorValue::parseJSON(message, parsedMessage)) {
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> // We could be called re-entrantly from a nested run loop, so restore the previous id.
</span><del>- SetForScope<Optional<long>> scopedRequestId(m_currentRequestId, requestId);
</del><ins>+ SetForScope<std::optional<long>> scopedRequestId(m_currentRequestId, requestId);
</ins><span class="cx">
</span><span class="cx"> RefPtr<InspectorValue> methodValue;
</span><span class="cx"> if (!messageObject->getValue(ASCIILiteral("method"), methodValue)) {
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> m_frontendRouter->sendResponse(message->toJSONString());
</span><span class="cx">
</span><span class="cx"> m_protocolErrors.clear();
</span><del>- m_currentRequestId = Nullopt;
</del><ins>+ m_currentRequestId = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackendDispatcher::reportProtocolError(CommonErrorCode errorCode, const String& errorMessage)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> reportProtocolError(m_currentRequestId, errorCode, errorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BackendDispatcher::reportProtocolError(Optional<long> relatedRequestId, CommonErrorCode errorCode, const String& errorMessage)
</del><ins>+void BackendDispatcher::reportProtocolError(std::optional<long> relatedRequestId, CommonErrorCode errorCode, const String& errorMessage)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(errorCode, errorCode >= 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> void sendPendingErrors();
</span><span class="cx">
</span><span class="cx"> void reportProtocolError(CommonErrorCode, const String& errorMessage);
</span><del>- void reportProtocolError(Optional<long> relatedRequestId, CommonErrorCode, const String& errorMessage);
</del><ins>+ void reportProtocolError(std::optional<long> relatedRequestId, CommonErrorCode, const String& errorMessage);
</ins><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> WTF_HIDDEN_DECLARATION
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> // For synchronously handled requests, avoid plumbing requestId through every
</span><span class="cx"> // call that could potentially fail with a protocol error.
</span><del>- Optional<long> m_currentRequestId { Nullopt };
</del><ins>+ std::optional<long> m_currentRequestId { std::nullopt };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -213,24 +213,24 @@
</span><span class="cx"> m_frontendDispatcher->trackingComplete(timestamp, snapshotData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<HeapSnapshotNode> InspectorHeapAgent::nodeForHeapObjectIdentifier(ErrorString& errorString, unsigned heapObjectIdentifier)
</del><ins>+std::optional<HeapSnapshotNode> InspectorHeapAgent::nodeForHeapObjectIdentifier(ErrorString& errorString, unsigned heapObjectIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> HeapProfiler* heapProfiler = m_environment.vm().heapProfiler();
</span><span class="cx"> if (!heapProfiler) {
</span><span class="cx"> errorString = ASCIILiteral("No heap snapshot");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HeapSnapshot* snapshot = heapProfiler->mostRecentSnapshot();
</span><span class="cx"> if (!snapshot) {
</span><span class="cx"> errorString = ASCIILiteral("No heap snapshot");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const Optional<HeapSnapshotNode> optionalNode = snapshot->nodeForObjectIdentifier(heapObjectIdentifier);
</del><ins>+ const std::optional<HeapSnapshotNode> optionalNode = snapshot->nodeForObjectIdentifier(heapObjectIdentifier);
</ins><span class="cx"> if (!optionalNode) {
</span><span class="cx"> errorString = ASCIILiteral("No object for identifier, it may have been collected");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return optionalNode;
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> DeferGC deferGC(vm.heap);
</span><span class="cx">
</span><span class="cx"> unsigned heapObjectIdentifier = static_cast<unsigned>(heapObjectId);
</span><del>- const Optional<HeapSnapshotNode> optionalNode = nodeForHeapObjectIdentifier(errorString, heapObjectIdentifier);
</del><ins>+ const std::optional<HeapSnapshotNode> optionalNode = nodeForHeapObjectIdentifier(errorString, heapObjectIdentifier);
</ins><span class="cx"> if (!optionalNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> DeferGC deferGC(vm.heap);
</span><span class="cx">
</span><span class="cx"> unsigned heapObjectIdentifier = static_cast<unsigned>(heapObjectId);
</span><del>- const Optional<HeapSnapshotNode> optionalNode = nodeForHeapObjectIdentifier(errorString, heapObjectIdentifier);
</del><ins>+ const std::optional<HeapSnapshotNode> optionalNode = nodeForHeapObjectIdentifier(errorString, heapObjectIdentifier);
</ins><span class="cx"> if (!optionalNode)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void clearHeapSnapshots();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<JSC::HeapSnapshotNode> nodeForHeapObjectIdentifier(ErrorString&, unsigned heapObjectIdentifier);
</del><ins>+ std::optional<JSC::HeapSnapshotNode> nodeForHeapObjectIdentifier(ErrorString&, unsigned heapObjectIdentifier);
</ins><span class="cx">
</span><span class="cx"> InjectedScriptManager& m_injectedScriptManager;
</span><span class="cx"> std::unique_ptr<HeapFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteConnectionToTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void close();
</span><span class="cx"> void targetClosed();
</span><span class="cx">
</span><del>- Optional<unsigned> targetIdentifier() const;
</del><ins>+ std::optional<unsigned> targetIdentifier() const;
</ins><span class="cx"> NSString *connectionIdentifier() const;
</span><span class="cx"> NSString *destination() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteConnectionToTargetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> teardownRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<unsigned> RemoteConnectionToTarget::targetIdentifier() const
</del><ins>+std::optional<unsigned> RemoteConnectionToTarget::targetIdentifier() const
</ins><span class="cx"> {
</span><del>- return m_target ? Optional<unsigned>(m_target->targetIdentifier()) : Nullopt;
</del><ins>+ return m_target ? std::optional<unsigned>(m_target->targetIdentifier()) : std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSString *RemoteConnectionToTarget::connectionIdentifier() const
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<Lock> lock(m_targetMutex);
</span><span class="cx"> if (!m_target || !m_target->remoteControlAllowed()) {
</span><del>- RemoteInspector::singleton().setupFailed(targetIdentifier().valueOr(0));
</del><ins>+ RemoteInspector::singleton().setupFailed(targetIdentifier().value_or(0));
</ins><span class="cx"> m_target = nullptr;
</span><span class="cx"> } else if (is<RemoteInspectionTarget>(m_target)) {
</span><span class="cx"> auto castedTarget = downcast<RemoteInspectionTarget>(m_target);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> RefPtr<RemoteInspectorXPCConnection> m_relayConnection;
</span><span class="cx">
</span><span class="cx"> RemoteInspector::Client* m_client { nullptr };
</span><del>- Optional<RemoteInspector::Client::Capabilities> m_clientCapabilities;
</del><ins>+ std::optional<RemoteInspector::Client::Capabilities> m_clientCapabilities;
</ins><span class="cx">
</span><span class="cx"> dispatch_queue_t m_xpcQueue;
</span><span class="cx"> unsigned m_nextAvailableTargetIdentifier { 1 };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> std::lock_guard<Lock> lock(m_mutex);
</span><span class="cx">
</span><span class="cx"> if (!m_client)
</span><del>- m_clientCapabilities = Nullopt;
</del><ins>+ m_clientCapabilities = std::nullopt;
</ins><span class="cx"> else {
</span><span class="cx"> RemoteInspector::Client::Capabilities updatedCapabilities = {
</span><span class="cx"> m_client->remoteAutomationAllowed() // remoteAutomationAllowed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -370,11 +370,11 @@
</span><span class="cx"> 'namespace %s {' % self.helpers_namespace(),
</span><span class="cx"> '',
</span><span class="cx"> 'template<typename ProtocolEnumType>',
</span><del>- 'Optional<ProtocolEnumType> parseEnumValueFromString(const String&);',
</del><ins>+ 'std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);',
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> def return_type_with_export_macro(cpp_protocol_type):
</span><del>- enum_return_type = 'Optional<%s>' % cpp_protocol_type
</del><ins>+ enum_return_type = 'std::optional<%s>' % cpp_protocol_type
</ins><span class="cx"> result_terms = [enum_return_type]
</span><span class="cx"> export_macro = self.model().framework.setting('export_macro', None)
</span><span class="cx"> if export_macro is not None:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> body_lines = []
</span><span class="cx"> body_lines.extend([
</span><span class="cx"> 'template<>',
</span><del>- 'Optional<%s> parseEnumValueFromString<%s>(const String& protocolString)' % (cpp_protocol_type, cpp_protocol_type),
</del><ins>+ 'std::optional<%s> parseEnumValueFromString<%s>(const String& protocolString)' % (cpp_protocol_type, cpp_protocol_type),
</ins><span class="cx"> '{',
</span><span class="cx"> ' static const size_t constantValues[] = {',
</span><span class="cx"> ])
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> ' if (protocolString == enum_constant_values[constantValues[i]])',
</span><span class="cx"> ' return (%s)constantValues[i];' % cpp_protocol_type,
</span><span class="cx"> '',
</span><del>- ' return Nullopt;',
</del><ins>+ ' return std::nullopt;',
</ins><span class="cx"> '}',
</span><span class="cx"> '',
</span><span class="cx"> ])
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -723,11 +723,11 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Database' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Database' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Database::PrimaryColors::Red,
</span><span class="lines">@@ -806,7 +806,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Database::PrimaryColors)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -624,11 +624,11 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Database' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -696,7 +696,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Database' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Database::PrimaryColors::Red,
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Database::PrimaryColors)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -471,11 +471,11 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'TypeDomain' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String&);
</del><ins>+std::optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'TypeDomain' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::TypeDomain::TypeDomainEnum::Shared,
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::TypeDomain::TypeDomainEnum)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -413,11 +413,11 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Runtime' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Runtime' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Runtime::KeyPath::Type::Null,
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Runtime::KeyPath::Type)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -363,11 +363,11 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Debugger' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Debugger' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Debugger::Reason::Died,
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Debugger::Reason)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -360,13 +360,13 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Runtime' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String&);
</ins><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Runtime' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Runtime::FarmAnimals::Pigs,
</span><span class="lines">@@ -446,11 +446,11 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Runtime::FarmAnimals)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Runtime::TwoLeggedAnimals::Ducks,
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Runtime::TwoLeggedAnimals)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -582,13 +582,13 @@
</span><span class="cx"> namespace TestHelpers {
</span><span class="cx">
</span><span class="cx"> template<typename ProtocolEnumType>
</span><del>-Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</del><ins>+std::optional<ProtocolEnumType> parseEnumValueFromString(const String&);
</ins><span class="cx">
</span><span class="cx"> // Enums in the 'Test' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String&);
</ins><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String&);
</del><ins>+std::optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace TestHelpers
</span><span class="cx">
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx">
</span><span class="cx"> // Enums in the 'Test' Domain
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Test::UncastedAnimals::Pigs,
</span><span class="lines">@@ -668,11 +668,11 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Test::UncastedAnimals)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-Optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String& protocolString)
</del><ins>+std::optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String& protocolString)
</ins><span class="cx"> {
</span><span class="cx"> static const size_t constantValues[] = {
</span><span class="cx"> (size_t)Inspector::Protocol::Test::CastedAnimals::Ducks,
</span><span class="lines">@@ -684,7 +684,7 @@
</span><span class="cx"> if (protocolString == enum_constant_values[constantValues[i]])
</span><span class="cx"> return (Inspector::Protocol::Test::CastedAnimals)constantValues[i];
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCode.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCode.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jit/JITCode.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> virtual RegisterSet liveRegistersToPreserveAtExceptionHandlingCallSite(CodeBlock*, CallSiteIndex);
</span><del>- virtual Optional<CodeOrigin> findPC(CodeBlock*, void* pc) { UNUSED_PARAM(pc); return Nullopt; }
</del><ins>+ virtual std::optional<CodeOrigin> findPC(CodeBlock*, void* pc) { UNUSED_PARAM(pc); return std::nullopt; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITDivGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITDivGenerator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITDivGenerator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jit/JITDivGenerator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> loadOperand(jit, m_leftOperand, m_left, m_leftFPR);
</span><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><del>- Optional<double> safeReciprocal;
</del><ins>+ std::optional<double> safeReciprocal;
</ins><span class="cx"> if (m_rightOperand.isConst()) {
</span><span class="cx"> double constant = m_rightOperand.asConstNumber();
</span><span class="cx"> safeReciprocal = safeReciprocalForDivByConst(constant);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> auto property = subscript.toPropertyKey(callFrame);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(property)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(property)) {
</ins><span class="cx"> byValInfo->tookSlowPath = true;
</span><span class="cx"> baseObject->putDirectIndex(callFrame, index.value(), value, 0, isStrictMode ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitPCToCodeOriginMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -246,11 +246,11 @@
</span><span class="cx"> return size;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CodeOrigin> PCToCodeOriginMap::findPC(void* pc) const
</del><ins>+std::optional<CodeOrigin> PCToCodeOriginMap::findPC(void* pc) const
</ins><span class="cx"> {
</span><span class="cx"> uintptr_t pcAsInt = bitwise_cast<uintptr_t>(pc);
</span><span class="cx"> if (!(m_pcRangeStart <= pcAsInt && pcAsInt <= m_pcRangeEnd))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> uintptr_t currentPC = 0;
</span><span class="cx"> CodeOrigin currentCodeOrigin(0, nullptr);
</span><span class="lines">@@ -293,12 +293,12 @@
</span><span class="cx"> // We subtract 1 because we generate end points inclusively in this table, even though we are interested in ranges of the form: [previousPC, currentPC)
</span><span class="cx"> uintptr_t endOfRange = currentPC - 1;
</span><span class="cx"> if (startOfRange <= pcAsInt && pcAsInt <= endOfRange)
</span><del>- return Optional<CodeOrigin>(previousOrigin); // We return previousOrigin here because CodeOrigin's are mapped to the startValue of the range.
</del><ins>+ return std::optional<CodeOrigin>(previousOrigin); // We return previousOrigin here because CodeOrigin's are mapped to the startValue of the range.
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitPCToCodeOriginMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jit/PCToCodeOriginMap.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> PCToCodeOriginMap(PCToCodeOriginMapBuilder&&, LinkBuffer&);
</span><span class="cx"> ~PCToCodeOriginMap();
</span><span class="cx">
</span><del>- Optional<CodeOrigin> findPC(void* pc) const;
</del><ins>+ std::optional<CodeOrigin> findPC(void* pc) const;
</ins><span class="cx">
</span><span class="cx"> double memorySize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < thisObject->getLength()) {
</span><span class="cx"> slot.setValue(thisObject, DontDelete | DontEnum, jsNumber(thisObject->m_vector[index.value()]));
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> if (UNLIKELY(throwScope.exception()))
</span><span class="cx"> LLINT_END();
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(property))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(property))
</ins><span class="cx"> baseObject->putDirectIndex(exec, index.value(), value, 0, isStrictMode ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
</span><span class="cx"> else {
</span><span class="cx"> PutPropertySlot slot(baseObject, isStrictMode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserModuleAnalyzercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> // Indirectly exported binding.
</span><span class="cx"> // import a from "mod"
</span><span class="cx"> // export { a }
</span><del>- Optional<JSModuleRecord::ImportEntry> optionalImportEntry = moduleRecord()->tryGetImportEntry(localName.get());
</del><ins>+ std::optional<JSModuleRecord::ImportEntry> optionalImportEntry = moduleRecord()->tryGetImportEntry(localName.get());
</ins><span class="cx"> ASSERT(optionalImportEntry);
</span><span class="cx"> const JSModuleRecord::ImportEntry& importEntry = *optionalImportEntry;
</span><span class="cx"> for (auto& exportName : moduleProgramNode.moduleScopeData().exportedBindings().get(localName.get()))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConcurrentJSLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConcurrentJSLock.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConcurrentJSLock.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/ConcurrentJSLock.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> ConcurrentJSLocker(ConcurrentJSLock& lockable)
</span><span class="cx"> : ConcurrentJSLockerBase(lockable)
</span><span class="cx"> #if ENABLE(CONCURRENT_JS) && !defined(NDEBUG)
</span><del>- , m_disallowGC(InPlace)
</del><ins>+ , m_disallowGC(std::in_place)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> ConcurrentJSLocker(ConcurrentJSLock* lockable)
</span><span class="cx"> : ConcurrentJSLockerBase(lockable)
</span><span class="cx"> #if ENABLE(CONCURRENT_JS) && !defined(NDEBUG)
</span><del>- , m_disallowGC(InPlace)
</del><ins>+ , m_disallowGC(std::in_place)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> ConcurrentJSLocker(NoLockingNecessaryTag)
</span><span class="cx"> : ConcurrentJSLockerBase(NoLockingNecessary)
</span><span class="cx"> #if ENABLE(CONCURRENT_JS) && !defined(NDEBUG)
</span><del>- , m_disallowGC(Nullopt)
</del><ins>+ , m_disallowGC(std::nullopt)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONCURRENT_JS) && !defined(NDEBUG)
</span><span class="cx"> private:
</span><del>- Optional<DisallowGC> m_disallowGC;
</del><ins>+ std::optional<DisallowGC> m_disallowGC;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDefinePropertyAttributesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DefinePropertyAttributes.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DefinePropertyAttributes.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/DefinePropertyAttributes.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -99,10 +99,10 @@
</span><span class="cx"> return extractTriState(WritableShift) != MixedTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<bool> writable() const
</del><ins>+ std::optional<bool> writable() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasWritable())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return extractTriState(WritableShift) == TrueTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,10 +111,10 @@
</span><span class="cx"> return extractTriState(ConfigurableShift) != MixedTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<bool> configurable() const
</del><ins>+ std::optional<bool> configurable() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasConfigurable())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return extractTriState(ConfigurableShift) == TrueTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,10 +123,10 @@
</span><span class="cx"> return extractTriState(EnumerableShift) != MixedTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<bool> enumerable() const
</del><ins>+ std::optional<bool> enumerable() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasEnumerable())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return extractTriState(EnumerableShift) == TrueTriState;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGenericArgumentsInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(ident);
</del><ins>+ std::optional<uint32_t> index = parseIndex(ident);
</ins><span class="cx"> if (index && thisObject->canAccessIndexQuickly(index.value())) {
</span><span class="cx"> slot.setValue(thisObject, None, thisObject->getIndexQuickly(index.value()));
</span><span class="cx"> return true;
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> if (UNLIKELY(isThisValueAltered(slot, thisObject)))
</span><span class="cx"> return ordinarySetSlow(exec, thisObject, ident, value, slot.thisValue(), slot.isStrictMode());
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(ident);
</del><ins>+ std::optional<uint32_t> index = parseIndex(ident);
</ins><span class="cx"> if (index && thisObject->canAccessIndexQuickly(index.value())) {
</span><span class="cx"> thisObject->setIndexQuickly(vm, index.value(), value);
</span><span class="cx"> return true;
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> || ident == vm.propertyNames->iteratorSymbol))
</span><span class="cx"> thisObject->overrideThings(vm);
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(ident);
</del><ins>+ std::optional<uint32_t> index = parseIndex(ident);
</ins><span class="cx"> if (index && thisObject->canAccessIndexQuickly(index.value())) {
</span><span class="cx"> thisObject->overrideArgument(vm, index.value());
</span><span class="cx"> return true;
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> || ident == vm.propertyNames->iteratorSymbol)
</span><span class="cx"> thisObject->overrideThingsIfNecessary(vm);
</span><span class="cx"> else {
</span><del>- Optional<uint32_t> optionalIndex = parseIndex(ident);
</del><ins>+ std::optional<uint32_t> optionalIndex = parseIndex(ident);
</ins><span class="cx"> if (optionalIndex && thisObject->canAccessIndexQuickly(optionalIndex.value())) {
</span><span class="cx"> uint32_t index = optionalIndex.value();
</span><span class="cx"> if (!descriptor.isAccessorDescriptor()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeHasOwnPropertyCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return bitwise_cast<uint32_t>(structureID) + impl->hash();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ALWAYS_INLINE Optional<bool> get(Structure* structure, PropertyName propName)
</del><ins>+ ALWAYS_INLINE std::optional<bool> get(Structure* structure, PropertyName propName)
</ins><span class="cx"> {
</span><span class="cx"> UniquedStringImpl* impl = propName.uid();
</span><span class="cx"> StructureID id = structure->id();
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> Entry& entry = bitwise_cast<Entry*>(this)[index];
</span><span class="cx"> if (entry.structureID == id && entry.impl.get() == impl)
</span><span class="cx"> return entry.result;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE void tryAdd(VM& vm, PropertySlot& slot, JSObject* object, PropertyName propName, bool result)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeHashMapImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/HashMapImpl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/HashMapImpl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/HashMapImpl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -253,16 +253,16 @@
</span><span class="cx"> return wangsInt64Hash(rawValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE Optional<uint32_t> concurrentJSMapHash(JSValue key)
</del><ins>+ALWAYS_INLINE std::optional<uint32_t> concurrentJSMapHash(JSValue key)
</ins><span class="cx"> {
</span><span class="cx"> key = normalizeMapKey(key);
</span><span class="cx"> if (key.isString()) {
</span><span class="cx"> JSString* string = asString(key);
</span><span class="cx"> if (string->length() > 10 * 1024)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> const StringImpl* impl = string->tryGetValueImpl();
</span><span class="cx"> if (!impl)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return impl->concurrentHash();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -38,46 +38,46 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharType>
</span><del>-ALWAYS_INLINE Optional<uint32_t> parseIndex(const CharType* characters, unsigned length)
</del><ins>+ALWAYS_INLINE std::optional<uint32_t> parseIndex(const CharType* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> // An empty string is not a number.
</span><span class="cx"> if (!length)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Get the first character, turning it into a digit.
</span><span class="cx"> uint32_t value = characters[0] - '0';
</span><span class="cx"> if (value > 9)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Check for leading zeros. If the first characher is 0, then the
</span><span class="cx"> // length of the string must be one - e.g. "042" is not equal to "42".
</span><span class="cx"> if (!value && length > 1)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> while (--length) {
</span><span class="cx"> // Multiply value by 10, checking for overflow out of 32 bits.
</span><span class="cx"> if (value > 0xFFFFFFFFU / 10)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> value *= 10;
</span><span class="cx">
</span><span class="cx"> // Get the next character, turning it into a digit.
</span><span class="cx"> uint32_t newValue = *(++characters) - '0';
</span><span class="cx"> if (newValue > 9)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Add in the old value, checking for overflow out of 32 bits.
</span><span class="cx"> newValue += value;
</span><span class="cx"> if (newValue < value)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> value = newValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isIndex(value))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE Optional<uint32_t> parseIndex(StringImpl& impl)
</del><ins>+ALWAYS_INLINE std::optional<uint32_t> parseIndex(StringImpl& impl)
</ins><span class="cx"> {
</span><span class="cx"> if (impl.is8Bit())
</span><span class="cx"> return parseIndex(impl.characters8(), impl.length());
</span><span class="lines">@@ -271,13 +271,13 @@
</span><span class="cx"> return WTF::equal(r, s, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE Optional<uint32_t> parseIndex(const Identifier& identifier)
</del><ins>+ALWAYS_INLINE std::optional<uint32_t> parseIndex(const Identifier& identifier)
</ins><span class="cx"> {
</span><span class="cx"> auto uid = identifier.impl();
</span><span class="cx"> if (!uid)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (uid->isSymbol())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return parseIndex(*uid);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> // 4. Else if P is an array index (15.4), then
</span><span class="cx"> // a. Let index be ToUint32(P).
</span><del>- if (Optional<uint32_t> optionalIndex = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> optionalIndex = parseIndex(propertyName)) {
</ins><span class="cx"> // b. Reject if index >= oldLen and oldLenDesc.[[Writable]] is false.
</span><span class="cx"> uint32_t index = optionalIndex.value();
</span><span class="cx"> // FIXME: Nothing prevents this from being called on a RuntimeArray, and the length function will always return 0 in that case.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx"> return isUndefined() ? PNaN : 0; // null and false both convert to 0.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> JSValue::toNumberFromPrimitive() const
</del><ins>+std::optional<double> JSValue::toNumberFromPrimitive() const
</ins><span class="cx"> {
</span><span class="cx"> if (isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (isNumber())
</span><span class="cx"> return asNumber();
</span><span class="cx"> if (isBoolean())
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return PNaN;
</span><span class="cx"> if (isNull())
</span><span class="cx"> return 0;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSObject* JSValue::toObjectSlowCase(ExecState* exec, JSGlobalObject* globalObject) const
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putToPrimitiveByIndex(exec, index.value(), value, slot.isStrictMode());
</span><span class="cx">
</span><span class="cx"> // Check if there are any setters or getters in the prototype chain
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> double toNumber(ExecState*) const;
</span><span class="cx">
</span><span class="cx"> // toNumber conversion if it can be done without side effects.
</span><del>- Optional<double> toNumberFromPrimitive() const;
</del><ins>+ std::optional<double> toNumberFromPrimitive() const;
</ins><span class="cx">
</span><span class="cx"> JSString* toString(ExecState*) const; // On exception, this returns the empty string.
</span><span class="cx"> JSString* toStringOrNull(ExecState*) const; // On exception, this returns null, to make exception checks faster.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> static ElementType toAdaptorNativeFromValue(ExecState* exec, JSValue jsValue) { return toNativeFromValue<Adaptor>(exec, jsValue); }
</span><span class="cx">
</span><del>- static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
</del><ins>+ static std::optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
</ins><span class="cx">
</span><span class="cx"> void sort()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ViewClass>
</span><del>-inline JSObject* constructGenericTypedArrayViewWithArguments(ExecState* exec, Structure* structure, EncodedJSValue firstArgument, unsigned offset, Optional<unsigned> lengthOpt)
</del><ins>+inline JSObject* constructGenericTypedArrayViewWithArguments(ExecState* exec, Structure* structure, EncodedJSValue firstArgument, unsigned offset, std::optional<unsigned> lengthOpt)
</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">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue firstValue = exec->uncheckedArgument(0);
</span><span class="cx"> unsigned offset = 0;
</span><del>- Optional<unsigned> length = Nullopt;
</del><ins>+ std::optional<unsigned> length = std::nullopt;
</ins><span class="cx"> if (jsDynamicCast<JSArrayBuffer*>(firstValue) && argCount > 1) {
</span><span class="cx"> offset = exec->uncheckedArgument(1).toIndex(exec, "byteOffset");
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSGenericTypedArrayView* thisObject = jsCast<JSGenericTypedArrayView*>(object);
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
</ins><span class="cx"> if (thisObject->isNeutered()) {
</span><span class="cx"> slot.setCustom(thisObject, None, throwNeuteredTypedArrayTypeError);
</span><span class="cx"> return true;
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> // https://tc39.github.io/ecma262/#sec-integer-indexed-exotic-objects-set-p-v-receiver
</span><span class="cx"> // Ignore the receiver even if the receiver is altered to non base value.
</span><span class="cx"> // 9.4.5.5-2-b-i Return ? IntegerIndexedElementSet(O, numericIndex, V).
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putByIndex(thisObject, exec, index.value(), value, slot.isStrictMode());
</span><span class="cx">
</span><span class="cx"> return Base::put(thisObject, exec, propertyName, value, slot);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -90,20 +90,20 @@
</span><span class="cx"> ASSERT_UNUSED(isNewEntry, isNewEntry); // This is guaranteed by the parser.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-auto JSModuleRecord::tryGetImportEntry(UniquedStringImpl* localName) -> Optional<ImportEntry>
</del><ins>+auto JSModuleRecord::tryGetImportEntry(UniquedStringImpl* localName) -> std::optional<ImportEntry>
</ins><span class="cx"> {
</span><span class="cx"> const auto iterator = m_importEntries.find(localName);
</span><span class="cx"> if (iterator == m_importEntries.end())
</span><del>- return Nullopt;
- return Optional<ImportEntry>(iterator->value);
</del><ins>+ return std::nullopt;
+ return std::optional<ImportEntry>(iterator->value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-auto JSModuleRecord::tryGetExportEntry(UniquedStringImpl* exportName) -> Optional<ExportEntry>
</del><ins>+auto JSModuleRecord::tryGetExportEntry(UniquedStringImpl* exportName) -> std::optional<ExportEntry>
</ins><span class="cx"> {
</span><span class="cx"> const auto iterator = m_exportEntries.find(exportName);
</span><span class="cx"> if (iterator == m_exportEntries.end())
</span><del>- return Nullopt;
- return Optional<ExportEntry>(iterator->value);
</del><ins>+ return std::nullopt;
+ return std::optional<ExportEntry>(iterator->value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto JSModuleRecord::ExportEntry::createLocal(const Identifier& exportName, const Identifier& localName) -> ExportEntry
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> auto JSModuleRecord::resolveImport(ExecState* exec, const Identifier& localName) -> Resolution
</span><span class="cx"> {
</span><del>- Optional<ImportEntry> optionalImportEntry = tryGetImportEntry(localName.impl());
</del><ins>+ std::optional<ImportEntry> optionalImportEntry = tryGetImportEntry(localName.impl());
</ins><span class="cx"> if (!optionalImportEntry)
</span><span class="cx"> return Resolution::notFound();
</span><span class="cx">
</span><span class="lines">@@ -215,12 +215,12 @@
</span><span class="cx"> return lhs.moduleRecord == rhs.moduleRecord && lhs.exportName == rhs.exportName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-auto JSModuleRecord::tryGetCachedResolution(UniquedStringImpl* exportName) -> Optional<Resolution>
</del><ins>+auto JSModuleRecord::tryGetCachedResolution(UniquedStringImpl* exportName) -> std::optional<Resolution>
</ins><span class="cx"> {
</span><span class="cx"> const auto iterator = m_resolutionCache.find(exportName);
</span><span class="cx"> if (iterator == m_resolutionCache.end())
</span><del>- return Nullopt;
- return Optional<Resolution>(iterator->value);
</del><ins>+ return std::nullopt;
+ return std::optional<Resolution>(iterator->value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSModuleRecord::cacheResolution(UniquedStringImpl* exportName, const Resolution& resolution)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> // 4. Once we follow star links, we should not retrieve the result from the cache and should not cache the result.
</span><span class="cx"> if (!foundStarLinks) {
</span><del>- if (Optional<Resolution> cachedResolution = moduleRecord->tryGetCachedResolution(query.exportName.get())) {
</del><ins>+ if (std::optional<Resolution> cachedResolution = moduleRecord->tryGetCachedResolution(query.exportName.get())) {
</ins><span class="cx"> if (!mergeToCurrentTop(*cachedResolution))
</span><span class="cx"> return Resolution::ambiguous();
</span><span class="cx"> continue;
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Optional<ExportEntry> optionalExportEntry = moduleRecord->tryGetExportEntry(query.exportName.get());
</del><ins>+ const std::optional<ExportEntry> optionalExportEntry = moduleRecord->tryGetExportEntry(query.exportName.get());
</ins><span class="cx"> if (!optionalExportEntry) {
</span><span class="cx"> // If there is no matched exported binding in the current module,
</span><span class="cx"> // we need to look into the stars.
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> auto JSModuleRecord::resolveExport(ExecState* exec, const Identifier& exportName) -> Resolution
</span><span class="cx"> {
</span><span class="cx"> // Look up the cached resolution first before entering the resolving loop, since the loop setup takes some cost.
</span><del>- if (Optional<Resolution> cachedResolution = tryGetCachedResolution(exportName.impl()))
</del><ins>+ if (std::optional<Resolution> cachedResolution = tryGetCachedResolution(exportName.impl()))
</ins><span class="cx"> return *cachedResolution;
</span><span class="cx"> return resolveExportImpl(exec, ResolveQuery(this, exportName.impl()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleRecord.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleRecord.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleRecord.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> void addImportEntry(const ImportEntry&);
</span><span class="cx"> void addExportEntry(const ExportEntry&);
</span><span class="cx">
</span><del>- Optional<ImportEntry> tryGetImportEntry(UniquedStringImpl* localName);
- Optional<ExportEntry> tryGetExportEntry(UniquedStringImpl* exportName);
</del><ins>+ std::optional<ImportEntry> tryGetImportEntry(UniquedStringImpl* localName);
+ std::optional<ExportEntry> tryGetExportEntry(UniquedStringImpl* exportName);
</ins><span class="cx">
</span><span class="cx"> const SourceCode& sourceCode() const { return m_sourceCode; }
</span><span class="cx"> const Identifier& moduleKey() const { return m_moduleKey; }
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> struct ResolveQuery;
</span><span class="cx"> static Resolution resolveExportImpl(ExecState*, const ResolveQuery&);
</span><del>- Optional<Resolution> tryGetCachedResolution(UniquedStringImpl* exportName);
</del><ins>+ std::optional<Resolution> tryGetCachedResolution(UniquedStringImpl* exportName);
</ins><span class="cx"> void cacheResolution(UniquedStringImpl* exportName, const Resolution&);
</span><span class="cx">
</span><span class="cx"> // The loader resolves the given module name to the module key. The module key is the unique value to represent this module.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1462,7 +1462,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(value.isGetterSetter() && (attributes & Accessor));
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putDirectIndex(exec, index.value(), value, attributes, PutDirectIndexLikePutDirect);
</span><span class="cx">
</span><span class="cx"> return putDirectNonIndexAccessor(exec->vm(), propertyName, value, attributes);
</span><span class="lines">@@ -1527,7 +1527,7 @@
</span><span class="cx"> JSObject* thisObject = jsCast<JSObject*>(cell);
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return thisObject->methodTable(vm)->deletePropertyByIndex(thisObject, exec, index.value());
</span><span class="cx">
</span><span class="cx"> unsigned attributes;
</span><span class="lines">@@ -3016,7 +3016,7 @@
</span><span class="cx">
</span><span class="cx"> bool JSObject::putDirectMayBeIndex(ExecState* exec, PropertyName propertyName, JSValue value)
</span><span class="cx"> {
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putDirectIndex(exec, index.value(), value);
</span><span class="cx"> return putDirect(exec->vm(), propertyName, value);
</span><span class="cx"> }
</span><span class="lines">@@ -3169,7 +3169,7 @@
</span><span class="cx"> bool JSObject::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool throwException)
</span><span class="cx"> {
</span><span class="cx"> // If it's an array index, then use the indexed property storage.
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
</ins><span class="cx"> // c. Let succeeded be the result of calling the default [[DefineOwnProperty]] internal method (8.12.9) on A passing P, Desc, and false as arguments.
</span><span class="cx"> // d. Reject if succeeded is false.
</span><span class="cx"> // e. If index >= oldLen
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1320,7 +1320,7 @@
</span><span class="cx"> Structure* structure = object->structure(vm);
</span><span class="cx"> if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
</span><span class="cx"> return true;
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return getOwnPropertySlotByIndex(object, exec, index.value(), slot);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1338,7 +1338,7 @@
</span><span class="cx"> // getOwnNonIndexPropertySlot), so we cannot safely call the overridden getOwnPropertySlot
</span><span class="cx"> // (lest we return a property from a prototype that is shadowed). Check now for an index,
</span><span class="cx"> // if so we need to start afresh from this object.
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return getPropertySlot(exec, index.value(), slot);
</span><span class="cx"> // Safe to continue searching from current position; call getNonIndexPropertySlot to avoid
</span><span class="cx"> // parsing the int again.
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> object = asObject(prototype);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return getPropertySlot(exec, index.value(), slot);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1394,7 +1394,7 @@
</span><span class="cx"> ASSERT(!structure()->hasGetterSetterProperties());
</span><span class="cx"> ASSERT(!structure()->hasCustomGetterSetterProperties());
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putDirectIndex(exec, index.value(), value, 0, PutDirectIndexLikePutDirect);
</span><span class="cx">
</span><span class="cx"> return putDirectInternal<PutModePut>(exec->vm(), propertyName, value, 0, slot);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> // Try indexed put first. This is required for correctness, since loads on property names that appear like
</span><span class="cx"> // valid indices will never look in the named property storage.
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putByIndex(thisObject, exec, index.value(), value, slot.isStrictMode());
</span><span class="cx">
</span><span class="cx"> if (thisObject->canPerformFastPutInline(exec, vm, propertyName)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < length()) {
</span><span class="cx"> descriptor.setDescriptor(getIndex(exec, index.value()), DontDelete | ReadOnly);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < length()) {
</span><span class="cx"> slot.setValue(this, DontDelete | ReadOnly, getIndex(exec, index.value()));
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLiteralParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> PutPropertySlot slot(object, codeBlock ? codeBlock->isStrictMode() : false);
</span><span class="cx"> objectStack.last().put(m_exec, ident, lastValue, slot);
</span><span class="cx"> } else {
</span><del>- if (Optional<uint32_t> index = parseIndex(ident))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(ident))
</ins><span class="cx"> object->putDirectIndex(m_exec, index.value(), lastValue);
</span><span class="cx"> else
</span><span class="cx"> object->putDirect(vm, ident, lastValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMathCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MathCommon.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MathCommon.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/MathCommon.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -118,15 +118,15 @@
</span><span class="cx"> return toInt32(number);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<double> safeReciprocalForDivByConst(double constant)
</del><ins>+inline std::optional<double> safeReciprocalForDivByConst(double constant)
</ins><span class="cx"> {
</span><span class="cx"> // No "weird" numbers (NaN, Denormal, etc).
</span><span class="cx"> if (!constant || !std::isnormal(constant))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> int exponent;
</span><span class="cx"> if (std::frexp(constant, &exponent) != 0.5)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Note that frexp() returns the value divided by two
</span><span class="cx"> // so we to offset this exponent by one.
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> // A double exponent is between -1022 and 1023.
</span><span class="cx"> // Nothing we can do to invert 1023.
</span><span class="cx"> if (exponent == 1023)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> double reciprocal = std::ldexp(1, -exponent);
</span><span class="cx"> ASSERT(std::isnormal(reciprocal));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> Structure* structure = thisObject->structure(vm);
</span><span class="cx"> HasOwnPropertyCache* hasOwnPropertyCache = vm.ensureHasOwnPropertyCache();
</span><del>- if (Optional<bool> result = hasOwnPropertyCache->get(structure, propertyName)) {
</del><ins>+ if (std::optional<bool> result = hasOwnPropertyCache->get(structure, propertyName)) {
</ins><span class="cx"> ASSERT(*result == thisObject->hasOwnProperty(exec, propertyName));
</span><span class="cx"> ASSERT(!scope.exception());
</span><span class="cx"> return JSValue::encode(jsBoolean(*result));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -98,16 +98,16 @@
</span><span class="cx"> // We assume that validation is already done.
</span><span class="cx"> PropertyDescriptor desc;
</span><span class="cx">
</span><del>- if (Optional<bool> enumerable = attributes.enumerable())
</del><ins>+ if (std::optional<bool> enumerable = attributes.enumerable())
</ins><span class="cx"> desc.setEnumerable(enumerable.value());
</span><span class="cx">
</span><del>- if (Optional<bool> configurable = attributes.configurable())
</del><ins>+ if (std::optional<bool> configurable = attributes.configurable())
</ins><span class="cx"> desc.setConfigurable(configurable.value());
</span><span class="cx">
</span><span class="cx"> if (attributes.hasValue())
</span><span class="cx"> desc.setValue(value);
</span><span class="cx">
</span><del>- if (Optional<bool> writable = attributes.writable())
</del><ins>+ if (std::optional<bool> writable = attributes.writable())
</ins><span class="cx"> desc.setWritable(writable.value());
</span><span class="cx">
</span><span class="cx"> if (attributes.hasGet())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyNameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyName.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyName.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/PropertyName.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -114,13 +114,13 @@
</span><span class="cx"> return a.uid() != b.uid();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE Optional<uint32_t> parseIndex(PropertyName propertyName)
</del><ins>+ALWAYS_INLINE std::optional<uint32_t> parseIndex(PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> auto uid = propertyName.uid();
</span><span class="cx"> if (!uid)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (uid->isSymbol())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return parseIndex(*uid);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> storeCalleeIntoTopFrame(unprocessedStackTrace.frames[0].unverifiedCallee);
</span><span class="cx"> startIndex = 1;
</span><span class="cx"> }
</span><del>- } else if (Optional<CodeOrigin> codeOrigin = topCodeBlock->findPC(unprocessedStackTrace.topPC)) {
</del><ins>+ } else if (std::optional<CodeOrigin> codeOrigin = topCodeBlock->findPC(unprocessedStackTrace.topPC)) {
</ins><span class="cx"> codeOrigin->walkUpInlineStack([&] (const CodeOrigin& codeOrigin) {
</span><span class="cx"> appendCodeBlock(codeOrigin.inlineCallFrame ? codeOrigin.inlineCallFrame->baselineCodeBlock.get() : topCodeBlock, codeOrigin.bytecodeIndex);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringObject.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> if (propertyName == vm.propertyNames->length)
</span><span class="cx"> return typeError(exec, scope, slot.isStrictMode(), ASCIILiteral(ReadonlyPropertyWriteError));
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return putByIndex(cell, exec, index.value(), value, slot.isStrictMode());
</span><span class="cx"> return JSObject::put(cell, exec, propertyName, value, slot);
</span><span class="cx"> }
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (propertyName == exec->propertyNames().length)
</span><span class="cx"> return true;
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
</ins><span class="cx"> if (object->internalValue()->canGetIndex(index.value()))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> StringObject* thisObject = jsCast<StringObject*>(cell);
</span><span class="cx"> if (propertyName == exec->propertyNames().length)
</span><span class="cx"> return false;
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && thisObject->internalValue()->canGetIndex(index.value()))
</span><span class="cx"> return false;
</span><span class="cx"> return JSObject::deleteProperty(thisObject, exec, propertyName);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeToNativeFromValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ToNativeFromValue.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ToNativeFromValue.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/ToNativeFromValue.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Adaptor>
</span><del>-Optional<typename Adaptor::Type> toNativeFromValueWithoutCoercion(JSValue value)
</del><ins>+std::optional<typename Adaptor::Type> toNativeFromValueWithoutCoercion(JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> if (!value.isNumber())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (value.isInt32())
</span><span class="cx"> return Adaptor::toNativeFromInt32WithoutCoercion(value.asInt32());
</span><span class="cx"> return Adaptor::toNativeFromDoubleWithoutCoercion(value.asDouble());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypedArrayAdaptorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypedArrayAdaptors.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypedArrayAdaptors.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/JavaScriptCore/runtime/TypedArrayAdaptors.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -79,26 +79,26 @@
</span><span class="cx"> return OtherAdaptor::toNativeFromInt32(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</del><ins>+ static std::optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</ins><span class="cx"> {
</span><span class="cx"> if ((value >= 0 && static_cast<uint32_t>(value) > static_cast<uint32_t>(maxValue)) || value < static_cast<int32_t>(minValue))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return static_cast<Type>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromUint32WithoutCoercion(uint32_t value)
</del><ins>+ static std::optional<Type> toNativeFromUint32WithoutCoercion(uint32_t value)
</ins><span class="cx"> {
</span><span class="cx"> if (value > static_cast<uint32_t>(maxValue))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return static_cast<Type>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</del><ins>+ static std::optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</ins><span class="cx"> {
</span><span class="cx"> Type integer = static_cast<Type>(value);
</span><span class="cx"> if (static_cast<double>(integer) != value)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (value < 0)
</span><span class="cx"> return toNativeFromInt32WithoutCoercion(static_cast<int32_t>(value));
</span><span class="lines">@@ -149,12 +149,12 @@
</span><span class="cx"> return OtherAdaptor::toNativeFromDouble(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</del><ins>+ static std::optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</ins><span class="cx"> {
</span><span class="cx"> return static_cast<Type>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</del><ins>+ static std::optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</ins><span class="cx"> {
</span><span class="cx"> if (std::isnan(value) || std::isinf(value))
</span><span class="cx"> return static_cast<Type>(value);
</span><span class="lines">@@ -162,10 +162,10 @@
</span><span class="cx"> Type valueResult = static_cast<Type>(value);
</span><span class="cx">
</span><span class="cx"> if (static_cast<double>(valueResult) != value)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (value < minValue || value > maxValue)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return valueResult;
</span><span class="cx"> }
</span><span class="lines">@@ -255,19 +255,19 @@
</span><span class="cx"> return OtherAdaptor::toNativeFromInt32(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</del><ins>+ static std::optional<Type> toNativeFromInt32WithoutCoercion(int32_t value)
</ins><span class="cx"> {
</span><span class="cx"> if (value > maxValue || value < minValue)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return static_cast<Type>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</del><ins>+ static std::optional<Type> toNativeFromDoubleWithoutCoercion(double value)
</ins><span class="cx"> {
</span><span class="cx"> uint8_t integer = static_cast<uint8_t>(value);
</span><span class="cx"> if (static_cast<double>(integer) != value)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return integer;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,101 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Import std::optional reference implementation offered by the C++17
+ original proposal paper. It has the same interface and functionality
+ to the C++17's one. Previous WTF::Optional lacks several functionalities.
+ The largest one is the correct constexpr constructors. This fact prevents
+ us from using Optional<literal type> in constexpr context in WebKit.
+
+ In WebKit, we do not allow global constructors. So only the constexpr
+ constructor is the way to use WTF::Optional in the static const
+ global variables. WTF::Optional is used in DOMJIT::Effect and
+ we would like to emit static const global variables that includes
+ this DOMJIT::Effect. That is the main motivation of this work.
+ This functionality allows the IDL code generator to emit DOMJIT
+ signatures as static const global variables.
+
+ We import the reference implementation one instead of LLVM libc++'s one.
+ This is because LLVM libc++'s one depends on many macro and type_traits
+ offered by libc++ implementation. And adopting it to WebKit requires
+ large modification compared to this reference implementation one.
+ Furthermore, it is difficult to compile libc++'s optional in old GCC and VC++.
+ It also requires some more modifications. To keep the thing simple,
+ we import the reference implementation one now. Once C++17 is released
+ and we update the compiler baseline, we can smoothly switch to the standard
+ library's std::optional.
+
+ We also add support for the environment that does not use exceptions to this
+ reference implementation.
+
+ And we also add valueOrCompute helper function. That keeps the extended
+ functionality that previous WTF::Optional has.
+
+ * wtf/CrossThreadQueue.h:
+ (WTF::CrossThreadQueue<DataType>::tryGetMessage):
+ * wtf/Expected.h:
+ (WTF::makeExpected):
+ * wtf/Forward.h:
+ * wtf/HashTraits.h:
+ (WTF::HashTraits<Ref<P>>::take):
+ * wtf/MainThread.cpp:
+ (WTF::initializeGCThreads):
+ (WTF::mayBeGCThread):
+ * wtf/MainThread.h:
+ * wtf/Optional.h:
+ (std::detail_::is_assignable::has_assign):
+ (std::detail_::has_overloaded_addressof::has_overload):
+ (std::detail_::static_addressof):
+ (std::detail_::convert):
+ (std::nullopt_t::nullopt_t):
+ (std::bad_optional_access::bad_optional_access):
+ (std::optional_base::optional_base):
+ (std::optional_base::~optional_base):
+ (std::constexpr_optional_base::constexpr_optional_base):
+ (std::optional::dataptr):
+ (std::optional::contained_val):
+ (std::optional::__NOEXCEPT_):
+ (std::optional::optional):
+ (std::optional::operator=):
+ (std::optional::emplace):
+ (std::optional::operator ->):
+ (std::optional::operator *):
+ (std::optional::value):
+ (std::optional::value_or):
+ (std::operator==):
+ (std::operator!=):
+ (std::operator<):
+ (std::operator>):
+ (std::operator<=):
+ (std::operator>=):
+ (std::__NOEXCEPT_):
+ (std::make_optional):
+ (std::hash<std::optional<T>>::operator()):
+ (WTF::NulloptTag::NulloptTag): Deleted.
+ (WTF::Optional::Optional): Deleted.
+ (WTF::Optional::~Optional): Deleted.
+ (WTF::Optional::operator=): Deleted.
+ (WTF::Optional::operator bool): Deleted.
+ (WTF::Optional::operator->): Deleted.
+ (WTF::Optional::operator*): Deleted.
+ (WTF::Optional::value): Deleted.
+ (WTF::Optional::valueOr): Deleted.
+ (WTF::Optional::valueOrCompute): Deleted.
+ (WTF::Optional::asPtr): Deleted.
+ (WTF::Optional::destroy): Deleted.
+ (WTF::operator==): Deleted.
+ (WTF::operator!=): Deleted.
+ (WTF::makeOptional): Deleted.
+ (WTF::printInternal): Deleted.
+ * wtf/text/StringView.cpp:
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::Impl):
+ (WTF::StringView::GraphemeClusters::Iterator::Iterator):
+ * wtf/text/StringView.h:
+
</ins><span class="cx"> 2016-11-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Migrate some layout timer-related code from std::chrono to Seconds and MonotonicTime
</span></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadQueue.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadQueue.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/CrossThreadQueue.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void append(DataType&&);
</span><span class="cx">
</span><span class="cx"> DataType waitForMessage();
</span><del>- Optional<DataType> tryGetMessage();
</del><ins>+ std::optional<DataType> tryGetMessage();
</ins><span class="cx">
</span><span class="cx"> bool isKilled() const { return false; }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename DataType>
</span><del>-Optional<DataType> CrossThreadQueue<DataType>::tryGetMessage()
</del><ins>+std::optional<DataType> CrossThreadQueue<DataType>::tryGetMessage()
</ins><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_lock);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfExpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Expected.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Expected.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/Expected.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -406,15 +406,15 @@
</span><span class="cx">
</span><span class="cx"> template <typename T, typename E> void swap(Expected<T, E>& x, Expected<T, E>& y) { x.swap(y); }
</span><span class="cx">
</span><del>-template <class T, class E = WTF::NulloptTag> constexpr Expected<std::decay_t<T>, E> makeExpected(T&& v)
</del><ins>+template <class T, class E = std::nullopt_t> constexpr Expected<std::decay_t<T>, E> makeExpected(T&& v)
</ins><span class="cx"> {
</span><span class="cx"> return Expected<typename std::decay<T>::type, E>(std::forward<T>(v));
</span><span class="cx"> }
</span><span class="cx"> template <class T, class E> constexpr Expected<T, std::decay_t<E>> makeExpectedFromError(E&& e) { return Expected<T, std::decay_t<E>>(makeUnexpected(e)); }
</span><span class="cx"> template <class T, class E, class U> constexpr Expected<T, E> makeExpectedFromError(U&& u) { return Expected<T, E>(makeUnexpected(E { std::forward<U>(u) } )); }
</span><del>-// template <class F, class E = WTF::NulloptTag> constexpr Expected<typename std::result_of<F>::type, E> makeExpected_from_call(F f);
</del><ins>+// template <class F, class E = std::nullopt_t> constexpr Expected<typename std::result_of<F>::type, E> makeExpected_from_call(F f);
</ins><span class="cx">
</span><del>-inline Expected<void, WTF::NulloptTag> makeExpected() { return Expected<void, WTF::NulloptTag>(); }
</del><ins>+inline Expected<void, std::nullopt_t> makeExpected() { return Expected<void, std::nullopt_t>(); }
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfForwardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Forward.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Forward.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/Forward.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -22,6 +22,10 @@
</span><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span><ins>+namespace std {
+template<typename T> class optional;
+}
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> template<typename T> class Function;
</span><span class="lines">@@ -28,7 +32,6 @@
</span><span class="cx"> template<typename T> class LazyNeverDestroyed;
</span><span class="cx"> template<typename T> class NeverDestroyed;
</span><span class="cx"> template<typename T> class OptionSet;
</span><del>-template<typename T> class Optional;
</del><span class="cx"> template<typename T> class PassRefPtr;
</span><span class="cx"> template<typename T> class Ref;
</span><span class="cx"> template<typename T> class RefPtr;
</span><span class="lines">@@ -61,7 +64,6 @@
</span><span class="cx"> using WTF::LazyNeverDestroyed;
</span><span class="cx"> using WTF::NeverDestroyed;
</span><span class="cx"> using WTF::OptionSet;
</span><del>-using WTF::Optional;
</del><span class="cx"> using WTF::OrdinalNumber;
</span><span class="cx"> using WTF::PassRefPtr;
</span><span class="cx"> using WTF::PrintStream;
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTraits.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTraits.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/HashTraits.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> static PeekType peek(const Ref<P>& value) { return const_cast<PeekType>(value.ptrAllowingHashTableEmptyValue()); }
</span><span class="cx"> static PeekType peek(P* value) { return value; }
</span><span class="cx">
</span><del>- typedef Optional<Ref<P>> TakeType;
- static TakeType take(Ref<P>&& value) { return isEmptyValue(value) ? Nullopt : Optional<Ref<P>>(WTFMove(value)); }
</del><ins>+ typedef std::optional<Ref<P>> TakeType;
+ static TakeType take(Ref<P>&& value) { return isEmptyValue(value) ? std::nullopt : std::optional<Ref<P>>(WTFMove(value)); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct HashTraits<String> : SimpleClassHashTraits<String> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static ThreadSpecific<Optional<GCThreadType>, CanBeGCThread::True>* isGCThread;
</del><ins>+static ThreadSpecific<std::optional<GCThreadType>, CanBeGCThread::True>* isGCThread;
</ins><span class="cx">
</span><span class="cx"> void initializeGCThreads()
</span><span class="cx"> {
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> std::call_once(
</span><span class="cx"> flag,
</span><span class="cx"> [] {
</span><del>- isGCThread = new ThreadSpecific<Optional<GCThreadType>, CanBeGCThread::True>();
</del><ins>+ isGCThread = new ThreadSpecific<std::optional<GCThreadType>, CanBeGCThread::True>();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -221,12 +221,12 @@
</span><span class="cx"> return isMainThread();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<GCThreadType> mayBeGCThread()
</del><ins>+std::optional<GCThreadType> mayBeGCThread()
</ins><span class="cx"> {
</span><span class="cx"> if (!isGCThread)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (!isGCThread->isSet())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return **isGCThread;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/MainThread.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void printInternal(PrintStream&, GCThreadType);
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void registerGCThread(GCThreadType);
</span><del>-WTF_EXPORT_PRIVATE Optional<GCThreadType> mayBeGCThread();
</del><ins>+WTF_EXPORT_PRIVATE std::optional<GCThreadType> mayBeGCThread();
</ins><span class="cx"> WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
</span><span class="cx">
</span><span class="cx"> // NOTE: these functions are internal to the callOnMainThread implementation.
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Optional.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Optional.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/Optional.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,283 +1,1109 @@
</span><del>-/*
- * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
</del><ins>+// Copyright (C) 2011 - 2012 Andrzej Krzemienski.
+//
+// Use, modification, and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// The idea and interface is based on Boost.Optional library
+// authored by Fernando Luis Cacciola Carballal
+//
+// Boost Software License - Version 1.0 - August 17th, 2003
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
</ins><span class="cx">
</span><del>-#ifndef Optional_h
-#define Optional_h
</del><ins>+// Copied from https://github.com/akrzemi1/Optional (727c729dd1d9f06f225868280e50154594d7e59d)
</ins><span class="cx">
</span><del>-#include <type_traits>
-#include <wtf/Assertions.h>
-#include <wtf/PrintStream.h>
-#include <wtf/StdLibExtras.h>
</del><ins>+// Modified to make it compile with exceptions disabled.
</ins><span class="cx">
</span><del>-// WTF::Optional is a class based on std::optional, described here:
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2013/n3527.html
-// If this ends up in a C++ standard, we should replace our implementation with it.
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-namespace WTF {
</del><ins>+# include <utility>
+# include <type_traits>
+# include <initializer_list>
+# include <cassert>
+# include <functional>
+# include <string>
+# include <stdexcept>
+# include <wtf/Assertions.h>
+# include <wtf/Compiler.h>
+# include <wtf/StdLibExtras.h>
</ins><span class="cx">
</span><del>-struct InPlaceTag { };
-constexpr InPlaceTag InPlace { };
</del><ins>+# define TR2_OPTIONAL_REQUIRES(...) typename std::enable_if<__VA_ARGS__::value, bool>::type = false
</ins><span class="cx">
</span><del>-struct NulloptTag { explicit constexpr NulloptTag(int) { } };
-constexpr NulloptTag Nullopt { 0 };
</del><ins>+# if defined __GNUC__ // NOTE: GNUC is also defined for Clang
+# if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)
+# define TR2_OPTIONAL_GCC_4_8_AND_HIGHER___
+# elif (__GNUC__ > 4)
+# define TR2_OPTIONAL_GCC_4_8_AND_HIGHER___
+# endif
+#
+# if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)
+# define TR2_OPTIONAL_GCC_4_7_AND_HIGHER___
+# elif (__GNUC__ > 4)
+# define TR2_OPTIONAL_GCC_4_7_AND_HIGHER___
+# endif
+#
+# if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8) && (__GNUC_PATCHLEVEL__ >= 1)
+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___
+# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)
+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___
+# elif (__GNUC__ > 4)
+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___
+# endif
+# endif
+#
+# if defined __clang_major__
+# if (__clang_major__ == 3 && __clang_minor__ >= 5)
+# define TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_
+# elif (__clang_major__ > 3)
+# define TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_
+# endif
+# if defined TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_
+# define TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_
+# elif (__clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ >= 2)
+# define TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_
+# endif
+# endif
+#
+# if defined _MSC_VER
+# if (_MSC_VER >= 1900)
+# define TR2_OPTIONAL_MSVC_2015_AND_HIGHER___
+# endif
+# endif
</ins><span class="cx">
</span><del>-template<typename T>
-class Optional {
</del><ins>+# if defined __clang__
+# if (__clang_major__ > 2) || (__clang_major__ == 2) && (__clang_minor__ >= 9)
+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1
+# else
+# define OPTIONAL_HAS_THIS_RVALUE_REFS 0
+# endif
+# elif defined TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___
+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1
+# elif defined TR2_OPTIONAL_MSVC_2015_AND_HIGHER___
+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1
+# else
+# define OPTIONAL_HAS_THIS_RVALUE_REFS 0
+# endif
+
+
+# if defined TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___
+# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 1
+# define OPTIONAL_CONSTEXPR_INIT_LIST constexpr
+# else
+# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 0
+# define OPTIONAL_CONSTEXPR_INIT_LIST
+# endif
+
+// FIXME: To make the result of value() type consistent among the compilers, we now intentionally disables move accessors.
+# define OPTIONAL_HAS_MOVE_ACCESSORS 0
+// # if defined TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_ && (defined __cplusplus) && (__cplusplus != 201103L)
+// # define OPTIONAL_HAS_MOVE_ACCESSORS 1
+// # else
+// # define OPTIONAL_HAS_MOVE_ACCESSORS 0
+// # endif
+
+# // In C++11 constexpr implies const, so we need to make non-const members also non-constexpr
+# if (defined __cplusplus) && (__cplusplus == 201103L)
+# define OPTIONAL_MUTABLE_CONSTEXPR
+# else
+# define OPTIONAL_MUTABLE_CONSTEXPR constexpr
+# endif
+
+#if COMPILER_SUPPORTS(EXCEPTIONS)
+#define __THROW_EXCEPTION(__exception) throw __exception;
+#define __NOEXCEPT noexcept
+#define __NOEXCEPT_(__exception) noexcept(__exception)
+#else
+#define __THROW_EXCEPTION(__exception) do { (void)__exception; CRASH(); } while (0);
+#define __NOEXCEPT
+#define __NOEXCEPT_(...)
+#endif
+
+namespace std {
+namespace detail_ {
+
+// NOTE: All our target compilers support is_trivially_destructible.
+// // BEGIN workaround for missing is_trivially_destructible
+// # if defined TR2_OPTIONAL_GCC_4_8_AND_HIGHER___
+// // leave it: it is already there
+// # elif defined TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_
+// // leave it: it is already there
+// # elif defined TR2_OPTIONAL_MSVC_2015_AND_HIGHER___
+// // leave it: it is already there
+// # elif defined TR2_OPTIONAL_DISABLE_EMULATION_OF_TYPE_TRAITS
+// // leave it: the user doesn't want it
+// # else
+// template <typename T>
+// using is_trivially_destructible = std::has_trivial_destructor<T>;
+// # endif
+// // END workaround for missing is_trivially_destructible
+
+#if COMPILER_SUPPORTS(EXCEPTIONS)
+# if defined(TR2_OPTIONAL_GCC_4_7_AND_HIGHER___) || defined(TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_) || defined(TR2_OPTIONAL_MSVC_2015_AND_HIGHER___)
+ // leave it; our metafunctions are already defined.
+ template <typename T>
+ using is_nothrow_move_constructible = std::is_nothrow_move_constructible<T>;
+ template <typename T>
+ using is_nothrow_move_assignable = std::is_nothrow_move_assignable<T>;
+# elif defined TR2_OPTIONAL_DISABLE_EMULATION_OF_TYPE_TRAITS
+ // leave it: the user doesn't want it
+# else
+
+
+// workaround for missing traits in GCC and CLANG
+template <class T>
+struct is_nothrow_move_constructible
+{
+ constexpr static bool value = std::is_nothrow_constructible<T, T&&>::value;
+};
+
+
+template <class T, class U>
+struct is_assignable
+{
+ template <class X, class Y>
+ constexpr static bool has_assign(...) { return false; }
+
+ template <class X, class Y, size_t S = sizeof((std::declval<X>() = std::declval<Y>(), true)) >
+ // the comma operator is necessary for the cases where operator= returns void
+ constexpr static bool has_assign(bool) { return true; }
+
+ constexpr static bool value = has_assign<T, U>(true);
+};
+
+
+template <class T>
+struct is_nothrow_move_assignable
+{
+ template <class X, bool has_any_move_assign>
+ struct has_nothrow_move_assign {
+ constexpr static bool value = false;
+ };
+
+ template <class X>
+ struct has_nothrow_move_assign<X, true> {
+ constexpr static bool value = __NOEXCEPT_( std::declval<X&>() = std::declval<X&&>() );
+ };
+
+ constexpr static bool value = has_nothrow_move_assign<T, is_assignable<T&, T&&>::value>::value;
+};
+// end workaround
+
+
+# endif
+#endif
+
+} // namespace detail_
+
+// 20.5.4, optional for object types
+template <class T> class optional;
+
+// 20.5.5, optional for lvalue reference types
+template <class T> class optional<T&>;
+
+namespace detail_ {
+
+// workaround: std utility functions aren't constexpr yet
+template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type& t) __NOEXCEPT
+{
+ return static_cast<T&&>(t);
+}
+
+template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type&& t) __NOEXCEPT
+{
+ static_assert(!std::is_lvalue_reference<T>::value, "!!");
+ return static_cast<T&&>(t);
+}
+
+template <class T> inline constexpr typename std::remove_reference<T>::type&& constexpr_move(T&& t) __NOEXCEPT
+{
+ return static_cast<typename std::remove_reference<T>::type&&>(t);
+}
+
+#if defined NDEBUG
+# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) (EXPR)
+#else
+# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(!#CHECK);}(), (EXPR)))
+#endif
+
+
+// static_addressof: a constexpr version of addressof
+template <typename T>
+struct has_overloaded_addressof
+{
+ template <class X>
+ constexpr static bool has_overload(...) { return false; }
+
+ template <class X, size_t S = sizeof(std::declval<X&>().operator&()) >
+ constexpr static bool has_overload(bool) { return true; }
+
+ constexpr static bool value = has_overload<T>(true);
+};
+
+template <typename T, TR2_OPTIONAL_REQUIRES(!has_overloaded_addressof<T>)>
+constexpr T* static_addressof(T& ref)
+{
+ return &ref;
+}
+
+template <typename T, TR2_OPTIONAL_REQUIRES(has_overloaded_addressof<T>)>
+T* static_addressof(T& ref)
+{
+ return std::addressof(ref);
+}
+
+
+// the call to convert<A>(b) has return type A and converts b to type A iff b decltype(b) is implicitly convertible to A
+template <class U>
+constexpr U convert(U v) { return v; }
+
+} // namespace detail
+
+
+constexpr struct trivial_init_t{} trivial_init{};
+
+
+// 20.5.6, In-place construction
+constexpr struct in_place_t{} in_place{};
+
+
+// 20.5.7, Disengaged state indicator
+struct nullopt_t
+{
+ struct init{};
+ constexpr explicit nullopt_t(init){}
+};
+constexpr nullopt_t nullopt{nullopt_t::init()};
+
+
+// 20.5.8, class bad_optional_access
+class bad_optional_access : public std::logic_error {
</ins><span class="cx"> public:
</span><del>- Optional()
- : m_isEngaged(false)
- {
- }
</del><ins>+ explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
+ explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
+};
</ins><span class="cx">
</span><del>- Optional(NulloptTag)
- : m_isEngaged(false)
- {
- }
</del><span class="cx">
</span><del>- Optional(const T& value)
- : m_isEngaged(true)
- {
- new (NotNull, &m_value) T(value);
- }
</del><ins>+template <class T>
+union storage_t
+{
+ unsigned char dummy_;
+ T value_;
</ins><span class="cx">
</span><del>- Optional(const Optional& other)
- : m_isEngaged(other.m_isEngaged)
- {
- if (m_isEngaged)
- new (NotNull, &m_value) T(*other.asPtr());
- }
</del><ins>+ constexpr storage_t( trivial_init_t ) __NOEXCEPT : dummy_() {};
</ins><span class="cx">
</span><del>- Optional(Optional&& other)
- : m_isEngaged(other.m_isEngaged)
- {
- if (m_isEngaged)
- new (NotNull, &m_value) T(WTFMove(*other.asPtr()));
- }
</del><ins>+ template <class... Args>
+ constexpr storage_t( Args&&... args ) : value_(detail_::constexpr_forward<Args>(args)...) {}
</ins><span class="cx">
</span><del>- Optional(T&& value)
- : m_isEngaged(true)
- {
- new (NotNull, &m_value) T(WTFMove(value));
- }
</del><ins>+ ~storage_t(){}
+};
</ins><span class="cx">
</span><del>- template<typename... Args>
- Optional(InPlaceTag, Args&&... args)
- : m_isEngaged(true)
- {
- new (NotNull, &m_value) T(std::forward<Args>(args)...);
- }
</del><span class="cx">
</span><del>- ~Optional()
- {
- destroy();
- }
</del><ins>+template <class T>
+union constexpr_storage_t
+{
+ unsigned char dummy_;
+ T value_;
</ins><span class="cx">
</span><del>- Optional& operator=(NulloptTag)
- {
- destroy();
- return *this;
- }
</del><ins>+ constexpr constexpr_storage_t( trivial_init_t ) __NOEXCEPT : dummy_() {};
</ins><span class="cx">
</span><del>- Optional& operator=(const Optional& other)
- {
- if (this == &other)
- return *this;
</del><ins>+ template <class... Args>
+ constexpr constexpr_storage_t( Args&&... args ) : value_(detail_::constexpr_forward<Args>(args)...) {}
</ins><span class="cx">
</span><del>- destroy();
- if (other.m_isEngaged) {
- new (NotNull, &m_value) T(*other.asPtr());
- m_isEngaged = true;
- }
- return *this;
- }
</del><ins>+ ~constexpr_storage_t() = default;
+};
</ins><span class="cx">
</span><del>- Optional& operator=(Optional&& other)
- {
- if (this == &other)
- return *this;
</del><span class="cx">
</span><del>- destroy();
- if (other.m_isEngaged) {
- new (NotNull, &m_value) T(WTFMove(*other.asPtr()));
- m_isEngaged = true;
- }
- return *this;
- }
</del><ins>+template <class T>
+struct optional_base
+{
+ bool init_;
+ storage_t<T> storage_;
</ins><span class="cx">
</span><del>- template<typename U, class = typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, T>::value>::type>
- Optional& operator=(U&& u)
- {
- destroy();
- new (NotNull, &m_value) T(std::forward<U>(u));
- m_isEngaged = true;
- return *this;
- }
</del><ins>+ constexpr optional_base() __NOEXCEPT : init_(false), storage_(trivial_init) {};
</ins><span class="cx">
</span><del>- explicit operator bool() const { return m_isEngaged; }
</del><ins>+ explicit constexpr optional_base(const T& v) : init_(true), storage_(v) {}
</ins><span class="cx">
</span><del>- const T* operator->() const
- {
- ASSERT(m_isEngaged);
- return asPtr();
- }
</del><ins>+ explicit constexpr optional_base(T&& v) : init_(true), storage_(detail_::constexpr_move(v)) {}
</ins><span class="cx">
</span><del>- T* operator->()
- {
- ASSERT(m_isEngaged);
- return asPtr();
- }
</del><ins>+ template <class... Args> explicit optional_base(in_place_t, Args&&... args)
+ : init_(true), storage_(detail_::constexpr_forward<Args>(args)...) {}
</ins><span class="cx">
</span><del>- const T& operator*() const { return value(); }
- T& operator*() { return value(); }
</del><ins>+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
+ explicit optional_base(in_place_t, std::initializer_list<U> il, Args&&... args)
+ : init_(true), storage_(il, std::forward<Args>(args)...) {}
</ins><span class="cx">
</span><del>- T& value()
- {
- ASSERT(m_isEngaged);
- return *asPtr();
- }
</del><ins>+ ~optional_base() { if (init_) storage_.value_.T::~T(); }
+};
</ins><span class="cx">
</span><del>- const T& value() const
- {
- ASSERT(m_isEngaged);
- return *asPtr();
- }
</del><span class="cx">
</span><del>- template<typename U>
- T valueOr(U&& value) const
- {
- if (m_isEngaged)
- return *asPtr();
</del><ins>+template <class T>
+struct constexpr_optional_base
+{
+ bool init_;
+ constexpr_storage_t<T> storage_;
</ins><span class="cx">
</span><del>- return std::forward<U>(value);
- }
</del><ins>+ constexpr constexpr_optional_base() __NOEXCEPT : init_(false), storage_(trivial_init) {};
</ins><span class="cx">
</span><del>- template<typename U>
- T valueOrCompute(U callback) const
- {
- if (m_isEngaged)
- return *asPtr();
</del><ins>+ explicit constexpr constexpr_optional_base(const T& v) : init_(true), storage_(v) {}
</ins><span class="cx">
</span><del>- return callback();
</del><ins>+ explicit constexpr constexpr_optional_base(T&& v) : init_(true), storage_(detail_::constexpr_move(v)) {}
+
+ template <class... Args> explicit constexpr constexpr_optional_base(in_place_t, Args&&... args)
+ : init_(true), storage_(detail_::constexpr_forward<Args>(args)...) {}
+
+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
+ OPTIONAL_CONSTEXPR_INIT_LIST explicit constexpr_optional_base(in_place_t, std::initializer_list<U> il, Args&&... args)
+ : init_(true), storage_(il, std::forward<Args>(args)...) {}
+
+ ~constexpr_optional_base() = default;
+};
+
+template <class T>
+using OptionalBase = typename std::conditional<
+ std::is_trivially_destructible<T>::value, // if possible
+ constexpr_optional_base<typename std::remove_const<T>::type>, // use base with trivial destructor
+ optional_base<typename std::remove_const<T>::type>
+>::type;
+
+
+
+template <class T>
+class optional : private OptionalBase<T>
+{
+ static_assert( !std::is_same<typename std::decay<T>::type, nullopt_t>::value, "bad T" );
+ static_assert( !std::is_same<typename std::decay<T>::type, in_place_t>::value, "bad T" );
+
+
+ constexpr bool initialized() const __NOEXCEPT { return OptionalBase<T>::init_; }
+ typename std::remove_const<T>::type* dataptr() { return std::addressof(OptionalBase<T>::storage_.value_); }
+ constexpr const T* dataptr() const { return detail_::static_addressof(OptionalBase<T>::storage_.value_); }
+
+# if OPTIONAL_HAS_THIS_RVALUE_REFS == 1
+ constexpr const T& contained_val() const& { return OptionalBase<T>::storage_.value_; }
+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
+ OPTIONAL_MUTABLE_CONSTEXPR T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); }
+ OPTIONAL_MUTABLE_CONSTEXPR T& contained_val() & { return OptionalBase<T>::storage_.value_; }
+# else
+ T& contained_val() & { return OptionalBase<T>::storage_.value_; }
+ T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); }
+# endif
+# else
+ constexpr const T& contained_val() const { return OptionalBase<T>::storage_.value_; }
+ T& contained_val() { return OptionalBase<T>::storage_.value_; }
+# endif
+
+ void clear() __NOEXCEPT {
+ if (initialized()) dataptr()->T::~T();
+ OptionalBase<T>::init_ = false;
+ }
+
+ template <class... Args>
+ void initialize(Args&&... args) __NOEXCEPT_(__NOEXCEPT_(T(std::forward<Args>(args)...)))
+ {
+ ASSERT(!OptionalBase<T>::init_);
+ ::new (static_cast<void*>(dataptr())) T(std::forward<Args>(args)...);
+ OptionalBase<T>::init_ = true;
+ }
+
+ template <class U, class... Args>
+ void initialize(std::initializer_list<U> il, Args&&... args) __NOEXCEPT_(__NOEXCEPT_(T(il, std::forward<Args>(args)...)))
+ {
+ ASSERT(!OptionalBase<T>::init_);
+ ::new (static_cast<void*>(dataptr())) T(il, std::forward<Args>(args)...);
+ OptionalBase<T>::init_ = true;
+ }
+
+public:
+ typedef T value_type;
+
+ // 20.5.5.1, constructors
+ constexpr optional() __NOEXCEPT : OptionalBase<T>() {};
+ constexpr optional(nullopt_t) __NOEXCEPT : OptionalBase<T>() {};
+
+ optional(const optional& rhs)
+ : OptionalBase<T>()
+ {
+ if (rhs.initialized()) {
+ ::new (static_cast<void*>(dataptr())) T(*rhs);
+ OptionalBase<T>::init_ = true;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>-private:
- const T* asPtr() const { return reinterpret_cast<const T*>(&m_value); }
- T* asPtr() { return reinterpret_cast<T*>(&m_value); }
- void destroy()
- {
- if (m_isEngaged) {
- asPtr()->~T();
- m_isEngaged = false;
- }
</del><ins>+ optional(optional&& rhs) __NOEXCEPT_(detail_::is_nothrow_move_constructible<T>::value)
+ : OptionalBase<T>()
+ {
+ if (rhs.initialized()) {
+ ::new (static_cast<void*>(dataptr())) T(std::move(*rhs));
+ OptionalBase<T>::init_ = true;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- bool m_isEngaged;
- typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_value;
</del><ins>+ constexpr optional(const T& v) : OptionalBase<T>(v) {}
+
+ constexpr optional(T&& v) : OptionalBase<T>(detail_::constexpr_move(v)) {}
+
+ template <class... Args>
+ explicit constexpr optional(in_place_t, Args&&... args)
+ : OptionalBase<T>(in_place_t{}, detail_::constexpr_forward<Args>(args)...) {}
+
+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
+ OPTIONAL_CONSTEXPR_INIT_LIST explicit optional(in_place_t, std::initializer_list<U> il, Args&&... args)
+ : OptionalBase<T>(in_place_t{}, il, detail_::constexpr_forward<Args>(args)...) {}
+
+ // 20.5.4.2, Destructor
+ ~optional() = default;
+
+ // 20.5.4.3, assignment
+ optional& operator=(nullopt_t) __NOEXCEPT
+ {
+ clear();
+ return *this;
+ }
+
+ optional& operator=(const optional& rhs)
+ {
+ if (initialized() == true && rhs.initialized() == false) clear();
+ else if (initialized() == false && rhs.initialized() == true) initialize(*rhs);
+ else if (initialized() == true && rhs.initialized() == true) contained_val() = *rhs;
+ return *this;
+ }
+
+ optional& operator=(optional&& rhs)
+ __NOEXCEPT_(detail_::is_nothrow_move_assignable<T>::value && detail_::is_nothrow_move_constructible<T>::value)
+ {
+ if (initialized() == true && rhs.initialized() == false) clear();
+ else if (initialized() == false && rhs.initialized() == true) initialize(std::move(*rhs));
+ else if (initialized() == true && rhs.initialized() == true) contained_val() = std::move(*rhs);
+ return *this;
+ }
+
+ template <class U>
+ auto operator=(U&& v)
+ -> typename std::enable_if
+ <
+ std::is_same<typename std::decay<U>::type, T>::value,
+ optional&
+ >::type
+ {
+ if (initialized()) { contained_val() = std::forward<U>(v); }
+ else { initialize(std::forward<U>(v)); }
+ return *this;
+ }
+
+
+ template <class... Args>
+ void emplace(Args&&... args)
+ {
+ clear();
+ initialize(std::forward<Args>(args)...);
+ }
+
+ template <class U, class... Args>
+ void emplace(std::initializer_list<U> il, Args&&... args)
+ {
+ clear();
+ initialize<U, Args...>(il, std::forward<Args>(args)...);
+ }
+
+ // 20.5.4.4, Swap
+ void swap(optional<T>& rhs) __NOEXCEPT_(detail_::is_nothrow_move_constructible<T>::value && __NOEXCEPT_(swap(std::declval<T&>(), std::declval<T&>())))
+ {
+ if (initialized() == true && rhs.initialized() == false) { rhs.initialize(std::move(**this)); clear(); }
+ else if (initialized() == false && rhs.initialized() == true) { initialize(std::move(*rhs)); rhs.clear(); }
+ else if (initialized() == true && rhs.initialized() == true) { using std::swap; swap(**this, *rhs); }
+ }
+
+ // 20.5.4.5, Observers
+
+ explicit constexpr operator bool() const __NOEXCEPT { return initialized(); }
+
+ constexpr T const* operator ->() const {
+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), dataptr());
+ }
+
+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
+
+ OPTIONAL_MUTABLE_CONSTEXPR T* operator ->() {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // CONSTEXPR_ASSERT(initialized());
+ return dataptr();
+ }
+
+ constexpr T const& operator *() const& {
+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
+ }
+
+ OPTIONAL_MUTABLE_CONSTEXPR T& operator *() & {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // CONSTEXPR_ASSERT(initialized());
+ return contained_val();
+ }
+
+ OPTIONAL_MUTABLE_CONSTEXPR T&& operator *() && {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // CONSTEXPR_ASSERT(initialized());
+ return detail_::constexpr_move(contained_val());
+ }
+
+ constexpr T const& value() const& {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
+ return contained_val();
+ }
+
+ OPTIONAL_MUTABLE_CONSTEXPR T& value() & {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
+ return contained_val();
+ }
+
+ OPTIONAL_MUTABLE_CONSTEXPR T&& value() && {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // if (!initialized()) __THROW_EXCEPTION(bad_optional_access("bad optional access"));
+ return std::move(contained_val());
+ }
+
+# else
+
+ T* operator ->() {
+ assert (initialized());
+ return dataptr();
+ }
+
+ constexpr T const& operator *() const {
+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
+ }
+
+ T& operator *() {
+ assert (initialized());
+ return contained_val();
+ }
+
+ constexpr T const& value() const {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
+ return contained_val();
+ }
+
+ T& value() {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
+ return contained_val();
+ }
+
+# endif
+
+# if OPTIONAL_HAS_THIS_RVALUE_REFS == 1
+
+ template <class V>
+ constexpr T value_or(V&& v) const&
+ {
+ return *this ? **this : detail_::convert<T>(detail_::constexpr_forward<V>(v));
+ }
+
+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
+
+ template <class V>
+ OPTIONAL_MUTABLE_CONSTEXPR T value_or(V&& v) &&
+ {
+ return *this ? detail_::constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(detail_::constexpr_forward<V>(v));
+ }
+
+# else
+
+ template <class V>
+ T value_or(V&& v) &&
+ {
+ return *this ? detail_::constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(detail_::constexpr_forward<V>(v));
+ }
+
+# endif
+
+# else
+
+ template <class V>
+ constexpr T value_or(V&& v) const
+ {
+ return *this ? **this : detail_::convert<T>(detail_::constexpr_forward<V>(v));
+ }
+
+# endif
+
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator==(const Optional<T>& lhs, const Optional<T>& rhs)
</del><ins>+
+template <class T>
+class optional<T&>
</ins><span class="cx"> {
</span><del>- return static_cast<bool>(lhs) == static_cast<bool>(rhs) && (!static_cast<bool>(lhs) || lhs.value() == rhs.value());
</del><ins>+ static_assert( !std::is_same<T, nullopt_t>::value, "bad T" );
+ static_assert( !std::is_same<T, in_place_t>::value, "bad T" );
+ T* ref;
+
+public:
+
+ // 20.5.5.1, construction/destruction
+ constexpr optional() __NOEXCEPT : ref(nullptr) {}
+
+ constexpr optional(nullopt_t) __NOEXCEPT : ref(nullptr) {}
+
+ constexpr optional(T& v) __NOEXCEPT : ref(detail_::static_addressof(v)) {}
+
+ optional(T&&) = delete;
+
+ constexpr optional(const optional& rhs) __NOEXCEPT : ref(rhs.ref) {}
+
+ explicit constexpr optional(in_place_t, T& v) __NOEXCEPT : ref(detail_::static_addressof(v)) {}
+
+ explicit optional(in_place_t, T&&) = delete;
+
+ ~optional() = default;
+
+ // 20.5.5.2, mutation
+ optional& operator=(nullopt_t) __NOEXCEPT {
+ ref = nullptr;
+ return *this;
+ }
+
+ // optional& operator=(const optional& rhs) __NOEXCEPT {
+ // ref = rhs.ref;
+ // return *this;
+ // }
+
+ // optional& operator=(optional&& rhs) __NOEXCEPT {
+ // ref = rhs.ref;
+ // return *this;
+ // }
+
+ template <typename U>
+ auto operator=(U&& rhs) __NOEXCEPT
+ -> typename std::enable_if
+ <
+ std::is_same<typename std::decay<U>::type, optional<T&>>::value,
+ optional&
+ >::type
+ {
+ ref = rhs.ref;
+ return *this;
+ }
+
+ template <typename U>
+ auto operator=(U&& rhs) __NOEXCEPT
+ -> typename std::enable_if
+ <
+ !std::is_same<typename std::decay<U>::type, optional<T&>>::value,
+ optional&
+ >::type
+ = delete;
+
+ void emplace(T& v) __NOEXCEPT {
+ ref = detail_::static_addressof(v);
+ }
+
+ void emplace(T&&) = delete;
+
+
+ void swap(optional<T&>& rhs) __NOEXCEPT
+ {
+ std::swap(ref, rhs.ref);
+ }
+
+ // 20.5.5.3, observers
+ constexpr T* operator->() const {
+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, ref);
+ }
+
+ constexpr T& operator*() const {
+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, *ref);
+ }
+
+ constexpr T& value() const {
+ // FIXME: We need to offer special assert function that can be used under the contexpr context.
+ // return ref ? *ref : (throw bad_optional_access("bad optional access"), *ref);
+ return *ref;
+ }
+
+ explicit constexpr operator bool() const __NOEXCEPT {
+ return ref != nullptr;
+ }
+
+ template <class V>
+ constexpr typename std::decay<T>::type value_or(V&& v) const
+ {
+ return *this ? **this : detail_::convert<typename std::decay<T>::type>(detail_::constexpr_forward<V>(v));
+ }
+};
+
+
+template <class T>
+class optional<T&&>
+{
+ static_assert( sizeof(T) == 0, "optional rvalue references disallowed" );
+};
+
+
+// 20.5.8, Relational operators
+template <class T> constexpr bool operator==(const optional<T>& x, const optional<T>& y)
+{
+ return bool(x) != bool(y) ? false : bool(x) == false ? true : *x == *y;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator!=(const Optional<T>& lhs, const Optional<T>& rhs)
</del><ins>+template <class T> constexpr bool operator!=(const optional<T>& x, const optional<T>& y)
</ins><span class="cx"> {
</span><del>- return !(lhs == rhs);
</del><ins>+ return !(x == y);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator==(const Optional<T>& opt, NulloptTag)
</del><ins>+template <class T> constexpr bool operator<(const optional<T>& x, const optional<T>& y)
</ins><span class="cx"> {
</span><del>- return !opt;
</del><ins>+ return (!y) ? false : (!x) ? true : *x < *y;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator!=(const Optional<T>& opt, NulloptTag)
</del><ins>+template <class T> constexpr bool operator>(const optional<T>& x, const optional<T>& y)
</ins><span class="cx"> {
</span><del>- return static_cast<bool>(opt);
</del><ins>+ return (y < x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator==(NulloptTag, const Optional<T>& opt)
</del><ins>+template <class T> constexpr bool operator<=(const optional<T>& x, const optional<T>& y)
</ins><span class="cx"> {
</span><del>- return !opt;
</del><ins>+ return !(y < x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator!=(NulloptTag, const Optional<T>& opt)
</del><ins>+template <class T> constexpr bool operator>=(const optional<T>& x, const optional<T>& y)
</ins><span class="cx"> {
</span><del>- return static_cast<bool>(opt);
</del><ins>+ return !(x < y);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator==(const Optional<T>& opt, const T& value)
</del><ins>+
+// 20.5.9, Comparison with nullopt
+template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) __NOEXCEPT
</ins><span class="cx"> {
</span><del>- return opt && opt.value() == value;
</del><ins>+ return (!x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator!=(const Optional<T>& opt, const T& value)
</del><ins>+template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) __NOEXCEPT
</ins><span class="cx"> {
</span><del>- return !(opt == value);
</del><ins>+ return (!x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator==(const T& value, const Optional<T>& opt)
</del><ins>+template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) __NOEXCEPT
</ins><span class="cx"> {
</span><del>- return opt && opt.value() == value;
</del><ins>+ return bool(x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-constexpr bool operator!=(const T& value, const Optional<T>& opt)
</del><ins>+template <class T> constexpr bool operator!=(nullopt_t, const optional<T>& x) __NOEXCEPT
</ins><span class="cx"> {
</span><del>- return !(value == opt);
</del><ins>+ return bool(x);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-Optional<typename std::decay<T>::type>
-makeOptional(T&& value)
</del><ins>+template <class T> constexpr bool operator<(const optional<T>&, nullopt_t) __NOEXCEPT
</ins><span class="cx"> {
</span><del>- return Optional<typename std::decay<T>::type>(std::forward<T>(value));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-void printInternal(PrintStream& out, const Optional<T>& optional)
</del><ins>+template <class T> constexpr bool operator<(nullopt_t, const optional<T>& x) __NOEXCEPT
</ins><span class="cx"> {
</span><ins>+ return bool(x);
+}
+
+template <class T> constexpr bool operator<=(const optional<T>& x, nullopt_t) __NOEXCEPT
+{
+ return (!x);
+}
+
+template <class T> constexpr bool operator<=(nullopt_t, const optional<T>&) __NOEXCEPT
+{
+ return true;
+}
+
+template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) __NOEXCEPT
+{
+ return bool(x);
+}
+
+template <class T> constexpr bool operator>(nullopt_t, const optional<T>&) __NOEXCEPT
+{
+ return false;
+}
+
+template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) __NOEXCEPT
+{
+ return true;
+}
+
+template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) __NOEXCEPT
+{
+ return (!x);
+}
+
+
+
+// 20.5.10, Comparison with T
+template <class T> constexpr bool operator==(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x == v : false;
+}
+
+template <class T> constexpr bool operator==(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v == *x : false;
+}
+
+template <class T> constexpr bool operator!=(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x != v : true;
+}
+
+template <class T> constexpr bool operator!=(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v != *x : true;
+}
+
+template <class T> constexpr bool operator<(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x < v : true;
+}
+
+template <class T> constexpr bool operator>(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v > *x : true;
+}
+
+template <class T> constexpr bool operator>(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x > v : false;
+}
+
+template <class T> constexpr bool operator<(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v < *x : false;
+}
+
+template <class T> constexpr bool operator>=(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x >= v : false;
+}
+
+template <class T> constexpr bool operator<=(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v <= *x : false;
+}
+
+template <class T> constexpr bool operator<=(const optional<T>& x, const T& v)
+{
+ return bool(x) ? *x <= v : true;
+}
+
+template <class T> constexpr bool operator>=(const T& v, const optional<T>& x)
+{
+ return bool(x) ? v >= *x : true;
+}
+
+
+// Comparison of optional<T&> with T
+template <class T> constexpr bool operator==(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x == v : false;
+}
+
+template <class T> constexpr bool operator==(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v == *x : false;
+}
+
+template <class T> constexpr bool operator!=(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x != v : true;
+}
+
+template <class T> constexpr bool operator!=(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v != *x : true;
+}
+
+template <class T> constexpr bool operator<(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x < v : true;
+}
+
+template <class T> constexpr bool operator>(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v > *x : true;
+}
+
+template <class T> constexpr bool operator>(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x > v : false;
+}
+
+template <class T> constexpr bool operator<(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v < *x : false;
+}
+
+template <class T> constexpr bool operator>=(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x >= v : false;
+}
+
+template <class T> constexpr bool operator<=(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v <= *x : false;
+}
+
+template <class T> constexpr bool operator<=(const optional<T&>& x, const T& v)
+{
+ return bool(x) ? *x <= v : true;
+}
+
+template <class T> constexpr bool operator>=(const T& v, const optional<T&>& x)
+{
+ return bool(x) ? v >= *x : true;
+}
+
+// Comparison of optional<T const&> with T
+template <class T> constexpr bool operator==(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x == v : false;
+}
+
+template <class T> constexpr bool operator==(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v == *x : false;
+}
+
+template <class T> constexpr bool operator!=(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x != v : true;
+}
+
+template <class T> constexpr bool operator!=(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v != *x : true;
+}
+
+template <class T> constexpr bool operator<(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x < v : true;
+}
+
+template <class T> constexpr bool operator>(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v > *x : true;
+}
+
+template <class T> constexpr bool operator>(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x > v : false;
+}
+
+template <class T> constexpr bool operator<(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v < *x : false;
+}
+
+template <class T> constexpr bool operator>=(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x >= v : false;
+}
+
+template <class T> constexpr bool operator<=(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v <= *x : false;
+}
+
+template <class T> constexpr bool operator<=(const optional<const T&>& x, const T& v)
+{
+ return bool(x) ? *x <= v : true;
+}
+
+template <class T> constexpr bool operator>=(const T& v, const optional<const T&>& x)
+{
+ return bool(x) ? v >= *x : true;
+}
+
+
+// 20.5.12, Specialized algorithms
+template <class T>
+void swap(optional<T>& x, optional<T>& y) __NOEXCEPT_(__NOEXCEPT_(x.swap(y)))
+{
+ x.swap(y);
+}
+
+
+template <class T>
+constexpr optional<typename std::decay<T>::type> make_optional(T&& v)
+{
+ return optional<typename std::decay<T>::type>(detail_::constexpr_forward<T>(v));
+}
+
+template <class X>
+constexpr optional<X&> make_optional(std::reference_wrapper<X> v)
+{
+ return optional<X&>(v.get());
+}
+
+} // namespace std
+
+namespace WTF {
+
+// -- WebKit Additions --
+template <class OptionalType, class Callback>
+ALWAYS_INLINE
+auto valueOrCompute(OptionalType optional, Callback callback) -> typename OptionalType::value_type
+{
</ins><span class="cx"> if (optional)
</span><del>- out.print(*optional);
- else
- out.print("Nullopt");
</del><ins>+ return *optional;
+ return callback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-using WTF::InPlace;
-using WTF::Nullopt;
-using WTF::Optional;
-using WTF::makeOptional;
</del><ins>+namespace std
+{
+ template <typename T>
+ struct hash<std::optional<T>>
+ {
+ typedef typename hash<T>::result_type result_type;
+ typedef std::optional<T> argument_type;
</ins><span class="cx">
</span><del>-#endif // Optional_h
</del><ins>+ constexpr result_type operator()(argument_type const& arg) const {
+ return arg ? std::hash<T>{}(*arg) : result_type{};
+ }
+ };
+
+ template <typename T>
+ struct hash<std::optional<T&>>
+ {
+ typedef typename hash<T>::result_type result_type;
+ typedef std::optional<T&> argument_type;
+
+ constexpr result_type operator()(argument_type const& arg) const {
+ return arg ? std::hash<T>{}(*arg) : result_type{};
+ }
+ };
+}
+
+# undef TR2_OPTIONAL_REQUIRES
+# undef TR2_OPTIONAL_ASSERTED_EXPRESSION
+
+using WTF::valueOrCompute;
</ins></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/text/StringView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> class StringView::GraphemeClusters::Iterator::Impl {
</span><span class="cx"> public:
</span><del>- Impl(const StringView& stringView, Optional<NonSharedCharacterBreakIterator>&& iterator, unsigned index)
</del><ins>+ Impl(const StringView& stringView, std::optional<NonSharedCharacterBreakIterator>&& iterator, unsigned index)
</ins><span class="cx"> : m_stringView(stringView)
</span><span class="cx"> , m_iterator(WTFMove(iterator))
</span><span class="cx"> , m_index(index)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const StringView& m_stringView;
</span><del>- Optional<NonSharedCharacterBreakIterator> m_iterator;
</del><ins>+ std::optional<NonSharedCharacterBreakIterator> m_iterator;
</ins><span class="cx"> unsigned m_index;
</span><span class="cx"> unsigned m_indexEnd;
</span><span class="cx"> };
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringView::GraphemeClusters::Iterator::Iterator(const StringView& stringView, unsigned index)
</span><del>- : m_impl(std::make_unique<Impl>(stringView, stringView.isNull() ? Nullopt : Optional<NonSharedCharacterBreakIterator>(NonSharedCharacterBreakIterator(stringView)), index))
</del><ins>+ : m_impl(std::make_unique<Impl>(stringView, stringView.isNull() ? std::nullopt : std::optional<NonSharedCharacterBreakIterator>(NonSharedCharacterBreakIterator(stringView)), index))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WTF/wtf/text/StringView.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::reference_wrapper<const StringView> m_stringView;
</span><del>- Optional<unsigned> m_nextCodePointOffset;
</del><ins>+ std::optional<unsigned> m_nextCodePointOffset;
</ins><span class="cx"> UChar32 m_codePoint;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_nextCodePointOffset);
</span><span class="cx"> if (m_nextCodePointOffset.value() == m_stringView.get().length()) {
</span><del>- m_nextCodePointOffset = Nullopt;
</del><ins>+ m_nextCodePointOffset = std::nullopt;
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx"> if (m_stringView.get().is8Bit())
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,1144 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Rename valueOr to value_or. This is specified in C++17 proposal.
+
+ Use Optional::emplace. C++17 Optional::operator=(Optional&&) requires
+ either copy assignment operator or move assignment operator. But
+ DFG::JSValueOperand etc. only defines move constructors and drop
+ implicit copy assignment operators.
+
+ It was OK in the previous WTF::Optional since it always uses move
+ constructors. But it is not valid in C++17 Optional. We use Optional::emplace
+ instead. This function has the same semantics to the previous WTF::Optional's
+ operator=.
+
+ No behavior change.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::parseAmount):
+ (WebCore::createContactFields):
+ (WebCore::toLineItemType):
+ (WebCore::createLineItem):
+ (WebCore::createLineItems):
+ (WebCore::createMerchantCapabilities):
+ (WebCore::createSupportedNetworks):
+ (WebCore::toShippingType):
+ (WebCore::createShippingMethod):
+ (WebCore::createShippingMethods):
+ (WebCore::createPaymentRequest):
+ (WebCore::toPaymentAuthorizationStatus):
+ * Modules/applepay/PaymentContact.h:
+ * Modules/applepay/PaymentCoordinator.cpp:
+ (WebCore::PaymentCoordinator::completeShippingMethodSelection):
+ (WebCore::PaymentCoordinator::completeShippingContactSelection):
+ (WebCore::PaymentCoordinator::completePaymentMethodSelection):
+ * Modules/applepay/PaymentCoordinator.h:
+ * Modules/applepay/PaymentCoordinatorClient.h:
+ * Modules/applepay/PaymentMerchantSession.h:
+ * Modules/applepay/PaymentRequest.h:
+ * Modules/applepay/cocoa/PaymentContactCocoa.mm:
+ (WebCore::PaymentContact::fromJS):
+ * Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm:
+ (WebCore::PaymentMerchantSession::fromJS):
+ * Modules/encryptedmedia/MediaKeyStatusMap.cpp:
+ (WebCore::MediaKeyStatusMap::Iterator::next):
+ * Modules/encryptedmedia/MediaKeyStatusMap.h:
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::extract):
+ * Modules/fetch/FetchBody.h:
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::FetchBodyOwner):
+ (WebCore::FetchBodyOwner::loadBlob):
+ (WebCore::FetchBodyOwner::finishBlobLoading):
+ * Modules/fetch/FetchBodyOwner.h:
+ * Modules/fetch/FetchHeaders.cpp:
+ (WebCore::FetchHeaders::Iterator::next):
+ * Modules/fetch/FetchHeaders.h:
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::setReferrerPolicy):
+ (WebCore::setMode):
+ (WebCore::setCredentials):
+ (WebCore::setCache):
+ (WebCore::setRedirect):
+ (WebCore::setMethod):
+ (WebCore::setReferrer):
+ (WebCore::buildOptions):
+ (WebCore::FetchRequest::clone):
+ * Modules/fetch/FetchRequest.h:
+ (WebCore::FetchRequest::FetchRequest):
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::FetchResponse):
+ (WebCore::FetchResponse::cloneForJS):
+ (WebCore::FetchResponse::fetch):
+ (WebCore::FetchResponse::BodyLoader::didSucceed):
+ (WebCore::FetchResponse::BodyLoader::didFail):
+ (WebCore::FetchResponse::BodyLoader::didReceiveResponse):
+ (WebCore::FetchResponse::BodyLoader::stop):
+ * Modules/fetch/FetchResponse.h:
+ * Modules/geolocation/Coordinates.cpp:
+ (WebCore::Coordinates::altitude):
+ (WebCore::Coordinates::altitudeAccuracy):
+ (WebCore::Coordinates::heading):
+ (WebCore::Coordinates::speed):
+ * Modules/geolocation/Coordinates.h:
+ * Modules/indexeddb/IDBCursor.cpp:
+ (WebCore::IDBCursor::stringToDirection):
+ * Modules/indexeddb/IDBCursor.h:
+ * Modules/indexeddb/IDBDatabase.h:
+ * Modules/indexeddb/IDBDatabaseIdentifier.h:
+ (WebCore::IDBDatabaseIdentifier::hash):
+ * Modules/indexeddb/IDBFactory.cpp:
+ (WebCore::IDBFactory::open):
+ * Modules/indexeddb/IDBFactory.h:
+ * Modules/indexeddb/IDBIndex.cpp:
+ (WebCore::IDBIndex::getAll):
+ (WebCore::IDBIndex::getAllKeys):
+ * Modules/indexeddb/IDBIndex.h:
+ * Modules/indexeddb/IDBKeyPath.h:
+ (WebCore::isolatedCopy):
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::keyPath):
+ (WebCore::IDBObjectStore::getAll):
+ (WebCore::IDBObjectStore::getAllKeys):
+ * Modules/indexeddb/IDBObjectStore.h:
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::requestGetAllObjectStoreRecords):
+ (WebCore::IDBTransaction::requestGetAllIndexRecords):
+ * Modules/indexeddb/IDBTransaction.h:
+ * Modules/indexeddb/IDBVersionChangeEvent.cpp:
+ (WebCore::IDBVersionChangeEvent::IDBVersionChangeEvent):
+ * Modules/indexeddb/IDBVersionChangeEvent.h:
+ * Modules/indexeddb/server/IDBSerialization.cpp:
+ (WebCore::serializeIDBKeyPath):
+ (WebCore::deserializeIDBKeyPath):
+ * Modules/indexeddb/server/IDBSerialization.h:
+ * Modules/indexeddb/server/MemoryIndex.cpp:
+ (WebCore::IDBServer::MemoryIndex::getAllRecords):
+ * Modules/indexeddb/server/MemoryIndex.h:
+ * Modules/indexeddb/server/MemoryObjectStore.cpp:
+ (WebCore::IDBServer::MemoryObjectStore::getAllRecords):
+ * Modules/indexeddb/server/MemoryObjectStore.h:
+ * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+ (WebCore::IDBServer::MemoryObjectStoreCursor::objectStoreCleared):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::keyDeleted):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setFirstInRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):
+ * Modules/indexeddb/server/MemoryObjectStoreCursor.h:
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::extractExistingDatabaseInfo):
+ * Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
+ (WebCore::IDBDatabaseInfo::createNewObjectStore):
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+ * Modules/indexeddb/shared/IDBGetAllRecordsData.h:
+ * Modules/indexeddb/shared/IDBObjectStoreInfo.cpp:
+ (WebCore::IDBObjectStoreInfo::IDBObjectStoreInfo):
+ * Modules/indexeddb/shared/IDBObjectStoreInfo.h:
+ (WebCore::IDBObjectStoreInfo::keyPath):
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::displayNameForTrack):
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::endOfStream):
+ (WebCore::MediaSource::streamEndedWithError):
+ * Modules/mediasource/MediaSource.h:
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ (WebCore::PeerConnectionBackend::createOfferSucceeded):
+ (WebCore::PeerConnectionBackend::createOfferFailed):
+ (WebCore::PeerConnectionBackend::createAnswerSucceeded):
+ (WebCore::PeerConnectionBackend::createAnswerFailed):
+ (WebCore::PeerConnectionBackend::setLocalDescriptionSucceeded):
+ (WebCore::PeerConnectionBackend::setLocalDescriptionFailed):
+ (WebCore::PeerConnectionBackend::setRemoteDescriptionSucceeded):
+ (WebCore::PeerConnectionBackend::setRemoteDescriptionFailed):
+ (WebCore::PeerConnectionBackend::addIceCandidateSucceeded):
+ (WebCore::PeerConnectionBackend::addIceCandidateFailed):
+ (WebCore::PeerConnectionBackend::stop):
+ * Modules/mediastream/PeerConnectionBackend.h:
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ (WebCore::RTCDTMFSender::insertDTMF):
+ * Modules/mediastream/RTCDTMFSender.h:
+ * Modules/mediastream/RTCIceCandidate.cpp:
+ (WebCore::RTCIceCandidate::create):
+ (WebCore::RTCIceCandidate::RTCIceCandidate):
+ * Modules/mediastream/RTCIceCandidate.h:
+ (WebCore::RTCIceCandidate::sdpMLineIndex):
+ * Modules/mediastream/SDPProcessor.cpp:
+ (WebCore::iceCandidateFromJSON):
+ * Modules/proximity/DeviceProximityEvent.h:
+ * Modules/streams/ReadableStreamSource.h:
+ (WebCore::ReadableStreamSource::startFinished):
+ (WebCore::ReadableStreamSource::pullFinished):
+ (WebCore::ReadableStreamSource::clean):
+ * Modules/webaudio/AudioBufferSourceNode.cpp:
+ (WebCore::AudioBufferSourceNode::start):
+ * Modules/webaudio/AudioBufferSourceNode.h:
+ * Modules/webdatabase/SQLResultSet.h:
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::close):
+ * Modules/websockets/WebSocket.h:
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::didReceiveSocketStreamData):
+ * Modules/websockets/WebSocketChannel.h:
+ * bindings/generic/IDLTypes.h:
+ (WebCore::IDLType::nullValue):
+ * bindings/js/CachedModuleScript.h:
+ (WebCore::CachedModuleScript::error):
+ * bindings/js/Dictionary.h:
+ (WebCore::Dictionary::get):
+ * bindings/js/IDBBindingUtilities.cpp:
+ (WebCore::toJS):
+ * bindings/js/IDBBindingUtilities.h:
+ * bindings/js/JSCryptoKeySerializationJWK.cpp:
+ (WebCore::JSCryptoKeySerializationJWK::reconcileAlgorithm):
+ * bindings/js/JSCryptoKeySerializationJWK.h:
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::Detail::VariadicConverterBase::convert):
+ (WebCore::Detail::VariadicConverterBase<IDLInterface<T>>::convert):
+ (WebCore::convertVariadicArguments):
+ * bindings/js/JSDOMIterator.h:
+ (WebCore::IteratorTraits>::next):
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DOMPromise::DOMPromise):
+ (WebCore::DOMPromise::operator=):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::getOwnPropertySlot):
+ * bindings/js/JSDictionary.h:
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSFileCustom.cpp:
+ (WebCore::constructJSFile):
+ * bindings/js/JSHTMLAllCollectionCustom.cpp:
+ (WebCore::callHTMLAllCollection):
+ (WebCore::JSHTMLAllCollection::item):
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ (WebCore::JSHTMLCanvasElement::toDataURL):
+ * bindings/js/JSImageConstructor.cpp:
+ (WebCore::JSImageConstructor::construct):
+ * bindings/js/JSMediaDevicesCustom.cpp:
+ (WebCore::createStringConstraint):
+ (WebCore::createBooleanConstraint):
+ (WebCore::createDoubleConstraint):
+ (WebCore::createIntConstraint):
+ * bindings/js/JSWebKitSubtleCryptoCustom.cpp:
+ (WebCore::importKey):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::setupModuleScriptHandlers):
+ (WebCore::ScriptController::executeScriptInWorld):
+ (WebCore::ScriptController::executeScript):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateGetOwnPropertySlotBody):
+ (GenerateEnumerationImplementationContent):
+ (GenerateEnumerationHeaderContent):
+ (GenerateDefaultValue):
+ (GenerateImplementation):
+ (GenerateParametersCheck):
+ * bindings/scripts/test/JS/JSFloat64Array.cpp:
+ (WebCore::JSFloat64Array::getOwnPropertySlot):
+ (WebCore::JSFloat64Array::getOwnPropertyDescriptor):
+ (WebCore::JSFloat64Array::put):
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ (WebCore::JSTestEventTarget::getOwnPropertySlot):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::parseEnumeration<TestObj::EnumType>):
+ (WebCore::parseEnumeration<TestObj::Optional>):
+ (WebCore::parseEnumeration<AlternateEnumName>):
+ (WebCore::parseEnumeration<TestObj::EnumA>):
+ (WebCore::parseEnumeration<TestObj::EnumB>):
+ (WebCore::parseEnumeration<TestObj::EnumC>):
+ (WebCore::parseEnumeration<TestObj::Kind>):
+ (WebCore::parseEnumeration<TestObj::Size>):
+ (WebCore::parseEnumeration<TestObj::Confidence>):
+ (WebCore::convertDictionary<TestObj::Dictionary>):
+ (WebCore::JSTestObj::getOwnPropertySlot):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArgCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArgCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArgCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgsCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLongCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequenceCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBooleanCaller):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalRecordCaller):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2Caller):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2Caller):
+ (WebCore::jsTestObjConstructorFunctionClassMethodWithOptional):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentCaller):
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp:
+ (WebCore::parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>):
+ * bindings/scripts/test/JS/JSTestStandaloneDictionary.h:
+ * bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp:
+ (WebCore::parseEnumeration<TestStandaloneEnumeration>):
+ * bindings/scripts/test/JS/JSTestStandaloneEnumeration.h:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::jsTestTypedefsPrototypeFunctionSetShadowCaller):
+ (WebCore::jsTestTypedefsPrototypeFunctionFuncWithClampCaller):
+ * bridge/runtime_array.cpp:
+ (JSC::RuntimeArray::getOwnPropertySlot):
+ (JSC::RuntimeArray::put):
+ * crypto/CryptoAlgorithmRegistry.cpp:
+ (WebCore::CryptoAlgorithmRegistry::identifier):
+ * crypto/CryptoAlgorithmRegistry.h:
+ * crypto/CryptoKeySerialization.h:
+ * crypto/JsonWebKey.h:
+ * crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
+ (WebCore::CryptoAlgorithmAES_CBC::importKey):
+ * crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
+ (WebCore::CryptoAlgorithmAES_KW::importKey):
+ * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
+ (WebCore::CryptoAlgorithmHMAC::generateKey):
+ (WebCore::CryptoAlgorithmHMAC::importKey):
+ * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
+ (WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::importKey):
+ * crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
+ (WebCore::calculateSignature):
+ * crypto/keys/CryptoKeyAES.h:
+ * crypto/keys/CryptoKeyHMAC.h:
+ * crypto/keys/CryptoKeyRSA.cpp:
+ (WebCore::CryptoKeyRSA::importJwk):
+ * crypto/keys/CryptoKeyRSA.h:
+ * crypto/keys/CryptoKeySerializationRaw.cpp:
+ (WebCore::CryptoKeySerializationRaw::reconcileAlgorithm):
+ * crypto/keys/CryptoKeySerializationRaw.h:
+ * crypto/mac/CryptoAlgorithmHMACMac.cpp:
+ (WebCore::commonCryptoHMACAlgorithm):
+ * crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
+ (WebCore::cryptoDigestAlgorithm):
+ * crypto/parameters/CryptoAlgorithmHmacKeyParams.h:
+ * crypto/parameters/CryptoAlgorithmRsaOaepParams.h:
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::calculateStyleMask):
+ (WebCore::CSSFontFace::calculateWeightMask):
+ * css/CSSFontFace.h:
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::computeFontTraitsMask):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::doubleValue):
+ (WebCore::CSSPrimitiveValue::doubleValueInternal):
+ * css/CSSPrimitiveValue.h:
+ * css/CSSPropertyNames.in:
+ * css/CSSSegmentedFontFace.cpp:
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::create):
+ (WebCore::CSSStyleSheet::CSSStyleSheet):
+ (WebCore::CSSStyleSheet::addRule):
+ * css/CSSStyleSheet.h:
+ * css/FontFace.cpp:
+ (WebCore::FontFace::fontStateChanged):
+ * css/FontFace.h:
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::completedLoading):
+ * css/FontFaceSet.h:
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::doubleValue):
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertGridPosition):
+ (WebCore::StyleBuilderConverter::convertWordSpacing):
+ (WebCore::StyleBuilderConverter::convertPerspective):
+ (WebCore::StyleBuilderConverter::convertMarqueeIncrement):
+ (WebCore::StyleBuilderConverter::convertFilterOperations):
+ (WebCore::StyleBuilderConverter::convertLineHeight):
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueLineHeight):
+ * css/StyleRuleImport.cpp:
+ (WebCore::StyleRuleImport::requestStyleSheet):
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseCubicBezierTimingFunctionValue):
+ (WebCore::CSSParser::parseSpringTimingFunctionValue):
+ (WebCore::CSSParser::parseColorFunctionParameters):
+ (WebCore::CSSParser::parseColorFromValue):
+ * css/parser/CSSParser.h:
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateAddStyleRelationIfResolvingStyle):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateAddStyleRelation):
+ * dom/CustomElementReactionQueue.cpp:
+ * dom/Document.cpp:
+ (WebCore::Document::lastModified):
+ * dom/Element.cpp:
+ (WebCore::Element::scrollBy):
+ (WebCore::Element::getIntegralAttribute):
+ (WebCore::Element::getUnsignedIntegralAttribute):
+ (WebCore::Element::resolveCustomStyle):
+ * dom/Element.h:
+ * dom/ElementIteratorAssertions.h:
+ (WebCore::ElementIteratorAssertions::dropEventDispatchAssertion):
+ (WebCore::ElementIteratorAssertions::clear):
+ * dom/ExceptionOr.h:
+ * dom/InlineStyleSheetOwner.cpp:
+ (WebCore::makeInlineStyleSheetCacheKey):
+ * dom/KeyboardEvent.h:
+ * dom/LoadableClassicScript.cpp:
+ (WebCore::LoadableClassicScript::error):
+ * dom/LoadableClassicScript.h:
+ * dom/LoadableModuleScript.cpp:
+ (WebCore::LoadableModuleScript::error):
+ * dom/LoadableModuleScript.h:
+ * dom/LoadableScript.h:
+ * dom/MessageEvent.cpp:
+ (WebCore::MessageEvent::MessageEvent):
+ (WebCore::MessageEvent::create):
+ (WebCore::MessageEvent::initMessageEvent):
+ * dom/MessageEvent.h:
+ * dom/MutationObserver.cpp:
+ (WebCore::MutationObserver::observe):
+ * dom/MutationObserver.h:
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::checkStyleSheet):
+ * dom/PseudoElement.cpp:
+ (WebCore::PseudoElement::resolveCustomStyle):
+ * dom/PseudoElement.h:
+ * dom/RangeBoundaryPoint.h:
+ (WebCore::RangeBoundaryPoint::setToBeforeChild):
+ (WebCore::RangeBoundaryPoint::setToAfterChild):
+ (WebCore::RangeBoundaryPoint::setToEndOfNode):
+ (WebCore::RangeBoundaryPoint::invalidateOffset):
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::determineScriptType):
+ (WebCore::ScriptElement::prepareScript):
+ (WebCore::ScriptElement::executeScriptAndDispatchEvent):
+ * dom/ScriptElement.h:
+ * dom/TextDecoder.cpp:
+ (WebCore::TextDecoder::decode):
+ * dom/TextDecoder.h:
+ * dom/UserGestureIndicator.cpp:
+ (WebCore::UserGestureIndicator::UserGestureIndicator):
+ * dom/UserGestureIndicator.h:
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::moveParagraphs):
+ * editing/CompositeEditCommand.h:
+ * fileapi/File.h:
+ * history/CachedFrame.h:
+ (WebCore::CachedFrame::hasInsecureContent):
+ * html/DOMTokenList.cpp:
+ (WebCore::DOMTokenList::toggle):
+ * html/DOMTokenList.h:
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::handleClick):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::toDataURL):
+ * html/HTMLCanvasElement.h:
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::parseBorderWidthAttribute):
+ (WebCore::HTMLElement::parseAttribute):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::createForJSConstructor):
+ (WebCore::HTMLImageElement::width):
+ (WebCore::HTMLImageElement::height):
+ * html/HTMLImageElement.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::findClosestTickMarkValue):
+ (WebCore::HTMLInputElement::maxLengthAttributeChanged):
+ (WebCore::HTMLInputElement::minLengthAttributeChanged):
+ * html/HTMLInputElement.h:
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::process):
+ (WebCore::HTMLLinkElement::initializeStyleSheet):
+ (WebCore::HTMLLinkElement::iconType):
+ * html/HTMLLinkElement.h:
+ * html/HTMLOListElement.h:
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::add):
+ * html/HTMLOptionsCollection.h:
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::add):
+ (WebCore::HTMLSelectElement::setLength):
+ * html/HTMLSelectElement.h:
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::maxLengthAttributeChanged):
+ (WebCore::HTMLTextAreaElement::minLengthAttributeChanged):
+ * html/ImageInputType.cpp:
+ (WebCore::ImageInputType::height):
+ (WebCore::ImageInputType::width):
+ * html/InputType.cpp:
+ (WebCore::InputType::findClosestTickMarkValue):
+ * html/InputType.h:
+ * html/LinkIconCollector.cpp:
+ * html/LinkRelAttribute.h:
+ * html/RangeInputType.cpp:
+ (WebCore::RangeInputType::findClosestTickMarkValue):
+ * html/RangeInputType.h:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::restore):
+ (WebCore::CanvasRenderingContext2D::setStrokeColor):
+ (WebCore::CanvasRenderingContext2D::setFillColor):
+ (WebCore::CanvasRenderingContext2D::isPointInPathInternal):
+ (WebCore::CanvasRenderingContext2D::isPointInStrokeInternal):
+ (WebCore::CanvasRenderingContext2D::setShadow):
+ (WebCore::CanvasRenderingContext2D::fillText):
+ (WebCore::CanvasRenderingContext2D::strokeText):
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::arrayBufferViewElementSize):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::bufferData):
+ (WebCore::WebGLRenderingContextBase::bufferSubData):
+ (WebCore::WebGLRenderingContextBase::texSubImage2D):
+ (WebCore::WebGLRenderingContextBase::validateArrayBufferType):
+ (WebCore::WebGLRenderingContextBase::validateTexFuncData):
+ (WebCore::WebGLRenderingContextBase::texImage2D):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::indexOfFirstUnopenFormattingElement):
+ (WebCore::HTMLConstructionSite::reconstructTheActiveFormattingElements):
+ * html/parser/HTMLConstructionSite.h:
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::parseHTMLIntegerInternal):
+ (WebCore::parseHTMLInteger):
+ (WebCore::parseHTMLNonNegativeInteger):
+ (WebCore::parseValidHTMLNonNegativeIntegerInternal):
+ (WebCore::parseValidHTMLNonNegativeInteger):
+ (WebCore::parseValidHTMLFloatingPointNumberInternal):
+ (WebCore::parseValidHTMLFloatingPointNumber):
+ (WebCore::parseHTTPRefreshInternal):
+ * html/parser/HTMLParserIdioms.h:
+ (WebCore::limitToOnlyHTMLNonNegative):
+ * html/parser/HTMLSrcsetParser.cpp:
+ (WebCore::parseDescriptors):
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::setPositionFromPoint):
+ (WebCore::SliderThumbElement::resolveCustomStyle):
+ (WebCore::SliderContainerElement::resolveCustomStyle):
+ * html/shadow/SliderThumbElement.h:
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::TextControlInnerElement::resolveCustomStyle):
+ (WebCore::TextControlInnerTextElement::resolveCustomStyle):
+ (WebCore::TextControlPlaceholderElement::resolveCustomStyle):
+ * html/shadow/TextControlInnerElements.h:
+ * html/track/TrackEvent.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didFinishXHRLoading):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::addRule):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::setInstruments):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::startIconLoading):
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequestWithPreflight):
+ (WebCore::DocumentThreadableLoader::clearResource):
+ (WebCore::DocumentThreadableLoader::preflightSuccess):
+ (WebCore::DocumentThreadableLoader::preflightFailure):
+ * loader/DocumentThreadableLoader.h:
+ * loader/EmptyClients.cpp:
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::urlSelected):
+ (WebCore::FrameLoader::receivedFirstData):
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ (WebCore::FrameLoader::open):
+ (WebCore::FrameLoader::dispatchDidCommitLoad):
+ (WebCore::FrameLoader::clearTestingOverrides):
+ * loader/FrameLoader.h:
+ * loader/FrameLoaderClient.h:
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::resourceTypeFromAsAttribute):
+ (WebCore::LinkLoader::loadLink):
+ * loader/LinkLoader.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::SubresourceLoader):
+ (WebCore::SubresourceLoader::didReceiveResponse):
+ (WebCore::SubresourceLoader::notifyDone):
+ * loader/SubresourceLoader.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::setLoadPriority):
+ * loader/cache/CachedResource.h:
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::CachedResourceRequest):
+ * loader/cache/CachedResourceRequest.h:
+ (WebCore::CachedResourceRequest::priority):
+ * mathml/MathMLElement.h:
+ (WebCore::MathMLElement::specifiedDisplayStyle):
+ (WebCore::MathMLElement::specifiedMathVariant):
+ * mathml/MathMLFractionElement.cpp:
+ (WebCore::MathMLFractionElement::cachedFractionAlignment):
+ (WebCore::MathMLFractionElement::parseAttribute):
+ * mathml/MathMLFractionElement.h:
+ * mathml/MathMLMathElement.cpp:
+ (WebCore::MathMLMathElement::specifiedDisplayStyle):
+ (WebCore::MathMLMathElement::parseAttribute):
+ * mathml/MathMLMathElement.h:
+ * mathml/MathMLMencloseElement.cpp:
+ (WebCore::MathMLMencloseElement::parseAttribute):
+ * mathml/MathMLMencloseElement.h:
+ * mathml/MathMLOperatorDictionary.cpp:
+ (WebCore::MathMLOperatorDictionary::search):
+ * mathml/MathMLOperatorDictionary.h:
+ * mathml/MathMLOperatorElement.cpp:
+ (WebCore::MathMLOperatorElement::computeOperatorFlag):
+ (WebCore::MathMLOperatorElement::childrenChanged):
+ (WebCore::attributeNameToPropertyFlag):
+ (WebCore::MathMLOperatorElement::parseAttribute):
+ * mathml/MathMLOperatorElement.h:
+ * mathml/MathMLPaddedElement.cpp:
+ (WebCore::MathMLPaddedElement::parseAttribute):
+ * mathml/MathMLPaddedElement.h:
+ * mathml/MathMLPresentationElement.cpp:
+ (WebCore::MathMLPresentationElement::cachedBooleanAttribute):
+ (WebCore::MathMLPresentationElement::cachedMathMLLength):
+ (WebCore::MathMLPresentationElement::specifiedDisplayStyle):
+ (WebCore::MathMLPresentationElement::specifiedMathVariant):
+ (WebCore::MathMLPresentationElement::parseAttribute):
+ * mathml/MathMLPresentationElement.h:
+ (WebCore::MathMLPresentationElement::toOptionalBool):
+ * mathml/MathMLScriptsElement.cpp:
+ (WebCore::MathMLScriptsElement::parseAttribute):
+ * mathml/MathMLScriptsElement.h:
+ * mathml/MathMLSpaceElement.cpp:
+ (WebCore::MathMLSpaceElement::parseAttribute):
+ * mathml/MathMLSpaceElement.h:
+ * mathml/MathMLTokenElement.cpp:
+ (WebCore::MathMLTokenElement::convertToSingleCodePoint):
+ * mathml/MathMLTokenElement.h:
+ * mathml/MathMLUnderOverElement.cpp:
+ (WebCore::MathMLUnderOverElement::parseAttribute):
+ * mathml/MathMLUnderOverElement.h:
+ * page/ChromeClient.h:
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::alignedFireTime):
+ * page/DOMTimer.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::scrollBy):
+ * page/DOMWindow.h:
+ * page/EventSource.cpp:
+ (WebCore::EventSource::parseEventStream):
+ (WebCore::EventSource::parseEventStreamLine):
+ * page/EventSource.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::recalculateScrollbarOverlayStyle):
+ (WebCore::FrameView::setLayoutViewportOverrideRect):
+ (WebCore::FrameView::setViewExposedRect):
+ * page/FrameView.h:
+ * page/Page.cpp:
+ (WebCore::Page::takeAnyMediaCanStartListener):
+ * page/Page.h:
+ (WebCore::Page::eventThrottlingBehaviorOverride):
+ (WebCore::Page::setEventThrottlingBehaviorOverride):
+ * page/ScrollToOptions.h:
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::SecurityOrigin):
+ (WebCore::SecurityOrigin::create):
+ * page/SecurityOrigin.h:
+ (WebCore::SecurityOrigin::port):
+ * page/SecurityOriginData.cpp:
+ (WebCore::SecurityOriginData::debugString):
+ (WebCore::SecurityOriginData::databaseIdentifier):
+ (WebCore::SecurityOriginData::fromDatabaseIdentifier):
+ * page/SecurityOriginData.h:
+ (WebCore::SecurityOriginData::SecurityOriginData):
+ (WebCore::SecurityOriginData::isEmpty):
+ (WebCore::SecurityOriginDataHash::hash):
+ * page/SecurityOriginHash.h:
+ (WebCore::SecurityOriginHash::hash):
+ * page/WindowFeatures.cpp:
+ (WebCore::parseDialogFeatures):
+ (WebCore::boolFeature):
+ (WebCore::floatFeature):
+ * page/WindowFeatures.h:
+ * page/csp/ContentSecurityPolicySource.cpp:
+ (WebCore::ContentSecurityPolicySource::ContentSecurityPolicySource):
+ (WebCore::ContentSecurityPolicySource::portMatches):
+ * page/csp/ContentSecurityPolicySource.h:
+ * page/csp/ContentSecurityPolicySourceList.cpp:
+ (WebCore::ContentSecurityPolicySourceList::parse):
+ (WebCore::ContentSecurityPolicySourceList::parseSource):
+ (WebCore::ContentSecurityPolicySourceList::parsePort):
+ * page/csp/ContentSecurityPolicySourceList.h:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
+ (WebCore::AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll):
+ (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+ (WebCore::AsyncScrollingCoordinator::reconcileScrollingState):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ (WebCore::AsyncScrollingCoordinator::ScheduledScrollUpdate::ScheduledScrollUpdate):
+ * page/scrolling/ScrollingCoordinator.h:
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::scrollPositionChangedViaDelegatedScrolling):
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::setScrollPositionWithoutContentEdgeConstraints):
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::scrollingTreeNodeDidScroll):
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::setScrollPositionWithoutContentEdgeConstraints):
+ * page/scrolling/ios/ScrollingTreeIOS.cpp:
+ (WebCore::ScrollingTreeIOS::scrollingTreeNodeDidScroll):
+ * page/scrolling/ios/ScrollingTreeIOS.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollPositionWithoutContentEdgeConstraints):
+ * platform/DragImage.cpp:
+ * platform/LinkIcon.h:
+ * platform/MemoryPressureHandler.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::handleDeferredScrollUpdateAfterContentSizeChange):
+ * platform/ScrollView.h:
+ * platform/Theme.h:
+ (WebCore::Theme::controlFont):
+ * platform/Timer.h:
+ (WebCore::TimerBase::alignedFireTime):
+ * platform/URL.cpp:
+ (WebCore::URL::port):
+ (WebCore::defaultPortForProtocol):
+ (WebCore::portAllowed):
+ * platform/URL.h:
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::defaultPortForProtocol):
+ (WebCore::findLongestZeroSequence):
+ (WebCore::URLParser::parseIPv4Piece):
+ (WebCore::URLParser::parseIPv4Host):
+ (WebCore::URLParser::parseIPv4PieceInsideIPv6):
+ (WebCore::URLParser::parseIPv4AddressInsideIPv6):
+ (WebCore::URLParser::parseIPv6Host):
+ (WebCore::URLParser::domainToASCII):
+ (WebCore::URLParser::formURLDecode):
+ * platform/URLParser.h:
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/Color.h:
+ (WebCore::colorWithOverrideAlpha):
+ * platform/graphics/DisplayRefreshMonitorClient.h:
+ * platform/graphics/Font.h:
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::drawText):
+ (WebCore::FontCascade::drawEmphasisMarks):
+ (WebCore::FontCascade::adjustSelectionRectForText):
+ (WebCore::FontCascade::getEmphasisMarkGlyphData):
+ (WebCore::FontCascade::emphasisMarkAscent):
+ (WebCore::FontCascade::emphasisMarkDescent):
+ (WebCore::FontCascade::emphasisMarkHeight):
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::drawText):
+ (WebCore::GraphicsContext::drawEmphasisMarks):
+ (WebCore::GraphicsContext::drawBidiText):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::InterpolationQualityMaintainer::InterpolationQualityMaintainer):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setPosition):
+ (WebCore::GraphicsLayer::setApproximatePosition):
+ * platform/graphics/Image.h:
+ (WebCore::Image::hotSpot):
+ * platform/graphics/ImageBuffer.h:
+ * platform/graphics/ImageFrameCache.cpp:
+ (WebCore::ImageFrameCache::clearMetadata):
+ (WebCore::ImageFrameCache::metadata):
+ (WebCore::ImageFrameCache::frameMetadataAtIndex):
+ (WebCore::ImageFrameCache::hotSpot):
+ * platform/graphics/ImageFrameCache.h:
+ * platform/graphics/ImageSource.h:
+ (WebCore::ImageSource::hotSpot):
+ * platform/graphics/PathUtilities.cpp:
+ (WebCore::rectFromPolygon):
+ (WebCore::PathUtilities::pathWithShrinkWrappedRectsForOutline):
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ShadowBlur::calculateLayerBoundingRect):
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::flush):
+ (WebCore::SourceBufferPrivateAVFObjC::naturalSize):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::computeVisibleAndCoverageRect):
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::setLayoutViewportRect):
+ * platform/graphics/ca/TileController.h:
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::encodeImage):
+ (WebCore::dataURL):
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/cg/ImageDecoderCG.cpp:
+ (WebCore::ImageDecoder::hotSpot):
+ * platform/graphics/cg/ImageDecoderCG.h:
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::openTypeFeature):
+ (WebCore::advanceForColorBitmapFont):
+ * platform/graphics/displaylists/DisplayListItems.cpp:
+ (WebCore::DisplayList::DrawGlyphs::localBounds):
+ (WebCore::DisplayList::DrawLine::localBounds):
+ (WebCore::DisplayList::DrawLinesForText::localBounds):
+ (WebCore::DisplayList::DrawLineForDocumentMarker::localBounds):
+ (WebCore::DisplayList::DrawFocusRingPath::localBounds):
+ (WebCore::DisplayList::DrawFocusRingRects::localBounds):
+ (WebCore::DisplayList::StrokeRect::localBounds):
+ (WebCore::DisplayList::StrokePath::localBounds):
+ (WebCore::DisplayList::StrokeEllipse::localBounds):
+ * platform/graphics/displaylists/DisplayListItems.h:
+ (WebCore::DisplayList::DrawingItem::localBounds):
+ * platform/graphics/displaylists/DisplayListRecorder.cpp:
+ (WebCore::DisplayList::Recorder::updateItemExtent):
+ (WebCore::DisplayList::Recorder::ContextState::rotate):
+ (WebCore::DisplayList::Recorder::ContextState::concatCTM):
+ * platform/graphics/efl/ImageBufferEfl.cpp:
+ (WebCore::encodeImageJPEG):
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/filters/Filter.h:
+ (WebCore::Filter::mapAbsolutePointToLocalPoint):
+ * platform/graphics/gtk/ImageBufferGtk.cpp:
+ (WebCore::encodeImage):
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
+ (WebCore::HarfBuzzShaper::selectionRect):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::capitalized):
+ (WebCore::shouldSynthesize):
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
+ (WebCore::TextureMapperLayer::replicaTransform):
+ (WebCore::TextureMapperLayer::mapScrollOffset):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::transformedVisibleRect):
+ (WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
+ * platform/graphics/transforms/AffineTransform.cpp:
+ (WebCore::AffineTransform::inverse):
+ * platform/graphics/transforms/AffineTransform.h:
+ * platform/graphics/transforms/TransformState.cpp:
+ (WebCore::TransformState::mappedPoint):
+ (WebCore::TransformState::mappedSecondaryQuad):
+ (WebCore::TransformState::mapQuad):
+ (WebCore::TransformState::flattenWithTransform):
+ * platform/graphics/transforms/TransformState.h:
+ * platform/graphics/transforms/TransformationMatrix.cpp:
+ (WebCore::TransformationMatrix::inverse):
+ * platform/graphics/transforms/TransformationMatrix.h:
+ * platform/graphics/win/ImageBufferDirect2D.cpp:
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/win/ImageDecoderDirect2D.cpp:
+ (WebCore::ImageDecoder::hotSpot):
+ * platform/graphics/win/ImageDecoderDirect2D.h:
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::supportsXDamage):
+ * platform/graphics/x11/PlatformDisplayX11.h:
+ * platform/image-decoders/ImageDecoder.h:
+ (WebCore::ImageDecoder::hotSpot):
+ * platform/image-decoders/ico/ICOImageDecoder.cpp:
+ (WebCore::ICOImageDecoder::hotSpot):
+ (WebCore::ICOImageDecoder::hotSpotAtIndex):
+ * platform/image-decoders/ico/ICOImageDecoder.h:
+ * platform/image-encoders/JPEGImageEncoder.cpp:
+ (WebCore::compressRGBABigEndianToJPEG):
+ * platform/image-encoders/JPEGImageEncoder.h:
+ * platform/ios/LegacyTileCache.h:
+ * platform/ios/LegacyTileCache.mm:
+ (WebCore::LegacyTileCache::setOverrideVisibleRect):
+ * platform/ios/LegacyTileLayer.mm:
+ (-[LegacyTileHostLayer renderInContext:]):
+ * platform/linux/MemoryPressureHandlerLinux.cpp:
+ * platform/mac/ThemeMac.h:
+ * platform/mac/ThemeMac.mm:
+ (WebCore::ThemeMac::controlFont):
+ * platform/mediastream/MediaConstraints.cpp:
+ (WebCore::MediaTrackConstraintSetMap::set):
+ * platform/mediastream/MediaConstraints.h:
+ (WebCore::MediaTrackConstraintSetMap::width):
+ (WebCore::MediaTrackConstraintSetMap::height):
+ (WebCore::MediaTrackConstraintSetMap::sampleRate):
+ (WebCore::MediaTrackConstraintSetMap::sampleSize):
+ (WebCore::MediaTrackConstraintSetMap::aspectRatio):
+ (WebCore::MediaTrackConstraintSetMap::frameRate):
+ (WebCore::MediaTrackConstraintSetMap::volume):
+ (WebCore::MediaTrackConstraintSetMap::echoCancellation):
+ (WebCore::MediaTrackConstraintSetMap::facingMode):
+ (WebCore::MediaTrackConstraintSetMap::deviceId):
+ (WebCore::MediaTrackConstraintSetMap::groupId):
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::supportsSizeAndFrameRate):
+ (WebCore::RealtimeMediaSource::applySizeAndFrameRate):
+ (WebCore::RealtimeMediaSource::applyConstraints):
+ * platform/mediastream/RealtimeMediaSource.h:
+ * platform/mediastream/mac/AVVideoCaptureSource.h:
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::applySizeAndFrameRate):
+ (WebCore::AVVideoCaptureSource::bestSessionPresetForVideoDimensions):
+ (WebCore::AVVideoCaptureSource::supportsSizeAndFrameRate):
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.h:
+ * platform/network/CacheValidation.cpp:
+ (WebCore::computeCurrentAge):
+ (WebCore::computeFreshnessLifetimeForHTTPFamily):
+ * platform/network/CacheValidation.h:
+ * platform/network/DataURLDecoder.h:
+ * platform/network/HTTPHeaderMap.h:
+ (WebCore::HTTPHeaderMap::HTTPHeaderMapConstIterator::updateKeyValue):
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::parseHTTPDate):
+ * platform/network/HTTPParsers.h:
+ * platform/network/ResourceHandle.cpp:
+ (WebCore::ResourceHandle::didReceiveResponse):
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::cacheControlMaxAge):
+ (WebCore::parseDateValueInHeader):
+ (WebCore::ResourceResponseBase::date):
+ (WebCore::ResourceResponseBase::age):
+ (WebCore::ResourceResponseBase::expires):
+ (WebCore::ResourceResponseBase::lastModified):
+ * platform/network/ResourceResponseBase.h:
+ (WebCore::ResourceResponseBase::certificateInfo):
+ * platform/network/SocketStreamHandle.h:
+ * platform/network/SocketStreamHandleClient.h:
+ * platform/network/cf/SocketStreamHandleImpl.h:
+ * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+ (WebCore::SocketStreamHandleImpl::readStreamCallback):
+ (WebCore::SocketStreamHandleImpl::platformSend):
+ * platform/network/curl/SocketStreamHandleImpl.h:
+ * platform/network/curl/SocketStreamHandleImplCurl.cpp:
+ (WebCore::SocketStreamHandleImpl::platformSend):
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookiesInPartitionForURL):
+ * platform/network/soup/SocketStreamHandleImpl.h:
+ * platform/network/soup/SocketStreamHandleImplSoup.cpp:
+ (WebCore::SocketStreamHandleImpl::readBytes):
+ (WebCore::SocketStreamHandleImpl::platformSend):
+ * rendering/BreakLines.h:
+ (WebCore::nextBreakablePositionNonLoosely):
+ (WebCore::nextBreakablePositionLoosely):
+ (WebCore::isBreakable):
+ * rendering/HitTestingTransformState.cpp:
+ (WebCore::HitTestingTransformState::flattenWithTransform):
+ * rendering/ImageQualityController.cpp:
+ (WebCore::ImageQualityController::interpolationQualityFromStyle):
+ (WebCore::ImageQualityController::chooseInterpolationQuality):
+ * rendering/ImageQualityController.h:
+ * rendering/InlineIterator.h:
+ (WebCore::InlineIterator::moveTo):
+ (WebCore::InlineIterator::nextBreakablePosition):
+ (WebCore::InlineIterator::setNextBreakablePosition):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintSelection):
+ (WebCore::InlineTextBox::substringToRender):
+ (WebCore::InlineTextBox::hyphenatedStringForTextRun):
+ (WebCore::InlineTextBox::constructTextRun):
+ * rendering/InlineTextBox.h:
+ (WebCore::InlineTextBox::substringToRender):
+ (WebCore::InlineTextBox::hyphenatedStringForTextRun):
+ (WebCore::InlineTextBox::constructTextRun):
+ * rendering/OrderIterator.cpp:
+ (WebCore::OrderIterator::reset):
+ * rendering/OrderIterator.h:
+ * rendering/PaintInfo.h:
+ (WebCore::PaintInfo::applyTransform):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlockRareData::RenderBlockRareData):
+ (WebCore::RenderBlock::baselinePosition):
+ (WebCore::RenderBlock::firstLineBaseline):
+ (WebCore::RenderBlock::inlineBlockBaseline):
+ (WebCore::RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::firstLineBaseline):
+ (WebCore::RenderBlockFlow::inlineBlockBaseline):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::constrainLogicalHeightByMinMax):
+ (WebCore::RenderBox::constrainContentBoxLogicalHeightByMinMax):
+ (WebCore::RenderBox::overrideContainingBlockContentLogicalWidth):
+ (WebCore::RenderBox::overrideContainingBlockContentLogicalHeight):
+ (WebCore::RenderBox::setOverrideContainingBlockContentLogicalWidth):
+ (WebCore::RenderBox::setOverrideContainingBlockContentLogicalHeight):
+ (WebCore::RenderBox::adjustContentBoxLogicalHeightForBoxSizing):
+ (WebCore::RenderBox::computeLogicalHeight):
+ (WebCore::RenderBox::computeLogicalHeightUsing):
+ (WebCore::RenderBox::computeContentLogicalHeight):
+ (WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing):
+ (WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing):
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+ (WebCore::RenderBox::availableLogicalHeight):
+ (WebCore::RenderBox::availableLogicalHeightUsing):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::firstLineBaseline):
+ (WebCore::RenderBox::inlineBlockBaseline):
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::computeTextOrigin):
+ * rendering/RenderCombineText.h:
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::baselinePosition):
+ (WebCore::RenderFlexibleBox::firstLineBaseline):
+ (WebCore::RenderFlexibleBox::inlineBlockBaseline):
+ (WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):
+ (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
+ (WebCore::RenderFlexibleBox::marginBoxAscentForChild):
+ (WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing):
+ (WebCore::RenderFlexibleBox::adjustChildSizeForAspectRatioCrossAxisMinAndMax):
+ (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+ * rendering/RenderFlexibleBox.h:
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::addForcedRegionBreak):
+ * rendering/RenderGrid.cpp:
+ (WebCore::GridTrack::setGrowthLimit):
+ (WebCore::GridTrack::setGrowthLimitCap):
+ (WebCore::GridTrack::growthLimitCap):
+ (WebCore::RenderGrid::GridSizingData::freeSpace):
+ (WebCore::RenderGrid::GridSizingData::availableSpace):
+ (WebCore::RenderGrid::GridSizingData::setAvailableSpace):
+ (WebCore::RenderGrid::GridSizingData::setFreeSpace):
+ (WebCore::RenderGrid::layoutBlock):
+ (WebCore::RenderGrid::computeIntrinsicLogicalWidths):
+ (WebCore::RenderGrid::computeIntrinsicLogicalHeight):
+ (WebCore::RenderGrid::computeIntrinsicLogicalContentHeightUsing):
+ (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
+ (WebCore::overrideContainingBlockContentSizeForChild):
+ (WebCore::setOverrideContainingBlockContentSizeForChild):
+ (WebCore::RenderGrid::logicalHeightForChild):
+ (WebCore::RenderGrid::minSizeForChild):
+ (WebCore::RenderGrid::minContentForChild):
+ (WebCore::RenderGrid::maxContentForChild):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+ (WebCore::sortByGridTrackGrowthPotential):
+ (WebCore::RenderGrid::tracksAreWiderThanMinTrackBreadth):
+ (WebCore::RenderGrid::computeAutoRepeatTracksCount):
+ (WebCore::RenderGrid::applyStretchAlignmentToTracksIfNeeded):
+ (WebCore::RenderGrid::layoutGridItems):
+ * rendering/RenderGrid.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerByApplyingTransform):
+ (WebCore::RenderLayer::hitTestLayer):
+ * rendering/RenderLayerBacking.cpp:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintItem):
+ (WebCore::RenderListBox::listIndexIsVisible):
+ (WebCore::RenderListBox::computeFirstIndexesVisibleInPaddingTopBottomAreas):
+ * rendering/RenderListBox.h:
+ * rendering/RenderMenuList.h:
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::calculateMaxColumnHeight):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
+ (WebCore::RenderTable::baselinePosition):
+ (WebCore::RenderTable::inlineBlockBaseline):
+ (WebCore::RenderTable::firstLineBaseline):
+ * rendering/RenderTable.h:
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::cellBaselinePosition):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::firstLineBaseline):
+ * rendering/RenderTableSection.h:
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::computePreferredLogicalWidths):
+ (WebCore::RenderText::stringView):
+ * rendering/RenderText.h:
+ * rendering/RenderTextControl.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::setSelection):
+ (WebCore::RenderView::splitSelectionBetweenSubtrees):
+ (WebCore::RenderView::getSelection):
+ (WebCore::RenderView::clearSelection):
+ * rendering/RenderView.h:
+ * rendering/SelectionSubtreeRoot.h:
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::SelectionSubtreeData):
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::selectionStartPos):
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::selectionEndPos):
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::setSelectionStartPos):
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::setSelectionEndPos):
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeData::clearSelection):
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::LineState::lastFragment):
+ (WebCore::SimpleLineLayout::closeLineEndingAndAdjustRuns):
+ (WebCore::SimpleLineLayout::createTextRuns):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+ * rendering/line/BreakingContext.h:
+ (WebCore::WordTrailingSpace::width):
+ (WebCore::BreakingContext::commitLineBreakAtCurrentWidth):
+ (WebCore::BreakingContext::InlineIteratorHistory::nextBreakablePosition):
+ (WebCore::BreakingContext::InlineIteratorHistory::moveTo):
+ (WebCore::tryHyphenating):
+ (WebCore::BreakingContext::computeAdditionalBetweenWordsWidth):
+ (WebCore::BreakingContext::handleText):
+ (WebCore::BreakingContext::optimalLineBreakLocationForTrailingWord):
+ * rendering/mathml/MathMLStyle.cpp:
+ (WebCore::MathMLStyle::resolveMathMLStyle):
+ * rendering/mathml/RenderMathMLBlock.cpp:
+ (WebCore::RenderMathMLBlock::baselinePosition):
+ (WebCore::RenderMathMLTable::firstLineBaseline):
+ * rendering/mathml/RenderMathMLBlock.h:
+ (WebCore::RenderMathMLBlock::ascentForChild):
+ * rendering/mathml/RenderMathMLFraction.cpp:
+ (WebCore::RenderMathMLFraction::firstLineBaseline):
+ * rendering/mathml/RenderMathMLFraction.h:
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::firstLineBaseline):
+ * rendering/mathml/RenderMathMLOperator.h:
+ * rendering/mathml/RenderMathMLPadded.cpp:
+ (WebCore::RenderMathMLPadded::firstLineBaseline):
+ * rendering/mathml/RenderMathMLPadded.h:
+ * rendering/mathml/RenderMathMLRow.cpp:
+ (WebCore::RenderMathMLRow::firstLineBaseline):
+ * rendering/mathml/RenderMathMLRow.h:
+ * rendering/mathml/RenderMathMLScripts.cpp:
+ (WebCore::RenderMathMLScripts::validateAndGetReferenceChildren):
+ (WebCore::RenderMathMLScripts::firstLineBaseline):
+ * rendering/mathml/RenderMathMLScripts.h:
+ * rendering/mathml/RenderMathMLSpace.cpp:
+ (WebCore::RenderMathMLSpace::firstLineBaseline):
+ * rendering/mathml/RenderMathMLSpace.h:
+ * rendering/mathml/RenderMathMLToken.cpp:
+ (WebCore::RenderMathMLToken::updateMathVariantGlyph):
+ (WebCore::RenderMathMLToken::firstLineBaseline):
+ * rendering/mathml/RenderMathMLToken.h:
+ * rendering/svg/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::nodeAtFloatPoint):
+ * rendering/svg/RenderSVGForeignObject.cpp:
+ (WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::nodeAtFloatPoint):
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ (WebCore::RenderSVGResourceClipper::hitTestClipContent):
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::postApplyResource):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::nodeAtPoint):
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::setupNonScalingStrokeContext):
+ (WebCore::RenderSVGShape::nodeAtFloatPoint):
+ (WebCore::RenderSVGShape::calculateStrokeBoundingBox):
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::nodeAtFloatPoint):
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::intersectRepaintRectWithShadows):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::clipToImageBuffer):
+ * rendering/svg/SVGTextQuery.cpp:
+ (WebCore::SVGTextQuery::modifyStartEndPositionsRespectingLigatures):
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::Parent::Parent):
+ * style/RenderTreeUpdater.h:
+ * style/StyleScope.h:
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::parseAttribute):
+ (WebCore::SVGElement::resolveCustomStyle):
+ * svg/SVGElement.h:
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::transcodeGlyphPaths):
+ (WebCore::SVGToOTFFontConverter::processGlyphElement):
+ (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+ (WebCore::convertSVGToOTFFont):
+ * svg/SVGToOTFFontConversion.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::setEventThrottlingBehaviorOverride):
+ (WebCore::Internals::eventThrottlingBehaviorOverride):
+ * testing/Internals.h:
+ * workers/Worker.h:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::prepareToSend):
+ (WebCore::XMLHttpRequest::didFinishLoading):
+ * xml/XMLHttpRequest.h:
+
</ins><span class="cx"> 2016-11-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix build warnings in WebCore/Modules/indexeddb/server/IDBSerialization.cp
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The amount follows the regular expression -?[0-9]+(\.[0-9][0-9])?.
</span><del>-static Optional<int64_t> parseAmount(const String& amountString)
</del><ins>+static std::optional<int64_t> parseAmount(const String& amountString)
</ins><span class="cx"> {
</span><span class="cx"> int64_t amount = 0;
</span><span class="cx">
</span><span class="lines">@@ -105,13 +105,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!parseDigit(c, isNegative, amount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> state = State::Digit;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case State::Sign:
</span><span class="cx"> if (!parseDigit(c, isNegative, amount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> state = State::Digit;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -122,12 +122,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!parseDigit(c, isNegative, amount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case State::Dot:
</span><span class="cx"> if (!parseDigit(c, isNegative, amount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> state = State::DotDigit;
</span><span class="cx"> break;
</span><span class="lines">@@ -134,18 +134,18 @@
</span><span class="cx">
</span><span class="cx"> case State::DotDigit:
</span><span class="cx"> if (!parseDigit(c, isNegative, amount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> state = State::End;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case State::End:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (state != State::Digit && state != State::DotDigit && state != State::End)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (state == State::DotDigit) {
</span><span class="cx"> // There was a single digit after the decimal point.
</span><span class="lines">@@ -163,18 +163,18 @@
</span><span class="cx"> return amount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray)
</del><ins>+static std::optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray)
</ins><span class="cx"> {
</span><span class="cx"> PaymentRequest::ContactFields result;
</span><span class="cx">
</span><span class="cx"> size_t contactFieldsCount;
</span><span class="cx"> if (!contactFieldsArray.length(contactFieldsCount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < contactFieldsCount; ++i) {
</span><span class="cx"> String contactField;
</span><span class="cx"> if (!contactFieldsArray.get(i, contactField))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (contactField == "postalAddress")
</span><span class="cx"> result.postalAddress = true;
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> else {
</span><span class="cx"> auto message = makeString("\"" + contactField, "\" is not a valid contact field.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::LineItem::Type> toLineItemType(const String& type)
</del><ins>+static std::optional<PaymentRequest::LineItem::Type> toLineItemType(const String& type)
</ins><span class="cx"> {
</span><span class="cx"> if (type == "pending")
</span><span class="cx"> return PaymentRequest::LineItem::Type::Pending;
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> if (type == "final")
</span><span class="cx"> return PaymentRequest::LineItem::Type::Final;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isValidLineItemPropertyName(const String& propertyName)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::LineItem> createLineItem(DOMWindow& window, const Dictionary& total)
</del><ins>+static std::optional<PaymentRequest::LineItem> createLineItem(DOMWindow& window, const Dictionary& total)
</ins><span class="cx"> {
</span><span class="cx"> Vector<String> propertyNames;
</span><span class="cx"> total.getOwnPropertyNames(propertyNames);
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> if (!isValidLineItemPropertyName(propertyName)) {
</span><span class="cx"> auto message = makeString("\"" + propertyName, "\" is not a valid line item property name.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> if (!type) {
</span><span class="cx"> auto message = makeString("\"" + *typeString, "\" is not a valid line item type.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result.type = *type;
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> else {
</span><span class="cx"> auto message = makeString("\"" + *amountString, "\" is not a valid amount.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -262,18 +262,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Vector<PaymentRequest::LineItem>> createLineItems(DOMWindow& window, const ArrayValue& lineItemsArray)
</del><ins>+static std::optional<Vector<PaymentRequest::LineItem>> createLineItems(DOMWindow& window, const ArrayValue& lineItemsArray)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PaymentRequest::LineItem> result;
</span><span class="cx">
</span><span class="cx"> size_t lineItemCount;
</span><span class="cx"> if (!lineItemsArray.length(lineItemCount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < lineItemCount; ++i) {
</span><span class="cx"> Dictionary lineItemDictionary;
</span><span class="cx"> if (!lineItemsArray.get(i, lineItemDictionary))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (auto lineItem = createLineItem(window, lineItemDictionary))
</span><span class="cx"> result.append(*lineItem);
</span><span class="lines">@@ -282,18 +282,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::MerchantCapabilities> createMerchantCapabilities(DOMWindow& window, const ArrayValue& merchantCapabilitiesArray)
</del><ins>+static std::optional<PaymentRequest::MerchantCapabilities> createMerchantCapabilities(DOMWindow& window, const ArrayValue& merchantCapabilitiesArray)
</ins><span class="cx"> {
</span><span class="cx"> PaymentRequest::MerchantCapabilities result;
</span><span class="cx">
</span><span class="cx"> size_t merchantCapabilitiesCount;
</span><span class="cx"> if (!merchantCapabilitiesArray.length(merchantCapabilitiesCount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < merchantCapabilitiesCount; ++i) {
</span><span class="cx"> String merchantCapability;
</span><span class="cx"> if (!merchantCapabilitiesArray.get(i, merchantCapability))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (merchantCapability == "supports3DS")
</span><span class="cx"> result.supports3DS = true;
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> else {
</span><span class="cx"> auto message = makeString("\"" + merchantCapability, "\" is not a valid merchant capability.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,23 +313,23 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Vector<String>> createSupportedNetworks(unsigned version, DOMWindow& window, const ArrayValue& supportedNetworksArray)
</del><ins>+static std::optional<Vector<String>> createSupportedNetworks(unsigned version, DOMWindow& window, const ArrayValue& supportedNetworksArray)
</ins><span class="cx"> {
</span><span class="cx"> Vector<String> result;
</span><span class="cx">
</span><span class="cx"> size_t supportedNetworksCount;
</span><span class="cx"> if (!supportedNetworksArray.length(supportedNetworksCount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < supportedNetworksCount; ++i) {
</span><span class="cx"> String supportedNetwork;
</span><span class="cx"> if (!supportedNetworksArray.get(i, supportedNetwork))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (!PaymentRequest::isValidSupportedNetwork(version, supportedNetwork)) {
</span><span class="cx"> auto message = makeString("\"" + supportedNetwork, "\" is not a valid payment network.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result.append(WTFMove(supportedNetwork));
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::ShippingType> toShippingType(const String& shippingTypeString)
</del><ins>+static std::optional<PaymentRequest::ShippingType> toShippingType(const String& shippingTypeString)
</ins><span class="cx"> {
</span><span class="cx"> if (shippingTypeString == "shipping")
</span><span class="cx"> return PaymentRequest::ShippingType::Shipping;
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> if (shippingTypeString == "servicePickup")
</span><span class="cx"> return PaymentRequest::ShippingType::ServicePickup;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isValidShippingMethodPropertyName(const String& propertyName)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::ShippingMethod> createShippingMethod(DOMWindow& window, const Dictionary& shippingMethodDictionary)
</del><ins>+static std::optional<PaymentRequest::ShippingMethod> createShippingMethod(DOMWindow& window, const Dictionary& shippingMethodDictionary)
</ins><span class="cx"> {
</span><span class="cx"> Vector<String> propertyNames;
</span><span class="cx"> shippingMethodDictionary.getOwnPropertyNames(propertyNames);
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> if (!isValidShippingMethodPropertyName(propertyName)) {
</span><span class="cx"> auto message = makeString("\"" + propertyName, "\" is not a valid shipping method property name.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> auto label = shippingMethodDictionary.get<String>("label");
</span><span class="cx"> if (!label) {
</span><span class="cx"> window.printErrorMessage("Missing shipping method label.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> result.label = *label;
</span><span class="cx">
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> auto detail = shippingMethodDictionary.get<String>("detail");
</span><span class="cx"> if (!detail) {
</span><span class="cx"> window.printErrorMessage("Missing shipping method detail.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> result.detail = *detail;
</span><span class="cx">
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> auto amountString = shippingMethodDictionary.get<String>("amount");
</span><span class="cx"> if (!amountString) {
</span><span class="cx"> window.printErrorMessage("Missing shipping method amount.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto amount = parseAmount(*amountString))
</span><span class="lines">@@ -409,13 +409,13 @@
</span><span class="cx"> else {
</span><span class="cx"> auto message = makeString("\"" + *amountString, "\" is not a valid amount.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto identifier = shippingMethodDictionary.get<String>("identifier");
</span><span class="cx"> if (!identifier) {
</span><span class="cx"> window.printErrorMessage("Missing shipping method identifier.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> result.identifier = *identifier;
</span><span class="cx">
</span><span class="lines">@@ -422,23 +422,23 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Vector<PaymentRequest::ShippingMethod>> createShippingMethods(DOMWindow& window, const ArrayValue& shippingMethodsArray)
</del><ins>+static std::optional<Vector<PaymentRequest::ShippingMethod>> createShippingMethods(DOMWindow& window, const ArrayValue& shippingMethodsArray)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PaymentRequest::ShippingMethod> result;
</span><span class="cx">
</span><span class="cx"> size_t shippingMethodCount;
</span><span class="cx"> if (!shippingMethodsArray.length(shippingMethodCount))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < shippingMethodCount; ++i) {
</span><span class="cx"> Dictionary shippingMethodDictionary;
</span><span class="cx"> if (!shippingMethodsArray.get(i, shippingMethodDictionary))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (auto shippingMethod = createShippingMethod(window, shippingMethodDictionary))
</span><span class="cx"> result.append(*shippingMethod);
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest> createPaymentRequest(unsigned version, DOMWindow& window, const Dictionary& dictionary)
</del><ins>+static std::optional<PaymentRequest> createPaymentRequest(unsigned version, DOMWindow& window, const Dictionary& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> PaymentRequest paymentRequest;
</span><span class="cx">
</span><span class="lines">@@ -480,18 +480,18 @@
</span><span class="cx"> for (auto& propertyName : propertyNames) {
</span><span class="cx"> if (propertyName == "requiredShippingAddressFields") {
</span><span class="cx"> window.printErrorMessage("\"requiredShippingAddressFields\" has been deprecated. Please switch to \"requiredShippingContactFields\" instead.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (propertyName == "requiredBillingAddressFields") {
</span><span class="cx"> window.printErrorMessage("\"requiredBillingAddressFields\" has been deprecated. Please switch to \"requiredBillingContactFields\" instead.");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isValidPaymentRequestPropertyName(propertyName)) {
</span><span class="cx"> auto message = makeString("\"" + propertyName, "\" is not a valid payment request property name.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> if (auto merchantCapabilitiesArray = dictionary.get<ArrayValue>("merchantCapabilities")) {
</span><span class="cx"> auto merchantCapabilities = createMerchantCapabilities(window, *merchantCapabilitiesArray);
</span><span class="cx"> if (!merchantCapabilities)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setMerchantCapabilities(*merchantCapabilities);
</span><span class="cx"> }
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> if (auto supportedNetworksArray = dictionary.get<ArrayValue>("supportedNetworks")) {
</span><span class="cx"> auto supportedNetworks = createSupportedNetworks(version, window, *supportedNetworksArray);
</span><span class="cx"> if (!supportedNetworks)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setSupportedNetworks(*supportedNetworks);
</span><span class="cx"> }
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> if (auto requiredBillingContactFieldsArray = dictionary.get<ArrayValue>("requiredBillingContactFields")) {
</span><span class="cx"> auto requiredBillingContactFields = createContactFields(window, *requiredBillingContactFieldsArray);
</span><span class="cx"> if (!requiredBillingContactFields)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setRequiredBillingContactFields(*requiredBillingContactFields);
</span><span class="cx"> }
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> auto billingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *billingContactValue, errorMessage);
</span><span class="cx"> if (!billingContact) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> paymentRequest.setBillingContact(*billingContact);
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> if (auto requiredShippingContactFieldsArray = dictionary.get<ArrayValue>("requiredShippingContactFields")) {
</span><span class="cx"> auto requiredShippingContactFields = createContactFields(window, *requiredShippingContactFieldsArray);
</span><span class="cx"> if (!requiredShippingContactFields)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setRequiredShippingContactFields(*requiredShippingContactFields);
</span><span class="cx"> }
</span><span class="lines">@@ -548,7 +548,7 @@
</span><span class="cx"> auto shippingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *shippingContactValue, errorMessage);
</span><span class="cx"> if (!shippingContact) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> paymentRequest.setShippingContact(*shippingContact);
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> if (!shippingType) {
</span><span class="cx"> auto message = makeString("\"" + *shippingTypeString, "\" is not a valid shipping type.");
</span><span class="cx"> window.printErrorMessage(message);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> paymentRequest.setShippingType(*shippingType);
</span><span class="cx"> }
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> if (auto shippingMethodsArray = dictionary.get<ArrayValue>("shippingMethods")) {
</span><span class="cx"> auto shippingMethods = createShippingMethods(window, *shippingMethodsArray);
</span><span class="cx"> if (!shippingMethods)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setShippingMethods(*shippingMethods);
</span><span class="cx"> }
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx"> if (auto totalDictionary = dictionary.get<Dictionary>("total")) {
</span><span class="cx"> auto total = createLineItem(window, *totalDictionary);
</span><span class="cx"> if (!total)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> paymentRequest.setTotal(*total);
</span><span class="cx"> }
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentAuthorizationStatus> toPaymentAuthorizationStatus(unsigned short status)
</del><ins>+static std::optional<PaymentAuthorizationStatus> toPaymentAuthorizationStatus(unsigned short status)
</ins><span class="cx"> {
</span><span class="cx"> switch (status) {
</span><span class="cx"> case ApplePaySession::STATUS_SUCCESS:
</span><span class="lines">@@ -870,7 +870,7 @@
</span><span class="cx"> return PaymentAuthorizationStatus::PINLockout;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentContacth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentContact.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentContact.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentContact.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<PaymentContact> fromJS(JSC::ExecState&, JSC::JSValue, String& errorMessage);
</del><ins>+ static std::optional<PaymentContact> fromJS(JSC::ExecState&, JSC::JSValue, String& errorMessage);
</ins><span class="cx"> JSC::JSValue toJS(JSC::ExecState&) const;
</span><span class="cx">
</span><span class="cx"> PKContact *pkContact() const { return m_pkContact.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> m_client.completeMerchantValidation(paymentMerchantSession);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PaymentCoordinator::completeShippingMethodSelection(PaymentAuthorizationStatus status, Optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void PaymentCoordinator::completeShippingMethodSelection(PaymentAuthorizationStatus status, std::optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_activeSession);
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_client.completeShippingMethodSelection(status, WTFMove(newTotalAndItems));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PaymentCoordinator::completeShippingContactSelection(PaymentAuthorizationStatus status, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, Optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void PaymentCoordinator::completeShippingContactSelection(PaymentAuthorizationStatus status, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, std::optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_activeSession);
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> m_client.completeShippingContactSelection(status, newShippingMethods, WTFMove(newTotalAndItems));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PaymentCoordinator::completePaymentMethodSelection(Optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void PaymentCoordinator::completePaymentMethodSelection(std::optional<PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_activeSession);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> bool beginPaymentSession(ApplePaySession&, const URL& originatingURL, const Vector<URL>& linkIconURLs, const PaymentRequest&);
</span><span class="cx"> void completeMerchantValidation(const PaymentMerchantSession&);
</span><del>- void completeShippingMethodSelection(PaymentAuthorizationStatus, Optional<PaymentRequest::TotalAndLineItems> newItems);
- void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, Optional<PaymentRequest::TotalAndLineItems> newItems);
- void completePaymentMethodSelection(Optional<PaymentRequest::TotalAndLineItems> newItems);
</del><ins>+ void completeShippingMethodSelection(PaymentAuthorizationStatus, std::optional<PaymentRequest::TotalAndLineItems> newItems);
+ void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, std::optional<PaymentRequest::TotalAndLineItems> newItems);
+ void completePaymentMethodSelection(std::optional<PaymentRequest::TotalAndLineItems> newItems);
</ins><span class="cx"> void completePaymentSession(PaymentAuthorizationStatus);
</span><span class="cx"> void abortPaymentSession();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentCoordinatorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool showPaymentUI(const URL& originatingURL, const Vector<URL>& linkIconURLs, const PaymentRequest&) = 0;
</span><span class="cx"> virtual void completeMerchantValidation(const PaymentMerchantSession&) = 0;
</span><del>- virtual void completeShippingMethodSelection(PaymentAuthorizationStatus, Optional<PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
- virtual void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, Optional<PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
- virtual void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
</del><ins>+ virtual void completeShippingMethodSelection(PaymentAuthorizationStatus, std::optional<PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
+ virtual void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>& newShippingMethods, std::optional<PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
+ virtual void completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
</ins><span class="cx"> virtual void completePaymentSession(PaymentAuthorizationStatus) = 0;
</span><span class="cx"> virtual void abortPaymentSession() = 0;
</span><span class="cx"> virtual void paymentCoordinatorDestroyed() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentMerchantSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentMerchantSession.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentMerchantSession.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentMerchantSession.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Optional<PaymentMerchantSession> fromJS(JSC::ExecState&, JSC::JSValue, String& errorMessage);
</del><ins>+ static std::optional<PaymentMerchantSession> fromJS(JSC::ExecState&, JSC::JSValue, String& errorMessage);
</ins><span class="cx">
</span><span class="cx"> PKPaymentMerchantSession *pkPaymentMerchantSession() const { return m_pkPaymentMerchantSession.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> // Stored as a fixed point decimal number with two decimals:
</span><span class="cx"> // 1.23 -> 123.
</span><span class="cx"> // 0.01 -> 1.
</span><del>- Optional<int64_t> amount;
</del><ins>+ std::optional<int64_t> amount;
</ins><span class="cx"> String label;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaycocoaPaymentContactCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -104,20 +104,20 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<PaymentContact> PaymentContact::fromJS(JSC::ExecState& state, JSC::JSValue value, String& errorMessage)
</del><ins>+std::optional<PaymentContact> PaymentContact::fromJS(JSC::ExecState& state, JSC::JSValue value, String& errorMessage)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Don't round-trip using NSString.
</span><span class="cx"> auto jsonString = JSONStringify(&state, value, 0);
</span><span class="cx"> if (!jsonString)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto dictionary = dynamic_objc_cast<NSDictionary>([NSJSONSerialization JSONObjectWithData:[(NSString *)jsonString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil]);
</span><span class="cx"> if (!dictionary || ![dictionary isKindOfClass:[NSDictionary class]])
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto pkContact = fromDictionary(dictionary, errorMessage);
</span><span class="cx"> if (!pkContact)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return PaymentContact(pkContact.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaycocoaPaymentMerchantSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,16 +42,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Optional<PaymentMerchantSession> PaymentMerchantSession::fromJS(JSC::ExecState& state, JSC::JSValue value, String&)
</del><ins>+std::optional<PaymentMerchantSession> PaymentMerchantSession::fromJS(JSC::ExecState& state, JSC::JSValue value, String&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Don't round-trip using NSString.
</span><span class="cx"> auto jsonString = JSONStringify(&state, value, 0);
</span><span class="cx"> if (!jsonString)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto dictionary = dynamic_objc_cast<NSDictionary>([NSJSONSerialization JSONObjectWithData:[(NSString *)jsonString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil]);
</span><span class="cx"> if (!dictionary || ![dictionary isKindOfClass:[NSDictionary class]])
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto pkPaymentMerchantSession = adoptNS([allocPKPaymentMerchantSessionInstance() initWithDictionary:dictionary]);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyStatusMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<WTF::KeyValuePair<BufferSource::VariantType, MediaKeyStatus>> MediaKeyStatusMap::Iterator::next()
</del><ins>+std::optional<WTF::KeyValuePair<BufferSource::VariantType, MediaKeyStatus>> MediaKeyStatusMap::Iterator::next()
</ins><span class="cx"> {
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyStatusMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> class Iterator {
</span><span class="cx"> public:
</span><span class="cx"> explicit Iterator(MediaKeyStatusMap&);
</span><del>- Optional<WTF::KeyValuePair<BufferSource::VariantType, MediaKeyStatus>> next();
</del><ins>+ std::optional<WTF::KeyValuePair<BufferSource::VariantType, MediaKeyStatus>> next();
</ins><span class="cx"> };
</span><span class="cx"> Iterator createIterator() { return Iterator(*this); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Optional<FetchBody> FetchBody::extract(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value, String& contentType)
</del><ins>+std::optional<FetchBody> FetchBody::extract(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value, String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> if (value.inherits(JSBlob::info())) {
</span><span class="cx"> auto& blob = *JSBlob::toWrapped(value);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> if (value.inherits(JSC::JSArrayBufferView::info()))
</span><span class="cx"> return FetchBody(toUnsharedArrayBufferView(value).releaseConstNonNull());
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBody::arrayBuffer(FetchBodyOwner& owner, Ref<DeferredPromise>&& promise)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> bool isURLSearchParams() const { return WTF::holds_alternative<Ref<const URLSearchParams>>(m_data); }
</span><span class="cx"> bool isText() const { return WTF::holds_alternative<String>(m_data); }
</span><span class="cx">
</span><del>- static Optional<FetchBody> extract(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue, String&);
</del><ins>+ static std::optional<FetchBody> extract(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue, String&);
</ins><span class="cx"> static FetchBody loadingBody() { return { }; }
</span><span class="cx">
</span><span class="cx"> void loadingFailed();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FetchBodyOwner::FetchBodyOwner(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers)
</del><ins>+FetchBodyOwner::FetchBodyOwner(ScriptExecutionContext& context, std::optional<FetchBody>&& body, Ref<FetchHeaders>&& headers)
</ins><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_body(WTFMove(body))
</span><span class="cx"> , m_headers(WTFMove(headers))
</span><span class="lines">@@ -190,13 +190,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_blobLoader = { *this };
</del><ins>+ m_blobLoader.emplace(*this);
</ins><span class="cx"> m_blobLoader->loader = std::make_unique<FetchLoader>(*m_blobLoader, consumer);
</span><span class="cx">
</span><span class="cx"> m_blobLoader->loader->start(*scriptExecutionContext(), blob);
</span><span class="cx"> if (!m_blobLoader->loader->isStarted()) {
</span><span class="cx"> m_body->loadingFailed();
</span><del>- m_blobLoader = Nullopt;
</del><ins>+ m_blobLoader = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> setPendingActivity(this);
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_blobLoader);
</span><span class="cx">
</span><del>- m_blobLoader = Nullopt;
</del><ins>+ m_blobLoader = std::nullopt;
</ins><span class="cx"> unsetPendingActivity(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject {
</span><span class="cx"> public:
</span><del>- FetchBodyOwner(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&);
</del><ins>+ FetchBodyOwner(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&);
</ins><span class="cx">
</span><span class="cx"> // Exposed Body API
</span><span class="cx"> bool isDisturbed() const { return m_isDisturbed; };
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- Optional<FetchBody> m_body;
</del><ins>+ std::optional<FetchBody> m_body;
</ins><span class="cx"> String m_contentType;
</span><span class="cx"> bool m_isDisturbed { false };
</span><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> Ref<FetchHeaders> m_headers;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<BlobLoader> m_blobLoader;
</del><ins>+ std::optional<BlobLoader> m_blobLoader;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeaderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<WTF::KeyValuePair<String, String>> FetchHeaders::Iterator::next()
</del><ins>+std::optional<WTF::KeyValuePair<String, String>> FetchHeaders::Iterator::next()
</ins><span class="cx"> {
</span><span class="cx"> while (m_currentIndex < m_keys.size()) {
</span><span class="cx"> auto key = m_keys[m_currentIndex++];
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> if (!value.isNull())
</span><span class="cx"> return WTF::KeyValuePair<String, String> { WTFMove(key), WTFMove(value) };
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FetchHeaders::Iterator::Iterator(FetchHeaders& headers)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> class Iterator {
</span><span class="cx"> public:
</span><span class="cx"> explicit Iterator(FetchHeaders&);
</span><del>- Optional<WTF::KeyValuePair<String, String>> next();
</del><ins>+ std::optional<WTF::KeyValuePair<String, String>> next();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ref<FetchHeaders> m_headers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Optional<Exception> setReferrerPolicy(FetchOptions& options, const String& referrerPolicy)
</del><ins>+static std::optional<Exception> setReferrerPolicy(FetchOptions& options, const String& referrerPolicy)
</ins><span class="cx"> {
</span><span class="cx"> if (referrerPolicy.isEmpty())
</span><span class="cx"> options.referrerPolicy = FetchOptions::ReferrerPolicy::EmptyString;
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> options.referrerPolicy = FetchOptions::ReferrerPolicy::UnsafeUrl;
</span><span class="cx"> else
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Bad referrer policy value.") };
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setMode(FetchOptions& options, const String& mode)
</del><ins>+static std::optional<Exception> setMode(FetchOptions& options, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> if (mode == "navigate")
</span><span class="cx"> options.mode = FetchOptions::Mode::Navigate;
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> options.mode = FetchOptions::Mode::Cors;
</span><span class="cx"> else
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Bad fetch mode value.") };
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setCredentials(FetchOptions& options, const String& credentials)
</del><ins>+static std::optional<Exception> setCredentials(FetchOptions& options, const String& credentials)
</ins><span class="cx"> {
</span><span class="cx"> if (credentials == "omit")
</span><span class="cx"> options.credentials = FetchOptions::Credentials::Omit;
</span><span class="lines">@@ -83,10 +83,10 @@
</span><span class="cx"> options.credentials = FetchOptions::Credentials::Include;
</span><span class="cx"> else
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Bad credentials mode value.") };
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setCache(FetchOptions& options, const String& cache)
</del><ins>+static std::optional<Exception> setCache(FetchOptions& options, const String& cache)
</ins><span class="cx"> {
</span><span class="cx"> if (cache == "default")
</span><span class="cx"> options.cache = FetchOptions::Cache::Default;
</span><span class="lines">@@ -102,10 +102,10 @@
</span><span class="cx"> options.cache = FetchOptions::Cache::OnlyIfCached;
</span><span class="cx"> else
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Bad cache mode value.") };
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setRedirect(FetchOptions& options, const String& redirect)
</del><ins>+static std::optional<Exception> setRedirect(FetchOptions& options, const String& redirect)
</ins><span class="cx"> {
</span><span class="cx"> if (redirect == "follow")
</span><span class="cx"> options.redirect = FetchOptions::Redirect::Follow;
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> options.redirect = FetchOptions::Redirect::Manual;
</span><span class="cx"> else
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Bad redirect mode value.") };
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setMethod(ResourceRequest& request, const String& initMethod)
</del><ins>+static std::optional<Exception> setMethod(ResourceRequest& request, const String& initMethod)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValidHTTPToken(initMethod))
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Method is not a valid HTTP token.") };
</span><span class="lines">@@ -129,17 +129,17 @@
</span><span class="cx">
</span><span class="cx"> request.setHTTPMethod((method == "DELETE" || method == "GET" || method == "HEAD" || method == "OPTIONS" || method == "POST" || method == "PUT") ? method : initMethod);
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> setReferrer(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
</del><ins>+static std::optional<Exception> setReferrer(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
</ins><span class="cx"> {
</span><span class="cx"> String referrer;
</span><span class="cx"> if (!init.get("referrer", referrer))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (referrer.isEmpty()) {
</span><span class="cx"> request.referrer = ASCIILiteral("no-referrer");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> // FIXME: Tighten the URL parsing algorithm according https://url.spec.whatwg.org/#concept-url-parser.
</span><span class="cx"> URL referrerURL = context.completeURL(referrer);
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> if (referrerURL.protocolIs("about") && referrerURL.path() == "client") {
</span><span class="cx"> request.referrer = ASCIILiteral("client");
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(context.securityOrigin() && context.securityOrigin()->canRequest(referrerURL)))
</span><span class="lines">@@ -155,10 +155,10 @@
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Referrer is not same-origin.") };
</span><span class="cx">
</span><span class="cx"> request.referrer = referrerURL.string();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Exception> buildOptions(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
</del><ins>+static std::optional<Exception> buildOptions(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
</ins><span class="cx"> {
</span><span class="cx"> JSC::JSValue window;
</span><span class="cx"> if (init.get("window", window)) {
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> if (exception)
</span><span class="cx"> return exception;
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool methodCanHaveBody(const FetchRequest::InternalRequest& internalRequest)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> if (isDisturbedOrLocked())
</span><span class="cx"> return Exception { TypeError };
</span><span class="cx">
</span><del>- auto clone = adoptRef(*new FetchRequest(context, Nullopt, FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
</del><ins>+ auto clone = adoptRef(*new FetchRequest(context, std::nullopt, FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
</ins><span class="cx"> clone->cloneBody(*this);
</span><span class="cx"> return WTFMove(clone);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class FetchRequest final : public FetchBodyOwner {
</span><span class="cx"> public:
</span><del>- static Ref<FetchRequest> create(ScriptExecutionContext& context) { return adoptRef(*new FetchRequest(context, Nullopt, FetchHeaders::create(FetchHeaders::Guard::Request), { })); }
</del><ins>+ static Ref<FetchRequest> create(ScriptExecutionContext& context) { return adoptRef(*new FetchRequest(context, std::nullopt, FetchHeaders::create(FetchHeaders::Guard::Request), { })); }
</ins><span class="cx">
</span><span class="cx"> ExceptionOr<FetchHeaders&> initializeWith(FetchRequest&, const Dictionary&);
</span><span class="cx"> ExceptionOr<FetchHeaders&> initializeWith(const String&, const Dictionary&);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> const String& internalRequestReferrer() const { return m_internalRequest.referrer; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FetchRequest(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&, InternalRequest&&);
</del><ins>+ FetchRequest(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&, InternalRequest&&);
</ins><span class="cx">
</span><span class="cx"> ExceptionOr<FetchHeaders&> initializeOptions(const Dictionary&);
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> mutable String m_requestURL;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline FetchRequest::FetchRequest(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, InternalRequest&& internalRequest)
</del><ins>+inline FetchRequest::FetchRequest(ScriptExecutionContext& context, std::optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, InternalRequest&& internalRequest)
</ins><span class="cx"> : FetchBodyOwner(context, WTFMove(body), WTFMove(headers))
</span><span class="cx"> , m_internalRequest(WTFMove(internalRequest))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> updateContentType();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FetchResponse::FetchResponse(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, ResourceResponse&& response)
</del><ins>+FetchResponse::FetchResponse(ScriptExecutionContext& context, std::optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, ResourceResponse&& response)
</ins><span class="cx"> : FetchBodyOwner(context, WTFMove(body), WTFMove(headers))
</span><span class="cx"> , m_response(WTFMove(response))
</span><span class="cx"> {
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> ASSERT(!isDisturbedOrLocked());
</span><span class="cx">
</span><del>- auto clone = adoptRef(*new FetchResponse(*scriptExecutionContext(), Nullopt, FetchHeaders::create(headers()), ResourceResponse(m_response)));
</del><ins>+ auto clone = adoptRef(*new FetchResponse(*scriptExecutionContext(), std::nullopt, FetchHeaders::create(headers()), ResourceResponse(m_response)));
</ins><span class="cx"> clone->cloneBody(*this);
</span><span class="cx"> return clone;
</span><span class="cx"> }
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> // Setting pending activity until BodyLoader didFail or didSucceed callback is called.
</span><span class="cx"> response->setPendingActivity(response.ptr());
</span><span class="cx">
</span><del>- response->m_bodyLoader = BodyLoader(response.get(), WTFMove(promise));
</del><ins>+ response->m_bodyLoader.emplace(response.get(), WTFMove(promise));
</ins><span class="cx"> if (!response->m_bodyLoader->start(context, request))
</span><del>- response->m_bodyLoader = Nullopt;
</del><ins>+ response->m_bodyLoader = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& FetchResponse::url() const
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_loader->isStarted())
</span><del>- m_response.m_bodyLoader = Nullopt;
</del><ins>+ m_response.m_bodyLoader = std::nullopt;
</ins><span class="cx"> m_response.unsetPendingActivity(&m_response);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_response.hasPendingActivity());
</span><span class="cx"> if (m_promise)
</span><del>- std::exchange(m_promise, Nullopt)->reject(TypeError);
</del><ins>+ std::exchange(m_promise, std::nullopt)->reject(TypeError);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="cx"> if (m_response.m_readableStreamSource) {
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> // Check whether didFail is called as part of FetchLoader::start.
</span><span class="cx"> if (m_loader->isStarted())
</span><del>- m_response.m_bodyLoader = Nullopt;
</del><ins>+ m_response.m_bodyLoader = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> m_response.unsetPendingActivity(&m_response);
</span><span class="cx"> }
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> m_response.m_response = resourceResponse;
</span><span class="cx"> m_response.m_headers->filterAndFill(resourceResponse.httpHeaderFields(), FetchHeaders::Guard::Response);
</span><span class="cx">
</span><del>- std::exchange(m_promise, Nullopt)->resolve(m_response);
</del><ins>+ std::exchange(m_promise, std::nullopt)->resolve(m_response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponse::BodyLoader::didReceiveData(const char* data, size_t size)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx">
</span><span class="cx"> void FetchResponse::BodyLoader::stop()
</span><span class="cx"> {
</span><del>- m_promise = Nullopt;
</del><ins>+ m_promise = std::nullopt;
</ins><span class="cx"> if (m_loader)
</span><span class="cx"> m_loader->stop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> public:
</span><span class="cx"> using Type = ResourceResponse::Type;
</span><span class="cx">
</span><del>- static Ref<FetchResponse> create(ScriptExecutionContext& context) { return adoptRef(*new FetchResponse(context, Nullopt, FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</del><ins>+ static Ref<FetchResponse> create(ScriptExecutionContext& context) { return adoptRef(*new FetchResponse(context, std::nullopt, FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</ins><span class="cx"> static Ref<FetchResponse> error(ScriptExecutionContext&);
</span><span class="cx"> static ExceptionOr<Ref<FetchResponse>> redirect(ScriptExecutionContext&, const String& url, int status);
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> bool isLoading() const { return !!m_bodyLoader; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FetchResponse(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&, ResourceResponse&&);
</del><ins>+ FetchResponse(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&, ResourceResponse&&);
</ins><span class="cx">
</span><span class="cx"> static void startFetching(ScriptExecutionContext&, const FetchRequest&, FetchPromise&&);
</span><span class="cx">
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx"> void didReceiveData(const char*, size_t) final;
</span><span class="cx">
</span><span class="cx"> FetchResponse& m_response;
</span><del>- Optional<FetchPromise> m_promise;
</del><ins>+ std::optional<FetchPromise> m_promise;
</ins><span class="cx"> std::unique_ptr<FetchLoader> m_loader;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ResourceResponse m_response;
</span><del>- Optional<BodyLoader> m_bodyLoader;
</del><ins>+ std::optional<BodyLoader> m_bodyLoader;
</ins><span class="cx"> mutable String m_responseURL;
</span><span class="cx">
</span><span class="cx"> FetchBodyConsumer m_consumer { FetchBodyConsumer::Type::ArrayBuffer };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationCoordinatescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Coordinates.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Coordinates.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/geolocation/Coordinates.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -28,31 +28,31 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Optional<double> Coordinates::altitude() const
</del><ins>+std::optional<double> Coordinates::altitude() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_canProvideAltitude)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return m_altitude;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> Coordinates::altitudeAccuracy() const
</del><ins>+std::optional<double> Coordinates::altitudeAccuracy() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_canProvideAltitudeAccuracy)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return m_altitudeAccuracy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> Coordinates::heading() const
</del><ins>+std::optional<double> Coordinates::heading() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_canProvideHeading)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return m_heading;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> Coordinates::speed() const
</del><ins>+std::optional<double> Coordinates::speed() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_canProvideSpeed)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return m_speed;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationCoordinatesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Coordinates.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Coordinates.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/geolocation/Coordinates.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx">
</span><span class="cx"> double latitude() const { return m_latitude; }
</span><span class="cx"> double longitude() const { return m_longitude; }
</span><del>- Optional<double> altitude() const;
</del><ins>+ std::optional<double> altitude() const;
</ins><span class="cx"> double accuracy() const { return m_accuracy; }
</span><del>- Optional<double> altitudeAccuracy() const;
- Optional<double> heading() const;
- Optional<double> speed() const;
</del><ins>+ std::optional<double> altitudeAccuracy() const;
+ std::optional<double> heading() const;
+ std::optional<double> speed() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return prevunique;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IndexedDB::CursorDirection> IDBCursor::stringToDirection(const String& directionString)
</del><ins>+std::optional<IndexedDB::CursorDirection> IDBCursor::stringToDirection(const String& directionString)
</ins><span class="cx"> {
</span><span class="cx"> if (directionString == directionNext())
</span><span class="cx"> return IndexedDB::CursorDirection::Next;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> if (directionString == directionPrevUnique())
</span><span class="cx"> return IndexedDB::CursorDirection::PrevNoDuplicate;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& IDBCursor::directionToString(IndexedDB::CursorDirection direction)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> static const AtomicString& directionPrev();
</span><span class="cx"> static const AtomicString& directionPrevUnique();
</span><span class="cx">
</span><del>- static Optional<IndexedDB::CursorDirection> stringToDirection(const String& modeString);
</del><ins>+ static std::optional<IndexedDB::CursorDirection> stringToDirection(const String& modeString);
</ins><span class="cx"> static const AtomicString& directionToString(IndexedDB::CursorDirection mode);
</span><span class="cx">
</span><span class="cx"> virtual ~IDBCursor();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> RefPtr<DOMStringList> objectStoreNames() const;
</span><span class="cx">
</span><span class="cx"> struct ObjectStoreParameters {
</span><del>- Optional<IDBKeyPath> keyPath;
</del><ins>+ std::optional<IDBKeyPath> keyPath;
</ins><span class="cx"> bool autoIncrement;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> unsigned mainFrameProtocolHash = StringHash::hash(m_mainFrameOrigin.protocol);
</span><span class="cx"> unsigned mainFrameHostHash = StringHash::hash(m_mainFrameOrigin.host);
</span><span class="cx">
</span><del>- unsigned hashCodes[7] = { nameHash, openingProtocolHash, openingHostHash, m_openingOrigin.port.valueOr(0), mainFrameProtocolHash, mainFrameHostHash, m_mainFrameOrigin.port.valueOr(0) };
</del><ins>+ unsigned hashCodes[7] = { nameHash, openingProtocolHash, openingHostHash, m_openingOrigin.port.value_or(0), mainFrameProtocolHash, mainFrameHostHash, m_mainFrameOrigin.port.value_or(0) };
</ins><span class="cx"> return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBOpenDBRequest>> IDBFactory::open(ScriptExecutionContext& context, const String& name, Optional<uint64_t> version)
</del><ins>+ExceptionOr<Ref<IDBOpenDBRequest>> IDBFactory::open(ScriptExecutionContext& context, const String& name, std::optional<uint64_t> version)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBFactory::open");
</span><span class="cx">
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> if (version && !version.value())
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("IDBFactory.open() called with a version of 0") };
</span><span class="cx">
</span><del>- return openInternal(context, name, version.valueOr(0));
</del><ins>+ return openInternal(context, name, version.value_or(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<IDBOpenDBRequest>> IDBFactory::openInternal(ScriptExecutionContext& context, const String& name, unsigned long long version)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> static Ref<IDBFactory> create(IDBClient::IDBConnectionProxy&);
</span><span class="cx"> ~IDBFactory();
</span><span class="cx">
</span><del>- ExceptionOr<Ref<IDBOpenDBRequest>> open(ScriptExecutionContext&, const String& name, Optional<uint64_t> version);
</del><ins>+ ExceptionOr<Ref<IDBOpenDBRequest>> open(ScriptExecutionContext&, const String& name, std::optional<uint64_t> version);
</ins><span class="cx"> ExceptionOr<Ref<IDBOpenDBRequest>> deleteDatabase(ScriptExecutionContext&, const String& name);
</span><span class="cx">
</span><span class="cx"> ExceptionOr<short> cmp(JSC::ExecState&, JSC::JSValue first, JSC::JSValue second);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBIndexcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> return transaction.requestGetKey(execState, *this, range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBIndex::getAll(ExecState& execState, RefPtr<IDBKeyRange> range, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBIndex::getAll(ExecState& execState, RefPtr<IDBKeyRange> range, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBIndex::getAll");
</span><span class="cx"> ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> return m_objectStore.transaction().requestGetAllIndexRecords(execState, *this, range.get(), IndexedDB::GetAllType::Values, count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBIndex::getAll(ExecState& execState, JSValue key, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBIndex::getAll(ExecState& execState, JSValue key, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> auto onlyResult = IDBKeyRange::only(execState, key);
</span><span class="cx"> if (onlyResult.hasException())
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> return getAll(execState, onlyResult.releaseReturnValue(), count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBIndex::getAllKeys(ExecState& execState, RefPtr<IDBKeyRange> range, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBIndex::getAllKeys(ExecState& execState, RefPtr<IDBKeyRange> range, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBIndex::getAllKeys");
</span><span class="cx"> ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> return m_objectStore.transaction().requestGetAllIndexRecords(execState, *this, range.get(), IndexedDB::GetAllType::Keys, count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBIndex::getAllKeys(ExecState& execState, JSValue key, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBIndex::getAllKeys(ExecState& execState, JSValue key, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> auto onlyResult = IDBKeyRange::only(execState, key);
</span><span class="cx"> if (onlyResult.hasException())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBIndexh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> getKey(JSC::ExecState&, IDBKeyRange*);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> getKey(JSC::ExecState&, JSC::JSValue key);
</span><span class="cx">
</span><del>- ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, RefPtr<IDBKeyRange>, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, JSC::JSValue key, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, RefPtr<IDBKeyRange>, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, JSC::JSValue key, Optional<uint32_t> count);
</del><ins>+ ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, RefPtr<IDBKeyRange>, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, JSC::JSValue key, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, RefPtr<IDBKeyRange>, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, JSC::JSValue key, std::optional<uint32_t> count);
</ins><span class="cx">
</span><span class="cx"> const IDBIndexInfo& info() const { return m_info; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBParseKeyPath(const String&, Vector<String>&, IDBKeyPathParseError&);
</span><span class="cx"> IDBKeyPath isolatedCopy(const IDBKeyPath&);
</span><del>-inline Optional<IDBKeyPath> isolatedCopy(const Optional<IDBKeyPath>& variant)
</del><ins>+inline std::optional<IDBKeyPath> isolatedCopy(const std::optional<IDBKeyPath>& variant)
</ins><span class="cx"> {
</span><span class="cx"> if (!variant)
</span><span class="cx"> return { };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const Optional<IDBKeyPath>& IDBObjectStore::keyPath() const
</del><ins>+const std::optional<IDBKeyPath>& IDBObjectStore::keyPath() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_transaction.database().originThreadID());
</span><span class="cx"> return m_info.keyPath();
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> return m_transaction.requestCount(execState, *this, range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAll(ExecState& execState, RefPtr<IDBKeyRange> range, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAll(ExecState& execState, RefPtr<IDBKeyRange> range, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBObjectStore::getAll");
</span><span class="cx"> ASSERT(currentThread() == m_transaction.database().originThreadID());
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> return m_transaction.requestGetAllObjectStoreRecords(execState, *this, range.get(), IndexedDB::GetAllType::Values, count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAll(ExecState& execState, JSValue key, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAll(ExecState& execState, JSValue key, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> auto onlyResult = IDBKeyRange::only(execState, key);
</span><span class="cx"> if (onlyResult.hasException())
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> return getAll(execState, onlyResult.releaseReturnValue(), count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAllKeys(ExecState& execState, RefPtr<IDBKeyRange> range, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAllKeys(ExecState& execState, RefPtr<IDBKeyRange> range, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBObjectStore::getAllKeys");
</span><span class="cx"> ASSERT(currentThread() == m_transaction.database().originThreadID());
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> return m_transaction.requestGetAllObjectStoreRecords(execState, *this, range.get(), IndexedDB::GetAllType::Keys, count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAllKeys(ExecState& execState, JSValue key, Optional<uint32_t> count)
</del><ins>+ExceptionOr<Ref<IDBRequest>> IDBObjectStore::getAllKeys(ExecState& execState, JSValue key, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> auto onlyResult = IDBKeyRange::only(execState, key);
</span><span class="cx"> if (onlyResult.hasException())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> const String& name() const;
</span><span class="cx"> ExceptionOr<void> setName(const String&);
</span><del>- const Optional<IDBKeyPath>& keyPath() const;
</del><ins>+ const std::optional<IDBKeyPath>& keyPath() const;
</ins><span class="cx"> RefPtr<DOMStringList> indexNames() const;
</span><span class="cx"> IDBTransaction& transaction();
</span><span class="cx"> bool autoIncrement() const;
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> ExceptionOr<void> deleteIndex(const String& name);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> count(JSC::ExecState&, IDBKeyRange*);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> count(JSC::ExecState&, JSC::JSValue key);
</span><del>- ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, RefPtr<IDBKeyRange>, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, JSC::JSValue key, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, RefPtr<IDBKeyRange>, Optional<uint32_t> count);
- ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, JSC::JSValue key, Optional<uint32_t> count);
</del><ins>+ ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, RefPtr<IDBKeyRange>, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAll(JSC::ExecState&, JSC::JSValue key, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, RefPtr<IDBKeyRange>, std::optional<uint32_t> count);
+ ExceptionOr<Ref<IDBRequest>> getAllKeys(JSC::ExecState&, JSC::JSValue key, std::optional<uint32_t> count);
</ins><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> putForCursorUpdate(JSC::ExecState&, JSC::JSValue, JSC::JSValue key);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -756,7 +756,7 @@
</span><span class="cx"> request.didOpenOrIterateCursor(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestGetAllObjectStoreRecords(JSC::ExecState& state, IDBObjectStore& objectStore, const IDBKeyRangeData& keyRangeData, IndexedDB::GetAllType getAllType, Optional<uint32_t> count)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestGetAllObjectStoreRecords(JSC::ExecState& state, IDBObjectStore& objectStore, const IDBKeyRangeData& keyRangeData, IndexedDB::GetAllType getAllType, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetAllObjectStoreRecords");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestGetAllIndexRecords(JSC::ExecState& state, IDBIndex& index, const IDBKeyRangeData& keyRangeData, IndexedDB::GetAllType getAllType, Optional<uint32_t> count)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestGetAllIndexRecords(JSC::ExecState& state, IDBIndex& index, const IDBKeyRangeData& keyRangeData, IndexedDB::GetAllType getAllType, std::optional<uint32_t> count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetAllIndexRecords");
</span><span class="cx"> ASSERT(isActive());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx">
</span><span class="cx"> Ref<IDBRequest> requestPutOrAdd(JSC::ExecState&, IDBObjectStore&, IDBKey*, SerializedScriptValue&, IndexedDB::ObjectStoreOverwriteMode);
</span><span class="cx"> Ref<IDBRequest> requestGetRecord(JSC::ExecState&, IDBObjectStore&, const IDBGetRecordData&);
</span><del>- Ref<IDBRequest> requestGetAllObjectStoreRecords(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&, IndexedDB::GetAllType, Optional<uint32_t> count);
- Ref<IDBRequest> requestGetAllIndexRecords(JSC::ExecState&, IDBIndex&, const IDBKeyRangeData&, IndexedDB::GetAllType, Optional<uint32_t> count);
</del><ins>+ Ref<IDBRequest> requestGetAllObjectStoreRecords(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&, IndexedDB::GetAllType, std::optional<uint32_t> count);
+ Ref<IDBRequest> requestGetAllIndexRecords(JSC::ExecState&, IDBIndex&, const IDBKeyRangeData&, IndexedDB::GetAllType, std::optional<uint32_t> count);
</ins><span class="cx"> Ref<IDBRequest> requestDeleteRecord(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&);
</span><span class="cx"> Ref<IDBRequest> requestClearObjectStore(JSC::ExecState&, IDBObjectStore&);
</span><span class="cx"> Ref<IDBRequest> requestCount(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> if (newVersion)
</span><span class="cx"> m_newVersion = newVersion;
</span><span class="cx"> else
</span><del>- m_newVersion = Nullopt;
</del><ins>+ m_newVersion = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& name, const Init& init, IsTrusted isTrusted)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> struct Init : EventInit {
</span><span class="cx"> uint64_t oldVersion { 0 };
</span><del>- Optional<uint64_t> newVersion;
</del><ins>+ std::optional<uint64_t> newVersion;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<IDBVersionChangeEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> bool isVersionChangeEvent() const final { return true; }
</span><span class="cx">
</span><span class="cx"> uint64_t oldVersion() const { return m_oldVersion; }
</span><del>- Optional<uint64_t> newVersion() const { return m_newVersion; }
</del><ins>+ std::optional<uint64_t> newVersion() const { return m_newVersion; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType);
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResourceIdentifier m_requestIdentifier;
</span><span class="cx"> uint64_t m_oldVersion;
</span><del>- Optional<uint64_t> m_newVersion;
</del><ins>+ std::optional<uint64_t> m_newVersion;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> enum class KeyPathType { Null, String, Array };
</span><span class="cx">
</span><del>-RefPtr<SharedBuffer> serializeIDBKeyPath(const Optional<IDBKeyPath>& keyPath)
</del><ins>+RefPtr<SharedBuffer> serializeIDBKeyPath(const std::optional<IDBKeyPath>& keyPath)
</ins><span class="cx"> {
</span><span class="cx"> auto encoder = KeyedEncoder::encoder();
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return encoder->finishEncoding();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool deserializeIDBKeyPath(const uint8_t* data, size_t size, Optional<IDBKeyPath>& result)
</del><ins>+bool deserializeIDBKeyPath(const uint8_t* data, size_t size, std::optional<IDBKeyPath>& result)
</ins><span class="cx"> {
</span><span class="cx"> if (!data || !size)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBSerializationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> class IDBKeyData;
</span><span class="cx">
</span><del>-RefPtr<SharedBuffer> serializeIDBKeyPath(const Optional<IDBKeyPath>&);
-bool deserializeIDBKeyPath(const uint8_t* buffer, size_t bufferSize, Optional<IDBKeyPath>&);
</del><ins>+RefPtr<SharedBuffer> serializeIDBKeyPath(const std::optional<IDBKeyPath>&);
+bool deserializeIDBKeyPath(const uint8_t* buffer, size_t bufferSize, std::optional<IDBKeyPath>&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> serializeIDBKeyData(const IDBKeyData&);
</span><span class="cx"> bool deserializeIDBKeyData(const uint8_t* buffer, size_t bufferSize, IDBKeyData&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIndexcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryIndex::getAllRecords(const IDBKeyRangeData& keyRangeData, Optional<uint32_t> count, IndexedDB::GetAllType type, IDBGetAllResult& result) const
</del><ins>+void MemoryIndex::getAllRecords(const IDBKeyRangeData& keyRangeData, std::optional<uint32_t> count, IndexedDB::GetAllType type, IDBGetAllResult& result) const
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "MemoryIndex::getAllRecords");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIndexh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> IDBGetResult getResultForKeyRange(IndexedDB::IndexRecordType, const IDBKeyRangeData&) const;
</span><span class="cx"> uint64_t countForKeyRange(const IDBKeyRangeData&);
</span><del>- void getAllRecords(const IDBKeyRangeData&, Optional<uint32_t> count, IndexedDB::GetAllType, IDBGetAllResult&) const;
</del><ins>+ void getAllRecords(const IDBKeyRangeData&, std::optional<uint32_t> count, IndexedDB::GetAllType, IDBGetAllResult&) const;
</ins><span class="cx">
</span><span class="cx"> IDBError putIndexKey(const IDBKeyData&, const IndexKey&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> return m_keyValueStore->get(key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryObjectStore::getAllRecords(const IDBKeyRangeData& keyRangeData, Optional<uint32_t> count, IndexedDB::GetAllType type, IDBGetAllResult& result) const
</del><ins>+void MemoryObjectStore::getAllRecords(const IDBKeyRangeData& keyRangeData, std::optional<uint32_t> count, IndexedDB::GetAllType type, IDBGetAllResult& result) const
</ins><span class="cx"> {
</span><span class="cx"> result = { type };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> IDBGetResult indexValueForKeyRange(uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&) const;
</span><span class="cx"> uint64_t countForKeyRange(uint64_t indexIdentifier, const IDBKeyRangeData&) const;
</span><span class="cx">
</span><del>- void getAllRecords(const IDBKeyRangeData&, Optional<uint32_t> count, IndexedDB::GetAllType, IDBGetAllResult&) const;
</del><ins>+ void getAllRecords(const IDBKeyRangeData&, std::optional<uint32_t> count, IndexedDB::GetAllType, IDBGetAllResult&) const;
</ins><span class="cx">
</span><span class="cx"> const IDBObjectStoreInfo& info() const { return m_info; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::objectStoreCleared()
</span><span class="cx"> {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::keyDeleted(const IDBKeyData& key)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (m_currentPositionKey != key)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::keyAdded(std::set<IDBKeyData>::iterator iterator)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::setFirstInRemainingRange(std::set<IDBKeyData>& set)
</span><span class="cx"> {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (m_info.isDirectionForward()) {
</span><span class="cx"> setForwardIteratorFromRemainingRange(set);
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange(std::set<IDBKeyData>& set)
</span><span class="cx"> {
</span><span class="cx"> if (!set.size()) {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,12 +102,12 @@
</span><span class="cx"> if (m_remainingRange.isExactlyOneKey()) {
</span><span class="cx"> m_iterator = set.find(m_remainingRange.lowerKey);
</span><span class="cx"> if (*m_iterator == set.end())
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto lowest = set.lower_bound(m_remainingRange.lowerKey);
</span><span class="cx"> if (lowest == set.end())
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> void MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange(std::set<IDBKeyData>& set)
</span><span class="cx"> {
</span><span class="cx"> if (!set.size()) {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> if (m_remainingRange.isExactlyOneKey()) {
</span><span class="cx"> m_iterator = set.find(m_remainingRange.lowerKey);
</span><span class="cx"> if (*m_iterator == set.end())
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -148,12 +148,12 @@
</span><span class="cx"> if (!m_remainingRange.upperKey.isValid()) {
</span><span class="cx"> m_iterator = --set.end();
</span><span class="cx"> if (!m_remainingRange.containsKey(**m_iterator))
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // This is one record past the actual key we're looking for.
</span><span class="cx"> auto highest = set.upper_bound(m_remainingRange.upperKey);
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> ++*m_iterator;
</span><span class="cx">
</span><span class="cx"> if (*m_iterator == set.end() || !m_info.range().containsKey(**m_iterator)) {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx">
</span><span class="cx"> while (count) {
</span><span class="cx"> if (*m_iterator == set.begin()) {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> --*m_iterator;
</span><span class="cx">
</span><span class="cx"> if (!m_info.range().containsKey(**m_iterator)) {
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> IDBKeyRangeData m_remainingRange;
</span><span class="cx">
</span><del>- WTF::Optional<std::set<IDBKeyData>::iterator> m_iterator;
</del><ins>+ std::optional<std::set<IDBKeyData>::iterator> m_iterator;
</ins><span class="cx">
</span><span class="cx"> IDBKeyData m_currentPositionKey;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> Vector<char> keyPathBuffer;
</span><span class="cx"> sql.getColumnBlobAsVector(2, keyPathBuffer);
</span><span class="cx">
</span><del>- Optional<IDBKeyPath> objectStoreKeyPath;
</del><ins>+ std::optional<IDBKeyPath> objectStoreKeyPath;
</ins><span class="cx"> if (!deserializeIDBKeyPath(reinterpret_cast<const uint8_t*>(keyPathBuffer.data()), keyPathBuffer.size(), objectStoreKeyPath)) {
</span><span class="cx"> LOG_ERROR("Unable to extract key path from database");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> Vector<char> keyPathBuffer;
</span><span class="cx"> sql.getColumnBlobAsVector(3, keyPathBuffer);
</span><span class="cx">
</span><del>- Optional<IDBKeyPath> indexKeyPath;
</del><ins>+ std::optional<IDBKeyPath> indexKeyPath;
</ins><span class="cx"> if (!deserializeIDBKeyPath(reinterpret_cast<const uint8_t*>(keyPathBuffer.data()), keyPathBuffer.size(), indexKeyPath)) {
</span><span class="cx"> LOG_ERROR("Unable to extract key path from database");
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBObjectStoreInfo IDBDatabaseInfo::createNewObjectStore(const String& name, Optional<IDBKeyPath>&& keyPath, bool autoIncrement)
</del><ins>+IDBObjectStoreInfo IDBDatabaseInfo::createNewObjectStore(const String& name, std::optional<IDBKeyPath>&& keyPath, bool autoIncrement)
</ins><span class="cx"> {
</span><span class="cx"> IDBObjectStoreInfo info(++m_maxObjectStoreID, name, WTFMove(keyPath), autoIncrement);
</span><span class="cx"> m_objectStoreMap.set(info.identifier(), info);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> uint64_t version() const { return m_version; }
</span><span class="cx">
</span><span class="cx"> bool hasObjectStore(const String& name) const;
</span><del>- IDBObjectStoreInfo createNewObjectStore(const String& name, Optional<IDBKeyPath>&&, bool autoIncrement);
</del><ins>+ IDBObjectStoreInfo createNewObjectStore(const String& name, std::optional<IDBKeyPath>&&, bool autoIncrement);
</ins><span class="cx"> void addExistingObjectStore(const IDBObjectStoreInfo&);
</span><span class="cx"> IDBObjectStoreInfo* infoForExistingObjectStore(uint64_t objectStoreIdentifier);
</span><span class="cx"> IDBObjectStoreInfo* infoForExistingObjectStore(const String& objectStoreName);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBGetAllRecordsDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> struct IDBGetAllRecordsData {
</span><span class="cx"> IDBKeyRangeData keyRangeData;
</span><span class="cx"> IndexedDB::GetAllType getAllType;
</span><del>- Optional<uint32_t> count;
</del><ins>+ std::optional<uint32_t> count;
</ins><span class="cx"> uint64_t objectStoreIdentifier;
</span><span class="cx"> uint64_t indexIdentifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBObjectStoreInfo::IDBObjectStoreInfo(uint64_t identifier, const String& name, Optional<IDBKeyPath>&& keyPath, bool autoIncrement)
</del><ins>+IDBObjectStoreInfo::IDBObjectStoreInfo(uint64_t identifier, const String& name, std::optional<IDBKeyPath>&& keyPath, bool autoIncrement)
</ins><span class="cx"> : m_identifier(identifier)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_keyPath(WTFMove(keyPath))
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx"> class IDBObjectStoreInfo {
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT IDBObjectStoreInfo();
</span><del>- IDBObjectStoreInfo(uint64_t identifier, const String& name, Optional<IDBKeyPath>&&, bool autoIncrement);
</del><ins>+ IDBObjectStoreInfo(uint64_t identifier, const String& name, std::optional<IDBKeyPath>&&, bool autoIncrement);
</ins><span class="cx">
</span><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx"> const String& name() const { return m_name; }
</span><del>- const Optional<IDBKeyPath>& keyPath() const { return m_keyPath; }
</del><ins>+ const std::optional<IDBKeyPath>& keyPath() const { return m_keyPath; }
</ins><span class="cx"> bool autoIncrement() const { return m_autoIncrement; }
</span><span class="cx"> uint64_t maxIndexID() const { return m_maxIndexID; }
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> private:
</span><span class="cx"> uint64_t m_identifier { 0 };
</span><span class="cx"> String m_name;
</span><del>- Optional<IDBKeyPath> m_keyPath;
</del><ins>+ std::optional<IDBKeyPath> m_keyPath;
</ins><span class="cx"> bool m_autoIncrement { false };
</span><span class="cx"> uint64_t m_maxIndexID { 0 };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> return page->group().captionPreferences().sortedTrackListForMenu(&trackList);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String MediaControlsHost::displayNameForTrack(const Optional<TextOrAudioTrack>& track)
</del><ins>+String MediaControlsHost::displayNameForTrack(const std::optional<TextOrAudioTrack>& track)
</ins><span class="cx"> {
</span><span class="cx"> if (!track)
</span><span class="cx"> return emptyString();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList&);
</span><span class="cx">
</span><span class="cx"> using TextOrAudioTrack = WTF::Variant<RefPtr<TextTrack>, RefPtr<AudioTrack>>;
</span><del>- String displayNameForTrack(const Optional<TextOrAudioTrack>&);
</del><ins>+ String displayNameForTrack(const std::optional<TextOrAudioTrack>&);
</ins><span class="cx">
</span><span class="cx"> TextTrack* captionMenuOffItem();
</span><span class="cx"> TextTrack* captionMenuAutomaticItem();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> onReadyStateChange(oldState, state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> MediaSource::endOfStream(Optional<EndOfStreamError> error)
</del><ins>+ExceptionOr<void> MediaSource::endOfStream(std::optional<EndOfStreamError> error)
</ins><span class="cx"> {
</span><span class="cx"> // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/tip/media-source/media-source.html#widl-MediaSource-endOfStream-void-EndOfStreamError-error
</span><span class="cx"> // 1. If the readyState attribute is not in the "open" state then throw an
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaSource::streamEndedWithError(Optional<EndOfStreamError> error)
</del><ins>+void MediaSource::streamEndedWithError(std::optional<EndOfStreamError> error)
</ins><span class="cx"> {
</span><span class="cx"> LOG(MediaSource, "MediaSource::streamEndedWithError(%p)", this);
</span><span class="cx"> if (isClosed())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> void sourceBufferDidChangeActiveState(SourceBuffer&, bool);
</span><span class="cx">
</span><span class="cx"> enum class EndOfStreamError { Network, Decode };
</span><del>- void streamEndedWithError(Optional<EndOfStreamError>);
</del><ins>+ void streamEndedWithError(std::optional<EndOfStreamError>);
</ins><span class="cx">
</span><span class="cx"> MediaTime duration() const final;
</span><span class="cx"> void durationChanged(const MediaTime&) final;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> ExceptionOr<void> setDurationInternal(const MediaTime&);
</span><span class="cx"> MediaTime currentTime() const;
</span><span class="cx"> const AtomicString& readyState() const { return m_readyState; }
</span><del>- ExceptionOr<void> endOfStream(Optional<EndOfStreamError>);
</del><ins>+ ExceptionOr<void> endOfStream(std::optional<EndOfStreamError>);
</ins><span class="cx">
</span><span class="cx"> HTMLMediaElement* mediaElement() const { return m_mediaElement; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> Ref<MediaStreamTrackPrivate> m_private;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaConstraints> m_constraints;
</span><del>- Optional<DOMPromise<void>> m_promise;
</del><ins>+ std::optional<DOMPromise<void>> m_promise;
</ins><span class="cx"> WeakPtrFactory<MediaStreamTrack> m_weakPtrFactory;
</span><span class="cx">
</span><span class="cx"> bool m_ended { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><span class="cx"> m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSessionDescription::SdpType::Offer, WTFMove(sdp)));
</span><del>- m_offerAnswerPromise = Nullopt;
</del><ins>+ m_offerAnswerPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::createOfferFailed(Exception&& exception)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><span class="cx"> m_offerAnswerPromise->reject(WTFMove(exception));
</span><del>- m_offerAnswerPromise = Nullopt;
</del><ins>+ m_offerAnswerPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::createAnswer(RTCAnswerOptions&& options, PeerConnection::SessionDescriptionPromise&& promise)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><span class="cx"> m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSessionDescription::SdpType::Answer, WTFMove(sdp)));
</span><del>- m_offerAnswerPromise = Nullopt;
</del><ins>+ m_offerAnswerPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::createAnswerFailed(Exception&& exception)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><span class="cx"> m_offerAnswerPromise->reject(WTFMove(exception));
</span><del>- m_offerAnswerPromise = Nullopt;
</del><ins>+ m_offerAnswerPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isLocalDescriptionTypeValidForState(RTCSessionDescription::SdpType type, PeerConnectionStates::SignalingState state)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> ASSERT(m_setDescriptionPromise);
</span><span class="cx">
</span><span class="cx"> m_setDescriptionPromise->resolve();
</span><del>- m_setDescriptionPromise = Nullopt;
</del><ins>+ m_setDescriptionPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::setLocalDescriptionFailed(Exception&& exception)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> ASSERT(m_setDescriptionPromise);
</span><span class="cx">
</span><span class="cx"> m_setDescriptionPromise->reject(WTFMove(exception));
</span><del>- m_setDescriptionPromise = Nullopt;
</del><ins>+ m_setDescriptionPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isRemoteDescriptionTypeValidForState(RTCSessionDescription::SdpType type, PeerConnectionStates::SignalingState state)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> ASSERT(m_setDescriptionPromise);
</span><span class="cx">
</span><span class="cx"> m_setDescriptionPromise->resolve();
</span><del>- m_setDescriptionPromise = Nullopt;
</del><ins>+ m_setDescriptionPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::setRemoteDescriptionFailed(Exception&& exception)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> ASSERT(m_setDescriptionPromise);
</span><span class="cx">
</span><span class="cx"> m_setDescriptionPromise->reject(WTFMove(exception));
</span><del>- m_setDescriptionPromise = Nullopt;
</del><ins>+ m_setDescriptionPromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::addIceCandidate(RTCIceCandidate& iceCandidate, PeerConnection::VoidPromise&& promise)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> ASSERT(m_addIceCandidatePromise);
</span><span class="cx">
</span><span class="cx"> m_addIceCandidatePromise->resolve();
</span><del>- m_addIceCandidatePromise = Nullopt;
</del><ins>+ m_addIceCandidatePromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::addIceCandidateFailed(Exception&& exception)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> ASSERT(m_addIceCandidatePromise);
</span><span class="cx">
</span><span class="cx"> m_addIceCandidatePromise->reject(WTFMove(exception));
</span><del>- m_addIceCandidatePromise = Nullopt;
</del><ins>+ m_addIceCandidatePromise = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::fireICECandidateEvent(RefPtr<RTCIceCandidate>&& candidate)
</span><span class="lines">@@ -289,9 +289,9 @@
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::stop()
</span><span class="cx"> {
</span><del>- m_offerAnswerPromise = Nullopt;
- m_setDescriptionPromise = Nullopt;
- m_addIceCandidatePromise = Nullopt;
</del><ins>+ m_offerAnswerPromise = std::nullopt;
+ m_setDescriptionPromise = std::nullopt;
+ m_addIceCandidatePromise = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> doStop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -139,9 +139,9 @@
</span><span class="cx"> RTCPeerConnection& m_peerConnection;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<PeerConnection::SessionDescriptionPromise> m_offerAnswerPromise;
- Optional<PeerConnection::VoidPromise> m_setDescriptionPromise;
- Optional<PeerConnection::VoidPromise> m_addIceCandidatePromise;
</del><ins>+ std::optional<PeerConnection::SessionDescriptionPromise> m_offerAnswerPromise;
+ std::optional<PeerConnection::VoidPromise> m_setDescriptionPromise;
+ std::optional<PeerConnection::VoidPromise> m_addIceCandidatePromise;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return m_handler->currentToneBuffer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> RTCDTMFSender::insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap)
</del><ins>+ExceptionOr<void> RTCDTMFSender::insertDTMF(const String& tones, std::optional<int> duration, std::optional<int> interToneGap)
</ins><span class="cx"> {
</span><span class="cx"> if (!canInsertDTMF())
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="lines">@@ -96,8 +96,8 @@
</span><span class="cx"> if (interToneGap && interToneGap.value() < minInterToneGapMs)
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- m_duration = duration.valueOr(defaultToneDurationMs);
- m_interToneGap = interToneGap.valueOr(defaultInterToneGapMs);
</del><ins>+ m_duration = duration.value_or(defaultToneDurationMs);
+ m_interToneGap = interToneGap.value_or(defaultInterToneGapMs);
</ins><span class="cx">
</span><span class="cx"> if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap))
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> long duration() const { return m_duration; }
</span><span class="cx"> long interToneGap() const { return m_interToneGap; }
</span><span class="cx">
</span><del>- ExceptionOr<void> insertDTMF(const String& tones, Optional<int> duration, Optional<int> interToneGap);
</del><ins>+ ExceptionOr<void> insertDTMF(const String& tones, std::optional<int> duration, std::optional<int> interToneGap);
</ins><span class="cx">
</span><span class="cx"> using RefCounted::ref;
</span><span class="cx"> using RefCounted::deref;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> String sdpMid;
</span><span class="cx"> dictionary.getWithUndefinedOrNullCheck("sdpMid", sdpMid);
</span><span class="cx">
</span><del>- Optional<unsigned short> sdpMLineIndex;
</del><ins>+ std::optional<unsigned short> sdpMLineIndex;
</ins><span class="cx"> String sdpMLineIndexString;
</span><span class="cx">
</span><span class="cx"> if (dictionary.getWithUndefinedOrNullCheck("sdpMLineIndex", sdpMLineIndexString)) {
</span><span class="lines">@@ -66,12 +66,12 @@
</span><span class="cx"> return adoptRef(*new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<RTCIceCandidate> RTCIceCandidate::create(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex)
</del><ins>+Ref<RTCIceCandidate> RTCIceCandidate::create(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCIceCandidate::RTCIceCandidate(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex)
</del><ins>+RTCIceCandidate::RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex)
</ins><span class="cx"> : m_candidate(candidate)
</span><span class="cx"> , m_sdpMid(sdpMid)
</span><span class="cx"> , m_sdpMLineIndex(sdpMLineIndex)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,18 +44,18 @@
</span><span class="cx"> class RTCIceCandidate : public RefCounted<RTCIceCandidate>, public ScriptWrappable {
</span><span class="cx"> public:
</span><span class="cx"> static ExceptionOr<Ref<RTCIceCandidate>> create(const Dictionary&);
</span><del>- static Ref<RTCIceCandidate> create(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex);
</del><ins>+ static Ref<RTCIceCandidate> create(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex);
</ins><span class="cx">
</span><span class="cx"> const String& candidate() const { return m_candidate; }
</span><span class="cx"> const String& sdpMid() const { return m_sdpMid; }
</span><del>- Optional<unsigned short> sdpMLineIndex() const { return m_sdpMLineIndex; }
</del><ins>+ std::optional<unsigned short> sdpMLineIndex() const { return m_sdpMLineIndex; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RTCIceCandidate(const String& candidate, const String& sdpMid, Optional<unsigned short> sdpMLineIndex);
</del><ins>+ explicit RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex);
</ins><span class="cx">
</span><span class="cx"> String m_candidate;
</span><span class="cx"> String m_sdpMid;
</span><del>- Optional<unsigned short> m_sdpMLineIndex;
</del><ins>+ std::optional<unsigned short> m_sdpMLineIndex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamSDPProcessorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -327,15 +327,15 @@
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<IceCandidate> iceCandidateFromJSON(const String& json)
</del><ins>+static std::optional<IceCandidate> iceCandidateFromJSON(const String& json)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> value;
</span><span class="cx"> if (!InspectorValue::parseJSON(json, value))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> candidateObject;
</span><span class="cx"> if (!value->asObject(candidateObject))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return createCandidate(*candidateObject);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesproximityDeviceProximityEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/proximity/DeviceProximityEvent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/proximity/DeviceProximityEvent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/proximity/DeviceProximityEvent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct Init : EventInit {
</span><del>- Optional<double> value;
- Optional<double> min;
- Optional<double> max;
</del><ins>+ std::optional<double> value;
+ std::optional<double> min;
+ std::optional<double> max;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<DeviceProximityEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> virtual void doCancel() = 0;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<DOMPromise<void>> m_promise;
- Optional<ReadableStreamDefaultController> m_controller;
</del><ins>+ std::optional<DOMPromise<void>> m_promise;
+ std::optional<ReadableStreamDefaultController> m_controller;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void ReadableStreamSource::start(ReadableStreamDefaultController&& controller, DOMPromise<void>&& promise)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> inline void ReadableStreamSource::startFinished()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_promise);
</span><del>- std::exchange(m_promise, Nullopt).value().resolve();
</del><ins>+ std::exchange(m_promise, std::nullopt).value().resolve();
</ins><span class="cx"> setInactive();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> inline void ReadableStreamSource::pullFinished()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_promise);
</span><del>- std::exchange(m_promise, Nullopt).value().resolve();
</del><ins>+ std::exchange(m_promise, std::nullopt).value().resolve();
</ins><span class="cx"> setInactive();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> inline void ReadableStreamSource::clean()
</span><span class="cx"> {
</span><span class="cx"> if (m_promise) {
</span><del>- m_promise = Nullopt;
</del><ins>+ m_promise = std::nullopt;
</ins><span class="cx"> setInactive();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> return output(0)->numberOfChannels();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> AudioBufferSourceNode::start(double when, double grainOffset, Optional<double> optionalGrainDuration)
</del><ins>+ExceptionOr<void> AudioBufferSourceNode::start(double when, double grainOffset, std::optional<double> optionalGrainDuration)
</ins><span class="cx"> {
</span><span class="cx"> double grainDuration = 0;
</span><span class="cx"> if (optionalGrainDuration)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> unsigned numberOfChannels();
</span><span class="cx">
</span><span class="cx"> // Play-state
</span><del>- ExceptionOr<void> start(double when, double grainOffset, Optional<double> grainDuration);
</del><ins>+ ExceptionOr<void> start(double when, double grainOffset, std::optional<double> grainDuration);
</ins><span class="cx">
</span><span class="cx"> // Note: the attribute was originally exposed as .looping, but to be more consistent in naming with <audio>
</span><span class="cx"> // and with how it's described in the specification, the proper attribute name is .loop
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> SQLResultSet();
</span><span class="cx">
</span><span class="cx"> Ref<SQLResultSetRowList> m_rows;
</span><del>- Optional<int64_t> m_insertId;
</del><ins>+ std::optional<int64_t> m_insertId;
</ins><span class="cx"> int m_rowsAffected { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> WebSocket::close(Optional<unsigned short> optionalCode, const String& reason)
</del><ins>+ExceptionOr<void> WebSocket::close(std::optional<unsigned short> optionalCode, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> int code = optionalCode ? optionalCode.value() : static_cast<int>(WebSocketChannel::CloseEventCodeNotSpecified);
</span><span class="cx"> if (code == WebSocketChannel::CloseEventCodeNotSpecified)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> ExceptionOr<void> send(JSC::ArrayBufferView&);
</span><span class="cx"> ExceptionOr<void> send(Blob&);
</span><span class="cx">
</span><del>- ExceptionOr<void> close(Optional<unsigned short> code, const String& reason);
</del><ins>+ ExceptionOr<void> close(std::optional<unsigned short> code, const String& reason);
</ins><span class="cx">
</span><span class="cx"> const URL& url() const;
</span><span class="cx"> State readyState() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, Optional<size_t> len)
</del><ins>+void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, std::optional<size_t> len)
</ins><span class="cx"> {
</span><span class="cx"> if (len)
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %zu bytes", this, len.value());
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> // SocketStreamHandleClient functions.
</span><span class="cx"> void didOpenSocketStream(SocketStreamHandle&) final;
</span><span class="cx"> void didCloseSocketStream(SocketStreamHandle&) final;
</span><del>- void didReceiveSocketStreamData(SocketStreamHandle&, const char*, Optional<size_t>) final;
</del><ins>+ void didReceiveSocketStreamData(SocketStreamHandle&, const char*, std::optional<size_t>) final;
</ins><span class="cx"> void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) final;
</span><span class="cx"> void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericIDLTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/IDLTypes.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> struct IDLType {
</span><span class="cx"> using ImplementationType = T;
</span><span class="cx">
</span><del>- using NullableType = Optional<ImplementationType>;
- static NullableType nullValue() { return Nullopt; }
</del><ins>+ using NullableType = std::optional<ImplementationType>;
+ static NullableType nullValue() { return std::nullopt; }
</ins><span class="cx"> static bool isNullValue(const NullableType& value) { return !value; }
</span><span class="cx"> static ImplementationType extractValueFromNullable(const NullableType& value) { return value.value(); }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsCachedModuleScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/CachedModuleScript.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/CachedModuleScript.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/CachedModuleScript.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void notifyLoadFailed(LoadableScript::Error&&);
</span><span class="cx"> void notifyLoadWasCanceled();
</span><span class="cx">
</span><del>- const Optional<LoadableScript::Error>& error() const { return m_error; }
</del><ins>+ const std::optional<LoadableScript::Error>& error() const { return m_error; }
</ins><span class="cx"> bool wasCanceled() const { return m_wasCanceled; }
</span><span class="cx"> bool isLoaded() const { return m_isLoaded; }
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> HashCountedSet<CachedModuleScriptClient*> m_clients;
</span><span class="cx"> String m_nonce;
</span><span class="cx"> String m_crossOriginMode;
</span><del>- Optional<LoadableScript::Error> m_error;
</del><ins>+ std::optional<LoadableScript::Error> m_error;
</ins><span class="cx"> bool m_wasCanceled { false };
</span><span class="cx"> bool m_isLoaded { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/Dictionary.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/Dictionary.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/Dictionary.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> template<typename Result> bool get(const char* propertyName, Result&) const;
</span><span class="cx"> template<typename Result> bool get(const String& propertyName, Result&) const;
</span><span class="cx">
</span><del>- template<typename Result> Optional<Result> get(const char* propertyName) const;
</del><ins>+ template<typename Result> std::optional<Result> get(const char* propertyName) const;
</ins><span class="cx">
</span><span class="cx"> template<typename T> RefPtr<EventListener> getEventListener(const char* propertyName, T* target) const;
</span><span class="cx"> template<typename T> RefPtr<EventListener> getEventListener(const String& propertyName, T* target) const;
</span><span class="lines">@@ -79,11 +79,11 @@
</span><span class="cx"> return get(propertyName.utf8().data(), result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename Result> Optional<Result> Dictionary::get(const char* propertyName) const
</del><ins>+template<typename Result> std::optional<Result> Dictionary::get(const char* propertyName) const
</ins><span class="cx"> {
</span><span class="cx"> Result result;
</span><span class="cx"> if (!get(propertyName, result))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> outKey = IndexKey(WTFMove(keyDatas));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue toJS(ExecState& state, JSDOMGlobalObject& globalObject, const Optional<IDBKeyPath>& keyPath)
</del><ins>+JSValue toJS(ExecState& state, JSDOMGlobalObject& globalObject, const std::optional<IDBKeyPath>& keyPath)
</ins><span class="cx"> {
</span><span class="cx"> if (!keyPath)
</span><span class="cx"> return jsNull();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> class ThreadSafeDataBuffer;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this once we support returning union types.
</span><del>-JSC::JSValue toJS(JSC::ExecState&, JSDOMGlobalObject&, const Optional<IDBKeyPath>&);
</del><ins>+JSC::JSValue toJS(JSC::ExecState&, JSDOMGlobalObject&, const std::optional<IDBKeyPath>&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<IDBKey> maybeCreateIDBKeyFromScriptValueAndKeyPath(JSC::ExecState&, const JSC::JSValue&, const IDBKeyPath&);
</span><span class="cx"> bool canInjectIDBKeyIntoScriptValue(JSC::ExecState&, const JSC::JSValue&, const IDBKeyPath&);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> return WTFMove(rsaKeyParameters);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(CryptoAlgorithm* suggestedAlgorithm, CryptoAlgorithmParametersDeprecated* suggestedParameters) const
</del><ins>+std::optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(CryptoAlgorithm* suggestedAlgorithm, CryptoAlgorithmParametersDeprecated* suggestedParameters) const
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = m_exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
</span><span class="cx"> } else {
</span><span class="cx"> throwTypeError(m_exec, scope, "Unsupported JWK algorithm " + m_jwkAlgorithmName);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!suggestedAlgorithm)
</span><span class="lines">@@ -244,11 +244,11 @@
</span><span class="cx"> return CryptoAlgorithmPair { suggestedAlgorithm, suggestedParameters };
</span><span class="cx">
</span><span class="cx"> if (algorithm->identifier() != suggestedAlgorithm->identifier())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (algorithm->identifier() == CryptoAlgorithmIdentifier::HMAC) {
</span><span class="cx"> if (downcast<CryptoAlgorithmHmacParamsDeprecated>(*parameters).hash != downcast<CryptoAlgorithmHmacParamsDeprecated>(*suggestedParameters).hash)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return CryptoAlgorithmPair { suggestedAlgorithm, suggestedParameters };
</span><span class="cx"> }
</span><span class="cx"> if (algorithm->identifier() == CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> ASSERT(rsaKeyParameters.hasHash);
</span><span class="cx"> if (suggestedRSAKeyParameters.hasHash) {
</span><span class="cx"> if (suggestedRSAKeyParameters.hash != rsaKeyParameters.hash)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return CryptoAlgorithmPair { suggestedAlgorithm, suggestedParameters };
</span><span class="cx"> }
</span><span class="cx"> suggestedRSAKeyParameters.hasHash = true;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> static String serialize(JSC::ExecState* exec, const CryptoKey&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
</del><ins>+ std::optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
</ins><span class="cx">
</span><span class="cx"> void reconcileUsages(CryptoKeyUsageBitmap&) const override;
</span><span class="cx"> void reconcileExtractable(bool&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> template<typename T> T convertDictionary(JSC::ExecState&, JSC::JSValue);
</span><span class="cx">
</span><span class="cx"> // Specialized by generated code for IDL enumeration conversion.
</span><del>-template<typename T> Optional<T> parseEnumeration(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<typename T> std::optional<T> parseEnumeration(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<typename T> T convertEnumeration(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<typename T> const char* expectedEnumerationValues();
</span><span class="cx">
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType, typename T>
</span><span class="cx"> struct ConditionalConverter<ReturnType, T, true> {
</span><del>- static Optional<ReturnType> convert(JSC::ExecState& state, JSC::JSValue value)
</del><ins>+ static std::optional<ReturnType> convert(JSC::ExecState& state, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> return ReturnType(Converter<T>::convert(state, value));
</span><span class="cx"> }
</span><span class="lines">@@ -1034,9 +1034,9 @@
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType, typename T>
</span><span class="cx"> struct ConditionalConverter<ReturnType, T, false> {
</span><del>- static Optional<ReturnType> convert(JSC::ExecState&, JSC::JSValue)
</del><ins>+ static std::optional<ReturnType> convert(JSC::ExecState&, JSC::JSValue)
</ins><span class="cx"> {
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> // 2. If types includes object, then return the IDL value that is a reference to the object V.
</span><span class="cx"> // (FIXME: Add support for object and step 4.2)
</span><span class="cx"> if (brigand::any<TypeList, IsIDLInterface<brigand::_1>>::value) {
</span><del>- Optional<ReturnType> returnValue;
</del><ins>+ std::optional<ReturnType> returnValue;
</ins><span class="cx"> brigand::for_each<InterfaceTypeList>([&](auto&& type) {
</span><span class="cx"> if (returnValue)
</span><span class="cx"> return;
</span><span class="lines">@@ -1257,7 +1257,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto index = variant.index();
</span><span class="cx">
</span><del>- Optional<JSC::JSValue> returnValue;
</del><ins>+ std::optional<JSC::JSValue> returnValue;
</ins><span class="cx"> brigand::for_each<Sequence>([&](auto&& type) {
</span><span class="cx"> using I = typename WTF::RemoveCVAndReference<decltype(type)>::type::type;
</span><span class="cx"> if (I::value == index) {
</span><span class="lines">@@ -1302,13 +1302,13 @@
</span><span class="cx"> struct VariadicConverterBase {
</span><span class="cx"> using Item = typename IDLType::ImplementationType;
</span><span class="cx">
</span><del>- static Optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
</del><ins>+ static std::optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto& vm = state.vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> auto result = Converter<IDLType>::convert(state, value);
</span><del>- RETURN_IF_EXCEPTION(scope, Nullopt);
</del><ins>+ RETURN_IF_EXCEPTION(scope, std::nullopt);
</ins><span class="cx">
</span><span class="cx"> return WTFMove(result);
</span><span class="cx"> }
</span><span class="lines">@@ -1318,12 +1318,12 @@
</span><span class="cx"> struct VariadicConverterBase<IDLInterface<T>> {
</span><span class="cx"> using Item = std::reference_wrapper<T>;
</span><span class="cx">
</span><del>- static Optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
</del><ins>+ static std::optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto* result = Converter<IDLInterface<T>>::convert(state, value);
</span><span class="cx"> if (!result)
</span><del>- return Nullopt;
- return Optional<Item>(*result);
</del><ins>+ return std::nullopt;
+ return std::optional<Item>(*result);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1334,7 +1334,7 @@
</span><span class="cx">
</span><span class="cx"> struct Result {
</span><span class="cx"> size_t argumentIndex;
</span><del>- Optional<Container> arguments;
</del><ins>+ std::optional<Container> arguments;
</ins><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx"> {
</span><span class="cx"> size_t length = state.argumentCount();
</span><span class="cx"> if (startIndex > length)
</span><del>- return { 0, Nullopt };
</del><ins>+ return { 0, std::nullopt };
</ins><span class="cx">
</span><span class="cx"> typename Detail::VariadicConverter<IDLType>::Container result;
</span><span class="cx"> result.reserveInitialCapacity(length - startIndex);
</span><span class="lines">@@ -1351,7 +1351,7 @@
</span><span class="cx"> for (size_t i = startIndex; i < length; ++i) {
</span><span class="cx"> auto value = Detail::VariadicConverter<IDLType>::convert(state, state.uncheckedArgument(i));
</span><span class="cx"> if (!value)
</span><del>- return { i, Nullopt };
</del><ins>+ return { i, std::nullopt };
</ins><span class="cx"> result.uncheckedAppend(WTFMove(*value));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><del>- Optional<typename DOMWrapped::Iterator> m_iterator;
</del><ins>+ std::optional<typename DOMWrapped::Iterator> m_iterator;
</ins><span class="cx"> IterationKind m_kind;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> auto iteratorValue = m_iterator->next();
</span><span class="cx"> if (iteratorValue)
</span><span class="cx"> return createIteratorResultObject(&state, asJS(state, iteratorValue), false);
</span><del>- m_iterator = Nullopt;
</del><ins>+ m_iterator = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> return createIteratorResultObject(&state, JSC::jsUndefined(), true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -206,12 +206,21 @@
</span><span class="cx"> template<typename Value> class DOMPromise {
</span><span class="cx"> public:
</span><span class="cx"> DOMPromise(Ref<DeferredPromise>&& genericPromise) : m_promiseDeferred(WTFMove(genericPromise)) { }
</span><del>-
</del><span class="cx"> DOMPromise(DOMPromise&& promise) : m_promiseDeferred(WTFMove(promise.m_promiseDeferred)) { }
</span><ins>+ DOMPromise(const DOMPromise& other) : m_promiseDeferred(other.m_promiseDeferred.copyRef()) { }
</ins><span class="cx">
</span><del>- DOMPromise(const DOMPromise&) = default;
- DOMPromise& operator=(DOMPromise const&) = default;
</del><ins>+ DOMPromise& operator=(const DOMPromise& other)
+ {
+ m_promiseDeferred = other.copyRef();
+ return *this;
+ }
</ins><span class="cx">
</span><ins>+ DOMPromise& operator=(DOMPromise&& other)
+ {
+ m_promiseDeferred = WTFMove(other.m_promiseDeferred);
+ return *this;
+ }
+
</ins><span class="cx"> template<typename T = Value>
</span><span class="cx"> typename std::enable_if<!std::is_void<T>::value, void>::type resolve(typename PromiseResultInspector<Value>::Type value) { m_promiseDeferred->resolve(value); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><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><del>- if (Optional<unsigned> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<unsigned> index = parseIndex(propertyName))
</ins><span class="cx"> return getOwnPropertySlotByIndex(object, state, index.value(), slot);
</span><span class="cx">
</span><span class="cx"> auto* thisObject = jsCast<JSDOMWindow*>(object);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -105,10 +105,10 @@
</span><span class="cx"> GetPropertyResult tryGetProperty(const char* propertyName, JSC::JSValue&) const;
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>- static void convertValue(JSC::ExecState* execState, JSC::JSValue value, Optional<T>& result)
</del><ins>+ static void convertValue(JSC::ExecState* execState, JSC::JSValue value, std::optional<T>& result)
</ins><span class="cx"> {
</span><span class="cx"> if (value.isUndefinedOrNull()) {
</span><del>- result = Nullopt;
</del><ins>+ result = std::nullopt;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFileCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFileCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFileCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSFileCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><span class="cx"> String normalizedType;
</span><del>- Optional<int64_t> lastModified;
</del><ins>+ std::optional<int64_t> lastModified;
</ins><span class="cx">
</span><span class="cx"> arg = exec.argument(2);
</span><span class="cx"> if (!arg.isUndefinedOrNull()) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // Support for document.all(<index>) etc.
</span><span class="cx"> String string = exec->argument(0).toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- if (Optional<uint32_t> index = parseIndex(*string.impl()))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(*string.impl()))
</ins><span class="cx"> return JSValue::encode(toJS(exec, jsCollection->globalObject(), collection.item(index.value())));
</span><span class="cx">
</span><span class="cx"> // Support for document.images('<name>') etc.
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> // The second arg, if set, is the index of the item we want
</span><span class="cx"> String string = exec->argument(0).toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- if (Optional<uint32_t> index = parseIndex(*exec->argument(1).toWTFString(exec).impl())) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(*exec->argument(1).toWTFString(exec).impl())) {
</ins><span class="cx"> if (auto* item = collection.namedItemWithIndex(string, index.value()))
</span><span class="cx"> return JSValue::encode(toJS(exec, jsCollection->globalObject(), *item));
</span><span class="cx"> }
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> String argument = state.uncheckedArgument(0).toWTFString(&state);
</span><del>- if (Optional<uint32_t> index = parseIndex(*argument.impl()))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(*argument.impl()))
</ins><span class="cx"> return toJS(&state, globalObject(), wrapped().item(index.value()));
</span><span class="cx"> return namedItems(state, this, Identifier::fromString(&state, argument));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> auto type = convert<IDLNullable<IDLDOMString>>(state, state.argument(0));
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSC::JSValue());
</span><span class="cx">
</span><del>- Optional<double> quality;
</del><ins>+ std::optional<double> quality;
</ins><span class="cx"> auto qualityValue = state.argument(1);
</span><span class="cx"> if (qualityValue.isNumber())
</span><span class="cx"> quality = qualityValue.toNumber(&state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSImageConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> // added to the window object. This is done to ensure that JSDocument::visit
</span><span class="cx"> // will be called, which will cause the image element to be marked if necessary.
</span><span class="cx"> toJS(state, jsConstructor->globalObject(), *document);
</span><del>- Optional<unsigned> width;
- Optional<unsigned> height;
</del><ins>+ std::optional<unsigned> width;
+ std::optional<unsigned> height;
</ins><span class="cx"> if (state->argumentCount() > 0) {
</span><span class="cx"> width = state->uncheckedArgument(0).toUInt32(state);
</span><span class="cx"> if (state->argumentCount() > 1)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<StringConstraint> createStringConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</del><ins>+static std::optional<StringConstraint> createStringConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</ins><span class="cx"> {
</span><span class="cx"> auto constraint = StringConstraint(name, type);
</span><span class="cx">
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> if (constraint.isEmpty()) {
</span><span class="cx"> LOG(Media, "createStringConstraint() - ignoring string constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return WTFMove(constraint);
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> if (constraint.isEmpty()) {
</span><span class="cx"> LOG(Media, "createStringConstraint() - ignoring string constraint '%s' with array value since it is empty.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return WTFMove(constraint);
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx">
</span><span class="cx"> // Invalid constraint value.
</span><span class="cx"> LOG(Media, "createStringConstraint() - ignoring string constraint '%s' since it has neither a dictionary nor sequence nor scalar value.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<BooleanConstraint> createBooleanConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</del><ins>+static std::optional<BooleanConstraint> createBooleanConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</ins><span class="cx"> {
</span><span class="cx"> auto constraint = BooleanConstraint(name, type);
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> if (constraint.isEmpty()) {
</span><span class="cx"> LOG(Media, "createBooleanConstraint() - ignoring boolean constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return WTFMove(constraint);
</span><span class="lines">@@ -156,10 +156,10 @@
</span><span class="cx">
</span><span class="cx"> // Invalid constraint value.
</span><span class="cx"> LOG(Media, "createBooleanConstraint() - ignoring boolean constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<DoubleConstraint> createDoubleConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</del><ins>+static std::optional<DoubleConstraint> createDoubleConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</ins><span class="cx"> {
</span><span class="cx"> auto constraint = DoubleConstraint(name, type);
</span><span class="cx">
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> if (constraint.isEmpty()) {
</span><span class="cx"> LOG(Media, "createDoubleConstraint() - ignoring double constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return WTFMove(constraint);
</span><span class="lines">@@ -203,10 +203,10 @@
</span><span class="cx">
</span><span class="cx"> // Invalid constraint value.
</span><span class="cx"> LOG(Media, "createDoubleConstraint() - ignoring double constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<IntConstraint> createIntConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</del><ins>+static std::optional<IntConstraint> createIntConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
</ins><span class="cx"> {
</span><span class="cx"> auto constraint = IntConstraint(name, type);
</span><span class="cx">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> if (constraint.isEmpty()) {
</span><span class="cx"> LOG(Media, "createIntConstraint() - ignoring long constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return WTFMove(constraint);
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx">
</span><span class="cx"> // Invalid constraint value.
</span><span class="cx"> LOG(Media, "createIntConstraint() - ignoring long constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void parseMediaTrackConstraintSetForKey(const Dictionary& mediaTrackConstraintSet, const String& name, MediaTrackConstraintSetMap& map, ConstraintSetType constraintSetType)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(keySerialization);
</span><span class="cx">
</span><del>- Optional<CryptoAlgorithmPair> reconciledResult = keySerialization->reconcileAlgorithm(algorithm.get(), parameters.get());
</del><ins>+ std::optional<CryptoAlgorithmPair> reconciledResult = keySerialization->reconcileAlgorithm(algorithm.get(), parameters.get());
</ins><span class="cx"> if (!reconciledResult) {
</span><span class="cx"> if (!scope.exception())
</span><span class="cx"> throwTypeError(&state, scope, ASCIILiteral("Algorithm specified in key is not compatible with one passed to importKey as argument"));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> if (symbol->privateName() == moduleLoaderAlreadyReportedErrorSymbol) {
</span><span class="cx"> moduleScript->notifyLoadFailed(LoadableScript::Error {
</span><span class="cx"> LoadableScript::ErrorType::CachedScript,
</span><del>- Nullopt
</del><ins>+ std::nullopt
</ins><span class="cx"> });
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue ScriptController::executeScriptInWorld(DOMWrapperWorld& world, const String& script, bool forceUserGesture)
</span><span class="cx"> {
</span><del>- UserGestureIndicator gestureIndicator(forceUserGesture ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(forceUserGesture ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx"> ScriptSourceCode sourceCode(script, m_frame.document()->url());
</span><span class="cx">
</span><span class="cx"> if (!canExecuteScripts(AboutToExecuteScript) || isPaused())
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue ScriptController::executeScript(const String& script, bool forceUserGesture, ExceptionDetails* exceptionDetails)
</span><span class="cx"> {
</span><del>- UserGestureIndicator gestureIndicator(forceUserGesture ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(forceUserGesture ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx"> return executeScript(ScriptSourceCode(script, m_frame.document()->url()), exceptionDetails);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if ($indexedGetterFunction) {
</span><del>- push(@getOwnPropertySlotImpl, " Optional<uint32_t> optionalIndex = parseIndex(propertyName);\n");
</del><ins>+ push(@getOwnPropertySlotImpl, " std::optional<uint32_t> optionalIndex = parseIndex(propertyName);\n");
</ins><span class="cx">
</span><span class="cx"> # If the item function returns a string then we let the TreatReturnedNullStringAs handle the cases
</span><span class="cx"> # where the index is out of range.
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> # FIXME: Change to take VM& instead of ExecState&.
</span><span class="cx"> # FIXME: Consider using toStringOrNull to make exception checking faster.
</span><span class="cx"> # FIXME: Consider finding a more efficient way to match against all the strings quickly.
</span><del>- $result .= "template<> Optional<$className> parseEnumeration<$className>(ExecState& state, JSValue value)\n";
</del><ins>+ $result .= "template<> std::optional<$className> parseEnumeration<$className>(ExecState& state, JSValue value)\n";
</ins><span class="cx"> $result .= "{\n";
</span><span class="cx"> $result .= " auto stringValue = value.toWTFString(&state);\n";
</span><span class="cx"> foreach my $value (@{$enumeration->values}) {
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx"> }
</span><span class="cx"> $result .= " return ${className}::${enumerationValueName};\n";
</span><span class="cx"> }
</span><del>- $result .= " return Nullopt;\n";
</del><ins>+ $result .= " return std::nullopt;\n";
</ins><span class="cx"> $result .= "}\n\n";
</span><span class="cx">
</span><span class="cx"> $result .= "template<> $className convertEnumeration<$className>(ExecState& state, JSValue value)\n";
</span><span class="lines">@@ -1063,7 +1063,7 @@
</span><span class="cx"> my $result = "";
</span><span class="cx"> $result .= "#if ${conditionalString}\n\n" if $conditionalString;
</span><span class="cx"> $result .= "template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, $className);\n\n";
</span><del>- $result .= "template<> Optional<$className> parseEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
</del><ins>+ $result .= "template<> std::optional<$className> parseEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
</ins><span class="cx"> $result .= "template<> $className convertEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
</span><span class="cx"> $result .= "template<> const char* expectedEnumerationValues<$className>();\n\n";
</span><span class="cx"> $result .= "#endif\n\n" if $conditionalString;
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ($defaultValue eq "null") {
</span><span class="cx"> if ($type->isUnion) {
</span><del>- return "Nullopt" if $type->isNullable;
</del><ins>+ return "std::nullopt" if $type->isNullable;
</ins><span class="cx">
</span><span class="cx"> my $IDLType = GetIDLType($interface, $type);
</span><span class="cx"> return "convert<${IDLType}>(state, jsNull());";
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx"> return "jsNull()" if $type->name eq "any";
</span><span class="cx"> return "nullptr" if $codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return "String()" if $codeGenerator->IsStringType($type);
</span><del>- return "Nullopt";
</del><ins>+ return "std::nullopt";
</ins><span class="cx"> }
</span><span class="cx"> if ($defaultValue eq "[]") {
</span><span class="cx"> my $nativeType = GetNativeType($interface, $type);
</span><span class="lines">@@ -3423,7 +3423,7 @@
</span><span class="cx"> push(@implContent, " auto* thisObject = jsCast<${className}*>(cell);\n");
</span><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx"> if ($interface->extendedAttributes->{CustomIndexedSetter}) {
</span><del>- push(@implContent, " if (Optional<uint32_t> index = parseIndex(propertyName)) {\n");
</del><ins>+ push(@implContent, " if (std::optional<uint32_t> index = parseIndex(propertyName)) {\n");
</ins><span class="cx"> push(@implContent, " thisObject->indexSetter(state, index.value(), value);\n");
</span><span class="cx"> push(@implContent, " return true;\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="lines">@@ -4418,7 +4418,7 @@
</span><span class="cx"> my $argumentLookupMethod = $argument->isOptional ? "argument" : "uncheckedArgument";
</span><span class="cx">
</span><span class="cx"> if ($argument->isOptional && !defined($argument->default)) {
</span><del>- $nativeType = "Optional<$className>";
</del><ins>+ $nativeType = "std::optional<$className>";
</ins><span class="cx"> $optionalValue = $name;
</span><span class="cx"> $defineOptionalValue = $name;
</span><span class="cx"> }
</span><span class="lines">@@ -4473,8 +4473,8 @@
</span><span class="cx"> $outer = "state->$argumentLookupMethod($argumentIndex).isUndefined() ? $defaultValue : ";
</span><span class="cx"> $inner = "state->uncheckedArgument($argumentIndex)";
</span><span class="cx"> } elsif ($argument->isOptional && !defined($argument->default)) {
</span><del>- # Use WTF::Optional<>() for optional arguments that are missing or undefined and that do not have a default value in the IDL.
- $outer = "state->$argumentLookupMethod($argumentIndex).isUndefined() ? Optional<$nativeType>() : ";
</del><ins>+ # Use std::optional<>() for optional arguments that are missing or undefined and that do not have a default value in the IDL.
+ $outer = "state->$argumentLookupMethod($argumentIndex).isUndefined() ? std::optional<$nativeType>() : ";
</ins><span class="cx"> $inner = "state->uncheckedArgument($argumentIndex)";
</span><span class="cx"> } elsif (($argument->type->name eq "EventListener" || $argument->type->name eq "XPathNSResolver") && ($argument->isOptional || $type->isNullable)) {
</span><span class="cx"> $outer = "";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSFloat64Arraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSFloat64Array* thisObject = jsCast<JSFloat64Array*>(object);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < static_cast<Float64Array*>(thisObject->impl())->length()) {
</span><span class="cx"> slot.setValue(thisObject, thisObject->getByIndex(exec, index.value()));
</span><span class="cx"> return true;
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSFloat64Array* thisObject = jsCast<JSFloat64Array*>(object);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < static_cast<Float64Array*>(thisObject->impl())->length()) {
</span><span class="cx"> descriptor.setDescriptor(thisObject->getByIndex(exec, index.value()), DontDelete);
</span><span class="cx"> return true;
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSFloat64Array* thisObject = jsCast<JSFloat64Array*>(cell);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName)) {
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
</ins><span class="cx"> thisObject->indexSetter(exec, index.value(), value);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto* thisObject = jsCast<JSTestEventTarget*>(object);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><del>- Optional<uint32_t> optionalIndex = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> optionalIndex = parseIndex(propertyName);
</ins><span class="cx"> if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {
</span><span class="cx"> unsigned index = optionalIndex.value();
</span><span class="cx"> unsigned attributes = ReadOnly;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumType> parseEnumeration<TestObj::EnumType>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::EnumType> parseEnumeration<TestObj::EnumType>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue.isEmpty())
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> return TestObj::EnumType::EnumValue2;
</span><span class="cx"> if (stringValue == "EnumValue3")
</span><span class="cx"> return TestObj::EnumType::EnumValue3;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::EnumType convertEnumeration<TestObj::EnumType>(ExecState& state, JSValue value)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Optional> parseEnumeration<TestObj::Optional>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::Optional> parseEnumeration<TestObj::Optional>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue.isEmpty())
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> return TestObj::Optional::OptionalValue2;
</span><span class="cx"> if (stringValue == "OptionalValue3")
</span><span class="cx"> return TestObj::Optional::OptionalValue3;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::Optional convertEnumeration<TestObj::Optional>(ExecState& state, JSValue value)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<AlternateEnumName> parseEnumeration<AlternateEnumName>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<AlternateEnumName> parseEnumeration<AlternateEnumName>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "enumValue1")
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> return AlternateEnumName::EnumValue1;
</span><span class="cx"> if (stringValue == "EnumValue2")
</span><span class="cx"> return AlternateEnumName::EnumValue2;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> AlternateEnumName convertEnumeration<AlternateEnumName>(ExecState& state, JSValue value)
</span><span class="lines">@@ -234,12 +234,12 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumA> parseEnumeration<TestObj::EnumA>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::EnumA> parseEnumeration<TestObj::EnumA>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "A")
</span><span class="cx"> return TestObj::EnumA::A;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::EnumA convertEnumeration<TestObj::EnumA>(ExecState& state, JSValue value)
</span><span class="lines">@@ -273,12 +273,12 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumB> parseEnumeration<TestObj::EnumB>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::EnumB> parseEnumeration<TestObj::EnumB>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "B")
</span><span class="cx"> return TestObj::EnumB::B;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::EnumB convertEnumeration<TestObj::EnumB>(ExecState& state, JSValue value)
</span><span class="lines">@@ -312,12 +312,12 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumC> parseEnumeration<TestObj::EnumC>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::EnumC> parseEnumeration<TestObj::EnumC>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "C")
</span><span class="cx"> return TestObj::EnumC::C;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::EnumC convertEnumeration<TestObj::EnumC>(ExecState& state, JSValue value)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Kind> parseEnumeration<TestObj::Kind>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::Kind> parseEnumeration<TestObj::Kind>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "quick")
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> return TestObj::Kind::Quick;
</span><span class="cx"> if (stringValue == "dead")
</span><span class="cx"> return TestObj::Kind::Dead;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::Kind convertEnumeration<TestObj::Kind>(ExecState& state, JSValue value)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Size> parseEnumeration<TestObj::Size>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::Size> parseEnumeration<TestObj::Size>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "small")
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> return TestObj::Size::Small;
</span><span class="cx"> if (stringValue == "much-much-larger")
</span><span class="cx"> return TestObj::Size::MuchMuchLarger;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::Size convertEnumeration<TestObj::Size>(ExecState& state, JSValue value)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Confidence> parseEnumeration<TestObj::Confidence>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestObj::Confidence> parseEnumeration<TestObj::Confidence>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "high")
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> return TestObj::Confidence::High;
</span><span class="cx"> if (stringValue == "kinda-low")
</span><span class="cx"> return TestObj::Confidence::KindaLow;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::Confidence convertEnumeration<TestObj::Confidence>(ExecState& state, JSValue value)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> result.nullableIntegerWithDefault = convert<IDLNullable<IDLLong>>(state, nullableIntegerWithDefaultValue);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, { });
</span><span class="cx"> } else
</span><del>- result.nullableIntegerWithDefault = Nullopt;
</del><ins>+ result.nullableIntegerWithDefault = std::nullopt;
</ins><span class="cx"> JSValue nullableNodeValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "nullableNode"));
</span><span class="cx"> if (!nullableNodeValue.isUndefined()) {
</span><span class="cx"> result.nullableNode = convert<IDLNullable<IDLInterface<Node>>>(state, nullableNodeValue);
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> result.nullableUnionMember = convert<IDLNullable<IDLUnion<IDLLong, IDLInterface<Node>>>>(state, nullableUnionMemberValue);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, { });
</span><span class="cx"> } else
</span><del>- result.nullableUnionMember = Nullopt;
</del><ins>+ result.nullableUnionMember = std::nullopt;
</ins><span class="cx"> JSValue restrictedDoubleValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "restrictedDouble"));
</span><span class="cx"> if (!restrictedDoubleValue.isUndefined()) {
</span><span class="cx"> result.restrictedDouble = convert<IDLDouble>(state, restrictedDoubleValue);
</span><span class="lines">@@ -1816,7 +1816,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto* thisObject = jsCast<JSTestObj*>(object);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><del>- Optional<uint32_t> optionalIndex = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> optionalIndex = parseIndex(propertyName);
</ins><span class="cx"> if (optionalIndex) {
</span><span class="cx"> unsigned index = optionalIndex.value();
</span><span class="cx"> unsigned attributes = ReadOnly;
</span><span class="lines">@@ -5369,7 +5369,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto enumArgValue = state->argument(0);
</span><del>- Optional<TestObj::EnumType> enumArg;
</del><ins>+ std::optional<TestObj::EnumType> enumArg;
</ins><span class="cx"> if (!enumArgValue.isUndefined()) {
</span><span class="cx"> enumArg = parseEnumeration<TestObj::EnumType>(*state, enumArgValue);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="lines">@@ -5991,7 +5991,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto opt = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</del><ins>+ auto opt = state->argument(0).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalArg(WTFMove(opt));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6031,7 +6031,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonOpt = convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto opt = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</del><ins>+ auto opt = state->argument(1).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithNonOptionalArgAndOptionalArg(WTFMove(nonOpt), WTFMove(opt));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6053,9 +6053,9 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonOpt = convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto opt1 = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</del><ins>+ auto opt1 = state->argument(1).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto opt2 = state->argument(2).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(2), IntegerConversionConfiguration::Normal);
</del><ins>+ auto opt2 = state->argument(2).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(2), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithNonOptionalArgAndTwoOptionalArgs(WTFMove(nonOpt), WTFMove(opt1), WTFMove(opt2));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6307,7 +6307,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto number = state->argument(0).isUndefined() ? Optional<int64_t>() : convert<IDLLongLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</del><ins>+ auto number = state->argument(0).isUndefined() ? std::optional<int64_t>() : convert<IDLLongLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalLongLong(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6343,7 +6343,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto number = state->argument(0).isUndefined() ? Optional<uint64_t>() : convert<IDLUnsignedLongLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</del><ins>+ auto number = state->argument(0).isUndefined() ? std::optional<uint64_t>() : convert<IDLUnsignedLongLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalUnsignedLongLong(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6379,7 +6379,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto array = state->argument(0).isUndefined() ? Optional<Vector<String>>() : convert<IDLSequence<IDLDOMString>>(*state, state->uncheckedArgument(0));
</del><ins>+ auto array = state->argument(0).isUndefined() ? std::optional<Vector<String>>() : convert<IDLSequence<IDLDOMString>>(*state, state->uncheckedArgument(0));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalSequence(WTFMove(array));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6415,7 +6415,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto b = state->argument(0).isUndefined() ? Optional<bool>() : convert<IDLBoolean>(*state, state->uncheckedArgument(0));
</del><ins>+ auto b = state->argument(0).isUndefined() ? std::optional<bool>() : convert<IDLBoolean>(*state, state->uncheckedArgument(0));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalBoolean(WTFMove(b));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6528,7 +6528,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto record = state->argument(0).isUndefined() ? Nullopt : convert<IDLNullable<IDLRecord<IDLDOMString, IDLLong>>>(*state, state->uncheckedArgument(0));
</del><ins>+ auto record = state->argument(0).isUndefined() ? std::nullopt : convert<IDLNullable<IDLRecord<IDLDOMString, IDLLong>>>(*state, state->uncheckedArgument(0));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.methodWithOptionalRecord(WTFMove(record));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6789,7 +6789,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto objArg = convert<IDLNullable<IDLInterface<TestObj>>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "objArg", "TestObject", "overloadedMethod", "TestObj"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto longArg = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</del><ins>+ auto longArg = state->argument(1).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.overloadedMethod(WTFMove(objArg), WTFMove(longArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7098,7 +7098,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto objArg = convert<IDLNullable<IDLInterface<TestObj>>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "objArg", "TestObject", "overloadedMethodWithOptionalParameter", "TestObj"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto longArg = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</del><ins>+ auto longArg = state->argument(1).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.overloadedMethodWithOptionalParameter(WTFMove(objArg), WTFMove(longArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7505,7 +7505,7 @@
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><del>- auto arg = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</del><ins>+ auto arg = state->argument(0).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> return JSValue::encode(toJS<IDLLong>(TestObj::classMethodWithOptional(WTFMove(arg))));
</span><span class="cx"> }
</span><span class="lines">@@ -8060,7 +8060,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto a = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</del><ins>+ auto a = state->argument(0).isUndefined() ? std::optional<int32_t>() : convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.testPromiseFunctionWithOptionalIntArgument(WTFMove(a), WTFMove(promise));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -103,19 +103,19 @@
</span><span class="cx"> };
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::EnumType);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumType> parseEnumeration<TestObj::EnumType>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::EnumType> parseEnumeration<TestObj::EnumType>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::EnumType convertEnumeration<TestObj::EnumType>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::EnumType>();
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::Optional);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Optional> parseEnumeration<TestObj::Optional>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::Optional> parseEnumeration<TestObj::Optional>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::Optional convertEnumeration<TestObj::Optional>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::Optional>();
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, AlternateEnumName);
</span><span class="cx">
</span><del>-template<> Optional<AlternateEnumName> parseEnumeration<AlternateEnumName>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<AlternateEnumName> parseEnumeration<AlternateEnumName>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> AlternateEnumName convertEnumeration<AlternateEnumName>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<AlternateEnumName>();
</span><span class="cx">
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::EnumA);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumA> parseEnumeration<TestObj::EnumA>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::EnumA> parseEnumeration<TestObj::EnumA>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::EnumA convertEnumeration<TestObj::EnumA>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::EnumA>();
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::EnumB);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumB> parseEnumeration<TestObj::EnumB>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::EnumB> parseEnumeration<TestObj::EnumB>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::EnumB convertEnumeration<TestObj::EnumB>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::EnumB>();
</span><span class="cx">
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::EnumC);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::EnumC> parseEnumeration<TestObj::EnumC>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::EnumC> parseEnumeration<TestObj::EnumC>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::EnumC convertEnumeration<TestObj::EnumC>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::EnumC>();
</span><span class="cx">
</span><span class="lines">@@ -151,19 +151,19 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::Kind);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Kind> parseEnumeration<TestObj::Kind>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::Kind> parseEnumeration<TestObj::Kind>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::Kind convertEnumeration<TestObj::Kind>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::Kind>();
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::Size);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Size> parseEnumeration<TestObj::Size>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::Size> parseEnumeration<TestObj::Size>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::Size convertEnumeration<TestObj::Size>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::Size>();
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestObj::Confidence);
</span><span class="cx">
</span><del>-template<> Optional<TestObj::Confidence> parseEnumeration<TestObj::Confidence>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestObj::Confidence> parseEnumeration<TestObj::Confidence>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestObj::Confidence convertEnumeration<TestObj::Confidence>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestObj::Confidence>();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestStandaloneDictionary::EnumInStandaloneDictionaryFile> parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestStandaloneDictionary::EnumInStandaloneDictionaryFile> parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "enumValue1")
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> return TestStandaloneDictionary::EnumInStandaloneDictionaryFile::EnumValue1;
</span><span class="cx"> if (stringValue == "enumValue2")
</span><span class="cx"> return TestStandaloneDictionary::EnumInStandaloneDictionaryFile::EnumValue2;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestStandaloneDictionary::EnumInStandaloneDictionaryFile convertEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(ExecState& state, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestStandaloneDictionary::EnumInStandaloneDictionaryFile);
</span><span class="cx">
</span><del>-template<> Optional<TestStandaloneDictionary::EnumInStandaloneDictionaryFile> parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestStandaloneDictionary::EnumInStandaloneDictionaryFile> parseEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestStandaloneDictionary::EnumInStandaloneDictionaryFile convertEnumeration<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestStandaloneDictionary::EnumInStandaloneDictionaryFile>();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneEnumerationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> Optional<TestStandaloneEnumeration> parseEnumeration<TestStandaloneEnumeration>(ExecState& state, JSValue value)
</del><ins>+template<> std::optional<TestStandaloneEnumeration> parseEnumeration<TestStandaloneEnumeration>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto stringValue = value.toWTFString(&state);
</span><span class="cx"> if (stringValue == "enumValue1")
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> return TestStandaloneEnumeration::EnumValue1;
</span><span class="cx"> if (stringValue == "enumValue2")
</span><span class="cx"> return TestStandaloneEnumeration::EnumValue2;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestStandaloneEnumeration convertEnumeration<TestStandaloneEnumeration>(ExecState& state, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestStandaloneEnumerationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, TestStandaloneEnumeration);
</span><span class="cx">
</span><del>-template<> Optional<TestStandaloneEnumeration> parseEnumeration<TestStandaloneEnumeration>(JSC::ExecState&, JSC::JSValue);
</del><ins>+template<> std::optional<TestStandaloneEnumeration> parseEnumeration<TestStandaloneEnumeration>(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> template<> TestStandaloneEnumeration convertEnumeration<TestStandaloneEnumeration>(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<> const char* expectedEnumerationValues<TestStandaloneEnumeration>();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto color = state->argument(3).isUndefined() ? String() : convert<IDLDOMString>(*state, state->uncheckedArgument(3), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto alpha = state->argument(4).isUndefined() ? Optional<float>() : convert<IDLUnrestrictedFloat>(*state, state->uncheckedArgument(4));
</del><ins>+ auto alpha = state->argument(4).isUndefined() ? std::optional<float>() : convert<IDLUnrestrictedFloat>(*state, state->uncheckedArgument(4));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.setShadow(WTFMove(width), WTFMove(height), WTFMove(blur), WTFMove(color), WTFMove(alpha));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arg1 = convert<IDLUnsignedLongLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Clamp);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto arg2 = state->argument(1).isUndefined() ? Optional<uint64_t>() : convert<IDLUnsignedLongLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Clamp);
</del><ins>+ auto arg2 = state->argument(1).isUndefined() ? std::optional<uint64_t>() : convert<IDLUnsignedLongLong>(*state, state->uncheckedArgument(1), IntegerConversionConfiguration::Clamp);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.funcWithClamp(WTFMove(arg1), WTFMove(arg2));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_arraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_array.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_array.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/bridge/runtime_array.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<uint32_t> index = parseIndex(propertyName);
</del><ins>+ std::optional<uint32_t> index = parseIndex(propertyName);
</ins><span class="cx"> if (index && index.value() < thisObject->getLength()) {
</span><span class="cx"> slot.setValue(thisObject, DontDelete | DontEnum,
</span><span class="cx"> thisObject->getConcreteArray()->valueAt(exec, index.value()));
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName))
</ins><span class="cx"> return thisObject->getConcreteArray()->setValueAt(exec, index.value(), value);
</span><span class="cx">
</span><span class="cx"> return JSObject::put(thisObject, exec, propertyName, value, slot);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx"> platformRegisterAlgorithms();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CryptoAlgorithmIdentifier> CryptoAlgorithmRegistry::identifier(const String& name)
</del><ins>+std::optional<CryptoAlgorithmIdentifier> CryptoAlgorithmRegistry::identifier(const String& name)
</ins><span class="cx"> {
</span><span class="cx"> if (name.isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> std::lock_guard<StaticLock> lock(registryMutex);
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // FIXME: How is it helpful to call isolatedCopy on the argument to find?
</span><span class="cx"> auto identifier = m_identifiers.find(name.isolatedCopy());
</span><span class="cx"> if (identifier == m_identifiers.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return identifier->value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static CryptoAlgorithmRegistry& singleton();
</span><span class="cx">
</span><del>- Optional<CryptoAlgorithmIdentifier> identifier(const String&);
</del><ins>+ std::optional<CryptoAlgorithmIdentifier> identifier(const String&);
</ins><span class="cx"> String name(CryptoAlgorithmIdentifier);
</span><span class="cx">
</span><span class="cx"> RefPtr<CryptoAlgorithm> create(CryptoAlgorithmIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoKeySerializationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoKeySerialization.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoKeySerialization.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/CryptoKeySerialization.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> virtual ~CryptoKeySerialization() { }
</span><span class="cx">
</span><span class="cx"> // Returns false if suggested algorithm was not compatible with one stored in the serialization.
</span><del>- virtual Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const = 0;
</del><ins>+ virtual std::optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void reconcileUsages(CryptoKeyUsageBitmap&) const = 0;
</span><span class="cx"> virtual void reconcileExtractable(bool&) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoJsonWebKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/JsonWebKey.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/JsonWebKey.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/JsonWebKey.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -35,27 +35,27 @@
</span><span class="cx">
</span><span class="cx"> struct JsonWebKey {
</span><span class="cx"> String kty;
</span><del>- Optional<String> use;
</del><ins>+ std::optional<String> use;
</ins><span class="cx"> // FIXME: Consider merging key_ops and usages.
</span><del>- Optional<Vector<CryptoKeyUsage>> key_ops;
</del><ins>+ std::optional<Vector<CryptoKeyUsage>> key_ops;
</ins><span class="cx"> CryptoKeyUsageBitmap usages;
</span><del>- Optional<String> alg;
</del><ins>+ std::optional<String> alg;
</ins><span class="cx">
</span><del>- Optional<bool> ext;
</del><ins>+ std::optional<bool> ext;
</ins><span class="cx">
</span><del>- Optional<String> crv;
- Optional<String> x;
- Optional<String> y;
- Optional<String> d;
- Optional<String> n;
- Optional<String> e;
- Optional<String> p;
- Optional<String> q;
- Optional<String> dp;
- Optional<String> dq;
- Optional<String> qi;
- Optional<Vector<RsaOtherPrimesInfo>> oth;
- Optional<String> k;
</del><ins>+ std::optional<String> crv;
+ std::optional<String> x;
+ std::optional<String> y;
+ std::optional<String> d;
+ std::optional<String> n;
+ std::optional<String> e;
+ std::optional<String> p;
+ std::optional<String> q;
+ std::optional<String> dp;
+ std::optional<String> dq;
+ std::optional<String> qi;
+ std::optional<Vector<RsaOtherPrimesInfo>> oth;
+ std::optional<String> k;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_CBCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> result = CryptoKeyAES::importRaw(parameters->identifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), extractable, usages);
</span><span class="cx"> break;
</span><span class="cx"> case SubtleCrypto::KeyFormat::Jwk: {
</span><del>- auto checkAlgCallback = [](size_t length, const Optional<String>& alg) -> bool {
</del><ins>+ auto checkAlgCallback = [](size_t length, const std::optional<String>& alg) -> bool {
</ins><span class="cx"> switch (length) {
</span><span class="cx"> case CryptoKeyAES::s_length128:
</span><span class="cx"> return !alg || alg.value() == ALG128;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> result = CryptoKeyAES::importRaw(parameters->identifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), extractable, usages);
</span><span class="cx"> break;
</span><span class="cx"> case SubtleCrypto::KeyFormat::Jwk: {
</span><del>- result = CryptoKeyAES::importJwk(parameters->identifier, WTFMove(WTF::get<JsonWebKey>(data)), extractable, usages, [](size_t length, const Optional<String>& alg) -> bool {
</del><ins>+ result = CryptoKeyAES::importJwk(parameters->identifier, WTFMove(WTF::get<JsonWebKey>(data)), extractable, usages, [](size_t length, const std::optional<String>& alg) -> bool {
</ins><span class="cx"> switch (length) {
</span><span class="cx"> case CryptoKeyAES::s_length128:
</span><span class="cx"> return !alg || alg.value() == ALG128;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = CryptoKeyHMAC::generate(hmacParameters.length.valueOr(0), hmacParameters.hashIdentifier, extractable, usages);
</del><ins>+ auto result = CryptoKeyHMAC::generate(hmacParameters.length.value_or(0), hmacParameters.hashIdentifier, extractable, usages);
</ins><span class="cx"> if (!result) {
</span><span class="cx"> exceptionCallback(OperationError);
</span><span class="cx"> return;
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx"> RefPtr<CryptoKeyHMAC> result;
</span><span class="cx"> switch (format) {
</span><span class="cx"> case SubtleCrypto::KeyFormat::Raw:
</span><del>- result = CryptoKeyHMAC::importRaw(hmacParameters.length.valueOr(0), hmacParameters.hashIdentifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), extractable, usages);
</del><ins>+ result = CryptoKeyHMAC::importRaw(hmacParameters.length.value_or(0), hmacParameters.hashIdentifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), extractable, usages);
</ins><span class="cx"> break;
</span><span class="cx"> case SubtleCrypto::KeyFormat::Jwk: {
</span><del>- auto checkAlgCallback = [](CryptoAlgorithmIdentifier hash, const Optional<String>& alg) -> bool {
</del><ins>+ auto checkAlgCallback = [](CryptoAlgorithmIdentifier hash, const std::optional<String>& alg) -> bool {
</ins><span class="cx"> switch (hash) {
</span><span class="cx"> case CryptoAlgorithmIdentifier::SHA_1:
</span><span class="cx"> return !alg || alg.value() == ALG1;
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><del>- result = CryptoKeyHMAC::importJwk(hmacParameters.length.valueOr(0), hmacParameters.hashIdentifier, WTFMove(WTF::get<JsonWebKey>(data)), extractable, usages, WTFMove(checkAlgCallback));
</del><ins>+ result = CryptoKeyHMAC::importJwk(hmacParameters.length.value_or(0), hmacParameters.hashIdentifier, WTFMove(WTF::get<JsonWebKey>(data)), extractable, usages, WTFMove(checkAlgCallback));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSAES_PKCS1_v1_5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> exceptionCallback(DataError);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- result = CryptoKeyRSA::importJwk(parameters->identifier, Nullopt, WTFMove(key), extractable, usages);
</del><ins>+ result = CryptoKeyRSA::importJwk(parameters->identifier, std::nullopt, WTFMove(key), extractable, usages);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorecryptogcryptCryptoAlgorithmHMACGCryptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
</del><ins>+static std::optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
</ins><span class="cx"> {
</span><span class="cx"> size_t digestLength = gcry_mac_get_algo_maclen(algorithm);
</span><span class="cx"> const void* keyData = key.data() ? key.data() : reinterpret_cast<const uint8_t*>("");
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> gcry_mac_close(hd);
</span><span class="cx">
</span><span class="cx"> if (!result)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return WTFMove(signature);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyAESh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyAES.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyAES.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyAES.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<CryptoKeyAES> generate(CryptoAlgorithmIdentifier, size_t lengthBits, bool extractable, CryptoKeyUsageBitmap);
</span><span class="cx"> static RefPtr<CryptoKeyAES> importRaw(CryptoAlgorithmIdentifier, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap);
</span><del>- using CheckAlgCallback = WTF::Function<bool(size_t, const Optional<String>&)>;
</del><ins>+ using CheckAlgCallback = WTF::Function<bool(size_t, const std::optional<String>&)>;
</ins><span class="cx"> static RefPtr<CryptoKeyAES> importJwk(CryptoAlgorithmIdentifier, JsonWebKey&&, bool extractable, CryptoKeyUsageBitmap, CheckAlgCallback&&);
</span><span class="cx">
</span><span class="cx"> CryptoKeyClass keyClass() const final { return CryptoKeyClass::AES; }
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyHMACh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<CryptoKeyHMAC> generate(size_t lengthBits, CryptoAlgorithmIdentifier hash, bool extractable, CryptoKeyUsageBitmap);
</span><span class="cx"> static RefPtr<CryptoKeyHMAC> importRaw(size_t lengthBits, CryptoAlgorithmIdentifier hash, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap);
</span><del>- using CheckAlgCallback = WTF::Function<bool(CryptoAlgorithmIdentifier, const Optional<String>&)>;
</del><ins>+ using CheckAlgCallback = WTF::Function<bool(CryptoAlgorithmIdentifier, const std::optional<String>&)>;
</ins><span class="cx"> static RefPtr<CryptoKeyHMAC> importJwk(size_t lengthBits, CryptoAlgorithmIdentifier hash, JsonWebKey&&, bool extractable, CryptoKeyUsageBitmap, CheckAlgCallback&&);
</span><span class="cx">
</span><span class="cx"> CryptoKeyClass keyClass() const final { return CryptoKeyClass::HMAC; }
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyRSAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<CryptoKeyRSA> CryptoKeyRSA::importJwk(CryptoAlgorithmIdentifier algorithm, Optional<CryptoAlgorithmIdentifier> hash, JsonWebKey&& keyData, bool extractable, CryptoKeyUsageBitmap usages)
</del><ins>+RefPtr<CryptoKeyRSA> CryptoKeyRSA::importJwk(CryptoAlgorithmIdentifier algorithm, std::optional<CryptoAlgorithmIdentifier> hash, JsonWebKey&& keyData, bool extractable, CryptoKeyUsageBitmap usages)
</ins><span class="cx"> {
</span><span class="cx"> if (keyData.kty != "RSA")
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> if (!keyData.d) {
</span><span class="cx"> // import public key
</span><span class="cx"> auto publicKeyComponents = CryptoKeyDataRSAComponents::createPublic(WTFMove(modulus), WTFMove(exponent));
</span><del>- // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is Nullopt.
- return CryptoKeyRSA::create(algorithm, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *publicKeyComponents, extractable, usages);
</del><ins>+ // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is std::nullopt.
+ return CryptoKeyRSA::create(algorithm, hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *publicKeyComponents, extractable, usages);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // import private key
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!keyData.p && !keyData.q && !keyData.dp && !keyData.dp && !keyData.qi) {
</span><span class="cx"> auto privateKeyComponents = CryptoKeyDataRSAComponents::createPrivate(WTFMove(modulus), WTFMove(exponent), WTFMove(privateExponent));
</span><del>- // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is Nullopt.
- return CryptoKeyRSA::create(algorithm, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</del><ins>+ // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is std::nullopt.
+ return CryptoKeyRSA::create(algorithm, hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!keyData.p || !keyData.q || !keyData.dp || !keyData.dq || !keyData.qi)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!keyData.oth) {
</span><span class="cx"> auto privateKeyComponents = CryptoKeyDataRSAComponents::createPrivateWithAdditionalData(WTFMove(modulus), WTFMove(exponent), WTFMove(privateExponent), WTFMove(firstPrimeInfo), WTFMove(secondPrimeInfo), { });
</span><del>- // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is Nullopt.
- return CryptoKeyRSA::create(algorithm, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</del><ins>+ // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is std::nullopt.
+ return CryptoKeyRSA::create(algorithm, hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<CryptoKeyDataRSAComponents::PrimeInfo> otherPrimeInfos;
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto privateKeyComponents = CryptoKeyDataRSAComponents::createPrivateWithAdditionalData(WTFMove(modulus), WTFMove(exponent), WTFMove(privateExponent), WTFMove(firstPrimeInfo), WTFMove(secondPrimeInfo), WTFMove(otherPrimeInfos));
</span><del>- // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is Nullopt.
- return CryptoKeyRSA::create(algorithm, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</del><ins>+ // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect if hash is std::nullopt.
+ return CryptoKeyRSA::create(algorithm, hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, extractable, usages);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JsonWebKey CryptoKeyRSA::exportJwk() const
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyRSAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> using KeyPairCallback = WTF::Function<void(CryptoKeyPair&)>;
</span><span class="cx"> using VoidCallback = WTF::Function<void()>;
</span><span class="cx"> static void generatePair(CryptoAlgorithmIdentifier, CryptoAlgorithmIdentifier hash, bool hasHash, unsigned modulusLength, const Vector<uint8_t>& publicExponent, bool extractable, CryptoKeyUsageBitmap, KeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext*);
</span><del>- static RefPtr<CryptoKeyRSA> importJwk(CryptoAlgorithmIdentifier, Optional<CryptoAlgorithmIdentifier> hash, JsonWebKey&&, bool extractable, CryptoKeyUsageBitmap);
</del><ins>+ static RefPtr<CryptoKeyRSA> importJwk(CryptoAlgorithmIdentifier, std::optional<CryptoAlgorithmIdentifier> hash, JsonWebKey&&, bool extractable, CryptoKeyUsageBitmap);
</ins><span class="cx">
</span><span class="cx"> PlatformRSAKey platformKey() const { return m_platformKey; }
</span><span class="cx"> JsonWebKey exportJwk() const;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeySerializationRawcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CryptoAlgorithmPair> CryptoKeySerializationRaw::reconcileAlgorithm(CryptoAlgorithm* algorithm, CryptoAlgorithmParametersDeprecated* parameters) const
</del><ins>+std::optional<CryptoAlgorithmPair> CryptoKeySerializationRaw::reconcileAlgorithm(CryptoAlgorithm* algorithm, CryptoAlgorithmParametersDeprecated* parameters) const
</ins><span class="cx"> {
</span><span class="cx"> return CryptoAlgorithmPair { algorithm, parameters };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeySerializationRawh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> private:
</span><span class="cx"> CryptoKeySerializationRaw(const CryptoOperationData&);
</span><span class="cx">
</span><del>- Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
</del><ins>+ std::optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
</ins><span class="cx">
</span><span class="cx"> void reconcileUsages(CryptoKeyUsageBitmap&) const override;
</span><span class="cx"> void reconcileExtractable(bool&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmHMACMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Optional<CCHmacAlgorithm> commonCryptoHMACAlgorithm(CryptoAlgorithmIdentifier hashFunction)
</del><ins>+static std::optional<CCHmacAlgorithm> commonCryptoHMACAlgorithm(CryptoAlgorithmIdentifier hashFunction)
</ins><span class="cx"> {
</span><span class="cx"> switch (hashFunction) {
</span><span class="cx"> case CryptoAlgorithmIdentifier::SHA_1:
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> case CryptoAlgorithmIdentifier::SHA_512:
</span><span class="cx"> return kCCHmacAlgSHA512;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmRSASSA_PKCS1_v1_5Maccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline Optional<CryptoDigest::Algorithm> cryptoDigestAlgorithm(CryptoAlgorithmIdentifier hashFunction)
</del><ins>+inline std::optional<CryptoDigest::Algorithm> cryptoDigestAlgorithm(CryptoAlgorithmIdentifier hashFunction)
</ins><span class="cx"> {
</span><span class="cx"> switch (hashFunction) {
</span><span class="cx"> case CryptoAlgorithmIdentifier::SHA_1:
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> case CryptoAlgorithmIdentifier::SHA_512:
</span><span class="cx"> return CryptoDigest::Algorithm::SHA_512;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoparametersCryptoAlgorithmHmacKeyParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> // FIXME: Consider merging hash and hashIdentifier.
</span><span class="cx"> JSC::JSValue hash;
</span><span class="cx"> CryptoAlgorithmIdentifier hashIdentifier;
</span><del>- Optional<unsigned long> length;
</del><ins>+ std::optional<unsigned long> length;
</ins><span class="cx">
</span><span class="cx"> Class parametersClass() const final { return Class::HmacKeyParams; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoparametersCryptoAlgorithmRsaOaepParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class CryptoAlgorithmRsaOaepParams final : public CryptoAlgorithmParameters {
</span><span class="cx"> public:
</span><span class="cx"> // Use labelVector() instead of label. The label will be gone once labelVector() is called.
</span><del>- Optional<BufferSource::VariantType> label;
</del><ins>+ std::optional<BufferSource::VariantType> label;
</ins><span class="cx">
</span><span class="cx"> Class parametersClass() const final { return Class::RsaOaepParams; }
</span><span class="cx">
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> return m_labelVector;
</span><span class="cx">
</span><span class="cx"> m_labelBuffer = WTFMove(*label);
</span><del>- label = Nullopt;
</del><ins>+ label = std::nullopt;
</ins><span class="cx"> if (!m_labelBuffer.length())
</span><span class="cx"> return m_labelVector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -124,10 +124,10 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FontTraitsMask> CSSFontFace::calculateStyleMask(CSSValue& style)
</del><ins>+std::optional<FontTraitsMask> CSSFontFace::calculateStyleMask(CSSValue& style)
</ins><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(style))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (downcast<CSSPrimitiveValue>(style).valueID()) {
</span><span class="cx"> case CSSValueNormal:
</span><span class="lines">@@ -159,10 +159,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FontTraitsMask> CSSFontFace::calculateWeightMask(CSSValue& weight)
</del><ins>+std::optional<FontTraitsMask> CSSFontFace::calculateWeightMask(CSSValue& weight)
</ins><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(weight))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (downcast<CSSPrimitiveValue>(weight).valueID()) {
</span><span class="cx"> case CSSValueBold:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> Status status() const { return m_status; }
</span><span class="cx"> StyleRuleFontFace* cssConnection() const { return m_cssConnection.get(); }
</span><span class="cx">
</span><del>- static Optional<FontTraitsMask> calculateStyleMask(CSSValue& style);
- static Optional<FontTraitsMask> calculateWeightMask(CSSValue& weight);
</del><ins>+ static std::optional<FontTraitsMask> calculateStyleMask(CSSValue& style);
+ static std::optional<FontTraitsMask> calculateWeightMask(CSSValue& weight);
</ins><span class="cx">
</span><span class="cx"> class Client;
</span><span class="cx"> void addClient(Client&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> return m_faces[i];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<FontTraitsMask> computeFontTraitsMask(MutableStyleProperties& style)
</del><ins>+static std::optional<FontTraitsMask> computeFontTraitsMask(MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> styleValue = style.getPropertyCSSValue(CSSPropertyFontStyle).get();
</span><span class="cx"> if (!styleValue)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> if (auto styleMaskOptional = CSSFontFace::calculateStyleMask(*styleValue))
</span><span class="cx"> styleMask = styleMaskOptional.value();
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> weightValue = style.getPropertyCSSValue(CSSPropertyFontWeight).get();
</span><span class="cx"> if (!weightValue)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> if (auto weightMaskOptional = CSSFontFace::calculateWeightMask(*weightValue))
</span><span class="cx"> weightMask = weightMaskOptional.value();
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return static_cast<FontTraitsMask>(static_cast<unsigned>(styleMask) | static_cast<unsigned>(weightMask));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx">
</span><span class="cx"> double CSSPrimitiveValue::doubleValue(UnitTypes unitType) const
</span><span class="cx"> {
</span><del>- return doubleValueInternal(unitType).valueOr(0);
</del><ins>+ return doubleValueInternal(unitType).value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double CSSPrimitiveValue::doubleValue() const
</span><span class="lines">@@ -871,10 +871,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> CSSPrimitiveValue::doubleValueInternal(UnitTypes requestedUnitType) const
</del><ins>+std::optional<double> CSSPrimitiveValue::doubleValueInternal(UnitTypes requestedUnitType) const
</ins><span class="cx"> {
</span><span class="cx"> if (!isValidCSSUnitTypeForDoubleConversion(static_cast<UnitTypes>(m_primitiveUnitType)) || !isValidCSSUnitTypeForDoubleConversion(requestedUnitType))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> UnitTypes sourceUnitType = static_cast<UnitTypes>(primitiveType());
</span><span class="cx"> if (requestedUnitType == sourceUnitType || requestedUnitType == CSS_DIMENSION)
</span><span class="lines">@@ -889,13 +889,13 @@
</span><span class="cx">
</span><span class="cx"> // Cannot convert between unrelated unit categories if one of them is not UNumber.
</span><span class="cx"> if (sourceCategory != targetCategory && sourceCategory != UNumber && targetCategory != UNumber)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (targetCategory == UNumber) {
</span><span class="cx"> // We interpret conversion to CSS_NUMBER as conversion to a canonical unit in this value's category.
</span><span class="cx"> targetUnitType = canonicalUnitTypeForCategory(sourceCategory);
</span><span class="cx"> if (targetUnitType == CSS_UNKNOWN)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sourceUnitType == CSS_NUMBER) {
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> // We interpret conversion from CSS_NUMBER in the same way as CSSParser::validUnit() while using non-strict mode.
</span><span class="cx"> sourceUnitType = canonicalUnitTypeForCategory(targetCategory);
</span><span class="cx"> if (sourceUnitType == CSS_UNKNOWN)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double convertedValue = doubleValue();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> void init(RefPtr<DashboardRegion>&&); // FIXME: Dashboard region should not be a primitive value.
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Optional<double> doubleValueInternal(UnitTypes targetUnitType) const;
</del><ins>+ std::optional<double> doubleValueInternal(UnitTypes targetUnitType) const;
</ins><span class="cx">
</span><span class="cx"> double computeLengthDouble(const CSSToLengthConversionData&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> // function in css/StyleBuilderConverter.h should be used.
</span><span class="cx"> //
</span><span class="cx"> // * ConditionalConverter=XXX:
</span><del>-// Similar to Converter=XXX but the converter function returns a WTF::Optional<>
</del><ins>+// Similar to Converter=XXX but the converter function returns a std::optional<>
</ins><span class="cx"> // to indicate if the property setter should be called or not.
</span><span class="cx"> //
</span><span class="cx"> // * Custom=[Initial|Value|Inherit|All]:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSegmentedFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> return m_result && m_result.value() && m_result.value()->isLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- mutable Optional<RefPtr<Font>> m_result; // Caches nullptr too
</del><ins>+ mutable std::optional<RefPtr<Font>> m_result; // Caches nullptr too
</ins><span class="cx"> mutable Ref<CSSFontFace> m_fontFace;
</span><span class="cx"> FontDescription m_fontDescription;
</span><span class="cx"> bool m_syntheticBold;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return adoptRef(*new CSSStyleSheet(WTFMove(sheet), ownerRule));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSStyleSheet> CSSStyleSheet::create(Ref<StyleSheetContents>&& sheet, Node& ownerNode, const Optional<bool>& isCleanOrigin)
</del><ins>+Ref<CSSStyleSheet> CSSStyleSheet::create(Ref<StyleSheetContents>&& sheet, Node& ownerNode, const std::optional<bool>& isCleanOrigin)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSStyleSheet(WTFMove(sheet), ownerNode, TextPosition::minimumPosition(), false, isCleanOrigin));
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> m_contents->registerClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSStyleSheet::CSSStyleSheet(Ref<StyleSheetContents>&& contents, Node& ownerNode, const TextPosition& startPosition, bool isInlineStylesheet, const Optional<bool>& isOriginClean)
</del><ins>+CSSStyleSheet::CSSStyleSheet(Ref<StyleSheetContents>&& contents, Node& ownerNode, const TextPosition& startPosition, bool isInlineStylesheet, const std::optional<bool>& isOriginClean)
</ins><span class="cx"> : m_contents(WTFMove(contents))
</span><span class="cx"> , m_isInlineStylesheet(isInlineStylesheet)
</span><span class="cx"> , m_isDisabled(false)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<int> CSSStyleSheet::addRule(const String& selector, const String& style, Optional<unsigned> index)
</del><ins>+ExceptionOr<int> CSSStyleSheet::addRule(const String& selector, const String& style, std::optional<unsigned> index)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder text;
</span><span class="cx"> text.append(selector);
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> if (!style.isEmpty())
</span><span class="cx"> text.append(' ');
</span><span class="cx"> text.append('}');
</span><del>- auto insertRuleResult = insertRule(text.toString(), index.valueOr(length()));
</del><ins>+ auto insertRuleResult = insertRule(text.toString(), index.value_or(length()));
</ins><span class="cx"> if (insertRuleResult.hasException())
</span><span class="cx"> return insertRuleResult.releaseException();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> class CSSStyleSheet final : public StyleSheet {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<CSSStyleSheet> create(Ref<StyleSheetContents>&&, CSSImportRule* ownerRule = 0);
</span><del>- static Ref<CSSStyleSheet> create(Ref<StyleSheetContents>&&, Node& ownerNode, const Optional<bool>& isOriginClean = Nullopt);
</del><ins>+ static Ref<CSSStyleSheet> create(Ref<StyleSheetContents>&&, Node& ownerNode, const std::optional<bool>& isOriginClean = std::nullopt);
</ins><span class="cx"> static Ref<CSSStyleSheet> createInline(Ref<StyleSheetContents>&&, Element& owner, const TextPosition& startPosition);
</span><span class="cx">
</span><span class="cx"> virtual ~CSSStyleSheet();
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> WEBCORE_EXPORT ExceptionOr<void> deleteRule(unsigned index);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RefPtr<CSSRuleList> rules();
</span><del>- WEBCORE_EXPORT ExceptionOr<int> addRule(const String& selector, const String& style, Optional<unsigned> index);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<int> addRule(const String& selector, const String& style, std::optional<unsigned> index);
</ins><span class="cx"> ExceptionOr<void> removeRule(unsigned index) { return deleteRule(index); }
</span><span class="cx">
</span><span class="cx"> // For CSSRuleList.
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> private:
</span><span class="cx"> CSSStyleSheet(Ref<StyleSheetContents>&&, CSSImportRule* ownerRule);
</span><span class="cx"> CSSStyleSheet(Ref<StyleSheetContents>&&, Node* ownerNode, const TextPosition& startPosition, bool isInlineStylesheet);
</span><del>- CSSStyleSheet(Ref<StyleSheetContents>&&, Node& ownerNode, const TextPosition& startPosition, bool isInlineStylesheet, const Optional<bool>&);
</del><ins>+ CSSStyleSheet(Ref<StyleSheetContents>&&, Node& ownerNode, const TextPosition& startPosition, bool isInlineStylesheet, const std::optional<bool>&);
</ins><span class="cx">
</span><span class="cx"> bool isCSSStyleSheet() const final { return true; }
</span><span class="cx"> String type() const final { return ASCIILiteral("text/css"); }
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> bool m_isInlineStylesheet;
</span><span class="cx"> bool m_isDisabled;
</span><span class="cx"> bool m_mutatedRules;
</span><del>- Optional<bool> m_isOriginClean;
</del><ins>+ std::optional<bool> m_isOriginClean;
</ins><span class="cx"> String m_title;
</span><span class="cx"> RefPtr<MediaQuerySet> m_mediaQueries;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -374,12 +374,12 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSFontFace::Status::Success:
</span><span class="cx"> if (m_promise)
</span><del>- std::exchange(m_promise, Nullopt)->resolve(*this);
</del><ins>+ std::exchange(m_promise, std::nullopt)->resolve(*this);
</ins><span class="cx"> deref();
</span><span class="cx"> return;
</span><span class="cx"> case CSSFontFace::Status::Failure:
</span><span class="cx"> if (m_promise)
</span><del>- std::exchange(m_promise, Nullopt)->reject(NETWORK_ERR);
</del><ins>+ std::exchange(m_promise, std::nullopt)->reject(NETWORK_ERR);
</ins><span class="cx"> deref();
</span><span class="cx"> return;
</span><span class="cx"> case CSSFontFace::Status::Pending:
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/FontFace.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> LoadStatus status() const;
</span><span class="cx">
</span><span class="cx"> typedef DOMPromise<FontFace&> Promise;
</span><del>- Optional<Promise>& promise() { return m_promise; }
</del><ins>+ std::optional<Promise>& promise() { return m_promise; }
</ins><span class="cx"> void registerLoaded(Promise&&);
</span><span class="cx">
</span><span class="cx"> void adopt(CSSFontFace&);
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> WeakPtrFactory<FontFace> m_weakPtrFactory;
</span><span class="cx"> Ref<CSSFontFace> m_backing;
</span><del>- Optional<Promise> m_promise;
</del><ins>+ std::optional<Promise> m_promise;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> void FontFaceSet::completedLoading()
</span><span class="cx"> {
</span><span class="cx"> if (m_promise)
</span><del>- std::exchange(m_promise, Nullopt)->resolve(*this);
</del><ins>+ std::exchange(m_promise, std::nullopt)->resolve(*this);
</ins><span class="cx"> m_isReady = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/FontFaceSet.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<CSSFontFaceSet> m_backing;
</span><span class="cx"> HashMap<RefPtr<FontFace>, Vector<Ref<PendingPromise>>> m_pendingPromises;
</span><del>- Optional<ReadyPromise> m_promise;
</del><ins>+ std::optional<ReadyPromise> m_promise;
</ins><span class="cx"> bool m_isReady { true };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -214,10 +214,10 @@
</span><span class="cx"> return compareValue(width * aspectRatio.denominatorValue(), height * aspectRatio.numeratorValue(), op);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<double> doubleValue(CSSValue* value)
</del><ins>+static std::optional<double> doubleValue(CSSValue* value)
</ins><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(value) || !downcast<CSSPrimitiveValue>(*value).isNumber())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return downcast<CSSPrimitiveValue>(*value).doubleValue(CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> static GridTrackSize convertGridTrackSize(StyleResolver&, const CSSValue&);
</span><span class="cx"> static Vector<GridTrackSize> convertGridTrackSizeList(StyleResolver&, const CSSValue&);
</span><del>- static Optional<GridPosition> convertGridPosition(StyleResolver&, const CSSValue&);
</del><ins>+ static std::optional<GridPosition> convertGridPosition(StyleResolver&, const CSSValue&);
</ins><span class="cx"> static GridAutoFlow convertGridAutoFlow(StyleResolver&, const CSSValue&);
</span><span class="cx"> #endif // ENABLE(CSS_GRID_LAYOUT)
</span><del>- static Optional<Length> convertWordSpacing(StyleResolver&, const CSSValue&);
- static Optional<float> convertPerspective(StyleResolver&, const CSSValue&);
- static Optional<Length> convertMarqueeIncrement(StyleResolver&, const CSSValue&);
- static Optional<FilterOperations> convertFilterOperations(StyleResolver&, const CSSValue&);
</del><ins>+ static std::optional<Length> convertWordSpacing(StyleResolver&, const CSSValue&);
+ static std::optional<float> convertPerspective(StyleResolver&, const CSSValue&);
+ static std::optional<Length> convertMarqueeIncrement(StyleResolver&, const CSSValue&);
+ static std::optional<FilterOperations> convertFilterOperations(StyleResolver&, const CSSValue&);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool convertTouchCallout(StyleResolver&, const CSSValue&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> static StyleContentAlignmentData convertContentAlignmentData(StyleResolver&, const CSSValue&);
</span><span class="cx"> static EGlyphOrientation convertGlyphOrientation(StyleResolver&, const CSSValue&);
</span><span class="cx"> static EGlyphOrientation convertGlyphOrientationOrAuto(StyleResolver&, const CSSValue&);
</span><del>- static Optional<Length> convertLineHeight(StyleResolver&, const CSSValue&, float multiplier = 1.f);
</del><ins>+ static std::optional<Length> convertLineHeight(StyleResolver&, const CSSValue&, float multiplier = 1.f);
</ins><span class="cx"> static FontSynthesis convertFontSynthesis(StyleResolver&, const CSSValue&);
</span><span class="cx">
</span><span class="cx"> static BreakBetween convertPageBreakBetween(StyleResolver&, const CSSValue&);
</span><span class="lines">@@ -1084,12 +1084,12 @@
</span><span class="cx"> return createGridTrackSize(value, styleResolver);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<GridPosition> StyleBuilderConverter::convertGridPosition(StyleResolver&, const CSSValue& value)
</del><ins>+inline std::optional<GridPosition> StyleBuilderConverter::convertGridPosition(StyleResolver&, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> GridPosition gridPosition;
</span><span class="cx"> if (createGridPosition(value, gridPosition))
</span><span class="cx"> return gridPosition;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolver&, const CSSValue& value)
</span><span class="lines">@@ -1137,9 +1137,9 @@
</span><span class="cx"> return styleResolver.state().cssToLengthConversionData();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<Length> StyleBuilderConverter::convertWordSpacing(StyleResolver& styleResolver, const CSSValue& value)
</del><ins>+inline std::optional<Length> StyleBuilderConverter::convertWordSpacing(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- Optional<Length> wordSpacing;
</del><ins>+ std::optional<Length> wordSpacing;
</ins><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> if (primitiveValue.valueID() == CSSValueNormal)
</span><span class="cx"> wordSpacing = RenderStyle::initialWordSpacing();
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx"> return wordSpacing;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<float> StyleBuilderConverter::convertPerspective(StyleResolver& styleResolver, const CSSValue& value)
</del><ins>+inline std::optional<float> StyleBuilderConverter::convertPerspective(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> if (primitiveValue.valueID() == CSSValueNone)
</span><span class="lines">@@ -1167,12 +1167,12 @@
</span><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><del>- return perspective < 0 ? Optional<float>(Nullopt) : Optional<float>(perspective);
</del><ins>+ return perspective < 0 ? std::optional<float>(std::nullopt) : std::optional<float>(perspective);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<Length> StyleBuilderConverter::convertMarqueeIncrement(StyleResolver& styleResolver, const CSSValue& value)
</del><ins>+inline std::optional<Length> StyleBuilderConverter::convertMarqueeIncrement(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- Optional<Length> marqueeLength;
</del><ins>+ std::optional<Length> marqueeLength;
</ins><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> switch (primitiveValue.valueID()) {
</span><span class="cx"> case CSSValueSmall:
</span><span class="lines">@@ -1196,12 +1196,12 @@
</span><span class="cx"> return marqueeLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<FilterOperations> StyleBuilderConverter::convertFilterOperations(StyleResolver& styleResolver, const CSSValue& value)
</del><ins>+inline std::optional<FilterOperations> StyleBuilderConverter::convertFilterOperations(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> FilterOperations operations;
</span><span class="cx"> if (styleResolver.createFilterOperations(value, operations))
</span><span class="cx"> return operations;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FontFeatureSettings StyleBuilderConverter::convertFontFeatureSettings(StyleResolver&, const CSSValue& value)
</span><span class="lines">@@ -1404,7 +1404,7 @@
</span><span class="cx"> return convertGlyphOrientation(styleResolver, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<Length> StyleBuilderConverter::convertLineHeight(StyleResolver& styleResolver, const CSSValue& value, float multiplier)
</del><ins>+inline std::optional<Length> StyleBuilderConverter::convertLineHeight(StyleResolver& styleResolver, const CSSValue& value, float multiplier)
</ins><span class="cx"> {
</span><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> if (primitiveValue.valueID() == CSSValueNormal)
</span><span class="lines">@@ -1424,7 +1424,7 @@
</span><span class="cx"> // FIXME: number and percentage values should produce the same type of Length (ie. Fixed or Percent).
</span><span class="cx"> return Length(primitiveValue.doubleValue() * multiplier * 100.0, Percent);
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FontSynthesis StyleBuilderConverter::convertFontSynthesis(StyleResolver&, const CSSValue& value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> inline void StyleBuilderCustom::applyValueLineHeight(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><span class="cx"> float multiplier = styleResolver.style()->textSizeAdjust().isPercentage() ? styleResolver.style()->textSizeAdjust().multiplier() : 1.f;
</span><del>- Optional<Length> lineHeight = StyleBuilderConverter::convertLineHeight(styleResolver, value, multiplier);
</del><ins>+ std::optional<Length> lineHeight = StyleBuilderConverter::convertLineHeight(styleResolver, value, multiplier);
</ins><span class="cx"> if (!lineHeight)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleImportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRuleImport.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Skip Content Security Policy check when stylesheet is in a user agent shadow tree.
</span><span class="cx"> // See <https://bugs.webkit.org/show_bug.cgi?id=146663>.
</span><del>- CachedResourceRequest request(absURL, CachedResourceLoader::defaultCachedResourceOptions(), Nullopt, String(m_parentStyleSheet->charset()));
</del><ins>+ CachedResourceRequest request(absURL, CachedResourceLoader::defaultCachedResourceOptions(), std::nullopt, String(m_parentStyleSheet->charset()));
</ins><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> if (m_cachedSheet)
</span><span class="cx"> m_cachedSheet->removeClient(m_styleSheetClient);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -4985,12 +4985,12 @@
</span><span class="cx"> return m_context.springTimingFunctionEnabled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> CSSParser::parseCubicBezierTimingFunctionValue(CSSParserValueList& args)
</del><ins>+std::optional<double> CSSParser::parseCubicBezierTimingFunctionValue(CSSParserValueList& args)
</ins><span class="cx"> {
</span><span class="cx"> ValueWithCalculation argumentWithCalculation(*args.current());
</span><span class="cx"> if (!validateUnit(argumentWithCalculation, FNumber))
</span><del>- return Nullopt;
- Optional<double> result = parsedDouble(argumentWithCalculation);
</del><ins>+ return std::nullopt;
+ std::optional<double> result = parsedDouble(argumentWithCalculation);
</ins><span class="cx"> CSSParserValue* nextValue = args.next();
</span><span class="cx"> if (!nextValue) {
</span><span class="cx"> // The last number in the function has no comma after it, so we're done.
</span><span class="lines">@@ -4997,17 +4997,17 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> if (!isComma(nextValue))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> args.next();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<double> CSSParser::parseSpringTimingFunctionValue(CSSParserValueList& args)
</del><ins>+std::optional<double> CSSParser::parseSpringTimingFunctionValue(CSSParserValueList& args)
</ins><span class="cx"> {
</span><span class="cx"> ValueWithCalculation argumentWithCalculation(*args.current());
</span><span class="cx"> if (!validateUnit(argumentWithCalculation, FNumber))
</span><del>- return Nullopt;
- Optional<double> result = parsedDouble(argumentWithCalculation);
</del><ins>+ return std::nullopt;
+ std::optional<double> result = parsedDouble(argumentWithCalculation);
</ins><span class="cx"> args.next();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -7671,11 +7671,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::pair<std::array<double, 4>, ColorSpace>> CSSParser::parseColorFunctionParameters(CSSParserValue& value)
</del><ins>+std::optional<std::pair<std::array<double, 4>, ColorSpace>> CSSParser::parseColorFunctionParameters(CSSParserValue& value)
</ins><span class="cx"> {
</span><span class="cx"> CSSParserValueList* args = value.function->args.get();
</span><span class="cx"> if (!args->size())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> ColorSpace colorSpace;
</span><span class="cx"> switch (args->current()->id) {
</span><span class="lines">@@ -7686,7 +7686,7 @@
</span><span class="cx"> colorSpace = ColorSpaceDisplayP3;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::array<double, 4> colorValues = { { 0, 0, 0, 1 } };
</span><span class="lines">@@ -7696,7 +7696,7 @@
</span><span class="cx"> if (valueOrNull) {
</span><span class="cx"> ValueWithCalculation argumentWithCalculation(*valueOrNull);
</span><span class="cx"> if (!validateUnit(argumentWithCalculation, FNumber))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> colorValues[i] = std::max(0.0, std::min(1.0, parsedDouble(argumentWithCalculation)));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -7706,13 +7706,13 @@
</span><span class="cx"> return { { colorValues, colorSpace } };
</span><span class="cx">
</span><span class="cx"> if (!isForwardSlashOperator(*slashOrNull))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Handle alpha.
</span><span class="cx">
</span><span class="cx"> ValueWithCalculation argumentWithCalculation(*args->next());
</span><span class="cx"> if (!validateUnit(argumentWithCalculation, FNumber | FPercent))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> colorValues[3] = std::max(0.0, std::min(1.0, parseColorDouble(argumentWithCalculation)));
</span><span class="cx">
</span><span class="cx"> // FIXME: Support the comma-separated list of fallback color values.
</span><span class="lines">@@ -7720,7 +7720,7 @@
</span><span class="cx">
</span><span class="cx"> auto commaOrNull = args->next();
</span><span class="cx"> if (commaOrNull && !isComma(commaOrNull))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return { { colorValues, colorSpace } };
</span><span class="cx"> }
</span><span class="lines">@@ -7814,7 +7814,7 @@
</span><span class="cx"> } else if (value.unit == CSSParserValue::Function
</span><span class="cx"> && value.function->args
</span><span class="cx"> && equalLettersIgnoringASCIICase(value.function->name, "color(")) {
</span><del>- Optional<std::pair<std::array<double, 4>, ColorSpace>> colorData = parseColorFunctionParameters(value);
</del><ins>+ std::optional<std::pair<std::array<double, 4>, ColorSpace>> colorData = parseColorFunctionParameters(value);
</ins><span class="cx"> if (!colorData)
</span><span class="cx"> return Color();
</span><span class="cx"> return Color(colorData.value().first[0], colorData.value().first[1], colorData.value().first[2], colorData.value().first[3], colorData.value().second);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/css/parser/CSSParser.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> SourceSize(MediaQueryExpression&&, Ref<CSSValue>&&);
</span><span class="cx"> };
</span><span class="cx"> Vector<SourceSize> parseSizesAttribute(StringView);
</span><del>- Optional<SourceSize> sourceSize(MediaQueryExpression&&, CSSParserValue&);
</del><ins>+ std::optional<SourceSize> sourceSize(MediaQueryExpression&&, CSSParserValue&);
</ins><span class="cx">
</span><span class="cx"> bool parseFillImage(CSSParserValueList&, RefPtr<CSSValue>&);
</span><span class="cx">
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> static std::unique_ptr<Vector<double>> parseKeyframeKeyList(const String&);
</span><span class="cx">
</span><span class="cx"> bool parseTransformOriginShorthand(RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSValue>&);
</span><del>- Optional<double> parseCubicBezierTimingFunctionValue(CSSParserValueList&);
- Optional<double> parseSpringTimingFunctionValue(CSSParserValueList&);
</del><ins>+ std::optional<double> parseCubicBezierTimingFunctionValue(CSSParserValueList&);
+ std::optional<double> parseSpringTimingFunctionValue(CSSParserValueList&);
</ins><span class="cx"> bool parseAnimationProperty(CSSPropertyID, RefPtr<CSSValue>&, AnimationParseContext&);
</span><span class="cx"> bool parseTransitionShorthand(CSSPropertyID, bool important);
</span><span class="cx"> bool parseAnimationShorthand(CSSPropertyID, bool important);
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> bool parseRGBParameters(CSSParserValue&, int* colorValues, bool parseAlpha);
</span><span class="cx"> bool parseHSLParameters(CSSParserValue&, double* colorValues, bool parseAlpha);
</span><del>- Optional<std::pair<std::array<double, 4>, ColorSpace>> parseColorFunctionParameters(CSSParserValue&);
</del><ins>+ std::optional<std::pair<std::array<double, 4>, ColorSpace>> parseColorFunctionParameters(CSSParserValue&);
</ins><span class="cx"> RefPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = nullptr);
</span><span class="cx"> Color parseColorFromValue(CSSParserValue&);
</span><span class="cx"> void parseSelector(const String&, CSSSelectorList&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -326,8 +326,8 @@
</span><span class="cx"> void generateElementHasFocusWithin(Assembler::JumpList& failureCases);
</span><span class="cx">
</span><span class="cx"> // Helpers.
</span><del>- void generateAddStyleRelationIfResolvingStyle(Assembler::RegisterID element, Style::Relation::Type, Optional<Assembler::RegisterID> value = { });
- void generateAddStyleRelation(Assembler::RegisterID checkingContext, Assembler::RegisterID element, Style::Relation::Type, Optional<Assembler::RegisterID> value = { });
</del><ins>+ void generateAddStyleRelationIfResolvingStyle(Assembler::RegisterID element, Style::Relation::Type, std::optional<Assembler::RegisterID> value = { });
+ void generateAddStyleRelation(Assembler::RegisterID checkingContext, Assembler::RegisterID element, Style::Relation::Type, std::optional<Assembler::RegisterID> value = { });
</ins><span class="cx"> Assembler::Jump branchOnResolvingModeWithCheckingContext(Assembler::RelationalCondition, SelectorChecker::Mode, Assembler::RegisterID checkingContext);
</span><span class="cx"> Assembler::Jump branchOnResolvingMode(Assembler::RelationalCondition, SelectorChecker::Mode, Assembler::RegisterID checkingContext);
</span><span class="cx"> void generateElementIsFirstLink(Assembler::JumpList& failureCases, Assembler::RegisterID element);
</span><span class="lines">@@ -2170,7 +2170,7 @@
</span><span class="cx"> localFailureCases.linkTo(loopStart, &m_assembler);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::generateAddStyleRelationIfResolvingStyle(Assembler::RegisterID element, Style::Relation::Type relationType, Optional<Assembler::RegisterID> value)
</del><ins>+void SelectorCodeGenerator::generateAddStyleRelationIfResolvingStyle(Assembler::RegisterID element, Style::Relation::Type relationType, std::optional<Assembler::RegisterID> value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_selectorContext == SelectorContext::QuerySelector)
</span><span class="cx"> return;
</span><span class="lines">@@ -2188,7 +2188,7 @@
</span><span class="cx"> checkingContext->styleRelations.append({ *element, Style::Relation::AffectedByActive, 1 });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::generateAddStyleRelation(Assembler::RegisterID checkingContext, Assembler::RegisterID element, Style::Relation::Type relationType, Optional<Assembler::RegisterID> value)
</del><ins>+void SelectorCodeGenerator::generateAddStyleRelation(Assembler::RegisterID checkingContext, Assembler::RegisterID element, Style::Relation::Type relationType, std::optional<Assembler::RegisterID> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_selectorContext != SelectorContext::QuerySelector);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementReactionQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> Type m_type;
</span><span class="cx"> RefPtr<Document> m_oldDocument;
</span><span class="cx"> RefPtr<Document> m_newDocument;
</span><del>- Optional<QualifiedName> m_attributeName;
</del><ins>+ std::optional<QualifiedName> m_attributeName;
</ins><span class="cx"> AtomicString m_oldValue;
</span><span class="cx"> AtomicString m_newValue;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -4343,7 +4343,7 @@
</span><span class="cx"> String Document::lastModified()
</span><span class="cx"> {
</span><span class="cx"> using namespace std::chrono;
</span><del>- Optional<system_clock::time_point> dateTime;
</del><ins>+ std::optional<system_clock::time_point> dateTime;
</ins><span class="cx"> if (m_frame && loader())
</span><span class="cx"> dateTime = loader()->response().lastModified();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx">
</span><span class="cx"> void Element::scrollBy(const ScrollToOptions& options)
</span><span class="cx"> {
</span><del>- return scrollBy(options.left.valueOr(0), options.top.valueOr(0));
</del><ins>+ return scrollBy(options.left.value_or(0), options.top.value_or(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline double normalizeNonFiniteValue(double f)
</span><span class="lines">@@ -3000,7 +3000,7 @@
</span><span class="cx">
</span><span class="cx"> int Element::getIntegralAttribute(const QualifiedName& attributeName) const
</span><span class="cx"> {
</span><del>- return parseHTMLInteger(getAttribute(attributeName)).valueOr(0);
</del><ins>+ return parseHTMLInteger(getAttribute(attributeName)).value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::setIntegralAttribute(const QualifiedName& attributeName, int value)
</span><span class="lines">@@ -3010,7 +3010,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned Element::getUnsignedIntegralAttribute(const QualifiedName& attributeName) const
</span><span class="cx"> {
</span><del>- return parseHTMLNonNegativeInteger(getAttribute(attributeName)).valueOr(0);
</del><ins>+ return parseHTMLNonNegativeInteger(getAttribute(attributeName)).value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::setUnsignedIntegralAttribute(const QualifiedName& attributeName, unsigned value)
</span><span class="lines">@@ -3498,10 +3498,10 @@
</span><span class="cx"> ASSERT(hasCustomStyleResolveCallbacks());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> Element::resolveCustomStyle(const RenderStyle&, const RenderStyle*)
</del><ins>+std::optional<ElementStyle> Element::resolveCustomStyle(const RenderStyle&, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasCustomStyleResolveCallbacks());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::cloneAttributesFromElement(const Element& other)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/Element.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> virtual void didAttachRenderers();
</span><span class="cx"> virtual void willDetachRenderers();
</span><span class="cx"> virtual void didDetachRenderers();
</span><del>- virtual Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle);
</del><ins>+ virtual std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle);
</ins><span class="cx">
</span><span class="cx"> LayoutRect absoluteEventHandlerBounds(bool& includesFixedPositionElements) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementIteratorAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementIteratorAssertions.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> private:
</span><span class="cx"> const Document* m_document;
</span><span class="cx"> uint64_t m_initialDOMTreeVersion;
</span><del>- Optional<NoEventDispatchAssertion> m_eventDispatchAssertion;
</del><ins>+ std::optional<NoEventDispatchAssertion> m_eventDispatchAssertion;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: No real point in doing these as inlines; they are for debugging and we usually turn off inlining in debug builds.
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> inline void ElementIteratorAssertions::dropEventDispatchAssertion()
</span><span class="cx"> {
</span><del>- m_eventDispatchAssertion = Nullopt;
</del><ins>+ m_eventDispatchAssertion = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void ElementIteratorAssertions::clear()
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_document = nullptr;
</span><span class="cx"> m_initialDOMTreeVersion = 0;
</span><del>- m_eventDispatchAssertion = Nullopt;
</del><ins>+ m_eventDispatchAssertion = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionOrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExceptionOr.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionOr.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/ExceptionOr.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> Exception&& releaseException();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<Exception> m_exception;
</del><ins>+ std::optional<Exception> m_exception;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> isolatedCopy(ExceptionOr<void>&&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<InlineStyleSheetCacheKey> makeInlineStyleSheetCacheKey(const String& text, const Element& element)
</del><ins>+static std::optional<InlineStyleSheetCacheKey> makeInlineStyleSheetCacheKey(const String& text, const Element& element)
</ins><span class="cx"> {
</span><span class="cx"> // Only cache for shadow trees. Main document inline stylesheets are generally unique and can't be shared between documents.
</span><span class="cx"> // FIXME: This could be relaxed when a stylesheet does not contain document-relative URLs (or #urls).
</span></span></pre></div>
<a id="trunkSourceWebCoredomKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/KeyboardEvent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/KeyboardEvent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/KeyboardEvent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> // Legacy.
</span><span class="cx"> String keyIdentifier;
</span><del>- Optional<unsigned> keyLocation;
</del><ins>+ std::optional<unsigned> keyLocation;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<KeyboardEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableClassicScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableClassicScript.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,15 +51,15 @@
</span><span class="cx"> return m_cachedScript->isLoaded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LoadableScript::Error> LoadableClassicScript::error() const
</del><ins>+std::optional<LoadableScript::Error> LoadableClassicScript::error() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_error)
</span><span class="cx"> return m_error;
</span><span class="cx">
</span><span class="cx"> if (m_cachedScript->errorOccurred())
</span><del>- return Error { ErrorType::CachedScript, Nullopt };
</del><ins>+ return Error { ErrorType::CachedScript, std::nullopt };
</ins><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool LoadableClassicScript::wasCanceled() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableClassicScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableClassicScript.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableClassicScript.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/LoadableClassicScript.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> static Ref<LoadableClassicScript> create(CachedResourceHandle<CachedScript>&&);
</span><span class="cx"> bool isLoaded() const final;
</span><del>- Optional<Error> error() const final;
</del><ins>+ std::optional<Error> error() const final;
</ins><span class="cx"> bool wasCanceled() const final;
</span><span class="cx">
</span><span class="cx"> CachedScript& cachedScript() { return *m_cachedScript; }
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> void notifyFinished(CachedResource&) final;
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedScript> m_cachedScript;
</span><del>- Optional<Error> m_error { Nullopt };
</del><ins>+ std::optional<Error> m_error { std::nullopt };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableModuleScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableModuleScript.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableModuleScript.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/LoadableModuleScript.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return m_moduleScript->isLoaded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LoadableScript::Error> LoadableModuleScript::error() const
</del><ins>+std::optional<LoadableScript::Error> LoadableModuleScript::error() const
</ins><span class="cx"> {
</span><span class="cx"> return m_moduleScript->error();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableModuleScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableModuleScript.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableModuleScript.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/LoadableModuleScript.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static Ref<LoadableModuleScript> create(CachedModuleScript&);
</span><span class="cx">
</span><span class="cx"> bool isLoaded() const final;
</span><del>- Optional<Error> error() const final;
</del><ins>+ std::optional<Error> error() const final;
</ins><span class="cx"> bool wasCanceled() const final;
</span><span class="cx">
</span><span class="cx"> CachedModuleScript& moduleScript() { return m_moduleScript.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableScript.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableScript.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/LoadableScript.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx">
</span><span class="cx"> struct Error {
</span><span class="cx"> ErrorType type;
</span><del>- Optional<ConsoleMessage> consoleMessage;
</del><ins>+ std::optional<ConsoleMessage> consoleMessage;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~LoadableScript() { }
</span><span class="cx">
</span><span class="cx"> virtual bool isLoaded() const = 0;
</span><del>- virtual Optional<Error> error() const = 0;
</del><ins>+ virtual std::optional<Error> error() const = 0;
</ins><span class="cx"> virtual bool wasCanceled() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual void execute(ScriptElement&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/MessageEvent.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline MessageEvent::MessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</del><ins>+inline MessageEvent::MessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</ins><span class="cx"> : Event(eventNames().messageEvent, false, false)
</span><span class="cx"> , m_dataType(DataTypeSerializedScriptValue)
</span><span class="cx"> , m_dataAsSerializedScriptValue(WTFMove(data))
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<MessageEvent> MessageEvent::create(Vector<RefPtr<MessagePort>>&& ports, RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source)
</del><ins>+Ref<MessageEvent> MessageEvent::create(Vector<RefPtr<MessagePort>>&& ports, RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&& source)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MessageEvent(WTFMove(data), origin, lastEventId, WTFMove(source), WTFMove(ports)));
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MessageEvent::initMessageEvent(ExecState& state, const AtomicString& type, bool canBubble, bool cancelable, JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</del><ins>+void MessageEvent::initMessageEvent(ExecState& state, const AtomicString& type, bool canBubble, bool cancelable, JSValue data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</ins><span class="cx"> {
</span><span class="cx"> if (dispatched())
</span><span class="cx"> return;
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> m_ports = WTFMove(ports);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</del><ins>+void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports)
</ins><span class="cx"> {
</span><span class="cx"> if (dispatched())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/MessageEvent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class MessageEvent final : public Event {
</span><span class="cx"> public:
</span><del>- static Ref<MessageEvent> create(Vector<RefPtr<MessagePort>>&&, RefPtr<SerializedScriptValue>&&, const String& origin = { }, const String& lastEventId = { }, Optional<MessageEventSource>&& source = Nullopt);
</del><ins>+ static Ref<MessageEvent> create(Vector<RefPtr<MessagePort>>&&, RefPtr<SerializedScriptValue>&&, const String& origin = { }, const String& lastEventId = { }, std::optional<MessageEventSource>&& source = std::nullopt);
</ins><span class="cx"> static Ref<MessageEvent> create(const AtomicString& type, RefPtr<SerializedScriptValue>&&, const String& origin, const String& lastEventId);
</span><span class="cx"> static Ref<MessageEvent> create(const String& data, const String& origin = { });
</span><span class="cx"> static Ref<MessageEvent> create(Ref<Blob>&& data, const String& origin);
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> JSC::JSValue data;
</span><span class="cx"> String origin;
</span><span class="cx"> String lastEventId;
</span><del>- Optional<MessageEventSource> source;
</del><ins>+ std::optional<MessageEventSource> source;
</ins><span class="cx"> Vector<RefPtr<MessagePort>> ports;
</span><span class="cx"> };
</span><span class="cx"> static Ref<MessageEvent> create(JSC::ExecState&, const AtomicString& type, Init&&, IsTrusted = IsTrusted::No);
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">
</span><span class="cx"> virtual ~MessageEvent();
</span><span class="cx">
</span><del>- void initMessageEvent(JSC::ExecState&, const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
- void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
</del><ins>+ void initMessageEvent(JSC::ExecState&, const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
+ void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
</ins><span class="cx">
</span><span class="cx"> const String& origin() const { return m_origin; }
</span><span class="cx"> const String& lastEventId() const { return m_lastEventId; }
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> private:
</span><span class="cx"> MessageEvent();
</span><span class="cx"> MessageEvent(JSC::ExecState&, const AtomicString&, Init&&, IsTrusted);
</span><del>- MessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
</del><ins>+ MessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, std::optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
</ins><span class="cx"> MessageEvent(const AtomicString& type, RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId);
</span><span class="cx"> MessageEvent(const String& data, const String& origin);
</span><span class="cx"> MessageEvent(Ref<Blob>&& data, const String& origin);
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> RefPtr<ArrayBuffer> m_dataAsArrayBuffer;
</span><span class="cx"> String m_origin;
</span><span class="cx"> String m_lastEventId;
</span><del>- Optional<MessageEventSource> m_source;
</del><ins>+ std::optional<MessageEventSource> m_source;
</ins><span class="cx"> Vector<RefPtr<MessagePort>> m_ports;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> options |= ChildList;
</span><span class="cx"> if (init.subtree)
</span><span class="cx"> options |= Subtree;
</span><del>- if (init.attributeOldValue.valueOr(false))
</del><ins>+ if (init.attributeOldValue.value_or(false))
</ins><span class="cx"> options |= AttributeOldValue;
</span><del>- if (init.characterDataOldValue.valueOr(false))
</del><ins>+ if (init.characterDataOldValue.value_or(false))
</ins><span class="cx"> options |= CharacterDataOldValue;
</span><span class="cx">
</span><span class="cx"> HashSet<AtomicString> attributeFilter;
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/MutationObserver.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx">
</span><span class="cx"> struct Init {
</span><span class="cx"> bool childList;
</span><del>- Optional<bool> attributes;
- Optional<bool> characterData;
</del><ins>+ std::optional<bool> attributes;
+ std::optional<bool> characterData;
</ins><span class="cx"> bool subtree;
</span><del>- Optional<bool> attributeOldValue;
- Optional<bool> characterDataOldValue;
- Optional<Vector<String>> attributeFilter;
</del><ins>+ std::optional<bool> attributeOldValue;
+ std::optional<bool> characterDataOldValue;
+ std::optional<Vector<String>> attributeFilter;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> observe(Node&, const Init&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> String charset = attrs.get("charset");
</span><del>- CachedResourceRequest request(document().completeURL(href), CachedResourceLoader::defaultCachedResourceOptions(), Nullopt, charset.isEmpty() ? document().charset() : WTFMove(charset));
</del><ins>+ CachedResourceRequest request(document().completeURL(href), CachedResourceLoader::defaultCachedResourceOptions(), std::nullopt, charset.isEmpty() ? document().charset() : WTFMove(charset));
</ins><span class="cx">
</span><span class="cx"> m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -77,11 +77,11 @@
</span><span class="cx"> m_hostElement = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> PseudoElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</del><ins>+std::optional<ElementStyle> PseudoElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> auto* style = m_hostElement->renderer()->getCachedPseudoStyle(m_pseudoId, &parentStyle);
</span><span class="cx"> if (!style)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return ElementStyle(RenderStyle::clonePtr(*style));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/PseudoElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> Element* hostElement() const { return m_hostElement; }
</span><span class="cx"> void clearHostElement();
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> void didAttachRenderers() override;
</span><span class="cx"> void didRecalcStyle(Style::Change) override;
</span><span class="cx"> bool rendererIsNeeded(const RenderStyle&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeBoundaryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RangeBoundaryPoint.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/RangeBoundaryPoint.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<Node> m_containerNode;
</span><del>- mutable Optional<unsigned> m_offsetInContainer { 0 };
</del><ins>+ mutable std::optional<unsigned> m_offsetInContainer { 0 };
</ins><span class="cx"> RefPtr<Node> m_childBeforeBoundary;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> ASSERT(child.parentNode());
</span><span class="cx"> m_childBeforeBoundary = child.previousSibling();
</span><span class="cx"> m_containerNode = child.parentNode();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? std::nullopt : std::optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::setToAfterChild(Node& child)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> ASSERT(child.parentNode());
</span><span class="cx"> m_childBeforeBoundary = &child;
</span><span class="cx"> m_containerNode = child.parentNode();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? std::nullopt : std::optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::setToStartOfNode(Ref<Node>&& container)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> m_childBeforeBoundary = nullptr;
</span><span class="cx"> } else {
</span><span class="cx"> m_childBeforeBoundary = m_containerNode->lastChild();
</span><del>- m_offsetInContainer = m_childBeforeBoundary ? Nullopt : Optional<unsigned>(0);
</del><ins>+ m_offsetInContainer = m_childBeforeBoundary ? std::nullopt : std::optional<unsigned>(0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> inline void RangeBoundaryPoint::invalidateOffset() const
</span><span class="cx"> {
</span><del>- m_offsetInContainer = Nullopt;
</del><ins>+ m_offsetInContainer = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const RangeBoundaryPoint& a, const RangeBoundaryPoint& b)
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> m_element.dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ScriptElement::ScriptType> ScriptElement::determineScriptType(LegacyTypeSupport supportLegacyTypes) const
</del><ins>+std::optional<ScriptElement::ScriptType> ScriptElement::determineScriptType(LegacyTypeSupport supportLegacyTypes) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: isLegacySupportedJavaScriptLanguage() is not valid HTML5. It is used here to maintain backwards compatibility with existing layout tests. The specific violations are:
</span><span class="cx"> // - Allowing type=javascript. type= should only support MIME types, such as text/javascript.
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> return ScriptType::Classic;
</span><span class="cx"> if (isLegacySupportedJavaScriptLanguage(language))
</span><span class="cx"> return ScriptType::Classic;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace()))
</span><span class="cx"> return ScriptType::Classic;
</span><span class="lines">@@ -168,16 +168,16 @@
</span><span class="cx"> // Once "defer" is implemented, we can reconsider enabling modules in XHTML.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=123387
</span><span class="cx"> if (!m_element.document().isHTMLDocument())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto* settings = m_element.document().settings();
</span><span class="cx"> if (!settings || !settings->es6ModulesEnabled())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> // https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
</span><span class="cx"> // Setting the attribute to an ASCII case-insensitive match for the string "module" means that the script is a module script.
</span><span class="cx"> if (equalLettersIgnoringASCIICase(type, "module"))
</span><span class="cx"> return ScriptType::Module;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // http://dev.w3.org/html5/spec/Overview.html#prepare-a-script
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ScriptType scriptType = ScriptType::Classic;
</span><del>- if (Optional<ScriptType> result = determineScriptType(supportLegacyTypes))
</del><ins>+ if (std::optional<ScriptType> result = determineScriptType(supportLegacyTypes))
</ins><span class="cx"> scriptType = result.value();
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="lines">@@ -438,8 +438,8 @@
</span><span class="cx">
</span><span class="cx"> void ScriptElement::executeScriptAndDispatchEvent(LoadableScript& loadableScript)
</span><span class="cx"> {
</span><del>- if (Optional<LoadableScript::Error> error = loadableScript.error()) {
- if (Optional<LoadableScript::ConsoleMessage> message = error->consoleMessage)
</del><ins>+ if (std::optional<LoadableScript::Error> error = loadableScript.error()) {
+ if (std::optional<LoadableScript::ConsoleMessage> message = error->consoleMessage)
</ins><span class="cx"> m_element.document().addConsoleMessage(message->source, message->level, message->message);
</span><span class="cx"> dispatchErrorEvent();
</span><span class="cx"> } else if (!loadableScript.wasCanceled()) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/ScriptElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void executeScriptAndDispatchEvent(LoadableScript&);
</span><span class="cx">
</span><del>- Optional<ScriptType> determineScriptType(LegacyTypeSupport) const;
</del><ins>+ std::optional<ScriptType> determineScriptType(LegacyTypeSupport) const;
</ins><span class="cx"> bool ignoresLoadRequest() const;
</span><span class="cx"> bool isScriptForEventSupported() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TextDecoder.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TextDecoder.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/TextDecoder.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> return 2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<String> TextDecoder::decode(Optional<BufferSource::VariantType> input, DecodeOptions options)
</del><ins>+ExceptionOr<String> TextDecoder::decode(std::optional<BufferSource::VariantType> input, DecodeOptions options)
</ins><span class="cx"> {
</span><del>- Optional<BufferSource> inputBuffer;
</del><ins>+ std::optional<BufferSource> inputBuffer;
</ins><span class="cx"> const uint8_t* data = nullptr;
</span><span class="cx"> size_t length = 0;
</span><span class="cx"> if (input) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TextDecoder.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TextDecoder.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/TextDecoder.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> String encoding() const;
</span><span class="cx"> bool fatal() const { return m_options.fatal; }
</span><span class="cx"> bool ignoreBOM() const { return m_options.ignoreBOM; }
</span><del>- ExceptionOr<String> decode(Optional<BufferSource::VariantType>, DecodeOptions);
</del><ins>+ ExceptionOr<String> decode(std::optional<BufferSource::VariantType>, DecodeOptions);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String prependBOMIfNecessary(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> observer(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UserGestureIndicator::UserGestureIndicator(Optional<ProcessingUserGestureState> state, Document* document)
</del><ins>+UserGestureIndicator::UserGestureIndicator(std::optional<ProcessingUserGestureState> state, Document* document)
</ins><span class="cx"> : m_previousToken(currentToken())
</span><span class="cx"> {
</span><span class="cx"> // Silently ignore UserGestureIndicators on non main threads.
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserGestureIndicator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> WEBCORE_EXPORT static bool processingUserGestureForMedia();
</span><span class="cx">
</span><span class="cx"> // If a document is provided, its last known user gesture timestamp is updated.
</span><del>- WEBCORE_EXPORT explicit UserGestureIndicator(Optional<ProcessingUserGestureState>, Document* = nullptr);
</del><ins>+ WEBCORE_EXPORT explicit UserGestureIndicator(std::optional<ProcessingUserGestureState>, Document* = nullptr);
</ins><span class="cx"> WEBCORE_EXPORT explicit UserGestureIndicator(RefPtr<UserGestureToken>);
</span><span class="cx"> WEBCORE_EXPORT ~UserGestureIndicator();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1535,11 +1535,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<VisibleSelection> CompositeEditCommand::shouldBreakOutOfEmptyListItem() const
</del><ins>+std::optional<VisibleSelection> CompositeEditCommand::shouldBreakOutOfEmptyListItem() const
</ins><span class="cx"> {
</span><span class="cx"> auto emptyListItem = enclosingEmptyListItem(endingSelection().visibleStart());
</span><span class="cx"> if (!emptyListItem)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto listNode = emptyListItem->parentNode();
</span><span class="cx"> // FIXME: Can't we do something better when the immediate parent wasn't a list node?
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> || (!listNode->hasTagName(ulTag) && !listNode->hasTagName(olTag))
</span><span class="cx"> || !listNode->hasEditableStyle()
</span><span class="cx"> || listNode == emptyListItem->rootEditableElement())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return VisibleSelection(endingSelection().start().previous(BackwardDeletion), endingSelection().end());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> void cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* outerNode, Element* blockElement);
</span><span class="cx"> void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition());
</span><span class="cx">
</span><del>- Optional<VisibleSelection> shouldBreakOutOfEmptyListItem() const;
</del><ins>+ std::optional<VisibleSelection> shouldBreakOutOfEmptyListItem() const;
</ins><span class="cx"> bool breakOutOfEmptyListItem();
</span><span class="cx"> bool breakOutOfEmptyMailBlockquotedParagraph();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/fileapi/File.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> String m_path;
</span><span class="cx"> String m_name;
</span><span class="cx">
</span><del>- Optional<int64_t> m_overrideLastModifiedDate;
</del><ins>+ std::optional<int64_t> m_overrideLastModifiedDate;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/history/CachedFrame.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> std::unique_ptr<CachedFramePlatformData> m_cachedFramePlatformData;
</span><span class="cx"> bool m_isMainFrame;
</span><span class="cx"> bool m_isComposited;
</span><del>- Optional<HasInsecureContent> m_hasInsecureContent;
</del><ins>+ std::optional<HasInsecureContent> m_hasInsecureContent;
</ins><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<CachedFrame>> m_childFrames;
</span><span class="cx"> };
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> WEBCORE_EXPORT CachedFramePlatformData* cachedFramePlatformData();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setHasInsecureContent(HasInsecureContent);
</span><del>- Optional<HasInsecureContent> hasInsecureContent() const { return m_hasInsecureContent; }
</del><ins>+ std::optional<HasInsecureContent> hasInsecureContent() const { return m_hasInsecureContent; }
</ins><span class="cx">
</span><span class="cx"> using CachedFrameBase::document;
</span><span class="cx"> using CachedFrameBase::view;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return removeInternal(&token.string(), 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<bool> DOMTokenList::toggle(const AtomicString& token, Optional<bool> force)
</del><ins>+ExceptionOr<bool> DOMTokenList::toggle(const AtomicString& token, std::optional<bool> force)
</ins><span class="cx"> {
</span><span class="cx"> auto result = validateToken(token);
</span><span class="cx"> if (result.hasException())
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> auto& tokens = this->tokens();
</span><span class="cx">
</span><span class="cx"> if (tokens.contains(token)) {
</span><del>- if (!force.valueOr(false)) {
</del><ins>+ if (!force.value_or(false)) {
</ins><span class="cx"> tokens.removeFirst(token);
</span><span class="cx"> updateAssociatedAttributeFromTokens();
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/DOMTokenList.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> ExceptionOr<void> add(const AtomicString&);
</span><span class="cx"> ExceptionOr<void> remove(const Vector<String>&);
</span><span class="cx"> ExceptionOr<void> remove(const AtomicString&);
</span><del>- WEBCORE_EXPORT ExceptionOr<bool> toggle(const AtomicString&, Optional<bool> force);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<bool> toggle(const AtomicString&, std::optional<bool> force);
</ins><span class="cx"> ExceptionOr<void> replace(const AtomicString& token, const AtomicString& newToken);
</span><span class="cx"> ExceptionOr<bool> supports(StringView token);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ShouldSendReferrer shouldSendReferrer = hasRel(Relation::NoReferrer) ? NeverSendReferrer : MaybeSendReferrer;
</span><del>- auto newFrameOpenerPolicy = hasRel(Relation::NoOpener) ? makeOptional(NewFrameOpenerPolicy::Suppress) : Nullopt;
</del><ins>+ auto newFrameOpenerPolicy = hasRel(Relation::NoOpener) ? std::make_optional(NewFrameOpenerPolicy::Suppress) : std::nullopt;
</ins><span class="cx"> frame->loader().urlSelected(completedURL, target(), &event, LockHistory::No, LockBackForwardList::No, shouldSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate(), newFrameOpenerPolicy, downloadAttribute);
</span><span class="cx">
</span><span class="cx"> sendPings(completedURL);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> return mimeType.convertToASCIILowercase();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<String> HTMLCanvasElement::toDataURL(const String& mimeType, Optional<double> quality)
</del><ins>+ExceptionOr<String> HTMLCanvasElement::toDataURL(const String& mimeType, std::optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_originClean)
</span><span class="cx"> return Exception { SECURITY_ERR };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</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 ExceptionOr<String> toDataURL(const String& mimeType, Optional<double> quality);
- ExceptionOr<String> toDataURL(const String& mimeType) { return toDataURL(mimeType, Nullopt); }
</del><ins>+ WEBCORE_EXPORT ExceptionOr<String> toDataURL(const String& mimeType, std::optional<double> quality);
+ ExceptionOr<String> toDataURL(const String& mimeType) { return toDataURL(mimeType, std::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="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned HTMLElement::parseBorderWidthAttribute(const AtomicString& value) const
</span><span class="cx"> {
</span><del>- if (Optional<unsigned> borderWidth = parseHTMLNonNegativeInteger(value))
</del><ins>+ if (std::optional<unsigned> borderWidth = parseHTMLNonNegativeInteger(value))
</ins><span class="cx"> return borderWidth.value();
</span><span class="cx">
</span><span class="cx"> return hasTagName(tableTag) ? 1 : 0;
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> if (name == tabindexAttr) {
</span><span class="cx"> if (value.isEmpty())
</span><span class="cx"> clearTabIndexExplicitlyIfNeeded();
</span><del>- else if (Optional<int> tabIndex = parseHTMLInteger(value))
</del><ins>+ else if (std::optional<int> tabIndex = parseHTMLInteger(value))
</ins><span class="cx"> setTabIndexExplicitly(tabIndex.value());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> setPictureElement(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document& document, Optional<unsigned> width, Optional<unsigned> height)
</del><ins>+Ref<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document& document, std::optional<unsigned> width, std::optional<unsigned> height)
</ins><span class="cx"> {
</span><span class="cx"> auto image = adoptRef(*new HTMLImageElement(imgTag, document));
</span><span class="cx"> if (width)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!renderer()) {
</span><span class="cx"> // check the attribute first for an explicit pixel value
</span><del>- Optional<unsigned> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
</del><ins>+ std::optional<unsigned> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
</ins><span class="cx"> if (width)
</span><span class="cx"> return width.value();
</span><span class="cx">
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!renderer()) {
</span><span class="cx"> // check the attribute first for an explicit pixel value
</span><del>- Optional<unsigned> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
</del><ins>+ std::optional<unsigned> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
</ins><span class="cx"> if (height)
</span><span class="cx"> return height.value();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLImageElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLImageElement> create(Document&);
</span><span class="cx"> static Ref<HTMLImageElement> create(const QualifiedName&, Document&, HTMLFormElement*);
</span><del>- static Ref<HTMLImageElement> createForJSConstructor(Document&, Optional<unsigned> width, Optional<unsigned> height);
</del><ins>+ static Ref<HTMLImageElement> createForJSConstructor(Document&, std::optional<unsigned> width, std::optional<unsigned> height);
</ins><span class="cx">
</span><span class="cx"> virtual ~HTMLImageElement();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><del>-Optional<Decimal> HTMLInputElement::findClosestTickMarkValue(const Decimal& value)
</del><ins>+std::optional<Decimal> HTMLInputElement::findClosestTickMarkValue(const Decimal& value)
</ins><span class="cx"> {
</span><span class="cx"> return m_inputType->findClosestTickMarkValue(value);
</span><span class="cx"> }
</span><span class="lines">@@ -1775,7 +1775,7 @@
</span><span class="cx"> void HTMLInputElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> unsigned oldEffectiveMaxLength = effectiveMaxLength();
</span><del>- internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).value_or(-1));
</ins><span class="cx"> if (oldEffectiveMaxLength != effectiveMaxLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -1787,7 +1787,7 @@
</span><span class="cx"> void HTMLInputElement::minLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> int oldMinLength = minLength();
</span><del>- internalSetMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ internalSetMinLength(parseHTMLNonNegativeInteger(newValue).value_or(-1));
</ins><span class="cx"> if (oldMinLength != minLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> StepRange createStepRange(AnyStepHandling) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><del>- Optional<Decimal> findClosestTickMarkValue(const Decimal&);
</del><ins>+ std::optional<Decimal> findClosestTickMarkValue(const Decimal&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ExceptionOr<void> stepUp(int = 1);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> bool mediaQueryMatches = true;
</span><span class="cx"> if (!m_media.isEmpty()) {
</span><del>- Optional<RenderStyle> documentStyle;
</del><ins>+ std::optional<RenderStyle> documentStyle;
</ins><span class="cx"> if (document().hasLivingRenderTree())
</span><span class="cx"> documentStyle = Style::resolveForDocument(document());
</span><span class="cx"> auto media = MediaQuerySet::create(m_media);
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> addPendingSheet(isActive ? ActiveSheet : InactiveSheet);
</span><span class="cx">
</span><span class="cx"> // Load stylesheets that are not needed for the rendering immediately with low priority.
</span><del>- Optional<ResourceLoadPriority> priority;
</del><ins>+ std::optional<ResourceLoadPriority> priority;
</ins><span class="cx"> if (!isActive)
</span><span class="cx"> priority = ResourceLoadPriority::VeryLow;
</span><span class="cx"> CachedResourceRequest request(url, CachedResourceLoader::defaultCachedResourceOptions(), priority, WTFMove(charset));
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> void HTMLLinkElement::initializeStyleSheet(Ref<StyleSheetContents>&& styleSheet, const CachedCSSStyleSheet& cachedStyleSheet)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: originClean should be turned to false except if fetch mode is CORS.
</span><del>- Optional<bool> originClean;
</del><ins>+ std::optional<bool> originClean;
</ins><span class="cx"> if (cachedStyleSheet.options().mode == FetchOptions::Mode::Cors)
</span><span class="cx"> originClean = cachedStyleSheet.isCORSSameOrigin();
</span><span class="cx">
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> return attributeWithoutSynchronization(typeAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LinkIconType> HTMLLinkElement::iconType() const
</del><ins>+std::optional<LinkIconType> HTMLLinkElement::iconType() const
</ins><span class="cx"> {
</span><span class="cx"> return m_relAttribute.iconType;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& type() const;
</span><span class="cx">
</span><del>- Optional<LinkIconType> iconType() const;
</del><ins>+ std::optional<LinkIconType> iconType() const;
</ins><span class="cx">
</span><span class="cx"> CSSStyleSheet* sheet() const { return m_sheet.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOListElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOListElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOListElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLOListElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</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>- Optional<int> m_start;
</del><ins>+ std::optional<int> m_start;
</ins><span class="cx"> unsigned m_itemCount;
</span><span class="cx">
</span><span class="cx"> bool m_isReversed : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> return adoptRef(*new HTMLOptionsCollection(select));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> HTMLOptionsCollection::add(const OptionOrOptGroupElement& element, const Optional<HTMLElementOrInt>& before)
</del><ins>+ExceptionOr<void> HTMLOptionsCollection::add(const OptionOrOptGroupElement& element, const std::optional<HTMLElementOrInt>& before)
</ins><span class="cx"> {
</span><span class="cx"> return selectElement().add(element, before);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> using OptionOrOptGroupElement = Variant<RefPtr<HTMLOptionElement>, RefPtr<HTMLOptGroupElement>>;
</span><span class="cx"> using HTMLElementOrInt = Variant<RefPtr<HTMLElement>, int>;
</span><del>- WEBCORE_EXPORT ExceptionOr<void> add(const OptionOrOptGroupElement&, const Optional<HTMLElementOrInt>& before);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> add(const OptionOrOptGroupElement&, const std::optional<HTMLElementOrInt>& before);
</ins><span class="cx"> WEBCORE_EXPORT void remove(int index);
</span><span class="cx"> void remove(HTMLOptionElement&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> return lastSelectedListIndex();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> HTMLSelectElement::add(const OptionOrOptGroupElement& element, const Optional<HTMLElementOrInt>& before)
</del><ins>+ExceptionOr<void> HTMLSelectElement::add(const OptionOrOptGroupElement& element, const std::optional<HTMLElementOrInt>& before)
</ins><span class="cx"> {
</span><span class="cx"> HTMLElement* beforeElement = nullptr;
</span><span class="cx"> if (before) {
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx">
</span><span class="cx"> if (diff < 0) { // Add dummy elements.
</span><span class="cx"> do {
</span><del>- auto result = add(HTMLOptionElement::create(document()).ptr(), Nullopt);
</del><ins>+ auto result = add(HTMLOptionElement::create(document()).ptr(), std::nullopt);
</ins><span class="cx"> if (result.hasException())
</span><span class="cx"> return result;
</span><span class="cx"> } while (++diff);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> using OptionOrOptGroupElement = Variant<RefPtr<HTMLOptionElement>, RefPtr<HTMLOptGroupElement>>;
</span><span class="cx"> using HTMLElementOrInt = Variant<RefPtr<HTMLElement>, int>;
</span><del>- WEBCORE_EXPORT ExceptionOr<void> add(const OptionOrOptGroupElement&, const Optional<HTMLElementOrInt>& before);
</del><ins>+ WEBCORE_EXPORT ExceptionOr<void> add(const OptionOrOptGroupElement&, const std::optional<HTMLElementOrInt>& before);
</ins><span class="cx">
</span><span class="cx"> using Node::remove;
</span><span class="cx"> ExceptionOr<void> remove(HTMLOptionElement&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -203,13 +203,13 @@
</span><span class="cx">
</span><span class="cx"> void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><del>- internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).value_or(-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>- internalSetMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ internalSetMinLength(parseHTMLNonNegativeInteger(newValue).value_or(-1));
</ins><span class="cx"> updateValidity();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageInputType.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageInputType.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/ImageInputType.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element->renderer()) {
</span><span class="cx"> // Check the attribute first for an explicit pixel value.
</span><del>- if (Optional<unsigned> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
</del><ins>+ if (std::optional<unsigned> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
</ins><span class="cx"> return height.value();
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its height.
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element->renderer()) {
</span><span class="cx"> // Check the attribute first for an explicit pixel value.
</span><del>- if (Optional<unsigned> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
</del><ins>+ if (std::optional<unsigned> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
</ins><span class="cx"> return width.value();
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its width.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/InputType.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -955,10 +955,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Decimal> InputType::findClosestTickMarkValue(const Decimal&)
</del><ins>+std::optional<Decimal> InputType::findClosestTickMarkValue(const Decimal&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/InputType.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> virtual void listAttributeTargetChanged();
</span><del>- virtual Optional<Decimal> findClosestTickMarkValue(const Decimal&);
</del><ins>+ virtual std::optional<Decimal> findClosestTickMarkValue(const Decimal&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLinkIconCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LinkIconCollector.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LinkIconCollector.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/LinkIconCollector.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> // This icon size parsing is a little wonky - it only parses the first
</span><span class="cx"> // part of the size, "60x70" becomes "60". This is for compatibility reasons
</span><span class="cx"> // and is probably good enough for now.
</span><del>- Optional<unsigned> iconSize;
</del><ins>+ std::optional<unsigned> iconSize;
</ins><span class="cx">
</span><span class="cx"> if (linkElement.sizes().length()) {
</span><span class="cx"> bool ok;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLinkRelAttributeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LinkRelAttribute.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LinkRelAttribute.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/LinkRelAttribute.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> struct LinkRelAttribute {
</span><span class="cx"> bool isStyleSheet { false };
</span><del>- Optional<LinkIconType> iconType;
</del><ins>+ std::optional<LinkIconType> iconType;
</ins><span class="cx"> bool isAlternate { false };
</span><span class="cx"> bool isDNSPrefetch { false };
</span><span class="cx"> bool isLinkPreload { false };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRangeInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RangeInputType.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RangeInputType.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/RangeInputType.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -381,11 +381,11 @@
</span><span class="cx"> std::sort(m_tickMarkValues.begin(), m_tickMarkValues.end());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Decimal> RangeInputType::findClosestTickMarkValue(const Decimal& value)
</del><ins>+std::optional<Decimal> RangeInputType::findClosestTickMarkValue(const Decimal& value)
</ins><span class="cx"> {
</span><span class="cx"> updateTickMarkValues();
</span><span class="cx"> if (!m_tickMarkValues.size())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> size_t left = 0;
</span><span class="cx"> size_t right = m_tickMarkValues.size();
</span><span class="lines">@@ -408,8 +408,8 @@
</span><span class="cx"> right = middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<Decimal> closestLeft = middle ? makeOptional(m_tickMarkValues[middle - 1]) : Nullopt;
- Optional<Decimal> closestRight = middle != m_tickMarkValues.size() ? makeOptional(m_tickMarkValues[middle]) : Nullopt;
</del><ins>+ std::optional<Decimal> closestLeft = middle ? std::make_optional(m_tickMarkValues[middle - 1]) : std::nullopt;
+ std::optional<Decimal> closestRight = middle != m_tickMarkValues.size() ? std::make_optional(m_tickMarkValues[middle]) : std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (!closestLeft)
</span><span class="cx"> return closestRight;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRangeInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RangeInputType.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RangeInputType.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/RangeInputType.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> void listAttributeTargetChanged() final;
</span><span class="cx"> void updateTickMarkValues();
</span><del>- Optional<Decimal> findClosestTickMarkValue(const Decimal&) final;
</del><ins>+ std::optional<Decimal> findClosestTickMarkValue(const Decimal&) final;
</ins><span class="cx">
</span><span class="cx"> bool m_tickMarkValuesDirty { true };
</span><span class="cx"> Vector<Decimal> m_tickMarkValues;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_path.transform(state().transform);
</span><span class="cx"> m_stateStack.removeLast();
</span><del>- if (Optional<AffineTransform> inverse = state().transform.inverse())
</del><ins>+ if (std::optional<AffineTransform> inverse = state().transform.inverse())
</ins><span class="cx"> m_path.transform(inverse.value());
</span><span class="cx"> GraphicsContext* c = drawingContext();
</span><span class="cx"> if (!c)
</span><span class="lines">@@ -832,7 +832,7 @@
</span><span class="cx"> modifiableState().hasInvertibleTransform = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setStrokeColor(const String& color, Optional<float> alpha)
</del><ins>+void CanvasRenderingContext2D::setStrokeColor(const String& color, std::optional<float> alpha)
</ins><span class="cx"> {
</span><span class="cx"> if (alpha) {
</span><span class="cx"> setStrokeStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha.value()));
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> setStrokeStyle(CanvasStyle(c, m, y, k, a));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setFillColor(const String& color, Optional<float> alpha)
</del><ins>+void CanvasRenderingContext2D::setFillColor(const String& color, std::optional<float> alpha)
</ins><span class="cx"> {
</span><span class="cx"> if (alpha) {
</span><span class="cx"> setFillStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha.value()));
</span><span class="lines">@@ -1114,7 +1114,7 @@
</span><span class="cx"> if (!state().hasInvertibleTransform)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint transformedPoint = state().transform.inverse().valueOr(AffineTransform()).mapPoint(FloatPoint(x, y));
</del><ins>+ FloatPoint transformedPoint = state().transform.inverse().value_or(AffineTransform()).mapPoint(FloatPoint(x, y));
</ins><span class="cx">
</span><span class="cx"> if (!std::isfinite(transformedPoint.x()) || !std::isfinite(transformedPoint.y()))
</span><span class="cx"> return false;
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> if (!state().hasInvertibleTransform)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint transformedPoint = state().transform.inverse().valueOr(AffineTransform()).mapPoint(FloatPoint(x, y));
</del><ins>+ FloatPoint transformedPoint = state().transform.inverse().value_or(AffineTransform()).mapPoint(FloatPoint(x, y));
</ins><span class="cx"> if (!std::isfinite(transformedPoint.x()) || !std::isfinite(transformedPoint.y()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1249,7 +1249,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setShadow(float width, float height, float blur, const String& colorString, Optional<float> alpha)
</del><ins>+void CanvasRenderingContext2D::setShadow(float width, float height, float blur, const String& colorString, std::optional<float> alpha)
</ins><span class="cx"> {
</span><span class="cx"> Color color = parseColorOrCurrentColor(colorString, &canvas());
</span><span class="cx"> if (!colorString.isNull() && !color.isValid())
</span><span class="lines">@@ -2257,12 +2257,12 @@
</span><span class="cx"> modifiableState().direction = direction;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::fillText(const String& text, float x, float y, Optional<float> maxWidth)
</del><ins>+void CanvasRenderingContext2D::fillText(const String& text, float x, float y, std::optional<float> maxWidth)
</ins><span class="cx"> {
</span><span class="cx"> drawTextInternal(text, x, y, true, maxWidth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::strokeText(const String& text, float x, float y, Optional<float> maxWidth)
</del><ins>+void CanvasRenderingContext2D::strokeText(const String& text, float x, float y, std::optional<float> maxWidth)
</ins><span class="cx"> {
</span><span class="cx"> drawTextInternal(text, x, y, false, maxWidth);
</span><span class="cx"> }
</span><span class="lines">@@ -2310,7 +2310,7 @@
</span><span class="cx"> return metrics;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, Optional<float> maxWidth)
</del><ins>+void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, std::optional<float> maxWidth)
</ins><span class="cx"> {
</span><span class="cx"> const auto& fontProxy = this->fontProxy();
</span><span class="cx"> const FontMetrics& fontMetrics = fontProxy.fontMetrics();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx"> void setTransform(float m11, float m12, float m21, float m22, float dx, float dy);
</span><span class="cx"> void resetTransform();
</span><span class="cx">
</span><del>- void setStrokeColor(const String& color, Optional<float> alpha = Nullopt);
</del><ins>+ void setStrokeColor(const String& color, std::optional<float> alpha = std::nullopt);
</ins><span class="cx"> void setStrokeColor(float grayLevel, float alpha = 1.0);
</span><span class="cx"> void setStrokeColor(float r, float g, float b, float a);
</span><span class="cx"> void setStrokeColor(float c, float m, float y, float k, float a);
</span><span class="cx">
</span><del>- void setFillColor(const String& color, Optional<float> alpha = Nullopt);
</del><ins>+ void setFillColor(const String& color, std::optional<float> alpha = std::nullopt);
</ins><span class="cx"> void setFillColor(float grayLevel, float alpha = 1.0f);
</span><span class="cx"> void setFillColor(float r, float g, float b, float a);
</span><span class="cx"> void setFillColor(float c, float m, float y, float k, float a);
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> void fillRect(float x, float y, float width, float height);
</span><span class="cx"> void strokeRect(float x, float y, float width, float height);
</span><span class="cx">
</span><del>- void setShadow(float width, float height, float blur, const String& color = String(), Optional<float> alpha = Nullopt);
</del><ins>+ void setShadow(float width, float height, float blur, const String& color = String(), std::optional<float> alpha = std::nullopt);
</ins><span class="cx"> void setShadow(float width, float height, float blur, float grayLevel, float alpha = 1.0);
</span><span class="cx"> void setShadow(float width, float height, float blur, float r, float g, float b, float a);
</span><span class="cx"> void setShadow(float width, float height, float blur, float c, float m, float y, float k, float a);
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> String direction() const;
</span><span class="cx"> void setDirection(const String&);
</span><span class="cx">
</span><del>- void fillText(const String& text, float x, float y, Optional<float> maxWidth = Nullopt);
- void strokeText(const String& text, float x, float y, Optional<float> maxWidth = Nullopt);
</del><ins>+ void fillText(const String& text, float x, float y, std::optional<float> maxWidth = std::nullopt);
+ void strokeText(const String& text, float x, float y, std::optional<float> maxWidth = std::nullopt);
</ins><span class="cx"> Ref<TextMetrics> measureText(const String& text);
</span><span class="cx">
</span><span class="cx"> LineCap getLineCap() const { return state().lineCap; }
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> void applyStrokePattern();
</span><span class="cx"> void applyFillPattern();
</span><span class="cx">
</span><del>- void drawTextInternal(const String& text, float x, float y, bool fill, Optional<float> maxWidth = Nullopt);
</del><ins>+ void drawTextInternal(const String& text, float x, float y, bool fill, std::optional<float> maxWidth = std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // The relationship between FontCascade and CanvasRenderingContext2D::FontProxy must hold certain invariants.
</span><span class="cx"> // Therefore, all font operations must pass through the State.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,12 +88,12 @@
</span><span class="cx"> m_context->getExtensions().ensureEnabled("GL_EXT_frag_depth");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static Optional<unsigned> arrayBufferViewElementSize(const ArrayBufferView& data)
</del><ins>+inline static std::optional<unsigned> arrayBufferViewElementSize(const ArrayBufferView& data)
</ins><span class="cx"> {
</span><span class="cx"> switch (data.getType()) {
</span><span class="cx"> case JSC::NotTypedArray:
</span><span class="cx"> case JSC::TypeDataView:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case JSC::TypeInt8:
</span><span class="cx"> case JSC::TypeUint8:
</span><span class="cx"> case JSC::TypeUint8Clamped:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, Optional<BufferDataSource>&& data, GC3Denum usage)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, std::optional<BufferDataSource>&& data, GC3Denum usage)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> }, data.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, Optional<BufferDataSource>&& data)
</del><ins>+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, std::optional<BufferDataSource>&& data)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -3448,7 +3448,7 @@
</span><span class="cx"> m_context->pixelStorei(GraphicsContext3D::UNPACK_ALIGNMENT, m_unpackAlignment);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Denum format, GC3Denum type, Optional<TexImageSource>&& source)
</del><ins>+ExceptionOr<void> WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Denum format, GC3Denum type, std::optional<TexImageSource>&& source)
</ins><span class="cx"> {
</span><span class="cx"> if (!source) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "texSubImage2D", "source is null");
</span><span class="lines">@@ -3575,7 +3575,7 @@
</span><span class="cx"> return WTF::visit(visitor, source.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLRenderingContextBase::validateArrayBufferType(const char* functionName, GC3Denum type, Optional<JSC::TypedArrayType> arrayType)
</del><ins>+bool WebGLRenderingContextBase::validateArrayBufferType(const char* functionName, GC3Denum type, std::optional<JSC::TypedArrayType> arrayType)
</ins><span class="cx"> {
</span><span class="cx"> #define TYPE_VALIDATION_CASE(arrayTypeMacro) if (arrayType && arrayType.value() != JSC::arrayTypeMacro) { \
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "ArrayBufferView not " #arrayTypeMacro); \
</span><span class="lines">@@ -3636,7 +3636,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!validateSettableTexInternalFormat(functionName, internalFormat))
</span><span class="cx"> return false;
</span><del>- if (!validateArrayBufferType(functionName, type, pixels ? Optional<JSC::TypedArrayType>(pixels->getType()) : Nullopt))
</del><ins>+ if (!validateArrayBufferType(functionName, type, pixels ? std::optional<JSC::TypedArrayType>(pixels->getType()) : std::nullopt))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> unsigned totalBytesRequired;
</span><span class="lines">@@ -3982,7 +3982,7 @@
</span><span class="cx"> || internalFormat == GraphicsContext3D::RGBA8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, Optional<TexImageSource> source)
</del><ins>+ExceptionOr<void> WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, std::optional<TexImageSource> source)
</ins><span class="cx"> {
</span><span class="cx"> if (!source) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "texImage2D", "source is null");
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx">
</span><span class="cx"> using BufferDataSource = WTF::Variant<RefPtr<ArrayBuffer>, RefPtr<ArrayBufferView>>;
</span><span class="cx"> void bufferData(GC3Denum target, long long size, GC3Denum usage);
</span><del>- void bufferData(GC3Denum target, Optional<BufferDataSource>&&, GC3Denum usage);
- void bufferSubData(GC3Denum target, long long offset, Optional<BufferDataSource>&&);
</del><ins>+ void bufferData(GC3Denum target, std::optional<BufferDataSource>&&, GC3Denum usage);
+ void bufferSubData(GC3Denum target, long long offset, std::optional<BufferDataSource>&&);
</ins><span class="cx">
</span><span class="cx"> GC3Denum checkFramebufferStatus(GC3Denum target);
</span><span class="cx"> virtual void clear(GC3Dbitfield mask) = 0;
</span><span class="lines">@@ -241,13 +241,13 @@
</span><span class="cx"> void texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, RefPtr<ArrayBufferView>&&);
</span><span class="cx">
</span><span class="cx"> using TexImageSource = WTF::Variant<RefPtr<ImageData>, RefPtr<HTMLImageElement>, RefPtr<HTMLCanvasElement>, RefPtr<HTMLVideoElement>>;
</span><del>- ExceptionOr<void> texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, Optional<TexImageSource>);
</del><ins>+ ExceptionOr<void> texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, std::optional<TexImageSource>);
</ins><span class="cx">
</span><span class="cx"> void texParameterf(GC3Denum target, GC3Denum pname, GC3Dfloat param);
</span><span class="cx"> void texParameteri(GC3Denum target, GC3Denum pname, GC3Dint param);
</span><span class="cx">
</span><span class="cx"> void texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, RefPtr<ArrayBufferView>&&);
</span><del>- ExceptionOr<void> texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Denum format, GC3Denum type, Optional<TexImageSource>&&);
</del><ins>+ ExceptionOr<void> texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Denum format, GC3Denum type, std::optional<TexImageSource>&&);
</ins><span class="cx">
</span><span class="cx"> void uniform1f(const WebGLUniformLocation*, GC3Dfloat x);
</span><span class="cx"> void uniform1fv(const WebGLUniformLocation*, Float32Array& v);
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> bool supportsDrawBuffers();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool validateArrayBufferType(const char* functionName, GC3Denum type, Optional<JSC::TypedArrayType>);
</del><ins>+ bool validateArrayBufferType(const char* functionName, GC3Denum type, std::optional<JSC::TypedArrayType>);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -701,10 +701,10 @@
</span><span class="cx"> return HTMLStackItem::create(createHTMLElement(fakeToken), WTFMove(fakeToken), item.namespaceURI());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<unsigned> HTMLConstructionSite::indexOfFirstUnopenFormattingElement() const
</del><ins>+std::optional<unsigned> HTMLConstructionSite::indexOfFirstUnopenFormattingElement() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_activeFormattingElements.isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> unsigned index = m_activeFormattingElements.size();
</span><span class="cx"> do {
</span><span class="cx"> --index;
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> const auto& entry = m_activeFormattingElements.at(index);
</span><span class="cx"> if (entry.isMarker() || m_openElements.contains(entry.element())) {
</span><span class="cx"> unsigned firstUnopenElementIndex = index + 1;
</span><del>- return firstUnopenElementIndex < m_activeFormattingElements.size() ? firstUnopenElementIndex : Optional<unsigned>(Nullopt);
</del><ins>+ return firstUnopenElementIndex < m_activeFormattingElements.size() ? firstUnopenElementIndex : std::optional<unsigned>(std::nullopt);
</ins><span class="cx"> }
</span><span class="cx"> } while (index);
</span><span class="cx">
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLConstructionSite::reconstructTheActiveFormattingElements()
</span><span class="cx"> {
</span><del>- Optional<unsigned> firstUnopenElementIndex = indexOfFirstUnopenFormattingElement();
</del><ins>+ std::optional<unsigned> firstUnopenElementIndex = indexOfFirstUnopenFormattingElement();
</ins><span class="cx"> if (!firstUnopenElementIndex)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSiteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> bool shouldFosterParent() const;
</span><span class="cx"> void fosterParent(Ref<Node>&&);
</span><span class="cx">
</span><del>- Optional<unsigned> indexOfFirstUnopenFormattingElement() const;
</del><ins>+ std::optional<unsigned> indexOfFirstUnopenFormattingElement() const;
</ins><span class="cx"> void reconstructTheActiveFormattingElements();
</span><span class="cx">
</span><span class="cx"> void generateImpliedEndTags();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static Optional<int> parseHTMLIntegerInternal(const CharacterType* position, const CharacterType* end)
</del><ins>+static std::optional<int> parseHTMLIntegerInternal(const CharacterType* position, const CharacterType* end)
</ins><span class="cx"> {
</span><span class="cx"> while (position < end && isHTMLSpace(*position))
</span><span class="cx"> ++position;
</span><span class="cx">
</span><span class="cx"> if (position == end)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> bool isNegative = false;
</span><span class="cx"> if (*position == '-') {
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> ++position;
</span><span class="cx">
</span><span class="cx"> if (position == end || !isASCIIDigit(*position))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> constexpr int intMax = std::numeric_limits<int>::max();
</span><span class="cx"> constexpr int base = 10;
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> int digitValue = *position - '0';
</span><span class="cx">
</span><span class="cx"> if (result > maxMultiplier || (result == maxMultiplier && digitValue > (intMax % base) + isNegative))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> result = base * result + digitValue;
</span><span class="cx"> ++position;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/multipage/infrastructure.html#rules-for-parsing-integers
</span><del>-Optional<int> parseHTMLInteger(StringView input)
</del><ins>+std::optional<int> parseHTMLInteger(StringView input)
</ins><span class="cx"> {
</span><span class="cx"> unsigned length = input.length();
</span><span class="cx"> if (!length)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (LIKELY(input.is8Bit())) {
</span><span class="cx"> auto* start = input.characters8();
</span><span class="lines">@@ -207,36 +207,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/multipage/infrastructure.html#rules-for-parsing-non-negative-integers
</span><del>-Optional<unsigned> parseHTMLNonNegativeInteger(StringView input)
</del><ins>+std::optional<unsigned> parseHTMLNonNegativeInteger(StringView input)
</ins><span class="cx"> {
</span><del>- Optional<int> signedValue = parseHTMLInteger(input);
</del><ins>+ std::optional<int> signedValue = parseHTMLInteger(input);
</ins><span class="cx"> if (!signedValue || signedValue.value() < 0)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return static_cast<unsigned>(signedValue.value());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static Optional<int> parseValidHTMLNonNegativeIntegerInternal(const CharacterType* position, const CharacterType* end)
</del><ins>+static std::optional<int> parseValidHTMLNonNegativeIntegerInternal(const CharacterType* position, const CharacterType* end)
</ins><span class="cx"> {
</span><span class="cx"> // A string is a valid non-negative integer if it consists of one or more ASCII digits.
</span><span class="cx"> for (auto* c = position; c < end; ++c) {
</span><span class="cx"> if (!isASCIIDigit(*c))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int> signedValue = parseHTMLIntegerInternal(position, end);
</del><ins>+ std::optional<int> signedValue = parseHTMLIntegerInternal(position, end);
</ins><span class="cx"> if (!signedValue || signedValue.value() < 0)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return signedValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/#valid-non-negative-integer
</span><del>-Optional<int> parseValidHTMLNonNegativeInteger(StringView input)
</del><ins>+std::optional<int> parseValidHTMLNonNegativeInteger(StringView input)
</ins><span class="cx"> {
</span><span class="cx"> if (input.isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (LIKELY(input.is8Bit())) {
</span><span class="cx"> auto* start = input.characters8();
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static Optional<double> parseValidHTMLFloatingPointNumberInternal(const CharacterType* position, size_t length)
</del><ins>+static std::optional<double> parseValidHTMLFloatingPointNumberInternal(const CharacterType* position, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(length > 0);
</span><span class="cx">
</span><span class="lines">@@ -255,18 +255,18 @@
</span><span class="cx"> // parseDouble() allows the string to start with a '+' or to end with a '.' but those
</span><span class="cx"> // are not valid floating point numbers as per HTML.
</span><span class="cx"> if (*position == '+' || *(position + length - 1) == '.')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> size_t parsedLength = 0;
</span><span class="cx"> double number = parseDouble(position, length, parsedLength);
</span><del>- return parsedLength == length && std::isfinite(number) ? number : Optional<double>();
</del><ins>+ return parsedLength == length && std::isfinite(number) ? number : std::optional<double>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/#valid-floating-point-number
</span><del>-Optional<double> parseValidHTMLFloatingPointNumber(StringView input)
</del><ins>+std::optional<double> parseValidHTMLFloatingPointNumber(StringView input)
</ins><span class="cx"> {
</span><span class="cx"> if (input.isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (LIKELY(input.is8Bit())) {
</span><span class="cx"> auto* start = input.characters8();
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> while (position < end && isASCIIDigit(*position))
</span><span class="cx"> ++position;
</span><span class="cx">
</span><del>- Optional<unsigned> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart));
</del><ins>+ std::optional<unsigned> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart));
</ins><span class="cx"> if (!number)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -62,16 +62,16 @@
</span><span class="cx"> double parseToDoubleForNumberType(const String&, double fallbackValue);
</span><span class="cx">
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#rules-for-parsing-integers
</span><del>-WEBCORE_EXPORT Optional<int> parseHTMLInteger(StringView);
</del><ins>+WEBCORE_EXPORT std::optional<int> parseHTMLInteger(StringView);
</ins><span class="cx">
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#rules-for-parsing-non-negative-integers
</span><del>-WEBCORE_EXPORT Optional<unsigned> parseHTMLNonNegativeInteger(StringView);
</del><ins>+WEBCORE_EXPORT std::optional<unsigned> parseHTMLNonNegativeInteger(StringView);
</ins><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/#valid-non-negative-integer
</span><del>-Optional<int> parseValidHTMLNonNegativeInteger(StringView);
</del><ins>+std::optional<int> parseValidHTMLNonNegativeInteger(StringView);
</ins><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/#valid-floating-point-number
</span><del>-Optional<double> parseValidHTMLFloatingPointNumber(StringView);
</del><ins>+std::optional<double> parseValidHTMLFloatingPointNumber(StringView);
</ins><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/multipage/infrastructure.html#rules-for-parsing-floating-point-number-values
</span><span class="cx"> Vector<double> parseHTMLListOfOfFloatingPointNumberValues(StringView);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> inline unsigned limitToOnlyHTMLNonNegative(StringView stringValue, unsigned defaultValue = 0)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(defaultValue <= maxHTMLNonNegativeInteger);
</span><del>- unsigned value = parseHTMLNonNegativeInteger(stringValue).valueOr(defaultValue);
</del><ins>+ unsigned value = parseHTMLNonNegativeInteger(stringValue).value_or(defaultValue);
</ins><span class="cx"> ASSERT(value <= maxHTMLNonNegativeInteger);
</span><span class="cx"> return value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLSrcsetParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> if (descriptorChar == 'x') {
</span><span class="cx"> if (result.hasDensity() || result.hasHeight() || result.hasWidth())
</span><span class="cx"> return false;
</span><del>- Optional<double> density = parseValidHTMLFloatingPointNumber(descriptor);
</del><ins>+ std::optional<double> density = parseValidHTMLFloatingPointNumber(descriptor);
</ins><span class="cx"> if (!density || density.value() < 0)
</span><span class="cx"> return false;
</span><span class="cx"> result.setDensity(density.value());
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> } else if (descriptorChar == 'w') {
</span><span class="cx"> if (result.hasDensity() || result.hasWidth())
</span><span class="cx"> return false;
</span><del>- Optional<int> resourceWidth = parseValidHTMLNonNegativeInteger(descriptor);
</del><ins>+ std::optional<int> resourceWidth = parseValidHTMLNonNegativeInteger(descriptor);
</ins><span class="cx"> if (!resourceWidth || resourceWidth.value() <= 0)
</span><span class="cx"> return false;
</span><span class="cx"> result.setResourceWidth(resourceWidth.value());
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> // The value of the 'h' descriptor is not used.
</span><span class="cx"> if (result.hasDensity() || result.hasHeight())
</span><span class="cx"> return false;
</span><del>- Optional<int> resourceHeight = parseValidHTMLNonNegativeInteger(descriptor);
</del><ins>+ std::optional<int> resourceHeight = parseValidHTMLNonNegativeInteger(descriptor);
</ins><span class="cx"> if (!resourceHeight || resourceHeight.value() <= 0)
</span><span class="cx"> return false;
</span><span class="cx"> result.setResourceHeight(resourceHeight.value());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> const LayoutUnit snappingThreshold = renderer()->theme().sliderTickSnappingThreshold();
</span><span class="cx"> if (snappingThreshold > 0) {
</span><del>- if (Optional<Decimal> closest = input->findClosestTickMarkValue(value)) {
</del><ins>+ if (std::optional<Decimal> closest = input->findClosestTickMarkValue(value)) {
</ins><span class="cx"> double closestFraction = stepRange.proportionFromValue(*closest).toDouble();
</span><span class="cx"> double closestRatio = isVertical || !isLeftToRightDirection ? 1.0 - closestFraction : closestFraction;
</span><span class="cx"> LayoutUnit closestPosition = trackLength * closestRatio;
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> return downcast<HTMLInputElement>(shadowHost());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SliderThumbElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</del><ins>+std::optional<ElementStyle> SliderThumbElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</ins><span class="cx"> {
</span><span class="cx"> // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known.
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> static NeverDestroyed<const AtomicString> mediaSliderThumbShadowPseudoId("-webkit-media-slider-thumb", AtomicString::ConstructFromLiteral);
</span><span class="cx">
</span><span class="cx"> if (!hostStyle)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (hostStyle->appearance()) {
</span><span class="cx"> case MediaSliderPart:
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> m_shadowPseudoId = sliderThumbShadowPseudoId;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& SliderThumbElement::shadowPseudoId() const
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> return createRenderer<RenderSliderContainer>(*this, WTFMove(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SliderContainerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</del><ins>+std::optional<ElementStyle> SliderContainerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</ins><span class="cx"> {
</span><span class="cx"> // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known.
</span><span class="cx">
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> static NeverDestroyed<const AtomicString> sliderContainer("-webkit-slider-container", AtomicString::ConstructFromLiteral);
</span><span class="cx">
</span><span class="cx"> if (!hostStyle)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (hostStyle->appearance()) {
</span><span class="cx"> case MediaSliderPart:
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> m_shadowPseudoId = sliderContainer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& SliderContainerElement::shadowPseudoId() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> void willDetachRenderers() override;
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</ins><span class="cx"> const AtomicString& shadowPseudoId() const override;
</span><span class="cx">
</span><span class="cx"> void startDragging();
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> private:
</span><span class="cx"> SliderContainerElement(Document&);
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</ins><span class="cx"> const AtomicString& shadowPseudoId() const override;
</span><span class="cx">
</span><span class="cx"> AtomicString m_shadowPseudoId;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> return adoptRef(*new TextControlInnerElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlInnerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</del><ins>+std::optional<ElementStyle> TextControlInnerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto innerContainerStyle = RenderStyle::createPtr();
</span><span class="cx"> innerContainerStyle->inheritFrom(shadowHostStyle);
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return downcast<RenderTextControlInnerBlock>(HTMLDivElement::renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlInnerTextElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</del><ins>+std::optional<ElementStyle> TextControlInnerTextElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto style = downcast<HTMLTextFormControlElement>(*shadowHost()).createInnerTextStyle(*shadowHostStyle);
</span><span class="cx"> return ElementStyle(std::make_unique<RenderStyle>(WTFMove(style)));
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlPlaceholderElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle)
</del><ins>+std::optional<ElementStyle> TextControlPlaceholderElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto style = resolveStyle(&parentStyle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> TextControlInnerElement(Document&);
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isMouseFocusable() const override { return false; }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> private:
</span><span class="cx"> TextControlInnerTextElement(Document&);
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> bool isMouseFocusable() const override { return false; }
</span><span class="cx"> bool isTextControlInnerTextElement() const override { return true; }
</span><span class="cx"> };
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> private:
</span><span class="cx"> TextControlPlaceholderElement(Document&);
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SearchFieldResultsButtonElement final : public HTMLDivElement {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTrackEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TrackEvent.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TrackEvent.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/html/track/TrackEvent.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> using TrackEventTrack = Variant<RefPtr<VideoTrack>, RefPtr<AudioTrack>, RefPtr<TextTrack>>;
</span><span class="cx">
</span><span class="cx"> struct Init : public EventInit {
</span><del>- Optional<TrackEventTrack> track;
</del><ins>+ std::optional<TrackEventTrack> track;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<TrackEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = idbFactory->open(*context(), databaseName, Nullopt);
</del><ins>+ auto result = idbFactory->open(*context(), databaseName, std::nullopt);
</ins><span class="cx"> if (result.hasException()) {
</span><span class="cx"> requestCallback().sendFailure("Could not open database.");
</span><span class="cx"> return;
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static RefPtr<KeyPath> keyPathFromIDBKeyPath(const Optional<IDBKeyPath>& idbKeyPath)
</del><ins>+static RefPtr<KeyPath> keyPathFromIDBKeyPath(const std::optional<IDBKeyPath>& idbKeyPath)
</ins><span class="cx"> {
</span><span class="cx"> if (!idbKeyPath)
</span><span class="cx"> return KeyPath::create().setType(KeyPath::Type::Null).release();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client, unsigned long identifier, Optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</del><ins>+void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="cx"> consoleAgent->didFinishXHRLoading(identifier, url, sendURL, sendLineNumber, sendColumnNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> static void didReceiveData(Frame*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
</span><span class="cx"> static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, double finishTime);
</span><span class="cx"> static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&);
</span><del>- static void didFinishXHRLoading(ScriptExecutionContext*, ThreadableLoaderClient*, unsigned long identifier, Optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</del><ins>+ static void didFinishXHRLoading(ScriptExecutionContext*, ThreadableLoaderClient*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</ins><span class="cx"> static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long identifier);
</span><span class="cx"> static void willLoadXHRSynchronously(ScriptExecutionContext*);
</span><span class="cx"> static void didLoadXHRSynchronously(ScriptExecutionContext*);
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&);
</span><span class="cx"> static void willLoadXHRImpl(InstrumentingAgents&, ThreadableLoaderClient*, const String&, const URL&, bool, RefPtr<FormData>&&, const HTTPHeaderMap&, bool);
</span><span class="cx"> static void didFailXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*);
</span><del>- static void didFinishXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*, unsigned long identifier, Optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</del><ins>+ static void didFinishXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</ins><span class="cx"> static void didReceiveXHRResponseImpl(InstrumentingAgents&, unsigned long identifier);
</span><span class="cx"> static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
</span><span class="cx"> static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
</span><span class="lines">@@ -914,7 +914,7 @@
</span><span class="cx"> didFailLoadingImpl(*instrumentingAgents, identifier, loader, error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, ThreadableLoaderClient* client, unsigned long identifier, Optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</del><ins>+inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, ThreadableLoaderClient* client, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</ins><span class="cx"> {
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
</span><span class="cx"> didFinishXHRLoadingImpl(*instrumentingAgents, client, identifier, decodedText, url, sendURL, sendLineNumber, sendColumnNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx"> StringBuilder styleSheetText;
</span><span class="cx"> styleSheetText.append(text.releaseReturnValue());
</span><span class="cx">
</span><del>- auto addRuleResult = m_pageStyleSheet->addRule(selector, emptyString(), Nullopt);
</del><ins>+ auto addRuleResult = m_pageStyleSheet->addRule(selector, emptyString(), std::nullopt);
</ins><span class="cx"> if (addRuleResult.hasException())
</span><span class="cx"> return addRuleResult.releaseException();
</span><span class="cx"> ASSERT(m_pageStyleSheet->length());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<Protocol::Timeline::Instrument> instrumentType = Protocol::InspectorHelpers::parseEnumValueFromString<Protocol::Timeline::Instrument>(enumValueString);
</del><ins>+ std::optional<Protocol::Timeline::Instrument> instrumentType = Protocol::InspectorHelpers::parseEnumValueFromString<Protocol::Timeline::Instrument>(enumValueString);
</ins><span class="cx"> if (!instrumentType) {
</span><span class="cx"> errorString = makeString("Unexpected enum value: ", enumValueString);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1715,7 +1715,7 @@
</span><span class="cx"> Vector<LinkIcon> icons = LinkIconCollector { *document }.iconsOfTypes({ LinkIconType::Favicon, LinkIconType::TouchIcon, LinkIconType::TouchPrecomposedIcon });
</span><span class="cx">
</span><span class="cx"> if (icons.isEmpty())
</span><del>- icons.append({ m_frame->document()->completeURL(ASCIILiteral("/favicon.ico")), LinkIconType::Favicon, String(), Nullopt });
</del><ins>+ icons.append({ m_frame->document()->completeURL(ASCIILiteral("/favicon.ico")), LinkIconType::Favicon, String(), std::nullopt });
</ins><span class="cx">
</span><span class="cx"> for (auto& icon : icons) {
</span><span class="cx"> auto result = m_iconsPendingLoadDecision.add(nextIconCallbackID++, icon);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> void DocumentThreadableLoader::makeCrossOriginAccessRequestWithPreflight(ResourceRequest&& request)
</span><span class="cx"> {
</span><span class="cx"> if (m_async) {
</span><del>- m_preflightChecker = CrossOriginPreflightChecker(*this, WTFMove(request));
</del><ins>+ m_preflightChecker.emplace(*this, WTFMove(request));
</ins><span class="cx"> m_preflightChecker->startPreflight();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> resource->removeClient(*this);
</span><span class="cx"> }
</span><span class="cx"> if (m_preflightChecker)
</span><del>- m_preflightChecker = Nullopt;
</del><ins>+ m_preflightChecker = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void reportContentSecurityPolicyError(ThreadableLoaderClient& client, const URL& url)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> ResourceRequest actualRequest(WTFMove(request));
</span><span class="cx"> updateRequestForAccessControl(actualRequest, securityOrigin(), m_options.allowCredentials);
</span><span class="cx">
</span><del>- m_preflightChecker = Nullopt;
</del><ins>+ m_preflightChecker = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // It should be ok to skip the security check since we already asked about the preflight request.
</span><span class="cx"> loadRequest(WTFMove(actualRequest), SkipSecurityCheck);
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const ResourceError& error)
</span><span class="cx"> {
</span><del>- m_preflightChecker = Nullopt;
</del><ins>+ m_preflightChecker = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didFailLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, error);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> bool m_simpleRequest;
</span><span class="cx"> bool m_async;
</span><span class="cx"> std::unique_ptr<ContentSecurityPolicy> m_contentSecurityPolicy;
</span><del>- Optional<CrossOriginPreflightChecker> m_preflightChecker;
- Optional<HTTPHeaderMap> m_originalHeaders;
</del><ins>+ std::optional<CrossOriginPreflightChecker> m_preflightChecker;
+ std::optional<HTTPHeaderMap> m_originalHeaders;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> bool showPaymentUI(const URL&, const Vector<URL>&, const PaymentRequest&) override { return false; }
</span><span class="cx"> void completeMerchantValidation(const PaymentMerchantSession&) override { }
</span><span class="cx">
</span><del>- void completeShippingMethodSelection(PaymentAuthorizationStatus, Optional<PaymentRequest::TotalAndLineItems>) override { }
- void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>&, Optional<PaymentRequest::TotalAndLineItems>) override { }
- void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override { }
</del><ins>+ void completeShippingMethodSelection(PaymentAuthorizationStatus, std::optional<PaymentRequest::TotalAndLineItems>) override { }
+ void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>&, std::optional<PaymentRequest::TotalAndLineItems>) override { }
+ void completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems>) override { }
</ins><span class="cx"> void completePaymentSession(PaymentAuthorizationStatus) override { }
</span><span class="cx"> void abortPaymentSession() override { }
</span><span class="cx"> void paymentCoordinatorDestroyed() override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override { }
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override { }
</span><span class="cx"> void dispatchDidReceiveTitle(const StringWithDirection&) override { }
</span><del>- void dispatchDidCommitLoad(Optional<HasInsecureContent>) override { }
</del><ins>+ void dispatchDidCommitLoad(std::optional<HasInsecureContent>) override { }
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFailLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -342,9 +342,9 @@
</span><span class="cx"> urlSelected(request, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomicString& downloadAttribute)
</del><ins>+void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, std::optional<NewFrameOpenerPolicy> openerPolicy, const AtomicString& downloadAttribute)
</ins><span class="cx"> {
</span><del>- NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.valueOr(shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow);
</del><ins>+ NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.value_or(shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow);
</ins><span class="cx"> urlSelected(FrameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), passedTarget, lockHistory, lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, DoNotReplaceDocumentIfJavaScriptURL, shouldOpenExternalURLsPolicy, downloadAttribute), triggeringEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::receivedFirstData()
</span><span class="cx"> {
</span><del>- dispatchDidCommitLoad(Nullopt);
</del><ins>+ dispatchDidCommitLoad(std::nullopt);
</ins><span class="cx"> dispatchDidClearWindowObjectsInAllWorlds();
</span><span class="cx"> dispatchGlobalObjectAvailableInAllWorlds();
</span><span class="cx">
</span><span class="lines">@@ -1814,7 +1814,7 @@
</span><span class="cx"> requestFromDelegate(mainResourceRequest, mainResourceIdentifier, mainResouceError);
</span><span class="cx"> notifier().dispatchDidReceiveResponse(cachedPage->documentLoader(), mainResourceIdentifier, cachedPage->documentLoader()->response());
</span><span class="cx">
</span><del>- Optional<HasInsecureContent> hasInsecureContent = cachedPage->cachedMainFrame()->hasInsecureContent();
</del><ins>+ std::optional<HasInsecureContent> hasInsecureContent = cachedPage->cachedMainFrame()->hasInsecureContent();
</ins><span class="cx">
</span><span class="cx"> // FIXME: This API should be turned around so that we ground CachedPage into the Page.
</span><span class="cx"> cachedPage->restore(*m_frame.page());
</span><span class="lines">@@ -2097,7 +2097,7 @@
</span><span class="cx"> ASSERT(view);
</span><span class="cx"> view->setWasScrolledByUser(false);
</span><span class="cx">
</span><del>- Optional<IntRect> previousViewFrameRect = m_frame.view() ? m_frame.view()->frameRect() : Optional<IntRect>(Nullopt);
</del><ins>+ std::optional<IntRect> previousViewFrameRect = m_frame.view() ? m_frame.view()->frameRect() : std::optional<IntRect>(std::nullopt);
</ins><span class="cx"> m_frame.setView(view);
</span><span class="cx">
</span><span class="cx"> // Use the previous ScrollView's frame rect.
</span><span class="lines">@@ -3529,7 +3529,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::dispatchDidCommitLoad(Optional<HasInsecureContent> initialHasInsecureContent)
</del><ins>+void FrameLoader::dispatchDidCommitLoad(std::optional<HasInsecureContent> initialHasInsecureContent)
</ins><span class="cx"> {
</span><span class="cx"> if (m_stateMachine.creatingInitialEmptyDocument())
</span><span class="cx"> return;
</span><span class="lines">@@ -3593,8 +3593,8 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::clearTestingOverrides()
</span><span class="cx"> {
</span><del>- m_overrideCachePolicyForTesting = Nullopt;
- m_overrideResourceLoadPriorityForTesting = Nullopt;
</del><ins>+ m_overrideCachePolicyForTesting = std::nullopt;
+ m_overrideResourceLoadPriorityForTesting = std::nullopt;
</ins><span class="cx"> m_isStrictRawResourceValidationPolicyDisabledForTesting = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data);
</span><span class="cx">
</span><span class="cx"> void changeLocation(const FrameLoadRequest&);
</span><del>- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = Nullopt, const AtomicString& downloadAttribute = nullAtom);
</del><ins>+ WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, std::optional<NewFrameOpenerPolicy> = std::nullopt, const AtomicString& downloadAttribute = nullAtom);
</ins><span class="cx"> void submitForm(PassRefPtr<FormSubmission>);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void reload(bool endToEndReload = false, bool contentBlockersEnabled = true);
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldReloadToHandleUnreachableURL(DocumentLoader*);
</span><span class="cx">
</span><del>- void dispatchDidCommitLoad(Optional<HasInsecureContent> initialHasInsecureContent);
</del><ins>+ void dispatchDidCommitLoad(std::optional<HasInsecureContent> initialHasInsecureContent);
</ins><span class="cx">
</span><span class="cx"> void urlSelected(const FrameLoadRequest&, Event*);
</span><span class="cx">
</span><span class="lines">@@ -452,8 +452,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<FrameNetworkingContext> m_networkingContext;
</span><span class="cx">
</span><del>- Optional<ResourceRequestCachePolicy> m_overrideCachePolicyForTesting;
- Optional<ResourceLoadPriority> m_overrideResourceLoadPriorityForTesting;
</del><ins>+ std::optional<ResourceRequestCachePolicy> m_overrideCachePolicyForTesting;
+ std::optional<ResourceLoadPriority> m_overrideResourceLoadPriorityForTesting;
</ins><span class="cx"> bool m_isStrictRawResourceValidationPolicyDisabledForTesting { false };
</span><span class="cx">
</span><span class="cx"> URL m_previousURL;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> virtual void dispatchDidReceiveIcon() = 0;
</span><span class="cx"> virtual void dispatchDidStartProvisionalLoad() = 0;
</span><span class="cx"> virtual void dispatchDidReceiveTitle(const StringWithDirection&) = 0;
</span><del>- virtual void dispatchDidCommitLoad(Optional<HasInsecureContent>) = 0;
</del><ins>+ virtual void dispatchDidCommitLoad(std::optional<HasInsecureContent>) = 0;
</ins><span class="cx"> virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
</span><span class="cx"> virtual void dispatchDidFailLoad(const ResourceError&) = 0;
</span><span class="cx"> virtual void dispatchDidFinishDocumentLoad() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> m_cachedLinkResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<CachedResource::Type> LinkLoader::resourceTypeFromAsAttribute(const String& as)
</del><ins>+std::optional<CachedResource::Type> LinkLoader::resourceTypeFromAsAttribute(const String& as)
</ins><span class="cx"> {
</span><span class="cx"> if (as.isEmpty())
</span><span class="cx"> return CachedResource::RawResource;
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> if (equalLettersIgnoringASCIICase(as, "track"))
</span><span class="cx"> return CachedResource::TextTrackResource;
</span><span class="cx"> #endif
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static std::unique_ptr<LinkPreloadResourceClient> createLinkPreloadResourceClient(CachedResource& resource, LinkLoader& loader, CachedResource::Type type)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> if (!m_client.shouldLoadLink())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- Optional<ResourceLoadPriority> priority;
</del><ins>+ std::optional<ResourceLoadPriority> priority;
</ins><span class="cx"> CachedResource::Type type = CachedResource::LinkPrefetch;
</span><span class="cx"> if (relAttribute.isLinkSubresource) {
</span><span class="cx"> // We only make one request to the cached resource loader if multiple rel types are specified;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/LinkLoader.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> virtual ~LinkLoader();
</span><span class="cx">
</span><span class="cx"> bool loadLink(const LinkRelAttribute&, const URL&, const String& as, const String& crossOrigin, Document&);
</span><del>- static Optional<CachedResource::Type> resourceTypeFromAsAttribute(const String& as);
</del><ins>+ static std::optional<CachedResource::Type> resourceTypeFromAsAttribute(const String& as);
</ins><span class="cx">
</span><span class="cx"> WeakPtr<LinkLoader> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx"> void triggerEvents(const CachedResource&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> , m_resource(&resource)
</span><span class="cx"> , m_loadingMultipartContent(false)
</span><span class="cx"> , m_state(Uninitialized)
</span><del>- , m_requestCountTracker(InPlace, frame.document()->cachedResourceLoader(), resource)
</del><ins>+ , m_requestCountTracker(std::in_place, frame.document()->cachedResourceLoader(), resource)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> subresourceLoaderCounter.increment();
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> m_loadingMultipartContent = true;
</span><span class="cx">
</span><span class="cx"> // We don't count multiParts in a CachedResourceLoader's request count
</span><del>- m_requestCountTracker = Nullopt;
</del><ins>+ m_requestCountTracker = std::nullopt;
</ins><span class="cx"> if (!m_resource->isImage()) {
</span><span class="cx"> cancel();
</span><span class="cx"> return;
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> if (reachedTerminalState())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_requestCountTracker = Nullopt;
</del><ins>+ m_requestCountTracker = std::nullopt;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_documentLoader->cachedResourceLoader().loadDone(m_resource, m_state != CancelledWhileInitializing);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> CachedResource* m_resource;
</span><span class="cx"> bool m_loadingMultipartContent;
</span><span class="cx"> SubresourceLoaderState m_state;
</span><del>- Optional<RequestCountTracker> m_requestCountTracker;
</del><ins>+ std::optional<RequestCountTracker> m_requestCountTracker;
</ins><span class="cx"> RefPtr<SecurityOrigin> m_origin;
</span><span class="cx"> unsigned m_redirectCount { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::setLoadPriority(const Optional<ResourceLoadPriority>& loadPriority)
</del><ins>+void CachedResource::setLoadPriority(const std::optional<ResourceLoadPriority>& loadPriority)
</ins><span class="cx"> {
</span><span class="cx"> if (loadPriority)
</span><span class="cx"> m_loadPriority = loadPriority.value();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> Type type() const { return m_type; }
</span><span class="cx">
</span><span class="cx"> ResourceLoadPriority loadPriority() const { return m_loadPriority; }
</span><del>- void setLoadPriority(const Optional<ResourceLoadPriority>&);
</del><ins>+ void setLoadPriority(const std::optional<ResourceLoadPriority>&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void addClient(CachedResourceClient&);
</span><span class="cx"> WEBCORE_EXPORT void removeClient(CachedResourceClient&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedResourceRequest::CachedResourceRequest(ResourceRequest&& resourceRequest, const ResourceLoaderOptions& options, Optional<ResourceLoadPriority> priority, String&& charset)
</del><ins>+CachedResourceRequest::CachedResourceRequest(ResourceRequest&& resourceRequest, const ResourceLoaderOptions& options, std::optional<ResourceLoadPriority> priority, String&& charset)
</ins><span class="cx"> : m_resourceRequest(WTFMove(resourceRequest))
</span><span class="cx"> , m_charset(WTFMove(charset))
</span><span class="cx"> , m_options(options)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedResourceRequest {
</span><span class="cx"> public:
</span><del>- CachedResourceRequest(ResourceRequest&&, const ResourceLoaderOptions&, Optional<ResourceLoadPriority> = Nullopt, String&& charset = String());
</del><ins>+ CachedResourceRequest(ResourceRequest&&, const ResourceLoaderOptions&, std::optional<ResourceLoadPriority> = std::nullopt, String&& charset = String());
</ins><span class="cx">
</span><span class="cx"> ResourceRequest&& releaseResourceRequest() { return WTFMove(m_resourceRequest); }
</span><span class="cx"> const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> void setCharset(const String& charset) { m_charset = charset; }
</span><span class="cx"> const ResourceLoaderOptions& options() const { return m_options; }
</span><span class="cx"> void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
</span><del>- const Optional<ResourceLoadPriority>& priority() const { return m_priority; }
</del><ins>+ const std::optional<ResourceLoadPriority>& priority() const { return m_priority; }
</ins><span class="cx"> void setInitiator(PassRefPtr<Element>);
</span><span class="cx"> void setInitiator(const AtomicString& name);
</span><span class="cx"> const AtomicString& initiatorName() const;
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> ResourceRequest m_resourceRequest;
</span><span class="cx"> String m_charset;
</span><span class="cx"> ResourceLoaderOptions m_options;
</span><del>- Optional<ResourceLoadPriority> m_priority;
</del><ins>+ std::optional<ResourceLoadPriority> m_priority;
</ins><span class="cx"> RefPtr<Element> m_initiatorElement;
</span><span class="cx"> AtomicString m_initiatorName;
</span><span class="cx"> RefPtr<SecurityOrigin> m_origin;
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> Stretched = 18
</span><span class="cx"> };
</span><span class="cx">
</span><del>- virtual Optional<bool> specifiedDisplayStyle() { return Nullopt; }
- virtual Optional<MathVariant> specifiedMathVariant() { return Nullopt; }
</del><ins>+ virtual std::optional<bool> specifiedDisplayStyle() { return std::nullopt; }
+ virtual std::optional<MathVariant> specifiedMathVariant() { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> virtual void updateSelectedChild() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLFractionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLFractionElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLFractionElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLFractionElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return m_lineThickness.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MathMLFractionElement::FractionAlignment MathMLFractionElement::cachedFractionAlignment(const QualifiedName& name, Optional<FractionAlignment>& alignment)
</del><ins>+MathMLFractionElement::FractionAlignment MathMLFractionElement::cachedFractionAlignment(const QualifiedName& name, std::optional<FractionAlignment>& alignment)
</ins><span class="cx"> {
</span><span class="cx"> if (alignment)
</span><span class="cx"> return alignment.value();
</span><span class="lines">@@ -97,11 +97,11 @@
</span><span class="cx"> void MathMLFractionElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == linethicknessAttr)
</span><del>- m_lineThickness = Nullopt;
</del><ins>+ m_lineThickness = std::nullopt;
</ins><span class="cx"> else if (name == numalignAttr)
</span><del>- m_numeratorAlignment = Nullopt;
</del><ins>+ m_numeratorAlignment = std::nullopt;
</ins><span class="cx"> else if (name == denomalignAttr)
</span><del>- m_denominatorAlignment = Nullopt;
</del><ins>+ m_denominatorAlignment = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLFractionElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLFractionElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLFractionElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLFractionElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><span class="cx">
</span><del>- FractionAlignment cachedFractionAlignment(const QualifiedName&, Optional<FractionAlignment>&);
</del><ins>+ FractionAlignment cachedFractionAlignment(const QualifiedName&, std::optional<FractionAlignment>&);
</ins><span class="cx">
</span><del>- Optional<Length> m_lineThickness;
- Optional<FractionAlignment> m_numeratorAlignment;
- Optional<FractionAlignment> m_denominatorAlignment;
</del><ins>+ std::optional<Length> m_lineThickness;
+ std::optional<FractionAlignment> m_numeratorAlignment;
+ std::optional<FractionAlignment> m_denominatorAlignment;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMathElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMathElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLMathElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> return createRenderer<RenderMathMLMath>(*this, WTFMove(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<bool> MathMLMathElement::specifiedDisplayStyle()
</del><ins>+std::optional<bool> MathMLMathElement::specifiedDisplayStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (cachedBooleanAttribute(displaystyleAttr, m_displayStyle) == BooleanValue::Default) {
</span><span class="cx"> // The default displaystyle value of the <math> depends on the display attribute, so we parse it here.
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> bool displayStyleAttribute = (name == displaystyleAttr || name == displayAttr);
</span><span class="cx"> bool mathVariantAttribute = name == mathvariantAttr;
</span><span class="cx"> if (displayStyleAttribute)
</span><del>- m_displayStyle = Nullopt;
</del><ins>+ m_displayStyle = std::nullopt;
</ins><span class="cx"> if (mathVariantAttribute)
</span><del>- m_mathVariant = Nullopt;
</del><ins>+ m_mathVariant = std::nullopt;
</ins><span class="cx"> if ((displayStyleAttribute || mathVariantAttribute) && renderer())
</span><span class="cx"> MathMLStyle::resolveMathMLStyleTree(renderer());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMathElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMathElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMathElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLMathElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> bool acceptsDisplayStyleAttribute() final { return true; }
</span><span class="cx"> bool acceptsMathVariantAttribute() final { return true; }
</span><del>- Optional<bool> specifiedDisplayStyle() final;
</del><ins>+ std::optional<bool> specifiedDisplayStyle() final;
</ins><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> void MathMLMencloseElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == notationAttr)
</span><del>- m_notationFlags = Nullopt;
</del><ins>+ m_notationFlags = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLRowElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void clearNotations() { m_notationFlags = 0; }
</span><span class="cx"> void addNotation(MencloseNotationFlag notationFlag) { m_notationFlags.value() |= notationFlag; }
</span><span class="cx"> void addNotationFlags(StringView notation);
</span><del>- Optional<uint16_t> m_notationFlags;
</del><ins>+ std::optional<uint16_t> m_notationFlags;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorDictionary.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorDictionary.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLOperatorDictionary.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1107,10 +1107,10 @@
</span><span class="cx"> 0x003D, 0x005E, 0x005F, 0x007E, 0x00AF, 0x02C6, 0x02C7, 0x02C9, 0x02CD, 0x02DC, 0x02F7, 0x0302, 0x0332, 0x203E, 0x20D0, 0x20D1, 0x20D6, 0x20D7, 0x20E1, 0x2190, 0x2192, 0x2194, 0x2198, 0x2199, 0x219C, 0x219D, 0x219E, 0x21A0, 0x21A2, 0x21A3, 0x21A4, 0x21A6, 0x21A9, 0x21AA, 0x21AB, 0x21AC, 0x21AD, 0x21B4, 0x21B9, 0x21BC, 0x21BD, 0x21C0, 0x21C1, 0x21C4, 0x21C6, 0x21C7, 0x21C9, 0x21CB, 0x21CC, 0x21D0, 0x21D2, 0x21D4, 0x21DA, 0x21DB, 0x21DC, 0x21DD, 0x21E0, 0x21E2, 0x21E4, 0x21E5, 0x21E6, 0x21E8, 0x21F0, 0x21F6, 0x21FD, 0x21FE, 0x21FF, 0x23B4, 0x23B5, 0x23DC, 0x23DD, 0x23DE, 0x23DF, 0x23E0, 0x23E1, 0x2500, 0x27F5, 0x27F6, 0x27F7, 0x27F8, 0x27F9, 0x27FA, 0x27FB, 0x27FC, 0x27FD, 0x27FE, 0x27FF, 0x290C, 0x290D, 0x290E, 0x290F, 0x2910, 0x294E, 0x2950, 0x2952, 0x2953, 0x2956, 0x2957, 0x295A, 0x295B, 0x295E, 0x295F, 0x2B45, 0x2B46, 0xFE35, 0xFE36, 0xFE37, 0xFE38, 0x1EEF0, 0x1EEF1
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Optional<Property> MathMLOperatorDictionary::search(UChar32 character, Form form, bool explicitForm)
</del><ins>+std::optional<Property> MathMLOperatorDictionary::search(UChar32 character, Form form, bool explicitForm)
</ins><span class="cx"> {
</span><span class="cx"> if (!character)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // We try and find the default values from the operator dictionary.
</span><span class="cx"> if (auto* entry = tryBinarySearch<const Entry, Key>(dictionary, dictionarySize, Key(character, form), ExtractKey))
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx"> return ExtractProperty(*entry);
</span><span class="cx">
</span><span class="cx"> if (explicitForm)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // If we did not find the desired operator form and if it was not set explicitely, we use the first one in the following order: Infix, Prefix, Postfix.
</span><span class="cx"> // This is to handle bad MathML markup without explicit <mrow> delimiters like "<mo>(</mo><mi>a</mi><mo>)</mo><mo>(</mo><mi>b</mi><mo>)</mo>" where innerfences should not be considered infix.
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> return ExtractProperty(*entry);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MathMLOperatorDictionary::isVertical(UChar32 textContent)
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLOperatorDictionary.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> // Default operator properties are all set to "false".
</span><span class="cx"> unsigned short flags { 0 };
</span><span class="cx"> };
</span><del>-Optional<Property> search(UChar32, Form, bool explicitForm);
</del><ins>+std::optional<Property> search(UChar32, Form, bool explicitForm);
</ins><span class="cx"> bool isVertical(UChar32);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_properties.dirtyFlags & flag);
</span><span class="cx">
</span><del>- Optional<BooleanValue> property;
</del><ins>+ std::optional<BooleanValue> property;
</ins><span class="cx"> const auto& name = propertyFlagToAttributeName(flag);
</span><span class="cx"> const BooleanValue& value = cachedBooleanAttribute(name, property);
</span><span class="cx"> switch (value) {
</span><span class="lines">@@ -211,13 +211,13 @@
</span><span class="cx">
</span><span class="cx"> void MathMLOperatorElement::childrenChanged(const ChildChange& change)
</span><span class="cx"> {
</span><del>- m_operatorChar = Nullopt;
- m_dictionaryProperty = Nullopt;
</del><ins>+ m_operatorChar = std::nullopt;
+ m_dictionaryProperty = std::nullopt;
</ins><span class="cx"> m_properties.dirtyFlags = MathMLOperatorDictionary::allFlags;
</span><span class="cx"> MathMLTokenElement::childrenChanged(change);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<MathMLOperatorDictionary::Flag> attributeNameToPropertyFlag(const QualifiedName& name)
</del><ins>+static std::optional<MathMLOperatorDictionary::Flag> attributeNameToPropertyFlag(const QualifiedName& name)
</ins><span class="cx"> {
</span><span class="cx"> if (name == accentAttr)
</span><span class="cx"> return Accent;
</span><span class="lines">@@ -233,24 +233,24 @@
</span><span class="cx"> return Stretchy;
</span><span class="cx"> if (name == symmetricAttr)
</span><span class="cx"> return Symmetric;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MathMLOperatorElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == formAttr) {
</span><del>- m_dictionaryProperty = Nullopt;
</del><ins>+ m_dictionaryProperty = std::nullopt;
</ins><span class="cx"> m_properties.dirtyFlags = MathMLOperatorDictionary::allFlags;
</span><span class="cx"> } else if (auto flag = attributeNameToPropertyFlag(name))
</span><span class="cx"> m_properties.dirtyFlags |= flag.value();
</span><span class="cx"> else if (name == lspaceAttr)
</span><del>- m_leadingSpace = Nullopt;
</del><ins>+ m_leadingSpace = std::nullopt;
</ins><span class="cx"> else if (name == rspaceAttr)
</span><del>- m_trailingSpace = Nullopt;
</del><ins>+ m_trailingSpace = std::nullopt;
</ins><span class="cx"> else if (name == minsizeAttr)
</span><del>- m_minSize = Nullopt;
</del><ins>+ m_minSize = std::nullopt;
</ins><span class="cx"> else if (name == maxsizeAttr)
</span><del>- m_maxSize = Nullopt;
</del><ins>+ m_maxSize = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if ((name == stretchyAttr || name == lspaceAttr || name == rspaceAttr || name == movablelimitsAttr) && renderer()) {
</span><span class="cx"> downcast<RenderMathMLOperator>(*renderer()).updateFromElement();
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLOperatorElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLOperatorElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLOperatorElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLOperatorElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> };
</span><span class="cx"> static OperatorChar parseOperatorChar(const String&);
</span><span class="cx"> const OperatorChar& operatorChar();
</span><del>- void setOperatorFormDirty() { m_dictionaryProperty = Nullopt; }
</del><ins>+ void setOperatorFormDirty() { m_dictionaryProperty = std::nullopt; }
</ins><span class="cx"> MathMLOperatorDictionary::Form form() { return dictionaryProperty().form; }
</span><span class="cx"> bool hasProperty(MathMLOperatorDictionary::Flag);
</span><span class="cx"> Length defaultLeadingSpace();
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> void childrenChanged(const ChildChange&) final;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><span class="cx">
</span><del>- Optional<OperatorChar> m_operatorChar;
</del><ins>+ std::optional<OperatorChar> m_operatorChar;
</ins><span class="cx">
</span><del>- Optional<MathMLOperatorDictionary::Property> m_dictionaryProperty;
</del><ins>+ std::optional<MathMLOperatorDictionary::Property> m_dictionaryProperty;
</ins><span class="cx"> MathMLOperatorDictionary::Property computeDictionaryProperty();
</span><span class="cx"> const MathMLOperatorDictionary::Property& dictionaryProperty();
</span><span class="cx">
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> OperatorProperties m_properties;
</span><span class="cx"> void computeOperatorFlag(MathMLOperatorDictionary::Flag);
</span><span class="cx">
</span><del>- Optional<Length> m_leadingSpace;
- Optional<Length> m_trailingSpace;
- Optional<Length> m_minSize;
- Optional<Length> m_maxSize;
</del><ins>+ std::optional<Length> m_leadingSpace;
+ std::optional<Length> m_trailingSpace;
+ std::optional<Length> m_minSize;
+ std::optional<Length> m_maxSize;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPaddedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPaddedElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPaddedElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLPaddedElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -73,15 +73,15 @@
</span><span class="cx"> void MathMLPaddedElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><del>- m_width = Nullopt;
</del><ins>+ m_width = std::nullopt;
</ins><span class="cx"> else if (name == heightAttr)
</span><del>- m_height = Nullopt;
</del><ins>+ m_height = std::nullopt;
</ins><span class="cx"> else if (name == depthAttr)
</span><del>- m_depth = Nullopt;
</del><ins>+ m_depth = std::nullopt;
</ins><span class="cx"> else if (name == lspaceAttr)
</span><del>- m_lspace = Nullopt;
</del><ins>+ m_lspace = std::nullopt;
</ins><span class="cx"> else if (name == voffsetAttr)
</span><del>- m_voffset = Nullopt;
</del><ins>+ m_voffset = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPaddedElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPaddedElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPaddedElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLPaddedElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><span class="cx">
</span><del>- Optional<Length> m_width;
- Optional<Length> m_height;
- Optional<Length> m_depth;
- Optional<Length> m_lspace;
- Optional<Length> m_voffset;
</del><ins>+ std::optional<Length> m_width;
+ std::optional<Length> m_height;
+ std::optional<Length> m_depth;
+ std::optional<Length> m_lspace;
+ std::optional<Length> m_voffset;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPresentationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> || htmlElement.hasTagName(HTMLNames::ulTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const MathMLElement::BooleanValue& MathMLPresentationElement::cachedBooleanAttribute(const QualifiedName& name, Optional<BooleanValue>& attribute)
</del><ins>+const MathMLElement::BooleanValue& MathMLPresentationElement::cachedBooleanAttribute(const QualifiedName& name, std::optional<BooleanValue>& attribute)
</ins><span class="cx"> {
</span><span class="cx"> if (attribute)
</span><span class="cx"> return attribute.value();
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> return parseNamedSpace(stringView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const MathMLElement::Length& MathMLPresentationElement::cachedMathMLLength(const QualifiedName& name, Optional<Length>& length)
</del><ins>+const MathMLElement::Length& MathMLPresentationElement::cachedMathMLLength(const QualifiedName& name, std::optional<Length>& length)
</ins><span class="cx"> {
</span><span class="cx"> if (length)
</span><span class="cx"> return length.value();
</span><span class="lines">@@ -319,10 +319,10 @@
</span><span class="cx"> return hasTagName(mtableTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<bool> MathMLPresentationElement::specifiedDisplayStyle()
</del><ins>+std::optional<bool> MathMLPresentationElement::specifiedDisplayStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (!acceptsDisplayStyleAttribute())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> const MathMLElement::BooleanValue& specifiedDisplayStyle = cachedBooleanAttribute(displaystyleAttr, m_displayStyle);
</span><span class="cx"> return toOptionalBool(specifiedDisplayStyle);
</span><span class="cx"> }
</span><span class="lines">@@ -369,13 +369,13 @@
</span><span class="cx"> return MathVariant::None;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<MathMLElement::MathVariant> MathMLPresentationElement::specifiedMathVariant()
</del><ins>+std::optional<MathMLElement::MathVariant> MathMLPresentationElement::specifiedMathVariant()
</ins><span class="cx"> {
</span><span class="cx"> if (!acceptsMathVariantAttribute())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (!m_mathVariant)
</span><span class="cx"> m_mathVariant = parseMathVariantAttribute(attributeWithoutSynchronization(mathvariantAttr));
</span><del>- return m_mathVariant.value() == MathVariant::None ? Nullopt : m_mathVariant;
</del><ins>+ return m_mathVariant.value() == MathVariant::None ? std::nullopt : m_mathVariant;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MathMLPresentationElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="lines">@@ -383,9 +383,9 @@
</span><span class="cx"> bool displayStyleAttribute = name == displaystyleAttr && acceptsDisplayStyleAttribute();
</span><span class="cx"> bool mathVariantAttribute = name == mathvariantAttr && acceptsMathVariantAttribute();
</span><span class="cx"> if (displayStyleAttribute)
</span><del>- m_displayStyle = Nullopt;
</del><ins>+ m_displayStyle = std::nullopt;
</ins><span class="cx"> if (mathVariantAttribute)
</span><del>- m_mathVariant = Nullopt;
</del><ins>+ m_mathVariant = std::nullopt;
</ins><span class="cx"> if ((displayStyleAttribute || mathVariantAttribute) && renderer())
</span><span class="cx"> MathMLStyle::resolveMathMLStyleTree(renderer());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPresentationElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPresentationElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPresentationElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLPresentationElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,20 +44,20 @@
</span><span class="cx"> static bool isPhrasingContent(const Node&);
</span><span class="cx"> static bool isFlowContent(const Node&);
</span><span class="cx">
</span><del>- static Optional<bool> toOptionalBool(const BooleanValue& value) { return value == BooleanValue::Default ? Nullopt : Optional<bool>(value == BooleanValue::True); }
- const BooleanValue& cachedBooleanAttribute(const QualifiedName&, Optional<BooleanValue>&);
</del><ins>+ static std::optional<bool> toOptionalBool(const BooleanValue& value) { return value == BooleanValue::Default ? std::nullopt : std::optional<bool>(value == BooleanValue::True); }
+ const BooleanValue& cachedBooleanAttribute(const QualifiedName&, std::optional<BooleanValue>&);
</ins><span class="cx">
</span><span class="cx"> static Length parseMathMLLength(const String&);
</span><del>- const Length& cachedMathMLLength(const QualifiedName&, Optional<Length>&);
</del><ins>+ const Length& cachedMathMLLength(const QualifiedName&, std::optional<Length>&);
</ins><span class="cx">
</span><span class="cx"> virtual bool acceptsDisplayStyleAttribute();
</span><del>- Optional<bool> specifiedDisplayStyle() override;
</del><ins>+ std::optional<bool> specifiedDisplayStyle() override;
</ins><span class="cx">
</span><span class="cx"> virtual bool acceptsMathVariantAttribute() { return false; }
</span><del>- Optional<MathVariant> specifiedMathVariant() final;
</del><ins>+ std::optional<MathVariant> specifiedMathVariant() final;
</ins><span class="cx">
</span><del>- Optional<BooleanValue> m_displayStyle;
- Optional<MathVariant> m_mathVariant;
</del><ins>+ std::optional<BooleanValue> m_displayStyle;
+ std::optional<MathVariant> m_mathVariant;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLScriptsElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLScriptsElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLScriptsElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLScriptsElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> void MathMLScriptsElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == subscriptshiftAttr)
</span><del>- m_subscriptShift = Nullopt;
</del><ins>+ m_subscriptShift = std::nullopt;
</ins><span class="cx"> else if (name == superscriptshiftAttr)
</span><del>- m_superscriptShift = Nullopt;
</del><ins>+ m_superscriptShift = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLScriptsElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLScriptsElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLScriptsElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLScriptsElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx">
</span><del>- Optional<Length> m_subscriptShift;
- Optional<Length> m_superscriptShift;
</del><ins>+ std::optional<Length> m_subscriptShift;
+ std::optional<Length> m_superscriptShift;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSpaceElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSpaceElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSpaceElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLSpaceElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx"> void MathMLSpaceElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><del>- m_width = Nullopt;
</del><ins>+ m_width = std::nullopt;
</ins><span class="cx"> else if (name == heightAttr)
</span><del>- m_height = Nullopt;
</del><ins>+ m_height = std::nullopt;
</ins><span class="cx"> else if (name == depthAttr)
</span><del>- m_depth = Nullopt;
</del><ins>+ m_depth = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLPresentationElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSpaceElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSpaceElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSpaceElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLSpaceElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx">
</span><span class="cx"> bool acceptsDisplayStyleAttribute() final { return false; }
</span><span class="cx">
</span><del>- Optional<Length> m_width;
- Optional<Length> m_height;
- Optional<Length> m_depth;
</del><ins>+ std::optional<Length> m_width;
+ std::optional<Length> m_height;
+ std::optional<Length> m_depth;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTokenElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLTokenElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTokenElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLTokenElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -77,15 +77,15 @@
</span><span class="cx"> return isPhrasingContent(child) && StyledElement::childShouldCreateRenderer(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<UChar32> MathMLTokenElement::convertToSingleCodePoint(StringView string)
</del><ins>+std::optional<UChar32> MathMLTokenElement::convertToSingleCodePoint(StringView string)
</ins><span class="cx"> {
</span><span class="cx"> auto codePoints = stripLeadingAndTrailingWhitespace(string).codePoints();
</span><span class="cx"> auto iterator = codePoints.begin();
</span><span class="cx"> if (iterator == codePoints.end())
</span><del>- return Nullopt;
- Optional<UChar32> character = *iterator;
</del><ins>+ return std::nullopt;
+ std::optional<UChar32> character = *iterator;
</ins><span class="cx"> ++iterator;
</span><del>- return iterator == codePoints.end() ? character : Nullopt;
</del><ins>+ return iterator == codePoints.end() ? character : std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLTokenElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLTokenElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLTokenElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLTokenElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLTokenElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- static Optional<UChar32> convertToSingleCodePoint(StringView);
</del><ins>+ static std::optional<UChar32> convertToSingleCodePoint(StringView);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> MathMLTokenElement(const QualifiedName& tagName, Document&);
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLUnderOverElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLUnderOverElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLUnderOverElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLUnderOverElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> void MathMLUnderOverElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == accentAttr)
</span><del>- m_accent = Nullopt;
</del><ins>+ m_accent = std::nullopt;
</ins><span class="cx"> else if (name == accentunderAttr)
</span><del>- m_accentUnder = Nullopt;
</del><ins>+ m_accentUnder = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> MathMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLUnderOverElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLUnderOverElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLUnderOverElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/mathml/MathMLUnderOverElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) final;
</span><span class="cx">
</span><del>- Optional<BooleanValue> m_accent;
- Optional<BooleanValue> m_accentUnder;
</del><ins>+ std::optional<BooleanValue> m_accent;
+ std::optional<BooleanValue> m_accentUnder;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/ChromeClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const IntRect&) { }
</span><span class="cx"> virtual void recommendedScrollbarStyleDidChange(ScrollbarStyle) { }
</span><span class="cx">
</span><del>- virtual WTF::Optional<ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() { return ScrollbarOverlayStyleDefault; }
</del><ins>+ virtual std::optional<ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() { return ScrollbarOverlayStyleDefault; }
</ins><span class="cx">
</span><span class="cx"> virtual void wheelEventHandlersChanged(bool hasHandlers) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -426,11 +426,11 @@
</span><span class="cx"> return interval;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::milliseconds> DOMTimer::alignedFireTime(std::chrono::milliseconds fireTime) const
</del><ins>+std::optional<std::chrono::milliseconds> DOMTimer::alignedFireTime(std::chrono::milliseconds fireTime) const
</ins><span class="cx"> {
</span><span class="cx"> auto alignmentInterval = scriptExecutionContext()->timerAlignmentInterval(m_nestingLevel >= maxTimerNestingLevel);
</span><span class="cx"> if (alignmentInterval == 0ms)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> static const double randomizedProportion = randomNumber();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/DOMTimer.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> // SuspendableTimer
</span><span class="cx"> void fired() override;
</span><span class="cx"> void didStop() override;
</span><del>- Optional<std::chrono::milliseconds> alignedFireTime(std::chrono::milliseconds) const override;
</del><ins>+ std::optional<std::chrono::milliseconds> alignedFireTime(std::chrono::milliseconds) const override;
</ins><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1522,7 +1522,7 @@
</span><span class="cx">
</span><span class="cx"> void DOMWindow::scrollBy(const ScrollToOptions& options) const
</span><span class="cx"> {
</span><del>- return scrollBy(options.left.valueOr(0), options.top.valueOr(0));
</del><ins>+ return scrollBy(options.left.value_or(0), options.top.value_or(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindow::scrollBy(double x, double y) const
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/DOMWindow.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_shouldPrintWhenFinishedLoading { false };
</span><span class="cx"> bool m_suspendedForDocumentSuspension { false };
</span><del>- Optional<bool> m_canShowModalDialogOverride;
</del><ins>+ std::optional<bool> m_canShowModalDialogOverride;
</ins><span class="cx">
</span><span class="cx"> HashSet<DOMWindowProperty*> m_properties;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/EventSource.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -280,8 +280,8 @@
</span><span class="cx"> m_discardTrailingNewline = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<unsigned> lineLength;
- Optional<unsigned> fieldLength;
</del><ins>+ std::optional<unsigned> lineLength;
+ std::optional<unsigned> fieldLength;
</ins><span class="cx"> for (unsigned i = position; !lineLength && i < size; ++i) {
</span><span class="cx"> switch (m_receiveBuffer[i]) {
</span><span class="cx"> case ':':
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> m_receiveBuffer.remove(0, position);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSource::parseEventStreamLine(unsigned position, Optional<unsigned> fieldLength, unsigned lineLength)
</del><ins>+void EventSource::parseEventStreamLine(unsigned position, std::optional<unsigned> fieldLength, unsigned lineLength)
</ins><span class="cx"> {
</span><span class="cx"> if (!lineLength) {
</span><span class="cx"> if (!m_data.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/EventSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> void scheduleReconnect();
</span><span class="cx"> void abortConnectionAttempt();
</span><span class="cx"> void parseEventStream();
</span><del>- void parseEventStreamLine(unsigned position, Optional<unsigned> fieldLength, unsigned lineLength);
</del><ins>+ void parseEventStreamLine(unsigned position, std::optional<unsigned> fieldLength, unsigned lineLength);
</ins><span class="cx"> void dispatchMessageEvent();
</span><span class="cx">
</span><span class="cx"> bool responseIsValid(const ResourceResponse&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> void FrameView::recalculateScrollbarOverlayStyle()
</span><span class="cx"> {
</span><span class="cx"> ScrollbarOverlayStyle oldOverlayStyle = scrollbarOverlayStyle();
</span><del>- WTF::Optional<ScrollbarOverlayStyle> clientOverlayStyle = frame().page() ? frame().page()->chrome().client().preferredScrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
</del><ins>+ std::optional<ScrollbarOverlayStyle> clientOverlayStyle = frame().page() ? frame().page()->chrome().client().preferredScrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
</ins><span class="cx"> if (clientOverlayStyle) {
</span><span class="cx"> if (clientOverlayStyle.value() != oldOverlayStyle)
</span><span class="cx"> setScrollbarOverlayStyle(clientOverlayStyle.value());
</span><span class="lines">@@ -1831,7 +1831,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::setLayoutViewportOverrideRect(Optional<LayoutRect> rect)
</del><ins>+void FrameView::setLayoutViewportOverrideRect(std::optional<LayoutRect> rect)
</ins><span class="cx"> {
</span><span class="cx"> if (rect == m_layoutViewportOverrideRect)
</span><span class="cx"> return;
</span><span class="lines">@@ -5156,7 +5156,7 @@
</span><span class="cx"> widget->notifyWidget(notification);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::setViewExposedRect(Optional<FloatRect> viewExposedRect)
</del><ins>+void FrameView::setViewExposedRect(std::optional<FloatRect> viewExposedRect)
</ins><span class="cx"> {
</span><span class="cx"> if (m_viewExposedRect == viewExposedRect)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/FrameView.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> // If set, overrides the default "m_layoutViewportOrigin, size of initial containing block" rect.
</span><span class="cx"> // Used with delegated scrolling (i.e. iOS).
</span><del>- WEBCORE_EXPORT void setLayoutViewportOverrideRect(Optional<LayoutRect>);
</del><ins>+ WEBCORE_EXPORT void setLayoutViewportOverrideRect(std::optional<LayoutRect>);
</ins><span class="cx">
</span><span class="cx"> // These are in document coordinates, unaffected by zooming.
</span><span class="cx"> WEBCORE_EXPORT LayoutRect layoutViewportRect() const;
</span><span class="lines">@@ -569,8 +569,8 @@
</span><span class="cx"> // of the view is actually exposed on screen (taking into account
</span><span class="cx"> // clipping by other UI elements), whereas visibleContentRect is
</span><span class="cx"> // internal to WebCore and doesn't respect those things.
</span><del>- WEBCORE_EXPORT void setViewExposedRect(Optional<FloatRect>);
- Optional<FloatRect> viewExposedRect() const { return m_viewExposedRect; }
</del><ins>+ WEBCORE_EXPORT void setViewExposedRect(std::optional<FloatRect>);
+ std::optional<FloatRect> viewExposedRect() const { return m_viewExposedRect; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> void updateSnapOffsets() override;
</span><span class="lines">@@ -786,10 +786,10 @@
</span><span class="cx">
</span><span class="cx"> bool m_shouldUpdateWhileOffscreen;
</span><span class="cx">
</span><del>- Optional<FloatRect> m_viewExposedRect;
</del><ins>+ std::optional<FloatRect> m_viewExposedRect;
</ins><span class="cx">
</span><span class="cx"> LayoutPoint m_layoutViewportOrigin;
</span><del>- Optional<LayoutRect> m_layoutViewportOverrideRect;
</del><ins>+ std::optional<LayoutRect> m_layoutViewportOverrideRect;
</ins><span class="cx">
</span><span class="cx"> unsigned m_deferSetNeedsLayoutCount;
</span><span class="cx"> bool m_setNeedsLayoutWasDeferred;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/Page.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<std::pair<MediaCanStartListener&, Document&>> Page::takeAnyMediaCanStartListener()
</del><ins>+inline std::optional<std::pair<MediaCanStartListener&, Document&>> Page::takeAnyMediaCanStartListener()
</ins><span class="cx"> {
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (!frame->document())
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> if (MediaCanStartListener* listener = frame->document()->takeAnyMediaCanStartListener())
</span><span class="cx"> return { { *listener, *frame->document() } };
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setCanStartMedia(bool canStartMedia)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/Page.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -541,8 +541,8 @@
</span><span class="cx"> bool isResourceCachingDisabled() const { return m_resourceCachingDisabled; }
</span><span class="cx"> void setResourceCachingDisabled(bool disabled) { m_resourceCachingDisabled = disabled; }
</span><span class="cx">
</span><del>- Optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const { return m_eventThrottlingBehaviorOverride; }
- void setEventThrottlingBehaviorOverride(Optional<EventThrottlingBehavior> throttling) { m_eventThrottlingBehaviorOverride = throttling; }
</del><ins>+ std::optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const { return m_eventThrottlingBehaviorOverride; }
+ void setEventThrottlingBehaviorOverride(std::optional<EventThrottlingBehavior> throttling) { m_eventThrottlingBehaviorOverride = throttling; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned findMatchesForText(const String&, FindOptions, unsigned maxMatchCount, ShouldHighlightMatches, ShouldMarkMatches);
</span><span class="cx">
</span><del>- Optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
</del><ins>+ std::optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
</ins><span class="cx">
</span><span class="cx"> Vector<Ref<PluginViewBase>> pluginViews();
</span><span class="cx">
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> UserInterfaceLayoutDirection m_userInterfaceLayoutDirection { UserInterfaceLayoutDirection::LTR };
</span><span class="cx">
</span><span class="cx"> // For testing.
</span><del>- Optional<EventThrottlingBehavior> m_eventThrottlingBehaviorOverride;
</del><ins>+ std::optional<EventThrottlingBehavior> m_eventThrottlingBehaviorOverride;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline PageGroup& Page::group()
</span></span></pre></div>
<a id="trunkSourceWebCorepageScrollToOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ScrollToOptions.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ScrollToOptions.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/ScrollToOptions.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct ScrollToOptions {
</span><del>- Optional<double> left;
- Optional<double> top;
</del><ins>+ std::optional<double> left;
+ std::optional<double> top;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> m_domain = m_host;
</span><span class="cx">
</span><span class="cx"> if (m_port && isDefaultPortForProtocol(m_port.value(), m_protocol))
</span><del>- m_port = Nullopt;
</del><ins>+ m_port = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // By default, only local SecurityOrigins can load local resources.
</span><span class="cx"> m_canLoadLocalResources = isLocal();
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx"> return SecurityOrigin::create(URL(URL(), originString));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, Optional<uint16_t> port)
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, std::optional<uint16_t> port)
</ins><span class="cx"> {
</span><span class="cx"> String decodedHost = decodeURLEscapeSequences(host);
</span><span class="cx"> auto origin = create(URL(URL(), protocol + "://" + host + "/"));
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/SecurityOrigin.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> static Ref<SecurityOrigin> createUnique();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static Ref<SecurityOrigin> createFromString(const String&);
</span><del>- WEBCORE_EXPORT static Ref<SecurityOrigin> create(const String& protocol, const String& host, Optional<uint16_t> port);
</del><ins>+ WEBCORE_EXPORT static Ref<SecurityOrigin> create(const String& protocol, const String& host, std::optional<uint16_t> port);
</ins><span class="cx">
</span><span class="cx"> // Some URL schemes use nested URLs for their security context. For example,
</span><span class="cx"> // filesystem URLs look like the following:
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> const String& protocol() const { return m_protocol; }
</span><span class="cx"> const String& host() const { return m_host; }
</span><span class="cx"> const String& domain() const { return m_domain; }
</span><del>- Optional<uint16_t> port() const { return m_port; }
</del><ins>+ std::optional<uint16_t> port() const { return m_port; }
</ins><span class="cx">
</span><span class="cx"> // Returns true if a given URL is secure, based either directly on its
</span><span class="cx"> // own protocol, or, when relevant, on the protocol of its "inner URL"
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> String m_host;
</span><span class="cx"> String m_domain;
</span><span class="cx"> String m_filePath;
</span><del>- Optional<uint16_t> m_port;
</del><ins>+ std::optional<uint16_t> m_port;
</ins><span class="cx"> bool m_isUnique { false };
</span><span class="cx"> bool m_universalAccess { false };
</span><span class="cx"> bool m_domainWasSetInDOM { false };
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/SecurityOriginData.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> String SecurityOriginData::debugString() const
</span><span class="cx"> {
</span><del>- return makeString(protocol, "://", host, ":", String::number(port.valueOr(0)));
</del><ins>+ return makeString(protocol, "://", host, ":", String::number(port.value_or(0)));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -92,27 +92,27 @@
</span><span class="cx"> stringBuilder.append(separatorCharacter);
</span><span class="cx"> stringBuilder.append(encodeForFileName(host));
</span><span class="cx"> stringBuilder.append(separatorCharacter);
</span><del>- stringBuilder.appendNumber(port.valueOr(0));
</del><ins>+ stringBuilder.appendNumber(port.value_or(0));
</ins><span class="cx">
</span><span class="cx"> return stringBuilder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<SecurityOriginData> SecurityOriginData::fromDatabaseIdentifier(const String& databaseIdentifier)
</del><ins>+std::optional<SecurityOriginData> SecurityOriginData::fromDatabaseIdentifier(const String& databaseIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> // Make sure there's a first separator
</span><span class="cx"> size_t separator1 = databaseIdentifier.find(separatorCharacter);
</span><span class="cx"> if (separator1 == notFound)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Make sure there's a second separator
</span><span class="cx"> size_t separator2 = databaseIdentifier.reverseFind(separatorCharacter);
</span><span class="cx"> if (separator2 == notFound)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Ensure there were at least 2 separator characters. Some hostnames on intranets have
</span><span class="cx"> // underscores in them, so we'll assume that any additional underscores are part of the host.
</span><span class="cx"> if (separator1 == separator2)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Make sure the port section is a valid port number or doesn't exist
</span><span class="cx"> bool portOkay;
</span><span class="lines">@@ -119,10 +119,10 @@
</span><span class="cx"> int port = databaseIdentifier.right(databaseIdentifier.length() - separator2 - 1).toInt(&portOkay);
</span><span class="cx"> bool portAbsent = (separator2 == databaseIdentifier.length() - 1);
</span><span class="cx"> if (!(portOkay || portAbsent))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (port < 0 || port > std::numeric_limits<uint16_t>::max())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return SecurityOriginData {databaseIdentifier.substring(0, separator1), databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1), static_cast<uint16_t>(port)};
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/SecurityOriginData.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> struct SecurityOriginData {
</span><span class="cx"> SecurityOriginData() = default;
</span><del>- SecurityOriginData(const String& protocol, const String& host, Optional<uint16_t> port)
</del><ins>+ SecurityOriginData(const String& protocol, const String& host, std::optional<uint16_t> port)
</ins><span class="cx"> : protocol(protocol)
</span><span class="cx"> , host(host)
</span><span class="cx"> , port(port)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> String protocol;
</span><span class="cx"> String host;
</span><del>- Optional<uint16_t> port;
</del><ins>+ std::optional<uint16_t> port;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT SecurityOriginData isolatedCopy() const;
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // Serialize the security origin to a string that could be used as part of
</span><span class="cx"> // file names. This format should be used in storage APIs only.
</span><span class="cx"> WEBCORE_EXPORT String databaseIdentifier() const;
</span><del>- WEBCORE_EXPORT static Optional<SecurityOriginData> fromDatabaseIdentifier(const String&);
</del><ins>+ WEBCORE_EXPORT static std::optional<SecurityOriginData> fromDatabaseIdentifier(const String&);
</ins><span class="cx">
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, SecurityOriginData&);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const
</span><span class="cx"> {
</span><del>- return protocol.isNull() && host.isNull() && port == Nullopt;
</del><ins>+ return protocol.isNull() && host.isNull() && port == std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isHashTableDeletedValue() const
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> unsigned hashCodes[3] = {
</span><span class="cx"> data.protocol.impl() ? data.protocol.impl()->hash() : 0,
</span><span class="cx"> data.host.impl() ? data.host.impl()->hash() : 0,
</span><del>- data.port.valueOr(0)
</del><ins>+ data.port.value_or(0)
</ins><span class="cx"> };
</span><span class="cx"> return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginHashh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginHash.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginHash.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/SecurityOriginHash.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> unsigned hashCodes[3] = {
</span><span class="cx"> origin->protocol().impl() ? origin->protocol().impl()->hash() : 0,
</span><span class="cx"> origin->host().impl() ? origin->host().impl()->hash() : 0,
</span><del>- origin->port().valueOr(0)
</del><ins>+ origin->port().value_or(0)
</ins><span class="cx"> };
</span><span class="cx"> return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageWindowFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WindowFeatures.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WindowFeatures.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/WindowFeatures.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> static void setWindowFeature(WindowFeatures&, StringView key, StringView value);
</span><span class="cx">
</span><span class="cx"> static DialogFeaturesMap parseDialogFeaturesMap(const String&);
</span><del>-static Optional<bool> boolFeature(const DialogFeaturesMap&, const char* key);
-static Optional<float> floatFeature(const DialogFeaturesMap&, const char* key, float min, float max);
</del><ins>+static std::optional<bool> boolFeature(const DialogFeaturesMap&, const char* key);
+static std::optional<float> floatFeature(const DialogFeaturesMap&, const char* key, float min, float max);
</ins><span class="cx">
</span><span class="cx"> static bool isSeparator(UChar character)
</span><span class="cx"> {
</span><span class="lines">@@ -158,8 +158,8 @@
</span><span class="cx"> features.locationBarVisible = false;
</span><span class="cx"> features.dialog = true;
</span><span class="cx">
</span><del>- float width = floatFeature(featuresMap, "dialogwidth", 100, screenAvailableRect.width()).valueOr(620); // default here came from frame size of dialog in MacIE
- float height = floatFeature(featuresMap, "dialogheight", 100, screenAvailableRect.height()).valueOr(450); // default here came from frame size of dialog in MacIE
</del><ins>+ float width = floatFeature(featuresMap, "dialogwidth", 100, screenAvailableRect.width()).value_or(620); // default here came from frame size of dialog in MacIE
+ float height = floatFeature(featuresMap, "dialogheight", 100, screenAvailableRect.height()).value_or(450); // default here came from frame size of dialog in MacIE
</ins><span class="cx">
</span><span class="cx"> features.width = width;
</span><span class="cx"> features.height = height;
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> features.x = floatFeature(featuresMap, "dialogleft", screenAvailableRect.x(), screenAvailableRect.maxX() - width);
</span><span class="cx"> features.y = floatFeature(featuresMap, "dialogtop", screenAvailableRect.y(), screenAvailableRect.maxY() - height);
</span><span class="cx">
</span><del>- if (boolFeature(featuresMap, "center").valueOr(true)) {
</del><ins>+ if (boolFeature(featuresMap, "center").value_or(true)) {
</ins><span class="cx"> if (!features.x)
</span><span class="cx"> features.x = screenAvailableRect.x() + (screenAvailableRect.width() - width) / 2;
</span><span class="cx"> if (!features.y)
</span><span class="lines">@@ -174,18 +174,18 @@
</span><span class="cx"> features.y = screenAvailableRect.y() + (screenAvailableRect.height() - height) / 2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- features.resizable = boolFeature(featuresMap, "resizable").valueOr(false);
- features.scrollbarsVisible = boolFeature(featuresMap, "scroll").valueOr(true);
- features.statusBarVisible = boolFeature(featuresMap, "status").valueOr(false);
</del><ins>+ features.resizable = boolFeature(featuresMap, "resizable").value_or(false);
+ features.scrollbarsVisible = boolFeature(featuresMap, "scroll").value_or(true);
+ features.statusBarVisible = boolFeature(featuresMap, "status").value_or(false);
</ins><span class="cx">
</span><span class="cx"> return features;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<bool> boolFeature(const DialogFeaturesMap& features, const char* key)
</del><ins>+static std::optional<bool> boolFeature(const DialogFeaturesMap& features, const char* key)
</ins><span class="cx"> {
</span><span class="cx"> auto it = features.find(key);
</span><span class="cx"> if (it == features.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto& value = it->value;
</span><span class="cx"> return value.isNull()
</span><span class="lines">@@ -194,11 +194,11 @@
</span><span class="cx"> || equalLettersIgnoringASCIICase(value, "on");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<float> floatFeature(const DialogFeaturesMap& features, const char* key, float min, float max)
</del><ins>+static std::optional<float> floatFeature(const DialogFeaturesMap& features, const char* key, float min, float max)
</ins><span class="cx"> {
</span><span class="cx"> auto it = features.find(key);
</span><span class="cx"> if (it == features.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // FIXME: The toDouble function does not offer a way to tell "0q" from string with no digits in it: Both
</span><span class="cx"> // return the number 0 and false for ok. But "0q" should yield the minimum rather than the default.
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> bool ok;
</span><span class="cx"> double parsedNumber = it->value.toDouble(&ok);
</span><span class="cx"> if ((!parsedNumber && !ok) || std::isnan(parsedNumber))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (parsedNumber < min || max <= min)
</span><span class="cx"> return min;
</span><span class="cx"> if (parsedNumber > max)
</span></span></pre></div>
<a id="trunkSourceWebCorepageWindowFeaturesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WindowFeatures.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WindowFeatures.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/WindowFeatures.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> class FloatRect;
</span><span class="cx">
</span><span class="cx"> struct WindowFeatures {
</span><del>- Optional<float> x;
- Optional<float> y;
- Optional<float> width;
- Optional<float> height;
</del><ins>+ std::optional<float> x;
+ std::optional<float> y;
+ std::optional<float> width;
+ std::optional<float> height;
</ins><span class="cx">
</span><span class="cx"> bool menuBarVisible { true };
</span><span class="cx"> bool statusBarVisible { true };
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ContentSecurityPolicySource::ContentSecurityPolicySource(const ContentSecurityPolicy& policy, const String& scheme, const String& host, Optional<uint16_t> port, const String& path, bool hostHasWildcard, bool portHasWildcard)
</del><ins>+ContentSecurityPolicySource::ContentSecurityPolicySource(const ContentSecurityPolicy& policy, const String& scheme, const String& host, std::optional<uint16_t> port, const String& path, bool hostHasWildcard, bool portHasWildcard)
</ins><span class="cx"> : m_policy(policy)
</span><span class="cx"> , m_scheme(scheme)
</span><span class="cx"> , m_host(host)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> if (m_portHasWildcard)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- Optional<uint16_t> port = url.port();
</del><ins>+ std::optional<uint16_t> port = url.port();
</ins><span class="cx">
</span><span class="cx"> if (port == m_port)
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class ContentSecurityPolicySource {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- ContentSecurityPolicySource(const ContentSecurityPolicy&, const String& scheme, const String& host, Optional<uint16_t> port, const String& path, bool hostHasWildcard, bool portHasWildcard);
</del><ins>+ ContentSecurityPolicySource(const ContentSecurityPolicy&, const String& scheme, const String& host, std::optional<uint16_t> port, const String& path, bool hostHasWildcard, bool portHasWildcard);
</ins><span class="cx">
</span><span class="cx"> bool matches(const URL&, bool didReceiveRedirectResponse = false) const;
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> const ContentSecurityPolicy& m_policy;
</span><span class="cx"> String m_scheme;
</span><span class="cx"> String m_host;
</span><del>- Optional<uint16_t> m_port;
</del><ins>+ std::optional<uint16_t> m_port;
</ins><span class="cx"> String m_path;
</span><span class="cx">
</span><span class="cx"> bool m_hostHasWildcard;
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> skipWhile<UChar, isSourceCharacter>(position, end);
</span><span class="cx">
</span><span class="cx"> String scheme, host, path;
</span><del>- Optional<uint16_t> port;
</del><ins>+ std::optional<uint16_t> port;
</ins><span class="cx"> bool hostHasWildcard = false;
</span><span class="cx"> bool portHasWildcard = false;
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> // / ( [ scheme "://" ] host [ port ] [ path ] )
</span><span class="cx"> // / "'self'"
</span><span class="cx"> //
</span><del>-bool ContentSecurityPolicySourceList::parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, Optional<uint16_t>& port, String& path, bool& hostHasWildcard, bool& portHasWildcard)
</del><ins>+bool ContentSecurityPolicySourceList::parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, std::optional<uint16_t>& port, String& path, bool& hostHasWildcard, bool& portHasWildcard)
</ins><span class="cx"> {
</span><span class="cx"> if (begin == end)
</span><span class="cx"> return false;
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!beginPort)
</span><del>- port = Nullopt;
</del><ins>+ port = std::nullopt;
</ins><span class="cx"> else {
</span><span class="cx"> if (!parsePort(beginPort, beginPath, port, portHasWildcard))
</span><span class="cx"> return false;
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx">
</span><span class="cx"> // port = ":" ( 1*DIGIT / "*" )
</span><span class="cx"> //
</span><del>-bool ContentSecurityPolicySourceList::parsePort(const UChar* begin, const UChar* end, Optional<uint16_t>& port, bool& portHasWildcard)
</del><ins>+bool ContentSecurityPolicySourceList::parsePort(const UChar* begin, const UChar* end, std::optional<uint16_t>& port, bool& portHasWildcard)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(begin <= end);
</span><span class="cx"> ASSERT(!port);
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (end - begin == 1 && *begin == '*') {
</span><del>- port = Nullopt;
</del><ins>+ port = std::nullopt;
</ins><span class="cx"> portHasWildcard = true;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourceListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> private:
</span><span class="cx"> void parse(const UChar* begin, const UChar* end);
</span><span class="cx">
</span><del>- bool parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, Optional<uint16_t>& port, String& path, bool& hostHasWildcard, bool& portHasWildcard);
</del><ins>+ bool parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, std::optional<uint16_t>& port, String& path, bool& hostHasWildcard, bool& portHasWildcard);
</ins><span class="cx"> bool parseScheme(const UChar* begin, const UChar* end, String& scheme);
</span><span class="cx"> bool parseHost(const UChar* begin, const UChar* end, String& host, bool& hostHasWildcard);
</span><del>- bool parsePort(const UChar* begin, const UChar* end, Optional<uint16_t>& port, bool& portHasWildcard);
</del><ins>+ bool parsePort(const UChar* begin, const UChar* end, std::optional<uint16_t>& port, bool& portHasWildcard);
</ins><span class="cx"> bool parsePath(const UChar* begin, const UChar* end, String& path);
</span><span class="cx">
</span><span class="cx"> bool parseNonceSource(const UChar* begin, const UChar* end);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> bool isProgrammaticScroll = frameView.inProgrammaticScroll();
</span><span class="cx"> if (isProgrammaticScroll || frameView.frame().document()->pageCacheState() != Document::NotInPageCache)
</span><del>- updateScrollPositionAfterAsyncScroll(frameView.scrollLayerID(), scrollPosition, Nullopt, isProgrammaticScroll, ScrollingLayerPositionAction::Set);
</del><ins>+ updateScrollPositionAfterAsyncScroll(frameView.scrollLayerID(), scrollPosition, std::nullopt, isProgrammaticScroll, ScrollingLayerPositionAction::Set);
</ins><span class="cx">
</span><span class="cx"> // If this frame view's document is being put into the page cache, we don't want to update our
</span><span class="cx"> // main frame scroll position. Just let the FrameView think that we did.
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> ScheduledScrollUpdate scrollUpdate(nodeID, scrollPosition, layoutViewportOrigin, programmaticScroll, scrollingLayerPositionAction);
</span><span class="cx">
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll(ScrollingNodeID scrollingNodeID, const FloatPoint& scrollPosition, Optional<FloatPoint> layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll(ScrollingNodeID scrollingNodeID, const FloatPoint& scrollPosition, std::optional<FloatPoint> layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="lines">@@ -349,13 +349,13 @@
</span><span class="cx"> bool oldProgrammaticScroll = frameView.inProgrammaticScroll();
</span><span class="cx"> frameView.setInProgrammaticScroll(programmaticScroll);
</span><span class="cx">
</span><del>- Optional<FloatRect> layoutViewportRect;
</del><ins>+ std::optional<FloatRect> layoutViewportRect;
</ins><span class="cx">
</span><span class="cx"> WTF::switchOn(layoutViewportOriginOrOverrideRect,
</span><del>- [&frameView](Optional<FloatPoint> origin) {
</del><ins>+ [&frameView](std::optional<FloatPoint> origin) {
</ins><span class="cx"> if (origin)
</span><span class="cx"> frameView.setBaseLayoutViewportOrigin(LayoutPoint(origin.value()), FrameView::TriggerLayoutOrNot::No);
</span><del>- }, [&frameView, &layoutViewportRect, inStableState, visualViewportEnabled = visualViewportEnabled()](Optional<FloatRect> overrideRect) {
</del><ins>+ }, [&frameView, &layoutViewportRect, inStableState, visualViewportEnabled = visualViewportEnabled()](std::optional<FloatRect> overrideRect) {
</ins><span class="cx"> layoutViewportRect = overrideRect;
</span><span class="cx"> if (overrideRect && inStableState) {
</span><span class="cx"> if (visualViewportEnabled)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void scrollingStateTreePropertiesChanged();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void scheduleUpdateScrollPositionAfterAsyncScroll(ScrollingNodeID, const FloatPoint&, const Optional<FloatPoint>& layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction);
</del><ins>+ WEBCORE_EXPORT void scheduleUpdateScrollPositionAfterAsyncScroll(ScrollingNodeID, const FloatPoint&, const std::optional<FloatPoint>& layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WEBCORE_EXPORT void setActiveScrollSnapIndices(ScrollingNodeID, unsigned horizontalIndex, unsigned verticalIndex);
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ScrollingTree> releaseScrollingTree() { return WTFMove(m_scrollingTree); }
</span><span class="cx">
</span><del>- void updateScrollPositionAfterAsyncScroll(ScrollingNodeID, const FloatPoint&, Optional<FloatPoint> layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction);
</del><ins>+ void updateScrollPositionAfterAsyncScroll(ScrollingNodeID, const FloatPoint&, std::optional<FloatPoint> layoutViewportOrigin, bool programmaticScroll, ScrollingLayerPositionAction);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String scrollingStateTreeAsText() const override;
</span><span class="cx"> WEBCORE_EXPORT void willCommitTree() override;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> struct ScheduledScrollUpdate {
</span><span class="cx"> ScheduledScrollUpdate() = default;
</span><del>- ScheduledScrollUpdate(ScrollingNodeID scrollingNodeID, FloatPoint point, Optional<FloatPoint> viewportOrigin, bool isProgrammatic, ScrollingLayerPositionAction udpateAction)
</del><ins>+ ScheduledScrollUpdate(ScrollingNodeID scrollingNodeID, FloatPoint point, std::optional<FloatPoint> viewportOrigin, bool isProgrammatic, ScrollingLayerPositionAction udpateAction)
</ins><span class="cx"> : nodeID(scrollingNodeID)
</span><span class="cx"> , scrollPosition(point)
</span><span class="cx"> , layoutViewportOrigin(viewportOrigin)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingNodeID nodeID { 0 };
</span><span class="cx"> FloatPoint scrollPosition;
</span><del>- Optional<FloatPoint> layoutViewportOrigin;
</del><ins>+ std::optional<FloatPoint> layoutViewportOrigin;
</ins><span class="cx"> bool isProgrammaticScroll { false };
</span><span class="cx"> ScrollingLayerPositionAction updateLayerPositionAction { ScrollingLayerPositionAction::Sync };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> // Should be called whenever the given frame view has been laid out.
</span><span class="cx"> virtual void frameViewLayoutUpdated(FrameView&) { }
</span><span class="cx">
</span><del>- using LayoutViewportOriginOrOverrideRect = WTF::Variant<Optional<FloatPoint>, Optional<FloatRect>>;
</del><ins>+ using LayoutViewportOriginOrOverrideRect = WTF::Variant<std::optional<FloatPoint>, std::optional<FloatRect>>;
</ins><span class="cx"> virtual void reconcileScrollingState(FrameView&, const FloatPoint&, const LayoutViewportOriginOrOverrideRect&, bool /* programmaticScroll */, bool /* inStableState*/, ScrollingLayerPositionAction) { }
</span><span class="cx">
</span><span class="cx"> // Should be called whenever the slow repaint objects counter changes between zero and one.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> downcast<ScrollingTreeOverflowScrollingNode>(*node).updateLayersAfterDelegatedScroll(scrollPosition);
</span><span class="cx">
</span><span class="cx"> // Update GraphicsLayers and scroll state.
</span><del>- scrollingTreeNodeDidScroll(nodeID, scrollPosition, Nullopt, inUserInteration ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
</del><ins>+ scrollingTreeNodeDidScroll(nodeID, scrollPosition, std::nullopt, inUserInteration ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> // Called after a scrolling tree node has handled a scroll and updated its layers.
</span><span class="cx"> // Updates FrameView/RenderLayer scrolling state and GraphicsLayers.
</span><del>- virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) = 0;
</del><ins>+ virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) = 0;
</ins><span class="cx">
</span><span class="cx"> // Called for requested scroll position updates.
</span><span class="cx"> virtual void scrollingTreeNodeRequestsScroll(ScrollingNodeID, const FloatPoint& /*scrollPosition*/, bool /*representsProgrammaticScroll*/) { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void ScrollingTreeScrollingNode::setScrollPositionWithoutContentEdgeConstraints(const FloatPoint& scrollPosition)
</span><span class="cx"> {
</span><span class="cx"> setScrollLayerPosition(scrollPosition, { });
</span><del>- scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, Nullopt);
</del><ins>+ scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollingTreeScrollingNode::minimumScrollPosition() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> ScrollingTree::commitTreeState(WTFMove(scrollingStateTree));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void ThreadedScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scrollingCoordinator)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> explicit ThreadedScrollingTree(AsyncScrollingCoordinator*);
</span><span class="cx">
</span><del>- void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) override;
</del><ins>+ void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) override;
</ins><span class="cx"> void currentSnapPointIndicesDidChange(ScrollingNodeID, unsigned horizontal, unsigned vertical) override;
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void handleWheelEventPhase(PlatformWheelEventPhase) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -109,13 +109,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (shouldUpdateScrollLayerPositionSynchronously()) {
</span><span class="cx"> m_probableMainThreadScrollPosition = scrollPosition;
</span><del>- scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, Nullopt, ScrollingLayerPositionAction::Set);
</del><ins>+ scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, std::nullopt, ScrollingLayerPositionAction::Set);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect layoutViewport; // FIXME: implement for iOS WK1.
</span><span class="cx"> setScrollLayerPosition(scrollPosition, layoutViewport);
</span><del>- scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, Nullopt);
</del><ins>+ scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeFrameScrollingNodeIOS::setScrollLayerPosition(const FloatPoint& scrollPosition, const FloatRect&)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scrollingCoordinator)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
</span><span class="cx">
</span><del>- void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) override;
</del><ins>+ void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync) override;
</ins><span class="cx">
</span><span class="cx"> void currentSnapPointIndicesDidChange(WebCore::ScrollingNodeID, unsigned horizontal, unsigned vertical) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> {
</span><span class="cx"> updateMainFramePinState(scrollPosition);
</span><span class="cx">
</span><del>- Optional<FloatPoint> layoutViewportOrigin;
</del><ins>+ std::optional<FloatPoint> layoutViewportOrigin;
</ins><span class="cx"> if (scrollingTree().visualViewportEnabled()) {
</span><span class="cx"> FloatPoint visibleContentOrigin = scrollPosition;
</span><span class="cx"> float counterScale = 1 / frameScaleFactor();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> const Frame& frame;
</span><span class="cx"> RenderObject* startRenderer;
</span><span class="cx"> RenderObject* endRenderer;
</span><del>- Optional<unsigned> startOffset;
- Optional<unsigned> endOffset;
</del><ins>+ std::optional<unsigned> startOffset;
+ std::optional<unsigned> endOffset;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DragImageRef createDragImageForRange(Frame& frame, Range& range, bool forceBlackText)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLinkIconh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LinkIcon.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LinkIcon.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/LinkIcon.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> URL url;
</span><span class="cx"> LinkIconType type;
</span><span class="cx"> String mimeType;
</span><del>- Optional<unsigned> size;
</del><ins>+ std::optional<unsigned> size;
</ins><span class="cx">
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, LinkIcon&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void readAndNotify() const;
</span><span class="cx">
</span><del>- Optional<int> m_fd;
</del><ins>+ std::optional<int> m_fd;
</ins><span class="cx"> std::function<void ()> m_notifyHandler;
</span><span class="cx"> #if USE(GLIB)
</span><span class="cx"> GRefPtr<GSource> m_source;
</span><span class="lines">@@ -164,8 +164,8 @@
</span><span class="cx"> CFRunLoopObserverRef m_observer { nullptr };
</span><span class="cx"> Lock m_observerMutex;
</span><span class="cx"> #elif OS(LINUX)
</span><del>- Optional<int> m_eventFD;
- Optional<int> m_pressureLevelFD;
</del><ins>+ std::optional<int> m_eventFD;
+ std::optional<int> m_pressureLevelFD;
</ins><span class="cx"> std::unique_ptr<EventFDPoller> m_eventFDPoller;
</span><span class="cx"> RunLoop::Timer<MemoryPressureHandler> m_holdOffTimer;
</span><span class="cx"> void holdOffTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -454,8 +454,8 @@
</span><span class="cx"> else if (m_deferredScrollOffsets)
</span><span class="cx"> scrollOffsetChangedViaPlatformWidgetImpl(m_deferredScrollOffsets.value().first, m_deferredScrollOffsets.value().second);
</span><span class="cx">
</span><del>- m_deferredScrollDelta = Nullopt;
- m_deferredScrollOffsets = Nullopt;
</del><ins>+ m_deferredScrollDelta = std::nullopt;
+ m_deferredScrollOffsets = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollView::scrollTo(const ScrollPosition& newPosition)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/ScrollView.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -462,8 +462,8 @@
</span><span class="cx"> IntSize m_fixedLayoutSize;
</span><span class="cx"> IntSize m_contentsSize;
</span><span class="cx">
</span><del>- Optional<IntSize> m_deferredScrollDelta; // Needed for WebKit scrolling
- Optional<std::pair<ScrollOffset, ScrollOffset>> m_deferredScrollOffsets; // Needed for platform widget scrolling
</del><ins>+ std::optional<IntSize> m_deferredScrollDelta; // Needed for WebKit scrolling
+ std::optional<std::pair<ScrollOffset, ScrollOffset>> m_deferredScrollOffsets; // Needed for platform widget scrolling
</ins><span class="cx">
</span><span class="cx"> bool m_scrollbarsSuppressed;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Theme.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Theme.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/Theme.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> // Methods used to adjust the RenderStyles of controls.
</span><span class="cx">
</span><span class="cx"> // The font description result should have a zoomed font size.
</span><del>- virtual Optional<FontCascadeDescription> controlFont(ControlPart, const FontCascade&, float /*zoomFactor*/) const { return Nullopt; }
</del><ins>+ virtual std::optional<FontCascadeDescription> controlFont(ControlPart, const FontCascade&, float /*zoomFactor*/) const { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> // The size here is in zoomed coordinates already. If a new size is returned, it also needs to be in zoomed coordinates.
</span><span class="cx"> virtual LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize& zoomedSize, float /*zoomFactor*/) const { return zoomedSize; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Timer.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Timer.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/Timer.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void fired() = 0;
</span><span class="cx">
</span><del>- virtual Optional<std::chrono::milliseconds> alignedFireTime(std::chrono::milliseconds) const { return Nullopt; }
</del><ins>+ virtual std::optional<std::chrono::milliseconds> alignedFireTime(std::chrono::milliseconds) const { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> void checkConsistency() const;
</span><span class="cx"> void checkHeapIndex() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -714,10 +714,10 @@
</span><span class="cx"> return m_string.substring(start, m_hostEnd - start);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<uint16_t> URL::port() const
</del><ins>+std::optional<uint16_t> URL::port() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_portEnd || m_hostEnd >= m_portEnd - 1)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> bool ok = false;
</span><span class="cx"> unsigned number;
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> else
</span><span class="cx"> number = charactersToUIntStrict(m_string.characters16() + m_hostEnd + 1, m_portEnd - m_hostEnd - 1, &ok);
</span><span class="cx"> if (!ok || number > std::numeric_limits<uint16_t>::max())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -826,7 +826,7 @@
</span><span class="cx"> defaultPortForProtocolMapForTesting().clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<uint16_t> defaultPortForProtocol(StringView protocol)
</del><ins>+std::optional<uint16_t> defaultPortForProtocol(StringView protocol)
</ins><span class="cx"> {
</span><span class="cx"> const auto& defaultPortForProtocolMap = defaultPortForProtocolMapForTesting();
</span><span class="cx"> auto iterator = defaultPortForProtocolMap.find(protocol.toStringWithoutCopying());
</span><span class="lines">@@ -2288,7 +2288,7 @@
</span><span class="cx">
</span><span class="cx"> bool portAllowed(const URL& url)
</span><span class="cx"> {
</span><del>- Optional<uint16_t> port = url.port();
</del><ins>+ std::optional<uint16_t> port = url.port();
</ins><span class="cx">
</span><span class="cx"> // Since most URLs don't have a port, return early for the "no port" case.
</span><span class="cx"> if (!port)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/URL.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT StringView protocol() const;
</span><span class="cx"> WEBCORE_EXPORT String host() const;
</span><del>- WEBCORE_EXPORT Optional<uint16_t> port() const;
</del><ins>+ WEBCORE_EXPORT std::optional<uint16_t> port() const;
</ins><span class="cx"> WEBCORE_EXPORT String hostAndPort() const;
</span><span class="cx"> WEBCORE_EXPORT String user() const;
</span><span class="cx"> WEBCORE_EXPORT String pass() const;
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool protocolIsJavaScript(const String& url);
</span><span class="cx"> WEBCORE_EXPORT bool protocolIsInHTTPFamily(const String& url);
</span><span class="cx">
</span><del>-Optional<uint16_t> defaultPortForProtocol(StringView protocol);
</del><ins>+std::optional<uint16_t> defaultPortForProtocol(StringView protocol);
</ins><span class="cx"> WEBCORE_EXPORT bool isDefaultPortForProtocol(uint16_t port, StringView protocol);
</span><span class="cx"> WEBCORE_EXPORT bool portAllowed(const URL&); // Blacklist ports that should never be used for Web resources.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<uint16_t> URLParser::defaultPortForProtocol(StringView scheme)
</del><ins>+std::optional<uint16_t> URLParser::defaultPortForProtocol(StringView scheme)
</ins><span class="cx"> {
</span><span class="cx"> static const uint16_t ftpPort = 21;
</span><span class="cx"> static const uint16_t gopherPort = 70;
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx">
</span><span class="cx"> auto length = scheme.length();
</span><span class="cx"> if (!length)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> switch (scheme[0]) {
</span><span class="cx"> case 'w':
</span><span class="cx"> switch (length) {
</span><span class="lines">@@ -641,12 +641,12 @@
</span><span class="cx"> case 2:
</span><span class="cx"> if (scheme[1] == 's')
</span><span class="cx"> return wsPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case 3:
</span><span class="cx"> if (scheme[1] == 's'
</span><span class="cx"> && scheme[2] == 's')
</span><span class="cx"> return wssPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> && scheme[2] == 't'
</span><span class="cx"> && scheme[3] == 'p')
</span><span class="cx"> return httpPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case 5:
</span><span class="cx"> if (scheme[1] == 't'
</span><span class="cx"> && scheme[2] == 't'
</span><span class="lines">@@ -664,9 +664,9 @@
</span><span class="cx"> && scheme[3] == 'p'
</span><span class="cx"> && scheme[4] == 's')
</span><span class="cx"> return httpsPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> case 'g':
</span><span class="cx"> if (length == 6
</span><span class="lines">@@ -676,15 +676,15 @@
</span><span class="cx"> && scheme[4] == 'e'
</span><span class="cx"> && scheme[5] == 'r')
</span><span class="cx"> return gopherPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> case 'f':
</span><span class="cx"> if (length == 3
</span><span class="cx"> && scheme[1] == 't'
</span><span class="cx"> && scheme[2] == 'p')
</span><span class="cx"> return ftpPort;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> default:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2055,9 +2055,9 @@
</span><span class="cx"> return end - begin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<size_t> findLongestZeroSequence(const std::array<uint16_t, 8>& address)
</del><ins>+static std::optional<size_t> findLongestZeroSequence(const std::array<uint16_t, 8>& address)
</ins><span class="cx"> {
</span><del>- Optional<size_t> longest;
</del><ins>+ std::optional<size_t> longest;
</ins><span class="cx"> size_t longestLength = 0;
</span><span class="cx"> for (size_t i = 0; i < 8; i++) {
</span><span class="cx"> size_t length = zeroSequenceLength(address, i);
</span><span class="lines">@@ -2114,7 +2114,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<uint32_t> URLParser::parseIPv4Piece(CodePointIterator<CharacterType>& iterator, bool& didSeeSyntaxViolation)
</del><ins>+std::optional<uint32_t> URLParser::parseIPv4Piece(CodePointIterator<CharacterType>& iterator, bool& didSeeSyntaxViolation)
</ins><span class="cx"> {
</span><span class="cx"> enum class State : uint8_t {
</span><span class="cx"> UnknownBase,
</span><span class="lines">@@ -2126,7 +2126,7 @@
</span><span class="cx"> State state = State::UnknownBase;
</span><span class="cx"> Checked<uint32_t, RecordOverflow> value = 0;
</span><span class="cx"> if (!iterator.atEnd() && *iterator == '.')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> while (!iterator.atEnd()) {
</span><span class="cx"> if (isTabOrNewline(*iterator)) {
</span><span class="cx"> didSeeSyntaxViolation = true;
</span><span class="lines">@@ -2157,31 +2157,31 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::Decimal:
</span><span class="cx"> if (*iterator < '0' || *iterator > '9')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> value *= 10;
</span><span class="cx"> value += *iterator - '0';
</span><span class="cx"> if (UNLIKELY(value.hasOverflowed()))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> ++iterator;
</span><span class="cx"> break;
</span><span class="cx"> case State::Octal:
</span><span class="cx"> ASSERT(didSeeSyntaxViolation);
</span><span class="cx"> if (*iterator < '0' || *iterator > '7')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> value *= 8;
</span><span class="cx"> value += *iterator - '0';
</span><span class="cx"> if (UNLIKELY(value.hasOverflowed()))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> ++iterator;
</span><span class="cx"> break;
</span><span class="cx"> case State::Hex:
</span><span class="cx"> ASSERT(didSeeSyntaxViolation);
</span><span class="cx"> if (!isASCIIHexDigit(*iterator))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> value *= 16;
</span><span class="cx"> value += toASCIIHexValue(*iterator);
</span><span class="cx"> if (UNLIKELY(value.hasOverflowed()))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> ++iterator;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -2198,7 +2198,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<URLParser::IPv4Address> URLParser::parseIPv4Host(CodePointIterator<CharacterType> iterator)
</del><ins>+std::optional<URLParser::IPv4Address> URLParser::parseIPv4Host(CodePointIterator<CharacterType> iterator)
</ins><span class="cx"> {
</span><span class="cx"> auto hostBegin = iterator;
</span><span class="cx">
</span><span class="lines">@@ -2212,30 +2212,30 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (items.size() >= 4)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (auto item = parseIPv4Piece(iterator, didSeeSyntaxViolation))
</span><span class="cx"> items.append(item.value());
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (!iterator.atEnd()) {
</span><span class="cx"> if (items.size() >= 4)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (*iterator == '.')
</span><span class="cx"> ++iterator;
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!iterator.atEnd() || !items.size() || items.size() > 4)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (items.size() > 1) {
</span><span class="cx"> for (size_t i = 0; i < items.size() - 1; i++) {
</span><span class="cx"> if (items[i] > 255)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (items[items.size() - 1] >= pow256(5 - items.size()))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (didSeeSyntaxViolation)
</span><span class="cx"> syntaxViolation(hostBegin);
</span><span class="lines">@@ -2254,20 +2254,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<uint32_t> URLParser::parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>& iterator)
</del><ins>+std::optional<uint32_t> URLParser::parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>& iterator)
</ins><span class="cx"> {
</span><span class="cx"> if (iterator.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> uint32_t piece = 0;
</span><span class="cx"> bool leadingZeros = false;
</span><span class="cx"> size_t digitCount = 0;
</span><span class="cx"> while (!iterator.atEnd()) {
</span><span class="cx"> if (!isASCIIDigit(*iterator))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> ++digitCount;
</span><span class="cx"> if (!piece && *iterator == '0') {
</span><span class="cx"> if (leadingZeros)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> leadingZeros = true;
</span><span class="cx"> }
</span><span class="cx"> if (!piece && *iterator == '0')
</span><span class="lines">@@ -2274,7 +2274,7 @@
</span><span class="cx"> leadingZeros = true;
</span><span class="cx"> piece = piece * 10 + *iterator - '0';
</span><span class="cx"> if (piece > 255)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> advance<CharacterType, ReportSyntaxViolation::No>(iterator);
</span><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> break;
</span><span class="lines">@@ -2282,27 +2282,27 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (piece && leadingZeros)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return piece;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<URLParser::IPv4Address> URLParser::parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType> iterator)
</del><ins>+std::optional<URLParser::IPv4Address> URLParser::parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType> iterator)
</ins><span class="cx"> {
</span><span class="cx"> IPv4Address address = 0;
</span><span class="cx"> for (size_t i = 0; i < 4; ++i) {
</span><del>- if (Optional<uint32_t> piece = parseIPv4PieceInsideIPv6(iterator))
</del><ins>+ if (std::optional<uint32_t> piece = parseIPv4PieceInsideIPv6(iterator))
</ins><span class="cx"> address = (address << 8) + piece.value();
</span><span class="cx"> else
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (i < 3) {
</span><span class="cx"> if (iterator.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (*iterator != '.')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> advance<CharacterType, ReportSyntaxViolation::No>(iterator);
</span><span class="cx"> } else if (!iterator.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(iterator.atEnd());
</span><span class="cx"> return address;
</span><span class="lines">@@ -2309,24 +2309,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<URLParser::IPv6Address> URLParser::parseIPv6Host(CodePointIterator<CharacterType> c)
</del><ins>+std::optional<URLParser::IPv6Address> URLParser::parseIPv6Host(CodePointIterator<CharacterType> c)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(*c == '[');
</span><span class="cx"> auto hostBegin = c;
</span><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> if (c.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> IPv6Address address = {{0, 0, 0, 0, 0, 0, 0, 0}};
</span><span class="cx"> size_t piecePointer = 0;
</span><del>- Optional<size_t> compressPointer;
</del><ins>+ std::optional<size_t> compressPointer;
</ins><span class="cx">
</span><span class="cx"> if (*c == ':') {
</span><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> if (c.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (*c != ':')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> ++piecePointer;
</span><span class="cx"> compressPointer = piecePointer;
</span><span class="lines">@@ -2334,10 +2334,10 @@
</span><span class="cx">
</span><span class="cx"> while (!c.atEnd()) {
</span><span class="cx"> if (piecePointer == 8)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (*c == ':') {
</span><span class="cx"> if (compressPointer)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> ++piecePointer;
</span><span class="cx"> compressPointer = piecePointer;
</span><span class="lines">@@ -2344,9 +2344,9 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (piecePointer == 6 || (compressPointer && piecePointer < 6)) {
</span><del>- if (Optional<IPv4Address> ipv4Address = parseIPv4AddressInsideIPv6(c)) {
</del><ins>+ if (std::optional<IPv4Address> ipv4Address = parseIPv4AddressInsideIPv6(c)) {
</ins><span class="cx"> if (compressPointer && piecePointer == 5)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> syntaxViolation(hostBegin);
</span><span class="cx"> address[piecePointer++] = ipv4Address.value() >> 16;
</span><span class="cx"> address[piecePointer++] = ipv4Address.value() & 0xFFFF;
</span><span class="lines">@@ -2377,12 +2377,12 @@
</span><span class="cx"> if (c.atEnd())
</span><span class="cx"> break;
</span><span class="cx"> if (piecePointer == 8 || *c != ':')
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!c.atEnd())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (compressPointer) {
</span><span class="cx"> size_t swaps = piecePointer - compressPointer.value();
</span><span class="lines">@@ -2390,9 +2390,9 @@
</span><span class="cx"> while (swaps)
</span><span class="cx"> std::swap(address[piecePointer--], address[compressPointer.value() + swaps-- - 1]);
</span><span class="cx"> } else if (piecePointer != 8)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><del>- Optional<size_t> possibleCompressPointer = findLongestZeroSequence(address);
</del><ins>+ std::optional<size_t> possibleCompressPointer = findLongestZeroSequence(address);
</ins><span class="cx"> if (possibleCompressPointer)
</span><span class="cx"> possibleCompressPointer.value()++;
</span><span class="cx"> if (UNLIKELY(compressPointer != possibleCompressPointer))
</span><span class="lines">@@ -2453,7 +2453,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<Vector<LChar, URLParser::defaultInlineBufferSize>> URLParser::domainToASCII(const String& domain, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition)
</del><ins>+std::optional<Vector<LChar, URLParser::defaultInlineBufferSize>> URLParser::domainToASCII(const String& domain, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition)
</ins><span class="cx"> {
</span><span class="cx"> Vector<LChar, defaultInlineBufferSize> ascii;
</span><span class="cx"> if (containsOnlyASCII(domain)) {
</span><span class="lines">@@ -2496,7 +2496,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Check for U_BUFFER_OVERFLOW_ERROR and retry with an allocated buffer.
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool URLParser::hasInvalidDomainCharacter(const Vector<LChar, URLParser::defaultInlineBufferSize>& asciiDomain)
</span><span class="lines">@@ -2690,11 +2690,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<String> URLParser::formURLDecode(StringView input)
</del><ins>+std::optional<String> URLParser::formURLDecode(StringView input)
</ins><span class="cx"> {
</span><span class="cx"> auto utf8 = input.utf8(StrictConversion);
</span><span class="cx"> if (utf8.isNull())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> auto percentDecoded = percentDecode(reinterpret_cast<const LChar*>(utf8.data()), utf8.length());
</span><span class="cx"> return String::fromUTF8(percentDecoded.data(), percentDecoded.size());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> static const UIDNA& internationalDomainNameTranscoder();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static Optional<uint16_t> defaultPortForProtocol(StringView);
- friend Optional<uint16_t> defaultPortForProtocol(StringView);
</del><ins>+ static std::optional<uint16_t> defaultPortForProtocol(StringView);
+ friend std::optional<uint16_t> defaultPortForProtocol(StringView);
</ins><span class="cx">
</span><span class="cx"> URL m_url;
</span><span class="cx"> Vector<LChar> m_asciiBuffer;
</span><span class="lines">@@ -94,10 +94,10 @@
</span><span class="cx"> template<typename UnsignedIntegerType> void appendNumberToASCIIBuffer(UnsignedIntegerType);
</span><span class="cx"> template<bool(*isInCodeSet)(UChar32), typename CharacterType> void utf8PercentEncode(const CodePointIterator<CharacterType>&);
</span><span class="cx"> template<typename CharacterType> void utf8QueryEncode(const CodePointIterator<CharacterType>&);
</span><del>- template<typename CharacterType> Optional<Vector<LChar, defaultInlineBufferSize>> domainToASCII(const String&, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition);
</del><ins>+ template<typename CharacterType> std::optional<Vector<LChar, defaultInlineBufferSize>> domainToASCII(const String&, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition);
</ins><span class="cx"> template<typename CharacterType> Vector<LChar, defaultInlineBufferSize> percentDecode(const LChar*, size_t, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition);
</span><span class="cx"> static Vector<LChar, defaultInlineBufferSize> percentDecode(const LChar*, size_t);
</span><del>- static Optional<String> formURLDecode(StringView input);
</del><ins>+ static std::optional<String> formURLDecode(StringView input);
</ins><span class="cx"> static bool hasInvalidDomainCharacter(const Vector<LChar, defaultInlineBufferSize>&);
</span><span class="cx"> void percentEncodeByte(uint8_t);
</span><span class="cx"> void appendToASCIIBuffer(UChar32);
</span><span class="lines">@@ -110,12 +110,12 @@
</span><span class="cx">
</span><span class="cx"> using IPv4Address = uint32_t;
</span><span class="cx"> void serializeIPv4(IPv4Address);
</span><del>- template<typename CharacterType> Optional<IPv4Address> parseIPv4Host(CodePointIterator<CharacterType>);
- template<typename CharacterType> Optional<uint32_t> parseIPv4Piece(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</del><ins>+ template<typename CharacterType> std::optional<IPv4Address> parseIPv4Host(CodePointIterator<CharacterType>);
+ template<typename CharacterType> std::optional<uint32_t> parseIPv4Piece(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</ins><span class="cx"> using IPv6Address = std::array<uint16_t, 8>;
</span><del>- template<typename CharacterType> Optional<IPv6Address> parseIPv6Host(CodePointIterator<CharacterType>);
- template<typename CharacterType> Optional<uint32_t> parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>&);
- template<typename CharacterType> Optional<IPv4Address> parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType>);
</del><ins>+ template<typename CharacterType> std::optional<IPv6Address> parseIPv6Host(CodePointIterator<CharacterType>);
+ template<typename CharacterType> std::optional<uint32_t> parseIPv4PieceInsideIPv6(CodePointIterator<CharacterType>&);
+ template<typename CharacterType> std::optional<IPv4Address> parseIPv4AddressInsideIPv6(CodePointIterator<CharacterType>);
</ins><span class="cx"> void serializeIPv6Piece(uint16_t piece);
</span><span class="cx"> void serializeIPv6(IPv6Address);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> size_t frameCount() const { return m_source.frameCount(); }
</span><span class="cx"> RepetitionCount repetitionCount() const { return m_source.repetitionCount(); }
</span><span class="cx"> String filenameExtension() const override { return m_source.filenameExtension(); }
</span><del>- Optional<IntPoint> hotSpot() const override { return m_source.hotSpot(); }
</del><ins>+ std::optional<IntPoint> hotSpot() const override { return m_source.hotSpot(); }
</ins><span class="cx">
</span><span class="cx"> // FloatSize due to override.
</span><span class="cx"> FloatSize size() const override { return m_source.size(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);
</span><del>-RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
</del><ins>+RGBA32 colorWithOverrideAlpha(RGBA32 color, std::optional<float> overrideAlpha);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a);
</span><span class="cx"> RGBA32 makeRGBAFromHSLA(double h, double s, double l, double a);
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> return approximation + (remainder >> 8);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha)
</del><ins>+inline RGBA32 colorWithOverrideAlpha(RGBA32 color, std::optional<float> overrideAlpha)
</ins><span class="cx"> {
</span><span class="cx"> return overrideAlpha ? colorWithOverrideAlpha(color, overrideAlpha.value()) : color;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool m_scheduled { false };
</span><del>- Optional<PlatformDisplayID> m_displayID;
</del><ins>+ std::optional<PlatformDisplayID> m_displayID;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -284,10 +284,10 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> mutable RetainPtr<CFDictionaryRef> m_nonKernedCFStringAttributes;
</span><span class="cx"> mutable RetainPtr<CFDictionaryRef> m_kernedCFStringAttributes;
</span><del>- mutable Optional<BitVector> m_glyphsSupportedBySmallCaps;
- mutable Optional<BitVector> m_glyphsSupportedByAllSmallCaps;
- mutable Optional<BitVector> m_glyphsSupportedByPetiteCaps;
- mutable Optional<BitVector> m_glyphsSupportedByAllPetiteCaps;
</del><ins>+ mutable std::optional<BitVector> m_glyphsSupportedBySmallCaps;
+ mutable std::optional<BitVector> m_glyphsSupportedByAllSmallCaps;
+ mutable std::optional<BitVector> m_glyphsSupportedByPetiteCaps;
+ mutable std::optional<BitVector> m_glyphsSupportedByAllPetiteCaps;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(HARFBUZZ)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> return getGlyphsAndAdvancesForComplexText(run, from, to, glyphBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float FontCascade::drawText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, unsigned from, Optional<unsigned> to, CustomFontNotReadyAction customFontNotReadyAction) const
</del><ins>+float FontCascade::drawText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, unsigned from, std::optional<unsigned> to, CustomFontNotReadyAction customFontNotReadyAction) const
</ins><span class="cx"> {
</span><span class="cx"> // Don't draw anything while we are using custom fonts that are in the process of loading,
</span><span class="cx"> // except if the 'force' argument is set to true (in which case it will use a fallback
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> if (isLoadingCustomFonts() && customFontNotReadyAction == DoNotPaintIfFontNotReady)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- unsigned destination = to.valueOr(run.length());
</del><ins>+ unsigned destination = to.value_or(run.length());
</ins><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><span class="lines">@@ -327,12 +327,12 @@
</span><span class="cx"> return startPoint.x() - startX;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::drawEmphasisMarks(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to) const
</del><ins>+void FontCascade::drawEmphasisMarks(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, std::optional<unsigned> to) const
</ins><span class="cx"> {
</span><span class="cx"> if (isLoadingCustomFonts())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- unsigned destination = to.valueOr(run.length());
</del><ins>+ unsigned destination = to.value_or(run.length());
</ins><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><span class="lines">@@ -490,9 +490,9 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::adjustSelectionRectForText(const TextRun& run, LayoutRect& selectionRect, unsigned from, Optional<unsigned> to) const
</del><ins>+void FontCascade::adjustSelectionRectForText(const TextRun& run, LayoutRect& selectionRect, unsigned from, std::optional<unsigned> to) const
</ins><span class="cx"> {
</span><del>- unsigned destination = to.valueOr(run.length());
</del><ins>+ unsigned destination = to.value_or(run.length());
</ins><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><span class="lines">@@ -1179,10 +1179,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This function may not work if the emphasis mark uses a complex script, but none of the
</span><span class="cx"> // standard emphasis marks do so.
</span><del>-Optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomicString& mark) const
</del><ins>+std::optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomicString& mark) const
</ins><span class="cx"> {
</span><span class="cx"> if (mark.isEmpty())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> UChar32 character;
</span><span class="cx"> if (!mark.is8Bit()) {
</span><span class="lines">@@ -1189,17 +1189,17 @@
</span><span class="cx"> SurrogatePairAwareTextIterator iterator(mark.characters16(), 0, mark.length(), mark.length());
</span><span class="cx"> unsigned clusterLength;
</span><span class="cx"> if (!iterator.consume(character, clusterLength))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> } else
</span><span class="cx"> character = mark[0];
</span><span class="cx">
</span><del>- Optional<GlyphData> glyphData(glyphDataForCharacter(character, false, EmphasisMarkVariant));
- return glyphData.value().isValid() ? glyphData : Nullopt;
</del><ins>+ std::optional<GlyphData> glyphData(glyphDataForCharacter(character, false, EmphasisMarkVariant));
+ return glyphData.value().isValid() ? glyphData : std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkAscent(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</del><ins>+ std::optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</ins><span class="cx"> if (!markGlyphData)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1213,7 +1213,7 @@
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkDescent(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</del><ins>+ std::optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</ins><span class="cx"> if (!markGlyphData)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkHeight(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</del><ins>+ std::optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</ins><span class="cx"> if (!markGlyphData)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1329,7 +1329,7 @@
</span><span class="cx">
</span><span class="cx"> void FontCascade::drawEmphasisMarks(GraphicsContext& context, const GlyphBuffer& glyphBuffer, const AtomicString& mark, const FloatPoint& point) const
</span><span class="cx"> {
</span><del>- Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</del><ins>+ std::optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
</ins><span class="cx"> if (!markGlyphData)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -132,9 +132,9 @@
</span><span class="cx"> void update(RefPtr<FontSelector>&&) const;
</span><span class="cx">
</span><span class="cx"> enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontNotReady };
</span><del>- WEBCORE_EXPORT float drawText(GraphicsContext&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = Nullopt, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
</del><ins>+ WEBCORE_EXPORT float drawText(GraphicsContext&, const TextRun&, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
</ins><span class="cx"> static void drawGlyphs(GraphicsContext&, const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, FontSmoothingMode);
</span><del>- void drawEmphasisMarks(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = Nullopt) const;
</del><ins>+ void drawEmphasisMarks(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt) const;
</ins><span class="cx">
</span><span class="cx"> DashArray dashesForIntersectionsWithRect(const TextRun&, const FloatPoint& textOrigin, const FloatRect& lineExtents) const;
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> static float width(TextLayout&, unsigned from, unsigned len, HashSet<const Font*>* fallbackFonts = 0);
</span><span class="cx">
</span><span class="cx"> int offsetForPosition(const TextRun&, float position, bool includePartialGlyphs) const;
</span><del>- void adjustSelectionRectForText(const TextRun&, LayoutRect& selectionRect, unsigned from = 0, Optional<unsigned> to = Nullopt) const;
</del><ins>+ void adjustSelectionRectForText(const TextRun&, LayoutRect& selectionRect, unsigned from = 0, std::optional<unsigned> to = std::nullopt) const;
</ins><span class="cx">
</span><span class="cx"> bool isSmallCaps() const { return m_fontDescription.variantCaps() == FontVariantCaps::Small; }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> int offsetForPositionForSimpleText(const TextRun&, float position, bool includePartialGlyphs) const;
</span><span class="cx"> void adjustSelectionRectForSimpleText(const TextRun&, LayoutRect& selectionRect, unsigned from, unsigned to) const;
</span><span class="cx">
</span><del>- Optional<GlyphData> getEmphasisMarkGlyphData(const AtomicString&) const;
</del><ins>+ std::optional<GlyphData> getEmphasisMarkGlyphData(const AtomicString&) const;
</ins><span class="cx">
</span><span class="cx"> static bool canReturnFallbackFontsForComplexText();
</span><span class="cx"> static bool canExpandAroundIdeographsInComplexText();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx"> --m_transparencyCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float GraphicsContext::drawText(const FontCascade& font, const TextRun& run, const FloatPoint& point, unsigned from, Optional<unsigned> to)
</del><ins>+float GraphicsContext::drawText(const FontCascade& font, const TextRun& run, const FloatPoint& point, unsigned from, std::optional<unsigned> to)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> fontCascade.drawGlyphs(*this, font, buffer, from, numGlyphs, point, fontCascade.fontDescription().fontSmoothing());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawEmphasisMarks(const FontCascade& font, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to)
</del><ins>+void GraphicsContext::drawEmphasisMarks(const FontCascade& font, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, std::optional<unsigned> to)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -692,7 +692,7 @@
</span><span class="cx"> subrun.setDirection(isRTL ? RTL : LTR);
</span><span class="cx"> subrun.setDirectionalOverride(bidiRun->dirOverride(false));
</span><span class="cx">
</span><del>- float width = font.drawText(*this, subrun, currPoint, 0, Nullopt, customFontNotReadyAction);
</del><ins>+ float width = font.drawText(*this, subrun, currPoint, 0, std::nullopt, customFontNotReadyAction);
</ins><span class="cx"> currPoint.move(width, 0);
</span><span class="cx">
</span><span class="cx"> bidiRun = bidiRun->next();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -387,9 +387,9 @@
</span><span class="cx"> void setTextDrawingMode(TextDrawingModeFlags);
</span><span class="cx"> TextDrawingModeFlags textDrawingMode() const { return m_state.textDrawingMode; }
</span><span class="cx">
</span><del>- float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = Nullopt);
</del><ins>+ float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt);
</ins><span class="cx"> void drawGlyphs(const FontCascade&, const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&);
</span><del>- void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = Nullopt);
</del><ins>+ void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt);
</ins><span class="cx"> void drawBidiText(const FontCascade&, const TextRun&, const FloatPoint&, FontCascade::CustomFontNotReadyAction = FontCascade::DoNotPaintIfFontNotReady);
</span><span class="cx">
</span><span class="cx"> void applyState(const GraphicsContextState&);
</span><span class="lines">@@ -698,7 +698,7 @@
</span><span class="cx"> m_graphicsContext.setImageInterpolationQuality(interpolationQualityToUse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit InterpolationQualityMaintainer(GraphicsContext& graphicsContext, Optional<InterpolationQuality> interpolationQuality)
</del><ins>+ explicit InterpolationQualityMaintainer(GraphicsContext& graphicsContext, std::optional<InterpolationQuality> interpolationQuality)
</ins><span class="cx"> : InterpolationQualityMaintainer(graphicsContext, interpolationQuality ? interpolationQuality.value() : graphicsContext.imageInterpolationQuality())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -307,11 +307,11 @@
</span><span class="cx">
</span><span class="cx"> // The position of the layer (the location of its top-left corner in its parent)
</span><span class="cx"> const FloatPoint& position() const { return m_position; }
</span><del>- virtual void setPosition(const FloatPoint& p) { m_approximatePosition = Nullopt; m_position = p; }
</del><ins>+ virtual void setPosition(const FloatPoint& p) { m_approximatePosition = std::nullopt; m_position = p; }
</ins><span class="cx">
</span><span class="cx"> // approximatePosition, if set, overrides position() and is used during coverage rect computation.
</span><span class="cx"> FloatPoint approximatePosition() const { return m_approximatePosition ? m_approximatePosition.value() : m_position; }
</span><del>- void setApproximatePosition(Optional<FloatPoint> p) { m_approximatePosition = p; }
</del><ins>+ void setApproximatePosition(std::optional<FloatPoint> p) { m_approximatePosition = p; }
</ins><span class="cx">
</span><span class="cx"> // For platforms that move underlying platform layers on a different thread for scrolling; just update the GraphicsLayer state.
</span><span class="cx"> virtual void syncPosition(const FloatPoint& p) { m_position = p; }
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> FloatPoint m_position;
</span><span class="cx">
</span><span class="cx"> // If set, overrides m_position. Only used for coverage computation.
</span><del>- Optional<FloatPoint> m_approximatePosition;
</del><ins>+ std::optional<FloatPoint> m_approximatePosition;
</ins><span class="cx">
</span><span class="cx"> FloatPoint3D m_anchorPoint;
</span><span class="cx"> FloatSize m_size;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> FloatRect rect() const { return FloatRect(FloatPoint(), size()); }
</span><span class="cx"> float width() const { return size().width(); }
</span><span class="cx"> float height() const { return size().height(); }
</span><del>- virtual Optional<IntPoint> hotSpot() const { return Nullopt; }
</del><ins>+ virtual std::optional<IntPoint> hotSpot() const { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual FloatSize originalSize() const { return size(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-11-27 06:08:16 UTC (rev 208985)
</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, Optional<double> quality = Nullopt, CoordinateSystem = LogicalCoordinateSystem) const;
</del><ins>+ String toDataURL(const String& mimeType, std::optional<double> quality = std::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 dataURL(const ImageData&, const String& mimeType, Optional<double> quality);
</del><ins>+String dataURL(const ImageData&, const String& mimeType, std::optional<double> quality);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageFrameCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -335,12 +335,12 @@
</span><span class="cx">
</span><span class="cx"> void ImageFrameCache::clearMetadata()
</span><span class="cx"> {
</span><del>- m_frameCount = Nullopt;
- m_singlePixelSolidColor = Nullopt;
</del><ins>+ m_frameCount = std::nullopt;
+ m_singlePixelSolidColor = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, T (ImageDecoder::*functor)() const>
</span><del>-T ImageFrameCache::metadata(const T& defaultValue, Optional<T>* cachedValue)
</del><ins>+T ImageFrameCache::metadata(const T& defaultValue, std::optional<T>* cachedValue)
</ins><span class="cx"> {
</span><span class="cx"> if (cachedValue && *cachedValue)
</span><span class="cx"> return cachedValue->value();
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, T (ImageFrame::*functor)() const>
</span><del>-T ImageFrameCache::frameMetadataAtIndex(size_t index, SubsamplingLevel subsamplingLevel, ImageFrame::Caching caching, Optional<T>* cachedValue)
</del><ins>+T ImageFrameCache::frameMetadataAtIndex(size_t index, SubsamplingLevel subsamplingLevel, ImageFrame::Caching caching, std::optional<T>* cachedValue)
</ins><span class="cx"> {
</span><span class="cx"> if (cachedValue && *cachedValue)
</span><span class="cx"> return cachedValue->value();
</span><span class="lines">@@ -400,9 +400,9 @@
</span><span class="cx"> return metadata<String, (&ImageDecoder::filenameExtension)>(String(), &m_filenameExtension);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IntPoint> ImageFrameCache::hotSpot()
</del><ins>+std::optional<IntPoint> ImageFrameCache::hotSpot()
</ins><span class="cx"> {
</span><del>- return metadata<Optional<IntPoint>, (&ImageDecoder::hotSpot)>(Nullopt, &m_hotSpot);
</del><ins>+ return metadata<std::optional<IntPoint>, (&ImageDecoder::hotSpot)>(std::nullopt, &m_hotSpot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize ImageFrameCache::size()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageFrameCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageFrameCache.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageFrameCache.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ImageFrameCache.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> size_t frameCount();
</span><span class="cx"> RepetitionCount repetitionCount();
</span><span class="cx"> String filenameExtension();
</span><del>- Optional<IntPoint> hotSpot();
</del><ins>+ std::optional<IntPoint> hotSpot();
</ins><span class="cx">
</span><span class="cx"> // Image metadata which is calculated from the first ImageFrame.
</span><span class="cx"> IntSize size();
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx"> ImageFrameCache(NativeImagePtr&&);
</span><span class="cx">
</span><span class="cx"> template<typename T, T (ImageDecoder::*functor)() const>
</span><del>- T metadata(const T& defaultValue, Optional<T>* cachedValue = nullptr);
</del><ins>+ T metadata(const T& defaultValue, std::optional<T>* cachedValue = nullptr);
</ins><span class="cx">
</span><span class="cx"> template<typename T, T (ImageFrame::*functor)() const>
</span><del>- T frameMetadataAtIndex(size_t index, SubsamplingLevel = SubsamplingLevel::Undefinded, ImageFrame::Caching = ImageFrame::Caching::Empty, Optional<T>* = nullptr);
</del><ins>+ T frameMetadataAtIndex(size_t index, SubsamplingLevel = SubsamplingLevel::Undefinded, ImageFrame::Caching = ImageFrame::Caching::Empty, std::optional<T>* = nullptr);
</ins><span class="cx">
</span><span class="cx"> bool isDecoderAvailable() const { return m_decoder; }
</span><span class="cx"> void decodedSizeChanged(long long decodedSize);
</span><span class="lines">@@ -153,16 +153,16 @@
</span><span class="cx"> RefPtr<WorkQueue> m_decodingQueue;
</span><span class="cx">
</span><span class="cx"> // Image metadata.
</span><del>- Optional<bool> m_isSizeAvailable;
- Optional<size_t> m_frameCount;
- Optional<RepetitionCount> m_repetitionCount;
- Optional<String> m_filenameExtension;
- Optional<Optional<IntPoint>> m_hotSpot;
</del><ins>+ std::optional<bool> m_isSizeAvailable;
+ std::optional<size_t> m_frameCount;
+ std::optional<RepetitionCount> m_repetitionCount;
+ std::optional<String> m_filenameExtension;
+ std::optional<std::optional<IntPoint>> m_hotSpot;
</ins><span class="cx">
</span><span class="cx"> // Image metadata which is calculated from the first ImageFrame.
</span><del>- Optional<IntSize> m_size;
- Optional<IntSize> m_sizeRespectingOrientation;
- Optional<Color> m_singlePixelSolidColor;
</del><ins>+ std::optional<IntSize> m_size;
+ std::optional<IntSize> m_sizeRespectingOrientation;
+ std::optional<Color> m_singlePixelSolidColor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> size_t frameCount() { return m_frameCache->frameCount(); }
</span><span class="cx"> RepetitionCount repetitionCount() { return m_frameCache->repetitionCount(); }
</span><span class="cx"> String filenameExtension() { return m_frameCache->filenameExtension(); }
</span><del>- Optional<IntPoint> hotSpot() { return m_frameCache->hotSpot(); }
</del><ins>+ std::optional<IntPoint> hotSpot() { return m_frameCache->hotSpot(); }
</ins><span class="cx">
</span><span class="cx"> // Image metadata which is calculated from the first ImageFrame.
</span><span class="cx"> IntSize size() { return m_frameCache->size(); }
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> Ref<ImageFrameCache> m_frameCache;
</span><span class="cx"> std::unique_ptr<ImageDecoder> m_decoder;
</span><span class="cx">
</span><del>- Optional<SubsamplingLevel> m_maximumSubsamplingLevel;
</del><ins>+ std::optional<SubsamplingLevel> m_maximumSubsamplingLevel;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: We should expose a setting to enable/disable progressive loading so that we can remove the PLATFORM(IOS)-guard.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PathUtilities.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -462,13 +462,13 @@
</span><span class="cx"> return radii;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<FloatRect> rectFromPolygon(const FloatPointGraph::Polygon& poly)
</del><ins>+static std::optional<FloatRect> rectFromPolygon(const FloatPointGraph::Polygon& poly)
</ins><span class="cx"> {
</span><span class="cx"> if (poly.size() != 4)
</span><del>- return Optional<FloatRect>();
</del><ins>+ return std::optional<FloatRect>();
</ins><span class="cx">
</span><del>- Optional<FloatPoint> topLeft;
- Optional<FloatPoint> bottomRight;
</del><ins>+ std::optional<FloatPoint> topLeft;
+ std::optional<FloatPoint> bottomRight;
</ins><span class="cx"> for (unsigned i = 0; i < poly.size(); ++i) {
</span><span class="cx"> const auto& toEdge = poly[i];
</span><span class="cx"> const auto& fromEdge = (i > 0) ? poly[i - 1] : poly[poly.size() - 1];
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!topLeft || !bottomRight)
</span><del>- return Optional<FloatRect>();
</del><ins>+ return std::optional<FloatRect>();
</ins><span class="cx"> return FloatRect(topLeft.value(), bottomRight.value());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> return Path();
</span><span class="cx"> const auto& poly = polys.at(0);
</span><span class="cx"> // Fast path when poly has one rect only.
</span><del>- Optional<FloatRect> rect = rectFromPolygon(poly);
</del><ins>+ std::optional<FloatRect> rect = rectFromPolygon(poly);
</ins><span class="cx"> if (rect)
</span><span class="cx"> return roundedRect(rect.value());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> if (m_shadowsIgnoreTransforms && !transform.isIdentity()) {
</span><span class="cx"> FloatQuad transformedPolygon = transform.mapQuad(FloatQuad(shadowedRect));
</span><span class="cx"> transformedPolygon.move(m_offset);
</span><del>- layerRect = transform.inverse().valueOr(AffineTransform()).mapQuad(transformedPolygon).boundingBox();
</del><ins>+ layerRect = transform.inverse().value_or(AffineTransform()).mapQuad(transformedPolygon).boundingBox();
</ins><span class="cx"> } else {
</span><span class="cx"> layerRect = shadowedRect;
</span><span class="cx"> layerRect.move(m_offset);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> virtual FloatRect visibleRect() const = 0;
</span><span class="cx">
</span><span class="cx"> // Only used to update the tile coverage map.
</span><del>- virtual void setLayoutViewportRect(Optional<FloatRect>) = 0;
</del><ins>+ virtual void setLayoutViewportRect(std::optional<FloatRect>) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void setCoverageRect(const FloatRect&) = 0;
</span><span class="cx"> virtual FloatRect coverageRect() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -2355,7 +2355,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> FloatRect imageRect(0, 0, CGImageGetWidth(m_lastImage.get()), CGImageGetHeight(m_lastImage.get()));
</span><span class="cx"> AffineTransform videoTransform = [firstEnabledVideoTrack preferredTransform];
</span><del>- FloatRect transformedOutputRect = videoTransform.inverse().valueOr(AffineTransform()).mapRect(outputRect);
</del><ins>+ FloatRect transformedOutputRect = videoTransform.inverse().value_or(AffineTransform()).mapRect(outputRect);
</ins><span class="cx">
</span><span class="cx"> context.concatCTM(videoTransform);
</span><span class="cx"> context.drawNativeImage(m_lastImage.get(), imageRect.size(), transformedOutputRect, imageRect);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> SourceBufferPrivateClient* m_client;
</span><span class="cx"> CDMSessionMediaSourceAVFObjC* m_session { nullptr };
</span><span class="cx">
</span><del>- Optional<FloatSize> m_cachedSize;
</del><ins>+ std::optional<FloatSize> m_cachedSize;
</ins><span class="cx"> FloatSize m_currentSize;
</span><span class="cx"> bool m_parsingSucceeded;
</span><span class="cx"> bool m_parserStateWasReset { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> void SourceBufferPrivateAVFObjC::flush(AVSampleBufferDisplayLayer *renderer)
</span><span class="cx"> {
</span><span class="cx"> [renderer flush];
</span><del>- m_cachedSize = Nullopt;
</del><ins>+ m_cachedSize = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (m_mediaSource) {
</span><span class="cx"> m_mediaSource->player()->setHasAvailableVideoFrame(false);
</span><span class="lines">@@ -1001,7 +1001,7 @@
</span><span class="cx">
</span><span class="cx"> FloatSize SourceBufferPrivateAVFObjC::naturalSize()
</span><span class="cx"> {
</span><del>- return m_cachedSize.valueOr(FloatSize());
</del><ins>+ return m_cachedSize.value_or(FloatSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SourceBufferPrivateAVFObjC::didBecomeReadyForMoreSamples(int trackID)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1274,7 +1274,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect coverageRect = clipRectForSelf;
</span><del>- Optional<FloatQuad> quad = state.mappedSecondaryQuad(&mapWasClamped);
</del><ins>+ std::optional<FloatQuad> quad = state.mappedSecondaryQuad(&mapWasClamped);
</ins><span class="cx"> if (quad && !mapWasClamped && !applyWasClamped)
</span><span class="cx"> coverageRect = (*quad).boundingBox();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> updateTileCoverageMap();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TileController::setLayoutViewportRect(Optional<FloatRect> rect)
</del><ins>+void TileController::setLayoutViewportRect(std::optional<FloatRect> rect)
</ins><span class="cx"> {
</span><span class="cx"> if (rect == m_layoutViewportRect)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect visibleRect() const override { return m_visibleRect; }
</span><span class="cx"> FloatRect coverageRect() const override { return m_coverageRect; }
</span><del>- Optional<FloatRect> layoutViewportRect() const { return m_layoutViewportRect; }
</del><ins>+ std::optional<FloatRect> layoutViewportRect() const { return m_layoutViewportRect; }
</ins><span class="cx">
</span><span class="cx"> unsigned blankPixelCount() const;
</span><span class="cx"> static unsigned blankPixelCountForTiles(const PlatformLayerList&, const FloatRect&, const IntPoint&);
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> // TiledBacking member functions.
</span><span class="cx"> void setVisibleRect(const FloatRect&) override;
</span><del>- void setLayoutViewportRect(Optional<FloatRect>) override;
</del><ins>+ void setLayoutViewportRect(std::optional<FloatRect>) override;
</ins><span class="cx"> void setCoverageRect(const FloatRect&) override;
</span><span class="cx"> bool tilesWouldChangeForCoverageRect(const FloatRect&) const override;
</span><span class="cx"> void setTiledScrollingIndicatorPosition(const FloatPoint&) override;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> std::unique_ptr<TileGrid> m_zoomedOutTileGrid;
</span><span class="cx">
</span><span class="cx"> FloatRect m_visibleRect; // Only used for scroll performance logging.
</span><del>- Optional<FloatRect> m_layoutViewportRect; // Only used by the tiled scrolling indicator.
</del><ins>+ std::optional<FloatRect> m_layoutViewportRect; // Only used by the tiled scrolling indicator.
</ins><span class="cx"> FloatRect m_coverageRect;
</span><span class="cx"> IntRect m_boundsAtLastRevalidate;
</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 (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</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, Optional<double>, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, std::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 (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool encodeImage(CGImageRef image, CFStringRef uti, Optional<double> quality, CFMutableDataRef data)
</del><ins>+static bool encodeImage(CGImageRef image, CFStringRef uti, std::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="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> return CGImageDestinationFinalize(destination.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String dataURL(CGImageRef image, const String& mimeType, Optional<double> quality)
</del><ins>+static String dataURL(CGImageRef image, const String& mimeType, std::optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> auto uti = utiFromMIMEType(mimeType);
</span><span class="cx"> ASSERT(uti);
</span><span class="lines">@@ -498,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, Optional<double> quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, std::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">@@ -539,7 +539,7 @@
</span><span class="cx"> return dataURL(image.get(), mimeType, quality);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String dataURL(const ImageData& source, const String& mimeType, Optional<double> quality)
</del><ins>+String dataURL(const ImageData& source, const String& mimeType, std::optional<double> quality)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageDecoderCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -203,23 +203,23 @@
</span><span class="cx"> return RepetitionCountNone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IntPoint> ImageDecoder::hotSpot() const
</del><ins>+std::optional<IntPoint> ImageDecoder::hotSpot() const
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_nativeDecoder.get(), 0, imageSourceOptions().get()));
</span><span class="cx"> if (!properties)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> int x = -1, y = -1;
</span><span class="cx"> CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(properties.get(), CFSTR("hotspotX"));
</span><span class="cx"> if (!num || !CFNumberGetValue(num, kCFNumberIntType, &x))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> num = (CFNumberRef)CFDictionaryGetValue(properties.get(), CFSTR("hotspotY"));
</span><span class="cx"> if (!num || !CFNumberGetValue(num, kCFNumberIntType, &y))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (x < 0 || y < 0)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return IntPoint(x, y);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageDecoderCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> size_t frameCount() const;
</span><span class="cx"> RepetitionCount repetitionCount() const;
</span><span class="cx"> String filenameExtension() const;
</span><del>- Optional<IntPoint> hotSpot() const;
</del><ins>+ std::optional<IntPoint> hotSpot() const;
</ins><span class="cx">
</span><span class="cx"> IntSize frameSizeAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default) const;
</span><span class="cx"> bool frameIsCompleteAtIndex(size_t) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> return CFDictionaryContainsKey(feature, kCTFontFeatureTypeIdentifierKey) && CFDictionaryContainsKey(feature, kCTFontFeatureSelectorIdentifierKey);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline Optional<CFStringRef> openTypeFeature(CFDictionaryRef feature)
</del><ins>+static inline std::optional<CFStringRef> openTypeFeature(CFDictionaryRef feature)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isOpenTypeFeature(feature));
</span><span class="cx"> CFStringRef tag = static_cast<CFStringRef>(CFDictionaryGetValue(feature, kCTFontOpenTypeFeatureTag));
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> CFNumberRef value = static_cast<CFNumberRef>(CFDictionaryGetValue(feature, kCTFontOpenTypeFeatureValue));
</span><span class="cx"> auto success = CFNumberGetValue(value, kCFNumberIntType, &rawValue);
</span><span class="cx"> ASSERT_UNUSED(success, success);
</span><del>- return rawValue ? Optional<CFStringRef>(tag) : Nullopt;
</del><ins>+ return rawValue ? std::optional<CFStringRef>(tag) : std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline std::pair<int, int> trueTypeFeature(CFDictionaryRef feature)
</span><span class="lines">@@ -592,11 +592,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
</span><del>-static inline Optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
</del><ins>+static inline std::optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
</ins><span class="cx"> {
</span><span class="cx"> CTFontRef font = platformData.font();
</span><span class="cx"> if (!font || !platformData.isColorBitmapFont())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> CGSize advance;
</span><span class="cx"> CTFontGetAdvancesForGlyphs(font, kCTFontOrientationDefault, &glyph, &advance, 1);
</span><span class="cx"> return advance;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawGlyphs::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawGlyphs::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect localBounds = m_bounds;
</span><span class="cx"> localBounds.move(m_blockLocation.x(), m_blockLocation.y());
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawLine::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawLine::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect bounds;
</span><span class="cx"> bounds.fitToPoints(m_point1, m_point2);
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> context.drawLinesForText(point(), m_widths, m_printing, m_doubleLines);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawLinesForText::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawLinesForText::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> // This function needs to return a value equal to or enclosing what GraphicsContext::computeLineBoundsAndAntialiasingModeForText() returns.
</span><span class="cx">
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> context.drawLineForDocumentMarker(m_point, m_width, m_style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawLineForDocumentMarker::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawLineForDocumentMarker::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> // This function needs to return a value equal to or enclosing what GraphicsContext::drawLineForDocumentMarker() returns.
</span><span class="cx">
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx"> context.drawFocusRing(m_path, m_width, m_offset, m_color);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawFocusRingPath::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawFocusRingPath::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect result = m_path.fastBoundingRect();
</span><span class="cx"> result.inflate(platformFocusRingWidth);
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> context.drawFocusRing(m_rects, m_width, m_offset, m_color);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> DrawFocusRingRects::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> DrawFocusRingRects::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect result;
</span><span class="cx"> for (auto& rect : m_rects)
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> StrokeRect::localBounds(const GraphicsContext&) const
</del><ins>+std::optional<FloatRect> StrokeRect::localBounds(const GraphicsContext&) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect bounds = m_rect;
</span><span class="cx"> bounds.expand(m_lineWidth, m_lineWidth);
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> StrokePath::localBounds(const GraphicsContext& context) const
</del><ins>+std::optional<FloatRect> StrokePath::localBounds(const GraphicsContext& context) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Need to take stroke thickness into account correctly, via CGPathByStrokingPath().
</span><span class="cx"> float strokeThickness = context.strokeThickness();
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatRect> StrokeEllipse::localBounds(const GraphicsContext& context) const
</del><ins>+std::optional<FloatRect> StrokeEllipse::localBounds(const GraphicsContext& context) const
</ins><span class="cx"> {
</span><span class="cx"> float strokeThickness = context.strokeThickness();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -172,12 +172,12 @@
</span><span class="cx">
</span><span class="cx"> // Return bounds of this drawing operation in local coordinates.
</span><span class="cx"> // Does not include effets of transform, shadow etc in the state.
</span><del>- virtual Optional<FloatRect> localBounds(const GraphicsContext&) const { return Nullopt; }
</del><ins>+ virtual std::optional<FloatRect> localBounds(const GraphicsContext&) const { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isDrawingItem() const { return true; }
</span><span class="cx">
</span><del>- Optional<FloatRect> m_extent; // In base coordinates, taking shadows and transforms into account.
</del><ins>+ std::optional<FloatRect> m_extent; // In base coordinates, taking shadows and transforms into account.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Save : public Item {
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> GlyphBuffer generateGlyphBuffer() const;
</span><span class="cx">
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</ins><span class="cx">
</span><span class="cx"> mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable.
</span><span class="cx"> FloatRect m_destination;
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</ins><span class="cx">
</span><span class="cx"> mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable.
</span><span class="cx"> FloatRect m_destination;
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</ins><span class="cx">
</span><span class="cx"> mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable.
</span><span class="cx"> FloatRect m_destination;
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> RetainPtr<CGImageRef> m_image;
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_destination; }
</ins><span class="cx">
</span><span class="cx"> mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable.
</span><span class="cx"> AffineTransform m_patternTransform;
</span><span class="lines">@@ -756,7 +756,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> float m_borderThickness;
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> FloatPoint m_point1;
</span><span class="cx"> FloatPoint m_point2;
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> FloatPoint m_blockLocation;
</span><span class="cx"> FloatSize m_localAnchor;
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> FloatPoint m_point;
</span><span class="cx"> float m_width;
</span><span class="lines">@@ -871,7 +871,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> };
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_path.fastBoundingRect(); }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_path.fastBoundingRect(); }
</ins><span class="cx">
</span><span class="cx"> const Path m_path;
</span><span class="cx"> };
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> const Path m_path;
</span><span class="cx"> int m_width;
</span><span class="lines">@@ -955,7 +955,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> Vector<FloatRect> m_rects;
</span><span class="cx"> int m_width;
</span><span class="lines">@@ -980,7 +980,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> };
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> Color m_color;
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> mutable Ref<Gradient> m_gradient; // FIXME: Make this not mutable
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> Color m_color;
</span><span class="lines">@@ -1087,7 +1087,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect.rect(); }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect.rect(); }
</ins><span class="cx">
</span><span class="cx"> FloatRoundedRect m_rect;
</span><span class="cx"> Color m_color;
</span><span class="lines">@@ -1115,7 +1115,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> FloatRoundedRect m_roundedHoleRect;
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_path.fastBoundingRect(); }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_path.fastBoundingRect(); }
</ins><span class="cx">
</span><span class="cx"> const Path m_path;
</span><span class="cx"> };
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><span class="cx">
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> };
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> float m_lineWidth;
</span><span class="lines">@@ -1209,7 +1209,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> const Path m_path;
</span><span class="cx"> FloatPoint m_blockLocation;
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override;
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override;
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> };
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void apply(GraphicsContext&) const override;
</span><del>- Optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</del><ins>+ std::optional<FloatRect> localBounds(const GraphicsContext&) const override { return m_rect; }
</ins><span class="cx">
</span><span class="cx"> FloatRect m_rect;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> void Recorder::updateItemExtent(DrawingItem& item) const
</span><span class="cx"> {
</span><del>- if (Optional<FloatRect> rect = item.localBounds(m_graphicsContext))
</del><ins>+ if (std::optional<FloatRect> rect = item.localBounds(m_graphicsContext))
</ins><span class="cx"> item.setExtent(extentFromLocalBounds(rect.value()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> AffineTransform rotation;
</span><span class="cx"> rotation.rotate(angleInDegrees);
</span><span class="cx">
</span><del>- if (Optional<AffineTransform> inverse = rotation.inverse())
</del><ins>+ if (std::optional<AffineTransform> inverse = rotation.inverse())
</ins><span class="cx"> clipBounds = inverse.value().mapRect(clipBounds);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> {
</span><span class="cx"> ctm *= matrix;
</span><span class="cx">
</span><del>- if (Optional<AffineTransform> inverse = matrix.inverse())
</del><ins>+ if (std::optional<AffineTransform> inverse = matrix.inverse())
</ins><span class="cx"> clipBounds = inverse.value().mapRect(clipBounds);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</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, Optional<double> quality)
</del><ins>+static bool encodeImageJPEG(unsigned char* data, IntSize size, Vector<char>* output, std::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, Optional<double> quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, std::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="trunkSourceWebCoreplatformgraphicsfiltersFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/Filter.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/Filter.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/filters/Filter.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> void setFilterScale(float scale) { m_filterScale = scale; }
</span><span class="cx">
</span><span class="cx"> const AffineTransform& absoluteTransform() const { return m_absoluteTransform; }
</span><del>- FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint& point) const { return m_absoluteTransform.inverse().valueOr(AffineTransform()).mapPoint(point); }
</del><ins>+ FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint& point) const { return m_absoluteTransform.inverse().value_or(AffineTransform()).mapPoint(point); }
</ins><span class="cx">
</span><span class="cx"> RenderingMode renderingMode() const { return m_renderingMode; }
</span><span class="cx"> void setRenderingMode(RenderingMode renderingMode) { m_renderingMode = renderingMode; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</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, Optional<double> quality, GUniqueOutPtr<gchar>& buffer, gsize& bufferSize)
</del><ins>+static bool encodeImage(cairo_surface_t* surface, const String& mimeType, std::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, Optional<double> quality, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String& mimeType, std::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="trunkSourceWebCoreplatformgraphicsharfbuzzHarfBuzzShapercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -652,8 +652,8 @@
</span><span class="cx"> bool foundFromX = false;
</span><span class="cx"> bool foundToX = false;
</span><span class="cx">
</span><del>- Optional<unsigned> fromIndex = from;
- Optional<unsigned> toIndex = to;
</del><ins>+ std::optional<unsigned> fromIndex = from;
+ std::optional<unsigned> toIndex = to;
</ins><span class="cx">
</span><span class="cx"> if (m_run.rtl())
</span><span class="cx"> currentX = m_totalWidth;
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> if (fromIndex && fromIndex.value() >= numCharacters)
</span><span class="cx"> fromIndex.value() -= numCharacters;
</span><span class="cx"> else
</span><del>- fromIndex = Nullopt;
</del><ins>+ fromIndex = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!foundToX && toIndex.value() < numCharacters) {
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx"> if (toIndex && toIndex.value() >= numCharacters)
</span><span class="cx"> toIndex.value() -= numCharacters;
</span><span class="cx"> else
</span><del>- toIndex = Nullopt;
</del><ins>+ toIndex = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (foundFromX && foundToX)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -276,19 +276,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Capitalization is language-dependent and context-dependent and should operate on grapheme clusters instead of codepoints.
</span><del>-static inline Optional<UChar32> capitalized(UChar32 baseCharacter)
</del><ins>+static inline std::optional<UChar32> capitalized(UChar32 baseCharacter)
</ins><span class="cx"> {
</span><span class="cx"> if (U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> UChar32 uppercaseCharacter = u_toupper(baseCharacter);
</span><span class="cx"> ASSERT(uppercaseCharacter == baseCharacter || (U_IS_BMP(baseCharacter) == U_IS_BMP(uppercaseCharacter)));
</span><span class="cx"> if (uppercaseCharacter != baseCharacter)
</span><span class="cx"> return uppercaseCharacter;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldSynthesize(const Font* nextFont, UChar32 baseCharacter, Optional<UChar32> capitalizedBase, FontVariantCaps fontVariantCaps, bool engageAllSmallCapsProcessing)
</del><ins>+static bool shouldSynthesize(const Font* nextFont, UChar32 baseCharacter, std::optional<UChar32> capitalizedBase, FontVariantCaps fontVariantCaps, bool engageAllSmallCapsProcessing)
</ins><span class="cx"> {
</span><span class="cx"> if (!nextFont || nextFont == Font::systemFallback())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> TextureMapperPaintOptions replicaOptions(options);
</span><span class="cx"> replicaOptions.transform
</span><span class="cx"> .multiply(m_state.replicaLayer->m_currentTransform.combined())
</span><del>- .multiply(m_currentTransform.combined().inverse().valueOr(TransformationMatrix()));
</del><ins>+ .multiply(m_currentTransform.combined().inverse().value_or(TransformationMatrix()));
</ins><span class="cx"> paintSelfAndChildren(replicaOptions);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> TransformationMatrix TextureMapperLayer::replicaTransform()
</span><span class="cx"> {
</span><del>- return TransformationMatrix(m_state.replicaLayer->m_currentTransform.combined()).multiply(m_currentTransform.combined().inverse().valueOr(TransformationMatrix()));
</del><ins>+ return TransformationMatrix(m_state.replicaLayer->m_currentTransform.combined()).multiply(m_currentTransform.combined().inverse().value_or(TransformationMatrix()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::setAnimatedFilters(const FilterOperations& filters)
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx"> FloatSize TextureMapperLayer::mapScrollOffset(const FloatSize& offset)
</span><span class="cx"> {
</span><span class="cx"> double zeroX, zeroY, offsetX, offsetY;
</span><del>- TransformationMatrix transform = m_currentTransform.combined().inverse().valueOr(TransformationMatrix());
</del><ins>+ TransformationMatrix transform = m_currentTransform.combined().inverse().value_or(TransformationMatrix());
</ins><span class="cx"> transform.map(0, 0, zeroX, zeroY);
</span><span class="cx"> transform.map(offset.width(), offset.height(), offsetX, offsetY);
</span><span class="cx"> return FloatSize(offsetX - zeroX, offsetY - zeroY);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -947,7 +947,7 @@
</span><span class="cx"> // Return a projection of the visible rect (surface coordinates) onto the layer's plane (layer coordinates).
</span><span class="cx"> // The resulting quad might be squewed and the visible rect is the bounding box of this quad,
</span><span class="cx"> // so it might spread further than the real visible area (and then even more amplified by the cover rect multiplier).
</span><del>- ASSERT(m_cachedInverseTransform == m_layerTransform.combined().inverse().valueOr(TransformationMatrix()));
</del><ins>+ ASSERT(m_cachedInverseTransform == m_layerTransform.combined().inverse().value_or(TransformationMatrix()));
</ins><span class="cx"> FloatRect rect = m_cachedInverseTransform.clampedBoundsOfProjectedQuad(FloatQuad(m_coordinator->visibleContentsRect()));
</span><span class="cx"> clampToContentsRectIfRectIsInfinite(rect, size());
</span><span class="cx"> return enclosingIntRect(rect);
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx"> m_layerTransform.setChildrenTransform(childrenTransform());
</span><span class="cx"> m_layerTransform.combineTransforms(parent() ? downcast<CoordinatedGraphicsLayer>(*parent()).m_layerTransform.combinedForChildren() : TransformationMatrix());
</span><span class="cx">
</span><del>- m_cachedInverseTransform = m_layerTransform.combined().inverse().valueOr(TransformationMatrix());
</del><ins>+ m_cachedInverseTransform = m_layerTransform.combined().inverse().value_or(TransformationMatrix());
</ins><span class="cx">
</span><span class="cx"> // The combined transform will be used in tiledBackingStoreVisibleRect.
</span><span class="cx"> setNeedsVisibleRectAdjustment();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -104,11 +104,11 @@
</span><span class="cx"> return std::isfinite(determinant) && determinant != 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<AffineTransform> AffineTransform::inverse() const
</del><ins>+std::optional<AffineTransform> AffineTransform::inverse() const
</ins><span class="cx"> {
</span><span class="cx"> double determinant = det(m_transform);
</span><span class="cx"> if (!std::isfinite(determinant) || determinant == 0)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> AffineTransform result;
</span><span class="cx"> if (isIdentityOrTranslation()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> WEBCORE_EXPORT double yScale() const;
</span><span class="cx">
</span><span class="cx"> bool isInvertible() const; // If you call this this, you're probably doing it wrong.
</span><del>- WEBCORE_EXPORT Optional<AffineTransform> inverse() const;
</del><ins>+ WEBCORE_EXPORT std::optional<AffineTransform> inverse() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void blend(const AffineTransform& from, double progress);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> if (m_direction == ApplyTransformDirection)
</span><span class="cx"> return m_accumulatedTransform->mapPoint(point);
</span><span class="cx">
</span><del>- return m_accumulatedTransform->inverse().valueOr(TransformationMatrix()).projectPoint(point, wasClamped);
</del><ins>+ return m_accumulatedTransform->inverse().value_or(TransformationMatrix()).projectPoint(point, wasClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatQuad TransformState::mappedQuad(bool* wasClamped) const
</span><span class="lines">@@ -183,13 +183,13 @@
</span><span class="cx"> return quad;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatQuad> TransformState::mappedSecondaryQuad(bool* wasClamped) const
</del><ins>+std::optional<FloatQuad> TransformState::mappedSecondaryQuad(bool* wasClamped) const
</ins><span class="cx"> {
</span><span class="cx"> if (wasClamped)
</span><span class="cx"> *wasClamped = false;
</span><span class="cx">
</span><span class="cx"> if (!m_lastPlanarSecondaryQuad)
</span><del>- return Optional<FloatQuad>();
</del><ins>+ return std::optional<FloatQuad>();
</ins><span class="cx">
</span><span class="cx"> FloatQuad quad = *m_lastPlanarSecondaryQuad;
</span><span class="cx"> mapQuad(quad, m_direction, wasClamped);
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> if (direction == ApplyTransformDirection)
</span><span class="cx"> quad = m_accumulatedTransform->mapQuad(quad);
</span><span class="cx">
</span><del>- quad = m_accumulatedTransform->inverse().valueOr(TransformationMatrix()).projectQuad(quad, wasClamped);
</del><ins>+ quad = m_accumulatedTransform->inverse().value_or(TransformationMatrix()).projectQuad(quad, wasClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TransformState::flattenWithTransform(const TransformationMatrix& t, bool* wasClamped)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- TransformationMatrix inverseTransform = t.inverse().valueOr(TransformationMatrix());
</del><ins>+ TransformationMatrix inverseTransform = t.inverse().value_or(TransformationMatrix());
</ins><span class="cx"> if (m_mapPoint)
</span><span class="cx"> m_lastPlanarPoint = inverseTransform.projectPoint(m_lastPlanarPoint);
</span><span class="cx"> if (m_mapQuad) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformState.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformState.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformState.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> m_lastPlanarQuad = quad;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: webkit.org/b/144226 use Optional<FloatQuad>.
</del><ins>+ // FIXME: webkit.org/b/144226 use std::optional<FloatQuad>.
</ins><span class="cx"> void setSecondaryQuad(const FloatQuad* quad)
</span><span class="cx"> {
</span><span class="cx"> // We must be in a flattened state (no accumulated offset) when setting this secondary quad.
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> m_lastPlanarSecondaryQuad = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: webkit.org/b/144226 use Optional<FloatQuad>.
</del><ins>+ // FIXME: webkit.org/b/144226 use std::optional<FloatQuad>.
</ins><span class="cx"> void setLastPlanarSecondaryQuad(const FloatQuad*);
</span><span class="cx">
</span><span class="cx"> void move(LayoutUnit x, LayoutUnit y, TransformAccumulation accumulate = FlattenTransform)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> // Return the point or quad mapped through the current transform
</span><span class="cx"> FloatPoint mappedPoint(bool* wasClamped = nullptr) const;
</span><span class="cx"> FloatQuad mappedQuad(bool* wasClamped = nullptr) const;
</span><del>- Optional<FloatQuad> mappedSecondaryQuad(bool* wasClamped = nullptr) const;
</del><ins>+ std::optional<FloatQuad> mappedSecondaryQuad(bool* wasClamped = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void translateTransform(const LayoutSize&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<TransformationMatrix> TransformationMatrix::inverse() const
</del><ins>+std::optional<TransformationMatrix> TransformationMatrix::inverse() const
</ins><span class="cx"> {
</span><span class="cx"> if (isIdentityOrTranslation()) {
</span><span class="cx"> // identity matrix
</span><span class="lines">@@ -1463,7 +1463,7 @@
</span><span class="cx"> // FIXME: Use LU decomposition to apply the inverse instead of calculating the inverse explicitly.
</span><span class="cx"> // Calculating the inverse of a 4x4 matrix using cofactors is numerically unstable and unnecessary to apply the inverse transformation to a point.
</span><span class="cx"> if (!WebCore::inverse(m_matrix, invMat.m_matrix))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return invMat;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> WEBCORE_EXPORT static TransformationMatrix rectToRect(const FloatRect&, const FloatRect&);
</span><span class="cx">
</span><span class="cx"> bool isInvertible() const; // If you call this this, you're probably doing it wrong.
</span><del>- WEBCORE_EXPORT Optional<TransformationMatrix> inverse() const;
</del><ins>+ WEBCORE_EXPORT std::optional<TransformationMatrix> inverse() const;
</ins><span class="cx">
</span><span class="cx"> // Decompose the matrix into its component parts.
</span><span class="cx"> struct Decomposed2Type {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -254,7 +254,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&, Optional<double>, CoordinateSystem) const
</del><ins>+String ImageBuffer::toDataURL(const String&, std::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="trunkSourceWebCoreplatformgraphicswinImageDecoderDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return RepetitionCountNone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IntPoint> ImageDecoder::hotSpot() const
</del><ins>+std::optional<IntPoint> ImageDecoder::hotSpot() const
</ins><span class="cx"> {
</span><span class="cx"> return IntPoint();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageDecoderDirect2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> size_t frameCount() const;
</span><span class="cx">
</span><span class="cx"> RepetitionCount repetitionCount() const;
</span><del>- Optional<IntPoint> hotSpot() const;
</del><ins>+ std::optional<IntPoint> hotSpot() const;
</ins><span class="cx">
</span><span class="cx"> IntSize frameSizeAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default) const;
</span><span class="cx"> bool frameIsCompleteAtIndex(size_t) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return m_supportsXComposite.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PlatformDisplayX11::supportsXDamage(Optional<int>& damageEventBase) const
</del><ins>+bool PlatformDisplayX11::supportsXDamage(std::optional<int>& damageEventBase) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_supportsXDamage) {
</span><span class="cx"> m_supportsXDamage = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsx11PlatformDisplayX11h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> Display* native() const { return m_display; }
</span><span class="cx"> bool supportsXComposite() const;
</span><del>- bool supportsXDamage(Optional<int>& damageEventBase) const;
</del><ins>+ bool supportsXDamage(std::optional<int>& damageEventBase) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Type type() const override { return PlatformDisplay::Type::X11; }
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx">
</span><span class="cx"> Display* m_display;
</span><span class="cx"> bool m_ownedDisplay;
</span><del>- mutable Optional<bool> m_supportsXComposite;
- mutable Optional<bool> m_supportsXDamage;
- mutable Optional<int> m_damageEventBase;
</del><ins>+ mutable std::optional<bool> m_supportsXComposite;
+ mutable std::optional<bool> m_supportsXDamage;
+ mutable std::optional<int> m_damageEventBase;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> // If the image has a cursor hot-spot, stores it in the argument
</span><span class="cx"> // and returns true. Otherwise returns false.
</span><del>- virtual Optional<IntPoint> hotSpot() const { return Nullopt; }
</del><ins>+ virtual std::optional<IntPoint> hotSpot() const { return std::nullopt; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void prepareScaleDataIfNecessary();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> return ImageDecoder::setFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IntPoint> ICOImageDecoder::hotSpot() const
</del><ins>+std::optional<IntPoint> ICOImageDecoder::hotSpot() const
</ins><span class="cx"> {
</span><span class="cx"> // When unspecified, the default frame is always frame 0. This is consistent with
</span><span class="cx"> // BitmapImage where currentFrame() starts at 0 and only increases when animation is
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> return hotSpotAtIndex(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<IntPoint> ICOImageDecoder::hotSpotAtIndex(size_t index) const
</del><ins>+std::optional<IntPoint> ICOImageDecoder::hotSpotAtIndex(size_t index) const
</ins><span class="cx"> {
</span><span class="cx"> if (index >= m_dirEntries.size() || m_fileType != CURSOR)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return m_dirEntries[index].m_hotSpot;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> // avoid accessing deleted memory, especially when calling this from
</span><span class="cx"> // inside BMPImageReader!
</span><span class="cx"> bool setFailed() override;
</span><del>- Optional<IntPoint> hotSpot() const override;
</del><ins>+ std::optional<IntPoint> hotSpot() const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum ImageType {
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> // could be decoded.
</span><span class="cx"> bool processDirectoryEntries();
</span><span class="cx">
</span><del>- // Returns the hot-spot for |index|, returns Nullopt if there is none.
- Optional<IntPoint> hotSpotAtIndex(size_t) const;
</del><ins>+ // Returns the hot-spot for |index|, returns std::nullopt if there is none.
+ std::optional<IntPoint> hotSpotAtIndex(size_t) const;
</ins><span class="cx">
</span><span class="cx"> // Reads and returns a directory entry from the current offset into
</span><span class="cx"> // |data|.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimageencodersJPEGImageEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</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, Optional<double> quality)
</del><ins>+bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize& size, Vector<char>& jpegData, std::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 (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -27,6 +27,6 @@
</span><span class="cx">
</span><span class="cx"> class IntSize;
</span><span class="cx">
</span><del>-bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize&, Vector<char>& jpegData, Optional<double> quality = Nullopt);
</del><ins>+bool compressRGBABigEndianToJPEG(unsigned char* rgbaBigEndianData, const IntSize&, Vector<char>& jpegData, std::optional<double> quality = std::nullopt);
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> CALayer* hostLayer() const;
</span><span class="cx"> unsigned tileCapacityForGrid(LegacyTileGrid*);
</span><span class="cx"> Color colorForGridTileBorder(LegacyTileGrid*) const;
</span><del>- void setOverrideVisibleRect(Optional<FloatRect>);
</del><ins>+ void setOverrideVisibleRect(std::optional<FloatRect>);
</ins><span class="cx">
</span><span class="cx"> void doPendingRepaints();
</span><span class="cx">
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> // Ensure there are no async calls on a dead tile cache.
</span><span class="cx"> RetainPtr<LegacyTileCacheTombstone> m_tombstone;
</span><span class="cx">
</span><del>- Optional<FloatRect> m_overrideVisibleRect;
</del><ins>+ std::optional<FloatRect> m_overrideVisibleRect;
</ins><span class="cx">
</span><span class="cx"> TilingMode m_tilingMode;
</span><span class="cx"> TilingDirection m_tilingDirection;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return [layer convertRect:[m_window extendedVisibleRect] fromLayer:hostLayer()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LegacyTileCache::setOverrideVisibleRect(Optional<FloatRect> rect)
</del><ins>+void LegacyTileCache::setOverrideVisibleRect(std::optional<FloatRect> rect)
</ins><span class="cx"> {
</span><span class="cx"> m_overrideVisibleRect = rect;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> [super renderInContext:context];
</span><span class="cx">
</span><del>- _tileGrid->tileCache().setOverrideVisibleRect(Nullopt);
</del><ins>+ _tileGrid->tileCache().setOverrideVisibleRect(std::nullopt);
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> MemoryPressureHandler::EventFDPoller::~EventFDPoller()
</span><span class="cx"> {
</span><del>- m_fd = Nullopt;
</del><ins>+ m_fd = std::nullopt;
</ins><span class="cx"> #if USE(GLIB)
</span><span class="cx"> g_source_destroy(m_source.get());
</span><span class="cx"> #else
</span><span class="lines">@@ -164,11 +164,11 @@
</span><span class="cx">
</span><span class="cx"> if (m_eventFD) {
</span><span class="cx"> close(m_eventFD.value());
</span><del>- m_eventFD = Nullopt;
</del><ins>+ m_eventFD = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> if (m_pressureLevelFD) {
</span><span class="cx"> close(m_pressureLevelFD.value());
</span><del>- m_pressureLevelFD = Nullopt;
</del><ins>+ m_pressureLevelFD = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -250,12 +250,12 @@
</span><span class="cx">
</span><span class="cx"> if (m_pressureLevelFD) {
</span><span class="cx"> close(m_pressureLevelFD.value());
</span><del>- m_pressureLevelFD = Nullopt;
</del><ins>+ m_pressureLevelFD = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Only close the eventFD used for cgroups.
</span><span class="cx"> if (m_eventFD) {
</span><span class="cx"> close(m_eventFD.value());
</span><del>- m_eventFD = Nullopt;
</del><ins>+ m_eventFD = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> int baselinePositionAdjustment(ControlPart) const override;
</span><span class="cx">
</span><del>- Optional<FontCascadeDescription> controlFont(ControlPart, const FontCascade&, float zoomFactor) const override;
</del><ins>+ std::optional<FontCascadeDescription> controlFont(ControlPart, const FontCascade&, float zoomFactor) const override;
</ins><span class="cx">
</span><span class="cx"> LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize&, float zoomFactor) const override;
</span><span class="cx"> LengthSize minimumControlSize(ControlPart, const FontCascade&, float zoomFactor) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> return Theme::baselinePositionAdjustment(part);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FontCascadeDescription> ThemeMac::controlFont(ControlPart part, const FontCascade& font, float zoomFactor) const
</del><ins>+std::optional<FontCascadeDescription> ThemeMac::controlFont(ControlPart part, const FontCascade& font, float zoomFactor) const
</ins><span class="cx"> {
</span><span class="cx"> switch (part) {
</span><span class="cx"> case PushButtonPart: {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, Optional<IntConstraint>&& constraint)
</del><ins>+void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
</ins><span class="cx"> {
</span><span class="cx"> switch (constraintType) {
</span><span class="cx"> case MediaConstraintType::Width:
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, Optional<DoubleConstraint>&& constraint)
</del><ins>+void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<DoubleConstraint>&& constraint)
</ins><span class="cx"> {
</span><span class="cx"> switch (constraintType) {
</span><span class="cx"> case MediaConstraintType::AspectRatio:
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, Optional<BooleanConstraint>&& constraint)
</del><ins>+void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<BooleanConstraint>&& constraint)
</ins><span class="cx"> {
</span><span class="cx"> switch (constraintType) {
</span><span class="cx"> case MediaConstraintType::EchoCancellation:
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, Optional<StringConstraint>&& constraint)
</del><ins>+void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<StringConstraint>&& constraint)
</ins><span class="cx"> {
</span><span class="cx"> switch (constraintType) {
</span><span class="cx"> case MediaConstraintType::FacingMode:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -341,10 +341,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<ValueType> m_min;
- Optional<ValueType> m_max;
- Optional<ValueType> m_exact;
- Optional<ValueType> m_ideal;
</del><ins>+ std::optional<ValueType> m_min;
+ std::optional<ValueType> m_max;
+ std::optional<ValueType> m_exact;
+ std::optional<ValueType> m_ideal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class IntConstraint final : public NumericConstraint<int> {
</span><span class="lines">@@ -474,8 +474,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<bool> m_exact;
- Optional<bool> m_ideal;
</del><ins>+ std::optional<bool> m_exact;
+ std::optional<bool> m_ideal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StringConstraint : public MediaConstraint {
</span><span class="lines">@@ -583,25 +583,25 @@
</span><span class="cx"> bool isEmpty() const;
</span><span class="cx"> WEBCORE_EXPORT size_t size() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void set(MediaConstraintType, Optional<IntConstraint>&&);
- WEBCORE_EXPORT void set(MediaConstraintType, Optional<DoubleConstraint>&&);
- WEBCORE_EXPORT void set(MediaConstraintType, Optional<BooleanConstraint>&&);
- WEBCORE_EXPORT void set(MediaConstraintType, Optional<StringConstraint>&&);
</del><ins>+ WEBCORE_EXPORT void set(MediaConstraintType, std::optional<IntConstraint>&&);
+ WEBCORE_EXPORT void set(MediaConstraintType, std::optional<DoubleConstraint>&&);
+ WEBCORE_EXPORT void set(MediaConstraintType, std::optional<BooleanConstraint>&&);
+ WEBCORE_EXPORT void set(MediaConstraintType, std::optional<StringConstraint>&&);
</ins><span class="cx">
</span><del>- Optional<IntConstraint> width() const { return m_width; }
- Optional<IntConstraint> height() const { return m_height; }
- Optional<IntConstraint> sampleRate() const { return m_sampleRate; }
- Optional<IntConstraint> sampleSize() const { return m_sampleSize; }
</del><ins>+ std::optional<IntConstraint> width() const { return m_width; }
+ std::optional<IntConstraint> height() const { return m_height; }
+ std::optional<IntConstraint> sampleRate() const { return m_sampleRate; }
+ std::optional<IntConstraint> sampleSize() const { return m_sampleSize; }
</ins><span class="cx">
</span><del>- Optional<DoubleConstraint> aspectRatio() const { return m_aspectRatio; }
- Optional<DoubleConstraint> frameRate() const { return m_frameRate; }
- Optional<DoubleConstraint> volume() const { return m_volume; }
</del><ins>+ std::optional<DoubleConstraint> aspectRatio() const { return m_aspectRatio; }
+ std::optional<DoubleConstraint> frameRate() const { return m_frameRate; }
+ std::optional<DoubleConstraint> volume() const { return m_volume; }
</ins><span class="cx">
</span><del>- Optional<BooleanConstraint> echoCancellation() const { return m_echoCancellation; }
</del><ins>+ std::optional<BooleanConstraint> echoCancellation() const { return m_echoCancellation; }
</ins><span class="cx">
</span><del>- Optional<StringConstraint> facingMode() const { return m_facingMode; }
- Optional<StringConstraint> deviceId() const { return m_deviceId; }
- Optional<StringConstraint> groupId() const { return m_groupId; }
</del><ins>+ std::optional<StringConstraint> facingMode() const { return m_facingMode; }
+ std::optional<StringConstraint> deviceId() const { return m_deviceId; }
+ std::optional<StringConstraint> groupId() const { return m_groupId; }
</ins><span class="cx">
</span><span class="cx"> template <class Encoder> void encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="lines">@@ -653,20 +653,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<IntConstraint> m_width;
- Optional<IntConstraint> m_height;
- Optional<IntConstraint> m_sampleRate;
- Optional<IntConstraint> m_sampleSize;
</del><ins>+ std::optional<IntConstraint> m_width;
+ std::optional<IntConstraint> m_height;
+ std::optional<IntConstraint> m_sampleRate;
+ std::optional<IntConstraint> m_sampleSize;
</ins><span class="cx">
</span><del>- Optional<DoubleConstraint> m_aspectRatio;
- Optional<DoubleConstraint> m_frameRate;
- Optional<DoubleConstraint> m_volume;
</del><ins>+ std::optional<DoubleConstraint> m_aspectRatio;
+ std::optional<DoubleConstraint> m_frameRate;
+ std::optional<DoubleConstraint> m_volume;
</ins><span class="cx">
</span><del>- Optional<BooleanConstraint> m_echoCancellation;
</del><ins>+ std::optional<BooleanConstraint> m_echoCancellation;
</ins><span class="cx">
</span><del>- Optional<StringConstraint> m_facingMode;
- Optional<StringConstraint> m_deviceId;
- Optional<StringConstraint> m_groupId;
</del><ins>+ std::optional<StringConstraint> m_facingMode;
+ std::optional<StringConstraint> m_deviceId;
+ std::optional<StringConstraint> m_groupId;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FlattenedConstraint {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -150,13 +150,13 @@
</span><span class="cx"> stop(callingObserver);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RealtimeMediaSource::supportsSizeAndFrameRate(Optional<int>, Optional<int>, Optional<double>)
</del><ins>+bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<int>, std::optional<int>, std::optional<double>)
</ins><span class="cx"> {
</span><span class="cx"> // The size and frame rate are within the capability limits, so they are supported.
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RealtimeMediaSource::supportsSizeAndFrameRate(Optional<IntConstraint> widthConstraint, Optional<IntConstraint> heightConstraint, Optional<DoubleConstraint> frameRateConstraint, String& badConstraint)
</del><ins>+bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<IntConstraint> widthConstraint, std::optional<IntConstraint> heightConstraint, std::optional<DoubleConstraint> frameRateConstraint, String& badConstraint)
</ins><span class="cx"> {
</span><span class="cx"> if (!widthConstraint && !heightConstraint && !frameRateConstraint)
</span><span class="cx"> return true;
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> ASSERT(this->capabilities());
</span><span class="cx"> RealtimeMediaSourceCapabilities& capabilities = *this->capabilities();
</span><span class="cx">
</span><del>- Optional<int> width;
</del><ins>+ std::optional<int> width;
</ins><span class="cx"> if (widthConstraint && capabilities.supportsWidth()) {
</span><span class="cx"> if (std::isinf(fitnessDistance(*widthConstraint))) {
</span><span class="cx"> badConstraint = widthConstraint->name();
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> width = widthConstraint->valueForCapabilityRange(size().width(), range.rangeMin().asInt, range.rangeMax().asInt);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int> height;
</del><ins>+ std::optional<int> height;
</ins><span class="cx"> if (heightConstraint && capabilities.supportsHeight()) {
</span><span class="cx"> if (std::isinf(fitnessDistance(*heightConstraint))) {
</span><span class="cx"> badConstraint = heightConstraint->name();
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> height = heightConstraint->valueForCapabilityRange(size().height(), range.rangeMin().asInt, range.rangeMax().asInt);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<double> frameRate;
</del><ins>+ std::optional<double> frameRate;
</ins><span class="cx"> if (frameRateConstraint && capabilities.supportsFrameRate()) {
</span><span class="cx"> if (std::isinf(fitnessDistance(*frameRateConstraint))) {
</span><span class="cx"> badConstraint = frameRateConstraint->name();
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> (source->*applier)(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeMediaSource::applySizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double> frameRate)
</del><ins>+void RealtimeMediaSource::applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double> frameRate)
</ins><span class="cx"> {
</span><span class="cx"> if (width)
</span><span class="cx"> setWidth(width.value());
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSourceCapabilities& capabilities = *this->capabilities();
</span><span class="cx">
</span><del>- Optional<int> width;
</del><ins>+ std::optional<int> width;
</ins><span class="cx"> if (const MediaConstraint* constraint = constraints.find(MediaConstraintType::Width)) {
</span><span class="cx"> ASSERT(constraint->isInt());
</span><span class="cx"> if (capabilities.supportsWidth()) {
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int> height;
</del><ins>+ std::optional<int> height;
</ins><span class="cx"> if (const MediaConstraint* constraint = constraints.find(MediaConstraintType::Height)) {
</span><span class="cx"> ASSERT(constraint->isInt());
</span><span class="cx"> if (capabilities.supportsHeight()) {
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<double> frameRate;
</del><ins>+ std::optional<double> frameRate;
</ins><span class="cx"> if (const MediaConstraint* constraint = constraints.find(MediaConstraintType::FrameRate)) {
</span><span class="cx"> ASSERT(constraint->isDouble());
</span><span class="cx"> if (capabilities.supportsFrameRate()) {
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> commitConfiguration();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::pair<String, String>> RealtimeMediaSource::applyConstraints(const MediaConstraints& constraints)
</del><ins>+std::optional<std::pair<String, String>> RealtimeMediaSource::applyConstraints(const MediaConstraints& constraints)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(constraints.isValid());
</span><span class="cx">
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> return { { failedConstraint, ASCIILiteral("Constraint not supported") } };
</span><span class="cx">
</span><span class="cx"> applyConstraints(candidates);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSource::applyConstraints(const MediaConstraints& constraints, SuccessHandler successHandler, FailureHandler failureHandler)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> using SuccessHandler = std::function<void()>;
</span><span class="cx"> using FailureHandler = std::function<void(const String& badConstraint, const String& errorString)>;
</span><span class="cx"> void applyConstraints(const MediaConstraints&, SuccessHandler, FailureHandler);
</span><del>- Optional<std::pair<String, String>> applyConstraints(const MediaConstraints&);
</del><ins>+ std::optional<std::pair<String, String>> applyConstraints(const MediaConstraints&);
</ins><span class="cx">
</span><span class="cx"> virtual bool supportsConstraints(const MediaConstraints&, String&);
</span><span class="cx">
</span><span class="lines">@@ -174,11 +174,11 @@
</span><span class="cx">
</span><span class="cx"> virtual bool selectSettings(const MediaConstraints&, FlattenedConstraint&, String&);
</span><span class="cx"> virtual double fitnessDistance(const MediaConstraint&);
</span><del>- virtual bool supportsSizeAndFrameRate(Optional<IntConstraint> width, Optional<IntConstraint> height, Optional<DoubleConstraint>, String&);
- virtual bool supportsSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>);
</del><ins>+ virtual bool supportsSizeAndFrameRate(std::optional<IntConstraint> width, std::optional<IntConstraint> height, std::optional<DoubleConstraint>, String&);
+ virtual bool supportsSizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>);
</ins><span class="cx"> virtual void applyConstraint(const MediaConstraint&);
</span><span class="cx"> virtual void applyConstraints(const FlattenedConstraint&);
</span><del>- virtual void applySizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>);
</del><ins>+ virtual void applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>);
</ins><span class="cx">
</span><span class="cx"> bool m_muted { false };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx">
</span><span class="cx"> void updateSettings(RealtimeMediaSourceSettings&) final;
</span><span class="cx">
</span><del>- void applySizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>) final;
</del><ins>+ void applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>) final;
</ins><span class="cx"> bool applySize(const IntSize&) final;
</span><span class="cx"> bool applyFrameRate(double) final;
</span><span class="cx"> bool setPreset(NSString*);
</span><span class="cx">
</span><del>- NSString *bestSessionPresetForVideoDimensions(Optional<int> width, Optional<int> height) const;
- bool supportsSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>) final;
</del><ins>+ NSString *bestSessionPresetForVideoDimensions(std::optional<int> width, std::optional<int> height) const;
+ bool supportsSizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>) final;
</ins><span class="cx">
</span><span class="cx"> void initializeCapabilities(RealtimeMediaSourceCapabilities&) final;
</span><span class="cx"> void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) final;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AVVideoCaptureSource::applySizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double> frameRate)
</del><ins>+void AVVideoCaptureSource::applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double> frameRate)
</ins><span class="cx"> {
</span><span class="cx"> setPreset(bestSessionPresetForVideoDimensions(WTFMove(width), WTFMove(height)));
</span><span class="cx">
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> return AVVideoSourcePreview::create(session(), device(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSString *AVVideoCaptureSource::bestSessionPresetForVideoDimensions(Optional<int> width, Optional<int> height) const
</del><ins>+NSString *AVVideoCaptureSource::bestSessionPresetForVideoDimensions(std::optional<int> width, std::optional<int> height) const
</ins><span class="cx"> {
</span><span class="cx"> if (!width && !height)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AVVideoCaptureSource::supportsSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double> frameRate)
</del><ins>+bool AVVideoCaptureSource::supportsSizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double> frameRate)
</ins><span class="cx"> {
</span><span class="cx"> if (!height && !width && !frameRate)
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> void ensureTransportAgentAndTransceivers(bool isInitiator, const Vector<TransceiverConfig>&);
</span><span class="cx"> void internalAddRemoteCandidate(OwrSession*, const IceCandidate&, const String& ufrag, const String& password);
</span><span class="cx">
</span><del>- Optional<MediaEndpointConfiguration> m_configuration;
</del><ins>+ std::optional<MediaEndpointConfiguration> m_configuration;
</ins><span class="cx"> GRegex* m_helperServerRegEx;
</span><span class="cx">
</span><span class="cx"> OwrTransportAgent* m_transportAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> // No compensation for latency as that is not terribly important in practice.
</span><span class="cx"> auto dateValue = response.date();
</span><span class="cx"> auto apparentAge = dateValue ? std::max(0us, duration_cast<microseconds>(responseTime - *dateValue)) : 0us;
</span><del>- auto ageValue = response.age().valueOr(0us);
</del><ins>+ auto ageValue = response.age().value_or(0us);
</ins><span class="cx"> auto correctedInitialAge = std::max(apparentAge, ageValue);
</span><span class="cx"> auto residentTime = duration_cast<microseconds>(system_clock::now() - responseTime);
</span><span class="cx"> return correctedInitialAge + residentTime;
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return *maxAge;
</span><span class="cx">
</span><span class="cx"> auto date = response.date();
</span><del>- auto effectiveDate = date.valueOr(responseTime);
</del><ins>+ auto effectiveDate = date.value_or(responseTime);
</ins><span class="cx"> if (auto expires = response.expires())
</span><span class="cx"> return duration_cast<microseconds>(*expires - effectiveDate);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/CacheValidation.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> WEBCORE_EXPORT bool redirectChainAllowsReuse(RedirectChainCacheStatus, ReuseExpiredRedirectionOrNot);
</span><span class="cx">
</span><span class="cx"> struct CacheControlDirectives {
</span><del>- Optional<std::chrono::microseconds> maxAge;
- Optional<std::chrono::microseconds> maxStale;
</del><ins>+ std::optional<std::chrono::microseconds> maxAge;
+ std::optional<std::chrono::microseconds> maxStale;
</ins><span class="cx"> bool noCache { false };
</span><span class="cx"> bool noStore { false };
</span><span class="cx"> bool mustRevalidate { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DataURLDecoder.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURLDecoder.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/DataURLDecoder.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> RefPtr<SharedBuffer> data;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-using DecodeCompletionHandler = std::function<void (Optional<Result>)>;
</del><ins>+using DecodeCompletionHandler = std::function<void (std::optional<Result>)>;
</ins><span class="cx"> struct ScheduleContext {
</span><span class="cx"> #if HAVE(RUNLOOP_TIMER)
</span><span class="cx"> SchedulePairHashSet scheduledPairs;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> struct KeyValue {
</span><span class="cx"> String key;
</span><del>- Optional<HTTPHeaderName> keyAsHTTPHeaderName;
</del><ins>+ std::optional<HTTPHeaderName> keyAsHTTPHeaderName;
</ins><span class="cx"> String value;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> if (it == m_table.uncommonHeaders().end())
</span><span class="cx"> return false;
</span><span class="cx"> m_keyValue.key = it->key;
</span><del>- m_keyValue.keyAsHTTPHeaderName = Nullopt;
</del><ins>+ m_keyValue.keyAsHTTPHeaderName = std::nullopt;
</ins><span class="cx"> m_keyValue.value = it->value;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::system_clock::time_point> parseHTTPDate(const String& value)
</del><ins>+std::optional<std::chrono::system_clock::time_point> parseHTTPDate(const String& value)
</ins><span class="cx"> {
</span><span class="cx"> double dateInMillisecondsSinceEpoch = parseDateFromNullTerminatedCharacters(value.utf8().data());
</span><span class="cx"> if (!std::isfinite(dateInMillisecondsSinceEpoch))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParsersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> bool isValidHTTPHeaderValue(const String&);
</span><span class="cx"> bool isValidHTTPToken(const String&);
</span><span class="cx"> bool parseHTTPRefresh(const String& refresh, double& delay, String& url);
</span><del>-Optional<std::chrono::system_clock::time_point> parseHTTPDate(const String&);
</del><ins>+std::optional<std::chrono::system_clock::time_point> parseHTTPDate(const String&);
</ins><span class="cx"> String filenameFromHTTPContentDisposition(const String&);
</span><span class="cx"> String extractMIMETypeFromMediaType(const String&);
</span><span class="cx"> String extractCharsetFromMediaType(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (response.isHttpVersion0_9()) {
</span><span class="cx"> auto url = response.url();
</span><del>- Optional<uint16_t> port = url.port();
</del><ins>+ std::optional<uint16_t> port = url.port();
</ins><span class="cx"> if (port && !isDefaultPortForProtocol(port.value(), url.protocol())) {
</span><span class="cx"> cancel();
</span><span class="cx"> String message = "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9.";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> return !m_httpHeaderFields.get(HTTPHeaderName::LastModified).isEmpty() || !m_httpHeaderFields.get(HTTPHeaderName::ETag).isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::microseconds> ResourceResponseBase::cacheControlMaxAge() const
</del><ins>+std::optional<std::chrono::microseconds> ResourceResponseBase::cacheControlMaxAge() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_haveParsedCacheControlHeader)
</span><span class="cx"> parseCacheControlDirectives();
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> return m_cacheControlDirectives.maxAge;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<std::chrono::system_clock::time_point> parseDateValueInHeader(const HTTPHeaderMap& headers, HTTPHeaderName headerName)
</del><ins>+static std::optional<std::chrono::system_clock::time_point> parseDateValueInHeader(const HTTPHeaderMap& headers, HTTPHeaderName headerName)
</ins><span class="cx"> {
</span><span class="cx"> String headerValue = headers.get(headerName);
</span><span class="cx"> if (headerValue.isEmpty())
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> return parseHTTPDate(headerValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::system_clock::time_point> ResourceResponseBase::date() const
</del><ins>+std::optional<std::chrono::system_clock::time_point> ResourceResponseBase::date() const
</ins><span class="cx"> {
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> return m_date;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::microseconds> ResourceResponseBase::age() const
</del><ins>+std::optional<std::chrono::microseconds> ResourceResponseBase::age() const
</ins><span class="cx"> {
</span><span class="cx"> using namespace std::chrono;
</span><span class="cx">
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> return m_age;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::system_clock::time_point> ResourceResponseBase::expires() const
</del><ins>+std::optional<std::chrono::system_clock::time_point> ResourceResponseBase::expires() const
</ins><span class="cx"> {
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> return m_expires;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<std::chrono::system_clock::time_point> ResourceResponseBase::lastModified() const
</del><ins>+std::optional<std::chrono::system_clock::time_point> ResourceResponseBase::lastModified() const
</ins><span class="cx"> {
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> // an invalid value (rdar://problem/22352838).
</span><span class="cx"> const std::chrono::system_clock::time_point epoch;
</span><span class="cx"> if (m_lastModified && m_lastModified.value() == epoch)
</span><del>- m_lastModified = Nullopt;
</del><ins>+ m_lastModified = std::nullopt;
</ins><span class="cx"> #endif
</span><span class="cx"> m_haveParsedLastModifiedHeader = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> WEBCORE_EXPORT String suggestedFilename() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void includeCertificateInfo() const;
</span><del>- const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
</del><ins>+ const std::optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
</ins><span class="cx">
</span><span class="cx"> // These functions return parsed values of the corresponding response headers.
</span><span class="cx"> // NaN means that the header was not present or had invalid value.
</span><span class="lines">@@ -123,11 +123,11 @@
</span><span class="cx"> WEBCORE_EXPORT bool cacheControlContainsNoStore() const;
</span><span class="cx"> WEBCORE_EXPORT bool cacheControlContainsMustRevalidate() const;
</span><span class="cx"> WEBCORE_EXPORT bool hasCacheValidatorFields() const;
</span><del>- WEBCORE_EXPORT Optional<std::chrono::microseconds> cacheControlMaxAge() const;
- WEBCORE_EXPORT Optional<std::chrono::system_clock::time_point> date() const;
- WEBCORE_EXPORT Optional<std::chrono::microseconds> age() const;
- WEBCORE_EXPORT Optional<std::chrono::system_clock::time_point> expires() const;
- WEBCORE_EXPORT Optional<std::chrono::system_clock::time_point> lastModified() const;
</del><ins>+ WEBCORE_EXPORT std::optional<std::chrono::microseconds> cacheControlMaxAge() const;
+ WEBCORE_EXPORT std::optional<std::chrono::system_clock::time_point> date() const;
+ WEBCORE_EXPORT std::optional<std::chrono::microseconds> age() const;
+ WEBCORE_EXPORT std::optional<std::chrono::system_clock::time_point> expires() const;
+ WEBCORE_EXPORT std::optional<std::chrono::system_clock::time_point> lastModified() const;
</ins><span class="cx"> ParsedContentRange& contentRange() const;
</span><span class="cx">
</span><span class="cx"> // This is primarily for testing support. It is not necessarily accurate in all scenarios.
</span><span class="lines">@@ -189,15 +189,15 @@
</span><span class="cx"> HTTPHeaderMap m_httpHeaderFields;
</span><span class="cx"> mutable NetworkLoadTiming m_networkLoadTiming;
</span><span class="cx">
</span><del>- mutable Optional<CertificateInfo> m_certificateInfo;
</del><ins>+ mutable std::optional<CertificateInfo> m_certificateInfo;
</ins><span class="cx">
</span><span class="cx"> int m_httpStatusCode;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- mutable Optional<std::chrono::microseconds> m_age;
- mutable Optional<std::chrono::system_clock::time_point> m_date;
- mutable Optional<std::chrono::system_clock::time_point> m_expires;
- mutable Optional<std::chrono::system_clock::time_point> m_lastModified;
</del><ins>+ mutable std::optional<std::chrono::microseconds> m_age;
+ mutable std::optional<std::chrono::system_clock::time_point> m_date;
+ mutable std::optional<std::chrono::system_clock::time_point> m_expires;
+ mutable std::optional<std::chrono::system_clock::time_point> m_lastModified;
</ins><span class="cx"> mutable ParsedContentRange m_contentRange;
</span><span class="cx"> mutable CacheControlDirectives m_cacheControlDirectives;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandle.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandle.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandle.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> SocketStreamHandle(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><span class="cx"> bool sendPendingData();
</span><del>- virtual Optional<size_t> platformSend(const char* data, size_t length) = 0;
</del><ins>+ virtual std::optional<size_t> platformSend(const char* data, size_t length) = 0;
</ins><span class="cx"> virtual void platformClose() = 0;
</span><span class="cx">
</span><span class="cx"> URL m_url;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void didOpenSocketStream(SocketStreamHandle&) = 0;
</span><span class="cx"> virtual void didCloseSocketStream(SocketStreamHandle&) = 0;
</span><del>- virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* data, Optional<size_t> length) = 0;
</del><ins>+ virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* data, std::optional<size_t> length) = 0;
</ins><span class="cx"> virtual void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) = 0;
</span><span class="cx"> virtual void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> virtual ~SocketStreamHandleImpl();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual Optional<size_t> platformSend(const char* data, size_t length);
</del><ins>+ virtual std::optional<size_t> platformSend(const char* data, size_t length);
</ins><span class="cx"> virtual void platformClose();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&, SessionID);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> if (!length)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Optional<size_t> optionalLength;
</del><ins>+ std::optional<size_t> optionalLength;
</ins><span class="cx"> if (length != -1)
</span><span class="cx"> optionalLength = length;
</span><span class="cx">
</span><span class="lines">@@ -653,14 +653,14 @@
</span><span class="cx"> ASSERT(!m_pacRunLoopSource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</del><ins>+std::optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> if (!CFWriteStreamCanAcceptBytes(m_writeStream.get()))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> CFIndex result = CFWriteStreamWrite(m_writeStream.get(), reinterpret_cast<const UInt8*>(data), length);
</span><span class="cx"> if (result == -1)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> ASSERT(result >= 0);
</span><span class="cx"> return static_cast<size_t>(result);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><del>- Optional<size_t> platformSend(const char* data, size_t length) final;
</del><ins>+ std::optional<size_t> platformSend(const char* data, size_t length) final;
</ins><span class="cx"> void platformClose() final;
</span><span class="cx">
</span><span class="cx"> bool readData(CURL*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> ASSERT(!m_workerThread);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</del><ins>+std::optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformSend", this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
</span><span class="cx">
</span><span class="cx"> // The _getCookiesForURL: method calls the completionHandler synchronously.
</span><del>- Optional<RetainPtr<NSArray *>> cookiesPtr;
</del><ins>+ std::optional<RetainPtr<NSArray *>> cookiesPtr;
</ins><span class="cx"> [cookieStorage _getCookiesForURL:url mainDocumentURL:firstParty partition:partition completionHandler:[&cookiesPtr](NSArray *cookies) {
</span><span class="cx"> cookiesPtr = retainPtr(cookies);
</span><span class="cx"> }];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> private:
</span><span class="cx"> SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><del>- Optional<size_t> platformSend(const char* data, size_t length) final;
</del><ins>+ std::optional<size_t> platformSend(const char* data, size_t length) final;
</ins><span class="cx"> void platformClose() final;
</span><span class="cx">
</span><span class="cx"> void beginWaitingForSocketWritability();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> // The client can close the handle, potentially removing the last reference.
</span><span class="cx"> RefPtr<SocketStreamHandle> protectedThis(this);
</span><del>- Optional<size_t> optionalLength;
</del><ins>+ std::optional<size_t> optionalLength;
</ins><span class="cx"> if (bytesRead != -1)
</span><span class="cx"> optionalLength = static_cast<size_t>(bytesRead);
</span><span class="cx"> m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), optionalLength);
</span><span class="lines">@@ -171,11 +171,11 @@
</span><span class="cx"> sendPendingData();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</del><ins>+std::optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformSend", this);
</span><span class="cx"> if (!m_outputStream || !data)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, m_cancellable.get(), &error.outPtr());
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx"> else
</span><span class="cx"> didFail(SocketStreamError(error->code, String(), error->message));
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we did not send all the bytes we were given, we know that
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx">
</span><span class="cx"> if (written == -1)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return static_cast<size_t>(written);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingBreakLinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/BreakLines.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/BreakLines.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/BreakLines.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> template<typename CharacterType, NonBreakingSpaceBehavior nonBreakingSpaceBehavior>
</span><span class="cx"> inline unsigned nextBreakablePositionNonLoosely(LazyLineBreakIterator& lazyBreakIterator, const CharacterType* string, unsigned length, unsigned startPosition)
</span><span class="cx"> {
</span><del>- Optional<unsigned> nextBreak;
</del><ins>+ std::optional<unsigned> nextBreak;
</ins><span class="cx">
</span><span class="cx"> CharacterType lastLastCharacter = startPosition > 1 ? string[startPosition - 2] : static_cast<CharacterType>(lazyBreakIterator.secondToLastCharacter());
</span><span class="cx"> CharacterType lastCharacter = startPosition > 0 ? string[startPosition - 1] : static_cast<CharacterType>(lazyBreakIterator.lastCharacter());
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> if (breakIterator) {
</span><span class="cx"> int candidate = textBreakFollowing(breakIterator, i - 1 + priorContextLength);
</span><span class="cx"> if (candidate == TextBreakDone)
</span><del>- nextBreak = Nullopt;
</del><ins>+ nextBreak = std::nullopt;
</ins><span class="cx"> else {
</span><span class="cx"> unsigned result = candidate;
</span><span class="cx"> ASSERT(result >= priorContextLength);
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> template<typename CharacterType, NonBreakingSpaceBehavior nonBreakingSpaceBehavior>
</span><span class="cx"> static inline unsigned nextBreakablePositionLoosely(LazyLineBreakIterator& lazyBreakIterator, const CharacterType* string, unsigned length, unsigned startPosition)
</span><span class="cx"> {
</span><del>- Optional<unsigned> nextBreak;
</del><ins>+ std::optional<unsigned> nextBreak;
</ins><span class="cx">
</span><span class="cx"> CharacterType lastCharacter = startPosition > 0 ? string[startPosition - 1] : static_cast<CharacterType>(lazyBreakIterator.lastCharacter());
</span><span class="cx"> unsigned priorContextLength = lazyBreakIterator.priorContextLength();
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> ASSERT(i + priorContextLength >= 1);
</span><span class="cx"> int candidate = textBreakFollowing(breakIterator, i + priorContextLength - 1);
</span><span class="cx"> if (candidate == TextBreakDone)
</span><del>- nextBreak = Nullopt;
</del><ins>+ nextBreak = std::nullopt;
</ins><span class="cx"> else {
</span><span class="cx"> unsigned result = candidate;
</span><span class="cx"> ASSERT(result > priorContextLength);
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> return nextBreakablePositionLoosely<UChar, NonBreakingSpaceBehavior::IgnoreNonBreakingSpace>(lazyBreakIterator, stringView.characters16(), stringView.length(), startPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isBreakable(LazyLineBreakIterator& lazyBreakIterator, unsigned startPosition, Optional<unsigned>& nextBreakable, bool breakNBSP, bool isLooseMode, bool keepAllWords)
</del><ins>+inline bool isBreakable(LazyLineBreakIterator& lazyBreakIterator, unsigned startPosition, std::optional<unsigned>& nextBreakable, bool breakNBSP, bool isLooseMode, bool keepAllWords)
</ins><span class="cx"> {
</span><span class="cx"> if (nextBreakable && nextBreakable.value() >= startPosition)
</span><span class="cx"> return startPosition == nextBreakable;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestingTransformStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestingTransformState.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestingTransformState.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/HitTestingTransformState.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> void HitTestingTransformState::flattenWithTransform(const TransformationMatrix& t)
</span><span class="cx"> {
</span><del>- if (Optional<TransformationMatrix> inverse = t.inverse()) {
</del><ins>+ if (std::optional<TransformationMatrix> inverse = t.inverse()) {
</ins><span class="cx"> m_lastPlanarPoint = inverse.value().projectPoint(m_lastPlanarPoint);
</span><span class="cx"> m_lastPlanarQuad = inverse.value().projectQuad(m_lastPlanarQuad);
</span><span class="cx"> m_lastPlanarArea = inverse.value().projectQuad(m_lastPlanarArea);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/ImageQualityController.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> m_timer.startOneShot(cLowQualityTimeThreshold);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<InterpolationQuality> ImageQualityController::interpolationQualityFromStyle(const RenderStyle& style)
</del><ins>+std::optional<InterpolationQuality> ImageQualityController::interpolationQualityFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> switch (style.imageRendering()) {
</span><span class="cx"> case ImageRenderingOptimizeSpeed:
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> case ImageRenderingAuto:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InterpolationQuality ImageQualityController::chooseInterpolationQuality(GraphicsContext& context, RenderBoxModelObject* object, Image& image, const void *layer, const LayoutSize& size)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> if (!(image.isBitmapImage() || image.isPDFDocumentImage()) || context.paintingDisabled())
</span><span class="cx"> return InterpolationDefault;
</span><span class="cx">
</span><del>- if (Optional<InterpolationQuality> styleInterpolation = interpolationQualityFromStyle(object->style()))
</del><ins>+ if (std::optional<InterpolationQuality> styleInterpolation = interpolationQualityFromStyle(object->style()))
</ins><span class="cx"> return styleInterpolation.value();
</span><span class="cx">
</span><span class="cx"> // Make sure to use the unzoomed image size, since if a full page zoom is in effect, the image
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/ImageQualityController.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit ImageQualityController(const RenderView&);
</span><span class="cx">
</span><del>- static Optional<InterpolationQuality> interpolationQualityFromStyle(const RenderStyle&);
</del><ins>+ static std::optional<InterpolationQuality> interpolationQualityFromStyle(const RenderStyle&);
</ins><span class="cx"> InterpolationQuality chooseInterpolationQuality(GraphicsContext&, RenderBoxModelObject*, Image&, const void* layer, const LayoutSize&);
</span><span class="cx">
</span><span class="cx"> void rendererWillBeDestroyed(RenderBoxModelObject& renderer) { removeObject(&renderer); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineIterator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineIterator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/InlineIterator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> moveTo(object, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void moveTo(RenderObject& object, unsigned offset, Optional<unsigned> nextBreak = Optional<unsigned>())
</del><ins>+ void moveTo(RenderObject& object, unsigned offset, std::optional<unsigned> nextBreak = std::optional<unsigned>())
</ins><span class="cx"> {
</span><span class="cx"> setRenderer(&object);
</span><span class="cx"> setOffset(offset);
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> unsigned offset() const { return m_pos; }
</span><span class="cx"> void setOffset(unsigned position);
</span><span class="cx"> RenderElement* root() const { return m_root; }
</span><del>- Optional<unsigned> nextBreakablePosition() const { return m_nextBreakablePosition; }
- void setNextBreakablePosition(Optional<unsigned> position) { m_nextBreakablePosition = position; }
</del><ins>+ std::optional<unsigned> nextBreakablePosition() const { return m_nextBreakablePosition; }
+ void setNextBreakablePosition(std::optional<unsigned> position) { m_nextBreakablePosition = position; }
</ins><span class="cx"> bool refersToEndOfPreviousNode() const { return m_refersToEndOfPreviousNode; }
</span><span class="cx"> void setRefersToEndOfPreviousNode();
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> RenderElement* m_root { nullptr };
</span><span class="cx"> RenderObject* m_renderer { nullptr };
</span><span class="cx">
</span><del>- Optional<unsigned> m_nextBreakablePosition;
</del><ins>+ std::optional<unsigned> m_nextBreakablePosition;
</ins><span class="cx"> unsigned m_pos { 0 };
</span><span class="cx">
</span><span class="cx"> // There are a couple places where we want to decrement an InlineIterator.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> bool respectHyphen = selectionEnd == length && hasHyphen();
</span><span class="cx"> if (respectHyphen)
</span><span class="cx"> hyphenatedString = hyphenatedStringForTextRun(style, length);
</span><del>- TextRun textRun = constructTextRun(style, hyphenatedString, Optional<unsigned>(length));
</del><ins>+ TextRun textRun = constructTextRun(style, hyphenatedString, std::optional<unsigned>(length));
</ins><span class="cx"> if (respectHyphen)
</span><span class="cx"> selectionEnd = textRun.length();
</span><span class="cx">
</span><span class="lines">@@ -1015,18 +1015,18 @@
</span><span class="cx"> return snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()).maxX();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StringView InlineTextBox::substringToRender(Optional<unsigned> overridingLength) const
</del><ins>+StringView InlineTextBox::substringToRender(std::optional<unsigned> overridingLength) const
</ins><span class="cx"> {
</span><del>- return StringView(renderer().text()).substring(start(), overridingLength.valueOr(len()));
</del><ins>+ return StringView(renderer().text()).substring(start(), overridingLength.value_or(len()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String InlineTextBox::hyphenatedStringForTextRun(const RenderStyle& style, Optional<unsigned> alternateLength) const
</del><ins>+String InlineTextBox::hyphenatedStringForTextRun(const RenderStyle& style, std::optional<unsigned> alternateLength) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasHyphen());
</span><span class="cx"> return makeString(substringToRender(alternateLength), style.hyphenString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun InlineTextBox::constructTextRun(const RenderStyle& style, StringView alternateStringToRender, Optional<unsigned> alternateLength) const
</del><ins>+TextRun InlineTextBox::constructTextRun(const RenderStyle& style, StringView alternateStringToRender, std::optional<unsigned> alternateLength) const
</ins><span class="cx"> {
</span><span class="cx"> if (alternateStringToRender.isNull())
</span><span class="cx"> return constructTextRun(style, substringToRender(alternateLength), renderer().textLength() - start());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -106,9 +106,9 @@
</span><span class="cx"> LayoutUnit selectionBottom() const;
</span><span class="cx"> LayoutUnit selectionHeight() const;
</span><span class="cx">
</span><del>- StringView substringToRender(Optional<unsigned> overridingLength = { }) const;
- String hyphenatedStringForTextRun(const RenderStyle&, Optional<unsigned> alternateLength = { }) const;
- TextRun constructTextRun(const RenderStyle&, StringView alternateStringToRender = { }, Optional<unsigned> alternateLength = { }) const;
</del><ins>+ StringView substringToRender(std::optional<unsigned> overridingLength = { }) const;
+ String hyphenatedStringForTextRun(const RenderStyle&, std::optional<unsigned> alternateLength = { }) const;
+ TextRun constructTextRun(const RenderStyle&, StringView alternateStringToRender = { }, std::optional<unsigned> alternateLength = { }) const;
</ins><span class="cx"> TextRun constructTextRun(const RenderStyle&, StringView, unsigned maximumLength) const;
</span><span class="cx">
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingOrderIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/OrderIterator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/OrderIterator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/OrderIterator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void OrderIterator::reset()
</span><span class="cx"> {
</span><span class="cx"> m_currentChild = nullptr;
</span><del>- m_orderIndex = Nullopt;
</del><ins>+ m_orderIndex = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OrderIteratorPopulator::OrderIteratorPopulator(OrderIterator& iterator)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingOrderIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/OrderIterator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/OrderIterator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/OrderIterator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> RenderBox* m_currentChild;
</span><span class="cx">
</span><span class="cx"> Vector<int, 1> m_orderValues;
</span><del>- Optional<size_t> m_orderIndex;
</del><ins>+ std::optional<size_t> m_orderIndex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class OrderIteratorPopulator {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingPaintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/PaintInfo.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/PaintInfo.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/PaintInfo.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> if (rect.isInfinite())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatRect tranformedRect(localToAncestorTransform.inverse().valueOr(AffineTransform()).mapRect(rect));
</del><ins>+ FloatRect tranformedRect(localToAncestorTransform.inverse().value_or(AffineTransform()).mapRect(rect));
</ins><span class="cx"> rect.setLocation(LayoutPoint(tranformedRect.location()));
</span><span class="cx"> rect.setSize(LayoutSize(tranformedRect.size()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> RenderBlockRareData()
</span><span class="cx"> : m_paginationStrut(0)
</span><span class="cx"> , m_pageLogicalOffset(0)
</span><del>- , m_flowThreadContainingBlock(Nullopt)
</del><ins>+ , m_flowThreadContainingBlock(std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> LayoutUnit m_paginationStrut;
</span><span class="cx"> LayoutUnit m_pageLogicalOffset;
</span><span class="cx">
</span><del>- Optional<RenderFlowThread*> m_flowThreadContainingBlock;
</del><ins>+ std::optional<RenderFlowThread*> m_flowThreadContainingBlock;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const RenderBlock*, std::unique_ptr<RenderBlockRareData>> RenderBlockRareDataMap;
</span><span class="lines">@@ -2944,7 +2944,7 @@
</span><span class="cx"> bool ignoreBaseline = (layer() && (layer()->marquee() || (direction == HorizontalLine ? (layer()->verticalScrollbar() || layer()->scrollOffset().y() != 0)
</span><span class="cx"> : (layer()->horizontalScrollbar() || layer()->scrollOffset().x() != 0)))) || (isWritingModeRoot() && !isRubyRun());
</span><span class="cx">
</span><del>- Optional<int> baselinePos = ignoreBaseline ? Optional<int>() : inlineBlockBaseline(direction);
</del><ins>+ std::optional<int> baselinePos = ignoreBaseline ? std::optional<int>() : inlineBlockBaseline(direction);
</ins><span class="cx">
</span><span class="cx"> if (isDeprecatedFlexibleBox()) {
</span><span class="cx"> // Historically, we did this check for all baselines. But we can't
</span><span class="lines">@@ -2954,7 +2954,7 @@
</span><span class="cx"> // For simplicity, we use this for all uses of deprecated flexbox.
</span><span class="cx"> LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
</span><span class="cx"> if (baselinePos && baselinePos.value() > bottomOfContent)
</span><del>- baselinePos = Optional<int>();
</del><ins>+ baselinePos = std::optional<int>();
</ins><span class="cx"> }
</span><span class="cx"> if (baselinePos)
</span><span class="cx"> return direction == HorizontalLine ? marginTop() + baselinePos.value() : marginRight() + baselinePos.value();
</span><span class="lines">@@ -2979,25 +2979,25 @@
</span><span class="cx"> return std::max<LayoutUnit>(replacedHeight, lineHeight(isFirstLine, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderBlock::firstLineBaseline() const
</del><ins>+std::optional<int> RenderBlock::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() && !isRubyRun())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) {
</span><span class="cx"> if (!curr->isFloatingOrOutOfFlowPositioned()) {
</span><del>- if (Optional<int> result = curr->firstLineBaseline())
- return Optional<int>(curr->logicalTop() + result.value()); // Translate to our coordinate space.
</del><ins>+ if (std::optional<int> result = curr->firstLineBaseline())
+ return std::optional<int>(curr->logicalTop() + result.value()); // Translate to our coordinate space.
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderBlock::inlineBlockBaseline(LineDirectionMode lineDirection) const
</del><ins>+std::optional<int> RenderBlock::inlineBlockBaseline(LineDirectionMode lineDirection) const
</ins><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() && !isRubyRun())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> bool haveNormalFlowChild = false;
</span><span class="cx"> for (auto* box = lastChildBox(); box; box = box->previousSiblingBox()) {
</span><span class="lines">@@ -3004,18 +3004,18 @@
</span><span class="cx"> if (box->isFloatingOrOutOfFlowPositioned())
</span><span class="cx"> continue;
</span><span class="cx"> haveNormalFlowChild = true;
</span><del>- if (Optional<int> result = box->inlineBlockBaseline(lineDirection))
- return Optional<int>(box->logicalTop() + result.value()); // Translate to our coordinate space.
</del><ins>+ if (std::optional<int> result = box->inlineBlockBaseline(lineDirection))
+ return std::optional<int>(box->logicalTop() + result.value()); // Translate to our coordinate space.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!haveNormalFlowChild && hasLineIfEmpty()) {
</span><span class="cx"> auto& fontMetrics = firstLineStyle().fontMetrics();
</span><del>- return Optional<int>(fontMetrics.ascent()
</del><ins>+ return std::optional<int>(fontMetrics.ascent()
</ins><span class="cx"> + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
</span><span class="cx"> + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isRenderBlockFlowOrRenderButton(RenderElement& renderElement)
</span><span class="lines">@@ -3354,7 +3354,7 @@
</span><span class="cx"> void RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate()
</span><span class="cx"> {
</span><span class="cx"> RenderBlockRareData& rareData = ensureBlockRareData(this);
</span><del>- rareData.m_flowThreadContainingBlock = Nullopt;
</del><ins>+ rareData.m_flowThreadContainingBlock = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* RenderBlock::updateCachedFlowThreadContainingBlock(RenderFlowThread* flowThread) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -341,8 +341,8 @@
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx">
</span><del>- Optional<int> firstLineBaseline() const override;
- Optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
+ std::optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</ins><span class="cx">
</span><span class="cx"> // Delay updating scrollbars until endAndCommitUpdateScrollInfoAfterLayoutTransaction() is called. These functions are used
</span><span class="cx"> // when a flexbox is laying out its descendants. If multiple calls are made to beginUpdateScrollInfoAfterLayoutTransaction()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -3034,34 +3034,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderBlockFlow::firstLineBaseline() const
</del><ins>+std::optional<int> RenderBlockFlow::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() && !isRubyRun())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> if (!childrenInline())
</span><span class="cx"> return RenderBlock::firstLineBaseline();
</span><span class="cx">
</span><span class="cx"> if (!hasLines())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> if (auto simpleLineLayout = this->simpleLineLayout())
</span><del>- return Optional<int>(SimpleLineLayout::computeFlowFirstLineBaseline(*this, *simpleLineLayout));
</del><ins>+ return std::optional<int>(SimpleLineLayout::computeFlowFirstLineBaseline(*this, *simpleLineLayout));
</ins><span class="cx">
</span><span class="cx"> ASSERT(firstRootBox());
</span><span class="cx"> return firstRootBox()->logicalTop() + firstLineStyle().fontMetrics().ascent(firstRootBox()->baselineType());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderBlockFlow::inlineBlockBaseline(LineDirectionMode lineDirection) const
</del><ins>+std::optional<int> RenderBlockFlow::inlineBlockBaseline(LineDirectionMode lineDirection) const
</ins><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() && !isRubyRun())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> // Note that here we only take the left and bottom into consideration. Our caller takes the right and top into consideration.
</span><span class="cx"> float boxHeight = lineDirection == HorizontalLine ? height() + m_marginBox.bottom() : width() + m_marginBox.left();
</span><span class="cx"> float lastBaseline;
</span><span class="cx"> if (!childrenInline()) {
</span><del>- Optional<int> inlineBlockBaseline = RenderBlock::inlineBlockBaseline(lineDirection);
</del><ins>+ std::optional<int> inlineBlockBaseline = RenderBlock::inlineBlockBaseline(lineDirection);
</ins><span class="cx"> if (!inlineBlockBaseline)
</span><span class="cx"> return inlineBlockBaseline;
</span><span class="cx"> lastBaseline = inlineBlockBaseline.value();
</span><span class="lines">@@ -3068,9 +3068,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (!hasLines()) {
</span><span class="cx"> if (!hasLineIfEmpty())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> const auto& fontMetrics = firstLineStyle().fontMetrics();
</span><del>- return Optional<int>(fontMetrics.ascent()
</del><ins>+ return std::optional<int>(fontMetrics.ascent()
</ins><span class="cx"> + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
</span><span class="cx"> + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight()));
</span><span class="cx"> }
</span><span class="lines">@@ -3086,7 +3086,7 @@
</span><span class="cx"> // According to the CSS spec http://www.w3.org/TR/CSS21/visudet.html, we shouldn't be performing this min, but should
</span><span class="cx"> // instead be returning boxHeight directly. However, we feel that a min here is better behavior (and is consistent
</span><span class="cx"> // enough with the spec to not cause tons of breakages).
</span><del>- return Optional<int>(style().overflowY() == OVISIBLE ? lastBaseline : std::min(boxHeight, lastBaseline));
</del><ins>+ return std::optional<int>(style().overflowY() == OVISIBLE ? lastBaseline : std::min(boxHeight, lastBaseline));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::setSelectionState(SelectionState state)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -447,8 +447,8 @@
</span><span class="cx">
</span><span class="cx"> void createFloatingObjects();
</span><span class="cx">
</span><del>- Optional<int> firstLineBaseline() const override;
- Optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
+ std::optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</ins><span class="cx">
</span><span class="cx"> bool isMultiColumnBlockFlow() const override { return multiColumnFlowThread(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> // Used by grid elements to properly size their grid items.
</span><del>-typedef WTF::HashMap<const RenderBox*, Optional<LayoutUnit>> OverrideOptionalSizeMap;
</del><ins>+typedef WTF::HashMap<const RenderBox*, std::optional<LayoutUnit>> OverrideOptionalSizeMap;
</ins><span class="cx"> static OverrideOptionalSizeMap* gOverrideContainingBlockLogicalHeightMap = nullptr;
</span><span class="cx"> static OverrideOptionalSizeMap* gOverrideContainingBlockLogicalWidthMap = nullptr;
</span><span class="cx"> static OverrideSizeMap* gExtraInlineOffsetMap = nullptr;
</span><span class="lines">@@ -656,26 +656,26 @@
</span><span class="cx"> return std::max(logicalWidth, computeLogicalWidthInRegionUsing(MinSize, styleToUse.logicalMinWidth(), availableWidth, cb, region));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderBox::constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, Optional<LayoutUnit> intrinsicContentHeight) const
</del><ins>+LayoutUnit RenderBox::constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, std::optional<LayoutUnit> intrinsicContentHeight) const
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle& styleToUse = style();
</span><span class="cx"> if (!styleToUse.logicalMaxHeight().isUndefined()) {
</span><del>- if (Optional<LayoutUnit> maxH = computeLogicalHeightUsing(MaxSize, styleToUse.logicalMaxHeight(), intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> maxH = computeLogicalHeightUsing(MaxSize, styleToUse.logicalMaxHeight(), intrinsicContentHeight))
</ins><span class="cx"> logicalHeight = std::min(logicalHeight, maxH.value());
</span><span class="cx"> }
</span><del>- if (Optional<LayoutUnit> computedLogicalHeight = computeLogicalHeightUsing(MinSize, styleToUse.logicalMinHeight(), intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> computedLogicalHeight = computeLogicalHeightUsing(MinSize, styleToUse.logicalMinHeight(), intrinsicContentHeight))
</ins><span class="cx"> return std::max(logicalHeight, computedLogicalHeight.value());
</span><span class="cx"> return logicalHeight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderBox::constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, Optional<LayoutUnit> intrinsicContentHeight) const
</del><ins>+LayoutUnit RenderBox::constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, std::optional<LayoutUnit> intrinsicContentHeight) const
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle& styleToUse = style();
</span><span class="cx"> if (!styleToUse.logicalMaxHeight().isUndefined()) {
</span><del>- if (Optional<LayoutUnit> maxH = computeContentLogicalHeight(MaxSize, styleToUse.logicalMaxHeight(), intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> maxH = computeContentLogicalHeight(MaxSize, styleToUse.logicalMaxHeight(), intrinsicContentHeight))
</ins><span class="cx"> logicalHeight = std::min(logicalHeight, maxH.value());
</span><span class="cx"> }
</span><del>- if (Optional<LayoutUnit> computedContentLogicalHeight = computeContentLogicalHeight(MinSize, styleToUse.logicalMinHeight(), intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> computedContentLogicalHeight = computeContentLogicalHeight(MinSize, styleToUse.logicalMinHeight(), intrinsicContentHeight))
</ins><span class="cx"> return std::max(logicalHeight, computedContentLogicalHeight.value());
</span><span class="cx"> return logicalHeight;
</span><span class="cx"> }
</span><span class="lines">@@ -1112,13 +1112,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>-Optional<LayoutUnit> RenderBox::overrideContainingBlockContentLogicalWidth() const
</del><ins>+std::optional<LayoutUnit> RenderBox::overrideContainingBlockContentLogicalWidth() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasOverrideContainingBlockLogicalWidth());
</span><span class="cx"> return gOverrideContainingBlockLogicalWidthMap->get(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::overrideContainingBlockContentLogicalHeight() const
</del><ins>+std::optional<LayoutUnit> RenderBox::overrideContainingBlockContentLogicalHeight() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasOverrideContainingBlockLogicalHeight());
</span><span class="cx"> return gOverrideContainingBlockLogicalHeightMap->get(this);
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> return gOverrideContainingBlockLogicalHeightMap && gOverrideContainingBlockLogicalHeightMap->contains(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::setOverrideContainingBlockContentLogicalWidth(Optional<LayoutUnit> logicalWidth)
</del><ins>+void RenderBox::setOverrideContainingBlockContentLogicalWidth(std::optional<LayoutUnit> logicalWidth)
</ins><span class="cx"> {
</span><span class="cx"> if (!gOverrideContainingBlockLogicalWidthMap)
</span><span class="cx"> gOverrideContainingBlockLogicalWidthMap = new OverrideOptionalSizeMap;
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> gOverrideContainingBlockLogicalWidthMap->set(this, logicalWidth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::setOverrideContainingBlockContentLogicalHeight(Optional<LayoutUnit> logicalHeight)
</del><ins>+void RenderBox::setOverrideContainingBlockContentLogicalHeight(std::optional<LayoutUnit> logicalHeight)
</ins><span class="cx"> {
</span><span class="cx"> if (!gOverrideContainingBlockLogicalHeightMap)
</span><span class="cx"> gOverrideContainingBlockLogicalHeightMap = new OverrideOptionalSizeMap;
</span><span class="lines">@@ -1217,7 +1217,7 @@
</span><span class="cx"> return std::max<LayoutUnit>(0, width);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderBox::adjustContentBoxLogicalHeightForBoxSizing(Optional<LayoutUnit> height) const
</del><ins>+LayoutUnit RenderBox::adjustContentBoxLogicalHeightForBoxSizing(std::optional<LayoutUnit> height) const
</ins><span class="cx"> {
</span><span class="cx"> if (!height)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2862,7 +2862,7 @@
</span><span class="cx"> LayoutUnit heightResult;
</span><span class="cx"> if (checkMinMaxHeight) {
</span><span class="cx"> LayoutUnit intrinsicHeight = computedValues.m_extent - borderAndPaddingLogicalHeight();
</span><del>- heightResult = computeLogicalHeightUsing(MainOrPreferredSize, style().logicalHeight(), intrinsicHeight).valueOr(computedValues.m_extent);
</del><ins>+ heightResult = computeLogicalHeightUsing(MainOrPreferredSize, style().logicalHeight(), intrinsicHeight).value_or(computedValues.m_extent);
</ins><span class="cx"> heightResult = constrainLogicalHeightByMinMax(heightResult, intrinsicHeight);
</span><span class="cx"> } else {
</span><span class="cx"> // The only times we don't check min/max height are when a fixed length has
</span><span class="lines">@@ -2901,21 +2901,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::computeLogicalHeightUsing(SizeType heightType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const
</del><ins>+std::optional<LayoutUnit> RenderBox::computeLogicalHeightUsing(SizeType heightType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const
</ins><span class="cx"> {
</span><del>- if (Optional<LayoutUnit> logicalHeight = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> logicalHeight = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
</ins><span class="cx"> return adjustBorderBoxLogicalHeightForBoxSizing(logicalHeight.value());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const
</del><ins>+std::optional<LayoutUnit> RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const
</ins><span class="cx"> {
</span><del>- if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
</del><ins>+ if (std::optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
</ins><span class="cx"> return std::max<LayoutUnit>(0, adjustContentBoxLogicalHeightForBoxSizing(heightIncludingScrollbar) - scrollbarLogicalHeight());
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, Optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const
</del><ins>+std::optional<LayoutUnit> RenderBox::computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, std::optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
</span><span class="cx"> // If that happens, this code will have to change.
</span><span class="lines">@@ -2932,10 +2932,10 @@
</span><span class="cx"> return LayoutUnit(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heightType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const
</del><ins>+std::optional<LayoutUnit> RenderBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heightType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const
</ins><span class="cx"> {
</span><span class="cx"> if (height.isAuto())
</span><del>- return heightType == MinSize ? Optional<LayoutUnit>(0) : Nullopt;
</del><ins>+ return heightType == MinSize ? std::optional<LayoutUnit>(0) : std::nullopt;
</ins><span class="cx"> // FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
</span><span class="cx"> // If that happens, this code will have to change.
</span><span class="cx"> if (height.isIntrinsic())
</span><span class="lines">@@ -2944,7 +2944,7 @@
</span><span class="cx"> return LayoutUnit(height.value());
</span><span class="cx"> if (height.isPercentOrCalculated())
</span><span class="cx"> return computePercentageLogicalHeight(height);
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::skipContainingBlockForPercentHeightCalculation(const RenderBox& containingBlock, bool isPerpendicularWritingMode) const
</span><span class="lines">@@ -2974,9 +2974,9 @@
</span><span class="cx"> return scrollsOverflowY && (!cell.style().logicalHeight().isAuto() || !cell.table()->style().logicalHeight().isAuto());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderBox::computePercentageLogicalHeight(const Length& height) const
</del><ins>+std::optional<LayoutUnit> RenderBox::computePercentageLogicalHeight(const Length& height) const
</ins><span class="cx"> {
</span><del>- Optional<LayoutUnit> availableHeight;
</del><ins>+ std::optional<LayoutUnit> availableHeight;
</ins><span class="cx">
</span><span class="cx"> bool skippedAutoHeightContainingBlock = false;
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><span class="lines">@@ -3014,7 +3014,7 @@
</span><span class="cx"> // don't care if the cell specified a height or not. We just always make ourselves
</span><span class="cx"> // be a percentage of the cell's current content height.
</span><span class="cx"> if (!cb->hasOverrideLogicalContentHeight())
</span><del>- return tableCellShouldHaveZeroInitialSize(*cb, scrollsOverflowY()) ? Optional<LayoutUnit>() : Nullopt;
</del><ins>+ return tableCellShouldHaveZeroInitialSize(*cb, scrollsOverflowY()) ? std::optional<LayoutUnit>() : std::nullopt;
</ins><span class="cx">
</span><span class="cx"> availableHeight = cb->overrideLogicalContentHeight();
</span><span class="cx"> includeBorderPadding = true;
</span><span class="lines">@@ -3021,16 +3021,16 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (cbstyle.logicalHeight().isFixed()) {
</span><span class="cx"> LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit(cbstyle.logicalHeight().value()));
</span><del>- availableHeight = std::max<LayoutUnit>(0, cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeight - cb->scrollbarLogicalHeight(), Nullopt));
</del><ins>+ availableHeight = std::max<LayoutUnit>(0, cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeight - cb->scrollbarLogicalHeight(), std::nullopt));
</ins><span class="cx"> } else if (cbstyle.logicalHeight().isPercentOrCalculated() && !isOutOfFlowPositionedWithSpecifiedHeight) {
</span><span class="cx"> // We need to recur and compute the percentage height for our containing block.
</span><del>- if (Optional<LayoutUnit> heightWithScrollbar = cb->computePercentageLogicalHeight(cbstyle.logicalHeight())) {
</del><ins>+ if (std::optional<LayoutUnit> heightWithScrollbar = cb->computePercentageLogicalHeight(cbstyle.logicalHeight())) {
</ins><span class="cx"> LayoutUnit contentBoxHeightWithScrollbar = cb->adjustContentBoxLogicalHeightForBoxSizing(heightWithScrollbar);
</span><span class="cx"> // We need to adjust for min/max height because this method does not
</span><span class="cx"> // handle the min/max of the current block, its caller does. So the
</span><span class="cx"> // return value from the recursive call will not have been adjusted
</span><span class="cx"> // yet.
</span><del>- LayoutUnit contentBoxHeight = cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight(), Nullopt);
</del><ins>+ LayoutUnit contentBoxHeight = cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight(), std::nullopt);
</ins><span class="cx"> availableHeight = std::max<LayoutUnit>(0, contentBoxHeight);
</span><span class="cx"> }
</span><span class="cx"> } else if (isOutOfFlowPositionedWithSpecifiedHeight) {
</span><span class="lines">@@ -3133,7 +3133,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(heightType == MinSize || heightType == MainOrPreferredSize || !logicalHeight.isAuto());
</span><span class="cx"> if (heightType == MinSize && logicalHeight.isAuto())
</span><del>- return adjustContentBoxLogicalHeightForBoxSizing(Optional<LayoutUnit>(0));
</del><ins>+ return adjustContentBoxLogicalHeightForBoxSizing(std::optional<LayoutUnit>(0));
</ins><span class="cx">
</span><span class="cx"> switch (logicalHeight.type()) {
</span><span class="cx"> case Fixed:
</span><span class="lines">@@ -3197,7 +3197,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::availableLogicalHeight(AvailableLogicalHeightType heightType) const
</span><span class="cx"> {
</span><del>- return constrainLogicalHeightByMinMax(availableLogicalHeightUsing(style().logicalHeight(), heightType), Nullopt);
</del><ins>+ return constrainLogicalHeightByMinMax(availableLogicalHeightUsing(style().logicalHeight(), heightType), std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::availableLogicalHeightUsing(const Length& h, AvailableLogicalHeightType heightType) const
</span><span class="lines">@@ -3217,7 +3217,7 @@
</span><span class="cx"> return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(h, availableHeight));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(MainOrPreferredSize, h, Nullopt))
</del><ins>+ if (std::optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(MainOrPreferredSize, h, std::nullopt))
</ins><span class="cx"> return std::max<LayoutUnit>(0, adjustContentBoxLogicalHeightForBoxSizing(heightIncludingScrollbar) - scrollbarLogicalHeight());
</span><span class="cx">
</span><span class="cx"> // FIXME: Check logicalTop/logicalBottom here to correctly handle vertical writing-mode.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> LayoutUnit logicalHeight() const { return style().isHorizontalWritingMode() ? height() : width(); }
</span><span class="cx">
</span><span class="cx"> LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock&, RenderRegion* = nullptr) const;
</span><del>- LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, Optional<LayoutUnit> intrinsicContentHeight) const;
- LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, Optional<LayoutUnit> intrinsicContentHeight) const;
</del><ins>+ LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, std::optional<LayoutUnit> intrinsicContentHeight) const;
+ LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, std::optional<LayoutUnit> intrinsicContentHeight) const;
</ins><span class="cx">
</span><span class="cx"> void setLogicalLeft(LayoutUnit left)
</span><span class="cx"> {
</span><span class="lines">@@ -312,12 +312,12 @@
</span><span class="cx"> void clearOverrideLogicalContentWidth();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>- Optional<LayoutUnit> overrideContainingBlockContentLogicalWidth() const;
- Optional<LayoutUnit> overrideContainingBlockContentLogicalHeight() const;
</del><ins>+ std::optional<LayoutUnit> overrideContainingBlockContentLogicalWidth() const;
+ std::optional<LayoutUnit> overrideContainingBlockContentLogicalHeight() const;
</ins><span class="cx"> bool hasOverrideContainingBlockLogicalWidth() const;
</span><span class="cx"> bool hasOverrideContainingBlockLogicalHeight() const;
</span><del>- void setOverrideContainingBlockContentLogicalWidth(Optional<LayoutUnit>);
- void setOverrideContainingBlockContentLogicalHeight(Optional<LayoutUnit>);
</del><ins>+ void setOverrideContainingBlockContentLogicalWidth(std::optional<LayoutUnit>);
+ void setOverrideContainingBlockContentLogicalHeight(std::optional<LayoutUnit>);
</ins><span class="cx"> void clearContainingBlockOverrideSize();
</span><span class="cx"> void clearOverrideContainingBlockContentLogicalHeight();
</span><span class="cx"> LayoutUnit extraInlineOffset() const;
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
</span><span class="cx"> LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const;
</span><span class="cx"> LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
</span><del>- LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(Optional<LayoutUnit> height) const;
</del><ins>+ LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(std::optional<LayoutUnit> height) const;
</ins><span class="cx">
</span><span class="cx"> struct ComputedMarginValues {
</span><span class="cx"> ComputedMarginValues()
</span><span class="lines">@@ -422,9 +422,9 @@
</span><span class="cx"> LayoutUnit shrinkLogicalWidthToAvoidFloats(LayoutUnit childMarginStart, LayoutUnit childMarginEnd, const RenderBlock& cb, RenderRegion*) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit computeLogicalWidthInRegionUsing(SizeType, Length logicalWidth, LayoutUnit availableLogicalWidth, const RenderBlock& containingBlock, RenderRegion*) const;
</span><del>- Optional<LayoutUnit> computeLogicalHeightUsing(SizeType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const;
- Optional<LayoutUnit> computeContentLogicalHeight(SizeType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const;
- Optional<LayoutUnit> computeContentAndScrollbarLogicalHeightUsing(SizeType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const;
</del><ins>+ std::optional<LayoutUnit> computeLogicalHeightUsing(SizeType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const;
+ std::optional<LayoutUnit> computeContentLogicalHeight(SizeType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const;
+ std::optional<LayoutUnit> computeContentAndScrollbarLogicalHeightUsing(SizeType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const;
</ins><span class="cx"> LayoutUnit computeReplacedLogicalWidthUsing(SizeType, Length width) const;
</span><span class="cx"> LayoutUnit computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred = ComputeActual) const;
</span><span class="cx"> LayoutUnit computeReplacedLogicalHeightUsing(SizeType, Length height) const;
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> bool hasDefiniteLogicalWidth() const;
</span><span class="cx"> static bool percentageLogicalHeightIsResolvableFromBlock(const RenderBlock& containingBlock, bool outOfFlowPositioned, bool scrollsOverflowY);
</span><span class="cx"> bool hasDefiniteLogicalHeight() const;
</span><del>- Optional<LayoutUnit> computePercentageLogicalHeight(const Length& height) const;
</del><ins>+ std::optional<LayoutUnit> computePercentageLogicalHeight(const Length& height) const;
</ins><span class="cx">
</span><span class="cx"> virtual LayoutUnit availableLogicalWidth() const { return contentLogicalWidth(); }
</span><span class="cx"> virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const;
</span><span class="lines">@@ -518,8 +518,8 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* enclosingFloatPaintingLayer() const;
</span><span class="cx">
</span><del>- virtual Optional<int> firstLineBaseline() const { return Optional<int>(); }
- virtual Optional<int> inlineBlockBaseline(LineDirectionMode) const { return Optional<int>(); } // Returns empty if we should skip this box when computing the baseline of an inline-block.
</del><ins>+ virtual std::optional<int> firstLineBaseline() const { return std::optional<int>(); }
+ virtual std::optional<int> inlineBlockBaseline(LineDirectionMode) const { return std::optional<int>(); } // Returns empty if we should skip this box when computing the baseline of an inline-block.
</ins><span class="cx">
</span><span class="cx"> bool shrinkToAvoidFloats() const;
</span><span class="cx"> virtual bool avoidsFloats() const;
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit computeIntrinsicLogicalWidthUsing(Length logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
</span><del>- virtual Optional<LayoutUnit> computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, Optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const;
</del><ins>+ virtual std::optional<LayoutUnit> computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, std::optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const;
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,10 +71,10 @@
</span><span class="cx"> return RenderText::width(from, length, font, xPosition, fallbackFonts, glyphOverflow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<FloatPoint> RenderCombineText::computeTextOrigin(const FloatRect& boxRect) const
</del><ins>+std::optional<FloatPoint> RenderCombineText::computeTextOrigin(const FloatRect& boxRect) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isCombined)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> // Visually center m_combinedTextWidth/Ascent/Descent within boxRect
</span><span class="cx"> FloatPoint result = boxRect.minXMaxYCorner();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderCombineText.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> Text& textNode() const { return downcast<Text>(nodeForNonAnonymous()); }
</span><span class="cx">
</span><span class="cx"> void combineText();
</span><del>- Optional<FloatPoint> computeTextOrigin(const FloatRect& boxRect) const;
</del><ins>+ std::optional<FloatPoint> computeTextOrigin(const FloatRect& boxRect) const;
</ins><span class="cx"> String combinedStringForRendering() const;
</span><span class="cx"> bool isCombined() const { return m_isCombined; }
</span><span class="cx"> float combinedTextWidth(const FontCascade& font) const { return font.size(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx">
</span><span class="cx"> // Update our height and overflow height.
</span><span class="cx"> if (style().boxAlign() == BBASELINE) {
</span><del>- LayoutUnit ascent = child->firstLineBaseline().valueOr(child->height() + child->marginBottom());
</del><ins>+ LayoutUnit ascent = child->firstLineBaseline().value_or(child->height() + child->marginBottom());
</ins><span class="cx"> ascent += child->marginTop();
</span><span class="cx"> LayoutUnit descent = (child->height() + child->verticalMarginExtent()) - ascent;
</span><span class="cx">
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx"> childY += child->marginTop() + std::max<LayoutUnit>(0, (contentHeight() - (child->height() + child->verticalMarginExtent())) / 2);
</span><span class="cx"> break;
</span><span class="cx"> case BBASELINE: {
</span><del>- LayoutUnit ascent = child->firstLineBaseline().valueOr(child->height() + child->marginBottom());
</del><ins>+ LayoutUnit ascent = child->firstLineBaseline().value_or(child->height() + child->marginBottom());
</ins><span class="cx"> ascent += child->marginTop();
</span><span class="cx"> childY += child->marginTop() + (maxAscent - ascent);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -175,16 +175,16 @@
</span><span class="cx">
</span><span class="cx"> int RenderFlexibleBox::baselinePosition(FontBaseline, bool, LineDirectionMode direction, LinePositionMode) const
</span><span class="cx"> {
</span><del>- int baseline = firstLineBaseline().valueOr(synthesizedBaselineFromContentBox(*this, direction));
</del><ins>+ int baseline = firstLineBaseline().value_or(synthesizedBaselineFromContentBox(*this, direction));
</ins><span class="cx">
</span><span class="cx"> int marginAscent = direction == HorizontalLine ? marginTop() : marginRight();
</span><span class="cx"> return baseline + marginAscent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderFlexibleBox::firstLineBaseline() const
</del><ins>+std::optional<int> RenderFlexibleBox::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() || m_numberOfInFlowChildrenOnFirstLine <= 0)
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> RenderBox* baselineChild = nullptr;
</span><span class="cx"> int childNumber = 0;
</span><span class="cx"> for (RenderBox* child = m_orderIterator.first(); child; child = m_orderIterator.next()) {
</span><span class="lines">@@ -203,27 +203,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!baselineChild)
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> if (!isColumnFlow() && hasOrthogonalFlow(*baselineChild))
</span><del>- return Optional<int>(crossAxisExtentForChild(*baselineChild) + baselineChild->logicalTop());
</del><ins>+ return std::optional<int>(crossAxisExtentForChild(*baselineChild) + baselineChild->logicalTop());
</ins><span class="cx"> if (isColumnFlow() && !hasOrthogonalFlow(*baselineChild))
</span><del>- return Optional<int>(mainAxisExtentForChild(*baselineChild) + baselineChild->logicalTop());
</del><ins>+ return std::optional<int>(mainAxisExtentForChild(*baselineChild) + baselineChild->logicalTop());
</ins><span class="cx">
</span><del>- Optional<int> baseline = baselineChild->firstLineBaseline();
</del><ins>+ std::optional<int> baseline = baselineChild->firstLineBaseline();
</ins><span class="cx"> if (!baseline) {
</span><span class="cx"> // FIXME: We should pass |direction| into firstLineBoxBaseline and stop bailing out if we're a writing mode root.
</span><span class="cx"> // This would also fix some cases where the flexbox is orthogonal to its container.
</span><span class="cx"> LineDirectionMode direction = isHorizontalWritingMode() ? HorizontalLine : VerticalLine;
</span><del>- return Optional<int>(synthesizedBaselineFromContentBox(*baselineChild, direction) + baselineChild->logicalTop());
</del><ins>+ return std::optional<int>(synthesizedBaselineFromContentBox(*baselineChild, direction) + baselineChild->logicalTop());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return Optional<int>(baseline.value() + baselineChild->logicalTop());
</del><ins>+ return std::optional<int>(baseline.value() + baselineChild->logicalTop());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderFlexibleBox::inlineBlockBaseline(LineDirectionMode direction) const
</del><ins>+std::optional<int> RenderFlexibleBox::inlineBlockBaseline(LineDirectionMode direction) const
</ins><span class="cx"> {
</span><del>- if (Optional<int> baseline = firstLineBaseline())
</del><ins>+ if (std::optional<int> baseline = firstLineBaseline())
</ins><span class="cx"> return baseline;
</span><span class="cx">
</span><span class="cx"> int marginAscent = direction == HorizontalLine ? marginTop() : marginRight();
</span><span class="lines">@@ -455,12 +455,12 @@
</span><span class="cx"> return contentLogicalWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderFlexibleBox::computeMainAxisExtentForChild(const RenderBox& child, SizeType sizeType, const Length& size)
</del><ins>+std::optional<LayoutUnit> RenderFlexibleBox::computeMainAxisExtentForChild(const RenderBox& child, SizeType sizeType, const Length& size)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This is wrong for orthogonal flows. It should use the flexbox's writing-mode, not the child's in order
</span><span class="cx"> // to figure out the logical height/width.
</span><span class="cx"> if (isColumnFlow()) {
</span><del>- // We don't have to check for "auto" here - computeContentLogicalHeight will just return Nullopt for that case anyway.
</del><ins>+ // We don't have to check for "auto" here - computeContentLogicalHeight will just return std::nullopt for that case anyway.
</ins><span class="cx"> if (size.isIntrinsic())
</span><span class="cx"> const_cast<RenderBox&>(child).layoutIfNeeded(); // FIXME: Should not need to do a layout here.
</span><span class="cx"> return child.computeContentLogicalHeight(sizeType, size, child.logicalHeight() - child.borderAndPaddingLogicalHeight());
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> ASSERT(mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child) >= 0);
</span><span class="cx"> return mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child);
</span><span class="cx"> }
</span><del>- return computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis).valueOr(0);
</del><ins>+ return computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis).value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren, Vector<LineContext>& lineContexts)
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::marginBoxAscentForChild(RenderBox& child)
</span><span class="cx"> {
</span><del>- LayoutUnit ascent = child.firstLineBaseline().valueOr(crossAxisExtentForChild(child));
</del><ins>+ LayoutUnit ascent = child.firstLineBaseline().value_or(crossAxisExtentForChild(child));
</ins><span class="cx"> return ascent + flowAwareMarginBeforeForChild(child);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -869,12 +869,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const
</del><ins>+std::optional<LayoutUnit> RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(child.hasAspectRatio());
</span><span class="cx"> ASSERT(child.intrinsicSize().height() > 0);
</span><span class="cx">
</span><del>- Optional<LayoutUnit> crossSize;
</del><ins>+ std::optional<LayoutUnit> crossSize;
</ins><span class="cx"> if (crossSizeLength.isFixed())
</span><span class="cx"> crossSize = LayoutUnit(crossSizeLength.value());
</span><span class="cx"> else {
</span><span class="lines">@@ -900,13 +900,13 @@
</span><span class="cx"> Length crossMax = isHorizontalFlow() ? child.style().maxHeight() : child.style().maxWidth();
</span><span class="cx">
</span><span class="cx"> if (crossAxisLengthIsDefinite(child, crossMax)) {
</span><del>- Optional<LayoutUnit> maxValue = computeMainSizeFromAspectRatioUsing(child, crossMax);
</del><ins>+ std::optional<LayoutUnit> maxValue = computeMainSizeFromAspectRatioUsing(child, crossMax);
</ins><span class="cx"> if (maxValue)
</span><span class="cx"> childSize = std::min(maxValue.value(), childSize);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (crossAxisLengthIsDefinite(child, crossMin)) {
</span><del>- Optional<LayoutUnit> minValue = computeMainSizeFromAspectRatioUsing(child, crossMin);
</del><ins>+ std::optional<LayoutUnit> minValue = computeMainSizeFromAspectRatioUsing(child, crossMin);
</ins><span class="cx"> if (minValue)
</span><span class="cx"> childSize = std::max(minValue.value(), childSize);
</span><span class="cx"> }
</span><span class="lines">@@ -927,15 +927,15 @@
</span><span class="cx"> LayoutUnit RenderFlexibleBox::adjustChildSizeForMinAndMax(const RenderBox& child, LayoutUnit childSize)
</span><span class="cx"> {
</span><span class="cx"> Length max = isHorizontalFlow() ? child.style().maxWidth() : child.style().maxHeight();
</span><del>- Optional<LayoutUnit> maxExtent = Nullopt;
</del><ins>+ std::optional<LayoutUnit> maxExtent = std::nullopt;
</ins><span class="cx"> if (max.isSpecifiedOrIntrinsic()) {
</span><span class="cx"> maxExtent = computeMainAxisExtentForChild(child, MaxSize, max);
</span><del>- childSize = std::min(childSize, maxExtent.valueOr(childSize));
</del><ins>+ childSize = std::min(childSize, maxExtent.value_or(childSize));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Length min = isHorizontalFlow() ? child.style().minWidth() : child.style().minHeight();
</span><span class="cx"> if (min.isSpecifiedOrIntrinsic())
</span><del>- return std::max(childSize, computeMainAxisExtentForChild(child, MinSize, min).valueOr(childSize));
</del><ins>+ return std::max(childSize, computeMainAxisExtentForChild(child, MinSize, min).value_or(childSize));
</ins><span class="cx">
</span><span class="cx"> if (!isFlexibleBoxImpl() && min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE && !(isColumnFlow() && is<RenderFlexibleBox>(child))) {
</span><span class="cx"> // This is the implementation of CSS flexbox section 4.5 which defines the minimum size of "pure" flex
</span><span class="lines">@@ -947,17 +947,17 @@
</span><span class="cx"> ASSERT(contentSize >= 0);
</span><span class="cx"> if (child.hasAspectRatio() && child.intrinsicSize().height() > 0)
</span><span class="cx"> contentSize = adjustChildSizeForAspectRatioCrossAxisMinAndMax(child, contentSize);
</span><del>- contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
</del><ins>+ contentSize = std::min(contentSize, maxExtent.value_or(contentSize));
</ins><span class="cx">
</span><span class="cx"> Length mainSize = isHorizontalFlow() ? child.style().width() : child.style().height();
</span><span class="cx"> if (mainAxisLengthIsDefinite(child, mainSize)) {
</span><span class="cx"> LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize).value();
</span><span class="cx"> ASSERT(resolvedMainSize >= 0);
</span><del>- LayoutUnit specifiedSize = std::min(resolvedMainSize, maxExtent.valueOr(resolvedMainSize));
</del><ins>+ LayoutUnit specifiedSize = std::min(resolvedMainSize, maxExtent.value_or(resolvedMainSize));
</ins><span class="cx"> return std::max(childSize, std::min(specifiedSize, contentSize));
</span><span class="cx"> } else if (useChildAspectRatio(child)) {
</span><span class="cx"> Length crossSizeLength = isHorizontalFlow() ? child.style().height() : child.style().width();
</span><del>- Optional<LayoutUnit> transferredSize = computeMainSizeFromAspectRatioUsing(child, crossSizeLength);
</del><ins>+ std::optional<LayoutUnit> transferredSize = computeMainSizeFromAspectRatioUsing(child, crossSizeLength);
</ins><span class="cx"> if (transferredSize) {
</span><span class="cx"> transferredSize = adjustChildSizeForAspectRatioCrossAxisMinAndMax(child, transferredSize.value());
</span><span class="cx"> return std::max(childSize, std::min(transferredSize.value(), contentSize));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><span class="cx">
</span><span class="cx"> int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
</span><del>- Optional<int> firstLineBaseline() const override;
- Optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
+ std::optional<int> inlineBlockBaseline(LineDirectionMode) const override;
</ins><span class="cx">
</span><span class="cx"> void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> LayoutUnit mainAxisExtent() const;
</span><span class="cx"> LayoutUnit crossAxisContentExtent() const;
</span><span class="cx"> LayoutUnit mainAxisContentExtent(LayoutUnit contentLogicalHeight);
</span><del>- Optional<LayoutUnit> computeMainAxisExtentForChild(const RenderBox& child, SizeType, const Length& size);
</del><ins>+ std::optional<LayoutUnit> computeMainAxisExtentForChild(const RenderBox& child, SizeType, const Length& size);
</ins><span class="cx"> WritingMode transformedWritingMode() const;
</span><span class="cx"> LayoutUnit flowAwareBorderStart() const;
</span><span class="cx"> LayoutUnit flowAwareBorderEnd() const;
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> bool mainAxisLengthIsDefinite(const RenderBox&, const Length&) const;
</span><span class="cx"> bool crossAxisLengthIsDefinite(const RenderBox&, const Length&) const;
</span><span class="cx"> bool useChildAspectRatio(const RenderBox&) const;
</span><del>- Optional<LayoutUnit> computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const;
</del><ins>+ std::optional<LayoutUnit> computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const;
</ins><span class="cx">
</span><span class="cx"> virtual bool isFlexibleBoxImpl() const { return false; };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1087,7 +1087,7 @@
</span><span class="cx"> hasComputedAutoHeight = true;
</span><span class="cx">
</span><span class="cx"> // Compute the region height pretending that the offsetBreakInCurrentRegion is the logicalHeight for the auto-height region.
</span><del>- LayoutUnit regionComputedAutoHeight = namedFlowFragment.constrainContentBoxLogicalHeightByMinMax(offsetBreakInCurrentRegion, Nullopt);
</del><ins>+ LayoutUnit regionComputedAutoHeight = namedFlowFragment.constrainContentBoxLogicalHeightByMinMax(offsetBreakInCurrentRegion, std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // The new height of this region needs to be smaller than the initial value, the max height. A forced break is the only way to change the initial
</span><span class="cx"> // height of an auto-height region besides content ending.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> void setGrowthLimit(LayoutUnit growthLimit)
</span><span class="cx"> {
</span><del>- m_growthLimit = growthLimit == infinity ? growthLimit : std::min(growthLimit, m_growthLimitCap.valueOr(growthLimit));
</del><ins>+ m_growthLimit = growthLimit == infinity ? growthLimit : std::min(growthLimit, m_growthLimitCap.value_or(growthLimit));
</ins><span class="cx"> ensureGrowthLimitIsBiggerThanBaseSize();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,13 +140,13 @@
</span><span class="cx"> bool infinitelyGrowable() const { return m_infinitelyGrowable; }
</span><span class="cx"> void setInfinitelyGrowable(bool infinitelyGrowable) { m_infinitelyGrowable = infinitelyGrowable; }
</span><span class="cx">
</span><del>- void setGrowthLimitCap(Optional<LayoutUnit> growthLimitCap)
</del><ins>+ void setGrowthLimitCap(std::optional<LayoutUnit> growthLimitCap)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!growthLimitCap || growthLimitCap.value() >= 0);
</span><span class="cx"> m_growthLimitCap = growthLimitCap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<LayoutUnit> growthLimitCap() const { return m_growthLimitCap; }
</del><ins>+ std::optional<LayoutUnit> growthLimitCap() const { return m_growthLimitCap; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool growthLimitIsInfinite() const { return m_growthLimit == infinity; }
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> LayoutUnit m_growthLimit { 0 };
</span><span class="cx"> LayoutUnit m_plannedSize { 0 };
</span><span class="cx"> LayoutUnit m_tempSize { 0 };
</span><del>- Optional<LayoutUnit> m_growthLimitCap;
</del><ins>+ std::optional<LayoutUnit> m_growthLimitCap;
</ins><span class="cx"> bool m_infinitelyGrowable { false };
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -284,11 +284,11 @@
</span><span class="cx"> Vector<GridTrack*> growBeyondGrowthLimitsTracks;
</span><span class="cx"> Vector<GridItemWithSpan> itemsSortedByIncreasingSpan;
</span><span class="cx">
</span><del>- Optional<LayoutUnit> freeSpace(GridTrackSizingDirection direction) { return direction == ForColumns ? freeSpaceForColumns : freeSpaceForRows; }
- void setFreeSpace(GridTrackSizingDirection, Optional<LayoutUnit> freeSpace);
</del><ins>+ std::optional<LayoutUnit> freeSpace(GridTrackSizingDirection direction) { return direction == ForColumns ? freeSpaceForColumns : freeSpaceForRows; }
+ void setFreeSpace(GridTrackSizingDirection, std::optional<LayoutUnit> freeSpace);
</ins><span class="cx">
</span><del>- Optional<LayoutUnit> availableSpace() const { return m_availableSpace; }
- void setAvailableSpace(Optional<LayoutUnit> availableSpace) { m_availableSpace = availableSpace; }
</del><ins>+ std::optional<LayoutUnit> availableSpace() const { return m_availableSpace; }
+ void setAvailableSpace(std::optional<LayoutUnit> availableSpace) { m_availableSpace = availableSpace; }
</ins><span class="cx">
</span><span class="cx"> SizingOperation sizingOperation { TrackSizing };
</span><span class="cx">
</span><span class="lines">@@ -328,14 +328,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<LayoutUnit> freeSpaceForColumns;
- Optional<LayoutUnit> freeSpaceForRows;
</del><ins>+ std::optional<LayoutUnit> freeSpaceForColumns;
+ std::optional<LayoutUnit> freeSpaceForRows;
</ins><span class="cx"> // No need to store one per direction as it will be only used for computations during each axis
</span><span class="cx"> // track sizing. It's cached here because we need it to compute relative sizes.
</span><del>- Optional<LayoutUnit> m_availableSpace;
</del><ins>+ std::optional<LayoutUnit> m_availableSpace;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void RenderGrid::GridSizingData::setFreeSpace(GridTrackSizingDirection direction, Optional<LayoutUnit> freeSpace)
</del><ins>+void RenderGrid::GridSizingData::setFreeSpace(GridTrackSizingDirection direction, std::optional<LayoutUnit> freeSpace)
</ins><span class="cx"> {
</span><span class="cx"> if (direction == ForColumns)
</span><span class="cx"> freeSpaceForColumns = freeSpace;
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: We should use RenderBlock::hasDefiniteLogicalHeight() but it does not work for positioned stuff.
</span><span class="cx"> // FIXME: Consider caching the hasDefiniteLogicalHeight value throughout the layout.
</span><del>- bool hasDefiniteLogicalHeight = hasOverrideLogicalContentHeight() || computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);
</del><ins>+ bool hasDefiniteLogicalHeight = hasOverrideLogicalContentHeight() || computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), std::nullopt);
</ins><span class="cx"> if (!hasDefiniteLogicalHeight)
</span><span class="cx"> computeIntrinsicLogicalHeight(sizingData);
</span><span class="cx"> else
</span><span class="lines">@@ -666,8 +666,8 @@
</span><span class="cx"> const_cast<RenderGrid*>(this)->placeItemsOnGrid(IntrinsicSizeComputation);
</span><span class="cx">
</span><span class="cx"> GridSizingData sizingData(numTracks(ForColumns), numTracks(ForRows));
</span><del>- sizingData.setAvailableSpace(Nullopt);
- sizingData.setFreeSpace(ForColumns, Nullopt);
</del><ins>+ sizingData.setAvailableSpace(std::nullopt);
+ sizingData.setFreeSpace(ForColumns, std::nullopt);
</ins><span class="cx"> sizingData.sizingOperation = IntrinsicSizeComputation;
</span><span class="cx"> computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
</span><span class="cx">
</span><span class="lines">@@ -686,8 +686,8 @@
</span><span class="cx"> void RenderGrid::computeIntrinsicLogicalHeight(GridSizingData& sizingData)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(sizingData.isValidTransition(ForRows));
</span><del>- sizingData.setAvailableSpace(Nullopt);
- sizingData.setFreeSpace(ForRows, Nullopt);
</del><ins>+ sizingData.setAvailableSpace(std::nullopt);
+ sizingData.setFreeSpace(ForRows, std::nullopt);
</ins><span class="cx"> sizingData.sizingOperation = IntrinsicSizeComputation;
</span><span class="cx"> LayoutUnit minHeight, maxHeight;
</span><span class="cx"> computeUsedBreadthOfGridTracks(ForRows, sizingData, minHeight, maxHeight);
</span><span class="lines">@@ -710,10 +710,10 @@
</span><span class="cx"> sizingData.sizingOperation = TrackSizing;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<LayoutUnit> RenderGrid::computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, Optional<LayoutUnit> intrinsicLogicalHeight, LayoutUnit borderAndPadding) const
</del><ins>+std::optional<LayoutUnit> RenderGrid::computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, std::optional<LayoutUnit> intrinsicLogicalHeight, LayoutUnit borderAndPadding) const
</ins><span class="cx"> {
</span><span class="cx"> if (!intrinsicLogicalHeight)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> if (logicalHeightLength.isMinContent())
</span><span class="cx"> return m_minContentHeight;
</span><span class="lines">@@ -723,13 +723,13 @@
</span><span class="cx">
</span><span class="cx"> if (logicalHeightLength.isFitContent()) {
</span><span class="cx"> LayoutUnit fillAvailableExtent = containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding);
</span><del>- return std::min(m_maxContentHeight.valueOr(0), std::max(m_minContentHeight.valueOr(0), fillAvailableExtent));
</del><ins>+ return std::min(m_maxContentHeight.value_or(0), std::max(m_minContentHeight.value_or(0), fillAvailableExtent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (logicalHeightLength.isFillAvailable())
</span><span class="cx"> return containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding) - borderAndPadding;
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline double normalizedFlexFraction(const GridTrack& track, double flexFactor)
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::computeUsedBreadthOfGridTracks(GridTrackSizingDirection direction, GridSizingData& sizingData, LayoutUnit& baseSizesWithoutMaximization, LayoutUnit& growthLimitsWithoutMaximization) const
</span><span class="cx"> {
</span><del>- const Optional<LayoutUnit> initialFreeSpace = sizingData.freeSpace(direction);
</del><ins>+ const std::optional<LayoutUnit> initialFreeSpace = sizingData.freeSpace(direction);
</ins><span class="cx"> Vector<GridTrack>& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
</span><span class="cx"> Vector<unsigned> flexibleSizedTracksIndex;
</span><span class="cx"> sizingData.contentSizedTracksIndex.shrink(0);
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx">
</span><span class="cx"> // Grid gutters were removed from freeSpace by the caller (if freeSpace is definite),
</span><span class="cx"> // but we must use them to compute relative (i.e. percentages) sizes.
</span><del>- LayoutUnit maxSize = std::max(LayoutUnit(), sizingData.availableSpace().valueOr(LayoutUnit()));
</del><ins>+ LayoutUnit maxSize = std::max(LayoutUnit(), sizingData.availableSpace().value_or(LayoutUnit()));
</ins><span class="cx"> const bool hasDefiniteFreeSpace = sizingData.sizingOperation == TrackSizing;
</span><span class="cx">
</span><span class="cx"> // 1. Initialize per Grid track variables.
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> growthLimitsWithoutMaximization += track.growthLimit();
</span><span class="cx"> // The growth limit caps must be cleared now in order to properly sort tracks by growth
</span><span class="cx"> // potential on an eventual "Maximize Tracks".
</span><del>- track.setGrowthLimitCap(Nullopt);
</del><ins>+ track.setGrowthLimitCap(std::nullopt);
</ins><span class="cx"> }
</span><span class="cx"> LayoutUnit freeSpace = initialFreeSpace ? initialFreeSpace.value() - baseSizesWithoutMaximization : LayoutUnit(0);
</span><span class="cx">
</span><span class="lines">@@ -973,12 +973,12 @@
</span><span class="cx"> return direction == ForColumns ? child.hasOverrideContainingBlockLogicalWidth() : child.hasOverrideContainingBlockLogicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<LayoutUnit> overrideContainingBlockContentSizeForChild(const RenderBox& child, GridTrackSizingDirection direction)
</del><ins>+static std::optional<LayoutUnit> overrideContainingBlockContentSizeForChild(const RenderBox& child, GridTrackSizingDirection direction)
</ins><span class="cx"> {
</span><span class="cx"> return direction == ForColumns ? child.overrideContainingBlockContentLogicalWidth() : child.overrideContainingBlockContentLogicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setOverrideContainingBlockContentSizeForChild(RenderBox& child, GridTrackSizingDirection direction, Optional<LayoutUnit> size)
</del><ins>+static void setOverrideContainingBlockContentSizeForChild(RenderBox& child, GridTrackSizingDirection direction, std::optional<LayoutUnit> size)
</ins><span class="cx"> {
</span><span class="cx"> if (direction == ForColumns)
</span><span class="cx"> child.setOverrideContainingBlockContentLogicalWidth(size);
</span><span class="lines">@@ -1080,7 +1080,7 @@
</span><span class="cx"> // If |child| has a relative logical height, we shouldn't let it override its intrinsic height, which is
</span><span class="cx"> // what we are interested in here. Thus we need to set the block-axis override size to -1 (no possible resolution).
</span><span class="cx"> if (shouldClearOverrideContainingBlockContentSizeForChild(child, ForRows)) {
</span><del>- setOverrideContainingBlockContentSizeForChild(child, childBlockDirection, Nullopt);
</del><ins>+ setOverrideContainingBlockContentSizeForChild(child, childBlockDirection, std::nullopt);
</ins><span class="cx"> child.setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1104,13 +1104,13 @@
</span><span class="cx"> bool overrideSizeHasChanged = updateOverrideContainingBlockContentSizeForChild(child, childInlineDirection, sizingData);
</span><span class="cx"> if (isRowAxis) {
</span><span class="cx"> LayoutUnit marginLogicalWidth = sizingData.sizingOperation == TrackSizing ? computeMarginLogicalSizeForChild(childInlineDirection, child) : marginIntrinsicLogicalWidthForChild(child);
</span><del>- return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, overrideContainingBlockContentSizeForChild(child, childInlineDirection).valueOr(0), *this, nullptr) + marginLogicalWidth;
</del><ins>+ return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, overrideContainingBlockContentSizeForChild(child, childInlineDirection).value_or(0), *this, nullptr) + marginLogicalWidth;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (overrideSizeHasChanged && (direction != ForColumns || sizingData.sizingOperation != IntrinsicSizeComputation))
</span><span class="cx"> child.setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> child.layoutIfNeeded();
</span><del>- return child.computeLogicalHeightUsing(MinSize, childMinSize, Nullopt).valueOr(0) + child.marginLogicalHeight() + child.scrollbarLogicalHeight();
</del><ins>+ return child.computeLogicalHeightUsing(MinSize, childMinSize, std::nullopt).value_or(0) + child.marginLogicalHeight() + child.scrollbarLogicalHeight();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderGrid::updateOverrideContainingBlockContentSizeForChild(RenderBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData) const
</span><span class="lines">@@ -1128,9 +1128,9 @@
</span><span class="cx"> GridTrackSizingDirection childInlineDirection = flowAwareDirectionForChild(child, ForColumns);
</span><span class="cx"> if (direction == childInlineDirection) {
</span><span class="cx"> // If |child| has a relative logical width, we shouldn't let it override its intrinsic width, which is
</span><del>- // what we are interested in here. Thus we need to set the override logical width to Nullopt (no possible resolution).
</del><ins>+ // what we are interested in here. Thus we need to set the override logical width to std::nullopt (no possible resolution).
</ins><span class="cx"> if (shouldClearOverrideContainingBlockContentSizeForChild(child, ForColumns))
</span><del>- setOverrideContainingBlockContentSizeForChild(child, childInlineDirection, Nullopt);
</del><ins>+ setOverrideContainingBlockContentSizeForChild(child, childInlineDirection, std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // FIXME: It's unclear if we should return the intrinsic width or the preferred width.
</span><span class="cx"> // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
</span><span class="lines">@@ -1158,7 +1158,7 @@
</span><span class="cx"> // If |child| has a relative logical width, we shouldn't let it override its intrinsic width, which is
</span><span class="cx"> // what we are interested in here. Thus we need to set the inline-axis override size to -1 (no possible resolution).
</span><span class="cx"> if (shouldClearOverrideContainingBlockContentSizeForChild(child, ForColumns))
</span><del>- setOverrideContainingBlockContentSizeForChild(child, childInlineDirection, Nullopt);
</del><ins>+ setOverrideContainingBlockContentSizeForChild(child, childInlineDirection, std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // FIXME: It's unclear if we should return the intrinsic width or the preferred width.
</span><span class="cx"> // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
</span><span class="lines">@@ -1274,7 +1274,7 @@
</span><span class="cx"> } else if (trackSize.hasMaxContentOrAutoMaxTrackBreadth()) {
</span><span class="cx"> LayoutUnit growthLimit = maxContentForChild(gridItem, direction, sizingData);
</span><span class="cx"> if (trackSize.isFitContent())
</span><del>- growthLimit = std::min(growthLimit, valueForLength(trackSize.fitContentTrackBreadth().length(), sizingData.availableSpace().valueOr(0)));
</del><ins>+ growthLimit = std::min(growthLimit, valueForLength(trackSize.fitContentTrackBreadth().length(), sizingData.availableSpace().value_or(0)));
</ins><span class="cx"> track.setGrowthLimit(std::max(track.growthLimit(), growthLimit));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1462,8 +1462,8 @@
</span><span class="cx"> if (track1HasInfiniteGrowthPotentialWithoutCap || track2HasInfiniteGrowthPotentialWithoutCap)
</span><span class="cx"> return track2HasInfiniteGrowthPotentialWithoutCap;
</span><span class="cx">
</span><del>- LayoutUnit track1Limit = track1->growthLimitCap().valueOr(track1->growthLimit());
- LayoutUnit track2Limit = track2->growthLimitCap().valueOr(track2->growthLimit());
</del><ins>+ LayoutUnit track1Limit = track1->growthLimitCap().value_or(track1->growthLimit());
+ LayoutUnit track2Limit = track2->growthLimitCap().value_or(track2->growthLimit());
</ins><span class="cx"> return (track1Limit - track1->baseSize()) < (track2Limit - track2->baseSize());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1532,7 +1532,7 @@
</span><span class="cx"> bool RenderGrid::tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection direction, GridSizingData& sizingData)
</span><span class="cx"> {
</span><span class="cx"> const Vector<GridTrack>& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
</span><del>- const LayoutUnit maxSize = sizingData.availableSpace().valueOr(0);
</del><ins>+ const LayoutUnit maxSize = sizingData.availableSpace().value_or(0);
</ins><span class="cx"> for (unsigned i = 0; i < tracks.size(); ++i) {
</span><span class="cx"> const GridTrackSize& trackSize = gridTrackSize(direction, i, sizingData.sizingOperation);
</span><span class="cx"> if (computeUsedBreadthOfMinLength(trackSize, maxSize) > tracks[i].baseSize())
</span><span class="lines">@@ -1551,19 +1551,19 @@
</span><span class="cx"> if (!autoRepeatTrackListLength)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Optional<LayoutUnit> availableSize;
</del><ins>+ std::optional<LayoutUnit> availableSize;
</ins><span class="cx"> if (isRowAxis) {
</span><span class="cx"> if (sizingOperation != IntrinsicSizeComputation)
</span><span class="cx"> availableSize = availableLogicalWidth();
</span><span class="cx"> } else {
</span><del>- availableSize = computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);
</del><ins>+ availableSize = computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), std::nullopt);
</ins><span class="cx"> if (!availableSize) {
</span><span class="cx"> const Length& maxLength = style().logicalMaxHeight();
</span><span class="cx"> if (!maxLength.isUndefined())
</span><del>- availableSize = computeContentLogicalHeight(MaxSize, maxLength, Nullopt);
</del><ins>+ availableSize = computeContentLogicalHeight(MaxSize, maxLength, std::nullopt);
</ins><span class="cx"> }
</span><span class="cx"> if (availableSize)
</span><del>- availableSize = constrainContentBoxLogicalHeightByMinMax(availableSize.value(), Nullopt);
</del><ins>+ availableSize = constrainContentBoxLogicalHeightByMinMax(availableSize.value(), std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool needsToFulfillMinimumSize = false;
</span><span class="lines">@@ -1926,7 +1926,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection direction, GridSizingData& sizingData)
</span><span class="cx"> {
</span><del>- Optional<LayoutUnit> freeSpace = sizingData.freeSpace(direction);
</del><ins>+ std::optional<LayoutUnit> freeSpace = sizingData.freeSpace(direction);
</ins><span class="cx"> if (!freeSpace
</span><span class="cx"> || freeSpace.value() <= 0
</span><span class="cx"> || (direction == ForColumns && style().resolvedJustifyContentDistribution(contentAlignmentNormalBehaviorGrid()) != ContentDistributionStretch)
</span><span class="lines">@@ -1951,7 +1951,7 @@
</span><span class="cx"> auto& track = tracks[trackIndex];
</span><span class="cx"> track.setBaseSize(track.baseSize() + sizeToIncrease);
</span><span class="cx"> }
</span><del>- sizingData.setFreeSpace(direction, Optional<LayoutUnit>(0));
</del><ins>+ sizingData.setFreeSpace(direction, std::optional<LayoutUnit>(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderGrid::layoutGridItems(GridSizingData& sizingData)
</span><span class="lines">@@ -1968,8 +1968,8 @@
</span><span class="cx">
</span><span class="cx"> // Because the grid area cannot be styled, we don't need to adjust
</span><span class="cx"> // the grid breadth to account for 'box-sizing'.
</span><del>- Optional<LayoutUnit> oldOverrideContainingBlockContentLogicalWidth = child->hasOverrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogicalWidth() : LayoutUnit();
- Optional<LayoutUnit> oldOverrideContainingBlockContentLogicalHeight = child->hasOverrideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogicalHeight() : LayoutUnit();
</del><ins>+ std::optional<LayoutUnit> oldOverrideContainingBlockContentLogicalWidth = child->hasOverrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogicalWidth() : LayoutUnit();
+ std::optional<LayoutUnit> oldOverrideContainingBlockContentLogicalHeight = child->hasOverrideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogicalHeight() : LayoutUnit();
</ins><span class="cx">
</span><span class="cx"> LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChildIncludingAlignmentOffsets(*child, ForColumns, sizingData);
</span><span class="cx"> LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadthForChildIncludingAlignmentOffsets(*child, ForRows, sizingData);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> bool isRenderGrid() const override { return true; }
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span><span class="cx">
</span><del>- Optional<LayoutUnit> computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, Optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const override;
</del><ins>+ std::optional<LayoutUnit> computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, std::optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const override;
</ins><span class="cx">
</span><span class="cx"> class GridIterator;
</span><span class="cx"> class GridSizingData;
</span><span class="lines">@@ -228,8 +228,8 @@
</span><span class="cx"> HashMap<const RenderBox*, GridArea> m_gridItemArea;
</span><span class="cx"> OrderIterator m_orderIterator;
</span><span class="cx">
</span><del>- Optional<LayoutUnit> m_minContentHeight;
- Optional<LayoutUnit> m_maxContentHeight;
</del><ins>+ std::optional<LayoutUnit> m_minContentHeight;
+ std::optional<LayoutUnit> m_maxContentHeight;
</ins><span class="cx">
</span><span class="cx"> int m_smallestColumnStart;
</span><span class="cx"> int m_smallestRowStart;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -4466,7 +4466,7 @@
</span><span class="cx">
</span><span class="cx"> // Now do a paint with the root layer shifted to be us.
</span><span class="cx"> LayoutSize adjustedSubpixelOffset = offsetForThisLayer - LayoutSize(devicePixelSnappedOffsetForThisLayer);
</span><del>- LayerPaintingInfo transformedPaintingInfo(this, LayoutRect(encloseRectToDevicePixels(transform.inverse().valueOr(AffineTransform()).mapRect(paintingInfo.paintDirtyRect), deviceScaleFactor)),
</del><ins>+ LayerPaintingInfo transformedPaintingInfo(this, LayoutRect(encloseRectToDevicePixels(transform.inverse().value_or(AffineTransform()).mapRect(paintingInfo.paintDirtyRect), deviceScaleFactor)),
</ins><span class="cx"> paintingInfo.paintBehavior, adjustedSubpixelOffset, paintingInfo.subtreePaintRoot, paintingInfo.overlapTestRequests);
</span><span class="cx"> paintLayerContentsAndReflection(context, transformedPaintingInfo, paintFlags);
</span><span class="cx"> context.setCTM(oldTransfrom);
</span><span class="lines">@@ -5100,7 +5100,7 @@
</span><span class="cx">
</span><span class="cx"> // Check for hit test on backface if backface-visibility is 'hidden'
</span><span class="cx"> if (localTransformState && renderer().style().backfaceVisibility() == BackfaceVisibilityHidden) {
</span><del>- Optional<TransformationMatrix> invertedMatrix = localTransformState->m_accumulatedTransform.inverse();
</del><ins>+ std::optional<TransformationMatrix> invertedMatrix = localTransformState->m_accumulatedTransform.inverse();
</ins><span class="cx"> // If the z-vector of the matrix is negative, the back is facing towards the viewer.
</span><span class="cx"> if (invertedMatrix && invertedMatrix.value().m33() < 0)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -790,9 +790,9 @@
</span><span class="cx"> return m_fromAncestorGraphicsLayer.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<LayoutSize> m_fromAncestorGraphicsLayer;
- Optional<LayoutSize> m_fromParentGraphicsLayer;
- Optional<LayoutSize> m_fromPrimaryGraphicsLayer;
</del><ins>+ std::optional<LayoutSize> m_fromAncestorGraphicsLayer;
+ std::optional<LayoutSize> m_fromParentGraphicsLayer;
+ std::optional<LayoutSize> m_fromPrimaryGraphicsLayer;
</ins><span class="cx">
</span><span class="cx"> const RenderLayer& m_renderLayer;
</span><span class="cx"> // Location is relative to the renderer.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> void RenderListBox::paintItem(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintFunction paintFunction)
</span><span class="cx"> {
</span><span class="cx"> int listItemsSize = numItems();
</span><del>- int firstVisibleItem = m_indexOfFirstVisibleItemInsidePaddingTopArea.valueOr(m_indexOffset);
</del><ins>+ int firstVisibleItem = m_indexOfFirstVisibleItemInsidePaddingTopArea.value_or(m_indexOffset);
</ins><span class="cx"> int endIndex = firstVisibleItem + numVisibleItems(ConsiderPadding::Yes);
</span><span class="cx"> for (int i = firstVisibleItem; i < listItemsSize && i < endIndex; ++i)
</span><span class="cx"> paintFunction(paintInfo, paintOffset, i);
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderListBox::listIndexIsVisible(int index)
</span><span class="cx"> {
</span><del>- int firstIndex = m_indexOfFirstVisibleItemInsidePaddingTopArea.valueOr(m_indexOffset);
</del><ins>+ int firstIndex = m_indexOfFirstVisibleItemInsidePaddingTopArea.value_or(m_indexOffset);
</ins><span class="cx"> int endIndex = m_indexOfFirstVisibleItemInsidePaddingBottomArea
</span><span class="cx"> ? m_indexOfFirstVisibleItemInsidePaddingBottomArea.value() + numberOfVisibleItemsInPaddingBottom()
</span><span class="cx"> : m_indexOffset + numVisibleItems();
</span><span class="lines">@@ -669,8 +669,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderListBox::computeFirstIndexesVisibleInPaddingTopBottomAreas()
</span><span class="cx"> {
</span><del>- m_indexOfFirstVisibleItemInsidePaddingTopArea = Nullopt;
- m_indexOfFirstVisibleItemInsidePaddingBottomArea = Nullopt;
</del><ins>+ m_indexOfFirstVisibleItemInsidePaddingTopArea = std::nullopt;
+ m_indexOfFirstVisibleItemInsidePaddingBottomArea = std::nullopt;
</ins><span class="cx">
</span><span class="cx"> int maximumNumberOfItemsThatFitInPaddingTopArea = paddingTop() / itemHeight();
</span><span class="cx"> if (maximumNumberOfItemsThatFitInPaddingTopArea) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -175,8 +175,8 @@
</span><span class="cx"> int m_optionsWidth;
</span><span class="cx"> int m_indexOffset;
</span><span class="cx">
</span><del>- Optional<int> m_indexOfFirstVisibleItemInsidePaddingTopArea;
- Optional<int> m_indexOfFirstVisibleItemInsidePaddingBottomArea;
</del><ins>+ std::optional<int> m_indexOfFirstVisibleItemInsidePaddingTopArea;
+ std::optional<int> m_indexOfFirstVisibleItemInsidePaddingBottomArea;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Scrollbar> m_vBar;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> {
</span><span class="cx"> return RenderBlock::baselinePosition(baseline, firstLine, direction, position);
</span><span class="cx"> }
</span><del>- Optional<int> firstLineBaseline() const override { return RenderBlock::firstLineBaseline(); }
- Optional<int> inlineBlockBaseline(LineDirectionMode direction) const override { return RenderBlock::inlineBlockBaseline(direction); }
</del><ins>+ std::optional<int> firstLineBaseline() const override { return RenderBlock::firstLineBaseline(); }
+ std::optional<int> inlineBlockBaseline(LineDirectionMode direction) const override { return RenderBlock::inlineBlockBaseline(direction); }
</ins><span class="cx">
</span><span class="cx"> void getItemBackgroundColor(unsigned listIndex, Color&, bool& itemHasCustomBackgroundColor) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> LayoutUnit availableHeight = multiColumnFlowThread()->columnHeightAvailable();
</span><span class="cx"> LayoutUnit maxColumnHeight = availableHeight ? availableHeight : RenderFlowThread::maxLogicalHeight();
</span><span class="cx"> if (!multicolStyle.logicalMaxHeight().isUndefined())
</span><del>- maxColumnHeight = std::min(maxColumnHeight, multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), Nullopt).valueOr(maxColumnHeight));
</del><ins>+ maxColumnHeight = std::min(maxColumnHeight, multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), std::nullopt).value_or(maxColumnHeight));
</ins><span class="cx"> return heightAdjustedForSetOffset(maxColumnHeight);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -373,9 +373,9 @@
</span><span class="cx"> }
</span><span class="cx"> return styleLogicalHeight.value() - borders;
</span><span class="cx"> } else if (styleLogicalHeight.isPercentOrCalculated())
</span><del>- return computePercentageLogicalHeight(styleLogicalHeight).valueOr(0);
</del><ins>+ return computePercentageLogicalHeight(styleLogicalHeight).value_or(0);
</ins><span class="cx"> else if (styleLogicalHeight.isIntrinsic())
</span><del>- return computeIntrinsicLogicalContentHeightUsing(styleLogicalHeight, logicalHeight() - borderAndPadding, borderAndPadding).valueOr(0);
</del><ins>+ return computeIntrinsicLogicalContentHeightUsing(styleLogicalHeight, logicalHeight() - borderAndPadding, borderAndPadding).value_or(0);
</ins><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return LayoutUnit();
</span><span class="lines">@@ -1468,18 +1468,18 @@
</span><span class="cx">
</span><span class="cx"> int RenderTable::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
</span><span class="cx"> {
</span><del>- return firstLineBaseline().valueOrCompute([&] {
</del><ins>+ return valueOrCompute(firstLineBaseline(), [&] {
</ins><span class="cx"> return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderTable::inlineBlockBaseline(LineDirectionMode) const
</del><ins>+std::optional<int> RenderTable::inlineBlockBaseline(LineDirectionMode) const
</ins><span class="cx"> {
</span><span class="cx"> // Tables are skipped when computing an inline-block's baseline.
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderTable::firstLineBaseline() const
</del><ins>+std::optional<int> RenderTable::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> // The baseline of a 'table' is the same as the 'inline-table' baseline per CSS 3 Flexbox (CSS 2.1
</span><span class="cx"> // doesn't define the baseline of a 'table' only an 'inline-table').
</span><span class="lines">@@ -1486,19 +1486,19 @@
</span><span class="cx"> // This is also needed to properly determine the baseline of a cell if it has a table child.
</span><span class="cx">
</span><span class="cx"> if (isWritingModeRoot())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> recalcSectionsIfNeeded();
</span><span class="cx">
</span><span class="cx"> const RenderTableSection* topNonEmptySection = this->topNonEmptySection();
</span><span class="cx"> if (!topNonEmptySection)
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><del>- if (Optional<int> baseline = topNonEmptySection->firstLineBaseline())
- return Optional<int>(topNonEmptySection->logicalTop() + baseline.value());
</del><ins>+ if (std::optional<int> baseline = topNonEmptySection->firstLineBaseline())
+ return std::optional<int>(topNonEmptySection->logicalTop() + baseline.value());
</ins><span class="cx">
</span><span class="cx"> // FIXME: A table row always has a baseline per CSS 2.1. Will this return the right value?
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderTable::overflowClipRect(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy, PaintPhase phase)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -291,8 +291,8 @@
</span><span class="cx"> bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
</span><span class="cx">
</span><span class="cx"> int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
</span><del>- Optional<int> firstLineBaseline() const override;
- Optional<int> inlineBlockBaseline(LineDirectionMode) const final;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
+ std::optional<int> inlineBlockBaseline(LineDirectionMode) const final;
</ins><span class="cx">
</span><span class="cx"> RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> // <http://www.w3.org/TR/2007/CR-CSS21-20070719/tables.html#height-layout>: The baseline of a cell is the baseline of
</span><span class="cx"> // the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first. If there
</span><span class="cx"> // is no such line box or table-row, the baseline is the bottom of content edge of the cell box.
</span><del>- return firstLineBaseline().valueOr(borderAndPaddingBefore() + contentLogicalHeight());
</del><ins>+ return firstLineBaseline().value_or(borderAndPaddingBefore() + contentLogicalHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void markCellDirtyWhenCollapsedBorderChanges(RenderTableCell* cell)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -917,16 +917,16 @@
</span><span class="cx"> m_outerBorderEnd = calcOuterBorderEnd();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderTableSection::firstLineBaseline() const
</del><ins>+std::optional<int> RenderTableSection::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_grid.size())
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><span class="cx"> int firstLineBaseline = m_grid[0].baseline;
</span><span class="cx"> if (firstLineBaseline)
</span><span class="cx"> return firstLineBaseline + roundToInt(m_rowPos[0]);
</span><span class="cx">
</span><del>- Optional<int> result;
</del><ins>+ std::optional<int> result;
</ins><span class="cx"> const Row& firstRow = m_grid[0].row;
</span><span class="cx"> for (size_t i = 0; i < firstRow.size(); ++i) {
</span><span class="cx"> const CellStruct& cs = firstRow.at(i);
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> // Only cells with content have a baseline
</span><span class="cx"> if (cell && cell->contentLogicalHeight()) {
</span><span class="cx"> int candidate = roundToInt(cell->logicalTop() + cell->borderAndPaddingBefore() + cell->contentLogicalHeight());
</span><del>- result = std::max(result.valueOr(candidate), candidate);
</del><ins>+ result = std::max(result.value_or(candidate), candidate);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTableSection.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><span class="cx">
</span><del>- Optional<int> firstLineBaseline() const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
</ins><span class="cx">
</span><span class="cx"> void addCell(RenderTableCell*, RenderTableRow* row);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> bool isSpace = false;
</span><span class="cx"> bool firstWord = true;
</span><span class="cx"> bool firstLine = true;
</span><del>- Optional<unsigned> nextBreakable;
</del><ins>+ std::optional<unsigned> nextBreakable;
</ins><span class="cx"> unsigned lastWordBoundary = 0;
</span><span class="cx">
</span><span class="cx"> // Non-zero only when kerning is enabled, in which case we measure words with their trailing
</span><span class="lines">@@ -822,7 +822,7 @@
</span><span class="cx"> minimumSuffixLength = after < 0 ? 2 : after;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<int> firstGlyphLeftOverflow;
</del><ins>+ std::optional<int> firstGlyphLeftOverflow;
</ins><span class="cx">
</span><span class="cx"> bool breakNBSP = style.autoWrap() && style.nbspMode() == SPACE;
</span><span class="cx">
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> float currMinWidth = 0;
</span><span class="cx"> bool isSpace = (j < len) && isSpaceAccordingToStyle(c, style);
</span><span class="cx"> float w;
</span><del>- Optional<float> wordTrailingSpaceWidth;
</del><ins>+ std::optional<float> wordTrailingSpaceWidth;
</ins><span class="cx"> if (isSpace)
</span><span class="cx"> wordTrailingSpaceWidth = wordTrailingSpace.width(fallbackFonts);
</span><span class="cx"> if (wordTrailingSpaceWidth)
</span><span class="lines">@@ -915,7 +915,7 @@
</span><span class="cx">
</span><span class="cx"> if (suffixStart) {
</span><span class="cx"> float suffixWidth;
</span><del>- Optional<float> wordTrailingSpaceWidth;
</del><ins>+ std::optional<float> wordTrailingSpaceWidth;
</ins><span class="cx"> if (isSpace)
</span><span class="cx"> wordTrailingSpaceWidth = wordTrailingSpace.width(fallbackFonts);
</span><span class="cx"> if (wordTrailingSpaceWidth)
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- glyphOverflow.left = firstGlyphLeftOverflow.valueOr(glyphOverflow.left);
</del><ins>+ glyphOverflow.left = firstGlyphLeftOverflow.value_or(glyphOverflow.left);
</ins><span class="cx">
</span><span class="cx"> if ((needsWordSpacing && len > 1) || (ignoringSpaces && !firstWord))
</span><span class="cx"> currMaxWidth += wordSpacing;
</span><span class="lines">@@ -1676,9 +1676,9 @@
</span><span class="cx"> secureTextTimer->restart(offsetAfterLastTypedCharacter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StringView RenderText::stringView(unsigned start, Optional<unsigned> stop) const
</del><ins>+StringView RenderText::stringView(unsigned start, std::optional<unsigned> stop) const
</ins><span class="cx"> {
</span><del>- unsigned destination = stop.valueOr(textLength());
</del><ins>+ unsigned destination = stop.value_or(textLength());
</ins><span class="cx"> ASSERT(start <= length());
</span><span class="cx"> ASSERT(destination <= length());
</span><span class="cx"> ASSERT(start <= destination);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderText.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> void deleteLineBoxesBeforeSimpleLineLayout();
</span><span class="cx"> const SimpleLineLayout::Layout* simpleLineLayout() const;
</span><span class="cx">
</span><del>- StringView stringView(unsigned start = 0, Optional<unsigned> stop = Nullopt) const;
</del><ins>+ StringView stringView(unsigned start = 0, std::optional<unsigned> stop = std::nullopt) const;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit topOfFirstText() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> {
</span><span class="cx"> return RenderBlock::baselinePosition(baseline, firstLine, direction, position);
</span><span class="cx"> }
</span><del>- Optional<int> firstLineBaseline() const override { return RenderBlock::firstLineBaseline(); }
- Optional<int> inlineBlockBaseline(LineDirectionMode direction) const override { return RenderBlock::inlineBlockBaseline(direction); }
</del><ins>+ std::optional<int> firstLineBaseline() const override { return RenderBlock::firstLineBaseline(); }
+ std::optional<int> inlineBlockBaseline(LineDirectionMode direction) const override { return RenderBlock::inlineBlockBaseline(direction); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isFlexibleBoxImpl() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::setSelection(RenderObject* start, Optional<unsigned> startPos, RenderObject* end, Optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode)
</del><ins>+void RenderView::setSelection(RenderObject* start, std::optional<unsigned> startPos, RenderObject* end, std::optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode)
</ins><span class="cx"> {
</span><span class="cx"> // Make sure both our start and end objects are defined.
</span><span class="cx"> // Check www.msnbc.com and try clicking around to find the case where this happened.
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx"> splitSelectionBetweenSubtrees(start, startPos, end, endPos, blockRepaintMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::splitSelectionBetweenSubtrees(const RenderObject* start, Optional<unsigned> startPos, const RenderObject* end, Optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode)
</del><ins>+void RenderView::splitSelectionBetweenSubtrees(const RenderObject* start, std::optional<unsigned> startPos, const RenderObject* end, std::optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode)
</ins><span class="cx"> {
</span><span class="cx"> // Compute the visible selection end points for each of the subtrees.
</span><span class="cx"> RenderSubtreesMap renderSubtreesMap;
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> SelectionSubtreeData selectionData = renderSubtreesMap.get(&root);
</span><span class="cx"> if (selectionData.selectionClear()) {
</span><span class="cx"> selectionData.setSelectionStart(node->renderer());
</span><del>- selectionData.setSelectionStartPos(node == startNode ? startPos : Optional<unsigned>(0));
</del><ins>+ selectionData.setSelectionStartPos(node == startNode ? startPos : std::optional<unsigned>(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> selectionData.setSelectionEnd(node->renderer());
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> selectedBlockInfo.value->repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::getSelection(RenderObject*& startRenderer, Optional<unsigned>& startOffset, RenderObject*& endRenderer, Optional<unsigned>& endOffset) const
</del><ins>+void RenderView::getSelection(RenderObject*& startRenderer, std::optional<unsigned>& startOffset, RenderObject*& endRenderer, std::optional<unsigned>& endOffset) const
</ins><span class="cx"> {
</span><span class="cx"> startRenderer = m_selectionUnsplitStart;
</span><span class="cx"> startOffset = m_selectionUnsplitStartPos;
</span><span class="lines">@@ -1113,7 +1113,7 @@
</span><span class="cx"> void RenderView::clearSelection()
</span><span class="cx"> {
</span><span class="cx"> layer()->repaintBlockSelectionGaps();
</span><del>- setSelection(nullptr, Nullopt, nullptr, Nullopt, RepaintNewMinusOld);
</del><ins>+ setSelection(nullptr, std::nullopt, nullptr, std::nullopt, RepaintNewMinusOld);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderView::printing() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/RenderView.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> void paintBoxDecorations(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx">
</span><span class="cx"> enum SelectionRepaintMode { RepaintNewXOROld, RepaintNewMinusOld, RepaintNothing };
</span><del>- void setSelection(RenderObject* start, Optional<unsigned> startPos, RenderObject* endObject, Optional<unsigned> endPos, SelectionRepaintMode = RepaintNewXOROld);
- void getSelection(RenderObject*& startRenderer, Optional<unsigned>& startOffset, RenderObject*& endRenderer, Optional<unsigned>& endOffset) const;
</del><ins>+ void setSelection(RenderObject* start, std::optional<unsigned> startPos, RenderObject* endObject, std::optional<unsigned> endPos, SelectionRepaintMode = RepaintNewXOROld);
+ void getSelection(RenderObject*& startRenderer, std::optional<unsigned>& startOffset, RenderObject*& endRenderer, std::optional<unsigned>& endOffset) const;
</ins><span class="cx"> void clearSelection();
</span><span class="cx"> RenderObject* selectionUnsplitStart() const { return m_selectionUnsplitStart; }
</span><span class="cx"> RenderObject* selectionUnsplitEnd() const { return m_selectionUnsplitEnd; }
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> bool isScrollableOrRubberbandableBox() const override;
</span><span class="cx">
</span><del>- void splitSelectionBetweenSubtrees(const RenderObject* startRenderer, Optional<unsigned> startPos, const RenderObject* endRenderer, Optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode);
</del><ins>+ void splitSelectionBetweenSubtrees(const RenderObject* startRenderer, std::optional<unsigned> startPos, const RenderObject* endRenderer, std::optional<unsigned> endPos, SelectionRepaintMode blockRepaintMode);
</ins><span class="cx"> void clearSubtreeSelection(const SelectionSubtreeRoot&, SelectionRepaintMode, OldSelectionData&) const;
</span><span class="cx"> void updateSelectionForSubtrees(RenderSubtreesMap&, SelectionRepaintMode);
</span><span class="cx"> void applySubtreeSelection(const SelectionSubtreeRoot&, SelectionRepaintMode, const OldSelectionData&);
</span><span class="lines">@@ -337,8 +337,8 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* m_selectionUnsplitStart { nullptr };
</span><span class="cx"> RenderObject* m_selectionUnsplitEnd { nullptr };
</span><del>- Optional<unsigned> m_selectionUnsplitStartPos;
- Optional<unsigned> m_selectionUnsplitEndPos;
</del><ins>+ std::optional<unsigned> m_selectionUnsplitStartPos;
+ std::optional<unsigned> m_selectionUnsplitEndPos;
</ins><span class="cx">
</span><span class="cx"> // Include this RenderView.
</span><span class="cx"> uint64_t m_rendererCount { 1 };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSelectionSubtreeRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<unsigned> selectionStartPos;
- Optional<unsigned> selectionEndPos;
</del><ins>+ std::optional<unsigned> selectionStartPos;
+ std::optional<unsigned> selectionEndPos;
</ins><span class="cx"> SelectedObjectMap selectedObjects;
</span><span class="cx"> SelectedBlockMap selectedBlocks;
</span><span class="cx"> };
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> public:
</span><span class="cx"> SelectionSubtreeData() = default;
</span><span class="cx">
</span><del>- SelectionSubtreeData(RenderObject* selectionStart, Optional<unsigned> selectionStartPos, RenderObject* selectionEnd, Optional<unsigned> selectionEndPos)
</del><ins>+ SelectionSubtreeData(RenderObject* selectionStart, std::optional<unsigned> selectionStartPos, RenderObject* selectionEnd, std::optional<unsigned> selectionEndPos)
</ins><span class="cx"> : m_selectionStart(selectionStart)
</span><span class="cx"> , m_selectionStartPos(selectionStartPos)
</span><span class="cx"> , m_selectionEnd(selectionEnd)
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* selectionStart() const { return m_selectionStart; }
</span><del>- Optional<unsigned> selectionStartPos() const { return m_selectionStartPos; }
</del><ins>+ std::optional<unsigned> selectionStartPos() const { return m_selectionStartPos; }
</ins><span class="cx"> RenderObject* selectionEnd() const { return m_selectionEnd; }
</span><del>- Optional<unsigned> selectionEndPos() const { return m_selectionEndPos; }
</del><ins>+ std::optional<unsigned> selectionEndPos() const { return m_selectionEndPos; }
</ins><span class="cx"> bool selectionClear() const
</span><span class="cx"> {
</span><span class="cx"> return !m_selectionStart
</span><span class="lines">@@ -83,22 +83,22 @@
</span><span class="cx"> endPos = m_selectionEndPos.value();
</span><span class="cx"> }
</span><span class="cx"> void setSelectionStart(RenderObject* selectionStart) { m_selectionStart = selectionStart; }
</span><del>- void setSelectionStartPos(Optional<unsigned> selectionStartPos) { m_selectionStartPos = selectionStartPos;}
</del><ins>+ void setSelectionStartPos(std::optional<unsigned> selectionStartPos) { m_selectionStartPos = selectionStartPos;}
</ins><span class="cx"> void setSelectionEnd(RenderObject* selectionEnd) { m_selectionEnd = selectionEnd; }
</span><del>- void setSelectionEndPos(Optional<unsigned> selectionEndPos) { m_selectionEndPos = selectionEndPos;}
</del><ins>+ void setSelectionEndPos(std::optional<unsigned> selectionEndPos) { m_selectionEndPos = selectionEndPos;}
</ins><span class="cx"> void clearSelection()
</span><span class="cx"> {
</span><span class="cx"> m_selectionStart = nullptr;
</span><del>- m_selectionStartPos = Nullopt;
</del><ins>+ m_selectionStartPos = std::nullopt;
</ins><span class="cx"> m_selectionEnd = nullptr;
</span><del>- m_selectionEndPos = Nullopt;
</del><ins>+ m_selectionEndPos = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderObject* m_selectionStart { nullptr };
</span><del>- Optional<unsigned> m_selectionStartPos;
</del><ins>+ std::optional<unsigned> m_selectionStartPos;
</ins><span class="cx"> RenderObject* m_selectionEnd { nullptr };
</span><del>- Optional<unsigned> m_selectionEndPos;
</del><ins>+ std::optional<unsigned> m_selectionEndPos;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<SelectionSubtreeRoot*, SelectionSubtreeData> RenderSubtreesMap;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -400,11 +400,11 @@
</span><span class="cx"> float logicalLeftOffset() const { return m_logicalLeftOffset; }
</span><span class="cx"> const TextFragmentIterator::TextFragment& overflowedFragment() const { return m_overflowedFragment; }
</span><span class="cx"> bool hasTrailingWhitespace() const { return m_trailingWhitespaceLength; }
</span><del>- Optional<TextFragmentIterator::TextFragment> lastFragment() const
</del><ins>+ std::optional<TextFragmentIterator::TextFragment> lastFragment() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_fragments.size())
</span><span class="cx"> return m_fragments.last();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> bool isWhitespaceOnly() const { return m_trailingWhitespaceWidth && m_runsWidth == m_trailingWhitespaceWidth; }
</span><span class="cx"> bool fits(float extra) const { return m_availableWidth >= m_runsWidth + extra; }
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> return textAlign;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void closeLineEndingAndAdjustRuns(LineState& line, Layout::RunVector& runs, Optional<unsigned> lastRunIndexOfPreviousLine, unsigned& lineCount,
</del><ins>+static void closeLineEndingAndAdjustRuns(LineState& line, Layout::RunVector& runs, std::optional<unsigned> lastRunIndexOfPreviousLine, unsigned& lineCount,
</ins><span class="cx"> const TextFragmentIterator& textFragmentIterator, bool lastLineInFlow)
</span><span class="cx"> {
</span><span class="cx"> if (!runs.size() || (lastRunIndexOfPreviousLine && runs.size() - 1 == lastRunIndexOfPreviousLine.value()))
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx"> LineState line;
</span><span class="cx"> bool isEndOfContent = false;
</span><span class="cx"> TextFragmentIterator textFragmentIterator = TextFragmentIterator(flow);
</span><del>- Optional<unsigned> lastRunIndexOfPreviousLine;
</del><ins>+ std::optional<unsigned> lastRunIndexOfPreviousLine;
</ins><span class="cx"> do {
</span><span class="cx"> flow.setLogicalHeight(lineHeight * lineCount + borderAndPaddingBefore);
</span><span class="cx"> LineState previousLine = line;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -94,11 +94,11 @@
</span><span class="cx"> textPainter.setFont(style.fontCascade());
</span><span class="cx"> textPainter.setTextPaintStyle(computeTextPaintStyle(flow.frame(), style, paintInfo));
</span><span class="cx">
</span><del>- Optional<TextDecorationPainter> textDecorationPainter;
</del><ins>+ std::optional<TextDecorationPainter> textDecorationPainter;
</ins><span class="cx"> if (style.textDecorationsInEffect() != TextDecorationNone) {
</span><span class="cx"> const RenderText* textRenderer = childrenOfType<RenderText>(flow).first();
</span><span class="cx"> if (textRenderer) {
</span><del>- textDecorationPainter = TextDecorationPainter(paintInfo.context(), style.textDecorationsInEffect(), *textRenderer, false);
</del><ins>+ textDecorationPainter.emplace(paintInfo.context(), style.textDecorationsInEffect(), *textRenderer, false);
</ins><span class="cx"> textDecorationPainter->setFont(style.fontCascade());
</span><span class="cx"> textDecorationPainter->setBaseline(style.fontMetrics().ascent());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WTF::Optional<float> width(HashSet<const Font*>& fallbackFonts)
</del><ins>+ std::optional<float> width(HashSet<const Font*>& fallbackFonts)
</ins><span class="cx"> {
</span><span class="cx"> if (m_state == WordTrailingSpaceState::Computed)
</span><span class="cx"> return m_width;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> private:
</span><span class="cx"> enum class WordTrailingSpaceState { Uninitialized, Computed };
</span><span class="cx"> WordTrailingSpaceState m_state { WordTrailingSpaceState::Uninitialized };
</span><del>- WTF::Optional<float> m_width;
</del><ins>+ std::optional<float> m_width;
</ins><span class="cx"> const RenderStyle& m_style;
</span><span class="cx"> TextLayout* m_textLayout { nullptr };
</span><span class="cx"> };
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> m_hangsAtEnd = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void commitLineBreakAtCurrentWidth(RenderObject& object, unsigned offset = 0, Optional<unsigned> nextBreak = Optional<unsigned>())
</del><ins>+ void commitLineBreakAtCurrentWidth(RenderObject& object, unsigned offset = 0, std::optional<unsigned> nextBreak = std::optional<unsigned>())
</ins><span class="cx"> {
</span><span class="cx"> m_width.commit();
</span><span class="cx"> m_lineBreakHistory.moveTo(object, offset, nextBreak);
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer() const { return this->at(0).renderer(); }
</span><span class="cx"> unsigned offset() const { return this->at(0).offset(); }
</span><del>- Optional<unsigned> nextBreakablePosition() const { return this->at(0).nextBreakablePosition(); }
</del><ins>+ std::optional<unsigned> nextBreakablePosition() const { return this->at(0).nextBreakablePosition(); }
</ins><span class="cx"> bool atTextParagraphSeparator() const { return this->at(0).atTextParagraphSeparator(); }
</span><span class="cx"> UChar previousInSameNode() const { return this->at(0).previousInSameNode(); }
</span><span class="cx"> const InlineIterator& get(size_t i) const { return this->at(i); };
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> const InlineIterator& current() const { return get(0); }
</span><span class="cx"> size_t historyLength() const { return this->size(); }
</span><span class="cx">
</span><del>- void moveTo(RenderObject& object, unsigned offset, Optional<unsigned> nextBreak = Nullopt)
</del><ins>+ void moveTo(RenderObject& object, unsigned offset, std::optional<unsigned> nextBreak = std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> push([&](InlineIterator& modifyMe) {
</span><span class="cx"> modifyMe.moveTo(object, offset, nextBreak);
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.offset()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, int availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, Optional<unsigned> nextBreakable, bool& hyphenated)
</del><ins>+inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, int availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, std::optional<unsigned> nextBreakable, bool& hyphenated)
</ins><span class="cx"> {
</span><span class="cx"> // Map 'hyphenate-limit-{before,after}: auto;' to 2.
</span><span class="cx"> unsigned minimumPrefixLength;
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> wordMeasurement.startOffset = lastSpace;
</span><span class="cx">
</span><span class="cx"> float additionalTempWidth = 0;
</span><del>- WTF::Optional<float> wordTrailingSpaceWidth;
</del><ins>+ std::optional<float> wordTrailingSpaceWidth;
</ins><span class="cx"> if (currentCharacter == ' ')
</span><span class="cx"> wordTrailingSpaceWidth = wordTrailingSpace.width(fallbackFonts);
</span><span class="cx"> if (wordTrailingSpaceWidth)
</span><span class="lines">@@ -870,7 +870,7 @@
</span><span class="cx"> midWordBreak = m_width.committedWidth() + wrapW + charWidth > m_width.availableWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<unsigned> nextBreakablePosition = m_current.nextBreakablePosition();
</del><ins>+ std::optional<unsigned> nextBreakablePosition = m_current.nextBreakablePosition();
</ins><span class="cx"> bool betweenWords = c == '\n' || (m_currWS != PRE && !m_atStart && isBreakable(m_renderTextInfo.lineBreakIterator, m_current.offset(), nextBreakablePosition, breakNBSP, isLooseCJKMode, keepAllWords)
</span><span class="cx"> && (style.hyphens() != HyphensNone || (m_current.previousInSameNode() != softHyphen)));
</span><span class="cx"> m_current.setNextBreakablePosition(nextBreakablePosition);
</span><span class="lines">@@ -972,7 +972,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Check if the last breaking position is a soft-hyphen.
</span><span class="cx"> if (!hyphenated && style.hyphens() != HyphensNone) {
</span><del>- Optional<unsigned> lastBreakingPositon;
</del><ins>+ std::optional<unsigned> lastBreakingPositon;
</ins><span class="cx"> const RenderObject* rendererAtBreakingPosition = nullptr;
</span><span class="cx"> if (m_lineBreakHistory.offset() || m_lineBreakHistory.nextBreakablePosition()) {
</span><span class="cx"> lastBreakingPositon = m_lineBreakHistory.offset();
</span><span class="lines">@@ -983,7 +983,7 @@
</span><span class="cx"> rendererAtBreakingPosition = m_current.renderer();
</span><span class="cx"> }
</span><span class="cx"> if (lastBreakingPositon) {
</span><del>- Optional<UChar> characterBeforeBreakingPosition;
</del><ins>+ std::optional<UChar> characterBeforeBreakingPosition;
</ins><span class="cx"> // When last breaking position points to the start of the current context, we need to look at the last character from
</span><span class="cx"> // the previous non-empty text renderer.
</span><span class="cx"> if (!lastBreakingPositon.value())
</span><span class="lines">@@ -1336,7 +1336,7 @@
</span><span class="cx"> return lineBreak;
</span><span class="cx"> bool isLooseCJKMode = m_renderTextInfo.text != &renderText && m_renderTextInfo.lineBreakIterator.isLooseCJKMode();
</span><span class="cx"> bool breakNBSP = m_autoWrap && m_currentStyle->nbspMode() == SPACE;
</span><del>- Optional<unsigned> nextBreakablePosition = lineBreak.nextBreakablePosition();
</del><ins>+ std::optional<unsigned> nextBreakablePosition = lineBreak.nextBreakablePosition();
</ins><span class="cx"> isBreakable(m_renderTextInfo.lineBreakIterator, lineBreak.offset() + 1, nextBreakablePosition, breakNBSP, isLooseCJKMode, m_currentStyle->wordBreak() == KeepAllWordBreak);
</span><span class="cx"> if (!nextBreakablePosition || nextBreakablePosition.value() != renderText.textLength())
</span><span class="cx"> return lineBreak;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlMathMLStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/MathMLStyle.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/MathMLStyle.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/MathMLStyle.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx"> // The displaystyle and mathvariant attributes override the default behavior.
</span><span class="cx"> auto* element = downcast<RenderElement>(renderer)->element();
</span><span class="cx"> if (is<MathMLElement>(element)) {
</span><del>- Optional<bool> displayStyle = downcast<MathMLElement>(element)->specifiedDisplayStyle();
</del><ins>+ std::optional<bool> displayStyle = downcast<MathMLElement>(element)->specifiedDisplayStyle();
</ins><span class="cx"> if (displayStyle)
</span><span class="cx"> m_displayStyle = displayStyle.value();
</span><del>- Optional<MathMLElement::MathVariant> mathVariant = downcast<MathMLElement>(element)->specifiedMathVariant();
</del><ins>+ std::optional<MathMLElement::MathVariant> mathVariant = downcast<MathMLElement>(element)->specifiedMathVariant();
</ins><span class="cx"> if (mathVariant)
</span><span class="cx"> m_mathVariant = mathVariant.value();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (linePositionMode == PositionOfInteriorLineBoxes)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return firstLineBaseline().valueOr(RenderBlock::baselinePosition(baselineType, firstLine, direction, linePositionMode));
</del><ins>+ return firstLineBaseline().value_or(RenderBlock::baselinePosition(baselineType, firstLine, direction, linePositionMode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEBUG_MATH_LAYOUT)
</span><span class="lines">@@ -173,11 +173,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLTable::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLTable::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> // By default the vertical center of <mtable> is aligned on the math axis.
</span><span class="cx"> // This is different than RenderTable::firstLineBoxBaseline, which returns the baseline of the first row of a <table>.
</span><del>- return Optional<int>(logicalHeight() / 2 + axisHeight(style()));
</del><ins>+ return std::optional<int>(logicalHeight() / 2 + axisHeight(style()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLBlock::layoutItems(bool relayoutChildren)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> static LayoutUnit ascentForChild(const RenderBox& child)
</span><span class="cx"> {
</span><del>- return child.firstLineBaseline().valueOr(child.logicalHeight());
</del><ins>+ return child.firstLineBaseline().value_or(child.logicalHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLTable() const final { return true; }
</span><span class="cx"> const char* renderName() const final { return "RenderMathMLTable"; }
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> Ref<MathMLStyle> m_mathMLStyle;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -242,10 +242,10 @@
</span><span class="cx"> info.context().drawLine(adjustedPaintOffset, roundedIntPoint(LayoutPoint(adjustedPaintOffset.x() + logicalWidth(), adjustedPaintOffset.y())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLFraction::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLFraction::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (isValid())
</span><del>- return Optional<int>(std::lround(static_cast<float>(m_ascent)));
</del><ins>+ return std::optional<int>(std::lround(static_cast<float>(m_ascent)));
</ins><span class="cx"> return RenderMathMLBlock::firstLineBaseline();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> void computePreferredLogicalWidths() final;
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) final;
</span><span class="cx"> RenderMathMLOperator* unembellishedOperator() final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -287,10 +287,10 @@
</span><span class="cx"> return (m_stretchDepthBelowBaseline - m_stretchHeightAboveBaseline - m_mathOperator.descent() + m_mathOperator.ascent()) / 2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLOperator::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLOperator::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (useMathOperator())
</span><del>- return Optional<int>(std::lround(static_cast<float>(m_mathOperator.ascent() - verticalStretchedOperatorShift())));
</del><ins>+ return std::optional<int>(std::lround(static_cast<float>(m_mathOperator.ascent() - verticalStretchedOperatorShift())));
</ins><span class="cx"> return RenderMathMLToken::firstLineBaseline();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> bool isRenderMathMLOperator() const final { return true; }
</span><span class="cx"> bool isInvisibleOperator() const;
</span><span class="cx">
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx"> RenderMathMLOperator* unembellishedOperator() final { return this; }
</span><span class="cx">
</span><span class="cx"> LayoutUnit verticalStretchedOperatorShift() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLPaddedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLPadded::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLPadded::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> // We try and calculate the baseline from the position of the first child.
</span><span class="cx"> LayoutUnit ascent;
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> ascent = ascentForChild(*baselineChild) + baselineChild->logicalTop() + voffset();
</span><span class="cx"> else
</span><span class="cx"> ascent = mpaddedHeight(0);
</span><del>- return Optional<int>(std::lround(static_cast<float>(ascent)));
</del><ins>+ return std::optional<int>(std::lround(static_cast<float>(ascent)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> void computePreferredLogicalWidths() final;
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> MathMLPaddedElement& element() const { return static_cast<MathMLPaddedElement&>(nodeForNonAnonymous()); }
</span><span class="cx"> LayoutUnit voffset() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> return static_cast<MathMLRowElement&>(nodeForNonAnonymous());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLRow::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLRow::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> auto* baselineChild = firstChildBox();
</span><span class="cx"> if (!baselineChild)
</span><del>- return Optional<int>();
</del><ins>+ return std::optional<int>();
</ins><span class="cx">
</span><del>- return Optional<int>(static_cast<int>(lroundf(ascentForChild(*baselineChild) + baselineChild->logicalTop())));
</del><ins>+ return std::optional<int>(static_cast<int>(lroundf(ascentForChild(*baselineChild) + baselineChild->logicalTop())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLRow::computeLineVerticalStretch(LayoutUnit& ascent, LayoutUnit& descent)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</span><del>- Optional<int> firstLineBaseline() const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
</ins><span class="cx">
</span><span class="cx"> void layoutRowItems(LayoutUnit& ascent, LayoutUnit& descent);
</span><span class="cx"> void computeLineVerticalStretch(LayoutUnit& ascent, LayoutUnit& descent);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> return downcast<RenderMathMLBlock>(base)->unembellishedOperator();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<RenderMathMLScripts::ReferenceChildren> RenderMathMLScripts::validateAndGetReferenceChildren()
</del><ins>+std::optional<RenderMathMLScripts::ReferenceChildren> RenderMathMLScripts::validateAndGetReferenceChildren()
</ins><span class="cx"> {
</span><span class="cx"> // All scripted elements must have at least one child.
</span><span class="cx"> // The first child is the base.
</span><span class="cx"> auto base = firstChildBox();
</span><span class="cx"> if (!base)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> ReferenceChildren reference;
</span><span class="cx"> reference.base = base;
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> // <mover> base overscript </mover>
</span><span class="cx"> auto script = base->nextSiblingBox();
</span><span class="cx"> if (!script || isPrescriptDelimiter(*script) || script->nextSiblingBox())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> reference.firstPostScript = script;
</span><span class="cx"> return reference;
</span><span class="cx"> }
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> // <munderover> base subscript superscript </munderover>
</span><span class="cx"> auto subScript = base->nextSiblingBox();
</span><span class="cx"> if (!subScript || isPrescriptDelimiter(*subScript))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> auto superScript = subScript->nextSiblingBox();
</span><span class="cx"> if (!superScript || isPrescriptDelimiter(*superScript) || superScript->nextSiblingBox())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> reference.firstPostScript = subScript;
</span><span class="cx"> return reference;
</span><span class="cx"> }
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> if (isPrescriptDelimiter(*script)) {
</span><span class="cx"> // This is a <mprescripts/>. Let's check 2a) and 2c).
</span><span class="cx"> if (!numberOfScriptIsEven || reference.firstPreScript)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> reference.firstPreScript = script->nextSiblingBox(); // We do 1).
</span><span class="cx"> reference.prescriptDelimiter = script;
</span><span class="cx"> continue;
</span><span class="lines">@@ -155,12 +155,12 @@
</span><span class="cx"> }
</span><span class="cx"> numberOfScriptIsEven = !numberOfScriptIsEven;
</span><span class="cx"> }
</span><del>- return numberOfScriptIsEven ? Optional<ReferenceChildren>(reference) : Nullopt; // We verify 2b).
</del><ins>+ return numberOfScriptIsEven ? std::optional<ReferenceChildren>(reference) : std::nullopt; // We verify 2b).
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderMathMLScripts::spaceAfterScript()
</span><span class="lines">@@ -471,13 +471,13 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLScripts::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLScripts::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!needsLayout());
</span><span class="cx"> auto* base = firstChildBox();
</span><span class="cx"> if (!base)
</span><del>- return Optional<int>();
- return Optional<int>(static_cast<int>(lroundf(ascentForChild(*base) + base->logicalTop())));
</del><ins>+ return std::optional<int>();
+ return std::optional<int>(static_cast<int>(lroundf(ascentForChild(*base) + base->logicalTop())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MathMLScriptsElement& element() const;
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx"> struct ReferenceChildren {
</span><span class="cx"> RenderBox* base;
</span><span class="cx"> RenderBox* prescriptDelimiter;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> RenderBox* firstPostScript;
</span><span class="cx"> RenderBox* firstPreScript;
</span><span class="cx"> };
</span><del>- Optional<ReferenceChildren> validateAndGetReferenceChildren();
</del><ins>+ std::optional<ReferenceChildren> validateAndGetReferenceChildren();
</ins><span class="cx"> LayoutUnit spaceAfterScript();
</span><span class="cx"> LayoutUnit italicCorrection(const ReferenceChildren&);
</span><span class="cx"> struct VerticalParameters {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,11 +82,11 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLSpace::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLSpace::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> LayoutUnit height, depth;
</span><span class="cx"> getSpaceHeightAndDepth(height, depth);
</span><del>- return Optional<int>(height);
</del><ins>+ return std::optional<int>(height);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> bool isChildAllowed(const RenderObject&, const RenderStyle&) const final { return false; }
</span><span class="cx"> void computePreferredLogicalWidths() final;
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><del>- Optional<int> firstLineBaseline() const final;
</del><ins>+ std::optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit spaceWidth() const;
</span><span class="cx"> void getSpaceHeightAndDepth(LayoutUnit& height, LayoutUnit& depth) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLTokencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_mathVariantGlyphDirty);
</span><span class="cx">
</span><del>- m_mathVariantCodePoint = Nullopt;
</del><ins>+ m_mathVariantCodePoint = std::nullopt;
</ins><span class="cx"> m_mathVariantGlyphDirty = false;
</span><span class="cx">
</span><span class="cx"> // Early return if the token element contains RenderElements.
</span><span class="lines">@@ -551,12 +551,12 @@
</span><span class="cx"> setMathVariantGlyphDirty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<int> RenderMathMLToken::firstLineBaseline() const
</del><ins>+std::optional<int> RenderMathMLToken::firstLineBaseline() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_mathVariantCodePoint) {
</span><span class="cx"> auto mathVariantGlyph = style().fontCascade().glyphDataForCharacter(m_mathVariantCodePoint.value(), m_mathVariantIsMirrored);
</span><span class="cx"> if (mathVariantGlyph.font)
</span><del>- return Optional<int>(static_cast<int>(lroundf(-mathVariantGlyph.font->boundsForGlyph(mathVariantGlyph.glyph).y())));
</del><ins>+ return std::optional<int>(static_cast<int>(lroundf(-mathVariantGlyph.font->boundsForGlyph(mathVariantGlyph.glyph).y())));
</ins><span class="cx"> }
</span><span class="cx"> return RenderMathMLBlock::firstLineBaseline();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx"> void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override;
</span><del>- Optional<int> firstLineBaseline() const override;
</del><ins>+ std::optional<int> firstLineBaseline() const override;
</ins><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> m_mathVariantGlyphDirty = true;
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> }
</span><del>- Optional<UChar32> m_mathVariantCodePoint { Nullopt };
</del><ins>+ std::optional<UChar32> m_mathVariantCodePoint { std::nullopt };
</ins><span class="cx"> bool m_mathVariantIsMirrored { false };
</span><span class="cx"> bool m_mathVariantGlyphDirty { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> if (!pointIsInsideViewportClip(pointInParent))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint localPoint = localToParentTransform().inverse().valueOr(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</ins><span class="cx">
</span><span class="cx"> if (!SVGRenderSupport::pointInClippingArea(*this, localPoint))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGForeignObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> if (hitTestAction != HitTestForeground)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint localPoint = localTransform().inverse().valueOr(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = localTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</ins><span class="cx">
</span><span class="cx"> // Early exit if local point is not contained in clipped viewport area
</span><span class="cx"> if (SVGRenderSupport::isOverflowHidden(*this) && !m_viewport.contains(localPoint))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_IMAGE_HITTESTING, request, style().pointerEvents());
</span><span class="cx"> bool isVisible = (style().visibility() == VISIBLE);
</span><span class="cx"> if (isVisible || !hitRules.requireVisible) {
</span><del>- FloatPoint localPoint = localToParentTransform().inverse().valueOr(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</ins><span class="cx">
</span><span class="cx"> if (!SVGRenderSupport::pointInClippingArea(*this, localPoint))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -267,10 +267,10 @@
</span><span class="cx"> AffineTransform transform;
</span><span class="cx"> transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
</span><span class="cx"> transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
</span><del>- point = transform.inverse().valueOr(AffineTransform()).mapPoint(point);
</del><ins>+ point = transform.inverse().value_or(AffineTransform()).mapPoint(point);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- point = clipPathElement().animatedLocalTransform().inverse().valueOr(AffineTransform()).mapPoint(point);
</del><ins>+ point = clipPathElement().animatedLocalTransform().inverse().value_or(AffineTransform()).mapPoint(point);
</ins><span class="cx">
</span><span class="cx"> for (Node* childNode = clipPathElement().firstChild(); childNode; childNode = childNode->nextSibling()) {
</span><span class="cx"> RenderObject* renderer = childNode->renderer();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">
</span><span class="cx"> ImageBuffer* resultImage = lastEffect->asImageBuffer();
</span><span class="cx"> if (resultImage) {
</span><del>- context->concatCTM(filterData->shearFreeAbsoluteTransform.inverse().valueOr(AffineTransform()));
</del><ins>+ context->concatCTM(filterData->shearFreeAbsoluteTransform.inverse().value_or(AffineTransform()));
</ins><span class="cx">
</span><span class="cx"> context->scale(FloatSize(1 / filterData->filter->filterResolution().width(), 1 / filterData->filter->filterResolution().height()));
</span><span class="cx"> context->drawImageBuffer(*resultImage, lastEffect->absolutePaintRect());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> // Only test SVG content if the point is in our content box.
</span><span class="cx"> // FIXME: This should be an intersection when rect-based hit tests are supported by nodeAtFloatPoint.
</span><span class="cx"> if (contentBoxRect().contains(pointInBorderBox)) {
</span><del>- FloatPoint localPoint = localToParentTransform().inverse().valueOr(AffineTransform()).mapPoint(FloatPoint(pointInParent));
</del><ins>+ FloatPoint localPoint = localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(FloatPoint(pointInParent));
</ins><span class="cx">
</span><span class="cx"> for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
</span><span class="cx"> // FIXME: nodeAtFloatPoint() doesn't handle rect-based hit tests yet.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderSVGShape::setupNonScalingStrokeContext(AffineTransform& strokeTransform, GraphicsContextStateSaver& stateSaver)
</span><span class="cx"> {
</span><del>- Optional<AffineTransform> inverse = strokeTransform.inverse();
</del><ins>+ std::optional<AffineTransform> inverse = strokeTransform.inverse();
</ins><span class="cx"> if (!inverse)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> if (hitTestAction != HitTestForeground)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint localPoint = m_localTransform.inverse().valueOr(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = m_localTransform.inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</ins><span class="cx">
</span><span class="cx"> if (!SVGRenderSupport::pointInClippingArea(*this, localPoint))
</span><span class="cx"> return false;
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> BoundingRectStrokeStyleApplier strokeStyle(*this);
</span><span class="cx"> if (hasNonScalingStroke()) {
</span><span class="cx"> AffineTransform nonScalingTransform = nonScalingStrokeTransform();
</span><del>- if (Optional<AffineTransform> inverse = nonScalingTransform.inverse()) {
</del><ins>+ if (std::optional<AffineTransform> inverse = nonScalingTransform.inverse()) {
</ins><span class="cx"> Path* usePath = nonScalingStrokePath(m_path.get(), nonScalingTransform);
</span><span class="cx"> FloatRect strokeBoundingRect = usePath->strokeBoundingRect(&strokeStyle);
</span><span class="cx"> strokeBoundingRect = inverse.value().mapRect(strokeBoundingRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> if (isVisible || !hitRules.requireVisible) {
</span><span class="cx"> if ((hitRules.canHitStroke && (style().svgStyle().hasStroke() || !hitRules.requireStroke))
</span><span class="cx"> || (hitRules.canHitFill && (style().svgStyle().hasFill() || !hitRules.requireFill))) {
</span><del>- FloatPoint localPoint = localToParentTransform().inverse().valueOr(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</ins><span class="cx">
</span><span class="cx"> if (!SVGRenderSupport::pointInClippingArea(*this, localPoint))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> if (localToRootTransform.isIdentity())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AffineTransform rootToLocalTransform = localToRootTransform.inverse().valueOr(AffineTransform());
</del><ins>+ AffineTransform rootToLocalTransform = localToRootTransform.inverse().value_or(AffineTransform());
</ins><span class="cx"> repaintRect = rootToLocalTransform.mapRect(repaintRect);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx">
</span><span class="cx"> // The mask image has been created in the absolute coordinate space, as the image should not be scaled.
</span><span class="cx"> // So the actual masking process has to be done in the absolute coordinate space as well.
</span><del>- context.concatCTM(absoluteTransform.inverse().valueOr(AffineTransform()));
</del><ins>+ context.concatCTM(absoluteTransform.inverse().value_or(AffineTransform()));
</ins><span class="cx"> context.clipToImageBuffer(*imageBuffer, absoluteTargetRect);
</span><span class="cx"> context.concatCTM(absoluteTransform);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/rendering/svg/SVGTextQuery.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> bool alterStartPosition = true;
</span><span class="cx"> bool alterEndPosition = true;
</span><span class="cx">
</span><del>- Optional<unsigned> lastPositionOffset;
</del><ins>+ std::optional<unsigned> lastPositionOffset;
</ins><span class="cx"> for (; textMetricsOffset < textMetricsSize && positionOffset < positionSize; ++textMetricsOffset) {
</span><span class="cx"> SVGTextMetrics& metrics = textMetricsValues[textMetricsOffset];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> RenderTreeUpdater::Parent::Parent(Element& element, Style::Change styleChange)
</span><span class="cx"> : element(&element)
</span><span class="cx"> , styleChange(styleChange)
</span><del>- , renderTreePosition(element.renderer() ? makeOptional(RenderTreePosition(*element.renderer())) : Nullopt)
</del><ins>+ , renderTreePosition(element.renderer() ? std::make_optional(RenderTreePosition(*element.renderer())) : std::nullopt)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdaterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> struct Parent {
</span><span class="cx"> Element* element { nullptr };
</span><span class="cx"> Style::Change styleChange { Style::NoChange };
</span><del>- Optional<RenderTreePosition> renderTreePosition;
</del><ins>+ std::optional<RenderTreePosition> renderTreePosition;
</ins><span class="cx">
</span><span class="cx"> Parent(ContainerNode& root);
</span><span class="cx"> Parent(Element&, Style::Change);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/style/StyleScope.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> int m_pendingStyleSheetCount { 0 };
</span><span class="cx"> bool m_didUpdateActiveStyleSheets { false };
</span><span class="cx">
</span><del>- Optional<UpdateType> m_pendingUpdate;
</del><ins>+ std::optional<UpdateType> m_pendingUpdate;
</ins><span class="cx"> bool m_hasDescendantWithPendingUpdate { false };
</span><span class="cx">
</span><span class="cx"> ListHashSet<Node*> m_styleSheetCandidateNodes;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> if (name == HTMLNames::tabindexAttr) {
</span><span class="cx"> if (value.isEmpty())
</span><span class="cx"> clearTabIndexExplicitlyIfNeeded();
</span><del>- else if (Optional<int> tabIndex = parseHTMLInteger(value))
</del><ins>+ else if (std::optional<int> tabIndex = parseHTMLInteger(value))
</ins><span class="cx"> setTabIndexExplicitly(tabIndex.value());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> contextElement->synchronizeSystemLanguage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SVGElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</del><ins>+std::optional<ElementStyle> SVGElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> // If the element is in a <use> tree we get the style from the definition tree.
</span><span class="cx"> if (auto* styleElement = this->correspondingElement())
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/svg/SVGElement.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> void synchronizeAnimatedSVGAttribute(const QualifiedName&) const;
</span><span class="cx"> static void synchronizeAllAnimatedSVGAttribute(SVGElement*);
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</del><ins>+ std::optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx">
</span><span class="cx"> static void synchronizeRequiredFeatures(SVGElement* contextElement);
</span><span class="cx"> static void synchronizeRequiredExtensions(SVGElement* contextElement);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> uint32_t calculateChecksum(size_t startingOffset, size_t endingOffset) const;
</span><span class="cx">
</span><del>- void processGlyphElement(const SVGElement& glyphOrMissingGlyphElement, const SVGGlyphElement*, float defaultHorizontalAdvance, float defaultVerticalAdvance, const String& codepoints, Optional<FloatRect>& boundingBox);
</del><ins>+ void processGlyphElement(const SVGElement& glyphOrMissingGlyphElement, const SVGGlyphElement*, float defaultHorizontalAdvance, float defaultVerticalAdvance, const String& codepoints, std::optional<FloatRect>& boundingBox);
</ins><span class="cx">
</span><span class="cx"> typedef void (SVGToOTFFontConverter::*FontAppendingFunction)();
</span><span class="cx"> void appendTable(const char identifier[4], FontAppendingFunction);
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> void appendValidCFFString(const String&);
</span><span class="cx">
</span><del>- Vector<char> transcodeGlyphPaths(float width, const SVGElement& glyphOrMissingGlyphElement, Optional<FloatRect>& boundingBox) const;
</del><ins>+ Vector<char> transcodeGlyphPaths(float width, const SVGElement& glyphOrMissingGlyphElement, std::optional<FloatRect>& boundingBox) const;
</ins><span class="cx">
</span><span class="cx"> void addCodepointRanges(const UnicodeRanges&, HashSet<Glyph>& glyphSet) const;
</span><span class="cx"> void addCodepoints(const HashSet<String>& codepoints, HashSet<Glyph>& glyphSet) const;
</span><span class="lines">@@ -1155,7 +1155,7 @@
</span><span class="cx"> m_cffData.append(rMoveTo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Optional<FloatRect> boundingBox() const
</del><ins>+ std::optional<FloatRect> boundingBox() const
</ins><span class="cx"> {
</span><span class="cx"> return m_boundingBox;
</span><span class="cx"> }
</span><span class="lines">@@ -1246,11 +1246,11 @@
</span><span class="cx"> Vector<char>& m_cffData;
</span><span class="cx"> FloatPoint m_startingPoint;
</span><span class="cx"> FloatPoint m_current;
</span><del>- Optional<FloatRect> m_boundingBox;
</del><ins>+ std::optional<FloatRect> m_boundingBox;
</ins><span class="cx"> float m_unitsPerEmScalar;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Vector<char> SVGToOTFFontConverter::transcodeGlyphPaths(float width, const SVGElement& glyphOrMissingGlyphElement, Optional<FloatRect>& boundingBox) const
</del><ins>+Vector<char> SVGToOTFFontConverter::transcodeGlyphPaths(float width, const SVGElement& glyphOrMissingGlyphElement, std::optional<FloatRect>& boundingBox) const
</ins><span class="cx"> {
</span><span class="cx"> Vector<char> result;
</span><span class="cx">
</span><span class="lines">@@ -1286,7 +1286,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGToOTFFontConverter::processGlyphElement(const SVGElement& glyphOrMissingGlyphElement, const SVGGlyphElement* glyphElement, float defaultHorizontalAdvance, float defaultVerticalAdvance, const String& codepoints, Optional<FloatRect>& boundingBox)
</del><ins>+void SVGToOTFFontConverter::processGlyphElement(const SVGElement& glyphOrMissingGlyphElement, const SVGGlyphElement* glyphElement, float defaultHorizontalAdvance, float defaultVerticalAdvance, const String& codepoints, std::optional<FloatRect>& boundingBox)
</ins><span class="cx"> {
</span><span class="cx"> bool ok;
</span><span class="cx"> float horizontalAdvance = scaleUnitsPerEm(glyphOrMissingGlyphElement.attributeWithoutSynchronization(SVGNames::horiz_adv_xAttr).toFloat(&ok));
</span><span class="lines">@@ -1298,7 +1298,7 @@
</span><span class="cx"> verticalAdvance = defaultVerticalAdvance;
</span><span class="cx"> m_advanceHeightMax = std::max(m_advanceHeightMax, verticalAdvance);
</span><span class="cx">
</span><del>- Optional<FloatRect> glyphBoundingBox;
</del><ins>+ std::optional<FloatRect> glyphBoundingBox;
</ins><span class="cx"> auto path = transcodeGlyphPaths(horizontalAdvance, glyphOrMissingGlyphElement, glyphBoundingBox);
</span><span class="cx"> if (!path.size()) {
</span><span class="cx"> // It's better to use a fallback font rather than use a font without all its glyphs.
</span><span class="lines">@@ -1311,7 +1311,7 @@
</span><span class="cx"> if (glyphBoundingBox)
</span><span class="cx"> m_minRightSideBearing = std::min(m_minRightSideBearing, horizontalAdvance - glyphBoundingBox.value().maxX());
</span><span class="cx">
</span><del>- m_glyphs.append(GlyphData(WTFMove(path), glyphElement, horizontalAdvance, verticalAdvance, glyphBoundingBox.valueOr(FloatRect()), codepoints));
</del><ins>+ m_glyphs.append(GlyphData(WTFMove(path), glyphElement, horizontalAdvance, verticalAdvance, glyphBoundingBox.value_or(FloatRect()), codepoints));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGToOTFFontConverter::appendLigatureGlyphs()
</span><span class="lines">@@ -1421,7 +1421,7 @@
</span><span class="cx">
</span><span class="cx"> populateEmptyGlyphCharString(m_emptyGlyphCharString, s_outputUnitsPerEm);
</span><span class="cx">
</span><del>- Optional<FloatRect> boundingBox;
</del><ins>+ std::optional<FloatRect> boundingBox;
</ins><span class="cx"> if (m_missingGlyphElement)
</span><span class="cx"> processGlyphElement(*m_missingGlyphElement, nullptr, defaultHorizontalAdvance, defaultVerticalAdvance, String(), boundingBox);
</span><span class="cx"> else {
</span><span class="lines">@@ -1435,7 +1435,7 @@
</span><span class="cx"> processGlyphElement(glyphElement, &glyphElement, defaultHorizontalAdvance, defaultVerticalAdvance, unicodeAttribute, boundingBox);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_boundingBox = boundingBox.valueOr(FloatRect());
</del><ins>+ m_boundingBox = boundingBox.value_or(FloatRect());
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
</span><span class="lines">@@ -1584,13 +1584,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Vector<char>> convertSVGToOTFFont(const SVGFontElement& element)
</del><ins>+std::optional<Vector<char>> convertSVGToOTFFont(const SVGFontElement& element)
</ins><span class="cx"> {
</span><span class="cx"> SVGToOTFFontConverter converter(element);
</span><span class="cx"> if (converter.error())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> if (!converter.convertSVGToOTFFont())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> return converter.releaseResult();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -32,6 +32,6 @@
</span><span class="cx">
</span><span class="cx"> class SVGFontElement;
</span><span class="cx">
</span><del>-Optional<Vector<char>> convertSVGToOTFFont(const SVGFontElement&);
</del><ins>+std::optional<Vector<char>> convertSVGToOTFFont(const SVGFontElement&);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx"> return contextDocument()->isTimerThrottlingEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::setEventThrottlingBehaviorOverride(Optional<EventThrottlingBehavior> value)
</del><ins>+void Internals::setEventThrottlingBehaviorOverride(std::optional<EventThrottlingBehavior> value)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->page())
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!value) {
</span><del>- document->page()->setEventThrottlingBehaviorOverride(Nullopt);
</del><ins>+ document->page()->setEventThrottlingBehaviorOverride(std::nullopt);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -875,15 +875,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Internals::EventThrottlingBehavior> Internals::eventThrottlingBehaviorOverride() const
</del><ins>+std::optional<Internals::EventThrottlingBehavior> Internals::eventThrottlingBehaviorOverride() const
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->page())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto behavior = document->page()->eventThrottlingBehaviorOverride();
</span><span class="cx"> if (!behavior)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> switch (behavior.value()) {
</span><span class="cx"> case WebCore::EventThrottlingBehavior::Responsive:
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> return Internals::EventThrottlingBehavior::Unresponsive;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Internals::visiblePlaceholder(Element& element)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/testing/Internals.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> bool areTimersThrottled() const;
</span><span class="cx">
</span><span class="cx"> enum EventThrottlingBehavior { Responsive, Unresponsive };
</span><del>- void setEventThrottlingBehaviorOverride(Optional<EventThrottlingBehavior>);
- Optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const;
</del><ins>+ void setEventThrottlingBehaviorOverride(std::optional<EventThrottlingBehavior>);
+ std::optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const;
</ins><span class="cx">
</span><span class="cx"> // Spatial Navigation testing.
</span><span class="cx"> ExceptionOr<unsigned> lastSpatialNavigationCandidateCount() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/workers/Worker.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> RefPtr<WorkerScriptLoader> m_scriptLoader;
</span><span class="cx"> String m_identifier;
</span><span class="cx"> WorkerGlobalScopeProxy* m_contextProxy; // The proxy outlives the worker to perform thread shutdown.
</span><del>- Optional<ContentSecurityPolicyResponseHeaders> m_contentSecurityPolicyResponseHeaders;
</del><ins>+ std::optional<ContentSecurityPolicyResponseHeaders> m_contentSecurityPolicyResponseHeaders;
</ins><span class="cx"> bool m_shouldBypassMainWorldContentSecurityPolicy { false };
</span><span class="cx"> JSC::RuntimeFlags m_runtimeFlags;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -476,10 +476,10 @@
</span><span class="cx"> return open(method, urlWithCredentials, async);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ExceptionOr<void>> XMLHttpRequest::prepareToSend()
</del><ins>+std::optional<ExceptionOr<void>> XMLHttpRequest::prepareToSend()
</ins><span class="cx"> {
</span><del>- // A return value other than Nullopt means we should not try to send, and we should return that value to the caller.
- // Nullopt means we are ready to send and should continue with the send algorithm.
</del><ins>+ // A return value other than std::nullopt means we should not try to send, and we should return that value to the caller.
+ // std::nullopt means we are ready to send and should continue with the send algorithm.
</ins><span class="cx">
</span><span class="cx"> if (!scriptExecutionContext())
</span><span class="cx"> return ExceptionOr<void> { };
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_error = false;
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> XMLHttpRequest::send(Document& document)
</span><span class="lines">@@ -980,7 +980,7 @@
</span><span class="cx">
</span><span class="cx"> m_responseBuilder.shrinkToFit();
</span><span class="cx">
</span><del>- Optional<String> decodedText;
</del><ins>+ std::optional<String> decodedText;
</ins><span class="cx"> if (!m_binaryResponseBuilder)
</span><span class="cx"> decodedText = m_responseBuilder.toStringPreserveCapacity();
</span><span class="cx"> InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), this, identifier, decodedText, m_url, m_lastSendURL, m_lastSendLineNumber, m_lastSendColumnNumber);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">
</span><span class="cx"> bool responseIsXML() const;
</span><span class="cx">
</span><del>- Optional<ExceptionOr<void>> prepareToSend();
</del><ins>+ std::optional<ExceptionOr<void>> prepareToSend();
</ins><span class="cx"> ExceptionOr<void> sendBytesData(const void*, size_t);
</span><span class="cx">
</span><span class="cx"> void changeState(State);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Use WTF::Optional::value_or.
+
+ * DOM/DOMHTMLOptionsCollection.mm:
+ (-[DOMHTMLOptionsCollection add:index:]):
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::evaluate):
+ * Plugins/WebNetscapePluginView.mm:
+ (-[WebNetscapePluginView sendEvent:isDrawRect:]):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidCommitLoad):
+ * WebCoreSupport/WebPaymentCoordinatorClient.h:
+ * WebCoreSupport/WebPaymentCoordinatorClient.mm:
+ (WebPaymentCoordinatorClient::completeShippingMethodSelection):
+ (WebPaymentCoordinatorClient::completeShippingContactSelection):
+ (WebPaymentCoordinatorClient::completePaymentMethodSelection):
+ * WebCoreSupport/WebSecurityOrigin.mm:
+ (-[WebSecurityOrigin port]):
+ * WebView/WebHTMLView.mm:
+ (toAction):
+ (toTag):
+
</ins><span class="cx"> 2016-11-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert IntersectionObserver over to using RuntimeEnabledFeatures so it can be properly excluded from script
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLOptionsCollectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLOptionsCollection.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> if (!option)
</span><span class="cx"> raiseTypeErrorException();
</span><del>- raiseOnDOMError(IMPL->add(core(option), Optional<WebCore::HTMLOptionsCollection::HTMLElementOrInt> { static_cast<int>(index) }));
</del><ins>+ raiseOnDOMError(IMPL->add(core(option), std::optional<WebCore::HTMLOptionsCollection::HTMLElementOrInt> { static_cast<int>(index) }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)remove:(unsigned)index
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx"> Strong<JSGlobalObject> globalObject(vm, frame->script().globalObject(pluginWorld()));
</span><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><del>- UserGestureIndicator gestureIndicator(allowPopups ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(allowPopups ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx">
</span><span class="cx"> JSValue result = JSC::evaluate(exec, makeSource(script));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> ASSERT(_eventHandler);
</span><span class="cx"> {
</span><span class="cx"> JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
</span><del>- UserGestureIndicator gestureIndicator(_eventHandler->currentEventIsUserGesture() ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(_eventHandler->currentEventIsUserGesture() ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx"> acceptedEvent = [_pluginPackage.get() pluginFuncs]->event(plugin, event);
</span><span class="cx"> }
</span><span class="cx"> [self didCallPlugInFunction];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</del><ins>+ void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> CallFrameLoadDelegate(implementations->didReceiveTitleForFrameFunc, webView, @selector(webView:didReceiveTitle:forFrame:), (NSString *)title.string(), m_webFrame.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent>)
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(std::optional<HasInsecureContent>)
</ins><span class="cx"> {
</span><span class="cx"> // Tell the client we've committed this URL.
</span><span class="cx"> ASSERT([m_webFrame->_private->webFrameView documentView] != nil);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) override;
</span><span class="cx"> bool showPaymentUI(const WebCore::URL&, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&) override;
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&) override;
</span><del>- void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
- void completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
- void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
</del><ins>+ void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
</ins><span class="cx"> void completePaymentSession(WebCore::PaymentAuthorizationStatus) override;
</span><span class="cx"> void abortPaymentSession() override;
</span><span class="cx"> void paymentCoordinatorDestroyed() override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,15 +71,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorClient::completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems>)
</del><ins>+void WebPaymentCoordinatorClient::completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, std::optional<WebCore::PaymentRequest::TotalAndLineItems>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorClient::completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, Optional<WebCore::PaymentRequest::TotalAndLineItems>)
</del><ins>+void WebPaymentCoordinatorClient::completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, std::optional<WebCore::PaymentRequest::TotalAndLineItems>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorClient::completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>)
</del><ins>+void WebPaymentCoordinatorClient::completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSecurityOriginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> - (unsigned short)port
</span><span class="cx"> {
</span><del>- return reinterpret_cast<SecurityOrigin*>(_private)->port().valueOr(0);
</del><ins>+ return reinterpret_cast<SecurityOrigin*>(_private)->port().value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Overriding isEqual: without overriding hash will cause trouble if this ever goes into an NSSet or is the key in an NSDictionary,
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> - (void)forwardContextMenuAction:(id)sender;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-static Optional<ContextMenuAction> toAction(NSInteger tag)
</del><ins>+static std::optional<ContextMenuAction> toAction(NSInteger tag)
</ins><span class="cx"> {
</span><span class="cx"> if (tag >= ContextMenuItemBaseCustomTag && tag <= ContextMenuItemLastCustomTag) {
</span><span class="cx"> // Just pass these through.
</span><span class="lines">@@ -357,14 +357,14 @@
</span><span class="cx"> case WebMenuItemTagDictationAlternative:
</span><span class="cx"> return ContextMenuItemTagDictationAlternative;
</span><span class="cx"> }
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<NSInteger> toTag(ContextMenuAction action)
</del><ins>+static std::optional<NSInteger> toTag(ContextMenuAction action)
</ins><span class="cx"> {
</span><span class="cx"> switch (action) {
</span><span class="cx"> case ContextMenuItemTagNoAction:
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> case ContextMenuItemTagOpenLinkInNewWindow:
</span><span class="cx"> return WebMenuItemTagOpenLinkInNewWindow;
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WebMenuTarget* target;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/win/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Use WTF::Optional::value_or.
+
+ * Plugins/PluginView.cpp:
+ (WebCore::PluginView::performRequest):
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidCommitLoad):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebSecurityOrigin.cpp:
+ (WebSecurityOrigin::port):
+
</ins><span class="cx"> 2016-11-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] When zoomed in and panning on pages with fixed bars, parts of the bars are sometimes missing
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> URL requestURL = request->frameLoadRequest().resourceRequest().url();
</span><span class="cx"> String jsString = scriptStringIfJavaScriptURL(requestURL);
</span><span class="cx">
</span><del>- UserGestureIndicator gestureIndicator(request->shouldAllowPopups() ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(request->shouldAllowPopups() ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx">
</span><span class="cx"> if (jsString.isNull()) {
</span><span class="cx"> // if this is not a targeted request, create a stream for it. otherwise,
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> frameLoadDelegate->didReceiveTitle(webView, BString(title.string()), m_webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent>)
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(std::optional<HasInsecureContent>)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</del><ins>+ void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebSecurityOrigin.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebSecurityOrigin.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit/win/WebSecurityOrigin.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- *result = m_securityOrigin->port().valueOr(0);
</del><ins>+ *result = m_securityOrigin->port().value_or(0);
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,191 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ * NetworkProcess/NetworkDataTask.cpp:
+ (WebKit::NetworkDataTask::didReceiveResponse):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::responseHasExpired):
+ * NetworkProcess/cache/NetworkCacheCoders.h:
+ (WebKit::NetworkCache::Coder<std::optional<T>>::encode):
+ (WebKit::NetworkCache::Coder<std::optional<T>>::decode):
+ (WebKit::NetworkCache::Coder<Optional<T>>::encode): Deleted.
+ (WebKit::NetworkCache::Coder<Optional<T>>::decode): Deleted.
+ * NetworkProcess/cache/NetworkCacheData.cpp:
+ (WebKit::NetworkCache::readOrMakeSalt):
+ * NetworkProcess/cache/NetworkCacheData.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::PreloadedEntry):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::revalidationRequest):
+ (WebKit::NetworkCache::SpeculativeLoadManager::addPreloadedEntry):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ (WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
+ (WebKit::NetworkCache::Statistics::recordRetrievalFailure):
+ (WebKit::NetworkCache::Statistics::queryWasEverRequested):
+ * NetworkProcess/cache/NetworkCacheStatistics.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::storeBodyAsBlob):
+ (WebKit::NetworkCache::Storage::encodeRecord):
+ (WebKit::NetworkCache::Storage::dispatchWriteOperation):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ * Platform/IPC/ArgumentCoders.h:
+ (IPC::ArgumentCoder<std::optional<T>>::encode):
+ (IPC::ArgumentCoder<std::optional<T>>::decode):
+ (IPC::ArgumentCoder<WTF::Optional<T>>::encode): Deleted.
+ (IPC::ArgumentCoder<WTF::Optional<T>>::decode): Deleted.
+ * Platform/IPC/Connection.h:
+ (IPC::Connection::sendWithReply):
+ * Platform/SharedMemory.h:
+ * Platform/unix/SharedMemoryUnix.cpp:
+ (WebKit::SharedMemory::map):
+ * Scripts/webkit/messages.py:
+ (class_template_headers):
+ * Shared/API/APISecurityOrigin.h:
+ (API::SecurityOrigin::create):
+ * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
+ * Shared/API/c/WKSecurityOriginRef.cpp:
+ (WKSecurityOriginGetPort):
+ * Shared/SessionState.h:
+ * Shared/WebPageCreationParameters.h:
+ * Shared/mac/ObjCObjectGraph.mm:
+ (WebKit::typeFromObject):
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::sendSecItemRequest):
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+ * UIProcess/API/Cocoa/WKSecurityOrigin.mm:
+ (-[WKSecurityOrigin port]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLayerTree:]):
+ (-[WKWebView _navigationGestureDidEnd]):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataType):
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::setCursor):
+ * UIProcess/API/mac/WKView.mm:
+ (toCoreScrollbarStyle):
+ (toAPIScrollbarStyle):
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
+ (WebKit::WebPaymentCoordinatorProxy::completeShippingMethodSelection):
+ (WebKit::WebPaymentCoordinatorProxy::completeShippingContactSelection):
+ (WebKit::WebPaymentCoordinatorProxy::completePaymentMethodSelection):
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in:
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toPKPaymentSummaryItem):
+ (WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection):
+ (WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection):
+ (WebKit::WebPaymentCoordinatorProxy::platformCompletePaymentMethodSelection):
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::webFrameIDForHandle):
+ (WebKit::WebAutomationSession::switchToBrowsingContext):
+ (WebKit::WebAutomationSession::evaluateJavaScriptFunction):
+ (WebKit::WebAutomationSession::resolveChildFrameHandle):
+ (WebKit::WebAutomationSession::resolveParentFrameHandle):
+ (WebKit::WebAutomationSession::computeElementLayout):
+ * UIProcess/Automation/WebAutomationSession.h:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::updateViewExposedRect):
+ (WebKit::WebViewImpl::setOverlayScrollbarStyle):
+ (WebKit::WebViewImpl::overlayScrollbarStyle):
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::setViewExposedRect):
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::viewExposedRect):
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+ (WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
+ * UIProcess/InspectorServer/WebSocketServerConnection.h:
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll):
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/RemoteScrollingTree.cpp:
+ (WebKit::RemoteScrollingTree::scrollingTreeNodeDidScroll):
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::fileCreationTime):
+ (WebKit::fileModificationTime):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::backForwardListState):
+ (WebKit::WebBackForwardList::restoreFromState):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setOverlayScrollbarStyle):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::overlayScrollbarStyle):
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebsiteData/WebsiteDataRecord.h:
+ * UIProcess/efl/WebView.cpp:
+ (WebKit::WebView::transformFromScene):
+ * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+ * UIProcess/gtk/WebPreferencesGtk.cpp:
+ (WebKit::WebPreferences::platformInitializeStore):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _scrollOffsetForEvent:]):
+ (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::encodeFormDataElement):
+ (WebKit::decodeFormDataElement):
+ (WebKit::decodeV1SessionHistory):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::setViewExposedRect):
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::completeShippingMethodSelection):
+ (WebKit::WebPaymentCoordinator::completeShippingContactSelection):
+ (WebKit::WebPaymentCoordinator::completePaymentMethodSelection):
+ * WebProcess/ApplePay/WebPaymentCoordinator.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetEventThrottlingBehaviorOverride):
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::PDFPlugin::convertFromPDFViewToRootView):
+ (WebKit::PDFPlugin::convertFromPDFViewToScreen):
+ (WebKit::PDFPlugin::boundsOnScreen):
+ (WebKit::PDFPlugin::geometryDidChange):
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::geometryDidChange):
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::performFrameLoadURLRequest):
+ (WebKit::PluginView::evaluate):
+ * WebProcess/Plugins/WebPluginInfoProvider.cpp:
+ (WebKit::WebPluginInfoProvider::pluginLoadClientPolicyForHost):
+ * WebProcess/Plugins/WebPluginInfoProvider.h:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+ (WebKit::RemoteScrollingCoordinator::scrollPositionChangedForNode):
+ * WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+ (WebKit::toFormData):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::preferredScrollbarOverlayStyle):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::certificateInfo):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_userInterfaceLayoutDirection):
+ (WebKit::WebPage::setScrollbarOverlayStyle):
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::scrollbarOverlayStyle):
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::setViewExposedRect):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::setViewExposedRect):
+
</ins><span class="cx"> 2016-11-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert IntersectionObserver over to using RuntimeEnabledFeatures so it can be properly excluded from script
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx"> if (response.isHttpVersion0_9()) {
</span><span class="cx"> auto url = response.url();
</span><del>- Optional<uint16_t> port = url.port();
</del><ins>+ std::optional<uint16_t> port = url.port();
</ins><span class="cx"> if (port && !isDefaultPortForProtocol(port.value(), url.protocol())) {
</span><span class="cx"> cancel();
</span><span class="cx"> m_client->didCompleteWithError({ String(), 0, url, "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9." });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> const NetworkLoadParameters m_parameters;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> RefPtr<NetworkDataTask> m_task;
</span><del>- Optional<WebCore::AuthenticationChallenge> m_challenge;
</del><ins>+ std::optional<WebCore::AuthenticationChallenge> m_challenge;
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> ChallengeCompletionHandler m_challengeCompletionHandler;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool responseHasExpired(const WebCore::ResourceResponse& response, std::chrono::system_clock::time_point timestamp, Optional<std::chrono::microseconds> maxStale)
</del><ins>+static bool responseHasExpired(const WebCore::ResourceResponse& response, std::chrono::system_clock::time_point timestamp, std::optional<std::chrono::microseconds> maxStale)
</ins><span class="cx"> {
</span><span class="cx"> if (response.cacheControlContainsNoCache())
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename T> struct Coder<Optional<T>> {
- static void encode(Encoder& encoder, const Optional<T>& optional)
</del><ins>+template<typename T> struct Coder<std::optional<T>> {
+ static void encode(Encoder& encoder, const std::optional<T>& optional)
</ins><span class="cx"> {
</span><span class="cx"> if (!optional) {
</span><span class="cx"> encoder << false;
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> encoder << optional.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static bool decode(Decoder& decoder, Optional<T>& optional)
</del><ins>+ static bool decode(Decoder& decoder, std::optional<T>& optional)
</ins><span class="cx"> {
</span><span class="cx"> bool isEngaged;
</span><span class="cx"> if (!decoder.decode(isEngaged))
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!isEngaged) {
</span><del>- optional = Nullopt;
</del><ins>+ optional = std::nullopt;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> return salt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<Salt> readOrMakeSalt(const String& path)
</del><ins>+std::optional<Salt> readOrMakeSalt(const String& path)
</ins><span class="cx"> {
</span><span class="cx"> auto cpath = WebCore::fileSystemRepresentation(path);
</span><span class="cx"> auto fd = open(cpath.data(), O_RDONLY, 0);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> using Salt = std::array<uint8_t, 8>;
</span><span class="cx">
</span><del>-Optional<Salt> readOrMakeSalt(const String& path);
</del><ins>+std::optional<Salt> readOrMakeSalt(const String& path);
</ins><span class="cx"> SHA1::Digest computeSHA1(const Data&, const Salt&);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> class SpeculativeLoadManager::PreloadedEntry : private ExpiringEntry {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PreloadedEntry(std::unique_ptr<Entry> entry, Optional<ResourceRequest>&& speculativeValidationRequest, std::function<void()>&& lifetimeReachedHandler)
</del><ins>+ PreloadedEntry(std::unique_ptr<Entry> entry, std::optional<ResourceRequest>&& speculativeValidationRequest, std::function<void()>&& lifetimeReachedHandler)
</ins><span class="cx"> : ExpiringEntry(WTFMove(lifetimeReachedHandler))
</span><span class="cx"> , m_entry(WTFMove(entry))
</span><span class="cx"> , m_speculativeValidationRequest(WTFMove(speculativeValidationRequest))
</span><span class="lines">@@ -145,12 +145,12 @@
</span><span class="cx"> return WTFMove(m_entry);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Optional<ResourceRequest>& revalidationRequest() const { return m_speculativeValidationRequest; }
</del><ins>+ const std::optional<ResourceRequest>& revalidationRequest() const { return m_speculativeValidationRequest; }
</ins><span class="cx"> bool wasRevalidated() const { return !!m_speculativeValidationRequest; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<Entry> m_entry;
</span><del>- Optional<ResourceRequest> m_speculativeValidationRequest;
</del><ins>+ std::optional<ResourceRequest> m_speculativeValidationRequest;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SpeculativeLoadManager::PendingFrameLoad : public RefCounted<PendingFrameLoad> {
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> pendingFrameLoad->registerSubresourceLoad(request, resourceKey);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, Optional<ResourceRequest>&& revalidationRequest)
</del><ins>+void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, std::optional<ResourceRequest>&& revalidationRequest)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(entry);
</span><span class="cx"> ASSERT(!entry->needsValidation());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> class PreloadedEntry;
</span><span class="cx">
</span><del>- void addPreloadedEntry(std::unique_ptr<Entry>, const GlobalFrameID&, Optional<WebCore::ResourceRequest>&& revalidationRequest = Nullopt);
</del><ins>+ void addPreloadedEntry(std::unique_ptr<Entry>, const GlobalFrameID&, std::optional<WebCore::ResourceRequest>&& revalidationRequest = std::nullopt);
</ins><span class="cx"> void preloadEntry(const Key&, const SubresourceInfo&, const GlobalFrameID&);
</span><span class="cx"> void retrieveEntryFromStorage(const Key&, RetrieveCompletionHandler&&);
</span><span class="cx"> void revalidateEntry(std::unique_ptr<Entry>, const SubresourceInfo&, const GlobalFrameID&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> ASSERT(retrieveDecision != RetrieveDecision::Yes);
</span><span class="cx">
</span><span class="cx"> auto hash = key.hashAsString();
</span><del>- queryWasEverRequested(hash, NeedUncachedReason::No, [this, hash, requestURL = request.url(), webPageID, retrieveDecision](bool wasEverRequested, const Optional<StoreDecision>&) {
</del><ins>+ queryWasEverRequested(hash, NeedUncachedReason::No, [this, hash, requestURL = request.url(), webPageID, retrieveDecision](bool wasEverRequested, const std::optional<StoreDecision>&) {
</ins><span class="cx"> if (wasEverRequested) {
</span><span class="cx"> String diagnosticKey = retrieveDecisionToDiagnosticKey(retrieveDecision);
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously requested but we are not using the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> void Statistics::recordRetrievalFailure(uint64_t webPageID, const Key& key, const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> auto hash = key.hashAsString();
</span><del>- queryWasEverRequested(hash, NeedUncachedReason::Yes, [this, hash, requestURL = request.url(), webPageID](bool wasPreviouslyRequested, const Optional<StoreDecision>& storeDecision) {
</del><ins>+ queryWasEverRequested(hash, NeedUncachedReason::Yes, [this, hash, requestURL = request.url(), webPageID](bool wasPreviouslyRequested, const std::optional<StoreDecision>& storeDecision) {
</ins><span class="cx"> if (wasPreviouslyRequested) {
</span><span class="cx"> String diagnosticKey = storeDecisionToDiagnosticKey(storeDecision.value());
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously request but is not in the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> // Query pending writes first.
</span><span class="cx"> bool wasAlreadyRequested = m_hashesToAdd.contains(hash);
</span><span class="cx"> if (wasAlreadyRequested && needUncachedReason == NeedUncachedReason::No) {
</span><del>- completionHandler(true, Nullopt);
</del><ins>+ completionHandler(true, std::nullopt);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (needUncachedReason == NeedUncachedReason::Yes && m_storeDecisionsToAdd.contains(hash)) {
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> m_activeQueries.add(WTFMove(everRequestedQuery));
</span><span class="cx"> serialBackgroundIOQueue().dispatch([this, wasAlreadyRequested, &query] () mutable {
</span><span class="cx"> WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><del>- Optional<StoreDecision> storeDecision;
</del><ins>+ std::optional<StoreDecision> storeDecision;
</ins><span class="cx"> if (m_database.isOpen()) {
</span><span class="cx"> if (!wasAlreadyRequested) {
</span><span class="cx"> WebCore::SQLiteStatement statement(m_database, ASCIILiteral("SELECT hash FROM AlreadyRequested WHERE hash=?"));
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void addStoreDecisionsToDatabase(const HashMap<String, NetworkCache::StoreDecision>&);
</span><span class="cx"> void writeTimerFired();
</span><span class="cx">
</span><del>- typedef std::function<void (bool wasEverRequested, const Optional<StoreDecision>&)> RequestedCompletionHandler;
</del><ins>+ typedef std::function<void (bool wasEverRequested, const std::optional<StoreDecision>&)> RequestedCompletionHandler;
</ins><span class="cx"> enum class NeedUncachedReason { No, Yes };
</span><span class="cx"> void queryWasEverRequested(const String&, NeedUncachedReason, RequestedCompletionHandler&&);
</span><span class="cx"> void markAsRequested(const String& hash);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> return Data(encoder.buffer(), encoder.bufferSize());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<BlobStorage::Blob> Storage::storeBodyAsBlob(WriteOperation& writeOperation)
</del><ins>+std::optional<BlobStorage::Blob> Storage::storeBodyAsBlob(WriteOperation& writeOperation)
</ins><span class="cx"> {
</span><span class="cx"> auto blobPath = blobPathForKey(writeOperation.record.key);
</span><span class="cx">
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> return blob;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Data Storage::encodeRecord(const Record& record, Optional<BlobStorage::Blob> blob)
</del><ins>+Data Storage::encodeRecord(const Record& record, std::optional<BlobStorage::Blob> blob)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!blob || bytesEqual(blob.value().data, record.body));
</span><span class="cx">
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> ++writeOperation.activeCount;
</span><span class="cx">
</span><span class="cx"> bool shouldStoreAsBlob = shouldStoreBodyAsBlob(writeOperation.record.body);
</span><del>- auto blob = shouldStoreAsBlob ? storeBodyAsBlob(writeOperation) : Nullopt;
</del><ins>+ auto blob = shouldStoreAsBlob ? storeBodyAsBlob(writeOperation) : std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto recordData = encodeRecord(writeOperation.record, blob);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -124,8 +124,8 @@
</span><span class="cx"> void dispatchPendingWriteOperations();
</span><span class="cx"> void finishWriteOperation(WriteOperation&);
</span><span class="cx">
</span><del>- Optional<BlobStorage::Blob> storeBodyAsBlob(WriteOperation&);
- Data encodeRecord(const Record&, Optional<BlobStorage::Blob>);
</del><ins>+ std::optional<BlobStorage::Blob> storeBodyAsBlob(WriteOperation&);
+ Data encodeRecord(const Record&, std::optional<BlobStorage::Blob>);
</ins><span class="cx"> void readRecord(ReadOperation&, const Data&);
</span><span class="cx">
</span><span class="cx"> void updateFileModificationTime(const String& path);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename T> struct ArgumentCoder<WTF::Optional<T>> {
- static void encode(Encoder& encoder, const WTF::Optional<T>& optional)
</del><ins>+template<typename T> struct ArgumentCoder<std::optional<T>> {
+ static void encode(Encoder& encoder, const std::optional<T>& optional)
</ins><span class="cx"> {
</span><span class="cx"> if (!optional) {
</span><span class="cx"> encoder << false;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> encoder << optional.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static bool decode(Decoder& decoder, WTF::Optional<T>& optional)
</del><ins>+ static bool decode(Decoder& decoder, std::optional<T>& optional)
</ins><span class="cx"> {
</span><span class="cx"> bool isEngaged;
</span><span class="cx"> if (!decoder.decode(isEngaged))
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!isEngaged) {
</span><del>- optional = Nullopt;
</del><ins>+ optional = std::nullopt;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> void postConnectionDidCloseOnConnectionWorkQueue();
</span><span class="cx">
</span><span class="cx"> template<typename T> bool send(T&& message, uint64_t destinationID, OptionSet<SendOption> sendOptions = { });
</span><del>- template<typename T> void sendWithReply(T&& message, uint64_t destinationID, FunctionDispatcher& replyDispatcher, Function<void (Optional<typename CodingType<typename T::Reply>::Type>)>&& replyHandler);
</del><ins>+ template<typename T> void sendWithReply(T&& message, uint64_t destinationID, FunctionDispatcher& replyDispatcher, Function<void (std::optional<typename CodingType<typename T::Reply>::Type>)>&& replyHandler);
</ins><span class="cx"> template<typename T> bool sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, Seconds timeout = Seconds::infinity(), OptionSet<SendSyncOption> sendSyncOptions = { });
</span><span class="cx"> template<typename T> bool waitForAndDispatchImmediately(uint64_t destinationID, Seconds timeout, OptionSet<WaitForOption> waitForOptions = { });
</span><span class="cx">
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-void Connection::sendWithReply(T&& message, uint64_t destinationID, FunctionDispatcher& replyDispatcher, Function<void (Optional<typename CodingType<typename T::Reply>::Type>)>&& replyHandler)
</del><ins>+void Connection::sendWithReply(T&& message, uint64_t destinationID, FunctionDispatcher& replyDispatcher, Function<void (std::optional<typename CodingType<typename T::Reply>::Type>)>&& replyHandler)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t requestID = 0;
</span><span class="cx"> std::unique_ptr<Encoder> encoder = createSyncMessageEncoder(T::receiverName(), T::name(), destinationID, requestID);
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- replyHandler(Nullopt);
</del><ins>+ replyHandler(std::nullopt);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/SharedMemory.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Platform/SharedMemory.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> Protection m_protection;
</span><span class="cx">
</span><span class="cx"> #if USE(UNIX_DOMAIN_SOCKETS)
</span><del>- Optional<int> m_fileDescriptor;
</del><ins>+ std::optional<int> m_fileDescriptor;
</ins><span class="cx"> bool m_isWrappingMap { false };
</span><span class="cx"> #elif OS(DARWIN)
</span><span class="cx"> mach_port_t m_port;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedMemory> instance = wrapMap(data, handle.m_attachment.size(), -1);
</span><del>- instance->m_fileDescriptor = Nullopt;
</del><ins>+ instance->m_fileDescriptor = std::nullopt;
</ins><span class="cx"> instance->m_isWrappingMap = false;
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> class_template_types = {
</span><span class="cx"> 'HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><del>- 'Optional': {'headers': ['<wtf/Optional.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</del><ins>+ 'std::optional': {'headers': ['<wtf/Optional.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</ins><span class="cx"> 'OptionSet': {'headers': ['<wtf/OptionSet.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> 'Vector': {'headers': ['<wtf/Vector.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> 'std::pair': {'headers': ['<utility>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPISecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> return create(WebCore::SecurityOrigin::createFromString(string));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static RefPtr<SecurityOrigin> create(const WTF::String& protocol, const WTF::String& host, Optional<uint16_t> port)
</del><ins>+ static RefPtr<SecurityOrigin> create(const WTF::String& protocol, const WTF::String& host, std::optional<uint16_t> port)
</ins><span class="cx"> {
</span><span class="cx"> return create(WebCore::SecurityOrigin::create(protocol, host, port));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> CString replySignature;
</span><span class="cx"> Vector<HashSet<Class>> allowedReplyClasses;
</span><span class="cx"> };
</span><del>- Optional<ReplyInfo> replyInfo;
</del><ins>+ std::optional<ReplyInfo> replyInfo;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @implementation _WKRemoteObjectInterface {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOriginRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
</span><span class="cx"> {
</span><del>- return toImpl(securityOrigin)->securityOrigin().port().valueOr(0);
</del><ins>+ return toImpl(securityOrigin)->securityOrigin().port().value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For backwards ABI compatibility.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> // File.
</span><span class="cx"> String filePath;
</span><span class="cx"> int64_t fileStart;
</span><del>- Optional<int64_t> fileLength;
- Optional<double> expectedFileModificationTime;
</del><ins>+ std::optional<int64_t> fileLength;
+ std::optional<double> expectedFileModificationTime;
</ins><span class="cx">
</span><span class="cx"> // Blob.
</span><span class="cx"> String blobURLString;
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> String target;
</span><span class="cx">
</span><span class="cx"> Vector<String> documentState;
</span><del>- Optional<Vector<uint8_t>> stateObjectData;
</del><ins>+ std::optional<Vector<uint8_t>> stateObjectData;
</ins><span class="cx">
</span><span class="cx"> int64_t documentSequenceNumber;
</span><span class="cx"> int64_t itemSequenceNumber;
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> WebCore::IntPoint scrollPosition;
</span><span class="cx"> float pageScaleFactor;
</span><span class="cx">
</span><del>- Optional<HTTPBody> httpBody;
</del><ins>+ std::optional<HTTPBody> httpBody;
</ins><span class="cx">
</span><span class="cx"> // FIXME: These should not be per frame.
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> static bool decode(IPC::Decoder&, BackForwardListState&);
</span><span class="cx">
</span><span class="cx"> Vector<BackForwardListItemState> items;
</span><del>- Optional<uint32_t> currentIndex;
</del><ins>+ std::optional<uint32_t> currentIndex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct SessionState {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior;
</span><span class="cx">
</span><del>- // FIXME: This should be WTF::Optional<WebCore::ScrollbarOverlayStyle>, but we would need to
</del><ins>+ // FIXME: This should be std::optional<WebCore::ScrollbarOverlayStyle>, but we would need to
</ins><span class="cx"> // correctly handle enums inside Optionals when encoding and decoding.
</span><del>- WTF::Optional<uint32_t> scrollbarOverlayStyle;
</del><ins>+ std::optional<uint32_t> scrollbarOverlayStyle;
</ins><span class="cx">
</span><span class="cx"> bool backgroundExtendsBeyondPage;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacObjCObjectGraphmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static Optional<ObjCType> typeFromObject(id object)
</del><ins>+static std::optional<ObjCType> typeFromObject(id object)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(object);
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> return ObjCType::WKTypeRefWrapper;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ObjCObjectGraph::encode(IPC::Encoder& encoder, id object)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> return *workQueue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
</del><ins>+static std::optional<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
</ins><span class="cx"> {
</span><del>- Optional<SecItemResponseData> response;
</del><ins>+ std::optional<SecItemResponseData> response;
</ins><span class="cx">
</span><span class="cx"> auto semaphore = adoptOSObject(dispatch_semaphore_create(0));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx">
</span><span class="cx"> detailsMap.set(toImpl(WKKeyValueStorageManagerGetOriginKey())->string(), origin);
</span><span class="cx"> if (originDetails.creationTime)
</span><del>- detailsMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(originDetails.creationTime.valueOr(0)));
</del><ins>+ detailsMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(originDetails.creationTime.value_or(0)));
</ins><span class="cx"> if (originDetails.modificationTime)
</span><del>- detailsMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(originDetails.modificationTime.valueOr(0)));
</del><ins>+ detailsMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(originDetails.modificationTime.value_or(0)));
</ins><span class="cx">
</span><span class="cx"> result.uncheckedAppend(API::Dictionary::create(WTFMove(detailsMap)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKSecurityOriginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSInteger)port
</span><span class="cx"> {
</span><del>- return _securityOrigin->securityOrigin().port().valueOr(0);
</del><ins>+ return _securityOrigin->securityOrigin().port().value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -235,11 +235,11 @@
</span><span class="cx"> uint64_t _firstPaintAfterCommitLoadTransactionID;
</span><span class="cx"> DynamicViewportUpdateMode _dynamicViewportUpdateMode;
</span><span class="cx"> CATransform3D _resizeAnimationTransformAdjustments;
</span><del>- Optional<uint64_t> _resizeAnimationTransformTransactionID;
</del><ins>+ std::optional<uint64_t> _resizeAnimationTransformTransactionID;
</ins><span class="cx"> RetainPtr<UIView> _resizeAnimationView;
</span><span class="cx"> CGFloat _lastAdjustmentForScroller;
</span><del>- Optional<CGRect> _frozenVisibleContentRect;
- Optional<CGRect> _frozenUnobscuredContentRect;
</del><ins>+ std::optional<CGRect> _frozenVisibleContentRect;
+ std::optional<CGRect> _frozenUnobscuredContentRect;
</ins><span class="cx">
</span><span class="cx"> BOOL _needsToRestoreScrollPosition;
</span><span class="cx"> BOOL _commitDidRestoreScrollPosition;
</span><span class="lines">@@ -1271,7 +1271,7 @@
</span><span class="cx">
</span><span class="cx"> if (_dynamicViewportUpdateMode != DynamicViewportUpdateMode::NotResizing) {
</span><span class="cx"> if (_resizeAnimationTransformTransactionID && layerTreeTransaction.transactionID() >= _resizeAnimationTransformTransactionID.value()) {
</span><del>- _resizeAnimationTransformTransactionID = Nullopt;
</del><ins>+ _resizeAnimationTransformTransactionID = std::nullopt;
</ins><span class="cx"> [_resizeAnimationView layer].sublayerTransform = _resizeAnimationTransformAdjustments;
</span><span class="cx"> if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::ResizingWithDocumentHidden) {
</span><span class="cx"> [_contentView setHidden:NO];
</span><span class="lines">@@ -2301,8 +2301,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_navigationGestureDidEnd
</span><span class="cx"> {
</span><del>- _frozenVisibleContentRect = Nullopt;
- _frozenUnobscuredContentRect = Nullopt;
</del><ins>+ _frozenVisibleContentRect = std::nullopt;
+ _frozenUnobscuredContentRect = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> return (WKWebsiteDataRecord *)websiteDataRecord.wrapper();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline Optional<WebsiteDataType> toWebsiteDataType(NSString *websiteDataType)
</del><ins>+static inline std::optional<WebsiteDataType> toWebsiteDataType(NSString *websiteDataType)
</ins><span class="cx"> {
</span><span class="cx"> if ([websiteDataType isEqualToString:WKWebsiteDataTypeCookies])
</span><span class="cx"> return WebsiteDataType::Cookies;
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if ([websiteDataType isEqualToString:_WKWebsiteDataTypeResourceLoadStatistics])
</span><span class="cx"> return WebsiteDataType::WebsiteDataTypeResourceLoadStatistics;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline OptionSet<WebKit::WebsiteDataType> toWebsiteDataTypes(NSSet *websiteDataTypes)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx">
</span><del>- Optional<IntPoint> hotSpot = cursorImage->hotSpot();
</del><ins>+ std::optional<IntPoint> hotSpot = cursorImage->hotSpot();
</ins><span class="cx"> Ecore_X_Cursor customCursor = createCustomCursor(window, cursorImage, IntSize(cursorImage->size()), hotSpot ? hotSpot.value() : IntPoint());
</span><span class="cx"> if (!customCursor)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1329,7 +1329,7 @@
</span><span class="cx"> return _data->_impl->totalHeightOfBanners();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static WTF::Optional<WebCore::ScrollbarOverlayStyle> toCoreScrollbarStyle(_WKOverlayScrollbarStyle scrollbarStyle)
</del><ins>+static std::optional<WebCore::ScrollbarOverlayStyle> toCoreScrollbarStyle(_WKOverlayScrollbarStyle scrollbarStyle)
</ins><span class="cx"> {
</span><span class="cx"> switch (scrollbarStyle) {
</span><span class="cx"> case _WKOverlayScrollbarStyleDark:
</span><span class="lines">@@ -1343,10 +1343,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static _WKOverlayScrollbarStyle toAPIScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle> coreScrollbarStyle)
</del><ins>+static _WKOverlayScrollbarStyle toAPIScrollbarStyle(std::optional<WebCore::ScrollbarOverlayStyle> coreScrollbarStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (!coreScrollbarStyle)
</span><span class="cx"> return _WKOverlayScrollbarStyleAutomatic;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> m_merchantValidationState = MerchantValidationState::ValidationComplete;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::completeShippingMethodSelection(uint32_t opaqueStatus, const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::completeShippingMethodSelection(uint32_t opaqueStatus, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> // It's possible that the payment has been canceled already.
</span><span class="cx"> if (m_state == State::Idle)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> m_state = State::Active;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::completeShippingContactSelection(uint32_t opaqueStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::completeShippingContactSelection(uint32_t opaqueStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> // It's possible that the payment has been canceled already.
</span><span class="cx"> if (m_state == State::Idle)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> m_state = State::Active;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::completePaymentMethodSelection(const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::completePaymentMethodSelection(const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> // It's possible that the payment has been canceled already.
</span><span class="cx"> if (m_state == State::Idle)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> void openPaymentSetup(const String& merchantIdentifier, const String& domainName, uint64_t requestID);
</span><span class="cx"> void showPaymentUI(const String& originatingURLString, const Vector<String>& linkIconURLStrings, const WebCore::PaymentRequest&, bool& result);
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&);
</span><del>- void completeShippingMethodSelection(uint32_t opaqueStatus, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
- void completeShippingContactSelection(uint32_t opaqueStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
- void completePaymentMethodSelection(const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</del><ins>+ void completeShippingMethodSelection(uint32_t opaqueStatus, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
+ void completeShippingContactSelection(uint32_t opaqueStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
+ void completePaymentMethodSelection(const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</ins><span class="cx"> void completePaymentSession(uint32_t opaqueStatus);
</span><span class="cx"> void abortPaymentSession();
</span><span class="cx">
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> void platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler);
</span><span class="cx"> void platformShowPaymentUI(const WebCore::URL& originatingURL, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&, std::function<void (bool)> completionHandler);
</span><span class="cx"> void platformCompleteMerchantValidation(const WebCore::PaymentMerchantSession&);
</span><del>- void platformCompleteShippingMethodSelection(WebCore::PaymentAuthorizationStatus, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
- void platformCompleteShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
- void platformCompletePaymentMethodSelection(const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</del><ins>+ void platformCompleteShippingMethodSelection(WebCore::PaymentAuthorizationStatus, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
+ void platformCompleteShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
+ void platformCompletePaymentMethodSelection(const std::optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</ins><span class="cx"> void platformCompletePaymentSession(WebCore::PaymentAuthorizationStatus);
</span><span class="cx">
</span><span class="cx"> WebPageProxy& m_webPageProxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> ShowPaymentUI(String originatingURLString, Vector<String> linkIconURLStrings, WebCore::PaymentRequest paymentRequest) -> (bool result)
</span><span class="cx"> CompleteMerchantValidation(WebCore::PaymentMerchantSession paymentMerchantSession);
</span><del>- CompleteShippingMethodSelection(uint32_t opaqueStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
- CompleteShippingContactSelection(uint32_t opaqueStatus, Vector<WebCore::PaymentRequest::ShippingMethod> newShippingMethods, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
- CompletePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+ CompleteShippingMethodSelection(uint32_t opaqueStatus, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
+ CompleteShippingContactSelection(uint32_t opaqueStatus, Vector<WebCore::PaymentRequest::ShippingMethod> newShippingMethods, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
+ CompletePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> CompletePaymentSession(uint32_t opaqueStatus)
</span><span class="cx"> AbortPaymentSession()
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> static RetainPtr<PKPaymentSummaryItem> toPKPaymentSummaryItem(const WebCore::PaymentRequest::LineItem& lineItem)
</span><span class="cx"> {
</span><del>- return [getPKPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount.valueOr(0)).get() type:toPKPaymentSummaryItemType(lineItem.type)];
</del><ins>+ return [getPKPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount.value_or(0)).get() type:toPKPaymentSummaryItemType(lineItem.type)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PKMerchantCapability toPKMerchantCapabilities(const WebCore::PaymentRequest::MerchantCapabilities& merchantCapabilities)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_sessionBlock = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection(WebCore::PaymentAuthorizationStatus status, const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection(WebCore::PaymentAuthorizationStatus status, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewController);
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewControllerDelegate);
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_didSelectShippingMethodCompletion = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection(WebCore::PaymentAuthorizationStatus status, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection(WebCore::PaymentAuthorizationStatus status, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewController);
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewControllerDelegate);
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_didSelectShippingContactCompletion = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinatorProxy::platformCompletePaymentMethodSelection(const Optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</del><ins>+void WebPaymentCoordinatorProxy::platformCompletePaymentMethodSelection(const std::optional<WebCore::PaymentRequest::TotalAndLineItems>& newTotalAndLineItems)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewController);
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewControllerDelegate);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> static const char* const errorNameAndDetailsSeparator = ";";
</span><span class="cx">
</span><span class="cx"> // Make sure the predefined error name is valid, otherwise use InternalError.
</span><del>-#define VALIDATED_ERROR_MESSAGE(errorString) Inspector::Protocol::AutomationHelpers::parseEnumValueFromString<Inspector::Protocol::Automation::ErrorMessage>(errorString).valueOr(Inspector::Protocol::Automation::ErrorMessage::InternalError)
</del><ins>+#define VALIDATED_ERROR_MESSAGE(errorString) Inspector::Protocol::AutomationHelpers::parseEnumValueFromString<Inspector::Protocol::Automation::ErrorMessage>(errorString).value_or(Inspector::Protocol::Automation::ErrorMessage::InternalError)
</ins><span class="cx">
</span><span class="cx"> // If the error name is incorrect for these macros, it will be a compile-time error.
</span><span class="cx"> #define STRING_FOR_PREDEFINED_ERROR_NAME(errorName) Inspector::Protocol::AutomationHelpers::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::errorName)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> return handle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<uint64_t> WebAutomationSession::webFrameIDForHandle(const String& handle)
</del><ins>+std::optional<uint64_t> WebAutomationSession::webFrameIDForHandle(const String& handle)
</ins><span class="cx"> {
</span><span class="cx"> if (handle.isEmpty())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> auto iter = m_handleWebFrameMap.find(handle);
</span><span class="cx"> if (iter == m_handleWebFrameMap.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return iter->value;
</span><span class="cx"> }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
</span><span class="cx">
</span><del>- Optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</del><ins>+ std::optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</ins><span class="cx"> if (!frameID)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(FrameNotFound);
</span><span class="cx">
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
</span><span class="cx">
</span><del>- Optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</del><ins>+ std::optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</ins><span class="cx"> if (!frameID)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(FrameNotFound);
</span><span class="cx">
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
</span><span class="cx">
</span><del>- Optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</del><ins>+ std::optional<uint64_t> frameID = webFrameIDForHandle(optionalFrameHandle ? *optionalFrameHandle : emptyString());
</ins><span class="cx"> if (!frameID)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(FrameNotFound);
</span><span class="cx">
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
</span><span class="cx">
</span><del>- Optional<uint64_t> frameID = webFrameIDForHandle(frameHandle);
</del><ins>+ std::optional<uint64_t> frameID = webFrameIDForHandle(frameHandle);
</ins><span class="cx"> if (!frameID)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(FrameNotFound);
</span><span class="cx">
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
</span><span class="cx">
</span><del>- Optional<uint64_t> frameID = webFrameIDForHandle(frameHandle);
</del><ins>+ std::optional<uint64_t> frameID = webFrameIDForHandle(frameHandle);
</ins><span class="cx"> if (!frameID)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR(FrameNotFound);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> String handleForWebPageProxy(const WebPageProxy&);
</span><span class="cx"> RefPtr<Inspector::Protocol::Automation::BrowsingContext> buildBrowsingContextForPage(WebPageProxy&);
</span><span class="cx">
</span><del>- Optional<uint64_t> webFrameIDForHandle(const String&);
</del><ins>+ std::optional<uint64_t> webFrameIDForHandle(const String&);
</ins><span class="cx"> String handleForWebFrameID(uint64_t frameID);
</span><span class="cx"> String handleForWebFrameProxy(const WebFrameProxy&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -230,8 +230,8 @@
</span><span class="cx"> NSColor *underlayColor() const;
</span><span class="cx"> NSColor *pageExtendedBackgroundColor() const;
</span><span class="cx">
</span><del>- void setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle);
- WTF::Optional<WebCore::ScrollbarOverlayStyle> overlayScrollbarStyle() const;
</del><ins>+ void setOverlayScrollbarStyle(std::optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle);
+ std::optional<WebCore::ScrollbarOverlayStyle> overlayScrollbarStyle() const;
</ins><span class="cx">
</span><span class="cx"> void beginDeferringViewInWindowChanges();
</span><span class="cx"> // FIXME: Merge these two?
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> String m_promisedFilename;
</span><span class="cx"> String m_promisedURL;
</span><span class="cx">
</span><del>- WTF::Optional<NSInteger> m_spellCheckerDocumentTag;
</del><ins>+ std::optional<NSInteger> m_spellCheckerDocumentTag;
</ins><span class="cx">
</span><span class="cx"> CGFloat m_totalHeightOfBanners { 0 };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1635,7 +1635,7 @@
</span><span class="cx"> exposedRect = CGRectUnion(m_contentPreparationRect, exposedRect);
</span><span class="cx">
</span><span class="cx"> if (auto drawingArea = m_page->drawingArea())
</span><del>- drawingArea->setViewExposedRect(m_clipsToVisibleRect ? Optional<WebCore::FloatRect>(exposedRect) : Nullopt);
</del><ins>+ drawingArea->setViewExposedRect(m_clipsToVisibleRect ? std::optional<WebCore::FloatRect>(exposedRect) : std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::setClipsToVisibleRect(bool clipsToVisibleRect)
</span><span class="lines">@@ -2084,12 +2084,12 @@
</span><span class="cx"> return WebCore::nsColor(color);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebViewImpl::setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle)
</del><ins>+void WebViewImpl::setOverlayScrollbarStyle(std::optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle)
</ins><span class="cx"> {
</span><span class="cx"> m_page->setOverlayScrollbarStyle(scrollbarStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WTF::Optional<WebCore::ScrollbarOverlayStyle> WebViewImpl::overlayScrollbarStyle() const
</del><ins>+std::optional<WebCore::ScrollbarOverlayStyle> WebViewImpl::overlayScrollbarStyle() const
</ins><span class="cx"> {
</span><span class="cx"> return m_page->overlayScrollbarStyle();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void DrawingAreaProxy::setViewExposedRect(Optional<WebCore::FloatRect> viewExposedRect)
</del><ins>+void DrawingAreaProxy::setViewExposedRect(std::optional<WebCore::FloatRect> viewExposedRect)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_webPageProxy.isValid())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> virtual void commitTransientZoom(double, WebCore::FloatPoint) { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual void setViewExposedRect(Optional<WebCore::FloatRect>);
- Optional<WebCore::FloatRect> viewExposedRect() const { return m_viewExposedRect; }
</del><ins>+ virtual void setViewExposedRect(std::optional<WebCore::FloatRect>);
+ std::optional<WebCore::FloatRect> viewExposedRect() const { return m_viewExposedRect; }
</ins><span class="cx"> void viewExposedRectChangedTimerFired();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RunLoop::Timer<DrawingAreaProxy> m_viewExposedRectChangedTimer;
</span><del>- Optional<WebCore::FloatRect> m_viewExposedRect;
- Optional<WebCore::FloatRect> m_lastSentViewExposedRect;
</del><ins>+ std::optional<WebCore::FloatRect> m_viewExposedRect;
+ std::optional<WebCore::FloatRect> m_lastSentViewExposedRect;
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> m_server->didCloseWebSocketServerConnection(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, Optional<size_t> length)
</del><ins>+void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, std::optional<size_t> length)
</ins><span class="cx"> {
</span><span class="cx"> // Each didReceiveData call adds more data to our buffer.
</span><span class="cx"> // We clear the buffer when we have handled data from it.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // SocketStreamHandleClient implementation.
</span><span class="cx"> void didOpenSocketStream(WebCore::SocketStreamHandle&) final { }
</span><span class="cx"> void didCloseSocketStream(WebCore::SocketStreamHandle&) final;
</span><del>- void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, Optional<size_t> length) final;
</del><ins>+ void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, std::optional<size_t> length) final;
</ins><span class="cx"> void didUpdateBufferedAmount(WebCore::SocketStreamHandle&, size_t bufferedAmount) final;
</span><span class="cx"> void didFailSocketStream(WebCore::SocketStreamHandle&, const WebCore::SocketStreamError&) final { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This comes from the scrolling tree.
</span><del>-void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll(ScrollingNodeID scrolledNodeID, const FloatPoint& newScrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll(ScrollingNodeID scrolledNodeID, const FloatPoint& newScrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> // Scroll updates for the main frame are sent via WebPageProxy::updateVisibleContentRects()
</span><span class="cx"> // so don't send them here.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> bool visualViewportEnabled() const { return m_scrollingTree && m_scrollingTree->visualViewportEnabled(); }
</span><span class="cx">
</span><span class="cx"> // Inform the web process that the scroll position changed (called from the scrolling tree)
</span><del>- void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& newScrollPosition, const Optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction);
</del><ins>+ void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& newScrollPosition, const std::optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction);
</ins><span class="cx"> void scrollingTreeNodeRequestsScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool representsProgrammaticScroll);
</span><span class="cx">
</span><span class="cx"> WebCore::TrackingType eventTrackingTypeForPoint(const AtomicString& eventName, WebCore::IntPoint) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void RemoteScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const Optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</del><ins>+void RemoteScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, const std::optional<FloatPoint>& layoutViewportOrigin, ScrollingLayerPositionAction scrollingLayerPositionAction)
</ins><span class="cx"> {
</span><span class="cx"> m_scrollingCoordinatorProxy.scrollingTreeNodeDidScroll(nodeID, scrollPosition, layoutViewportOrigin, scrollingLayerPositionAction);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> const RemoteScrollingCoordinatorProxy& scrollingCoordinatorProxy() const { return m_scrollingCoordinatorProxy; }
</span><span class="cx">
</span><del>- void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, const Optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction = WebCore::ScrollingLayerPositionAction::Sync) override;
</del><ins>+ void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, const std::optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction = WebCore::ScrollingLayerPositionAction::Sync) override;
</ins><span class="cx"> void scrollingTreeNodeRequestsScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool representsProgrammaticScroll) override;
</span><span class="cx">
</span><span class="cx"> void currentSnapPointIndicesDidChange(WebCore::ScrollingNodeID, unsigned horizontal, unsigned vertical) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -125,17 +125,17 @@
</span><span class="cx"> deleteEmptyDirectory(m_localStorageDirectory);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<time_t> fileCreationTime(const String& filePath)
</del><ins>+static std::optional<time_t> fileCreationTime(const String& filePath)
</ins><span class="cx"> {
</span><span class="cx"> time_t time;
</span><del>- return getFileCreationTime(filePath, time) ? time : Optional<time_t>(Nullopt);
</del><ins>+ return getFileCreationTime(filePath, time) ? time : std::optional<time_t>(std::nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<time_t> fileModificationTime(const String& filePath)
</del><ins>+static std::optional<time_t> fileModificationTime(const String& filePath)
</ins><span class="cx"> {
</span><span class="cx"> time_t time;
</span><span class="cx"> if (!getFileModificationTime(filePath, time))
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return time;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx">
</span><span class="cx"> struct OriginDetails {
</span><span class="cx"> String originIdentifier;
</span><del>- Optional<time_t> creationTime;
- Optional<time_t> modificationTime;
</del><ins>+ std::optional<time_t> creationTime;
+ std::optional<time_t> modificationTime;
</ins><span class="cx"> };
</span><span class="cx"> Vector<OriginDetails> originDetails();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> auto request = UserMediaPermissionCheckProxy::create(*this, userMediaID);
</span><span class="cx"> m_pendingDeviceRequests.add(userMediaID, request.ptr());
</span><span class="cx">
</span><del>- auto userMediaOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(userMediaDocumentOriginIdentifier).valueOr(SecurityOriginData()).securityOrigin());
- auto topLevelOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(topLevelDocumentOriginIdentifier).valueOr(SecurityOriginData()).securityOrigin());
</del><ins>+ auto userMediaOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(userMediaDocumentOriginIdentifier).value_or(SecurityOriginData()).securityOrigin());
+ auto topLevelOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(topLevelDocumentOriginIdentifier).value_or(SecurityOriginData()).securityOrigin());
</ins><span class="cx">
</span><span class="cx"> if (!m_page.uiClient().checkUserMediaPermissionForOrigin(m_page, *m_page.process().webFrame(frameID), *userMediaOrigin.get(), *topLevelOrigin.get(), request.get())) {
</span><span class="cx"> m_pendingDeviceRequests.take(userMediaID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (backForwardListState.items.isEmpty())
</span><del>- backForwardListState.currentIndex = Nullopt;
</del><ins>+ backForwardListState.currentIndex = std::nullopt;
</ins><span class="cx"> else if (backForwardListState.items.size() <= backForwardListState.currentIndex.value())
</span><span class="cx"> backForwardListState.currentIndex = backForwardListState.items.size() - 1;
</span><span class="cx">
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> items.uncheckedAppend(WebBackForwardListItem::create(WTFMove(backForwardListItemState), m_page->pageID()));
</span><span class="cx"> }
</span><span class="cx"> m_hasCurrentIndex = !!backForwardListState.currentIndex;
</span><del>- m_currentIndex = backForwardListState.currentIndex.valueOr(0);
</del><ins>+ m_currentIndex = backForwardListState.currentIndex.value_or(0);
</ins><span class="cx"> m_entries = WTFMove(items);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -3295,7 +3295,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, bool containsPluginDocument, Optional<HasInsecureContent> hasInsecureContent, const UserData& userData)
</del><ins>+void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, bool containsPluginDocument, std::optional<HasInsecureContent> hasInsecureContent, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="lines">@@ -5552,7 +5552,7 @@
</span><span class="cx"> if (m_scrollbarOverlayStyle)
</span><span class="cx"> parameters.scrollbarOverlayStyle = m_scrollbarOverlayStyle.value();
</span><span class="cx"> else
</span><del>- parameters.scrollbarOverlayStyle = Nullopt;
</del><ins>+ parameters.scrollbarOverlayStyle = std::nullopt;
</ins><span class="cx"> parameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
</span><span class="cx"> parameters.layerHostingMode = m_layerHostingMode;
</span><span class="cx"> parameters.controlledByAutomation = m_controlledByAutomation;
</span><span class="lines">@@ -6180,7 +6180,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetScrollPinningBehavior(pinning), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle)
</del><ins>+void WebPageProxy::setOverlayScrollbarStyle(std::optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scrollbarOverlayStyle && !scrollbarStyle)
</span><span class="cx"> return;
</span><span class="lines">@@ -6190,7 +6190,7 @@
</span><span class="cx">
</span><span class="cx"> m_scrollbarOverlayStyle = scrollbarStyle;
</span><span class="cx">
</span><del>- WTF::Optional<uint32_t> scrollbarStyleForMessage;
</del><ins>+ std::optional<uint32_t> scrollbarStyleForMessage;
</ins><span class="cx"> if (scrollbarStyle)
</span><span class="cx"> scrollbarStyleForMessage = static_cast<ScrollbarOverlayStyle>(scrollbarStyle.value());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1018,8 +1018,8 @@
</span><span class="cx"> void setScrollPinningBehavior(WebCore::ScrollPinningBehavior);
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() const { return m_scrollPinningBehavior; }
</span><span class="cx">
</span><del>- void setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle>);
- WTF::Optional<WebCore::ScrollbarOverlayStyle> overlayScrollbarStyle() const { return m_scrollbarOverlayStyle; }
</del><ins>+ void setOverlayScrollbarStyle(std::optional<WebCore::ScrollbarOverlayStyle>);
+ std::optional<WebCore::ScrollbarOverlayStyle> overlayScrollbarStyle() const { return m_scrollbarOverlayStyle; }
</ins><span class="cx">
</span><span class="cx"> bool shouldRecordNavigationSnapshots() const { return m_shouldRecordNavigationSnapshots; }
</span><span class="cx"> void setShouldRecordNavigationSnapshots(bool shouldRecordSnapshots) { m_shouldRecordNavigationSnapshots = shouldRecordSnapshots; }
</span><span class="lines">@@ -1217,7 +1217,7 @@
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, const UserData&);
</span><span class="cx"> void didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, const String& url);
</span><span class="cx"> void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, const UserData&);
</span><del>- void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, Optional<WebCore::HasInsecureContent> forcedHasInsecureContent, const UserData&);
</del><ins>+ void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, std::optional<WebCore::HasInsecureContent> forcedHasInsecureContent, const UserData&);
</ins><span class="cx"> void didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="cx"> void didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="cx"> void didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, const UserData&);
</span><span class="lines">@@ -1915,7 +1915,7 @@
</span><span class="cx"> HiddenPageThrottlingAutoIncreasesCounter::Token m_hiddenPageDOMTimerThrottlingAutoIncreasesCount;
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior;
</span><del>- WTF::Optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</del><ins>+ std::optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</ins><span class="cx">
</span><span class="cx"> uint64_t m_navigationID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::UserData userData)
</span><span class="cx"> DidChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, String url)
</span><span class="cx"> DidFailProvisionalLoadForFrame(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, String provisionalURL, WebCore::ResourceError error, WebKit::UserData userData)
</span><del>- DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, Optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebKit::UserData userData)
</del><ins>+ DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, std::optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebKit::UserData userData)
</ins><span class="cx"> DidFailLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::UserData userData)
</span><span class="cx"> DidFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span><span class="cx"> DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> uint64_t totalSize;
</span><span class="cx"> HashMap<unsigned, uint64_t> typeSizes;
</span><span class="cx"> };
</span><del>- Optional<Size> size;
</del><ins>+ std::optional<Size> size;
</ins><span class="cx">
</span><span class="cx"> HashSet<WebCore::SecurityOriginData> origins;
</span><span class="cx"> HashSet<String> cookieHostNames;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/efl/WebView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> AffineTransform WebView::transformFromScene() const
</span><span class="cx"> {
</span><del>- return transformToScene().inverse().valueOr(AffineTransform());
</del><ins>+ return transformToScene().inverse().value_or(AffineTransform());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AffineTransform WebView::transformToScene() const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkAcceleratedBackingStoreX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static Optional<int> s_damageEventBase;
</del><ins>+static std::optional<int> s_damageEventBase;
</ins><span class="cx">
</span><span class="cx"> class XDamageNotifier {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(XDamageNotifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPreferencesGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
</span><span class="cx"> auto& display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay());
</span><del>- Optional<int> damageBase;
</del><ins>+ std::optional<int> damageBase;
</ins><span class="cx"> if (!display.supportsXComposite() || !display.supportsXDamage(damageBase))
</span><span class="cx"> setAcceleratedCompositingEnabled(false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -3188,16 +3188,16 @@
</span><span class="cx"> _uiEventBeingResent = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (Optional<FloatPoint>)_scrollOffsetForEvent:(WebIOSEvent *)event
</del><ins>+- (std::optional<FloatPoint>)_scrollOffsetForEvent:(WebIOSEvent *)event
</ins><span class="cx"> {
</span><span class="cx"> static const unsigned kWebSpaceKey = 0x20;
</span><span class="cx">
</span><span class="cx"> if (_page->editorState().isContentEditable)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> NSString *charactersIgnoringModifiers = event.charactersIgnoringModifiers;
</span><span class="cx"> if (!charactersIgnoringModifiers.length)
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> enum ScrollingIncrement { Document, Page, Line };
</span><span class="cx"> enum ScrollingDirection { Up, Down, Left, Right };
</span><span class="lines">@@ -3249,7 +3249,7 @@
</span><span class="cx"> if ([charactersIgnoringModifiers characterAtIndex:0] == kWebSpaceKey)
</span><span class="cx"> return computeOffset(Page, (event.modifierFlags & WebEventFlagMaskShift) ? Up : Down);
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_interpretKeyEvent:(WebIOSEvent *)event isCharEvent:(BOOL)isCharEvent
</span><span class="lines">@@ -3266,7 +3266,7 @@
</span><span class="cx"> if (!contentEditable && event.isTabKey)
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- if (Optional<FloatPoint> scrollOffset = [self _scrollOffsetForEvent:event]) {
</del><ins>+ if (std::optional<FloatPoint> scrollOffset = [self _scrollOffsetForEvent:event]) {
</ins><span class="cx"> [_webView _scrollByContentOffset:*scrollOffset];
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -282,8 +282,8 @@
</span><span class="cx"> encoder << false;
</span><span class="cx">
</span><span class="cx"> encoder << element.fileStart;
</span><del>- encoder << element.fileLength.valueOr(-1);
- encoder << element.expectedFileModificationTime.valueOr(std::numeric_limits<double>::quiet_NaN());
</del><ins>+ encoder << element.fileLength.value_or(-1);
+ encoder << element.expectedFileModificationTime.value_or(std::numeric_limits<double>::quiet_NaN());
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPBody::Element::Type::Blob:
</span><span class="lines">@@ -704,13 +704,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>- auto operator>>(Optional<T>& value) -> typename std::enable_if<std::is_enum<T>::value, HistoryEntryDataDecoder&>::type
</del><ins>+ auto operator>>(std::optional<T>& value) -> typename std::enable_if<std::is_enum<T>::value, HistoryEntryDataDecoder&>::type
</ins><span class="cx"> {
</span><span class="cx"> uint32_t underlyingEnumValue;
</span><span class="cx"> *this >> underlyingEnumValue;
</span><span class="cx">
</span><span class="cx"> if (!isValid() || !isValidEnum(static_cast<T>(underlyingEnumValue)))
</span><del>- value = Nullopt;
</del><ins>+ value = std::nullopt;
</ins><span class="cx"> else
</span><span class="cx"> value = static_cast<T>(underlyingEnumValue);
</span><span class="cx">
</span><span class="lines">@@ -790,7 +790,7 @@
</span><span class="cx">
</span><span class="cx"> static void decodeFormDataElement(HistoryEntryDataDecoder& decoder, HTTPBody::Element& formDataElement)
</span><span class="cx"> {
</span><del>- Optional<FormDataElementType> elementType;
</del><ins>+ std::optional<FormDataElementType> elementType;
</ins><span class="cx"> decoder >> elementType;
</span><span class="cx"> if (!elementType)
</span><span class="cx"> return;
</span><span class="lines">@@ -1068,7 +1068,7 @@
</span><span class="cx"> auto currentIndexNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
</span><span class="cx"> if (!currentIndexNumber) {
</span><span class="cx"> // No current index means the dictionary represents an empty session.
</span><del>- backForwardListState.currentIndex = Nullopt;
</del><ins>+ backForwardListState.currentIndex = std::nullopt;
</ins><span class="cx"> backForwardListState.items = { };
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void dispatchAfterEnsuringDrawing(std::function<void (CallbackBase::Error)>) override;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void setViewExposedRect(Optional<WebCore::FloatRect>) override;
</del><ins>+ void setViewExposedRect(std::optional<WebCore::FloatRect>) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> float indicatorScale(WebCore::IntSize contentsSize) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> static const float indicatorInset = 10;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void RemoteLayerTreeDrawingAreaProxy::setViewExposedRect(Optional<WebCore::FloatRect> viewExposedRect)
</del><ins>+void RemoteLayerTreeDrawingAreaProxy::setViewExposedRect(std::optional<WebCore::FloatRect> viewExposedRect)
</ins><span class="cx"> {
</span><span class="cx"> DrawingAreaProxy::setViewExposedRect(viewExposedRect);
</span><span class="cx"> updateDebugIndicatorPosition();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplePayWebPaymentCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -117,17 +117,17 @@
</span><span class="cx"> m_webPage.send(Messages::WebPaymentCoordinatorProxy::CompleteMerchantValidation(paymentMerchantSession));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinator::completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus status, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void WebPaymentCoordinator::completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus status, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> m_webPage.send(Messages::WebPaymentCoordinatorProxy::CompleteShippingMethodSelection(static_cast<uint32_t>(status), newTotalAndItems));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinator::completeShippingContactSelection(WebCore::PaymentAuthorizationStatus status, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void WebPaymentCoordinator::completeShippingContactSelection(WebCore::PaymentAuthorizationStatus status, const Vector<WebCore::PaymentRequest::ShippingMethod>& newShippingMethods, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> m_webPage.send(Messages::WebPaymentCoordinatorProxy::CompleteShippingContactSelection(static_cast<uint32_t>(status), newShippingMethods, newTotalAndItems));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPaymentCoordinator::completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</del><ins>+void WebPaymentCoordinator::completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems)
</ins><span class="cx"> {
</span><span class="cx"> m_webPage.send(Messages::WebPaymentCoordinatorProxy::CompletePaymentMethodSelection(newTotalAndItems));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplePayWebPaymentCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx"> void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) override;
</span><span class="cx"> bool showPaymentUI(const WebCore::URL& originatingURL, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&) override;
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&) override;
</span><del>- void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
- void completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
- void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
</del><ins>+ void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, std::optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completePaymentMethodSelection(std::optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
</ins><span class="cx"> void completePaymentSession(WebCore::PaymentAuthorizationStatus) override;
</span><span class="cx"> void abortPaymentSession() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx">
</span><span class="cx"> void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, EventThrottlingBehavior* behavior)
</span><span class="cx"> {
</span><del>- Optional<WebCore::EventThrottlingBehavior> behaviorValue;
</del><ins>+ std::optional<WebCore::EventThrottlingBehavior> behaviorValue;
</ins><span class="cx"> if (behavior) {
</span><span class="cx"> switch (*behavior) {
</span><span class="cx"> case EventThrottlingBehaviorResponsive:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1196,7 +1196,7 @@
</span><span class="cx"> IntPoint PDFPlugin::convertFromPDFViewToRootView(const IntPoint& point) const
</span><span class="cx"> {
</span><span class="cx"> IntPoint pointInPluginCoordinates(point.x(), size().height() - point.y());
</span><del>- return m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapPoint(pointInPluginCoordinates);
</del><ins>+ return m_rootViewToPluginTransform.inverse().value_or(AffineTransform()).mapPoint(pointInPluginCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect PDFPlugin::convertFromPDFViewToScreen(const FloatRect& rect) const
</span><span class="lines">@@ -1207,7 +1207,7 @@
</span><span class="cx"> return FloatRect();
</span><span class="cx">
</span><span class="cx"> FloatPoint originInPluginCoordinates(rect.x(), size().height() - rect.y() - rect.height());
</span><del>- FloatRect rectInRootViewCoordinates = m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapRect(FloatRect(originInPluginCoordinates, rect.size()));
</del><ins>+ FloatRect rectInRootViewCoordinates = m_rootViewToPluginTransform.inverse().value_or(AffineTransform()).mapRect(FloatRect(originInPluginCoordinates, rect.size()));
</ins><span class="cx">
</span><span class="cx"> return frameView->contentsToScreen(enclosingIntRect(rectInRootViewCoordinates));
</span><span class="cx"> }
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><span class="cx"> FloatRect bounds = FloatRect(FloatPoint(), size());
</span><del>- FloatRect rectInRootViewCoordinates = m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapRect(bounds);
</del><ins>+ FloatRect rectInRootViewCoordinates = m_rootViewToPluginTransform.inverse().value_or(AffineTransform()).mapRect(bounds);
</ins><span class="cx"> return frameView->contentsToScreen(enclosingIntRect(rectInRootViewCoordinates));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1230,7 +1230,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_size = pluginSize;
</span><del>- m_rootViewToPluginTransform = pluginToRootViewTransform.inverse().valueOr(AffineTransform());
</del><ins>+ m_rootViewToPluginTransform = pluginToRootViewTransform.inverse().value_or(AffineTransform());
</ins><span class="cx"> [m_pdfLayerController setFrameSize:pluginSize];
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx"> void PDFPlugin::geometryDidChange(const IntSize& pluginSize, const IntRect&, const AffineTransform& pluginToRootViewTransform)
</span><span class="cx"> {
</span><span class="cx"> m_pluginToRootViewTransform = pluginToRootViewTransform;
</span><del>- m_rootViewToPluginTransform = pluginToRootViewTransform.inverse().valueOr(AffineTransform());
</del><ins>+ m_rootViewToPluginTransform = pluginToRootViewTransform.inverse().value_or(AffineTransform());
</ins><span class="cx"> m_size = pluginSize;
</span><span class="cx">
</span><span class="cx"> FrameView* frameView = webFrame()->coreFrame()->view();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1205,7 +1205,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UserGestureIndicator gestureIndicator(request->allowPopups() ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(request->allowPopups() ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx">
</span><span class="cx"> // First, try to find a target frame.
</span><span class="cx"> Frame* targetFrame = frame->loader().findFrameForNavigation(request->target());
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> // protect the plug-in view from destruction.
</span><span class="cx"> NPRuntimeObjectMap::PluginProtector pluginProtector(&m_npRuntimeObjectMap);
</span><span class="cx">
</span><del>- UserGestureIndicator gestureIndicator(allowPopups ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</del><ins>+ UserGestureIndicator gestureIndicator(allowPopups ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</ins><span class="cx"> return m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsWebPluginInfoProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-Optional<WebCore::PluginLoadClientPolicy> WebPluginInfoProvider::pluginLoadClientPolicyForHost(const String& host, const WebCore::PluginInfo& info) const
</del><ins>+std::optional<WebCore::PluginLoadClientPolicy> WebPluginInfoProvider::pluginLoadClientPolicyForHost(const String& host, const WebCore::PluginInfo& info) const
</ins><span class="cx"> {
</span><span class="cx"> String hostToLookUp = host;
</span><span class="cx"> String identifier = info.bundleIdentifier;
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto& policiesByIdentifier = policiesByIdentifierIterator->value;
</span><span class="cx">
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (identifierPolicyIterator == policiesByIdentifier.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> auto& versionsToPolicies = identifierPolicyIterator->value;
</span><span class="cx">
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (policyIterator == versionsToPolicies.end())
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx">
</span><span class="cx"> return policyIterator->value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsWebPluginInfoProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- Optional<WebCore::PluginLoadClientPolicy> pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&) const;
</del><ins>+ std::optional<WebCore::PluginLoadClientPolicy> pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&) const;
</ins><span class="cx"> String longestMatchedWildcardHostForHost(const String& host) const;
</span><span class="cx"> bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> // Notification from the UI process that we scrolled.
</span><span class="cx"> void RemoteScrollingCoordinator::scrollPositionChangedForNode(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, bool syncLayerPosition)
</span><span class="cx"> {
</span><del>- scheduleUpdateScrollPositionAfterAsyncScroll(nodeID, scrollPosition, Nullopt, false /* FIXME */, syncLayerPosition ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
</del><ins>+ scheduleUpdateScrollPositionAfterAsyncScroll(nodeID, scrollPosition, std::nullopt, false /* FIXME */, syncLayerPosition ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteScrollingCoordinator::currentSnapPointIndicesChangedForNode(ScrollingNodeID nodeID, unsigned horizontal, unsigned vertical)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPBody::Element::Type::File:
</span><del>- formData->appendFileRange(element.filePath, element.fileStart, element.fileLength.valueOr(BlobDataItem::toEndOfFile), element.expectedFileModificationTime.valueOr(invalidFileTime()));
</del><ins>+ formData->appendFileRange(element.filePath, element.fileStart, element.fileLength.value_or(BlobDataItem::toEndOfFile), element.expectedFileModificationTime.value_or(invalidFileTime()));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPBody::Element::Type::Blob:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(static_cast<int32_t>(newStyle)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WTF::Optional<ScrollbarOverlayStyle> WebChromeClient::preferredScrollbarOverlayStyle()
</del><ins>+std::optional<ScrollbarOverlayStyle> WebChromeClient::preferredScrollbarOverlayStyle()
</ins><span class="cx"> {
</span><span class="cx"> return m_page->scrollbarOverlayStyle();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) override;
</span><span class="cx"> void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle newStyle) override;
</span><span class="cx">
</span><del>- WTF::Optional<WebCore::ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() override;
</del><ins>+ std::optional<WebCore::ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() override;
</ins><span class="cx">
</span><span class="cx"> WebCore::Color underlayColor() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidCommitLoad(Optional<HasInsecureContent> hasInsecureContent)
</del><ins>+void WebFrameLoaderClient::dispatchDidCommitLoad(std::optional<HasInsecureContent> hasInsecureContent)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> webPage->sandboxExtensionTracker().didCommitProvisionalLoad(m_frame);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo().valueOrCompute([] { return CertificateInfo(); }), m_frame->coreFrame()->document()->isPluginDocument(), hasInsecureContent, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), valueOrCompute(documentLoader.response().certificateInfo(), [] { return CertificateInfo(); }), m_frame->coreFrame()->document()->isPluginDocument(), hasInsecureContent, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> webPage->didCommitLoad(m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> void dispatchDidReceiveIcon() override;
</span><span class="cx"> void dispatchDidStartProvisionalLoad() override;
</span><span class="cx"> void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
</span><del>- void dispatchDidCommitLoad(Optional<WebCore::HasInsecureContent>) override;
</del><ins>+ void dispatchDidCommitLoad(std::optional<WebCore::HasInsecureContent>) override;
</ins><span class="cx"> void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual void setViewExposedRect(Optional<WebCore::FloatRect>) = 0;
- virtual Optional<WebCore::FloatRect> viewExposedRect() const = 0;
</del><ins>+ virtual void setViewExposedRect(std::optional<WebCore::FloatRect>) = 0;
+ virtual std::optional<WebCore::FloatRect> viewExposedRect() const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void acceleratedAnimationDidStart(uint64_t /*layerID*/, const String& /*key*/, double /*startTime*/) { }
</span><span class="cx"> virtual void acceleratedAnimationDidEnd(uint64_t /*layerID*/, const String& /*key*/) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition, bool flushSynchronously, WebCore::MachSendRight fencePort)
</span><span class="cx"> SetDeviceScaleFactor(float deviceScaleFactor)
</span><span class="cx"> SetColorSpace(struct WebKit::ColorSpaceData colorSpace)
</span><del>- SetViewExposedRect(Optional<WebCore::FloatRect> viewExposedRect)
</del><ins>+ SetViewExposedRect(std::optional<WebCore::FloatRect> viewExposedRect)
</ins><span class="cx">
</span><span class="cx"> AdjustTransientZoom(double scale, WebCore::FloatPoint origin)
</span><span class="cx"> CommitTransientZoom(double scale, WebCore::FloatPoint origin)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> if (!documentLoader)
</span><span class="cx"> return { };
</span><span class="cx">
</span><del>- return documentLoader->response().certificateInfo().valueOrCompute([] { return CertificateInfo(); });
</del><ins>+ return valueOrCompute(documentLoader->response().certificateInfo(), [] { return CertificateInfo(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebFrame::innerText() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> if (parameters.scrollbarOverlayStyle)
</span><span class="cx"> m_scrollbarOverlayStyle = static_cast<ScrollbarOverlayStyle>(parameters.scrollbarOverlayStyle.value());
</span><span class="cx"> else
</span><del>- m_scrollbarOverlayStyle = WTF::Optional<ScrollbarOverlayStyle>();
</del><ins>+ m_scrollbarOverlayStyle = std::optional<ScrollbarOverlayStyle>();
</ins><span class="cx">
</span><span class="cx"> setBackgroundExtendsBeyondPage(parameters.backgroundExtendsBeyondPage);
</span><span class="cx">
</span><span class="lines">@@ -5398,12 +5398,12 @@
</span><span class="cx"> m_page->mainFrame().view()->setScrollPinningBehavior(m_scrollPinningBehavior);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setScrollbarOverlayStyle(WTF::Optional<uint32_t> scrollbarStyle)
</del><ins>+void WebPage::setScrollbarOverlayStyle(std::optional<uint32_t> scrollbarStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (scrollbarStyle)
</span><span class="cx"> m_scrollbarOverlayStyle = static_cast<ScrollbarOverlayStyle>(scrollbarStyle.value());
</span><span class="cx"> else
</span><del>- m_scrollbarOverlayStyle = WTF::Optional<ScrollbarOverlayStyle>();
</del><ins>+ m_scrollbarOverlayStyle = std::optional<ScrollbarOverlayStyle>();
</ins><span class="cx"> m_page->mainFrame().view()->recalculateScrollbarOverlayStyle();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -910,8 +910,8 @@
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
</span><span class="cx"> void setScrollPinningBehavior(uint32_t /* WebCore::ScrollPinningBehavior */ pinning);
</span><span class="cx">
</span><del>- WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarOverlayStyle() { return m_scrollbarOverlayStyle; }
- void setScrollbarOverlayStyle(WTF::Optional<uint32_t /* WebCore::ScrollbarOverlayStyle */> scrollbarStyle);
</del><ins>+ std::optional<WebCore::ScrollbarOverlayStyle> scrollbarOverlayStyle() { return m_scrollbarOverlayStyle; }
+ void setScrollbarOverlayStyle(std::optional<uint32_t /* WebCore::ScrollbarOverlayStyle */> scrollbarStyle);
</ins><span class="cx">
</span><span class="cx"> Ref<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame&, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</span><span class="cx"> void updateCachedDocumentLoader(WebDocumentLoader&, WebCore::Frame&);
</span><span class="lines">@@ -1484,7 +1484,7 @@
</span><span class="cx"> unsigned m_maximumRenderingSuppressionToken { 0 };
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior { WebCore::DoNotPin };
</span><del>- WTF::Optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</del><ins>+ std::optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</ins><span class="cx">
</span><span class="cx"> bool m_useAsyncScrolling { false };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SetScrollPinningBehavior(uint32_t pinning)
</span><del>- SetScrollbarOverlayStyle(Optional<uint32_t> scrollbarStyle)
</del><ins>+ SetScrollbarOverlayStyle(std::optional<uint32_t> scrollbarStyle)
</ins><span class="cx">
</span><span class="cx"> GetBytecodeProfile(uint64_t callbackID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> void forceRepaint() override;
</span><span class="cx"> bool forceRepaintAsync(uint64_t) override { return false; }
</span><span class="cx">
</span><del>- void setViewExposedRect(Optional<WebCore::FloatRect>) override;
- Optional<WebCore::FloatRect> viewExposedRect() const override { return m_scrolledViewExposedRect; }
</del><ins>+ void setViewExposedRect(std::optional<WebCore::FloatRect>) override;
+ std::optional<WebCore::FloatRect> viewExposedRect() const override { return m_scrolledViewExposedRect; }
</ins><span class="cx">
</span><span class="cx"> void acceleratedAnimationDidStart(uint64_t layerID, const String& key, double startTime) override;
</span><span class="cx"> void acceleratedAnimationDidEnd(uint64_t layerID, const String& key) override;
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize m_viewSize;
</span><span class="cx">
</span><del>- Optional<WebCore::FloatRect> m_viewExposedRect;
- Optional<WebCore::FloatRect> m_scrolledViewExposedRect;
</del><ins>+ std::optional<WebCore::FloatRect> m_viewExposedRect;
+ std::optional<WebCore::FloatRect> m_scrolledViewExposedRect;
</ins><span class="cx">
</span><span class="cx"> WebCore::Timer m_layerFlushTimer;
</span><span class="cx"> bool m_isFlushingSuspended;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> m_remoteLayerTreeContext->animationDidEnd(layerID, key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeDrawingArea::setViewExposedRect(Optional<WebCore::FloatRect> viewExposedRect)
</del><ins>+void RemoteLayerTreeDrawingArea::setViewExposedRect(std::optional<WebCore::FloatRect> viewExposedRect)
</ins><span class="cx"> {
</span><span class="cx"> m_viewExposedRect = viewExposedRect;
</span><span class="cx"> updateScrolledExposedRect();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> void updatePreferences(const WebPreferencesStore&) override;
</span><span class="cx"> void mainFrameContentSizeChanged(const WebCore::IntSize&) override;
</span><span class="cx">
</span><del>- void setViewExposedRect(Optional<WebCore::FloatRect>) override;
- Optional<WebCore::FloatRect> viewExposedRect() const override { return m_scrolledViewExposedRect; }
</del><ins>+ void setViewExposedRect(std::optional<WebCore::FloatRect>) override;
+ std::optional<WebCore::FloatRect> viewExposedRect() const override { return m_scrolledViewExposedRect; }
</ins><span class="cx">
</span><span class="cx"> bool supportsAsyncScrolling() override { return true; }
</span><span class="cx">
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_isPaintingSuspended;
</span><span class="cx">
</span><del>- Optional<WebCore::FloatRect> m_viewExposedRect;
- Optional<WebCore::FloatRect> m_scrolledViewExposedRect;
</del><ins>+ std::optional<WebCore::FloatRect> m_viewExposedRect;
+ std::optional<WebCore::FloatRect> m_scrolledViewExposedRect;
</ins><span class="cx">
</span><span class="cx"> WebCore::IntSize m_lastSentIntrinsicContentSize;
</span><span class="cx"> bool m_inUpdateGeometry;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidResumeNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_hostingLayer.get() forKey:@"layer"]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::setViewExposedRect(Optional<WebCore::FloatRect> viewExposedRect)
</del><ins>+void TiledCoreAnimationDrawingArea::setViewExposedRect(std::optional<WebCore::FloatRect> viewExposedRect)
</ins><span class="cx"> {
</span><span class="cx"> m_viewExposedRect = viewExposedRect;
</span><span class="cx"> updateScrolledExposedRect();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/ChangeLog 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-11-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Import std::optional reference implementation as WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=164199
+
+ Reviewed by Saam Barati and Sam Weinig.
+
+ Use WTF::Optional::value_or.
+
+ * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::stableStateOverride):
+ (WTR::UIScriptController::setStableStateOverride):
+ * TestRunnerShared/Bindings/JSWrappable.h:
+ (WTR::JSValueMakeBooleanOrNull):
+ (WTR::JSValueToNullableBoolean):
+ * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
+ (WTR::UIScriptController::stableStateOverride):
+ (WTR::UIScriptController::setStableStateOverride):
+ * TestRunnerShared/UIScriptContext/UIScriptController.h:
+ * TestWebKitAPI/Tests/WTF/Optional.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp:
+ (TestWebKitAPI::testParseHTMLInteger):
+ (TestWebKitAPI::testParseHTMLNonNegativeInteger):
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::checkURL):
+ (TestWebKitAPI::checkRelativeURL):
+ (TestWebKitAPI::checkURLDifferences):
+ (TestWebKitAPI::checkRelativeURLDifferences):
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::stableStateOverride):
+ (WTR::UIScriptController::setStableStateOverride):
+
</ins><span class="cx"> 2016-11-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert IntersectionObserver over to using RuntimeEnabledFeatures so it can be properly excluded from script
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -199,12 +199,12 @@
</span><span class="cx"> return gWebScrollView.maximumZoomScale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<bool> UIScriptController::stableStateOverride() const
</del><ins>+std::optional<bool> UIScriptController::stableStateOverride() const
</ins><span class="cx"> {
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIScriptController::setStableStateOverride(Optional<bool>)
</del><ins>+void UIScriptController::setStableStateOverride(std::optional<bool>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedBindingsJSWrappableh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/Bindings/JSWrappable.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/Bindings/JSWrappable.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestRunnerShared/Bindings/JSWrappable.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -37,14 +37,14 @@
</span><span class="cx"> virtual JSClassRef wrapperClass() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline JSValueRef JSValueMakeBooleanOrNull(JSContextRef context, Optional<bool> value)
</del><ins>+inline JSValueRef JSValueMakeBooleanOrNull(JSContextRef context, std::optional<bool> value)
</ins><span class="cx"> {
</span><span class="cx"> return value ? JSValueMakeBoolean(context, value.value()) : JSValueMakeNull(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Optional<bool> JSValueToNullableBoolean(JSContextRef context, JSValueRef value)
</del><ins>+inline std::optional<bool> JSValueToNullableBoolean(JSContextRef context, JSValueRef value)
</ins><span class="cx"> {
</span><del>- return JSValueIsUndefined(context, value) || JSValueIsNull(context, value) ? Nullopt : Optional<bool>(JSValueToBoolean(context, value));
</del><ins>+ return JSValueIsUndefined(context, value) || JSValueIsNull(context, value) ? std::nullopt : std::optional<bool>(JSValueToBoolean(context, value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSValueRef JSValueMakeStringOrNull(JSContextRef context, JSStringRef stringOrNull)
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedUIScriptContextUIScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -288,12 +288,12 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<bool> UIScriptController::stableStateOverride() const
</del><ins>+std::optional<bool> UIScriptController::stableStateOverride() const
</ins><span class="cx"> {
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIScriptController::setStableStateOverride(Optional<bool>)
</del><ins>+void UIScriptController::setStableStateOverride(std::optional<bool>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedUIScriptContextUIScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> double minimumZoomScale() const;
</span><span class="cx"> double maximumZoomScale() const;
</span><span class="cx">
</span><del>- Optional<bool> stableStateOverride() const;
- void setStableStateOverride(Optional<bool>);
</del><ins>+ std::optional<bool> stableStateOverride() const;
+ void setStableStateOverride(std::optional<bool>);
</ins><span class="cx">
</span><span class="cx"> JSObjectRef contentVisibleRect() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFOptionalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Optional.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Optional.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Optional.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx"> TEST(WTF_Optional, Disengaged)
</span><span class="cx"> {
</span><span class="cx"> {
</span><del>- Optional<int> optional;
</del><ins>+ std::optional<int> optional;
</ins><span class="cx">
</span><span class="cx"> EXPECT_FALSE(static_cast<bool>(optional));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- Optional<int> optional { Nullopt };
</del><ins>+ std::optional<int> optional { std::nullopt };
</ins><span class="cx">
</span><span class="cx"> EXPECT_FALSE(static_cast<bool>(optional));
</span><span class="cx"> }
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> TEST(WTF_Optional, Engaged)
</span><span class="cx"> {
</span><del>- Optional<int> optional { 10 };
</del><ins>+ std::optional<int> optional { 10 };
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE(static_cast<bool>(optional));
</span><span class="cx"> EXPECT_EQ(10, optional.value());
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> {
</span><del>- Optional<A> optional { InPlace };
</del><ins>+ std::optional<A> optional { std::in_place };
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE(static_cast<bool>(optional));
</span><span class="cx"> }
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> TEST(WTF_Optional, Callback)
</span><span class="cx"> {
</span><span class="cx"> bool called = false;
</span><del>- Optional<int> a;
- int result = a.valueOrCompute([&] {
</del><ins>+ std::optional<int> a;
+ int result = valueOrCompute(a, [&] {
</ins><span class="cx"> called = true;
</span><span class="cx"> return 300;
</span><span class="cx"> });
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> a = 250;
</span><span class="cx"> called = false;
</span><del>- result = a.valueOrCompute([&] {
</del><ins>+ result = valueOrCompute(a, [&] {
</ins><span class="cx"> called = true;
</span><span class="cx"> return 300;
</span><span class="cx"> });
</span><span class="lines">@@ -95,12 +95,12 @@
</span><span class="cx">
</span><span class="cx"> TEST(WTF_Optional, Equality)
</span><span class="cx"> {
</span><del>- Optional<int> unengaged1;
- Optional<int> unengaged2;
</del><ins>+ std::optional<int> unengaged1;
+ std::optional<int> unengaged2;
</ins><span class="cx">
</span><del>- Optional<int> engaged1 { 1 };
- Optional<int> engaged2 { 2 };
- Optional<int> engagedx2 { 2 };
</del><ins>+ std::optional<int> engaged1 { 1 };
+ std::optional<int> engaged2 { 2 };
+ std::optional<int> engagedx2 { 2 };
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE(unengaged1 == unengaged2);
</span><span class="cx"> EXPECT_FALSE(engaged1 == engaged2);
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx"> EXPECT_FALSE(engaged1 == unengaged1);
</span><span class="cx"> EXPECT_TRUE(engaged2 == engagedx2);
</span><span class="cx">
</span><del>- EXPECT_TRUE(unengaged1 == Nullopt);
- EXPECT_FALSE(engaged1 == Nullopt);
- EXPECT_TRUE(Nullopt == unengaged1);
- EXPECT_FALSE(Nullopt == engaged1);
</del><ins>+ EXPECT_TRUE(unengaged1 == std::nullopt);
+ EXPECT_FALSE(engaged1 == std::nullopt);
+ EXPECT_TRUE(std::nullopt == unengaged1);
+ EXPECT_FALSE(std::nullopt == engaged1);
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE(engaged1 == 1);
</span><span class="cx"> EXPECT_TRUE(1 == engaged1);
</span><span class="lines">@@ -120,12 +120,12 @@
</span><span class="cx">
</span><span class="cx"> TEST(WTF_Optional, Inequality)
</span><span class="cx"> {
</span><del>- Optional<int> unengaged1;
- Optional<int> unengaged2;
</del><ins>+ std::optional<int> unengaged1;
+ std::optional<int> unengaged2;
</ins><span class="cx">
</span><del>- Optional<int> engaged1 { 1 };
- Optional<int> engaged2 { 2 };
- Optional<int> engagedx2 { 2 };
</del><ins>+ std::optional<int> engaged1 { 1 };
+ std::optional<int> engaged2 { 2 };
+ std::optional<int> engagedx2 { 2 };
</ins><span class="cx">
</span><span class="cx"> EXPECT_FALSE(unengaged1 != unengaged2);
</span><span class="cx"> EXPECT_TRUE(engaged1 != engaged2);
</span><span class="lines">@@ -132,10 +132,10 @@
</span><span class="cx"> EXPECT_TRUE(engaged1 != unengaged1);
</span><span class="cx"> EXPECT_FALSE(engaged2 != engagedx2);
</span><span class="cx">
</span><del>- EXPECT_FALSE(unengaged1 != Nullopt);
- EXPECT_TRUE(engaged1 != Nullopt);
- EXPECT_FALSE(Nullopt != unengaged1);
- EXPECT_TRUE(Nullopt != engaged1);
</del><ins>+ EXPECT_FALSE(unengaged1 != std::nullopt);
+ EXPECT_TRUE(engaged1 != std::nullopt);
+ EXPECT_FALSE(std::nullopt != unengaged1);
+ EXPECT_TRUE(std::nullopt != engaged1);
</ins><span class="cx">
</span><span class="cx"> EXPECT_FALSE(engaged1 != 1);
</span><span class="cx"> EXPECT_TRUE(engaged1 != 2);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/HTMLParserIdioms.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto optionalResult = parseHTMLInteger(input);
</span><span class="cx"> EXPECT_TRUE(!!optionalResult);
</span><del>- return optionalResult.valueOr(0);
</del><ins>+ return optionalResult.value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool parseHTMLIntegerFails(const String& input)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto optionalResult = parseHTMLNonNegativeInteger(input);
</span><span class="cx"> EXPECT_TRUE(!!optionalResult);
</span><del>- return optionalResult.valueOr(0);
</del><ins>+ return optionalResult.value_or(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool parseHTMLNonNegativeIntegerFails(const String& input)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, url.host()));
</span><del>- EXPECT_EQ(parts.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, oldURL.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, oldURL.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, oldURL.host()));
</span><del>- EXPECT_EQ(parts.port, oldURL.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, oldURL.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, oldURL.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, oldURL.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, oldURL.fragmentIdentifier()));
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, url.host()));
</span><del>- EXPECT_EQ(parts.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, oldURL.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, oldURL.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, oldURL.host()));
</span><del>- EXPECT_EQ(parts.port, oldURL.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, oldURL.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, oldURL.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, oldURL.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, oldURL.fragmentIdentifier()));
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.host, url.host()));
</span><del>- EXPECT_EQ(partsNew.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(partsNew.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(partsNew.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.fragment, url.fragmentIdentifier()));
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.user, oldURL.user()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.password, oldURL.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.host, oldURL.host()));
</span><del>- EXPECT_EQ(partsOld.port, oldURL.port().valueOr(0));
</del><ins>+ EXPECT_EQ(partsOld.port, oldURL.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(partsOld.path, oldURL.path()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.query, oldURL.query()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.fragment, oldURL.fragmentIdentifier()));
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.host, url.host()));
</span><del>- EXPECT_EQ(partsNew.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(partsNew.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(partsNew.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(partsNew.fragment, url.fragmentIdentifier()));
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.user, oldURL.user()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.password, oldURL.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.host, oldURL.host()));
</span><del>- EXPECT_EQ(partsOld.port, oldURL.port().valueOr(0));
</del><ins>+ EXPECT_EQ(partsOld.port, oldURL.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(partsOld.path, oldURL.path()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.query, oldURL.query()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.fragment, oldURL.fragmentIdentifier()));
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, url.host()));
</span><del>- EXPECT_EQ(parts.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.user, url.user()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.password, url.pass()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.host, url.host()));
</span><del>- EXPECT_EQ(parts.port, url.port().valueOr(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().value_or(0));
</ins><span class="cx"> EXPECT_TRUE(eq(parts.path, url.path()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.query, url.query()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (208984 => 208985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2016-11-27 04:40:58 UTC (rev 208984)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2016-11-27 06:08:16 UTC (rev 208985)
</span><span class="lines">@@ -405,16 +405,16 @@
</span><span class="cx"> return webView.scrollView.maximumZoomScale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<bool> UIScriptController::stableStateOverride() const
</del><ins>+std::optional<bool> UIScriptController::stableStateOverride() const
</ins><span class="cx"> {
</span><span class="cx"> TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><span class="cx"> if (webView._stableStateOverride)
</span><span class="cx"> return webView._stableStateOverride.boolValue;
</span><span class="cx">
</span><del>- return Nullopt;
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIScriptController::setStableStateOverride(Optional<bool> overrideValue)
</del><ins>+void UIScriptController::setStableStateOverride(std::optional<bool> overrideValue)
</ins><span class="cx"> {
</span><span class="cx"> TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><span class="cx"> if (overrideValue)
</span></span></pre>
</div>
</div>
</body>
</html>