[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239461] trunk
From: cdumez () apple ! com
Date: 2018-12-20 20:23:18
Message-ID: 20181220202319.4E88B10051CC () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[239461] 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/239461">239461</a></dd> \
<dt>Author</dt> <dd>cdumez@apple.com</dd> <dt>Date</dt> <dd>2018-12-20 12:23:18 -0800 \
(Thu, 20 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>Use Optional::valueOr() instead of Optional::value_or()
https://bugs.webkit.org/show_bug.cgi?id=192933
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm:
(Inspector::RemoteConnectionToTarget::setup):
* inspector/remote/glib/RemoteConnectionToTargetGlib.cpp:
(Inspector::RemoteConnectionToTarget::setup):
* parser/SourceCodeKey.h:
(JSC::SourceCodeKey::SourceCodeKey):
* wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::link):
Source/WebCore:
* Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
(WebCore::convert):
(WebCore::ApplePayPaymentHandler::didAuthorizePayment):
* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::load):
* Modules/indexeddb/IDBDatabaseIdentifier.h:
(WebCore::IDBDatabaseIdentifier::hash const):
* Modules/indexeddb/IDBFactory.cpp:
(WebCore::IDBFactory::open):
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::applyConstraints):
* Modules/mediastream/RTCDTMFSender.cpp:
(WebCore::RTCDTMFSender::insertDTMF):
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::executeSql):
* Modules/webvr/VRFrameData.cpp:
(WebCore::VRFrameData::update):
* animation/AnimationTimeline.cpp:
(WebCore::AnimationTimeline::updateCSSTransitionsForElement):
* animation/DeclarativeAnimation.cpp:
(WebCore::DeclarativeAnimation::cancel):
(WebCore::DeclarativeAnimation::invalidateDOMEvents):
* animation/KeyframeEffect.cpp:
(WebCore::computeMissingKeyframeOffsets):
(WebCore::KeyframeEffect::applyPendingAcceleratedActions):
* animation/WebAnimation.cpp:
(WebCore::WebAnimation::runPendingPlayTask):
(WebCore::WebAnimation::runPendingPauseTask):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::write):
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
(WebCore::CryptoAlgorithmHMAC::generateKey):
(WebCore::CryptoAlgorithmHMAC::importKey):
* crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp:
(WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
(WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
* crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:
(WebCore::CryptoKeyRSA::importSpki):
(WebCore::CryptoKeyRSA::importPkcs8):
* crypto/keys/CryptoKeyRSA.cpp:
(WebCore::CryptoKeyRSA::importJwk):
* crypto/mac/CryptoAlgorithmAES_GCMMac.cpp:
(WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
(WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
* crypto/mac/CryptoKeyRSAMac.cpp:
(WebCore::CryptoKeyRSA::importSpki):
(WebCore::CryptoKeyRSA::importPkcs8):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::counterToCSSValue):
* css/CSSFontFace.cpp:
(WebCore::calculateItalicRange):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::doubleValue const):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::addRule):
* css/DOMMatrix.cpp:
(WebCore::DOMMatrix::rotateSelf):
* css/DOMMatrixReadOnly.cpp:
(WebCore::DOMMatrixReadOnly::validateAndFixup):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueCounter):
* css/parser/MediaQueryParser.cpp:
(WebCore::MediaQueryParser::commitMediaQuery):
* dom/Document.h:
(WebCore::Document::referrerPolicy const):
* dom/Element.cpp:
(WebCore::toScrollAlignment):
* dom/EventTarget.cpp:
(WebCore::EventTarget::addEventListener):
* dom/MutationObserver.cpp:
(WebCore::MutationObserver::observe):
* editing/cocoa/FontAttributeChangesCocoa.mm:
(WebCore::FontChanges::platformFontFamilyNameForCSS const):
* fileapi/File.cpp:
(WebCore::File::File):
* html/DOMTokenList.cpp:
(WebCore::DOMTokenList::toggle):
* html/HTMLOListElement.h:
* html/ImageBitmap.cpp:
(WebCore::croppedSourceRectangleWithFormatting):
* html/canvas/CanvasPattern.cpp:
(WebCore::CanvasPattern::setTransform):
* html/canvas/CanvasRenderingContext2DBase.cpp:
(WebCore::CanvasRenderingContext2DBase::setTransform):
(WebCore::CanvasRenderingContext2DBase::isPointInPathInternal):
(WebCore::CanvasRenderingContext2DBase::isPointInStrokeInternal):
* html/canvas/Path2D.cpp:
(WebCore::Path2D::addPath):
* inspector/InspectorCanvas.cpp:
(WebCore::InspectorCanvas::buildAction):
* inspector/InspectorFrontendHost.cpp:
(WebCore::populateContextMenu):
* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::validateGeometryConstraintsAfterLayout const):
* layout/FormattingContextGeometry.cpp:
(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
(WebCore::Layout::FormattingContext::Geometry::complicatedCases):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::inFlowPositionedPositionOffset):
(WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedHorizontalMarginValue):
(WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedVerticalMarginValue):
* layout/FormattingContextQuirks.cpp:
(WebCore::Layout::FormattingContext::Quirks::heightValueOfNearestContainingBlockWithFixedHeight):
* layout/MarginTypes.h:
(WebCore::Layout::VerticalMargin::usedValues const):
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::instrinsicWidthConstraints):
* layout/blockformatting/BlockFormattingContextQuirks.cpp:
(WebCore::Layout::BlockFormattingContext::Quirks::stretchedHeight):
* layout/displaytree/DisplayBox.h:
(WebCore::Display::Box::width const):
(WebCore::Display::Box::height const):
(WebCore::Display::Box::contentBoxTop const):
(WebCore::Display::Box::contentBoxLeft const):
* layout/floats/FloatingContext.cpp:
(WebCore::Layout::Iterator::set):
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::appendContentToLine const):
(WebCore::Layout::InlineFormattingContext::placeInFlowPositionedChildren const):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::urlSelected):
* loader/NavigationAction.cpp:
* page/FrameView.cpp:
(WebCore::FrameView::setLayoutViewportOverrideRect):
(WebCore::FrameView::documentToAbsoluteScaleFactor const):
(WebCore::FrameView::viewportSizeForCSSViewportUnits const):
* page/Page.cpp:
(WebCore::Page::setLowPowerModeEnabledOverrideForTesting):
* page/SecurityOriginData.cpp:
(WebCore::SecurityOriginData::databaseIdentifier const):
* page/SecurityOriginData.h:
(WebCore::SecurityOriginDataHash::hash):
* page/SecurityOriginHash.h:
(WebCore::SecurityOriginHash::hash):
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::setViewLayoutSize):
* page/WindowFeatures.cpp:
(WebCore::parseDialogFeatures):
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::updateStateMachine):
(WebCore::AnimationBase::fireAnimationEventsIfNeeded):
(WebCore::AnimationBase::getTimeToNextEvent const):
(WebCore::AnimationBase::freezeAtTime):
(WebCore::AnimationBase::getElapsedTime const):
* page/animation/CSSAnimationController.cpp:
(WebCore::CSSAnimationControllerPrivate::updateAnimationTimer):
* page/cocoa/ResourceUsageThreadCocoa.mm:
(WebCore::ResourceUsageThread::platformThreadBody):
* page/linux/ResourceUsageThreadLinux.cpp:
(WebCore::ResourceUsageThread::platformThreadBody):
* platform/graphics/ComplexTextController.cpp:
(WebCore::ComplexTextController::offsetForPosition):
* platform/graphics/FontCache.h:
(WebCore::FontDescriptionKey::computeHash const):
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::drawText const):
(WebCore::FontCascade::drawEmphasisMarks const):
(WebCore::FontCascade::displayListForTextRun const):
(WebCore::FontCascade::adjustSelectionRectForText const):
(WebCore::FontCascade::codePath const):
* platform/graphics/FontSelectionAlgorithm.cpp:
(WebCore::FontSelectionAlgorithm::styleDistance const):
* platform/graphics/FontSelectionAlgorithm.h:
(WebCore::operator<<):
(WebCore::FontSelectionSpecifiedCapabilities::computeWeight const):
(WebCore::FontSelectionSpecifiedCapabilities::computeWidth const):
(WebCore::FontSelectionSpecifiedCapabilities::computeSlope const):
* platform/graphics/ShadowBlur.cpp:
(WebCore::ShadowBlur::calculateLayerBoundingRect):
* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
(WebCore::WebCoreAVCFResourceLoader::startLoading):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::paintCurrentFrameInContext):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::naturalSize):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):
* platform/graphics/filters/FETurbulence.cpp:
(WebCore::FETurbulence::fillRegion const):
* platform/graphics/gstreamer/GStreamerCommon.cpp:
(WebCore::initializeGStreamer):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
(WebCore::TextureMapperLayer::replicaTransform):
(WebCore::TextureMapperLayer::syncAnimations):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::transformedVisibleRect):
(WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
* platform/graphics/transforms/TransformState.cpp:
(WebCore::TransformState::mappedPoint const):
(WebCore::TransformState::mapQuad const):
(WebCore::TransformState::flattenWithTransform):
* platform/network/CacheValidation.cpp:
(WebCore::computeCurrentAge):
(WebCore::computeFreshnessLifetimeForHTTPFamily):
* platform/network/NetworkStateNotifier.cpp:
(WebCore::NetworkStateNotifier::onLine):
* rendering/FloatingObjects.cpp:
(WebCore::FindNextFloatLogicalBottomAdapter::nextLogicalBottom const):
(WebCore::FindNextFloatLogicalBottomAdapter::nextShapeLogicalBottom const):
* rendering/GridBaselineAlignment.cpp:
(WebCore::GridBaselineAlignment::ascentForChild const):
* rendering/GridTrackSizingAlgorithm.cpp:
(WebCore::GridTrack::setGrowthLimit):
(WebCore::GridTrackSizingAlgorithm::initialBaseSize const):
(WebCore::GridTrackSizingAlgorithm::initialGrowthLimit const):
(WebCore::GridTrackSizingAlgorithm::sizeTrackToFitNonSpanningItem):
(WebCore::sortByGridTrackGrowthPotential):
(WebCore::GridTrackSizingAlgorithm::estimatedGridAreaBreadthForChild const):
(WebCore::GridTrackSizingAlgorithmStrategy::minSizeForChild const):
(WebCore::GridTrackSizingAlgorithm::initializeTrackSizes):
* rendering/PaintInfo.h:
(WebCore::PaintInfo::applyTransform):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalHeight const):
* rendering/RenderCounter.cpp:
(WebCore::planCounter):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::baselinePosition const):
(WebCore::RenderFlexibleBox::marginBoxAscentForChild):
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::gridGap const):
(WebCore::RenderGrid::baselinePosition const):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayerByApplyingTransform):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintItem):
(WebCore::RenderListBox::listIndexIsVisible):
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::calculateMaxColumnHeight const):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::cellBaselinePosition const):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::firstLineBaseline const):
* rendering/RenderText.cpp:
(WebCore::RenderText::computePreferredLogicalWidths):
(WebCore::RenderText::previousOffset const):
(WebCore::RenderText::previousOffsetForBackwardDeletion const):
(WebCore::RenderText::nextOffset const):
(WebCore::RenderText::stringView const):
* rendering/RenderView.cpp:
(WebCore::RenderView::layout):
* rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::baselinePosition const):
* rendering/mathml/RenderMathMLBlock.h:
(WebCore::RenderMathMLBlock::ascentForChild):
* rendering/style/GridPosition.cpp:
(WebCore::GridPosition::max):
* rendering/style/TextUnderlineOffset.h:
(WebCore::TextUnderlineOffset::lengthOr const):
* 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::nodeAtFloatPoint):
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::nodeAtFloatPoint):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::clipToImageBuffer):
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::processGlyphElement):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
Source/WebDriver:
* Session.cpp:
(WebDriver::Session::handleUnexpectedAlertOpen):
(WebDriver::Session::computeElementLayout):
(WebDriver::Session::selectOptionElement):
(WebDriver::builtAutomationCookie):
(WebDriver::Session::takeScreenshot):
* WebDriverService.cpp:
(WebDriver::WebDriverService::sendResponse const):
(WebDriver::WebDriverService::createSession):
Source/WebKit:
* Shared/API/c/WKSecurityOriginRef.cpp:
(WKSecurityOriginGetPort):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/WKSecurityOrigin.mm:
(-[WKSecurityOrigin port]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _cpuLimit]):
* UIProcess/API/glib/WebKitSecurityOrigin.cpp:
(webkit_security_origin_get_port):
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseHandleWheelEvent):
* UIProcess/Automation/SimulatedInputDispatcher.cpp:
(WebKit::SimulatedInputKeyFrame::maximumDuration const):
(WebKit::SimulatedInputDispatcher::transitionInputSourceToState):
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::setWindowFrameOfBrowsingContext):
(WebKit::WebAutomationSession::performInteractionSequence):
* UIProcess/Automation/WebAutomationSessionMacros.h:
* UIProcess/ServiceWorkerProcessProxy.cpp:
(WebKit::ServiceWorkerProcessProxy::start):
* UIProcess/WebAuthentication/AuthenticatorManager.cpp:
(WebKit::AuthenticatorManager::initTimeOutTimer):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::deviceScaleFactor const):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::viewportSizeForCSSViewportUnits const):
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::activateItem):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeFormDataElement):
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoad):
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::convertFromPDFViewToRootView const):
(WebKit::PDFPlugin::boundsOnScreen const):
(WebKit::PDFPlugin::geometryDidChange):
* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toFormData):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):
* WebProcess/WebPage/wpe/CompositingManager.cpp:
(WebKit::CompositingManager::releaseConnectionFd):
Source/WebKitLegacy/mac:
* WebCoreSupport/WebSecurityOrigin.mm:
(-[WebSecurityOrigin port]):
Source/WebKitLegacy/win:
* WebSecurityOrigin.cpp:
(WebSecurityOrigin::port):
Source/WTF:
* wtf/Optional.h:
(WTF::Optional<T::valueOr const):
Tools:
* TestWebKitAPI/Tests/WTF/URLParser.cpp:
(TestWebKitAPI::checkURL):
(TestWebKitAPI::checkRelativeURL):
(TestWebKitAPI::checkURLDifferences):
(TestWebKitAPI::checkRelativeURLDifferences):
* TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp:
(TestWebKitAPI::checkURL):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremotecocoaRemoteConnectionToTargetCo \
coamm">trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteglibRemoteConnectionToTargetGli \
bcpp">trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodeKeyh">trunk/Source/JavaScriptCore/parser/SourceCodeKey.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyModuleRecordcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfOptionalh">trunk/Source/WTF/wtf/Optional.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaypaymentrequestApplePayPaymentHandlercpp \
">trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</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="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebvrVRFrameDatacpp">trunk/Source/WebCore/Modules/webvr/VRFrameData.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationAnimationTimelinecpp">trunk/Source/WebCore/animation/AnimationTimeline.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationDeclarativeAnimationcpp">trunk/Source/WebCore/animation/DeclarativeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationKeyframeEffectcpp">trunk/Source/WebCore/animation/KeyframeEffect.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationWebAnimationcpp">trunk/Source/WebCore/animation/WebAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptogcryptCryptoAlgorithmAES_GCMGCryptcpp">trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptogcryptCryptoKeyRSAGCryptcpp">trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyRSAcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmAES_GCMMaccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp">trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMMatrixcpp">trunk/Source/WebCore/css/DOMMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMMatrixReadOnlycpp">trunk/Source/WebCore/css/DOMMatrixReadOnly.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssparserMediaQueryParsercpp">trunk/Source/WebCore/css/parser/MediaQueryParser.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetcpp">trunk/Source/WebCore/dom/EventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObservercpp">trunk/Source/WebCore/dom/MutationObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaFontAttributeChangesCocoamm">trunk/Source/WebCore/editing/cocoa/FontAttributeChangesCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorefileapiFilecpp">trunk/Source/WebCore/fileapi/File.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListcpp">trunk/Source/WebCore/html/DOMTokenList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOListElementh">trunk/Source/WebCore/html/HTMLOListElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlImageBitmapcpp">trunk/Source/WebCore/html/ImageBitmap.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasPatterncpp">trunk/Source/WebCore/html/canvas/CanvasPattern.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasPath2Dcpp">trunk/Source/WebCore/html/canvas/Path2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvascpp">trunk/Source/WebCore/inspector/InspectorCanvas.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContextcpp">trunk/Source/WebCore/layout/FormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContextGeometrycpp">trunk/Source/WebCore/layout/FormattingContextGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContextQuirkscpp">trunk/Source/WebCore/layout/FormattingContextQuirks.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutMarginTypesh">trunk/Source/WebCore/layout/MarginTypes.h</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextGeometrycp \
p">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextQuirkscpp" \
>trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp</a></li>
>
<li><a href="#trunkSourceWebCorelayoutdisplaytreeDisplayBoxh">trunk/Source/WebCore/layout/displaytree/DisplayBox.h</a></li>
<li><a href="#trunkSourceWebCorelayoutfloatsFloatingContextcpp">trunk/Source/WebCore/layout/floats/FloatingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationActioncpp">trunk/Source/WebCore/loader/NavigationAction.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</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="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageWindowFeaturescpp">trunk/Source/WebCore/page/WindowFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSAnimationControllercpp">trunk/Source/WebCore/page/animation/CSSAnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorepagelinuxResourceUsageThreadLinuxcpp">trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmcpp">trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmh">trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVF \
oundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMed \
iaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAV \
FObjCmm">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="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFETurbulencecpp">trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerCommoncpp">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsL \
ayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformStatecpp">trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifiercpp">trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingGridBaselineAlignmentcpp">trunk/Source/WebCore/rendering/GridBaselineAlignment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingGridTrackSizingAlgorithmcpp">trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingPaintInfoh">trunk/Source/WebCore/rendering/PaintInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCountercpp">trunk/Source/WebCore/rendering/RenderCounter.cpp</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="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</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="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.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="#trunkSourceWebCorerenderingstyleGridPositioncpp">trunk/Source/WebCore/rendering/style/GridPosition.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleTextUnderlineOffseth">trunk/Source/WebCore/rendering/style/TextUnderlineOffset.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="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
<li><a href="#trunkSourceWebDriverChangeLog">trunk/Source/WebDriver/ChangeLog</a></li>
<li><a href="#trunkSourceWebDriverSessioncpp">trunk/Source/WebDriver/Session.cpp</a></li>
<li><a href="#trunkSourceWebDriverWebDriverServicecpp">trunk/Source/WebDriver/WebDriverService.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedAPIcWKSecurityOriginRefcpp">trunk/Source/WebKit/Shared/API/c/WKSecurityOriginRef.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKSecurityOriginmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIglibWebKitSecurityOrigincpp">trunk/Source/WebKit/UIProcess/API/glib/WebKitSecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAutomationSimulatedInputDispatchercpp">trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAutomationWebAutomationSessionMacrosh">trunk/Source/WebKit/UIProcess/Automation/WebAutomationSessionMacros.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessServiceWorkerProcessProxycpp">trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebAuthenticationAuthenticatorManagercpp">trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessgtkWebPopupMenuProxyGtkcpp">trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebCoreSupportSessionStateConversioncpp">trunk/Source/WebKit/WebProcess/WebCoreSupport/SessionStateConversion.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagewpeCompositingManagercpp">trunk/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebSecurityOriginmm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKitLegacywinChangeLog">trunk/Source/WebKitLegacy/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacywinWebSecurityOrigincpp">trunk/Source/WebKitLegacy/win/WebSecurityOrigin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParserTextEncodingcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/JavaScriptCore/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm:
+ (Inspector::RemoteConnectionToTarget::setup):
+ * inspector/remote/glib/RemoteConnectionToTargetGlib.cpp:
+ (Inspector::RemoteConnectionToTarget::setup):
+ * parser/SourceCodeKey.h:
+ (JSC::SourceCodeKey::SourceCodeKey):
+ * wasm/js/WebAssemblyModuleRecord.cpp:
+ (JSC::WebAssemblyModuleRecord::link):
+
</ins><span class="cx"> 2018-12-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> ITMLKit Inspector: Elements tab does not show DOM \
Tree </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremotecocoaRemoteConnectionToTargetCocoamm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> if (!m_target)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- unsigned targetIdentifier = this->targetIdentifier().value_or(0);
</del><ins>+ unsigned targetIdentifier = this->targetIdentifier().valueOr(0);
</ins><span class="cx">
</span><span class="cx"> ref();
</span><span class="cx"> dispatchAsyncOnTarget(^{
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteglibRemoteConnectionToTargetGlibcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> if (!m_target)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- unsigned targetIdentifier = this->targetIdentifier().value_or(0);
</del><ins>+ unsigned targetIdentifier = this->targetIdentifier().valueOr(0);
</ins><span class="cx">
</span><span class="cx"> if (!m_target || !m_target->remoteControlAllowed()) {
</span><span class="cx"> \
RemoteInspector::singleton().setupFailed(targetIdentifier); \
</span></span></pre></div> <a id="trunkSourceJavaScriptCoreparserSourceCodeKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceCodeKey.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCodeKey.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/JavaScriptCore/parser/SourceCodeKey.h 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> : m_sourceCode(sourceCode)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_flags(codeType, strictMode, scriptMode, \
derivedContextType, evalContextType, isArrowFunctionContext, debuggerMode, \
typeProfilerEnabled, controlFlowProfilerEnabled) </span><del>- , \
m_functionConstructorParametersEndPosition(functionConstructorParametersEndPosition.value_or(-1))
</del><ins>+ , \
m_functionConstructorParametersEndPosition(functionConstructorParametersEndPosition.valueOr(-1))
</ins><span class="cx"> , m_hash(sourceCode.hash() ^ m_flags.bits())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasStart = \
!!moduleInformation.startFunctionIndexSpace; </span><span class="cx"> if \
(hasStart) { </span><del>- auto startFunctionIndexSpace = \
moduleInformation.startFunctionIndexSpace.value_or(0); </del><ins>+ auto \
startFunctionIndexSpace = moduleInformation.startFunctionIndexSpace.valueOr(0); \
</ins><span class="cx"> Wasm::SignatureIndex signatureIndex = \
module->signatureIndexFromFunctionIndexSpace(startFunctionIndexSpace); \
</span><span class="cx"> const Wasm::Signature& signature = \
Wasm::SignatureInformation::get(signatureIndex); </span><span class="cx"> // \
The start function must not take any arguments or return anything. This is enforced \
by the parser. </span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (239460 => 239461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WTF/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/Optional.h:
+ (WTF::Optional<T::valueOr const):
+
</ins><span class="cx"> 2018-12-20 Tadeu Zagallo <tzagallo@apple.com>
</span><span class="cx">
</span><span class="cx"> Consistently use MaxLength for all WTF strings
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Optional.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Optional.h 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WTF/wtf/Optional.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -557,26 +557,12 @@
</span><span class="cx"> return *this ? **this : \
detail_::convert<T>(detail_::constexpr_forward<V>(v)); </span><span \
class="cx"> } </span><span class="cx">
</span><del>- // FIXME: Remove this.
</del><span class="cx"> template <class V>
</span><del>- constexpr T value_or(V&& v) const&
- {
- return *this ? **this : \
detail_::convert<T>(detail_::constexpr_forward<V>(v));
- }
-
- template <class V>
</del><span class="cx"> OPTIONAL_MUTABLE_CONSTEXPR T valueOr(V&& v) \
&& </span><span class="cx"> {
</span><span class="cx"> return *this ? \
detail_::constexpr_move(const_cast<Optional<T>&>(*this).contained_val()) \
: detail_::convert<T>(detail_::constexpr_forward<V>(v)); </span><span \
class="cx"> } </span><span class="cx">
</span><del>- // FIXME: Remove this.
- 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));
- }
-
</del><span class="cx"> # else
</span><span class="cx">
</span><span class="cx"> template <class V>
</span><span class="lines">@@ -585,13 +571,6 @@
</span><span class="cx"> return *this ? **this : \
detail_::convert<T>(detail_::constexpr_forward<V>(v)); </span><span \
class="cx"> } </span><span class="cx">
</span><del>- // FIXME: Remove this.
- template <class V>
- constexpr T value_or(V&& v) const
- {
- return *this ? **this : \
detail_::convert<T>(detail_::constexpr_forward<V>(v));
- }
-
</del><span class="cx"> # endif
</span><span class="cx">
</span><span class="cx"> // 20.6.3.6, modifiers
</span><span class="lines">@@ -699,7 +678,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class V>
</span><del>- constexpr typename std::decay<T>::type value_or(V&& v) \
const </del><ins>+ constexpr typename std::decay<T>::type valueOr(V&& \
v) const </ins><span class="cx"> {
</span><span class="cx"> return *this ? **this : detail_::convert<typename \
std::decay<T>::type>(detail_::constexpr_forward<V>(v)); </span><span \
class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,296 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
+ (WebCore::convert):
+ (WebCore::ApplePayPaymentHandler::didAuthorizePayment):
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::load):
+ * Modules/indexeddb/IDBDatabaseIdentifier.h:
+ (WebCore::IDBDatabaseIdentifier::hash const):
+ * Modules/indexeddb/IDBFactory.cpp:
+ (WebCore::IDBFactory::open):
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::applyConstraints):
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ (WebCore::RTCDTMFSender::insertDTMF):
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::executeSql):
+ * Modules/webvr/VRFrameData.cpp:
+ (WebCore::VRFrameData::update):
+ * animation/AnimationTimeline.cpp:
+ (WebCore::AnimationTimeline::updateCSSTransitionsForElement):
+ * animation/DeclarativeAnimation.cpp:
+ (WebCore::DeclarativeAnimation::cancel):
+ (WebCore::DeclarativeAnimation::invalidateDOMEvents):
+ * animation/KeyframeEffect.cpp:
+ (WebCore::computeMissingKeyframeOffsets):
+ (WebCore::KeyframeEffect::applyPendingAcceleratedActions):
+ * animation/WebAnimation.cpp:
+ (WebCore::WebAnimation::runPendingPlayTask):
+ (WebCore::WebAnimation::runPendingPauseTask):
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::write):
+ * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
+ (WebCore::CryptoAlgorithmHMAC::generateKey):
+ (WebCore::CryptoAlgorithmHMAC::importKey):
+ * crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp:
+ (WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
+ (WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
+ * crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:
+ (WebCore::CryptoKeyRSA::importSpki):
+ (WebCore::CryptoKeyRSA::importPkcs8):
+ * crypto/keys/CryptoKeyRSA.cpp:
+ (WebCore::CryptoKeyRSA::importJwk):
+ * crypto/mac/CryptoAlgorithmAES_GCMMac.cpp:
+ (WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
+ (WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
+ * crypto/mac/CryptoKeyRSAMac.cpp:
+ (WebCore::CryptoKeyRSA::importSpki):
+ (WebCore::CryptoKeyRSA::importPkcs8):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::counterToCSSValue):
+ * css/CSSFontFace.cpp:
+ (WebCore::calculateItalicRange):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::doubleValue const):
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::addRule):
+ * css/DOMMatrix.cpp:
+ (WebCore::DOMMatrix::rotateSelf):
+ * css/DOMMatrixReadOnly.cpp:
+ (WebCore::DOMMatrixReadOnly::validateAndFixup):
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueCounter):
+ * css/parser/MediaQueryParser.cpp:
+ (WebCore::MediaQueryParser::commitMediaQuery):
+ * dom/Document.h:
+ (WebCore::Document::referrerPolicy const):
+ * dom/Element.cpp:
+ (WebCore::toScrollAlignment):
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::addEventListener):
+ * dom/MutationObserver.cpp:
+ (WebCore::MutationObserver::observe):
+ * editing/cocoa/FontAttributeChangesCocoa.mm:
+ (WebCore::FontChanges::platformFontFamilyNameForCSS const):
+ * fileapi/File.cpp:
+ (WebCore::File::File):
+ * html/DOMTokenList.cpp:
+ (WebCore::DOMTokenList::toggle):
+ * html/HTMLOListElement.h:
+ * html/ImageBitmap.cpp:
+ (WebCore::croppedSourceRectangleWithFormatting):
+ * html/canvas/CanvasPattern.cpp:
+ (WebCore::CanvasPattern::setTransform):
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ (WebCore::CanvasRenderingContext2DBase::setTransform):
+ (WebCore::CanvasRenderingContext2DBase::isPointInPathInternal):
+ (WebCore::CanvasRenderingContext2DBase::isPointInStrokeInternal):
+ * html/canvas/Path2D.cpp:
+ (WebCore::Path2D::addPath):
+ * inspector/InspectorCanvas.cpp:
+ (WebCore::InspectorCanvas::buildAction):
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::populateContextMenu):
+ * layout/FormattingContext.cpp:
+ (WebCore::Layout::FormattingContext::validateGeometryConstraintsAfterLayout \
const): + * layout/FormattingContextGeometry.cpp:
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::complicatedCases):
+ (WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin):
+ (WebCore::Layout::FormattingContext::Geometry::inFlowPositionedPositionOffset):
+ (WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedHorizontalMarginValue):
+ (WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedVerticalMarginValue):
+ * layout/FormattingContextQuirks.cpp:
+ (WebCore::Layout::FormattingContext::Quirks::heightValueOfNearestContainingBlockWithFixedHeight):
+ * layout/MarginTypes.h:
+ (WebCore::Layout::VerticalMargin::usedValues const):
+ * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+ (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
+ (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin):
+ (WebCore::Layout::BlockFormattingContext::Geometry::instrinsicWidthConstraints):
+ * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+ (WebCore::Layout::BlockFormattingContext::Quirks::stretchedHeight):
+ * layout/displaytree/DisplayBox.h:
+ (WebCore::Display::Box::width const):
+ (WebCore::Display::Box::height const):
+ (WebCore::Display::Box::contentBoxTop const):
+ (WebCore::Display::Box::contentBoxLeft const):
+ * layout/floats/FloatingContext.cpp:
+ (WebCore::Layout::Iterator::set):
+ * layout/inlineformatting/InlineFormattingContext.cpp:
+ (WebCore::Layout::InlineFormattingContext::appendContentToLine const):
+ (WebCore::Layout::InlineFormattingContext::placeInFlowPositionedChildren \
const): + * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::urlSelected):
+ * loader/NavigationAction.cpp:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setLayoutViewportOverrideRect):
+ (WebCore::FrameView::documentToAbsoluteScaleFactor const):
+ (WebCore::FrameView::viewportSizeForCSSViewportUnits const):
+ * page/Page.cpp:
+ (WebCore::Page::setLowPowerModeEnabledOverrideForTesting):
+ * page/SecurityOriginData.cpp:
+ (WebCore::SecurityOriginData::databaseIdentifier const):
+ * page/SecurityOriginData.h:
+ (WebCore::SecurityOriginDataHash::hash):
+ * page/SecurityOriginHash.h:
+ (WebCore::SecurityOriginHash::hash):
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::setViewLayoutSize):
+ * page/WindowFeatures.cpp:
+ (WebCore::parseDialogFeatures):
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::updateStateMachine):
+ (WebCore::AnimationBase::fireAnimationEventsIfNeeded):
+ (WebCore::AnimationBase::getTimeToNextEvent const):
+ (WebCore::AnimationBase::freezeAtTime):
+ (WebCore::AnimationBase::getElapsedTime const):
+ * page/animation/CSSAnimationController.cpp:
+ (WebCore::CSSAnimationControllerPrivate::updateAnimationTimer):
+ * page/cocoa/ResourceUsageThreadCocoa.mm:
+ (WebCore::ResourceUsageThread::platformThreadBody):
+ * page/linux/ResourceUsageThreadLinux.cpp:
+ (WebCore::ResourceUsageThread::platformThreadBody):
+ * platform/graphics/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::offsetForPosition):
+ * platform/graphics/FontCache.h:
+ (WebCore::FontDescriptionKey::computeHash const):
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::drawText const):
+ (WebCore::FontCascade::drawEmphasisMarks const):
+ (WebCore::FontCascade::displayListForTextRun const):
+ (WebCore::FontCascade::adjustSelectionRectForText const):
+ (WebCore::FontCascade::codePath const):
+ * platform/graphics/FontSelectionAlgorithm.cpp:
+ (WebCore::FontSelectionAlgorithm::styleDistance const):
+ * platform/graphics/FontSelectionAlgorithm.h:
+ (WebCore::operator<<):
+ (WebCore::FontSelectionSpecifiedCapabilities::computeWeight const):
+ (WebCore::FontSelectionSpecifiedCapabilities::computeWidth const):
+ (WebCore::FontSelectionSpecifiedCapabilities::computeSlope const):
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ShadowBlur::calculateLayerBoundingRect):
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::startLoading):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::paintCurrentFrameInContext):
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::naturalSize):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+ * platform/graphics/filters/FETurbulence.cpp:
+ (WebCore::FETurbulence::fillRegion const):
+ * platform/graphics/gstreamer/GStreamerCommon.cpp:
+ (WebCore::initializeGStreamer):
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
+ (WebCore::TextureMapperLayer::replicaTransform):
+ (WebCore::TextureMapperLayer::syncAnimations):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::transformedVisibleRect):
+ (WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
+ * platform/graphics/transforms/TransformState.cpp:
+ (WebCore::TransformState::mappedPoint const):
+ (WebCore::TransformState::mapQuad const):
+ (WebCore::TransformState::flattenWithTransform):
+ * platform/network/CacheValidation.cpp:
+ (WebCore::computeCurrentAge):
+ (WebCore::computeFreshnessLifetimeForHTTPFamily):
+ * platform/network/NetworkStateNotifier.cpp:
+ (WebCore::NetworkStateNotifier::onLine):
+ * rendering/FloatingObjects.cpp:
+ (WebCore::FindNextFloatLogicalBottomAdapter::nextLogicalBottom const):
+ (WebCore::FindNextFloatLogicalBottomAdapter::nextShapeLogicalBottom const):
+ * rendering/GridBaselineAlignment.cpp:
+ (WebCore::GridBaselineAlignment::ascentForChild const):
+ * rendering/GridTrackSizingAlgorithm.cpp:
+ (WebCore::GridTrack::setGrowthLimit):
+ (WebCore::GridTrackSizingAlgorithm::initialBaseSize const):
+ (WebCore::GridTrackSizingAlgorithm::initialGrowthLimit const):
+ (WebCore::GridTrackSizingAlgorithm::sizeTrackToFitNonSpanningItem):
+ (WebCore::sortByGridTrackGrowthPotential):
+ (WebCore::GridTrackSizingAlgorithm::estimatedGridAreaBreadthForChild const):
+ (WebCore::GridTrackSizingAlgorithmStrategy::minSizeForChild const):
+ (WebCore::GridTrackSizingAlgorithm::initializeTrackSizes):
+ * rendering/PaintInfo.h:
+ (WebCore::PaintInfo::applyTransform):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalHeight const):
+ * rendering/RenderCounter.cpp:
+ (WebCore::planCounter):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::baselinePosition const):
+ (WebCore::RenderFlexibleBox::marginBoxAscentForChild):
+ (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::gridGap const):
+ (WebCore::RenderGrid::baselinePosition const):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerByApplyingTransform):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintItem):
+ (WebCore::RenderListBox::listIndexIsVisible):
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::calculateMaxColumnHeight const):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::cellBaselinePosition const):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::firstLineBaseline const):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::computePreferredLogicalWidths):
+ (WebCore::RenderText::previousOffset const):
+ (WebCore::RenderText::previousOffsetForBackwardDeletion const):
+ (WebCore::RenderText::nextOffset const):
+ (WebCore::RenderText::stringView const):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::layout):
+ * rendering/mathml/RenderMathMLBlock.cpp:
+ (WebCore::RenderMathMLBlock::baselinePosition const):
+ * rendering/mathml/RenderMathMLBlock.h:
+ (WebCore::RenderMathMLBlock::ascentForChild):
+ * rendering/style/GridPosition.cpp:
+ (WebCore::GridPosition::max):
+ * rendering/style/TextUnderlineOffset.h:
+ (WebCore::TextUnderlineOffset::lengthOr const):
+ * 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::nodeAtFloatPoint):
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::nodeAtFloatPoint):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::clipToImageBuffer):
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::processGlyphElement):
+ (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
</ins><span class="cx"> 2018-12-20 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r239419): heap-use-after-free in \
AudioSourceProviderAVFObjC::finalizeCallback() </span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaypaymentrequestApplePayPaymentHandlercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx">
</span><span class="cx"> static Ref<PaymentAddress> convert(const \
ApplePayPaymentContact& contact) </span><span class="cx"> {
</span><del>- return PaymentAddress::create(contact.countryCode, \
contact.addressLines.value_or(Vector<String>()), contact.administrativeArea, \
contact.locality, contact.subLocality, contact.postalCode, String(), String(), \
contact.localizedName, contact.phoneNumber); </del><ins>+ return \
PaymentAddress::create(contact.countryCode, \
contact.addressLines.valueOr(Vector<String>()), contact.administrativeArea, \
contact.locality, contact.subLocality, contact.postalCode, String(), String(), \
contact.localizedName, contact.phoneNumber); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> ASSERT(!m_isUpdating);
</span><span class="cx">
</span><span class="cx"> auto applePayPayment = \
payment.toApplePayPayment(version()); </span><del>- auto shippingContact = \
applePayPayment.shippingContact.value_or(ApplePayPaymentContact()); </del><ins>+ \
auto shippingContact = \
applePayPayment.shippingContact.valueOr(ApplePayPaymentContact()); </ins><span \
class="cx"> auto detailsFunction = [applePayPayment = \
WTFMove(applePayPayment)](JSC::ExecState& execState) { </span><span class="cx"> \
return toJSDictionary(execState, applePayPayment); </span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // 8.9.5. Run the Update Expiration \
algorithm on the session, providing expiration time. </span><span class="cx"> \
// This must be run, and NaN is the default value if the CDM instance doesn't provide \
one. </span><del>- \
updateExpiration(expiration.value_or(std::numeric_limits<double>::quiet_NaN()));
</del><ins>+ \
updateExpiration(expiration.valueOr(std::numeric_limits<double>::quiet_NaN())); \
</ins><span class="cx"> </span><span class="cx"> // 8.9.6. If \
message is not null, run the Queue a "message" Event algorithm on the \
session, providing message type and message. </span><span class="cx"> \
if (message) </span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifierh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -62,7 +62,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[8] = { nameHash, \
sessionIDHash, openingProtocolHash, openingHostHash, \
m_openingOrigin.port.value_or(0), mainFrameProtocolHash, mainFrameHostHash, \
m_mainFrameOrigin.port.value_or(0) }; </del><ins>+ unsigned hashCodes[8] = { \
nameHash, sessionIDHash, openingProtocolHash, openingHostHash, \
m_openingOrigin.port.valueOr(0), mainFrameProtocolHash, mainFrameHostHash, \
m_mainFrameOrigin.port.valueOr(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 (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> if (version && !version.value())
</span><span class="cx"> return Exception { TypeError, \
"IDBFactory.open() called with a version of 0"_s }; </span><span \
class="cx"> </span><del>- return openInternal(context, name, \
version.value_or(0)); </del><ins>+ return openInternal(context, name, \
version.valueOr(0)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<IDBOpenDBRequest>> \
IDBFactory::openInternal(ScriptExecutionContext& context, const String& name, \
uint64_t version) </span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> if (!weakThis || !weakThis->m_promise)
</span><span class="cx"> return;
</span><span class="cx"> weakThis->m_promise->resolve();
</span><del>- weakThis->m_constraints = \
constraints.value_or(MediaTrackConstraints { }); </del><ins>+ \
weakThis->m_constraints = constraints.valueOr(MediaTrackConstraints { }); \
</ins><span class="cx"> }; </span><span class="cx"> \
m_private->applyConstraints(createMediaConstraints(constraints), \
WTFMove(successHandler), WTFMove(failureHandler)); </span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> if (interToneGap && interToneGap.value() < \
minInterToneGapMs) </span><span class="cx"> return Exception { SyntaxError };
</span><span class="cx">
</span><del>- m_duration = duration.value_or(defaultToneDurationMs);
- m_interToneGap = interToneGap.value_or(defaultInterToneGapMs);
</del><ins>+ m_duration = duration.valueOr(defaultToneDurationMs);
+ m_interToneGap = interToneGap.valueOr(defaultInterToneGapMs);
</ins><span class="cx">
</span><span class="cx"> return Exception { SyntaxError };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> else if (m_readOnly)
</span><span class="cx"> permissions |= DatabaseAuthorizer::ReadOnlyMask;
</span><span class="cx">
</span><del>- auto statement = std::make_unique<SQLStatement>(m_database, \
sqlStatement, arguments.value_or(Vector<SQLValue> { }), WTFMove(callback), \
WTFMove(callbackError), permissions); </del><ins>+ auto statement = \
std::make_unique<SQLStatement>(m_database, sqlStatement, \
arguments.valueOr(Vector<SQLValue> { }), WTFMove(callback), \
WTFMove(callbackError), permissions); </ins><span class="cx">
</span><span class="cx"> if (m_database->deleted())
</span><span class="cx"> statement->setDatabaseDeletedError();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebvrVRFrameDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webvr/VRFrameData.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webvr/VRFrameData.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/Modules/webvr/VRFrameData.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> m_timestamp = trackingInfo.timestamp;
</span><span class="cx"> m_pose->update(trackingInfo);
</span><span class="cx">
</span><del>- auto rotationMatrix = \
rotationMatrixFromQuaternion(trackingInfo.orientation.value_or(VRPlatformTrackingInfo::Quaternion(0, \
0, 0, 1)));
- FloatPoint3D position = trackingInfo.position.value_or(FloatPoint3D(0, 0, 0));
</del><ins>+ auto rotationMatrix = \
rotationMatrixFromQuaternion(trackingInfo.orientation.valueOr(VRPlatformTrackingInfo::Quaternion(0, \
0, 0, 1))); + FloatPoint3D position = \
trackingInfo.position.valueOr(FloatPoint3D(0, 0, 0)); </ins><span class="cx"> \
rotationMatrix.translate3d(-position.x(), -position.y(), -position.z()); </span><span \
class="cx"> </span><span class="cx"> m_leftViewMatrix = rotationMatrix;
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationAnimationTimelinecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/animation/AnimationTimeline.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/animation/AnimationTimeline.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/animation/AnimationTimeline.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> auto& reversingAdjustedStartStyle = \
previouslyRunningTransition->targetStyle(); </span><span class="cx"> \
double transformedProgress = 1; </span><span class="cx"> if (auto* \
effect = previouslyRunningTransition->effect()) </span><del>- \
transformedProgress = effect->iterationProgress().value_or(transformedProgress); \
</del><ins>+ transformedProgress = \
effect->iterationProgress().valueOr(transformedProgress); </ins><span class="cx"> \
auto reversingShorteningFactor = std::max(std::min(((transformedProgress * \
previouslyRunningTransition->reversingShorteningFactor()) + (1 - \
previouslyRunningTransition->reversingShorteningFactor())), 1.0), 0.0); \
</span><span class="cx"> auto delay = \
matchingBackingAnimation->delay() < 0 ? \
Seconds(matchingBackingAnimation->delay()) * reversingShorteningFactor : \
Seconds(matchingBackingAnimation->delay()); </span><span class="cx"> \
auto duration = Seconds(matchingBackingAnimation->duration()) * \
reversingShorteningFactor; </span></span></pre></div>
<a id="trunkSourceWebCoreanimationDeclarativeAnimationcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/animation/DeclarativeAnimation.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/animation/DeclarativeAnimation.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/animation/DeclarativeAnimation.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto cancelationTime = 0_s;
</span><span class="cx"> if (auto animationEffect = effect())
</span><del>- cancelationTime = \
animationEffect->activeTime().value_or(0_s); </del><ins>+ cancelationTime = \
animationEffect->activeTime().valueOr(0_s); </ins><span class="cx">
</span><span class="cx"> WebAnimation::cancel();
</span><span class="cx">
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> if (isPending && m_wasPending)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto iteration = animationEffect ? \
animationEffect->currentIteration().value_or(0) : 0; </del><ins>+ auto \
iteration = animationEffect ? animationEffect->currentIteration().valueOr(0) : 0; \
</ins><span class="cx"> auto currentPhase = animationEffect ? \
animationEffect->phase() : phaseWithoutEffect(); </span><span class="cx">
</span><span class="cx"> bool wasActive = m_previousPhase == \
AnimationEffect::Phase::Active; </span></span></pre></div>
<a id="trunkSourceWebCoreanimationKeyframeEffectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/KeyframeEffect.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/KeyframeEffect.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/animation/KeyframeEffect.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> // that a keyframe hasn't had a computed offset by \
checking if it has a null offset and a 0 computedOffset, since the first </span><span \
class="cx"> // keyframe will already have a 0 computedOffset. </span><span \
class="cx"> for (auto& keyframe : keyframes) </span><del>- \
keyframe.computedOffset = keyframe.offset.value_or(0); </del><ins>+ \
keyframe.computedOffset = keyframe.offset.valueOr(0); </ins><span class="cx">
</span><span class="cx"> // 2. If keyframes contains more than one keyframe and \
the computed keyframe offset of the first keyframe in keyframes is null, </span><span \
class="cx"> // set the computed keyframe offset of the first keyframe to 0. \
</span><span class="lines">@@ -1314,7 +1314,7 @@ </span><span class="cx"> auto* \
compositedRenderer = downcast<RenderBoxModelObject>(renderer); </span><span \
class="cx"> </span><span class="cx"> // To simplify the code we use a default of \
0s for an unresolved current time since for a Stop action that is acceptable. \
</span><del>- auto timeOffset = \
animation()->currentTime().value_or(0_s).seconds() - delay().seconds(); \
</del><ins>+ auto timeOffset = \
animation()->currentTime().valueOr(0_s).seconds() - delay().seconds(); </ins><span \
class="cx"> </span><span class="cx"> for (const auto& action : \
pendingAcceleratedActions) { </span><span class="cx"> switch (action) {
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationWebAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/WebAnimation.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/WebAnimation.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/animation/WebAnimation.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -917,7 +917,7 @@
</span><span class="cx"> // Subsequently, the resulting readyTime value can \
be null. Unify behavior between C++17 and </span><span class="cx"> // C++14 \
builds (the latter using WTF's Optional) and avoid null Optional dereferencing \
</span><span class="cx"> // by defaulting to a Seconds(0) value. See \
https://bugs.webkit.org/show_bug.cgi?id=186189. </span><del>- auto \
newStartTime = readyTime.value_or(0_s); </del><ins>+ auto newStartTime = \
readyTime.valueOr(0_s); </ins><span class="cx"> if (m_playbackRate)
</span><span class="cx"> newStartTime -= m_holdTime.value() / \
m_playbackRate; </span><span class="cx"> // 3. Set the start time of \
animation to new start time. </span><span class="lines">@@ -928,7 +928,7 @@
</span><span class="cx"> } else if (m_startTime && m_pendingPlaybackRate) \
{ </span><span class="cx"> // If animation's start time is resolved and \
animation has a pending playback rate, </span><span class="cx"> // 1. Let \
current time to match be the result of evaluating (ready time - start time) × \
playback rate for animation. </span><del>- auto currentTimeToMatch = \
(readyTime.value_or(0_s) - m_startTime.value()) * m_playbackRate; </del><ins>+ \
auto currentTimeToMatch = (readyTime.valueOr(0_s) - m_startTime.value()) * \
m_playbackRate; </ins><span class="cx"> // 2. Apply any pending playback rate \
on animation. </span><span class="cx"> applyPendingPlaybackRate();
</span><span class="cx"> // 3. If animation's playback rate is zero, let \
animation's hold time be current time to match. </span><span class="lines">@@ -936,7 \
+936,7 @@ </span><span class="cx"> m_holdTime = currentTimeToMatch;
</span><span class="cx"> // 4. Let new start time be the result of evaluating \
ready time - current time to match / playback rate for animation. </span><span \
class="cx"> // If the playback rate is zero, let new start time be simply \
ready time. </span><del>- auto newStartTime = readyTime.value_or(0_s);
</del><ins>+ auto newStartTime = readyTime.valueOr(0_s);
</ins><span class="cx"> if (m_playbackRate)
</span><span class="cx"> newStartTime -= currentTimeToMatch / \
m_playbackRate; </span><span class="cx"> // 5. Set the start time of \
animation to new start time. </span><span class="lines">@@ -1059,7 +1059,7 @@
</span><span class="cx"> // Subsequently, the resulting readyTime value can \
be null. Unify behavior between C++17 and </span><span class="cx"> // C++14 \
builds (the latter using WTF's Optional) and avoid null Optional dereferencing \
</span><span class="cx"> // by defaulting to a Seconds(0) value. See \
https://bugs.webkit.org/show_bug.cgi?id=186189. </span><del>- m_holdTime = \
(readyTime.value_or(0_s) - animationStartTime.value()) * m_playbackRate; </del><ins>+ \
m_holdTime = (readyTime.valueOr(0_s) - animationStartTime.value()) * m_playbackRate; \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> // 3. Apply any pending playback rate on animation.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -1262,7 +1262,7 @@
</span><span class="cx"> write(file.url());
</span><span class="cx"> write(file.type());
</span><span class="cx"> write(file.name());
</span><del>- \
write(static_cast<double>(file.lastModifiedOverride().value_or(-1))); \
</del><ins>+ write(static_cast<double>(file.lastModifiedOverride().valueOr(-1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_CRYPTO)
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = \
CryptoKeyHMAC::generate(hmacParameters.length.value_or(0), \
hmacParameters.hashIdentifier, extractable, usages); </del><ins>+ auto result = \
CryptoKeyHMAC::generate(hmacParameters.length.valueOr(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">@@ -110,7 +110,7 @@
</span><span class="cx"> RefPtr<CryptoKeyHMAC> result;
</span><span class="cx"> switch (format) {
</span><span class="cx"> case CryptoKeyFormat::Raw:
</span><del>- result = \
CryptoKeyHMAC::importRaw(hmacParameters.length.value_or(0), \
hmacParameters.hashIdentifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), \
extractable, usages); </del><ins>+ result = \
CryptoKeyHMAC::importRaw(hmacParameters.length.valueOr(0), \
hmacParameters.hashIdentifier, WTFMove(WTF::get<Vector<uint8_t>>(data)), \
extractable, usages); </ins><span class="cx"> break;
</span><span class="cx"> case CryptoKeyFormat::Jwk: {
</span><span class="cx"> auto checkAlgCallback = [](CryptoAlgorithmIdentifier \
hash, const String& alg) -> bool { </span><span class="lines">@@ -130,7 +130,7 \
@@ </span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><del>- result = \
CryptoKeyHMAC::importJwk(hmacParameters.length.value_or(0), \
hmacParameters.hashIdentifier, WTFMove(WTF::get<JsonWebKey>(data)), \
extractable, usages, WTFMove(checkAlgCallback)); </del><ins>+ result = \
CryptoKeyHMAC::importJwk(hmacParameters.length.valueOr(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="trunkSourceWebCorecryptogcryptCryptoAlgorithmAES_GCMGCryptcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoAlgorithmAES_GCM::platformEncrypt(const CryptoAlgorithmAesGcmParams& \
parameters, const CryptoKeyAES& key, const Vector<uint8_t>& plainText) \
</span><span class="cx"> { </span><del>- auto output = gcryptEncrypt(key.key(), \
parameters.ivVector(), plainText, parameters.additionalDataVector(), \
parameters.tagLength.value_or(0) / 8); </del><ins>+ auto output = \
gcryptEncrypt(key.key(), parameters.ivVector(), plainText, \
parameters.additionalDataVector(), parameters.tagLength.valueOr(0) / 8); </ins><span \
class="cx"> if (!output) </span><span class="cx"> return Exception { \
OperationError }; </span><span class="cx"> return WTFMove(*output);
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoAlgorithmAES_GCM::platformDecrypt(const CryptoAlgorithmAesGcmParams& \
parameters, const CryptoKeyAES& key, const Vector<uint8_t>& cipherText) \
</span><span class="cx"> { </span><del>- auto output = gcryptDecrypt(key.key(), \
parameters.ivVector(), cipherText, parameters.additionalDataVector(), \
parameters.tagLength.value_or(0) / 8); </del><ins>+ auto output = \
gcryptDecrypt(key.key(), parameters.ivVector(), cipherText, \
parameters.additionalDataVector(), parameters.tagLength.valueOr(0) / 8); </ins><span \
class="cx"> if (!output) </span><span class="cx"> return Exception { \
OperationError }; </span><span class="cx"> return WTFMove(*output);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptogcryptCryptoKeyRSAGCryptcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return adoptRef(new CryptoKeyRSA(identifier, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, CryptoKeyType::Public, \
platformKey.release(), extractable, usages)); </del><ins>+ return adoptRef(new \
CryptoKeyRSA(identifier, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, \
CryptoKeyType::Public, platformKey.release(), extractable, usages)); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> RefPtr<CryptoKeyRSA> \
CryptoKeyRSA::importPkcs8(CryptoAlgorithmIdentifier identifier, \
Optional<CryptoAlgorithmIdentifier> hash, Vector<uint8_t>&& \
keyData, bool extractable, CryptoKeyUsageBitmap usages) </span><span class="lines">@@ \
-408,7 +408,7 @@ </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return adoptRef(new CryptoKeyRSA(identifier, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, CryptoKeyType::Private, \
platformKey.release(), extractable, usages)); </del><ins>+ return adoptRef(new \
CryptoKeyRSA(identifier, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, \
CryptoKeyType::Private, platformKey.release(), extractable, usages)); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoKeyRSA::exportSpki() const </span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyRSAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> // import public key
</span><span class="cx"> auto publicKeyComponents = \
CryptoKeyRSAComponents::createPublic(WTFMove(modulus), WTFMove(exponent)); \
</span><span class="cx"> // Notice: CryptoAlgorithmIdentifier::SHA_1 is just \
a placeholder. It should not have any effect if hash is WTF::nullopt. </span><del>- \
return CryptoKeyRSA::create(algorithm, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *publicKeyComponents, \
extractable, usages); </del><ins>+ return CryptoKeyRSA::create(algorithm, \
hash.valueOr(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">@@ -68,7 +68,7 @@
</span><span class="cx"> if (keyData.p.isNull() && keyData.q.isNull() \
&& keyData.dp.isNull() && keyData.dp.isNull() && \
keyData.qi.isNull()) { </span><span class="cx"> auto privateKeyComponents = \
CryptoKeyRSAComponents::createPrivate(WTFMove(modulus), WTFMove(exponent), \
WTFMove(privateExponent)); </span><span class="cx"> // Notice: \
CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect \
if hash is WTF::nullopt. </span><del>- return CryptoKeyRSA::create(algorithm, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, \
extractable, usages); </del><ins>+ return CryptoKeyRSA::create(algorithm, \
hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, \
extractable, usages); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (keyData.p.isNull() || keyData.q.isNull() || \
keyData.dp.isNull() || keyData.dq.isNull() || keyData.qi.isNull()) </span><span \
class="lines">@@ -88,7 +88,7 @@ </span><span class="cx"> if (!keyData.oth) {
</span><span class="cx"> auto privateKeyComponents = \
CryptoKeyRSAComponents::createPrivateWithAdditionalData(WTFMove(modulus), \
WTFMove(exponent), WTFMove(privateExponent), WTFMove(firstPrimeInfo), \
WTFMove(secondPrimeInfo), { }); </span><span class="cx"> // Notice: \
CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have any effect \
if hash is WTF::nullopt. </span><del>- return CryptoKeyRSA::create(algorithm, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, \
extractable, usages); </del><ins>+ return CryptoKeyRSA::create(algorithm, \
hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, *privateKeyComponents, \
extractable, usages); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<CryptoKeyRSAComponents::PrimeInfo> \
otherPrimeInfos; </span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> auto privateKeyComponents = \
CryptoKeyRSAComponents::createPrivateWithAdditionalData(WTFMove(modulus), \
WTFMove(exponent), WTFMove(privateExponent), WTFMove(firstPrimeInfo), \
WTFMove(secondPrimeInfo), WTFMove(otherPrimeInfos)); </span><span class="cx"> // \
Notice: CryptoAlgorithmIdentifier::SHA_1 is just a placeholder. It should not have \
any effect if hash is WTF::nullopt. </span><del>- return \
CryptoKeyRSA::create(algorithm, hash.value_or(CryptoAlgorithmIdentifier::SHA_1), \
!!hash, *privateKeyComponents, extractable, usages); </del><ins>+ return \
CryptoKeyRSA::create(algorithm, hash.valueOr(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="trunkSourceWebCorecryptomacCryptoAlgorithmAES_GCMMaccpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoAlgorithmAES_GCM::platformEncrypt(const CryptoAlgorithmAesGcmParams& \
parameters, const CryptoKeyAES& key, const Vector<uint8_t>& plainText) \
</span><span class="cx"> { </span><del>- return \
encryptAES_GCM(parameters.ivVector(), key.key(), plainText, \
parameters.additionalDataVector(), parameters.tagLength.value_or(0) / 8); \
</del><ins>+ return encryptAES_GCM(parameters.ivVector(), key.key(), plainText, \
parameters.additionalDataVector(), parameters.tagLength.valueOr(0) / 8); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoAlgorithmAES_GCM::platformDecrypt(const CryptoAlgorithmAesGcmParams& \
parameters, const CryptoKeyAES& key, const Vector<uint8_t>& cipherText) \
</span><span class="cx"> { </span><del>- return \
decyptAES_GCM(parameters.ivVector(), key.key(), cipherText, \
parameters.additionalDataVector(), parameters.tagLength.value_or(0) / 8); \
</del><ins>+ return decyptAES_GCM(parameters.ivVector(), key.key(), cipherText, \
parameters.additionalDataVector(), parameters.tagLength.valueOr(0) / 8); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a \
placeholder. It should not have any effect if hash is WTF::nullopt. </span><del>- \
return adoptRef(new CryptoKeyRSA(identifier, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, CryptoKeyType::Public, \
ccPublicKey, extractable, usages)); </del><ins>+ return adoptRef(new \
CryptoKeyRSA(identifier, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, \
CryptoKeyType::Public, ccPublicKey, extractable, usages)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoKeyRSA::exportSpki() const </span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // Notice: CryptoAlgorithmIdentifier::SHA_1 is just a \
placeholder. It should not have any effect if hash is WTF::nullopt. </span><del>- \
return adoptRef(new CryptoKeyRSA(identifier, \
hash.value_or(CryptoAlgorithmIdentifier::SHA_1), !!hash, CryptoKeyType::Private, \
ccPrivateKey, extractable, usages)); </del><ins>+ return adoptRef(new \
CryptoKeyRSA(identifier, hash.valueOr(CryptoAlgorithmIdentifier::SHA_1), !!hash, \
CryptoKeyType::Private, ccPrivateKey, extractable, usages)); </ins><span class="cx"> \
} </span><span class="cx">
</span><span class="cx"> ExceptionOr<Vector<uint8_t>> \
CryptoKeyRSA::exportPkcs8() const </span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -1951,7 +1951,7 @@
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> for (auto& keyValue : *map) {
</span><span class="cx"> \
list->append(cssValuePool.createValue(keyValue.key, \
CSSPrimitiveValue::CSS_STRING)); </span><del>- double number = (propertyID == \
CSSPropertyCounterIncrement ? keyValue.value.incrementValue : \
keyValue.value.resetValue).value_or(0); </del><ins>+ double number = \
(propertyID == CSSPropertyCounterIncrement ? keyValue.value.incrementValue : \
keyValue.value.resetValue).valueOr(0); </ins><span class="cx"> \
list->append(cssValuePool.createValue(number, CSSPrimitiveValue::CSS_NUMBER)); \
</span><span class="cx"> } </span><span class="cx"> return WTFMove(list);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (value.isFontStyleValue()) {
</span><span class="cx"> auto result = \
StyleBuilderConverter::convertFontStyleFromValue(value); </span><del>- return \
{ result.value_or(normalItalicValue()), result.value_or(normalItalicValue()) }; \
</del><ins>+ return { result.valueOr(normalItalicValue()), \
result.valueOr(normalItalicValue()) }; </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(value.isFontStyleRangeValue());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx">
</span><span class="cx"> double CSSPrimitiveValue::doubleValue(UnitType unitType) \
const </span><span class="cx"> {
</span><del>- return doubleValueInternal(unitType).value_or(0);
</del><ins>+ return doubleValueInternal(unitType).valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double CSSPrimitiveValue::doubleValue() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -316,7 +316,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.value_or(length())); </del><ins>+ auto insertRuleResult = \
insertRule(text.toString(), index.valueOr(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="trunkSourceWebCorecssDOMMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMMatrix.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMMatrix.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/css/DOMMatrix.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> rotX = 0;
</span><span class="cx"> rotY = 0;
</span><span class="cx"> }
</span><del>- m_matrix.rotate3d(rotX, rotY.value_or(0), rotZ.value_or(0));
- if (rotX || rotY.value_or(0))
</del><ins>+ m_matrix.rotate3d(rotX, rotY.valueOr(0), rotZ.valueOr(0));
+ if (rotX || rotY.valueOr(0))
</ins><span class="cx"> m_is2D = false;
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMMatrixReadOnlycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMMatrixReadOnly.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMMatrixReadOnly.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/css/DOMMatrixReadOnly.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -120,17 +120,17 @@
</span><span class="cx"> return Exception { TypeError, "init.f and \
init.m42 do not match"_s }; </span><span class="cx">
</span><span class="cx"> if (!init.m11)
</span><del>- init.m11 = init.a.value_or(1);
</del><ins>+ init.m11 = init.a.valueOr(1);
</ins><span class="cx"> if (!init.m12)
</span><del>- init.m12 = init.b.value_or(0);
</del><ins>+ init.m12 = init.b.valueOr(0);
</ins><span class="cx"> if (!init.m21)
</span><del>- init.m21 = init.c.value_or(0);
</del><ins>+ init.m21 = init.c.valueOr(0);
</ins><span class="cx"> if (!init.m22)
</span><del>- init.m22 = init.d.value_or(1);
</del><ins>+ init.m22 = init.d.valueOr(1);
</ins><span class="cx"> if (!init.m41)
</span><del>- init.m41 = init.e.value_or(0);
</del><ins>+ init.m41 = init.e.valueOr(0);
</ins><span class="cx"> if (!init.m42)
</span><del>- init.m42 = init.f.value_or(0);
</del><ins>+ init.m42 = init.f.valueOr(0);
</ins><span class="cx">
</span><span class="cx"> return { };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -1193,7 +1193,7 @@
</span><span class="cx"> if (counterBehavior == Reset)
</span><span class="cx"> directives.resetValue = value;
</span><span class="cx"> else
</span><del>- directives.incrementValue = \
saturatedAddition(directives.incrementValue.value_or(0), value); </del><ins>+ \
directives.incrementValue = saturatedAddition(directives.incrementValue.valueOr(0), \
value); </ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserMediaQueryParsercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/css/parser/MediaQueryParser.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> // FIXME-NEWPARSER: Convoluted and awful, but we can't \
change the MediaQuerySet yet because of the </span><span class="cx"> // old \
parser. </span><span class="cx"> static const NeverDestroyed<String> \
defaultMediaType { "all"_s }; </span><del>- MediaQuery mediaQuery { \
m_mediaQueryData.restrictor(), \
m_mediaQueryData.mediaType().value_or(defaultMediaType), \
WTFMove(m_mediaQueryData.expressions()) }; </del><ins>+ MediaQuery mediaQuery { \
m_mediaQueryData.restrictor(), \
m_mediaQueryData.mediaType().valueOr(defaultMediaType), \
WTFMove(m_mediaQueryData.expressions()) }; </ins><span class="cx"> \
m_mediaQueryData.clear(); </span><span class="cx"> \
m_querySet->addMediaQuery(WTFMove(mediaQuery)); </span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/dom/Document.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setReferrerPolicy(ReferrerPolicy);
</span><del>- ReferrerPolicy referrerPolicy() const { return \
m_referrerPolicy.value_or(ReferrerPolicy::NoReferrerWhenDowngrade); } </del><ins>+ \
ReferrerPolicy referrerPolicy() const { return \
m_referrerPolicy.valueOr(ReferrerPolicy::NoReferrerWhenDowngrade); } </ins><span \
class="cx"> </span><span class="cx"> WEBCORE_EXPORT DocumentType* doctype() \
const; </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/dom/Element.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> // FIXME(webkit.org/b/161611): Take into account \
orientation/direction. </span><span class="cx"> inline ScrollAlignment \
toScrollAlignment(Optional<ScrollLogicalPosition> position, bool isVertical) \
</span><span class="cx"> { </span><del>- switch (position.value_or(isVertical ? \
ScrollLogicalPosition::Start : ScrollLogicalPosition::Nearest)) { </del><ins>+ \
switch (position.valueOr(isVertical ? ScrollLogicalPosition::Start : \
ScrollLogicalPosition::Nearest)) { </ins><span class="cx"> case \
ScrollLogicalPosition::Start: </span><span class="cx"> return isVertical ? \
ScrollAlignment::alignTopAlways : ScrollAlignment::alignLeftAlways; </span><span \
class="cx"> case ScrollLogicalPosition::Center: </span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> bool listenerCreatedFromScript = listener->type() == \
EventListener::JSEventListenerType && !listener->wasCreatedFromMarkup(); \
</span><span class="cx"> auto listenerRef = listener.copyRef(); </span><span \
class="cx"> </span><del>- if \
(!ensureEventTargetData().eventListenerMap.add(eventType, WTFMove(listener), { \
options.capture, passive.value_or(false), options.once })) </del><ins>+ if \
(!ensureEventTargetData().eventListenerMap.add(eventType, WTFMove(listener), { \
options.capture, passive.valueOr(false), options.once })) </ins><span class="cx"> \
return false; </span><span class="cx">
</span><span class="cx"> if (listenerCreatedFromScript)
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -85,9 +85,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.value_or(false))
</del><ins>+ if (init.attributeOldValue.valueOr(false))
</ins><span class="cx"> options |= AttributeOldValue;
</span><del>- if (init.characterDataOldValue.value_or(false))
</del><ins>+ if (init.characterDataOldValue.valueOr(false))
</ins><span class="cx"> options |= CharacterDataOldValue;
</span><span class="cx">
</span><span class="cx"> HashSet<AtomicString> attributeFilter;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaFontAttributeChangesCocoamm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/editing/cocoa/FontAttributeChangesCocoa.mm (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/editing/cocoa/FontAttributeChangesCocoa.mm 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/editing/cocoa/FontAttributeChangesCocoa.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> RetainPtr<CFStringRef> fontNameFromDescription;
</span><span class="cx">
</span><span class="cx"> FontDescription description;
</span><del>- description.setIsItalic(m_italic.value_or(false));
- description.setWeight(FontSelectionValue { m_bold.value_or(false) ? 900 : 500 \
}); </del><ins>+ description.setIsItalic(m_italic.valueOr(false));
+ description.setWeight(FontSelectionValue { m_bold.valueOr(false) ? 900 : 500 });
</ins><span class="cx"> if (auto font = \
FontCache::singleton().fontForFamily(description, m_fontFamily)) </span><span \
class="cx"> fontNameFromDescription = \
adoptCF(CTFontCopyPostScriptName(font->getCTFont())); </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/fileapi/File.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> File::File(Vector<BlobPartVariant>&& \
blobPartVariants, const String& filename, const PropertyBag& propertyBag) \
</span><span class="cx"> : Blob(WTFMove(blobPartVariants), \
convertPropertyBag(propertyBag)) </span><span class="cx"> , m_name(filename)
</span><del>- , m_lastModifiedDateOverride(propertyBag.lastModified.value_or(WallTime::now().secondsSinceEpoch().milliseconds()))
</del><ins>+ , m_lastModifiedDateOverride(propertyBag.lastModified.valueOr(WallTime::now().secondsSinceEpoch().milliseconds()))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -141,7 +141,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.value_or(false)) {
</del><ins>+ if (!force.valueOr(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="trunkSourceWebCorehtmlHTMLOListElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOListElement.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOListElement.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/html/HTMLOListElement.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> static Ref<HTMLOListElement> \
create(Document&); </span><span class="cx"> static \
Ref<HTMLOListElement> create(const QualifiedName&, Document&); \
</span><span class="cx"> </span><del>- int startForBindings() const { return \
m_start.value_or(1); } </del><ins>+ int startForBindings() const { return \
m_start.valueOr(1); } </ins><span class="cx"> WEBCORE_EXPORT void \
setStartForBindings(int); </span><span class="cx">
</span><span class="cx"> // FIXME: The reason start() does not trigger layout is \
because it is called </span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageBitmap.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageBitmap.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/html/ImageBitmap.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> // Otherwise let sourceRectangle be a rectangle whose \
corners are the four points </span><span class="cx"> // (0,0), (width of \
input, 0), (width of input, height of input), (0, height of </span><span class="cx"> \
// input). </span><del>- auto sourceRectangle = rect.value_or(IntRect { 0, 0, \
inputSize.width(), inputSize.height() }); </del><ins>+ auto sourceRectangle = \
rect.valueOr(IntRect { 0, 0, inputSize.width(), inputSize.height() }); </ins><span \
class="cx"> </span><span class="cx"> // 4. Clip sourceRectangle to the \
dimensions of input. </span><span class="cx"> sourceRectangle.intersect(IntRect { \
0, 0, inputSize.width(), inputSize.height() }); </span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasPatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasPattern.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasPattern.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/html/canvas/CanvasPattern.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if (checkValid.hasException())
</span><span class="cx"> return checkValid.releaseException();
</span><span class="cx">
</span><del>- m_pattern->setPatternSpaceTransform({ matrixInit.a.value_or(1), \
matrixInit.b.value_or(0), matrixInit.c.value_or(0), matrixInit.d.value_or(1), \
matrixInit.e.value_or(0), matrixInit.f.value_or(0) }); </del><ins>+ \
m_pattern->setPatternSpaceTransform({ matrixInit.a.valueOr(1), \
matrixInit.b.valueOr(0), matrixInit.c.valueOr(0), matrixInit.d.valueOr(1), \
matrixInit.e.valueOr(0), matrixInit.f.valueOr(0) }); </ins><span class="cx"> \
return { }; </span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -915,7 +915,7 @@
</span><span class="cx"> if (checkValid.hasException())
</span><span class="cx"> return checkValid.releaseException();
</span><span class="cx">
</span><del>- setTransform(matrixInit.a.value_or(1), matrixInit.b.value_or(0), \
matrixInit.c.value_or(0), matrixInit.d.value_or(1), matrixInit.e.value_or(0), \
matrixInit.f.value_or(0)); </del><ins>+ setTransform(matrixInit.a.valueOr(1), \
matrixInit.b.valueOr(0), matrixInit.c.valueOr(0), matrixInit.d.valueOr(1), \
matrixInit.e.valueOr(0), matrixInit.f.valueOr(0)); </ins><span class="cx"> return \
{ }; </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1204,7 +1204,7 @@
</span><span class="cx"> if (!state().hasInvertibleTransform)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto transformedPoint = \
state().transform.inverse().value_or(AffineTransform()).mapPoint(FloatPoint(x, y)); \
</del><ins>+ auto transformedPoint = \
state().transform.inverse().valueOr(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">@@ -1220,7 \
+1220,7 @@ </span><span class="cx"> if (!state().hasInvertibleTransform)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto transformedPoint = \
state().transform.inverse().value_or(AffineTransform()).mapPoint(FloatPoint(x, y)); \
</del><ins>+ auto transformedPoint = \
state().transform.inverse().valueOr(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></pre></div>
<a id="trunkSourceWebCorehtmlcanvasPath2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/Path2D.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/Path2D.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/html/canvas/Path2D.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> if (checkValid.hasException())
</span><span class="cx"> return checkValid.releaseException();
</span><span class="cx">
</span><del>- m_path.addPath(path.path(), { matrixInit.a.value_or(1), \
matrixInit.b.value_or(0), matrixInit.c.value_or(0), matrixInit.d.value_or(1), \
matrixInit.e.value_or(0), matrixInit.f.value_or(0) }); </del><ins>+ \
m_path.addPath(path.path(), { matrixInit.a.valueOr(1), matrixInit.b.valueOr(0), \
matrixInit.c.valueOr(0), matrixInit.d.valueOr(1), matrixInit.e.valueOr(0), \
matrixInit.f.valueOr(0) }); </ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvas.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvas.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/inspector/InspectorCanvas.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -582,12 +582,12 @@
</span><span class="cx"> [&] (CanvasTextBaseline value) { \
addParameter(indexForData(convertEnumerationToString(value)), \
RecordingSwizzleTypes::String); }, </span><span class="cx"> [&] \
(const DOMMatrix2DInit& value) { </span><span class="cx"> auto \
array = JSON::ArrayOf<double>::create(); </span><del>- \
array->addItem(value.a.value_or(1));
- array->addItem(value.b.value_or(0));
- array->addItem(value.c.value_or(0));
- array->addItem(value.d.value_or(1));
- array->addItem(value.e.value_or(0));
- array->addItem(value.f.value_or(0));
</del><ins>+ array->addItem(value.a.valueOr(1));
+ array->addItem(value.b.valueOr(0));
+ array->addItem(value.c.valueOr(0));
+ array->addItem(value.d.valueOr(1));
+ array->addItem(value.e.valueOr(0));
+ array->addItem(value.f.valueOr(0));
</ins><span class="cx"> addParameter(array.ptr(), \
RecordingSwizzleTypes::DOMMatrix); </span><span class="cx"> },
</span><span class="cx"> [&] (const Element*) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto type = item.type == "checkbox" ? \
CheckableActionType : ActionType; </span><del>- auto action = \
static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + \
item.id.value_or(0)); </del><ins>+ auto action = \
static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + \
item.id.valueOr(0)); </ins><span class="cx"> ContextMenuItem menuItem = { \
type, action, item.label }; </span><span class="cx"> if (item.enabled)
</span><span class="cx"> menuItem.setEnabled(*item.enabled);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> if ((layoutBox.isBlockLevelBox() || \
layoutBox.isOutOfFlowPositioned()) && !layoutBox.replaced()) { </span><span \
class="cx"> // margin-left + border-left-width + padding-left + width + \
padding-right + border-right-width + margin-right = width of containing block \
</span><span class="cx"> auto containingBlockWidth = \
containingBlockDisplayBox.contentBoxWidth(); </span><del>- \
ASSERT(displayBox.marginStart() + displayBox.borderLeft() + \
displayBox.paddingLeft().value_or(0) + displayBox.contentBoxWidth()
- + displayBox.paddingRight().value_or(0) + displayBox.borderRight() + \
displayBox.marginEnd() == containingBlockWidth); </del><ins>+ \
ASSERT(displayBox.marginStart() + displayBox.borderLeft() + \
displayBox.paddingLeft().valueOr(0) + displayBox.contentBoxWidth() + + \
displayBox.paddingRight().valueOr(0) + displayBox.borderRight() + \
displayBox.marginEnd() == containingBlockWidth); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 10.6.4 Absolutely positioned, non-replaced \
elements </span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> if (layoutBox.isOutOfFlowPositioned() && \
!layoutBox.replaced()) { </span><span class="cx"> // top + margin-top + \
border-top-width + padding-top + height + padding-bottom + border-bottom-width + \
margin-bottom + bottom = height of containing block </span><span class="cx"> \
auto containingBlockHeight = containingBlockDisplayBox.contentBoxHeight(); \
</span><del>- ASSERT(displayBox.top() + displayBox.marginBefore() + \
displayBox.borderTop() + displayBox.paddingTop().value_or(0) + \
displayBox.contentBoxHeight()
- + displayBox.paddingBottom().value_or(0) + displayBox.borderBottom() \
+ displayBox.marginAfter() == containingBlockHeight); </del><ins>+ \
ASSERT(displayBox.top() + displayBox.marginBefore() + displayBox.borderTop() + \
displayBox.paddingTop().valueOr(0) + displayBox.contentBoxHeight() + + \
displayBox.paddingBottom().valueOr(0) + displayBox.borderBottom() + \
displayBox.marginAfter() == containingBlockHeight); </ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContextGeometrycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/FormattingContextGeometry.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -282,8 +282,8 @@
</span><span class="cx"> auto height = usedHeight ? usedHeight.value() : \
computedHeightValue(layoutState, layoutBox, HeightType::Normal); </span><span \
class="cx"> auto marginBefore = computedValueIfNotAuto(style.marginBefore(), \
containingBlockWidth); </span><span class="cx"> auto marginAfter = \
computedValueIfNotAuto(style.marginAfter(), containingBlockWidth); </span><del>- \
auto paddingTop = displayBox.paddingTop().value_or(0);
- auto paddingBottom = displayBox.paddingBottom().value_or(0);
</del><ins>+ auto paddingTop = displayBox.paddingTop().valueOr(0);
+ auto paddingBottom = displayBox.paddingBottom().valueOr(0);
</ins><span class="cx"> auto borderTop = displayBox.borderTop();
</span><span class="cx"> auto borderBottom = displayBox.borderBottom();
</span><span class="cx">
</span><span class="lines">@@ -307,8 +307,8 @@
</span><span class="cx"> if (!top && !height && bottom) {
</span><span class="cx"> // #1
</span><span class="cx"> height = \
contentHeightForFormattingContextRoot(layoutState, layoutBox); </span><del>- \
marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> top = containingBlockHeight - (*marginBefore + \
borderTop + paddingTop + *height + paddingBottom + borderBottom + *marginAfter + \
*bottom); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -315,8 +315,8 @@
</span><span class="cx"> if (!top && !bottom && height) {
</span><span class="cx"> // #2
</span><span class="cx"> top = \
staticVerticalPositionForOutOfFlowPositioned(layoutState, layoutBox); </span><del>- \
marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> bottom = containingBlockHeight - (*top + \
*marginBefore + borderTop + paddingTop + *height + paddingBottom + borderBottom + \
*marginAfter); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -323,29 +323,29 @@
</span><span class="cx"> if (!height && !bottom && top) {
</span><span class="cx"> // #3
</span><span class="cx"> height = \
contentHeightForFormattingContextRoot(layoutState, layoutBox); </span><del>- \
marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> bottom = containingBlockHeight - (*top + \
*marginBefore + borderTop + paddingTop + *height + paddingBottom + borderBottom + \
*marginAfter); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!top && height && bottom) {
</span><span class="cx"> // #4
</span><del>- marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> top = containingBlockHeight - (*marginBefore + \
borderTop + paddingTop + *height + paddingBottom + borderBottom + *marginAfter + \
*bottom); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!height && top && bottom) {
</span><span class="cx"> // #5
</span><del>- marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> height = containingBlockHeight - (*top + \
*marginBefore + borderTop + paddingTop + paddingBottom + borderBottom + *marginAfter \
+ *bottom); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!bottom && top && height) {
</span><span class="cx"> // #6
</span><del>- marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> bottom = containingBlockHeight - (*top + \
*marginBefore + borderTop + paddingTop + *height + paddingBottom + borderBottom + \
*marginAfter); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -400,10 +400,10 @@
</span><span class="cx"> auto width = computedValueIfNotAuto(usedWidth ? Length { \
usedWidth.value(), Fixed } : style.logicalWidth(), containingBlockWidth); \
</span><span class="cx"> auto marginStart = \
computedValueIfNotAuto(style.marginStart(), containingBlockWidth); </span><span \
class="cx"> auto marginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth); </span><del>- auto nonComputedMarginStart = \
marginStart.value_or(0);
- auto nonComputedMarginEnd = marginEnd.value_or(0);
- auto paddingLeft = displayBox.paddingLeft().value_or(0);
- auto paddingRight = displayBox.paddingRight().value_or(0);
</del><ins>+ auto nonComputedMarginStart = marginStart.valueOr(0);
+ auto nonComputedMarginEnd = marginEnd.valueOr(0);
+ auto paddingLeft = displayBox.paddingLeft().valueOr(0);
+ auto paddingRight = displayBox.paddingRight().valueOr(0);
</ins><span class="cx"> auto borderLeft = displayBox.borderLeft();
</span><span class="cx"> auto borderRight = displayBox.borderRight();
</span><span class="cx">
</span><span class="lines">@@ -411,8 +411,8 @@
</span><span class="cx"> // If all three of 'left', 'width', and 'right' are \
'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. \
</span><span class="cx"> // Then, if the 'direction' property of the element \
establishing the static-position containing block is 'ltr' set 'left' to the static \
</span><span class="cx"> // position and apply rule number three below; \
otherwise, set 'right' to the static position and apply rule number one below. \
</span><del>- marginStart = marginStart.value_or(0);
- marginEnd = marginEnd.value_or(0);
</del><ins>+ marginStart = marginStart.valueOr(0);
+ marginEnd = marginEnd.valueOr(0);
</ins><span class="cx">
</span><span class="cx"> auto staticHorizontalPosition = \
staticHorizontalPositionForOutOfFlowPositioned(layoutState, layoutBox); </span><span \
class="cx"> if (isLeftToRightDirection) </span><span class="lines">@@ -459,8 \
+459,8 @@ </span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Otherwise, set 'auto' values for 'margin-left' \
and 'margin-right' to 0, and pick the one of the following six rules that applies. \
</span><del>- marginStart = marginStart.value_or(0);
- marginEnd = marginEnd.value_or(0);
</del><ins>+ marginStart = marginStart.valueOr(0);
+ marginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(marginStart);
</span><span class="lines">@@ -530,8 +530,8 @@
</span><span class="cx"> auto height = inlineReplacedHeightAndMargin(layoutState, \
layoutBox, usedHeight).height; </span><span class="cx"> auto marginBefore = \
computedValueIfNotAuto(style.marginBefore(), containingBlockWidth); </span><span \
class="cx"> auto marginAfter = computedValueIfNotAuto(style.marginAfter(), \
containingBlockWidth); </span><del>- auto paddingTop = \
displayBox.paddingTop().value_or(0);
- auto paddingBottom = displayBox.paddingBottom().value_or(0);
</del><ins>+ auto paddingTop = displayBox.paddingTop().valueOr(0);
+ auto paddingBottom = displayBox.paddingBottom().valueOr(0);
</ins><span class="cx"> auto borderTop = displayBox.borderTop();
</span><span class="cx"> auto borderBottom = displayBox.borderBottom();
</span><span class="cx">
</span><span class="lines">@@ -542,8 +542,8 @@
</span><span class="cx">
</span><span class="cx"> if (!bottom) {
</span><span class="cx"> // #2
</span><del>- marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!marginBefore && !marginAfter) {
</span><span class="lines">@@ -602,11 +602,11 @@
</span><span class="cx"> auto right = \
computedValueIfNotAuto(style.logicalRight(), containingBlockWidth); </span><span \
class="cx"> auto marginStart = computedValueIfNotAuto(style.marginStart(), \
containingBlockWidth); </span><span class="cx"> auto marginEnd = \
computedValueIfNotAuto(style.marginEnd(), containingBlockWidth); </span><del>- \
auto nonComputedMarginStart = marginStart.value_or(0);
- auto nonComputedMarginEnd = marginEnd.value_or(0);
</del><ins>+ auto nonComputedMarginStart = marginStart.valueOr(0);
+ auto nonComputedMarginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> auto width = inlineReplacedWidthAndMargin(layoutState, \
layoutBox, usedWidth).width; </span><del>- auto paddingLeft = \
displayBox.paddingLeft().value_or(0);
- auto paddingRight = displayBox.paddingRight().value_or(0);
</del><ins>+ auto paddingLeft = displayBox.paddingLeft().valueOr(0);
+ auto paddingRight = displayBox.paddingRight().valueOr(0);
</ins><span class="cx"> auto borderLeft = displayBox.borderLeft();
</span><span class="cx"> auto borderRight = displayBox.borderRight();
</span><span class="cx">
</span><span class="lines">@@ -621,8 +621,8 @@
</span><span class="cx">
</span><span class="cx"> if (!left || !right) {
</span><span class="cx"> // #2
</span><del>- marginStart = marginStart.value_or(0);
- marginEnd = marginEnd.value_or(0);
</del><ins>+ marginStart = marginStart.valueOr(0);
+ marginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!marginStart && !marginEnd) {
</span><span class="lines">@@ -697,8 +697,8 @@
</span><span class="cx"> auto marginAfter = \
computedValueIfNotAuto(style.marginAfter(), containingBlockWidth); </span><span \
class="cx"> </span><span class="cx"> // #1
</span><del>- marginBefore = marginBefore.value_or(0);
- marginAfter = marginAfter.value_or(0);
</del><ins>+ marginBefore = marginBefore.valueOr(0);
+ marginAfter = marginAfter.valueOr(0);
</ins><span class="cx"> // #2
</span><span class="cx"> if (!height) {
</span><span class="cx"> ASSERT(isHeightAuto(layoutBox));
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> if (precomputedMarginEnd)
</span><span class="cx"> return precomputedMarginEnd.value();
</span><span class="cx"> auto marginEnd = \
computedValueIfNotAuto(style.marginEnd(), containingBlockWidth); </span><del>- \
return marginEnd.value_or(0_lu); </del><ins>+ return marginEnd.valueOr(0_lu);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> auto computeMarginStart = [&]() {
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> if (precomputedMarginStart)
</span><span class="cx"> return precomputedMarginStart.value();
</span><span class="cx"> auto marginStart = \
computedValueIfNotAuto(style.marginStart(), containingBlockWidth); </span><del>- \
return marginStart.value_or(0_lu); </del><ins>+ return \
marginStart.valueOr(0_lu); </ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> auto replaced = layoutBox.replaced();
</span><span class="lines">@@ -888,8 +888,8 @@
</span><span class="cx">
</span><span class="cx"> auto marginStart = computeMarginStart();
</span><span class="cx"> auto marginEnd = computeMarginEnd();
</span><del>- auto nonComputedMarginStart = \
computedValueIfNotAuto(style.marginStart(), \
containingBlockWidth).value_or(0);
- auto nonComputedMarginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth).value_or(0); </del><ins>+ auto nonComputedMarginStart = \
computedValueIfNotAuto(style.marginStart(), containingBlockWidth).valueOr(0); + \
auto nonComputedMarginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth).valueOr(0); </ins><span class="cx"> auto width = \
computedValueIfNotAuto(usedWidth ? Length { usedWidth.value(), Fixed } : \
style.logicalWidth(), containingBlockWidth); </span><span class="cx">
</span><span class="cx"> auto heightIsAuto = isHeightAuto(layoutBox);
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> } else if ((!width && heightIsAuto && \
!replaced->hasIntrinsicWidth() && replaced->hasIntrinsicHeight() \
&& replaced->hasIntrinsicRatio()) </span><span class="cx"> || \
(!width && height && replaced->hasIntrinsicRatio())) { \
</span><span class="cx"> // #2 </span><del>- width = \
height.value_or(replaced->hasIntrinsicHeight()) * replaced->intrinsicRatio(); \
</del><ins>+ width = height.valueOr(replaced->hasIntrinsicHeight()) * \
replaced->intrinsicRatio(); </ins><span class="cx"> } else if (!width \
&& heightIsAuto && replaced->hasIntrinsicRatio() && \
!replaced->hasIntrinsicWidth() && !replaced->hasIntrinsicHeight()) { \
</span><span class="cx"> // #3 </span><span class="cx"> // FIXME: \
undefined but surely doable. </span><span class="lines">@@ -990,7 +990,7 @@
</span><span class="cx"> ASSERT(!left || *left == -*right);
</span><span class="cx">
</span><span class="cx"> auto topPositionOffset = *top;
</span><del>- auto leftPositionOffset = left.value_or(-*right);
</del><ins>+ auto leftPositionOffset = left.valueOr(-*right);
</ins><span class="cx">
</span><span class="cx"> LOG_WITH_STREAM(FormattingContextLayout, stream << \
"[Position] -> positioned inflow -> top offset(" << \
topPositionOffset << "px) left offset(" << leftPositionOffset \
<< "px) layoutBox(" << &layoutBox << ")"); \
</span><span class="cx"> return { leftPositionOffset, topPositionOffset }; \
</span><span class="lines">@@ -1025,8 +1025,8 @@ </span><span class="cx"> \
auto& style = layoutBox.style(); </span><span class="cx"> auto \
containingBlockWidth = \
layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth(); \
</span><span class="cx"> </span><del>- auto marginStart = \
computedValueIfNotAuto(style.marginStart(), \
containingBlockWidth).value_or(0_lu);
- auto marginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth).value_or(0_lu); </del><ins>+ auto marginStart = \
computedValueIfNotAuto(style.marginStart(), containingBlockWidth).valueOr(0_lu); + \
auto marginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth).valueOr(0_lu); </ins><span class="cx">
</span><span class="cx"> LOG_WITH_STREAM(FormattingContextLayout, stream << \
"[Margin] -> non collapsed horizontal -> margin(" << \
marginStart << "px, " << marginEnd << "px) -> \
layoutBox: " << &layoutBox); </span><span class="cx"> return { \
marginStart, marginEnd }; </span><span class="lines">@@ -1037,8 +1037,8 @@
</span><span class="cx"> auto& style = layoutBox.style();
</span><span class="cx"> auto containingBlockWidth = \
layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth(); \
</span><span class="cx"> </span><del>- auto marginBefore = \
computedValueIfNotAuto(style.marginBefore(), \
containingBlockWidth).value_or(0_lu);
- auto marginAfter = computedValueIfNotAuto(style.marginAfter(), \
containingBlockWidth).value_or(0_lu); </del><ins>+ auto marginBefore = \
computedValueIfNotAuto(style.marginBefore(), containingBlockWidth).valueOr(0_lu); + \
auto marginAfter = computedValueIfNotAuto(style.marginAfter(), \
containingBlockWidth).valueOr(0_lu); </ins><span class="cx">
</span><span class="cx"> LOG_WITH_STREAM(FormattingContextLayout, stream << \
"[Margin] -> non collapsed vertical -> margin(" << marginBefore \
<< "px, " << marginAfter << "px) -> layoutBox: \
" << &layoutBox); </span><span class="cx"> return { marginBefore, \
marginAfter }; </span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContextQuirkscpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/FormattingContextQuirks.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/layout/FormattingContextQuirks.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/layout/FormattingContextQuirks.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> auto& displayBox = \
layoutState.displayBoxForLayoutBox(*containingBlock); </span><span class="cx">
</span><span class="cx"> auto verticalMargin = \
FormattingContext::Geometry::computedNonCollapsedVerticalMarginValue(layoutState, \
*containingBlock); </span><del>- auto verticalPadding = \
displayBox.paddingTop().value_or(0) + displayBox.paddingBottom().value_or(0); \
</del><ins>+ auto verticalPadding = displayBox.paddingTop().valueOr(0) + \
displayBox.paddingBottom().valueOr(0); </ins><span class="cx"> auto \
verticalBorder = displayBox.borderTop() + displayBox.borderBottom(); </span><span \
class="cx"> bodyAndDocumentVerticalMarginPaddingAndBorder += \
verticalMargin.before + verticalMargin.after + verticalPadding + verticalBorder; \
</span><span class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebCorelayoutMarginTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/MarginTypes.h (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/MarginTypes.h 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/layout/MarginTypes.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_collapsed)
</span><span class="cx"> return m_nonCollapsed;
</span><del>- return { m_collapsed->before.value_or(m_nonCollapsed.before),
- m_collapsed->after.value_or(m_nonCollapsed.after) };
</del><ins>+ return { m_collapsed->before.valueOr(m_nonCollapsed.before),
+ m_collapsed->after.valueOr(m_nonCollapsed.after) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextGeometrycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -61,10 +61,10 @@
</span><span class="cx"> auto containingBlockWidth = \
layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth(); \
</span><span class="cx"> auto& displayBox = \
layoutState.displayBoxForLayoutBox(layoutBox); </span><span class="cx">
</span><del>- auto nonCollapsedMargin = VerticalMargin::ComputedValues { \
computedValueIfNotAuto(style.marginBefore(), \
containingBlockWidth).value_or(0),
- computedValueIfNotAuto(style.marginAfter(), \
containingBlockWidth).value_or(0) }; </del><ins>+ auto nonCollapsedMargin = \
VerticalMargin::ComputedValues { computedValueIfNotAuto(style.marginBefore(), \
containingBlockWidth).valueOr(0), + \
computedValueIfNotAuto(style.marginAfter(), containingBlockWidth).valueOr(0) }; \
</ins><span class="cx"> auto collapsedMargin = \
VerticalMargin::CollapsedValues { MarginCollapse::marginBefore(layoutState, \
layoutBox), MarginCollapse::marginAfter(layoutState, layoutBox) }; </span><del>- \
auto borderAndPaddingTop = displayBox.borderTop() + \
displayBox.paddingTop().value_or(0); </del><ins>+ auto borderAndPaddingTop = \
displayBox.borderTop() + displayBox.paddingTop().valueOr(0); </ins><span class="cx">
</span><span class="cx"> auto height = usedHeight ? usedHeight.value() : \
computedHeightValue(layoutState, layoutBox, HeightType::Normal); </span><span \
class="cx"> if (height) </span><span class="lines">@@ -143,19 +143,19 @@
</span><span class="cx"> auto width = computedValueIfNotAuto(usedWidth ? \
Length { usedWidth.value(), Fixed } : style.logicalWidth(), containingBlockWidth); \
</span><span class="cx"> auto marginStart = \
computedValueIfNotAuto(style.marginStart(), containingBlockWidth); </span><span \
class="cx"> auto marginEnd = computedValueIfNotAuto(style.marginEnd(), \
containingBlockWidth); </span><del>- auto nonComputedMarginStart = \
marginStart.value_or(0);
- auto nonComputedMarginEnd = marginEnd.value_or(0);
</del><ins>+ auto nonComputedMarginStart = marginStart.valueOr(0);
+ auto nonComputedMarginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> auto borderLeft = displayBox.borderLeft();
</span><span class="cx"> auto borderRight = displayBox.borderRight();
</span><del>- auto paddingLeft = displayBox.paddingLeft().value_or(0);
- auto paddingRight = displayBox.paddingRight().value_or(0);
</del><ins>+ auto paddingLeft = displayBox.paddingLeft().valueOr(0);
+ auto paddingRight = displayBox.paddingRight().valueOr(0);
</ins><span class="cx">
</span><span class="cx"> // #1
</span><span class="cx"> if (width) {
</span><del>- auto horizontalSpaceForMargin = containingBlockWidth - \
(marginStart.value_or(0) + borderLeft + paddingLeft + *width + paddingRight + \
borderRight + marginEnd.value_or(0)); </del><ins>+ auto \
horizontalSpaceForMargin = containingBlockWidth - (marginStart.valueOr(0) + \
borderLeft + paddingLeft + *width + paddingRight + borderRight + \
marginEnd.valueOr(0)); </ins><span class="cx"> if \
(horizontalSpaceForMargin < 0) { </span><del>- marginStart = \
marginStart.value_or(0);
- marginEnd = marginEnd.value_or(0);
</del><ins>+ marginStart = marginStart.valueOr(0);
+ marginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx">
</span><span class="cx"> // #4
</span><span class="cx"> if (!width) {
</span><del>- marginStart = marginStart.value_or(0);
- marginEnd = marginEnd.value_or(0);
</del><ins>+ marginStart = marginStart.valueOr(0);
+ marginEnd = marginEnd.valueOr(0);
</ins><span class="cx"> width = containingBlockWidth - (*marginStart + \
borderLeft + paddingLeft + paddingRight + borderRight + *marginEnd); </span><span \
class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -308,12 +308,12 @@
</span><span class="cx"> ASSERT(childInstrinsicWidthConstraints);
</span><span class="cx">
</span><span class="cx"> auto& style = child.style();
</span><del>- auto horizontalMarginBorderAndPadding = \
fixedValue(style.marginStart()).value_or(0) </del><ins>+ auto \
horizontalMarginBorderAndPadding = fixedValue(style.marginStart()).valueOr(0) \
</ins><span class="cx"> + LayoutUnit { style.borderLeftWidth() } \
</span><del>- + \
fixedValue(style.paddingLeft()).value_or(0)
- + fixedValue(style.paddingRight()).value_or(0)
</del><ins>+ + fixedValue(style.paddingLeft()).valueOr(0)
+ + fixedValue(style.paddingRight()).valueOr(0)
</ins><span class="cx"> + LayoutUnit { style.borderRightWidth() }
</span><del>- + fixedValue(style.marginEnd()).value_or(0);
</del><ins>+ + fixedValue(style.marginEnd()).valueOr(0);
</ins><span class="cx">
</span><span class="cx"> minimumIntrinsicWidth = \
std::max(minimumIntrinsicWidth, childInstrinsicWidthConstraints->minimum + \
horizontalMarginBorderAndPadding); </span><span class="cx"> \
maximumIntrinsicWidth = std::max(maximumIntrinsicWidth, \
childInstrinsicWidthConstraints->maximum + horizontalMarginBorderAndPadding); \
</span></span></pre></div> <a \
id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextQuirkscpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> auto& documentBox = layoutBox.isDocumentBox() ? \
layoutBox : *layoutBox.parent(); </span><span class="cx"> auto& \
documentBoxDisplayBox = layoutState.displayBoxForLayoutBox(documentBox); </span><span \
class="cx"> auto documentBoxVerticalBorders = documentBoxDisplayBox.borderTop() + \
documentBoxDisplayBox.borderBottom(); </span><del>- auto \
documentBoxVerticalPaddings = documentBoxDisplayBox.paddingTop().value_or(0) + \
documentBoxDisplayBox.paddingBottom().value_or(0); </del><ins>+ auto \
documentBoxVerticalPaddings = documentBoxDisplayBox.paddingTop().valueOr(0) + \
documentBoxDisplayBox.paddingBottom().valueOr(0); </ins><span class="cx">
</span><span class="cx"> auto strechedHeight = \
layoutState.displayBoxForLayoutBox(initialContainingBlock(layoutBox)).contentBoxHeight();
</span><span class="cx"> strechedHeight -= documentBoxVerticalBorders + \
documentBoxVerticalPaddings; </span></span></pre></div>
<a id="trunkSourceWebCorelayoutdisplaytreeDisplayBoxh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/displaytree/DisplayBox.h (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/layout/displaytree/DisplayBox.h 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/layout/displaytree/DisplayBox.h 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> LayoutPoint bottomRight() const { return { right(), \
bottom() }; } </span><span class="cx">
</span><span class="cx"> LayoutSize size() const { return { width(), height() }; \
} </span><del>- LayoutUnit width() const { return borderLeft() + \
paddingLeft().value_or(0) + contentBoxWidth() + paddingRight().value_or(0) + \
borderRight(); }
- LayoutUnit height() const { return borderTop() + paddingTop().value_or(0) + \
contentBoxHeight() + paddingBottom().value_or(0) + borderBottom(); } </del><ins>+ \
LayoutUnit width() const { return borderLeft() + paddingLeft().valueOr(0) + \
contentBoxWidth() + paddingRight().valueOr(0) + borderRight(); } + LayoutUnit \
height() const { return borderTop() + paddingTop().valueOr(0) + contentBoxHeight() + \
paddingBottom().valueOr(0) + borderBottom(); } </ins><span class="cx"> Rect \
rect() const { return { top(), left(), width(), height() }; } </span><span \
class="cx"> Rect rectWithMargin() const { return { top() - marginBefore(), left() \
- marginStart(), marginStart() + width() + marginEnd(), marginBefore() + height() + \
marginAfter() }; } </span><span class="cx">
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx"> Optional<LayoutUnit> paddingBottom() const;
</span><span class="cx"> Optional<LayoutUnit> paddingRight() const;
</span><span class="cx">
</span><del>- LayoutUnit contentBoxTop() const { return borderTop() + \
paddingTop().value_or(0); }
- LayoutUnit contentBoxLeft() const { return borderLeft() + \
paddingLeft().value_or(0); } </del><ins>+ LayoutUnit contentBoxTop() const { \
return borderTop() + paddingTop().valueOr(0); } + LayoutUnit contentBoxLeft() \
const { return borderLeft() + paddingLeft().valueOr(0); } </ins><span class="cx"> \
LayoutUnit contentBoxBottom() const { return contentBoxTop() + contentBoxHeight(); } \
</span><span class="cx"> LayoutUnit contentBoxRight() const { return \
contentBoxLeft() + contentBoxWidth(); } </span><span class="cx"> LayoutUnit \
contentBoxHeight() const; </span></span></pre></div>
<a id="trunkSourceWebCorelayoutfloatsFloatingContextcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/floats/FloatingContext.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/layout/floats/FloatingContext.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/layout/floats/FloatingContext.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx">
</span><span class="cx"> auto index = floatingType == Float::Left ? \
m_current.m_leftIndex : m_current.m_rightIndex; </span><span class="cx"> // \
Start from the end if we don't have current yet. </span><del>- index = \
index.value_or(m_floats.size()); </del><ins>+ index = \
index.valueOr(m_floats.size()); </ins><span class="cx"> while (true) {
</span><span class="cx"> index = previousFloatingIndex(floatingType, \
m_floats, *index); </span><span class="cx"> if (!index)
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> line.appendContent(run, runSize);
</span><span class="cx">
</span><span class="cx"> if (root().style().textAlign() == \
TextAlignMode::Justify) </span><del>- \
Geometry::computeExpansionOpportunities(line, run, \
lastRunType.value_or(InlineRunProvider::Run::Type::NonWhitespace)); </del><ins>+ \
Geometry::computeExpansionOpportunities(line, run, \
lastRunType.valueOr(InlineRunProvider::Run::Type::NonWhitespace)); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> void InlineFormattingContext::layoutInlineContent(const \
InlineRunProvider& inlineRunProvider) const </span><span class="lines">@@ -415,7 \
+415,7 @@ </span><span class="cx"> for (auto* box = &layoutBox; box \
!= &root(); box = box->parent()) { </span><span class="cx"> if \
(!box->isInFlowPositioned()) </span><span class="cx"> \
continue; </span><del>- offset = offset.value_or(LayoutSize()) + \
Geometry::inFlowPositionedPositionOffset(layoutState(), *box); </del><ins>+ \
offset = offset.valueOr(LayoutSize()) + \
Geometry::inFlowPositionedPositionOffset(layoutState(), *box); </ins><span \
class="cx"> } </span><span class="cx"> return offset;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> auto* frame = lexicalFrameFromCommonVM();
</span><span class="cx"> auto initiatedByMainFrame = frame && \
frame->isMainFrame() ? InitiatedByMainFrame::Yes : InitiatedByMainFrame::Unknown; \
</span><span class="cx"> </span><del>- NewFrameOpenerPolicy newFrameOpenerPolicy \
= openerPolicy.value_or(shouldSendReferrer == NeverSendReferrer ? \
NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow); </del><ins>+ \
NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.valueOr(shouldSendReferrer \
== NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow); \
</ins><span class="cx"> urlSelected(FrameLoadRequest(*m_frame.document(), \
m_frame.document()->securityOrigin(), { url }, passedTarget, lockHistory, \
lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, \
newFrameOpenerPolicy, shouldOpenExternalURLsPolicy, initiatedByMainFrame, \
DoNotReplaceDocumentIfJavaScriptURL, downloadAttribute, systemPreviewInfo), \
triggeringEvent); </span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationAction.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationAction.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/loader/NavigationAction.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> NavigationAction::Requester::Requester(const Document& \
document) </span><span class="cx"> : m_url { URL { document.url() } }
</span><span class="cx"> , m_origin { makeRefPtr(document.securityOrigin()) }
</span><del>- , m_pageIDAndFrameIDPair { document.frame() ? \
std::make_pair(document.frame()->loader().client().pageID().value_or(0), \
document.frame()->loader().client().frameID().value_or(0)) : \
std::make_pair<uint64_t, uint64_t>(0, 0) } </del><ins>+ , \
m_pageIDAndFrameIDPair { document.frame() ? \
std::make_pair(document.frame()->loader().client().pageID().valueOr(0), \
document.frame()->loader().client().frameID().valueOr(0)) : \
std::make_pair<uint64_t, uint64_t>(0, 0) } </ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/page/FrameView.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1671,7 +1671,7 @@
</span><span class="cx"> if (oldRect.height() != layoutViewportRect().height())
</span><span class="cx"> layoutTriggering = TriggerLayoutOrNot::Yes;
</span><span class="cx">
</span><del>- LOG_WITH_STREAM(Scrolling, stream << "\nFrameView " \
<< this << " setLayoutViewportOverrideRect() - changing override \
layout viewport from " << oldRect << " to " << \
m_layoutViewportOverrideRect.value_or(LayoutRect()) << " layoutTriggering \
" << (layoutTriggering == TriggerLayoutOrNot::Yes ? "yes" : \
"no")); </del><ins>+ LOG_WITH_STREAM(Scrolling, stream << \
"\nFrameView " << this << " \
setLayoutViewportOverrideRect() - changing override layout viewport from " \
<< oldRect << " to " << \
m_layoutViewportOverrideRect.valueOr(LayoutRect()) << " layoutTriggering \
" << (layoutTriggering == TriggerLayoutOrNot::Yes ? "yes" : \
"no")); </ins><span class="cx">
</span><span class="cx"> if (oldRect != layoutViewportRect() && \
layoutTriggering == TriggerLayoutOrNot::Yes) </span><span class="cx"> \
setViewportConstrainedObjectsNeedLayout(); </span><span class="lines">@@ -4823,7 \
+4823,7 @@ </span><span class="cx"> float \
FrameView::documentToAbsoluteScaleFactor(Optional<float> effectiveZoom) const \
</span><span class="cx"> { </span><span class="cx"> // If effectiveZoom is \
passed, it already factors in pageZoomFactor(). </span><del>- return \
effectiveZoom.value_or(frame().pageZoomFactor()) * frame().frameScaleFactor(); \
</del><ins>+ return effectiveZoom.valueOr(frame().pageZoomFactor()) * \
frame().frameScaleFactor(); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float \
FrameView::absoluteToDocumentScaleFactor(Optional<float> effectiveZoom) const \
</span><span class="lines">@@ -5370,8 +5370,8 @@ </span><span class="cx">
</span><span class="cx"> if (useFixedLayout()) {
</span><span class="cx"> auto fixedLayoutSize = this->fixedLayoutSize();
</span><del>- viewportSize.width = \
viewportSize.width.value_or(fixedLayoutSize.width());
- viewportSize.height = \
viewportSize.height.value_or(fixedLayoutSize.height()); </del><ins>+ \
viewportSize.width = viewportSize.width.valueOr(fixedLayoutSize.width()); + \
viewportSize.height = viewportSize.height.valueOr(fixedLayoutSize.height()); \
</ins><span class="cx"> return { *viewportSize.width, *viewportSize.height }; \
</span><span class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -5378,8 +5378,8 @@
</span><span class="cx"> // FIXME: the value returned should take into account \
the value of the overflow </span><span class="cx"> // property on the root \
element. </span><span class="cx"> auto visibleContentSizeIncludingScrollbars = \
visibleContentRectIncludingScrollbars().size(); </span><del>- viewportSize.width = \
viewportSize.width.value_or(visibleContentSizeIncludingScrollbars.width());
- viewportSize.height = \
viewportSize.height.value_or(visibleContentSizeIncludingScrollbars.height()); \
</del><ins>+ viewportSize.width = \
viewportSize.width.valueOr(visibleContentSizeIncludingScrollbars.width()); + \
viewportSize.height = \
viewportSize.height.valueOr(visibleContentSizeIncludingScrollbars.height()); \
</ins><span class="cx"> return { *viewportSize.width, *viewportSize.height }; \
</span><span class="cx"> } </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/page/Page.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1128,7 +1128,7 @@
</span><span class="cx"> void \
Page::setLowPowerModeEnabledOverrideForTesting(Optional<bool> isEnabled) \
</span><span class="cx"> { </span><span class="cx"> \
m_lowPowerModeEnabledOverrideForTesting = isEnabled; </span><del>- \
handleLowModePowerChange(m_lowPowerModeEnabledOverrideForTesting.value_or(false)); \
</del><ins>+ handleLowModePowerChange(m_lowPowerModeEnabledOverrideForTesting.valueOr(false));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setTopContentInset(float contentInset)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/page/SecurityOriginData.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> stringBuilder.append(separatorCharacter);
</span><span class="cx"> \
stringBuilder.append(FileSystem::encodeForFileName(host)); </span><span class="cx"> \
stringBuilder.append(separatorCharacter); </span><del>- \
stringBuilder.appendNumber(port.value_or(0)); </del><ins>+ \
stringBuilder.appendNumber(port.valueOr(0)); </ins><span class="cx">
</span><span class="cx"> return stringBuilder.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/page/SecurityOriginData.h 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -134,7 +134,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.value_or(0) </del><ins>+ data.port.valueOr(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 \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginHash.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/page/SecurityOriginHash.h 2018-12-20 20:23:18 UTC (rev \
239461) </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().value_or(0) </del><ins>+ origin->port().valueOr(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="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/page/ViewportConfiguration.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx">
</span><span class="cx"> bool ViewportConfiguration::setViewLayoutSize(const \
FloatSize& viewLayoutSize, Optional<double>&& scaleFactor, \
Optional<double>&& minimumEffectiveDeviceWidth) </span><span \
class="cx"> { </span><del>- double newScaleFactor = \
scaleFactor.value_or(m_layoutSizeScaleFactor);
- double newEffectiveWidth = \
minimumEffectiveDeviceWidth.value_or(m_minimumEffectiveDeviceWidth); </del><ins>+ \
double newScaleFactor = scaleFactor.valueOr(m_layoutSizeScaleFactor); + double \
newEffectiveWidth = minimumEffectiveDeviceWidth.valueOr(m_minimumEffectiveDeviceWidth);
</ins><span class="cx"> if (m_viewLayoutSize == viewLayoutSize && \
m_layoutSizeScaleFactor == newScaleFactor && newEffectiveWidth == \
m_minimumEffectiveDeviceWidth) </span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageWindowFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WindowFeatures.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WindowFeatures.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/page/WindowFeatures.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -182,8 +182,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()).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 </del><ins>+ 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 </ins><span class="cx">
</span><span class="cx"> features.width = width;
</span><span class="cx"> features.height = height;
</span><span class="lines">@@ -191,7 +191,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").value_or(true)) { </del><ins>+ if (boolFeature(featuresMap, \
"center").valueOr(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">@@ -198,9 +198,9 @@
</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").value_or(false);
- features.scrollbarsVisible = boolFeature(featuresMap, \
"scroll").value_or(true);
- features.statusBarVisible = boolFeature(featuresMap, \
"status").value_or(false); </del><ins>+ features.resizable = \
boolFeature(featuresMap, "resizable").valueOr(false); + \
features.scrollbarsVisible = boolFeature(featuresMap, \
"scroll").valueOr(true); + features.statusBarVisible = \
boolFeature(featuresMap, "status").valueOr(false); </ins><span class="cx">
</span><span class="cx"> return features;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/page/animation/AnimationBase.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/page/animation/AnimationBase.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> if (input == AnimationStateInput::ResumeOverride) {
</span><span class="cx"> if (m_animationState == AnimationState::Looping || \
m_animationState == AnimationState::Ending) { </span><span class="cx"> // \
Start the animation </span><del>- \
startAnimation(beginAnimationUpdateTime() - m_startTime.value_or(0)); </del><ins>+ \
startAnimation(beginAnimationUpdateTime() - m_startTime.valueOr(0)); </ins><span \
class="cx"> } </span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> // We are pausing while waiting for a start \
response. Cancel the animation and wait. When </span><span class="cx"> \
// we unpause, we will act as though the start timer just fired </span><span \
class="cx"> m_pauseTime = beginAnimationUpdateTime(); </span><del>- \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.value_or(0)); </del><ins>+ \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.valueOr(0)); </ins><span \
class="cx"> LOG(Animations, "%p AnimationState %s -> \
PausedWaitResponse", this, nameForState(m_animationState)); </span><span \
class="cx"> m_animationState = AnimationState::PausedWaitResponse; \
</span><span class="cx"> } </span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // We are pausing while running. Cancel the \
animation and wait </span><span class="cx"> m_pauseTime = \
beginAnimationUpdateTime(); </span><del>- \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.value_or(0)); </del><ins>+ \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.valueOr(0)); </ins><span \
class="cx"> LOG(Animations, "%p AnimationState %s -> \
PausedRun", this, nameForState(m_animationState)); </span><span class="cx"> \
m_animationState = AnimationState::PausedRun; </span><span class="cx"> }
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // We are pausing while running. Cancel the \
animation and wait </span><span class="cx"> m_pauseTime = \
beginAnimationUpdateTime(); </span><del>- \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.value_or(0)); </del><ins>+ \
pauseAnimation(beginAnimationUpdateTime() - m_startTime.valueOr(0)); </ins><span \
class="cx"> LOG(Animations, "%p AnimationState %s -> \
PausedRun", this, nameForState(m_animationState)); </span><span class="cx"> \
m_animationState = AnimationState::PausedRun; </span><span class="cx"> }
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> ASSERT(input == \
AnimationStateInput::PlayStateRunning); </span><span class="cx"> \
ASSERT(paused()); </span><span class="cx"> // Update the times
</span><del>- m_startTime = m_startTime.value_or(0) + \
beginAnimationUpdateTime() - m_pauseTime.value_or(0); </del><ins>+ \
m_startTime = m_startTime.valueOr(0) + beginAnimationUpdateTime() - \
m_pauseTime.valueOr(0); </ins><span class="cx"> m_pauseTime = \
WTF::nullopt; </span><span class="cx">
</span><span class="cx"> // we were waiting for the start timer to fire, \
go back and wait again </span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">
</span><span class="cx"> // Update the times
</span><span class="cx"> if (m_animationState == \
AnimationState::PausedRun) </span><del>- m_startTime = \
m_startTime.value_or(0) + beginAnimationUpdateTime() - m_pauseTime.value_or(0); \
</del><ins>+ m_startTime = m_startTime.valueOr(0) + \
beginAnimationUpdateTime() - m_pauseTime.valueOr(0); </ins><span class="cx"> \
else </span><span class="cx"> m_startTime = 0;
</span><span class="cx">
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> \
updateStateMachine(AnimationStateInput::StartTimeSet, beginAnimationUpdateTime()); \
</span><span class="cx"> m_isAccelerated = true; </span><span \
class="cx"> } else { </span><del>- bool \
started = startAnimation(beginAnimationUpdateTime() - m_startTime.value_or(0)); \
</del><ins>+ bool started = \
startAnimation(beginAnimationUpdateTime() - m_startTime.valueOr(0)); </ins><span \
class="cx"> \
m_compositeAnimation->animationController().addToAnimationsWaitingForStartTimeResponse(this, \
started); </span><span class="cx"> m_isAccelerated = started;
</span><span class="cx"> }
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> m_animationState = \
AnimationState::PausedRun; </span><span class="cx"> \
ASSERT(!m_startTime); </span><span class="cx"> m_startTime = param;
</span><del>- m_pauseTime = m_pauseTime.value_or(0) + param;
</del><ins>+ m_pauseTime = m_pauseTime.valueOr(0) + param;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- double elapsedDuration = beginAnimationUpdateTime() - \
m_startTime.value_or(0); </del><ins>+ double elapsedDuration = \
beginAnimationUpdateTime() - m_startTime.valueOr(0); </ins><span class="cx">
</span><span class="cx"> // FIXME: we need to ensure that elapsedDuration is \
never < 0. If it is, this suggests that </span><span class="cx"> // we had a \
recalcStyle() outside of beginAnimationUpdate()/endAnimationUpdate(). </span><span \
class="lines">@@ -631,9 +631,9 @@ </span><span class="cx"> void \
AnimationBase::getTimeToNextEvent(Seconds& time, bool& isLooping) const \
</span><span class="cx"> { </span><span class="cx"> // Decide when the end or \
loop event needs to fire </span><del>- const double elapsedDuration = \
std::max(beginAnimationUpdateTime() - m_startTime.value_or(0), 0.0); </del><ins>+ \
const double elapsedDuration = std::max(beginAnimationUpdateTime() - \
m_startTime.valueOr(0), 0.0); </ins><span class="cx"> double durationLeft = 0;
</span><del>- double nextIterationTime = m_totalDuration.value_or(0);
</del><ins>+ double nextIterationTime = m_totalDuration.valueOr(0);
</ins><span class="cx">
</span><span class="cx"> if (!m_totalDuration || elapsedDuration < \
m_totalDuration.value()) { </span><span class="cx"> durationLeft = \
m_animation->duration() > 0 ? (m_animation->duration() - \
fmod(elapsedDuration, m_animation->duration())) : 0; </span><span class="lines">@@ \
-675,9 +675,9 @@ </span><span class="cx">
</span><span class="cx"> ASSERT(m_startTime); // If m_startTime is zero, we \
haven't started yet, so we'll get a bad pause time. </span><span class="cx"> if \
(t <= m_animation->delay()) </span><del>- m_pauseTime = \
m_startTime.value_or(0); </del><ins>+ m_pauseTime = m_startTime.valueOr(0);
</ins><span class="cx"> else
</span><del>- m_pauseTime = m_startTime.value_or(0) + t - \
m_animation->delay(); </del><ins>+ m_pauseTime = m_startTime.valueOr(0) + t \
- m_animation->delay(); </ins><span class="cx">
</span><span class="cx"> if (auto* renderer = compositedRenderer())
</span><span class="cx"> \
renderer->suspendAnimations(MonotonicTime::fromRawSeconds(m_pauseTime.value())); \
</span><span class="lines">@@ -695,7 +695,7 @@ </span><span class="cx"> {
</span><span class="cx"> if (paused()) {
</span><span class="cx"> double delayOffset = (!m_startTime && \
m_animation->delay() < 0) ? m_animation->delay() : 0; </span><del>- \
return m_pauseTime.value_or(0) - m_startTime.value_or(0) - delayOffset; </del><ins>+ \
return m_pauseTime.valueOr(0) - m_startTime.valueOr(0) - delayOffset; </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> if (!m_startTime)
</span><span class="lines">@@ -702,9 +702,9 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (postActive() || fillingForwards())
</span><del>- return m_totalDuration.value_or(0);
</del><ins>+ return m_totalDuration.valueOr(0);
</ins><span class="cx">
</span><del>- return beginAnimationUpdateTime() - m_startTime.value_or(0);
</del><ins>+ return beginAnimationUpdateTime() - m_startTime.valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AnimationBase::setElapsedTime(double time)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/page/animation/CSSAnimationController.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/page/animation/CSSAnimationController.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/page/animation/CSSAnimationController.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> {
</span><span class="cx"> Optional<Seconds> timeToNextService = \
updateAnimations(callSetChanged); </span><span class="cx">
</span><del>- LOG(Animations, "updateAnimationTimer: timeToNextService is \
%.2f", timeToNextService.value_or(Seconds { -1 }).value()); </del><ins>+ \
LOG(Animations, "updateAnimationTimer: timeToNextService is %.2f", \
timeToNextService.valueOr(Seconds { -1 }).value()); </ins><span class="cx">
</span><span class="cx"> // If we don't need service, we want to make sure the \
timer is no longer running </span><span class="cx"> if (!timeToNextService) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -249,8 +249,8 @@
</span><span class="cx"> data.totalExternalSize = currentGCOwnedExternal;
</span><span class="cx">
</span><span class="cx"> auto now = MonotonicTime::now();
</span><del>- data.timeOfNextEdenCollection = now + \
vm->heap.edenActivityCallback()->timeUntilFire().value_or(Seconds(std::numeric_limits<double>::infinity()));
- data.timeOfNextFullCollection = now + \
vm->heap.fullActivityCallback()->timeUntilFire().value_or(Seconds(std::numeric_limits<double>::infinity()));
</del><ins>+ data.timeOfNextEdenCollection = now + \
vm->heap.edenActivityCallback()->timeUntilFire().valueOr(Seconds(std::numeric_limits<double>::infinity()));
+ data.timeOfNextFullCollection = now + \
vm->heap.fullActivityCallback()->timeUntilFire().valueOr(Seconds(std::numeric_limits<double>::infinity()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagelinuxResourceUsageThreadLinuxcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> data.totalExternalSize = currentGCOwnedExternal;
</span><span class="cx">
</span><span class="cx"> auto now = MonotonicTime::now();
</span><del>- data.timeOfNextEdenCollection = now + \
vm->heap.edenActivityCallback()->timeUntilFire().value_or(Seconds(std::numeric_limits<double>::infinity()));
- data.timeOfNextFullCollection = now + \
vm->heap.fullActivityCallback()->timeUntilFire().value_or(Seconds(std::numeric_limits<double>::infinity()));
</del><ins>+ data.timeOfNextEdenCollection = now + \
vm->heap.edenActivityCallback()->timeUntilFire().valueOr(Seconds(std::numeric_limits<double>::infinity()));
+ data.timeOfNextFullCollection = now + \
vm->heap.fullActivityCallback()->timeUntilFire().valueOr(Seconds(std::numeric_limits<double>::infinity()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -222,12 +222,12 @@
</span><span class="cx"> if \
(cursorPositionIterator.isBoundary(hitIndex)) </span><span class="cx"> \
clusterStart = hitIndex; </span><span class="cx"> else
</span><del>- clusterStart = \
cursorPositionIterator.preceding(hitIndex).value_or(0); </del><ins>+ \
clusterStart = cursorPositionIterator.preceding(hitIndex).valueOr(0); </ins><span \
class="cx"> </span><span class="cx"> if (!includePartialGlyphs)
</span><span class="cx"> return complexTextRun.stringLocation() + \
clusterStart; </span><span class="cx">
</span><del>- unsigned clusterEnd = \
cursorPositionIterator.following(hitIndex).value_or(stringLength); </del><ins>+ \
unsigned clusterEnd = \
cursorPositionIterator.following(hitIndex).valueOr(stringLength); </ins><span \
class="cx"> </span><span class="cx"> float clusterWidth;
</span><span class="cx"> // FIXME: The search stops at the boundaries \
of complexTextRun. In theory, it should go on into neighboring ComplexTextRuns \
</span></span></pre></div> <a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> hasher.add(m_size);
</span><span class="cx"> hasher.add(m_fontSelectionRequest.weight);
</span><span class="cx"> hasher.add(m_fontSelectionRequest.width);
</span><del>- \
hasher.add(m_fontSelectionRequest.slope.value_or(normalItalicValue())); </del><ins>+ \
hasher.add(m_fontSelectionRequest.slope.valueOr(normalItalicValue())); </ins><span \
class="cx"> hasher.add(m_locale.existingHash()); </span><span class="cx"> \
for (unsigned flagItem : m_flags) </span><span class="cx"> \
hasher.add(flagItem); </span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/FontCascade.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> float FontCascade::drawText(GraphicsContext& context, \
const TextRun& run, const FloatPoint& point, unsigned from, \
Optional<unsigned> to, CustomFontNotReadyAction customFontNotReadyAction) const \
</span><span class="cx"> { </span><del>- unsigned destination = \
to.value_or(run.length()); </del><ins>+ unsigned destination = \
to.valueOr(run.length()); </ins><span class="cx"> GlyphBuffer glyphBuffer;
</span><span class="cx"> float startX = point.x() + \
glyphBufferForTextRun(codePath(run, from, to), run, from, destination, glyphBuffer); \
</span><span class="cx"> // We couldn't generate any glyphs for the run. Give up. \
</span><span class="lines">@@ -303,7 +303,7 @@ </span><span class="cx"> if \
(isLoadingCustomFonts()) </span><span class="cx"> return;
</span><span class="cx">
</span><del>- unsigned destination = to.value_or(run.length());
</del><ins>+ unsigned destination = to.valueOr(run.length());
</ins><span class="cx"> if (codePath(run, from, to) != Complex)
</span><span class="cx"> drawEmphasisMarksForSimpleText(context, run, mark, \
point, from, destination); </span><span class="cx"> else
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> std::unique_ptr<DisplayList::DisplayList> \
FontCascade::displayListForTextRun(GraphicsContext& context, const TextRun& \
run, unsigned from, Optional<unsigned> to, CustomFontNotReadyAction \
customFontNotReadyAction) const </span><span class="cx"> {
</span><span class="cx"> ASSERT(!context.paintingDisabled());
</span><del>- unsigned destination = to.value_or(run.length());
</del><ins>+ unsigned destination = to.valueOr(run.length());
</ins><span class="cx">
</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="cx"> CodePath codePathToUse = codePath(run); </span><span class="lines">@@ \
-545,7 +545,7 @@ </span><span class="cx">
</span><span class="cx"> void FontCascade::adjustSelectionRectForText(const \
TextRun& run, LayoutRect& selectionRect, unsigned from, \
Optional<unsigned> to) const </span><span class="cx"> {
</span><del>- unsigned destination = to.value_or(run.length());
</del><ins>+ unsigned destination = to.valueOr(run.length());
</ins><span class="cx"> if (codePath(run, from, to) != Complex)
</span><span class="cx"> return adjustSelectionRectForSimpleText(run, \
selectionRect, from, destination); </span><span class="cx">
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx">
</span><span class="cx"> #if !USE(FREETYPE)
</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><del>- if \
((enableKerning() || requiresShaping()) && (from.value_or(0) || \
to.value_or(run.length()) != run.length())) </del><ins>+ if ((enableKerning() || \
requiresShaping()) && (from.valueOr(0) || to.valueOr(run.length()) != \
run.length())) </ins><span class="cx"> return Complex;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(from);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> auto FontSelectionAlgorithm::styleDistance(Capabilities \
capabilities) const -> DistanceResult </span><span class="cx"> {
</span><span class="cx"> auto slope = capabilities.slope;
</span><del>- auto requestSlope = m_request.slope.value_or(normalItalicValue());
</del><ins>+ auto requestSlope = m_request.slope.valueOr(normalItalicValue());
</ins><span class="cx"> ASSERT(slope.isValid());
</span><span class="cx"> if (slope.includes(requestSlope))
</span><span class="cx"> return { FontSelectionValue(), requestSlope };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> inline TextStream& operator<<(TextStream& ts, \
const Optional<FontSelectionValue>& optionalFontSelectionValue) \
</span><span class="cx"> { </span><del>- ts << \
optionalFontSelectionValue.value_or(normalItalicValue()); </del><ins>+ ts << \
optionalFontSelectionValue.valueOr(normalItalicValue()); </ins><span class="cx"> \
return ts; </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -432,17 +432,17 @@
</span><span class="cx">
</span><span class="cx"> constexpr Range computeWeight() const
</span><span class="cx"> {
</span><del>- return weight.value_or(Range { normalWeightValue() });
</del><ins>+ return weight.valueOr(Range { normalWeightValue() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> constexpr Range computeWidth() const
</span><span class="cx"> {
</span><del>- return width.value_or(Range { normalStretchValue() });
</del><ins>+ return width.valueOr(Range { normalStretchValue() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> constexpr Range computeSlope() const
</span><span class="cx"> {
</span><del>- return slope.value_or(Range { normalItalicValue() });
</del><ins>+ return slope.valueOr(Range { normalItalicValue() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OptionalRange weight;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -390,7 +390,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().value_or(AffineTransform()).mapQuad(transformedPolygon).boundingBox();
</del><ins>+ layerRect = \
transform.inverse().valueOr(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="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -2350,7 +2350,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().value_or(AffineTransform()).mapRect(outputRect); \
</del><ins>+ FloatRect transformedOutputRect = \
videoTransform.inverse().valueOr(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="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx"> auto image = m_imagePainter.cgImage.get();
</span><span class="cx"> FloatRect imageRect(0, 0, CGImageGetWidth(image), \
CGImageGetHeight(image)); </span><span class="cx"> AffineTransform videoTransform \
= videoTransformationMatrix(*m_imagePainter.mediaSample); </span><del>- FloatRect \
transformedDestRect = \
videoTransform.inverse().value_or(AffineTransform()).mapRect(destRect); </del><ins>+ \
FloatRect transformedDestRect = \
videoTransform.inverse().valueOr(AffineTransform()).mapRect(destRect); </ins><span \
class="cx"> context.concatCTM(videoTransform); </span><span class="cx"> \
context.drawNativeImage(image, imageRect.size(), transformedDestRect, imageRect); \
</span><span class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -1173,7 +1173,7 @@
</span><span class="cx">
</span><span class="cx"> FloatSize SourceBufferPrivateAVFObjC::naturalSize()
</span><span class="cx"> {
</span><del>- return m_cachedSize.value_or(FloatSize());
</del><ins>+ return m_cachedSize.valueOr(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 (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -1462,7 +1462,7 @@
</span><span class="cx"> auto bounds = FloatRect(m_boundsOrigin, size());
</span><span class="cx"> if (auto extent = animationExtent()) {
</span><span class="cx"> // Adjust the animation extent to match the current \
animation position. </span><del>- bounds = \
rects.animatingTransform.inverse().value_or(TransformationMatrix()).mapRect(*extent); \
</del><ins>+ bounds = \
rects.animatingTransform.inverse().valueOr(TransformationMatrix()).mapRect(*extent); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> // FIXME: we need to take reflections into account when \
determining whether this layer intersects the coverage rect. \
</span></span></pre></div> <a \
id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> if (applyWeightWidthSlopeVariations && \
!fontIsSystemFont(originalFont)) { </span><span class="cx"> float weight = \
fontSelectionRequest.weight; </span><span class="cx"> float width = \
fontSelectionRequest.width; </span><del>- float slope = \
fontSelectionRequest.slope.value_or(normalItalicValue()); </del><ins>+ float \
slope = fontSelectionRequest.slope.valueOr(normalItalicValue()); </ins><span \
class="cx"> if (auto weightValue = fontFaceCapabilities.weight) </span><span \
class="cx"> weight = std::max(std::min(weight, \
static_cast<float>(weightValue->maximum)), \
static_cast<float>(weightValue->minimum)); </span><span class="cx"> \
if (auto widthValue = fontFaceCapabilities.width) </span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFETurbulencecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> filterRegion.scale(filter().filterScale());
</span><span class="cx"> FloatPoint point(0, filterRegion.y() + startY);
</span><span class="cx"> int indexOfPixelChannel = startY * (filterRegion.width() \
<< 2); </span><del>- AffineTransform inverseTransfrom = \
filter().absoluteTransform().inverse().value_or(AffineTransform()); </del><ins>+ \
AffineTransform inverseTransfrom = \
filter().absoluteTransform().inverse().valueOr(AffineTransform()); </ins><span \
class="cx"> </span><span class="cx"> for (int y = startY; y < endY; ++y) {
</span><span class="cx"> point.setY(point.y() + 1);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerCommoncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> isGStreamerInitialized = false;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
</span><del>- Vector<String> parameters = \
options.value_or(extractGStreamerOptionsFromCommandLine()); </del><ins>+ \
Vector<String> parameters = \
options.valueOr(extractGStreamerOptionsFromCommandLine()); </ins><span class="cx"> \
char** argv = g_new0(char*, parameters.size() + 2); </span><span class="cx"> \
int argc = parameters.size() + 1; </span><span class="cx"> argv[0] = \
g_strdup(getCurrentExecutableName().data()); </span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> TextureMapperPaintOptions replicaOptions(options);
</span><span class="cx"> replicaOptions.transform
</span><span class="cx"> \
.multiply(m_state.replicaLayer->m_layerTransforms.combined) </span><del>- \
.multiply(m_layerTransforms.combined.inverse().value_or(TransformationMatrix())); \
</del><ins>+ \
.multiply(m_layerTransforms.combined.inverse().valueOr(TransformationMatrix())); \
</ins><span class="cx"> paintSelfAndChildren(replicaOptions); </span><span \
class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> TransformationMatrix TextureMapperLayer::replicaTransform()
</span><span class="cx"> {
</span><span class="cx"> return \
TransformationMatrix(m_state.replicaLayer->m_layerTransforms.combined) \
</span><del>- \
.multiply(m_layerTransforms.combined.inverse().value_or(TransformationMatrix())); \
</del><ins>+ .multiply(m_layerTransforms.combined.inverse().valueOr(TransformationMatrix()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void resolveOverlaps(Region& newRegion, \
Region& overlapRegion, Region& nonOverlapRegion) </span><span \
class="lines">@@ -647,9 +647,9 @@ </span><span class="cx"> \
TextureMapperAnimation::ApplicationResult applicationResults; </span><span \
class="cx"> m_animations.apply(applicationResults, time); </span><span \
class="cx"> </span><del>- m_layerTransforms.localTransform = \
applicationResults.transform.value_or(m_state.transform);
- m_currentOpacity = applicationResults.opacity.value_or(m_state.opacity);
- m_currentFilters = applicationResults.filters.value_or(m_state.filters);
</del><ins>+ m_layerTransforms.localTransform = \
applicationResults.transform.valueOr(m_state.transform); + m_currentOpacity = \
applicationResults.opacity.valueOr(m_state.opacity); + m_currentFilters = \
applicationResults.filters.valueOr(m_state.filters); </ins><span class="cx">
</span><span class="cx"> return applicationResults.hasRunningAnimations;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -825,7 +825,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().value_or(TransformationMatrix())); </del><ins>+ \
ASSERT(m_cachedInverseTransform == \
m_layerTransform.combined().inverse().valueOr(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">@@ -1089,7 +1089,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().value_or(TransformationMatrix()); </del><ins>+ \
m_cachedInverseTransform = \
m_layerTransform.combined().inverse().valueOr(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="trunkSourceWebCoreplatformgraphicstransformsTransformStatecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformState.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </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().value_or(TransformationMatrix()).projectPoint(point, \
wasClamped); </del><ins>+ return \
m_accumulatedTransform->inverse().valueOr(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">@@ -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().value_or(TransformationMatrix()).projectQuad(quad, \
wasClamped); </del><ins>+ quad = \
m_accumulatedTransform->inverse().valueOr(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().value_or(TransformationMatrix()); </del><ins>+ \
TransformationMatrix inverseTransform = t.inverse().valueOr(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="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/network/CacheValidation.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/network/CacheValidation.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -103,7 +103,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(0_us, \
responseTime - *dateValue) : 0_us; </span><del>- auto ageValue = \
response.age().value_or(0_us); </del><ins>+ auto ageValue = \
response.age().valueOr(0_us); </ins><span class="cx"> auto correctedInitialAge = \
std::max(apparentAge, ageValue); </span><span class="cx"> auto residentTime = \
WallTime::now() - responseTime; </span><span class="cx"> return \
correctedInitialAge + residentTime; </span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> return *maxAge;
</span><span class="cx">
</span><span class="cx"> auto date = response.date();
</span><del>- auto effectiveDate = date.value_or(responseTime);
</del><ins>+ auto effectiveDate = date.valueOr(responseTime);
</ins><span class="cx"> if (auto expires = response.expires())
</span><span class="cx"> return *expires - effectiveDate;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifiercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_isOnLine)
</span><span class="cx"> updateState();
</span><del>- return m_isOnLine.value_or(true);
</del><ins>+ return m_isOnLine.valueOr(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
NetworkStateNotifier::addListener(WTF::Function<void(bool)>&& listener) \
</span></span></pre></div> <a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -195,8 +195,8 @@
</span><span class="cx"> LayoutUnit highValue() const { return LayoutUnit::max(); \
} </span><span class="cx"> void collectIfNeeded(const IntervalType&);
</span><span class="cx">
</span><del>- LayoutUnit nextLogicalBottom() const { return \
m_nextLogicalBottom.value_or(0); }
- LayoutUnit nextShapeLogicalBottom() const { return \
m_nextShapeLogicalBottom.value_or(nextLogicalBottom()); } </del><ins>+ LayoutUnit \
nextLogicalBottom() const { return m_nextLogicalBottom.valueOr(0); } + LayoutUnit \
nextShapeLogicalBottom() const { return \
m_nextShapeLogicalBottom.valueOr(nextLogicalBottom()); } </ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WeakPtr<const RenderBlockFlow> m_renderer;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingGridBaselineAlignmentcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/GridBaselineAlignment.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/GridBaselineAlignment.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/GridBaselineAlignment.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> LayoutUnit GridBaselineAlignment::ascentForChild(const \
RenderBox& child, GridAxis baselineAxis) const </span><span class="cx"> {
</span><span class="cx"> LayoutUnit margin = isDescentBaselineForChild(child, \
baselineAxis) ? marginUnderForChild(child, baselineAxis) : marginOverForChild(child, \
baselineAxis); </span><del>- LayoutUnit \
baseline(isParallelToBaselineAxisForChild(child, baselineAxis) ? \
child.firstLineBaseline().value_or(-1) : -1); </del><ins>+ LayoutUnit \
baseline(isParallelToBaselineAxisForChild(child, baselineAxis) ? \
child.firstLineBaseline().valueOr(-1) : -1); </ins><span class="cx"> // We take \
border-box's under edge if no valid baseline. </span><span class="cx"> if \
(baseline == -1) { </span><span class="cx"> if \
(isHorizontalBaselineAxis(baselineAxis)) </span></span></pre></div>
<a id="trunkSourceWebCorerenderingGridTrackSizingAlgorithmcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void GridTrack::setGrowthLimit(LayoutUnit growthLimit)
</span><span class="cx"> {
</span><del>- m_growthLimit = growthLimit == infinity ? growthLimit : \
std::min(growthLimit, m_growthLimitCap.value_or(growthLimit)); </del><ins>+ \
m_growthLimit = growthLimit == infinity ? growthLimit : std::min(growthLimit, \
m_growthLimitCap.valueOr(growthLimit)); </ins><span class="cx"> \
ensureGrowthLimitIsBiggerThanBaseSize(); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><span class="cx"> if (trackLength.isSpecified())
</span><del>- return valueForLength(trackLength, \
std::max<LayoutUnit>(availableSpace().value_or(0), 0)); </del><ins>+ \
return valueForLength(trackLength, \
std::max<LayoutUnit>(availableSpace().valueOr(0), 0)); </ins><span class="cx">
</span><span class="cx"> ASSERT(trackLength.isMinContent() || \
trackLength.isAuto() || trackLength.isMaxContent()); </span><span class="cx"> \
return 0; </span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><span class="cx"> if (trackLength.isSpecified())
</span><del>- return valueForLength(trackLength, \
std::max<LayoutUnit>(availableSpace().value_or(0), 0)); </del><ins>+ \
return valueForLength(trackLength, \
std::max<LayoutUnit>(availableSpace().valueOr(0), 0)); </ins><span class="cx">
</span><span class="cx"> ASSERT(trackLength.isMinContent() || \
trackLength.isAuto() || trackLength.isMaxContent()); </span><span class="cx"> \
return infinity; </span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> } else if \
(trackSize.hasMaxContentOrAutoMaxTrackBreadth()) { </span><span class="cx"> \
LayoutUnit growthLimit = m_strategy->maxContentForChild(gridItem); </span><span \
class="cx"> if (trackSize.isFitContent()) </span><del>- \
growthLimit = std::min(growthLimit, \
valueForLength(trackSize.fitContentTrackBreadth().length(), \
availableSpace().value_or(0))); </del><ins>+ growthLimit = \
std::min(growthLimit, valueForLength(trackSize.fitContentTrackBreadth().length(), \
availableSpace().valueOr(0))); </ins><span class="cx"> \
track.setGrowthLimit(std::max(track.growthLimit(), growthLimit)); </span><span \
class="cx"> } </span><span class="cx"> }
</span><span class="lines">@@ -483,8 +483,8 @@
</span><span class="cx"> if (track1HasInfiniteGrowthPotentialWithoutCap || \
track2HasInfiniteGrowthPotentialWithoutCap) </span><span class="cx"> return \
track2HasInfiniteGrowthPotentialWithoutCap; </span><span class="cx">
</span><del>- LayoutUnit track1Limit = \
track1->growthLimitCap().value_or(track1->growthLimit());
- LayoutUnit track2Limit = \
track2->growthLimitCap().value_or(track2->growthLimit()); </del><ins>+ \
LayoutUnit track1Limit = \
track1->growthLimitCap().valueOr(track1->growthLimit()); + LayoutUnit \
track2Limit = track2->growthLimitCap().valueOr(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">@@ -569,7 +569,7 @@
</span><span class="cx"> if (maxTrackSize.isContentSized() || \
maxTrackSize.isFlex() || isRelativeGridLengthAsAuto(maxTrackSize, direction)) \
</span><span class="cx"> gridAreaIsIndefinite = true; </span><span \
class="cx"> else </span><del>- gridAreaSize += \
valueForLength(maxTrackSize.length(), availableSize.value_or(0_lu)); </del><ins>+ \
gridAreaSize += valueForLength(maxTrackSize.length(), availableSize.valueOr(0_lu)); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> gridAreaSize += m_renderGrid->guttersSize(m_grid, \
direction, span.startLine(), span.integerSpan(), availableSize); </span><span \
class="lines">@@ -810,7 +810,7 @@ </span><span class="cx"> GridTrackSize \
trackSize = m_algorithm.gridTrackSize(direction(), trackPosition); </span><span \
class="cx"> if (!trackSize.hasFixedMaxTrackBreadth()) </span><span \
class="cx"> return minSize; </span><del>- maxBreadth += \
valueForLength(trackSize.maxTrackBreadth().length(), \
availableSpace().value_or(0_lu)); </del><ins>+ maxBreadth += \
valueForLength(trackSize.maxTrackBreadth().length(), availableSpace().valueOr(0_lu)); \
</ins><span class="cx"> } </span><span class="cx"> if (minSize > \
maxBreadth) { </span><span class="cx"> auto marginAndBorderAndPadding = \
GridLayoutFunctions::marginLogicalSizeForChild(*renderGrid(), direction(), child); \
</span><span class="lines">@@ -831,7 +831,7 @@ </span><span class="cx"> bool \
overrideSizeHasChanged = updateOverrideContainingBlockContentSizeForChild(child, \
childInlineDirection, gridAreaSize); </span><span class="cx"> \
layoutGridItemForMinSizeComputation(child, overrideSizeHasChanged); </span><span \
class="cx"> </span><del>- return child.computeLogicalHeightUsing(MinSize, \
childMinSize, WTF::nullopt).value_or(0) + child.marginLogicalHeight() + \
child.scrollbarLogicalHeight() + baselineShim; </del><ins>+ return \
child.computeLogicalHeightUsing(MinSize, childMinSize, WTF::nullopt).valueOr(0) + \
child.marginLogicalHeight() + child.scrollbarLogicalHeight() + baselineShim; \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> bool \
GridTrackSizingAlgorithm::canParticipateInBaselineAlignment(const RenderBox& \
child, GridAxis baselineAxis) const </span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> Vector<GridTrack>& allTracks = \
tracks(m_direction); </span><span class="cx"> const bool hasDefiniteFreeSpace = \
!!availableSpace(); </span><span class="cx"> const bool indefiniteHeight = \
m_direction == ForRows && !m_renderGrid->hasDefiniteLogicalHeight(); \
</span><del>- LayoutUnit maxSize = std::max(0_lu, \
availableSpace().value_or(0_lu)); </del><ins>+ LayoutUnit maxSize = std::max(0_lu, \
availableSpace().valueOr(0_lu)); </ins><span class="cx"> // 1. Initialize per \
Grid track variables. </span><span class="cx"> for (unsigned i = 0; i < \
allTracks.size(); ++i) { </span><span class="cx"> GridTrack& track = \
allTracks[i]; </span></span></pre></div>
<a id="trunkSourceWebCorerenderingPaintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/PaintInfo.h (239460 \
=> 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/PaintInfo.h 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/PaintInfo.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> if (rect.isInfinite())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatRect \
tranformedRect(localToAncestorTransform.inverse().value_or(AffineTransform()).mapRect(rect));
</del><ins>+ FloatRect \
tranformedRect(localToAncestorTransform.inverse().valueOr(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="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -2754,7 +2754,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).value_or(computedValues.m_extent); \
</del><ins>+ heightResult = computeLogicalHeightUsing(MainOrPreferredSize, \
style().logicalHeight(), intrinsicHeight).valueOr(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></pre></div>
<a id="trunkSourceWebCorerenderingRenderCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderCounter.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (directives.resetValue)
</span><del>- return CounterPlan { true, \
saturatedAddition(*directives.resetValue, directives.incrementValue.value_or(0)) }; \
</del><ins>+ return CounterPlan { true, \
saturatedAddition(*directives.resetValue, directives.incrementValue.valueOr(0)) }; \
</ins><span class="cx"> if (directives.incrementValue) </span><span class="cx"> \
return CounterPlan { false, *directives.incrementValue }; </span><span class="cx"> \
return WTF::nullopt; </span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx">
</span><span class="cx"> // Update our height and overflow height.
</span><span class="cx"> if (style().boxAlign() == \
BoxAlignment::Baseline) { </span><del>- LayoutUnit ascent = \
child->firstLineBaseline().value_or(child->height() + \
child->marginBottom()); </del><ins>+ LayoutUnit ascent = \
child->firstLineBaseline().valueOr(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">@@ -510,7 +510,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 BoxAlignment::Baseline: {
</span><del>- LayoutUnit ascent = \
child->firstLineBaseline().value_or(child->height() + \
child->marginBottom()); </del><ins>+ LayoutUnit ascent = \
child->firstLineBaseline().valueOr(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 (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -172,7 +172,7 @@
</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().value_or(synthesizedBaselineFromContentBox(*this, direction)); \
</del><ins>+ int baseline = \
firstLineBaseline().valueOr(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="lines">@@ -1036,7 +1036,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::marginBoxAscentForChild(const \
RenderBox& child) </span><span class="cx"> {
</span><del>- LayoutUnit ascent = \
child.firstLineBaseline().value_or(crossAxisExtentForChild(child)); </del><ins>+ \
LayoutUnit ascent = child.firstLineBaseline().valueOr(crossAxisExtentForChild(child));
</ins><span class="cx"> return ascent + flowAwareMarginBeforeForChild(child);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1074,12 +1074,12 @@
</span><span class="cx"> Optional<LayoutUnit> maxExtent = WTF::nullopt;
</span><span class="cx"> if (max.isSpecifiedOrIntrinsic()) {
</span><span class="cx"> maxExtent = computeMainAxisExtentForChild(child, \
MaxSize, max); </span><del>- childSize = std::min(childSize, \
maxExtent.value_or(childSize)); </del><ins>+ childSize = std::min(childSize, \
maxExtent.valueOr(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, \
std::max(0_lu, computeMainAxisExtentForChild(child, MinSize, \
min).value_or(childSize))); </del><ins>+ return std::max(childSize, \
std::max(0_lu, computeMainAxisExtentForChild(child, MinSize, \
min).valueOr(childSize))); </ins><span class="cx">
</span><span class="cx"> if (!isFlexibleBoxImpl() && min.isAuto() \
&& mainAxisOverflowForChild(child) == Overflow::Visible && \
!(isColumnFlow() && is<RenderFlexibleBox>(child))) { </span><span \
class="cx"> // FIXME: For now, we do not handle min-height: auto for nested \
</span><span class="lines">@@ -1089,17 +1089,17 @@ </span><span class="cx"> \
// css-flexbox section 4.5 </span><span class="cx"> // FIXME: If the min \
value is expected to be valid here, we need to come up with a non optional version of \
computeMainAxisExtentForChild and </span><span class="cx"> // ensure it's \
valid through the virtual calls of computeIntrinsicLogicalContentHeightUsing. \
</span><del>- LayoutUnit contentSize = computeMainAxisExtentForChild(child, \
MinSize, Length(MinContent)).value_or(0); </del><ins>+ LayoutUnit contentSize \
= computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).valueOr(0); \
</ins><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.value_or(contentSize)); </del><ins>+ \
contentSize = std::min(contentSize, maxExtent.valueOr(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><del>- \
LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, \
MainOrPreferredSize, mainSize).value_or(0); </del><ins>+ LayoutUnit \
resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, \
mainSize).valueOr(0); </ins><span class="cx"> ASSERT(resolvedMainSize \
>= 0); </span><del>- LayoutUnit specifiedSize = \
std::min(resolvedMainSize, maxExtent.value_or(resolvedMainSize)); </del><ins>+ \
LayoutUnit specifiedSize = std::min(resolvedMainSize, \
maxExtent.valueOr(resolvedMainSize)); </ins><span class="cx"> return \
std::max(childSize, std::min(specifiedSize, contentSize)); </span><span class="cx"> \
} </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> if (gapLength.isNormal())
</span><span class="cx"> return 0_lu;
</span><span class="cx">
</span><del>- return valueForLength(gapLength.length(), \
availableSize.value_or(0)); </del><ins>+ return valueForLength(gapLength.length(), \
availableSize.valueOr(0)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::gridGap(GridTrackSizingDirection \
direction) const </span><span class="lines">@@ -1226,7 +1226,7 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(mode);
</span><span class="cx"> #endif
</span><del>- return \
firstLineBaseline().value_or(synthesizedBaselineFromMarginBox(*this, direction)); \
</del><ins>+ return \
firstLineBaseline().valueOr(synthesizedBaselineFromMarginBox(*this, direction)); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> Optional<int> RenderGrid::firstLineBaseline() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -4457,7 +4457,7 @@
</span><span class="cx"> LayoutSize adjustedSubpixelOffset = offsetForThisLayer - \
LayoutSize(devicePixelSnappedOffsetForThisLayer); </span><span class="cx"> \
LayerPaintingInfo transformedPaintingInfo(paintingInfo); </span><span class="cx"> \
transformedPaintingInfo.rootLayer = this; </span><del>- \
transformedPaintingInfo.paintDirtyRect = \
LayoutRect(encloseRectToDevicePixels(transform.inverse().value_or(AffineTransform()).mapRect(paintingInfo.paintDirtyRect), \
deviceScaleFactor)); </del><ins>+ transformedPaintingInfo.paintDirtyRect = \
LayoutRect(encloseRectToDevicePixels(transform.inverse().valueOr(AffineTransform()).mapRect(paintingInfo.paintDirtyRect), \
deviceScaleFactor)); </ins><span class="cx"> \
transformedPaintingInfo.subpixelOffset = adjustedSubpixelOffset; </span><span \
class="cx"> paintLayerContentsAndReflection(context, transformedPaintingInfo, \
paintFlags); </span><span class="cx"> context.setCTM(oldTransfrom);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> void RenderListBox::paintItem(PaintInfo& paintInfo, \
const LayoutPoint& paintOffset, const PaintFunction& paintFunction) \
</span><span class="cx"> { </span><span class="cx"> int listItemsSize = \
numItems(); </span><del>- int firstVisibleItem = \
m_indexOfFirstVisibleItemInsidePaddingTopArea.value_or(m_indexOffset); </del><ins>+ \
int firstVisibleItem = \
m_indexOfFirstVisibleItemInsidePaddingTopArea.valueOr(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">@@ -621,7 +621,7 @@ </span><span class="cx">
</span><span class="cx"> bool RenderListBox::listIndexIsVisible(int index)
</span><span class="cx"> {
</span><del>- int firstIndex = \
m_indexOfFirstVisibleItemInsidePaddingTopArea.value_or(m_indexOffset); </del><ins>+ \
int firstIndex = m_indexOfFirstVisibleItemInsidePaddingTopArea.valueOr(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></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> LayoutUnit availableHeight = \
multiColumnFlow()->columnHeightAvailable(); </span><span class="cx"> \
LayoutUnit maxColumnHeight = availableHeight ? availableHeight : \
RenderFragmentedFlow::maxLogicalHeight(); </span><span class="cx"> if \
(!multicolStyle.logicalMaxHeight().isUndefined()) </span><del>- \
maxColumnHeight = std::min(maxColumnHeight, \
multicolBlock->computeContentLogicalHeight(MaxSize, \
multicolStyle.logicalMaxHeight(), WTF::nullopt).value_or(maxColumnHeight)); \
</del><ins>+ maxColumnHeight = std::min(maxColumnHeight, \
multicolBlock->computeContentLogicalHeight(MaxSize, \
multicolStyle.logicalMaxHeight(), WTF::nullopt).valueOr(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 \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -322,9 +322,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).value_or(0); </del><ins>+ \
return computePercentageLogicalHeight(styleLogicalHeight).valueOr(0); </ins><span \
class="cx"> else if (styleLogicalHeight.isIntrinsic()) </span><del>- \
return computeIntrinsicLogicalContentHeightUsing(styleLogicalHeight, logicalHeight() \
- borderAndPadding, borderAndPadding).value_or(0); </del><ins>+ return \
computeIntrinsicLogicalContentHeightUsing(styleLogicalHeight, logicalHeight() - \
borderAndPadding, borderAndPadding).valueOr(0); </ins><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0_lu;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -410,7 +410,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().value_or(borderAndPaddingBefore() + \
contentLogicalHeight()); </del><ins>+ return \
firstLineBaseline().valueOr(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 \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/RenderTableSection.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -888,7 +888,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.value_or(candidate), candidate); </del><ins>+ result = \
std::max(result.valueOr(candidate), candidate); </ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -1004,7 +1004,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- glyphOverflow.left = \
firstGlyphLeftOverflow.value_or(glyphOverflow.left); </del><ins>+ \
glyphOverflow.left = firstGlyphLeftOverflow.valueOr(glyphOverflow.left); </ins><span \
class="cx"> </span><span class="cx"> if ((needsWordSpacing && length \
> 1) || (ignoringSpaces && !firstWord)) </span><span class="cx"> \
currMaxWidth += wordSpacing; </span><span class="lines">@@ -1510,13 +1510,13 @@
</span><span class="cx"> return current - 1;
</span><span class="cx">
</span><span class="cx"> CachedTextBreakIterator iterator(text(), \
TextBreakIterator::Mode::Caret, nullAtom()); </span><del>- return \
iterator.preceding(current).value_or(current - 1); </del><ins>+ return \
iterator.preceding(current).valueOr(current - 1); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderText::previousOffsetForBackwardDeletion(int \
current) const </span><span class="cx"> {
</span><span class="cx"> CachedTextBreakIterator iterator(text(), \
TextBreakIterator::Mode::Delete, nullAtom()); </span><del>- return \
iterator.preceding(current).value_or(0); </del><ins>+ return \
iterator.preceding(current).valueOr(0); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderText::nextOffset(int current) const
</span><span class="lines">@@ -1525,7 +1525,7 @@
</span><span class="cx"> return current + 1;
</span><span class="cx">
</span><span class="cx"> CachedTextBreakIterator iterator(text(), \
TextBreakIterator::Mode::Caret, nullAtom()); </span><del>- return \
iterator.following(current).value_or(current + 1); </del><ins>+ return \
iterator.following(current).valueOr(current + 1); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderText::computeCanUseSimpleFontCodePath() const
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx">
</span><span class="cx"> StringView RenderText::stringView(unsigned start, \
Optional<unsigned> stop) const </span><span class="cx"> {
</span><del>- unsigned destination = stop.value_or(text().length());
</del><ins>+ unsigned destination = stop.valueOr(text().length());
</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="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> if (!needsLayout())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LayoutStateMaintainer statePusher(*this, { }, false, \
m_pageLogicalSize.value_or(LayoutSize()).height(), m_pageLogicalHeightChanged); \
</del><ins>+ LayoutStateMaintainer statePusher(*this, { }, false, \
m_pageLogicalSize.valueOr(LayoutSize()).height(), m_pageLogicalHeightChanged); \
</ins><span class="cx"> </span><span class="cx"> m_pageLogicalHeightChanged = \
false; </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (linePositionMode == PositionOfInteriorLineBoxes)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return \
firstLineBaseline().value_or(RenderBlock::baselinePosition(baselineType, firstLine, \
direction, linePositionMode)); </del><ins>+ return \
firstLineBaseline().valueOr(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></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> static LayoutUnit ascentForChild(const RenderBox& \
child) </span><span class="cx"> {
</span><del>- return \
child.firstLineBaseline().value_or(child.logicalHeight()); </del><ins>+ return \
child.firstLineBaseline().valueOr(child.logicalHeight()); </ins><span class="cx"> \
} </span><span class="cx">
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit \
pageLogicalHeight = 0_lu) override; </span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridPositioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/style/GridPosition.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/style/GridPosition.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/style/GridPosition.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> int GridPosition::max()
</span><span class="cx"> {
</span><del>- return gMaxPositionForTesting.value_or(kGridMaxPosition);
</del><ins>+ return gMaxPositionForTesting.valueOr(kGridMaxPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int GridPosition::min()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleTextUnderlineOffseth"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/style/TextUnderlineOffset.h (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/style/TextUnderlineOffset.h 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/style/TextUnderlineOffset.h 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> float lengthOr(float defaultValue) const
</span><span class="cx"> {
</span><del>- return m_length.value_or(defaultValue);
</del><ins>+ return m_length.valueOr(defaultValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator==(const TextUnderlineOffset& other) \
const </span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> if (!pointIsInsideViewportClip(pointInParent))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint localPoint = \
localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = \
localToParentTransform().inverse().valueOr(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 (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> if (hitTestAction != HitTestForeground)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FloatPoint localPoint = \
localTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent); \
</del><ins>+ FloatPoint localPoint = \
localTransform().inverse().valueOr(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 (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> PointerEventsHitRules \
hitRules(PointerEventsHitRules::SVG_IMAGE_HITTESTING, request, \
style().pointerEvents()); </span><span class="cx"> bool isVisible = \
(style().visibility() == Visibility::Visible); </span><span class="cx"> if \
(isVisible || !hitRules.requireVisible) { </span><del>- FloatPoint localPoint \
= localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = \
localToParentTransform().inverse().valueOr(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 (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -268,10 +268,10 @@
</span><span class="cx"> AffineTransform transform;
</span><span class="cx"> transform.translate(objectBoundingBox.location());
</span><span class="cx"> transform.scale(objectBoundingBox.size());
</span><del>- point = \
transform.inverse().value_or(AffineTransform()).mapPoint(point); </del><ins>+ \
point = transform.inverse().valueOr(AffineTransform()).mapPoint(point); </ins><span \
class="cx"> } </span><span class="cx">
</span><del>- point = \
clipPathElement().animatedLocalTransform().inverse().value_or(AffineTransform()).mapPoint(point);
</del><ins>+ point = \
clipPathElement().animatedLocalTransform().inverse().valueOr(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 (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx"> ImageBuffer* resultImage = \
lastEffect->imageBufferResult(); </span><span class="cx"> if (resultImage) \
{ </span><del>- \
context->concatCTM(filterData.shearFreeAbsoluteTransform.inverse().value_or(AffineTransform()));
</del><ins>+ \
context->concatCTM(filterData.shearFreeAbsoluteTransform.inverse().valueOr(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 \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> // Test SVG content if the point is in our content box \
or it is inside the visualOverflowRect and the overflow is visible. </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) || (!shouldApplyViewportClip() \
&& visualOverflowRect().contains(pointInParent))) { </span><del>- \
FloatPoint localPoint = \
localToParentTransform().inverse().value_or(AffineTransform()).mapPoint(FloatPoint(pointInParent));
</del><ins>+ FloatPoint localPoint = \
localToParentTransform().inverse().valueOr(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 \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -368,7 +368,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().value_or(AffineTransform()).mapPoint(pointInParent); \
</del><ins>+ FloatPoint localPoint = \
m_localTransform.inverse().valueOr(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="trunkSourceWebCorerenderingsvgRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -439,7 +439,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().value_or(AffineTransform()).mapPoint(pointInParent);
</del><ins>+ FloatPoint localPoint = \
localToParentTransform().inverse().valueOr(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="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -316,7 +316,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().value_or(AffineTransform())); \
</del><ins>+ context.concatCTM(absoluteTransform.inverse().valueOr(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="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -1297,7 +1297,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.value_or(FloatRect()), codepoints)); </del><ins>+ \
m_glyphs.append(GlyphData(WTFMove(path), glyphElement, horizontalAdvance, \
verticalAdvance, glyphBoundingBox.valueOr(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"> processGlyphElement(glyphElement, \
&glyphElement, defaultHorizontalAdvance, defaultVerticalAdvance, \
unicodeAttribute, boundingBox); </span><span class="cx"> }
</span><span class="cx">
</span><del>- m_boundingBox = boundingBox.value_or(FloatRect());
</del><ins>+ m_boundingBox = boundingBox.valueOr(FloatRect());
</ins><span class="cx">
</span><span class="cx"> appendLigatureGlyphs();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebDriverChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebDriver/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebDriver/ChangeLog 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebDriver/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * Session.cpp:
+ (WebDriver::Session::handleUnexpectedAlertOpen):
+ (WebDriver::Session::computeElementLayout):
+ (WebDriver::Session::selectOptionElement):
+ (WebDriver::builtAutomationCookie):
+ (WebDriver::Session::takeScreenshot):
+ * WebDriverService.cpp:
+ (WebDriver::WebDriverService::sendResponse const):
+ (WebDriver::WebDriverService::createSession):
+
</ins><span class="cx"> 2018-12-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> WebDriver: Session::findElements should handle user \
prompts </span></span></pre></div>
<a id="trunkSourceWebDriverSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebDriver/Session.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebDriver/Session.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebDriver/Session.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> void Session::handleUnexpectedAlertOpen(Function<void \
(CommandResult&&)>&& completionHandler) </span><span class="cx"> {
</span><del>- switch \
(capabilities().unhandledPromptBehavior.value_or(UnhandledPromptBehavior::DismissAndNotify)) \
{ </del><ins>+ switch \
(capabilities().unhandledPromptBehavior.valueOr(UnhandledPromptBehavior::DismissAndNotify)) \
{ </ins><span class="cx"> case UnhandledPromptBehavior::Dismiss:
</span><span class="cx"> dismissAlert(WTFMove(completionHandler));
</span><span class="cx"> break;
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<JSON::Object> parameters = \
JSON::Object::create(); </span><span class="cx"> \
parameters->setString("browsingContextHandle"_s, \
m_toplevelBrowsingContext.value()); </span><del>- \
parameters->setString("frameHandle"_s, \
m_currentBrowsingContext.value_or(emptyString())); </del><ins>+ \
parameters->setString("frameHandle"_s, \
m_currentBrowsingContext.valueOr(emptyString())); </ins><span class="cx"> \
parameters->setString("nodeHandle"_s, elementID); </span><span \
class="cx"> parameters->setBoolean("scrollIntoViewIfNeeded"_s, \
options.contains(ElementLayoutOption::ScrollIntoViewIfNeeded)); </span><span \
class="cx"> parameters->setString("coordinateSystem"_s, \
options.contains(ElementLayoutOption::UseViewportCoordinates) ? \
"LayoutViewport"_s : "Page"_s); </span><span class="lines">@@ \
-1502,7 +1502,7 @@ </span><span class="cx"> {
</span><span class="cx"> RefPtr<JSON::Object> parameters = \
JSON::Object::create(); </span><span class="cx"> \
parameters->setString("browsingContextHandle"_s, \
m_toplevelBrowsingContext.value()); </span><del>- \
parameters->setString("frameHandle"_s, \
m_currentBrowsingContext.value_or(emptyString())); </del><ins>+ \
parameters->setString("frameHandle"_s, \
m_currentBrowsingContext.valueOr(emptyString())); </ins><span class="cx"> \
parameters->setString("nodeHandle"_s, elementID); </span><span \
class="cx"> m_host->sendCommandToBackend("selectOptionElement"_s, \
WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = \
WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { \
</span><span class="cx"> if (response.isError) { </span><span \
class="lines">@@ -2017,12 +2017,12 @@ </span><span class="cx"> \
RefPtr<JSON::Object> cookieObject = JSON::Object::create(); </span><span \
class="cx"> cookieObject->setString("name"_s, cookie.name); \
</span><span class="cx"> cookieObject->setString("value"_s, \
cookie.value); </span><del>- cookieObject->setString("path"_s, \
cookie.path.value_or("/"));
- cookieObject->setString("domain"_s, \
cookie.domain.value_or(emptyString()));
- cookieObject->setBoolean("secure"_s, \
cookie.secure.value_or(false));
- cookieObject->setBoolean("httpOnly"_s, \
cookie.httpOnly.value_or(false)); </del><ins>+ \
cookieObject->setString("path"_s, cookie.path.valueOr("/")); + \
cookieObject->setString("domain"_s, \
cookie.domain.valueOr(emptyString())); + \
cookieObject->setBoolean("secure"_s, cookie.secure.valueOr(false)); + \
cookieObject->setBoolean("httpOnly"_s, cookie.httpOnly.valueOr(false)); \
</ins><span class="cx"> cookieObject->setBoolean("session"_s, \
!cookie.expiry); </span><del>- cookieObject->setDouble("expires"_s, \
cookie.expiry.value_or(0)); </del><ins>+ \
cookieObject->setDouble("expires"_s, cookie.expiry.valueOr(0)); \
</ins><span class="cx"> return cookieObject; </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2479,7 +2479,7 @@
</span><span class="cx"> \
parameters->setString("nodeHandle"_s, elementID.value()); </span><span \
class="cx"> else </span><span class="cx"> \
parameters->setBoolean("clipToViewport"_s, true); </span><del>- \
if (scrollIntoView.value_or(false)) </del><ins>+ if \
(scrollIntoView.valueOr(false)) </ins><span class="cx"> \
parameters->setBoolean("scrollIntoViewIfNeeded"_s, true); </span><span \
class="cx"> m_host->sendCommandToBackend("takeScreenshot"_s, \
WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = \
WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable \
{ </span><span class="cx"> if (response.isError || \
!response.responseObject) { </span></span></pre></div>
<a id="trunkSourceWebDriverWebDriverServicecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebDriver/WebDriverService.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebDriver/WebDriverService.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebDriver/WebDriverService.cpp 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> // Let body be a new JSON Object initialised with \
the following properties: "error", "message", \
"stacktrace". </span><span class="cx"> auto errorObject = \
JSON::Object::create(); </span><span class="cx"> \
errorObject->setString("error"_s, result.errorString()); </span><del>- \
errorObject->setString("message"_s, \
result.errorMessage().value_or(emptyString())); </del><ins>+ \
errorObject->setString("message"_s, \
result.errorMessage().valueOr(emptyString())); </ins><span class="cx"> \
errorObject->setString("stacktrace"_s, emptyString()); </span><span \
class="cx"> // If the error data dictionary contains any entries, set the \
"data" field on body to a new JSON Object populated with the dictionary. \
</span><span class="cx"> if (auto& additionalData = \
result.additionalErrorData()) </span><span class="lines">@@ -695,12 +695,12 @@
</span><span class="cx"> \
resultObject->setString("sessionId"_s, m_session->id()); </span><span \
class="cx"> RefPtr<JSON::Object> capabilitiesObject = \
JSON::Object::create(); </span><span class="cx"> const auto& \
capabilities = m_session->capabilities(); </span><del>- \
capabilitiesObject->setString("browserName"_s, \
capabilities.browserName.value_or(emptyString()));
- capabilitiesObject->setString("browserVersion"_s, \
capabilities.browserVersion.value_or(emptyString()));
- capabilitiesObject->setString("platformName"_s, \
capabilities.platformName.value_or(emptyString()));
- capabilitiesObject->setBoolean("acceptInsecureCerts"_s, \
capabilities.acceptInsecureCerts.value_or(false));
- capabilitiesObject->setBoolean("setWindowRect"_s, \
capabilities.setWindowRect.value_or(true));
- switch (capabilities.unhandledPromptBehavior.value_or(UnhandledPromptBehavior::DismissAndNotify)) \
{ </del><ins>+ capabilitiesObject->setString("browserName"_s, \
capabilities.browserName.valueOr(emptyString())); + \
capabilitiesObject->setString("browserVersion"_s, \
capabilities.browserVersion.valueOr(emptyString())); + \
capabilitiesObject->setString("platformName"_s, \
capabilities.platformName.valueOr(emptyString())); + \
capabilitiesObject->setBoolean("acceptInsecureCerts"_s, \
capabilities.acceptInsecureCerts.valueOr(false)); + \
capabilitiesObject->setBoolean("setWindowRect"_s, \
capabilities.setWindowRect.valueOr(true)); + switch \
(capabilities.unhandledPromptBehavior.valueOr(UnhandledPromptBehavior::DismissAndNotify)) \
{ </ins><span class="cx"> case UnhandledPromptBehavior::Dismiss:
</span><span class="cx"> \
capabilitiesObject->setString("unhandledPromptBehavior"_s, \
"dismiss"); </span><span class="cx"> break;
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> \
capabilitiesObject->setString("unhandledPromptBehavior"_s, \
"ignore"); </span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- switch \
(capabilities.pageLoadStrategy.value_or(PageLoadStrategy::Normal)) { </del><ins>+ \
switch (capabilities.pageLoadStrategy.valueOr(PageLoadStrategy::Normal)) { \
</ins><span class="cx"> case PageLoadStrategy::None: </span><span \
class="cx"> \
capabilitiesObject->setString("pageLoadStrategy"_s, "none"); \
</span><span class="cx"> break; </span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebKit/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * Shared/API/c/WKSecurityOriginRef.cpp:
+ (WKSecurityOriginGetPort):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/WKSecurityOrigin.mm:
+ (-[WKSecurityOrigin port]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _cpuLimit]):
+ * UIProcess/API/glib/WebKitSecurityOrigin.cpp:
+ (webkit_security_origin_get_port):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseHandleWheelEvent):
+ * UIProcess/Automation/SimulatedInputDispatcher.cpp:
+ (WebKit::SimulatedInputKeyFrame::maximumDuration const):
+ (WebKit::SimulatedInputDispatcher::transitionInputSourceToState):
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::setWindowFrameOfBrowsingContext):
+ (WebKit::WebAutomationSession::performInteractionSequence):
+ * UIProcess/Automation/WebAutomationSessionMacros.h:
+ * UIProcess/ServiceWorkerProcessProxy.cpp:
+ (WebKit::ServiceWorkerProcessProxy::start):
+ * UIProcess/WebAuthentication/AuthenticatorManager.cpp:
+ (WebKit::AuthenticatorManager::initTimeOutTimer):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::deviceScaleFactor const):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::viewportSizeForCSSViewportUnits const):
+ * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+ (WebKit::WebPopupMenuProxyGtk::activateItem):
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::encodeFormDataElement):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::convertFromPDFViewToRootView const):
+ (WebKit::PDFPlugin::boundsOnScreen const):
+ (WebKit::PDFPlugin::geometryDidChange):
+ * WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+ (WebKit::toFormData):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+ * WebProcess/WebPage/wpe/CompositingManager.cpp:
+ (WebKit::CompositingManager::releaseConnectionFd):
+
</ins><span class="cx"> 2018-12-20 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve release-level page-load logging
</span></span></pre></div>
<a id="trunkSourceWebKitSharedAPIcWKSecurityOriginRefcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/Shared/API/c/WKSecurityOriginRef.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/Shared/API/c/WKSecurityOriginRef.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebKit/Shared/API/c/WKSecurityOriginRef.cpp 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -76,5 +76,5 @@
</span><span class="cx">
</span><span class="cx"> unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef \
securityOrigin) </span><span class="cx"> {
</span><del>- return \
WebKit::toImpl(securityOrigin)->securityOrigin().port().value_or(0); </del><ins>+ \
return WebKit::toImpl(securityOrigin)->securityOrigin().port().valueOr(0); \
</ins><span class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> bool isAutomaticProcessWarmingEnabled() const
</span><span class="cx"> {
</span><del>- return \
m_isAutomaticProcessWarmingEnabledByClient.value_or(m_clientWouldBenefitFromAutomaticProcessPrewarming);
</del><ins>+ return \
m_isAutomaticProcessWarmingEnabledByClient.valueOr(m_clientWouldBenefitFromAutomaticProcessPrewarming);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool wasAutomaticProcessWarmingSetByClient() const { \
return !!m_isAutomaticProcessWarmingEnabledByClient; } </span><span class="lines">@@ \
-157,7 +157,7 @@ </span><span class="cx">
</span><span class="cx"> bool processSwapsOnNavigation() const
</span><span class="cx"> {
</span><del>- return \
m_processSwapsOnNavigationFromClient.value_or(m_processSwapsOnNavigationFromExperimentalFeatures);
</del><ins>+ return \
m_processSwapsOnNavigationFromClient.valueOr(m_processSwapsOnNavigationFromExperimentalFeatures);
</ins><span class="cx"> }
</span><span class="cx"> void setProcessSwapsOnNavigation(bool swaps) { \
m_processSwapsOnNavigationFromClient = swaps; } </span><span class="cx"> void \
setProcessSwapsOnNavigationFromExperimentalFeatures(bool swaps) { \
m_processSwapsOnNavigationFromExperimentalFeatures = swaps; } \
</span></span></pre></div> <a \
id="trunkSourceWebKitUIProcessAPICocoaWKSecurityOriginmm"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKSecurityOrigin.mm (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2018-12-20 20:23:18 \
UTC (rev 239461) </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().value_or(0);
</del><ins>+ return _securityOrigin->securityOrigin().port().valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx">
</span><span class="cx"> - (double)_cpuLimit
</span><span class="cx"> {
</span><del>- return _pageConfiguration->cpuLimit().value_or(0);
</del><ins>+ return _pageConfiguration->cpuLimit().valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIglibWebKitSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/glib/WebKitSecurityOrigin.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/API/glib/WebKitSecurityOrigin.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSecurityOrigin.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(origin, 0);
</span><span class="cx">
</span><del>- return origin->securityOrigin->port().value_or(0);
</del><ins>+ return origin->securityOrigin->port().valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><span class="cx"> ASSERT(!priv->dialog);
</span><span class="cx"> if (phase)
</span><del>- \
priv->pageProxy->handleWheelEvent(NativeWebWheelEvent(event, phase.value(), \
momentum.value_or(WebWheelEvent::Phase::PhaseNone))); </del><ins>+ \
priv->pageProxy->handleWheelEvent(NativeWebWheelEvent(event, phase.value(), \
momentum.valueOr(WebWheelEvent::Phase::PhaseNone))); </ins><span class="cx"> else
</span><span class="cx"> \
priv->pageProxy->handleWheelEvent(NativeWebWheelEvent(event)); </span><span \
class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAutomationSimulatedInputDispatchercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // The "compute the tick duration" algorithm ( \
§17.4 Dispatching Actions). </span><span class="cx"> Seconds result;
</span><span class="cx"> for (auto& entry : states)
</span><del>- result = std::max(result, \
entry.second.duration.value_or(Seconds(0))); </del><ins>+ result = \
std::max(result, entry.second.duration.valueOr(Seconds(0))); </ins><span class="cx"> \
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> eventDispatchFinished(WTF::nullopt);
</span><span class="cx"> break;
</span><span class="cx"> case SimulatedInputSourceType::Mouse: {
</span><del>- resolveLocation(a.location.value_or(WebCore::IntPoint()), \
b.location, b.origin.value_or(MouseMoveOrigin::Viewport), b.nodeHandle, [this, \
&a, &b, eventDispatchFinished = \
WTFMove(eventDispatchFinished)](Optional<WebCore::IntPoint> location, \
Optional<AutomationCommandError> error) mutable { </del><ins>+ \
resolveLocation(a.location.valueOr(WebCore::IntPoint()), b.location, \
b.origin.valueOr(MouseMoveOrigin::Viewport), b.nodeHandle, [this, &a, &b, \
eventDispatchFinished = \
WTFMove(eventDispatchFinished)](Optional<WebCore::IntPoint> location, \
Optional<AutomationCommandError> error) mutable { </ins><span class="cx"> \
if (error) { </span><span class="cx"> eventDispatchFinished(error);
</span><span class="cx"> return;
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> } else if (a.location != b.location) {
</span><span class="cx"> LOG(Automation, \
"SimulatedInputDispatcher[%p]: simulating MouseMove for transition to \
%d.%d", this, m_keyframeIndex, m_inputSourceStateIndex); </span><span \
class="cx"> // FIXME: This does not interpolate mousemoves per the \
"perform a pointer move" algorithm ( §17.4 Dispatching Actions). \
</span><del>- m_client.simulateMouseInteraction(m_page, \
MouseInteraction::Move, b.pressedMouseButton.value_or(MouseButton::NoButton), \
b.location.value(), WTFMove(eventDispatchFinished)); </del><ins>+ \
m_client.simulateMouseInteraction(m_page, MouseInteraction::Move, \
b.pressedMouseButton.valueOr(MouseButton::NoButton), b.location.value(), \
WTFMove(eventDispatchFinished)); </ins><span class="cx"> } else
</span><span class="cx"> eventDispatchFinished(WTF::nullopt);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> this->restoreWindowForPage(webPage, [callback = \
WTFMove(callback), page = WTFMove(page), width, height, x, y]() mutable { \
</span><span class="cx"> auto& webPage = *page; </span><span \
class="cx"> webPage.getWindowFrameWithCallback([callback = \
WTFMove(callback), page = WTFMove(page), width, height, x, y](WebCore::FloatRect \
originalFrame) mutable { </span><del>- WebCore::FloatRect newFrame = \
WebCore::FloatRect(WebCore::FloatPoint(x.value_or(originalFrame.location().x()), \
y.value_or(originalFrame.location().y())), \
WebCore::FloatSize(width.value_or(originalFrame.size().width()), \
height.value_or(originalFrame.size().height()))); </del><ins>+ \
WebCore::FloatRect newFrame = \
WebCore::FloatRect(WebCore::FloatPoint(x.valueOr(originalFrame.location().x()), \
y.valueOr(originalFrame.location().y())), \
WebCore::FloatSize(width.valueOr(originalFrame.size().width()), \
height.valueOr(originalFrame.size().height()))); </ins><span class="cx"> \
if (newFrame != originalFrame) </span><span class="cx"> \
page->setWindowFrame(newFrame); </span><span class="cx">
</span><span class="lines">@@ -1834,7 +1834,7 @@
</span><span class="cx"> String pressedButtonString;
</span><span class="cx"> if \
(stateObject->getString("pressedButton"_s, pressedButtonString)) { \
</span><span class="cx"> auto protocolButton = \
Inspector::Protocol::AutomationHelpers::parseEnumValueFromString<Inspector::Protocol::Automation::MouseButton>(pressedButtonString);
</span><del>- sourceState.pressedMouseButton = \
protocolMouseButtonToWebMouseEventButton(protocolButton.value_or(Inspector::Protocol::Automation::MouseButton::None));
</del><ins>+ sourceState.pressedMouseButton = \
protocolMouseButtonToWebMouseEventButton(protocolButton.valueOr(Inspector::Protocol::Automation::MouseButton::None));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String originString;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAutomationWebAutomationSessionMacrosh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSessionMacros.h (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSessionMacros.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/Automation/WebAutomationSessionMacros.h 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #define 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::Protoco \
l::Automation::ErrorMessage>(errorString).value_or(Inspector::Protocol::Automation::ErrorMessage::InternalError)
</del><ins>+#define VALIDATED_ERROR_MESSAGE(errorString) \
Inspector::Protocol::AutomationHelpers::parseEnumValueFromString<Inspector::Protoco \
l::Automation::ErrorMessage>(errorString).valueOr(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></pre></div>
<a id="trunkSourceWebKitUIProcessServiceWorkerProcessProxycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void ServiceWorkerProcessProxy::start(const \
WebPreferencesStore& store, Optional<PAL::SessionID> initialSessionID) \
</span><span class="cx"> { </span><del>- \
send(Messages::WebProcess::EstablishWorkerContextConnectionToNetworkProcess { \
processPool().defaultPageGroup().pageGroupID(), m_serviceWorkerPageID, store, \
initialSessionID.value_or(PAL::SessionID::defaultSessionID()) }, 0); </del><ins>+ \
send(Messages::WebProcess::EstablishWorkerContextConnectionToNetworkProcess { \
processPool().defaultPageGroup().pageGroupID(), m_serviceWorkerPageID, store, \
initialSessionID.valueOr(PAL::SessionID::defaultSessionID()) }, 0); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> void ServiceWorkerProcessProxy::setUserAgent(const \
String& userAgent) </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebAuthenticationAuthenticatorManagercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> {
</span><span class="cx"> using namespace AuthenticatorManagerInternal;
</span><span class="cx">
</span><del>- unsigned timeOutInMsValue = std::min(maxTimeOutValue, \
timeOutInMs.value_or(maxTimeOutValue)); </del><ins>+ unsigned timeOutInMsValue = \
std::min(maxTimeOutValue, timeOutInMs.valueOr(maxTimeOutValue)); </ins><span \
class="cx"> // FIXME(192061) </span><span class="cx"> LOG_ERROR("Start \
timer. %d", timeOutInMsValue); </span><span class="cx"> \
m_requestTimeOutTimer.startOneShot(Seconds::fromMilliseconds(timeOutInMsValue)); \
</span></span></pre></div> <a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -3119,7 +3119,7 @@
</span><span class="cx">
</span><span class="cx"> float WebPageProxy::deviceScaleFactor() const
</span><span class="cx"> {
</span><del>- return \
m_customDeviceScaleFactor.value_or(m_intrinsicDeviceScaleFactor); </del><ins>+ \
return m_customDeviceScaleFactor.valueOr(m_intrinsicDeviceScaleFactor); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> void WebPageProxy::setCustomDeviceScaleFactor(float \
customScaleFactor) </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1169,7 +1169,7 @@
</span><span class="cx"> void setAutoSizingShouldExpandToViewHeight(bool);
</span><span class="cx">
</span><span class="cx"> void setViewportSizeForCSSViewportUnits(const \
WebCore::IntSize&); </span><del>- WebCore::IntSize \
viewportSizeForCSSViewportUnits() const { return \
m_viewportSizeForCSSViewportUnits.value_or(WebCore::IntSize()); } </del><ins>+ \
WebCore::IntSize viewportSizeForCSSViewportUnits() const { return \
m_viewportSizeForCSSViewportUnits.valueOr(WebCore::IntSize()); } </ins><span \
class="cx"> </span><span class="cx"> void \
didReceiveAuthenticationChallengeProxy(uint64_t frameID, \
Ref<AuthenticationChallengeProxy>&&); </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> void \
WebPopupMenuProxyGtk::activateItem(Optional<unsigned> itemIndex) </span><span \
class="cx"> { </span><span class="cx"> if (m_client)
</span><del>- m_client->valueChangedForPopupMenu(this, \
itemIndex.value_or(m_selectedItem.value_or(-1))); </del><ins>+ \
m_client->valueChangedForPopupMenu(this, \
itemIndex.valueOr(m_selectedItem.valueOr(-1))); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPopupMenuProxyGtk::activateItemAtPath(GtkTreePath* \
path) </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -284,8 +284,8 @@
</span><span class="cx"> encoder << false;
</span><span class="cx">
</span><span class="cx"> encoder << element.fileStart;
</span><del>- encoder << element.fileLength.value_or(-1);
- encoder << \
element.expectedFileModificationTime.value_or(WallTime::nan()).secondsSinceEpoch().value();
</del><ins>+ encoder << element.fileLength.valueOr(-1);
+ encoder << \
element.expectedFileModificationTime.valueOr(WallTime::nan()).secondsSinceEpoch().value();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPBody::Element::Type::Blob:
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (239460 => 239461)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-12-20 20:08:27 UTC \
(rev 239460)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-12-20 20:23:18 \
UTC (rev 239461) </span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> auto& frameLoaderClient = \
resourceLoader.frameLoader()->client(); </span><span class="cx">
</span><span class="cx"> WebResourceLoader::TrackingParameters \
trackingParameters; </span><del>- trackingParameters.pageID = \
frameLoaderClient.pageID().value_or(0);
- trackingParameters.frameID = frameLoaderClient.frameID().value_or(0);
</del><ins>+ trackingParameters.pageID = frameLoaderClient.pageID().valueOr(0);
+ trackingParameters.frameID = frameLoaderClient.frameID().valueOr(0);
</ins><span class="cx"> trackingParameters.resourceID = identifier;
</span><span class="cx"> auto sessionID = frameLoaderClient.sessionID();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -1286,7 +1286,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().value_or(AffineTransform()).mapPoint(pointInPluginCoordinates);
</del><ins>+ return \
m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapPoint(pointInPluginCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint PDFPlugin::convertFromRootViewToPDFView(const \
IntPoint& point) const </span><span class="lines">@@ -1315,7 +1315,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().value_or(AffineTransform()).mapRect(bounds); \
</del><ins>+ FloatRect rectInRootViewCoordinates = \
m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapRect(bounds); \
</ins><span class="cx"> return \
frameView->contentsToScreen(enclosingIntRect(rectInRootViewCoordinates)); \
</span><span class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -1325,7 +1325,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_size = pluginSize;
</span><del>- m_rootViewToPluginTransform = \
pluginToRootViewTransform.inverse().value_or(AffineTransform()); </del><ins>+ \
m_rootViewToPluginTransform = \
pluginToRootViewTransform.inverse().valueOr(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="trunkSourceWebKitWebProcessWebCoreSupportSessionStateConversioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/WebCoreSupport/SessionStateConversion.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -128,7 +128,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.value_or(BlobDataItem::toEndOfFile), \
element.expectedFileModificationTime); </del><ins>+ \
formData->appendFileRange(element.filePath, element.fileStart, \
element.fileLength.valueOr(BlobDataItem::toEndOfFile), \
element.expectedFileModificationTime); </ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPBody::Element::Type::Blob:
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-12-20 20:23:18 UTC \
(rev 239461) </span><span class="lines">@@ -2988,7 +2988,7 @@
</span><span class="cx"> \
m_oldestNonStableUpdateVisibleContentRectsTimestamp = oldestTimestamp; </span><span \
class="cx"> } </span><span class="cx">
</span><del>- float scaleToUse = \
scaleFromUIProcess.value_or(m_page->pageScaleFactor()); </del><ins>+ float \
scaleToUse = scaleFromUIProcess.valueOr(m_page->pageScaleFactor()); </ins><span \
class="cx"> FloatRect exposedContentRect = \
visibleContentRectUpdateInfo.exposedContentRect(); </span><span class="cx"> \
FloatRect adjustedExposedContentRect = \
adjustExposedRectForNewScale(exposedContentRect, \
visibleContentRectUpdateInfo.scale(), scaleToUse); </span><span class="cx"> \
m_drawingArea->setExposedContentRect(adjustedExposedContentRect); \
</span></span></pre></div> <a \
id="trunkSourceWebKitWebProcessWebPagewpeCompositingManagercpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> int CompositingManager::releaseConnectionFd()
</span><span class="cx"> {
</span><del>- int fd = m_connectionFd.value_or(-1);
</del><ins>+ int fd = m_connectionFd.valueOr(-1);
</ins><span class="cx"> m_connectionFd = WTF::nullopt;
</span><span class="cx"> return fd;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/WebSecurityOrigin.mm:
+ (-[WebSecurityOrigin port]):
+
</ins><span class="cx"> 2018-12-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r239417.
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebSecurityOriginmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOrigin.mm (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOrigin.mm 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOrigin.mm 2018-12-20 \
20:23:18 UTC (rev 239461) </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().value_or(0); \
</del><ins>+ return \
reinterpret_cast<SecurityOrigin*>(_private)->port().valueOr(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="trunkSourceWebKitLegacywinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/ChangeLog (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * WebSecurityOrigin.cpp:
+ (WebSecurityOrigin::port):
+
</ins><span class="cx"> 2018-12-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> wtf/Optional.h: move-constructor and move-assignment \
operator should disengage the value being moved from </span></span></pre></div>
<a id="trunkSourceWebKitLegacywinWebSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKitLegacy/win/WebSecurityOrigin.cpp (239460 => 239461)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKitLegacy/win/WebSecurityOrigin.cpp 2018-12-20 20:08:27 UTC (rev \
239460)
+++ trunk/Source/WebKitLegacy/win/WebSecurityOrigin.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </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().value_or(0);
</del><ins>+ *result = m_securityOrigin->port().valueOr(0);
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (239460 => 239461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2018-12-20 20:08:27 UTC (rev 239460)
+++ trunk/Tools/ChangeLog 2018-12-20 20:23:18 UTC (rev 239461)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::valueOr() instead of Optional::value_or()
+ https://bugs.webkit.org/show_bug.cgi?id=192933
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/Tests/WTF/URLParser.cpp:
+ (TestWebKitAPI::checkURL):
+ (TestWebKitAPI::checkRelativeURL):
+ (TestWebKitAPI::checkURLDifferences):
+ (TestWebKitAPI::checkRelativeURLDifferences):
+ * TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp:
+ (TestWebKitAPI::checkURL):
+
</ins><span class="cx"> 2018-12-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r239417.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp \
(239460 => 239461)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp 2018-12-20 \
20:08:27 UTC (rev 239460)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp 2018-12-20 20:23:18 UTC (rev \
239461) </span><span class="lines">@@ -94,7 +94,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().value_or(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().valueOr(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">@@ -121,7 +121,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().value_or(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().valueOr(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">@@ -150,7 +150,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().value_or(0));
</del><ins>+ EXPECT_EQ(partsNew.port, url.port().valueOr(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">@@ -179,7 +179,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().value_or(0));
</del><ins>+ EXPECT_EQ(partsNew.port, url.port().valueOr(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></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParserTextEncodingcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp (239460 => \
239461)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp 2018-12-20 20:08:27 \
UTC (rev 239460)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParserTextEncoding.cpp 2018-12-20 \
20:23:18 UTC (rev 239461) </span><span class="lines">@@ -96,7 +96,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().value_or(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().valueOr(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">@@ -120,7 +120,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().value_or(0));
</del><ins>+ EXPECT_EQ(parts.port, url.port().valueOr(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>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic