[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239477] trunk
From: cdumez () apple ! com
Date: 2018-12-21 0:40:09
Message-ID: 20181221004009.A243A10051CC () 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>[239477] 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/239477">239477</a></dd> \
<dt>Author</dt> <dd>cdumez@apple.com</dd> <dt>Date</dt> <dd>2018-12-20 16:40:09 -0800 \
(Thu, 20 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>Use Optional::hasValue() instead of Optional::has_value()
https://bugs.webkit.org/show_bug.cgi?id=192948
Reviewed by Tim Horton.
Source/JavaScriptCore:
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
(CppBackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
(CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
Source/WebCore:
* bindings/js/DOMPromiseProxy.h:
(WebCore::DOMPromiseProxy<IDLType>::isFulfilled const):
(WebCore::DOMPromiseProxy<IDLVoid>::isFulfilled const):
(WebCore::DOMPromiseProxyWithResolveCallback<IDLType>::isFulfilled const):
* dom/DataTransferItemList.h:
(WebCore::DataTransferItemList::hasItems const):
* dom/EventTarget.cpp:
(WebCore::EventTarget::addEventListener):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::captionDisplayMode):
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::wouldTaintOrigin const):
* platform/graphics/gstreamer/mse/AppendPipeline.cpp:
(WebCore::AppendPipeline::parseDemuxerSrcPadCaps):
* platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
(WebCore::MediaPlayerPrivateGStreamerMSE::trackDetected):
* platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcUpdatePresentationSize):
* platform/mac/NSScrollerImpDetails.mm:
(WebCore::ScrollerStyle::recommendedScrollerStyle):
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::setExplicitValue):
Source/WebKit:
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::AutomationCommandError::toProtocolString):
(WebKit::WebAutomationSession::willClosePage):
* WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::WebAutomationSessionProxy::computeElementLayout):
Source/WTF:
* wtf/Hasher.h:
(WTF::add):
* wtf/Optional.h:
Tools:
* TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebCore/FileSystem.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_di \
spatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHasherh">trunk/Source/WTF/wtf/Hasher.h</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="#trunkSourceWebCorebindingsjsDOMPromiseProxyh">trunk/Source/WebCore/bindings/js/DOMPromiseProxy.h</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemListh">trunk/Source/WebCore/dom/DataTransferItemList.h</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetcpp">trunk/Source/WebCore/dom/EventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelinecpp">trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamermseMediaPlayerPrivateGStream \
erMSEcpp">trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamermseWebKitMediaSourceGStreame \
rcpp">trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacNSScrollerImpDetailsmm">trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListItemcpp">trunk/Source/WebCore/rendering/RenderListItem.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessAutomationWebAutomationSessionProxycpp">trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreCBORReaderTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreCBORWriterTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreFileSystemcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2018-12-21 00:38:25 UTC \
(rev 239476)
+++ trunk/Source/JavaScriptCore/ChangeLog 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::hasValue() instead of Optional::has_value()
+ https://bugs.webkit.org/show_bug.cgi?id=192948
+
+ Reviewed by Tim Horton.
+
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ (CppBackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
+ (CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
+
</ins><span class="cx"> 2018-12-20 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for globalThis
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> if parameter.is_optional:
</span><span class="cx"> if \
CppGenerator.should_use_wrapper_for_return_type(parameter.type): </span><del>- \
out_parameter_assignments.append(' if (%(parameterName)s.has_value())' % \
param_args) </del><ins>+ out_parameter_assignments.append(' if \
(%(parameterName)s.hasValue())' % param_args) </ins><span class="cx"> \
out_parameter_assignments.append(' \
jsonMessage->%(keyedSetMethod)s("%(parameterKey)s"_s, \
*%(parameterName)s);' % param_args) </span><span class="cx"> else:
</span><span class="cx"> out_parameter_assignments.append(' if \
(%(parameterName)s)' % param_args) </span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> out_parameter_declarations.append(' \
%(parameterType)s out_%(parameterName)s;' % param_args) </span><span class="cx"> \
if parameter.is_optional: </span><span class="cx"> if \
CppGenerator.should_use_wrapper_for_return_type(parameter.type): </span><del>- \
out_parameter_assignments.append(' if (out_%(parameterName)s.has_value())' % \
param_args) </del><ins>+ out_parameter_assignments.append(' \
if (out_%(parameterName)s.hasValue())' % param_args) </ins><span class="cx"> \
out_parameter_assignments.append(' \
result->%(keyedSetMethod)s("%(parameterKey)s"_s, \
*out_%(parameterName)s);' % param_args) </span><span class="cx"> \
else: </span><span class="cx"> \
out_parameter_assignments.append(' if (out_%(parameterName)s)' % param_args) \
</span></span></pre></div> <a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (239476 => 239477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WTF/ChangeLog 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2018-12-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use Optional::hasValue() instead of Optional::has_value()
+ https://bugs.webkit.org/show_bug.cgi?id=192948
+
+ Reviewed by Tim Horton.
+
+ * wtf/Hasher.h:
+ (WTF::add):
+ * wtf/Optional.h:
+
+2018-12-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use Optional::valueOr() instead of \
Optional::value_or() </span><span class="cx"> \
https://bugs.webkit.org/show_bug.cgi?id=192933 </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfHasherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Hasher.h (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Hasher.h 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WTF/wtf/Hasher.h 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> void add(Hasher& hasher, \
const Optional<T>& optional) </span><span class="cx"> {
</span><del>- add(hasher, optional.has_value());
- if (optional.has_value())
</del><ins>+ add(hasher, optional.hasValue());
+ if (optional.hasValue())
</ins><span class="cx"> add(hasher, optional.value());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Optional.h (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Optional.h 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WTF/wtf/Optional.h 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -506,7 +506,6 @@
</span><span class="cx"> // 20.5.4.5, Observers
</span><span class="cx">
</span><span class="cx"> explicit constexpr operator bool() const __NOEXCEPT { \
return initialized(); } </span><del>- constexpr bool has_value() const __NOEXCEPT { \
return initialized(); } // FIXME: Remove this. </del><span class="cx"> constexpr \
bool hasValue() const __NOEXCEPT { return initialized(); } </span><span class="cx">
</span><span class="cx"> constexpr T const* operator ->() const {
</span><span class="lines">@@ -673,7 +672,7 @@
</span><span class="cx"> return ref != nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- constexpr bool has_value() const __NOEXCEPT {
</del><ins>+ constexpr bool hasValue() const __NOEXCEPT {
</ins><span class="cx"> return ref != nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WebCore/ChangeLog 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2018-12-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use Optional::hasValue() instead of Optional::has_value()
+ https://bugs.webkit.org/show_bug.cgi?id=192948
+
+ Reviewed by Tim Horton.
+
+ * bindings/js/DOMPromiseProxy.h:
+ (WebCore::DOMPromiseProxy<IDLType>::isFulfilled const):
+ (WebCore::DOMPromiseProxy<IDLVoid>::isFulfilled const):
+ (WebCore::DOMPromiseProxyWithResolveCallback<IDLType>::isFulfilled \
const): + * dom/DataTransferItemList.h:
+ (WebCore::DataTransferItemList::hasItems const):
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::addEventListener):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::captionDisplayMode):
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::wouldTaintOrigin const):
+ * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+ (WebCore::AppendPipeline::parseDemuxerSrcPadCaps):
+ * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerMSE::trackDetected):
+ * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
+ (webKitMediaSrcUpdatePresentationSize):
+ * platform/mac/NSScrollerImpDetails.mm:
+ (WebCore::ScrollerStyle::recommendedScrollerStyle):
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::setExplicitValue):
+
+2018-12-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move HTTPS_UPGRADE code behind a runtime flag, off by \
default </span><span class="cx"> \
https://bugs.webkit.org/show_bug.cgi?id=192937 </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDOMPromiseProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/DOMPromiseProxy.h \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/DOMPromiseProxy.h 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/bindings/js/DOMPromiseProxy.h 2018-12-21 00:40:09 UTC (rev \
239477) </span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> template<typename IDLType>
</span><span class="cx"> inline bool DOMPromiseProxy<IDLType>::isFulfilled() \
const </span><span class="cx"> {
</span><del>- return m_valueOrException.has_value();
</del><ins>+ return m_valueOrException.hasValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename IDLType>
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool DOMPromiseProxy<IDLVoid>::isFulfilled() \
const </span><span class="cx"> {
</span><del>- return m_valueOrException.has_value();
</del><ins>+ return m_valueOrException.hasValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void DOMPromiseProxy<IDLVoid>::resolve()
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> template<typename IDLType>
</span><span class="cx"> inline bool \
DOMPromiseProxyWithResolveCallback<IDLType>::isFulfilled() const </span><span \
class="cx"> { </span><del>- return m_valueOrException.has_value();
</del><ins>+ return m_valueOrException.hasValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename IDLType>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItemList.h \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItemList.h 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/dom/DataTransferItemList.h 2018-12-21 00:40:09 UTC (rev \
239477) </span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void didClearStringData(const String& type);
</span><span class="cx"> void didSetStringData(const String& type);
</span><del>- bool hasItems() const { return m_items.has_value(); }
</del><ins>+ bool hasItems() const { return m_items.hasValue(); }
</ins><span class="cx"> const Vector<Ref<DataTransferItem>>& \
items() const </span><span class="cx"> {
</span><span class="cx"> ASSERT(m_items);
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.cpp (239476 \
=> 239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.cpp 2018-12-21 00:38:25 \
UTC (rev 239476)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto passive = options.passive;
</span><span class="cx">
</span><del>- if (!passive.has_value() && \
eventNames().isTouchScrollBlockingEventType(eventType)) { </del><ins>+ if \
(!passive.hasValue() && \
eventNames().isTouchScrollBlockingEventType(eventType)) { </ins><span class="cx"> \
if (is<DOMWindow>(*this)) { </span><span class="cx"> auto& \
window = downcast<DOMWindow>(*this); </span><span class="cx"> if \
(auto* document = window.document()) </span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-12-21 00:40:09 UTC (rev \
239477) </span><span class="lines">@@ -6583,7 +6583,7 @@
</span><span class="cx">
</span><span class="cx"> CaptionUserPreferences::CaptionDisplayMode \
HTMLMediaElement::captionDisplayMode() </span><span class="cx"> {
</span><del>- if (!m_captionDisplayMode.has_value()) {
</del><ins>+ if (!m_captionDisplayMode.hasValue()) {
</ins><span class="cx"> if (document().page())
</span><span class="cx"> m_captionDisplayMode = \
document().page()->group().captionPreferences().captionDisplayMode(); </span><span \
class="cx"> else </span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (239476 => 239477)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-12-21 00:40:09 UTC \
(rev 239477) </span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx"> bool MediaPlayer::wouldTaintOrigin(const SecurityOrigin& \
origin) const </span><span class="cx"> {
</span><span class="cx"> auto wouldTaint = \
m_private->wouldTaintOrigin(origin); </span><del>- if (wouldTaint.has_value())
</del><ins>+ if (wouldTaint.hasValue())
</ins><span class="cx"> return wouldTaint.value();
</span><span class="cx">
</span><span class="cx"> if (m_url.protocolIsData())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelinecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> m_streamType = \
WebCore::MediaSourceStreamTypeGStreamer::Invalid; </span><span class="cx"> } else \
if (doCapsHaveType(m_demuxerSrcPadCaps.get(), GST_VIDEO_CAPS_TYPE_PREFIX)) { \
</span><span class="cx"> Optional<FloatSize> size = \
getVideoResolutionFromCaps(m_demuxerSrcPadCaps.get()); </span><del>- if \
(size.has_value()) </del><ins>+ if (size.hasValue())
</ins><span class="cx"> m_presentationSize = size.value();
</span><span class="cx"> else
</span><span class="cx"> m_presentationSize = WebCore::FloatSize();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamermseMediaPlayerPrivateGStreamerMSEcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx">
</span><span class="cx"> if (doCapsHaveType(caps, GST_VIDEO_CAPS_TYPE_PREFIX)) {
</span><span class="cx"> Optional<FloatSize> size = \
getVideoResolutionFromCaps(caps); </span><del>- if (size.has_value())
</del><ins>+ if (size.hasValue())
</ins><span class="cx"> m_videoSize = size.value();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamermseWebKitMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> GST_OBJECT_LOCK(stream->parent);
</span><span class="cx"> if (WebCore::doCapsHaveType(caps, \
GST_VIDEO_CAPS_TYPE_PREFIX)) { </span><span class="cx"> \
Optional<WebCore::FloatSize> size = WebCore::getVideoResolutionFromCaps(caps); \
</span><del>- if (size.has_value()) </del><ins>+ if (size.hasValue())
</ins><span class="cx"> stream->presentationSize = size.value();
</span><span class="cx"> else
</span><span class="cx"> stream->presentationSize = \
WebCore::FloatSize(); </span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacNSScrollerImpDetailsmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm (239476 => 239477)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm 2018-12-21 00:38:25 UTC \
(rev 239476)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm 2018-12-21 00:40:09 UTC \
(rev 239477) </span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> NSScrollerStyle ScrollerStyle::recommendedScrollerStyle()
</span><span class="cx"> {
</span><del>- if (m_useOverlayScrollbars.has_value())
</del><ins>+ if (m_useOverlayScrollbars.hasValue())
</ins><span class="cx"> return *m_useOverlayScrollbars ? \
NSScrollerStyleOverlay : NSScrollerStyleLegacy; </span><span class="cx">
</span><span class="cx"> if (DeprecatedGlobalSettings::usesOverlayScrollbars())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp \
(239476 => 239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListItem.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp 2018-12-21 00:40:09 UTC (rev \
239477) </span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> if (m_valueWasSetExplicitly && m_value == \
value) </span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_valueWasSetExplicitly = value.has_value();
</del><ins>+ m_valueWasSetExplicitly = value.hasValue();
</ins><span class="cx"> m_value = value;
</span><span class="cx"> explicitValueChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Source/WebKit/ChangeLog 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-12-20 Chris Dumez <cdumez@apple.com>
+
+ Use Optional::hasValue() instead of Optional::has_value()
+ https://bugs.webkit.org/show_bug.cgi?id=192948
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::AutomationCommandError::toProtocolString):
+ (WebKit::WebAutomationSession::willClosePage):
+ * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+ (WebKit::WebAutomationSessionProxy::computeElementLayout):
+
</ins><span class="cx"> 2018-12-20 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Flicker when exiting element fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2018-12-21 00:38:25 \
UTC (rev 239476)
+++ trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> String AutomationCommandError::toProtocolString()
</span><span class="cx"> {
</span><span class="cx"> String protocolErrorName = \
Inspector::Protocol::AutomationHelpers::getEnumConstantValue(type); </span><del>- \
if (!message.has_value()) </del><ins>+ if (!message.hasValue())
</ins><span class="cx"> return protocolErrorName;
</span><span class="cx">
</span><span class="cx"> return makeString(protocolErrorName, \
errorNameAndDetailsSeparator, message.value()); </span><span class="lines">@@ -784,7 \
+784,7 @@ </span><span class="cx">
</span><span class="cx"> // Then tell the input dispatcher to cancel so timers \
are stopped, and let it go out of scope. </span><span class="cx"> \
Optional<Ref<SimulatedInputDispatcher>> inputDispatcher = \
m_inputDispatchersByPage.take(page.pageID()); </span><del>- if \
(inputDispatcher.has_value()) </del><ins>+ if (inputDispatcher.hasValue())
</ins><span class="cx"> inputDispatcher.value()->cancel();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessAutomationWebAutomationSessionProxycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp (239476 => \
239477)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp 2018-12-21 \
00:38:25 UTC (rev 239476)
+++ trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp 2018-12-21 \
00:40:09 UTC (rev 239477) </span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> bool isObscured = false;
</span><span class="cx"> if (containerElement) {
</span><span class="cx"> Optional<WebCore::FloatPoint> \
frameInViewCenterPoint = elementInViewClientCenterPoint(*containerElement, \
isObscured); </span><del>- if (frameInViewCenterPoint.has_value()) {
</del><ins>+ if (frameInViewCenterPoint.hasValue()) {
</ins><span class="cx"> WebCore::IntPoint rootInViewCenterPoint = \
mainView->rootViewToContents(frameView->contentsToRootView(WebCore::IntPoint(frameInViewCenterPoint.value())));
</span><span class="cx"> switch (coordinateSystem) {
</span><span class="cx"> case CoordinateSystem::Page:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (239476 => 239477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2018-12-21 00:38:25 UTC (rev 239476)
+++ trunk/Tools/ChangeLog 2018-12-21 00:40:09 UTC (rev 239477)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2018-12-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use Optional::hasValue() instead of Optional::has_value()
+ https://bugs.webkit.org/show_bug.cgi?id=192948
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebCore/FileSystem.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2018-12-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Add style script rule to check for uses of \
std::optional<> </span><span class="cx"> \
https://bugs.webkit.org/show_bug.cgi?id=192931 </span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreCBORReaderTestcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp (239476 => 239477)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp 2018-12-21 00:38:25 UTC \
(rev 239476)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp 2018-12-21 00:40:09 \
UTC (rev 239477) </span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> for (const UintTestCase& testCase : kUintTestCases) \
{ </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::Unsigned); </span><span class="cx"> \
EXPECT_EQ(cbor.value().getInteger(), testCase.value); </span><span class="cx"> }
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> for (const auto& nonMinimalUint : \
nonMinimalUintEncodings) { </span><span class="cx"> Optional<CBORValue> \
cbor = CBORReader::read(nonMinimalUint, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::NonMinimalCBOREncoding); </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> for (const NegativeIntTestCase& testCase : \
kNegativeIntTestCases) { </span><span class="cx"> Optional<CBORValue> \
cbor = CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::Negative); </span><span class="cx"> \
EXPECT_EQ(cbor.value().getInteger(), testCase.negativeInt); </span><span class="cx"> \
} </span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> for (const ByteTestCase& testCase : \
kByteStringTestCases) { </span><span class="cx"> Optional<CBORValue> \
cbor = CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::ByteString); </span><span class="cx"> \
EXPECT_TRUE(cbor.value().getByteString() == testCase.value); </span><span class="cx"> \
} </span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> for (const StringTestCase& testCase : \
kStringTestCases) { </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::String); </span><span class="cx"> \
EXPECT_TRUE(cbor.value().getString() == testCase.value); </span><span class="cx"> \
} </span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& testCase : kStringTestCases) {
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::String); </span><span class="cx"> \
EXPECT_TRUE(cbor.value().getString() == testCase.value); </span><span class="cx"> \
} </span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> };
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(stringWithInvalidContinuationByte, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::InvalidUTF8); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kArrayTestCaseCBOR); </span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> const CBORValue cborArray = WTFMove(cbor.value());
</span><span class="cx"> ASSERT_TRUE(cborArray.type() == CBORValue::Type::Array);
</span><span class="cx"> ASSERT_EQ(cborArray.getArray().size(), 25u);
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kMapTestCaseCBOR); </span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> const CBORValue cborVal = WTFMove(cbor.value());
</span><span class="cx"> ASSERT_TRUE(cborVal.type() == CBORValue::Type::Map);
</span><span class="cx"> ASSERT_EQ(cborVal.getMap().size(), 4u);
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kMapWithIntegerKeyCBOR); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> const CBORValue cborVal = WTFMove(cbor.value());
</span><span class="cx"> ASSERT_TRUE(cborVal.type() == CBORValue::Type::Map);
</span><span class="cx"> ASSERT_EQ(cborVal.getMap().size(), 4u);
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kMapArrayTestCaseCBOR); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> const CBORValue cborVal = WTFMove(cbor.value());
</span><span class="cx"> ASSERT_TRUE(cborVal.type() == CBORValue::Type::Map);
</span><span class="cx"> ASSERT_EQ(cborVal.getMap().size(), 2u);
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kNestedMapTestCase); </span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> const CBORValue cborVal = WTFMove(cbor.value());
</span><span class="cx"> ASSERT_TRUE(cborVal.type() == CBORValue::Type::Map);
</span><span class="cx"> ASSERT_EQ(cborVal.getMap().size(), 2u);
</span><span class="lines">@@ -429,11 +429,11 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> maxPositiveInt = \
CBORReader::read(kMaxPositiveInt); </span><del>- \
ASSERT_TRUE(maxPositiveInt.has_value()); </del><ins>+ \
ASSERT_TRUE(maxPositiveInt.hasValue()); </ins><span class="cx"> \
EXPECT_EQ(maxPositiveInt.value().getInteger(), INT64_MAX); </span><span class="cx">
</span><span class="cx"> Optional<CBORValue> minNegativeInt = \
CBORReader::read(kMinNegativeInt); </span><del>- \
ASSERT_TRUE(minNegativeInt.has_value()); </del><ins>+ \
ASSERT_TRUE(minNegativeInt.hasValue()); </ins><span class="cx"> \
EXPECT_EQ(minNegativeInt.value().getInteger(), INT64_MIN); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& testCase : kSimpleValueTestCases) {
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(testCase.cborData); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> ASSERT_TRUE(cbor.value().type() == \
CBORValue::Type::SimpleValue); </span><span class="cx"> \
ASSERT_TRUE(cbor.value().getSimpleValue() == testCase.value); </span><span \
class="cx"> } </span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> for (const auto& unsupported_floating_point : \
floatingPointCbors) { </span><span class="cx"> CBORReader::DecoderError \
errorCode; </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(unsupported_floating_point, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::UnsupportedFloatingPointValue); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> for (const auto& incomplete_data : \
incompleteCborList) { </span><span class="cx"> CBORReader::DecoderError \
errorCode; </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(incomplete_data, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::IncompleteCBORData); </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx">
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kMapWithUintKey, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::IncorrectMapKeyType); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx"> for (const auto& incorrect_cbor : \
kUnknownAdditionalInfoList) { </span><span class="cx"> \
CBORReader::DecoderError errorCode; </span><span class="cx"> \
Optional<CBORValue> cbor = CBORReader::read(incorrect_cbor, &errorCode); \
</span><del>- EXPECT_FALSE(cbor.has_value()); </del><ins>+ \
EXPECT_FALSE(cbor.hasValue()); </ins><span class="cx"> EXPECT_TRUE(errorCode \
== CBORReader::DecoderError::UnknownAdditionalInfo); </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> for (const auto& zeroDepthData : kZeroDepthCBORList) \
{ </span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(zeroDepthData, &errorCode, 0); </span><del>- \
EXPECT_TRUE(cbor.has_value()); </del><ins>+ EXPECT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::CBORNoError); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -610,11 +610,11 @@
</span><span class="cx">
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> Optional<CBORValue> cborSingleLayerMax = \
CBORReader::read(kNestedCBORData, &errorCode, 1); </span><del>- \
EXPECT_FALSE(cborSingleLayerMax.has_value()); </del><ins>+ \
EXPECT_FALSE(cborSingleLayerMax.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(errorCode == CBORReader::DecoderError::TooMuchNesting); </span><span \
class="cx"> </span><span class="cx"> Optional<CBORValue> \
cborDoubleLayerMax = CBORReader::read(kNestedCBORData, &errorCode, 2); \
</span><del>- EXPECT_TRUE(cborDoubleLayerMax.has_value()); </del><ins>+ \
EXPECT_TRUE(cborDoubleLayerMax.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(errorCode == CBORReader::DecoderError::CBORNoError); </span><span \
class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> for (const auto& unsortedMap : \
kMapsWithUnsortedKeys) { </span><span class="cx"> Optional<CBORValue> \
cbor = </span><span class="cx"> CBORReader::read(unsortedMap, \
&errorCode); </span><del>- EXPECT_FALSE(cbor.has_value());
</del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::OutOfOrderKey); </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx">
</span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(kMapWithDuplicateKey, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::DuplicateKey); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> CBORReader::DecoderError errorCode;
</span><span class="cx"> for (const auto& cbor_byte : utf8CharacterEncodings) \
{ </span><span class="cx"> Optional<CBORValue> correctlyEncodedCbor = \
CBORReader::read(cbor_byte, &errorCode); </span><del>- \
EXPECT_TRUE(correctlyEncodedCbor.has_value()); </del><ins>+ \
EXPECT_TRUE(correctlyEncodedCbor.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(errorCode == CBORReader::DecoderError::CBORNoError); </span><span \
class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> for (const auto& extraneous_cborData : \
zeroPaddedCborList) { </span><span class="cx"> CBORReader::DecoderError \
errorCode; </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(extraneous_cborData, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::ExtraneousData); </span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -759,7 +759,7 @@
</span><span class="cx"> for (const auto& unsupportedSimpleVal : \
unsupportedSimpleValues) { </span><span class="cx"> CBORReader::DecoderError \
errorCode; </span><span class="cx"> Optional<CBORValue> cbor = \
CBORReader::read(unsupportedSimpleVal, &errorCode); </span><del>- \
EXPECT_FALSE(cbor.has_value()); </del><ins>+ EXPECT_FALSE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(errorCode == \
CBORReader::DecoderError::UnsupportedSimpleValue); </span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreCBORWriterTestcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp (239476 => 239477)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp 2018-12-21 00:38:25 UTC \
(rev 239476)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp 2018-12-21 00:40:09 \
UTC (rev 239477) </span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> for (const UintTestCase& testCase : kUintTestCases) \
{ </span><span class="cx"> auto cbor = \
CBORWriter::write(CBORValue(testCase.value)); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), testCase.cbor));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& testCase : kNegativeIntTestCases) {
</span><span class="cx"> auto cbor = \
CBORWriter::write(CBORValue(testCase.negativeInt)); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), testCase.cbor));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> for (const BytesTestCase& testCase : \
kBytesTestCases) { </span><span class="cx"> auto cbor = \
CBORWriter::write(CBORValue(testCase.bytes)); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), testCase.cbor));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> for (const StringTestCase& testCase : \
kStringTestCases) { </span><span class="cx"> auto cbor = \
CBORWriter::write(CBORValue(testCase.string)); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), testCase.cbor));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> for (int64_t i = 1; i <= 25; i++)
</span><span class="cx"> array.append(CBORValue(i));
</span><span class="cx"> auto cbor = CBORWriter::write(CBORValue(array));
</span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), kArrayTestCaseCbor, \
sizeof(kArrayTestCaseCbor))); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> map[CBORValue(int64_t(4294967296))] = \
CBORValue("i"); </span><span class="cx"> \
map[CBORValue(std::numeric_limits<int64_t>::max())] = CBORValue("j"); \
</span><span class="cx"> auto cbor = CBORWriter::write(CBORValue(map)); \
</span><del>- ASSERT_TRUE(cbor.has_value()); </del><ins>+ \
ASSERT_TRUE(cbor.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(eq(cbor.value(), kMapTestCaseCbor, sizeof(kMapTestCaseCbor))); \
</span><span class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> array.append(CBORValue(3));
</span><span class="cx"> map[CBORValue("b")] = CBORValue(array);
</span><span class="cx"> auto cbor = CBORWriter::write(CBORValue(map));
</span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), kMapArrayTestCaseCbor, \
sizeof(kMapArrayTestCaseCbor))); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> nestedMap[CBORValue("d")] = CBORValue(3);
</span><span class="cx"> map[CBORValue("b")] = CBORValue(nestedMap);
</span><span class="cx"> auto cbor = CBORWriter::write(CBORValue(map));
</span><del>- ASSERT_TRUE(cbor.has_value());
</del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), kNestedMapTestCase, \
sizeof(kNestedMapTestCase))); </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& testCase : kSimpleTestCase) {
</span><span class="cx"> auto cbor = \
CBORWriter::write(CBORValue(testCase.simpleValue)); </span><del>- \
ASSERT_TRUE(cbor.has_value()); </del><ins>+ ASSERT_TRUE(cbor.hasValue());
</ins><span class="cx"> EXPECT_TRUE(eq(cbor.value(), testCase.cbor));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -370,18 +370,18 @@
</span><span class="cx"> const CBORValue singleLayerCborMap = \
CBORValue(simpleMap); </span><span class="cx"> const CBORValue \
singleLayerCborArray = CBORValue(simpleArray); </span><span class="cx">
</span><del>- EXPECT_TRUE(CBORWriter::write(simpleUint, 0).has_value());
- EXPECT_TRUE(CBORWriter::write(simpleString, 0).has_value());
- EXPECT_TRUE(CBORWriter::write(simpleBytestring, 0).has_value());
</del><ins>+ EXPECT_TRUE(CBORWriter::write(simpleUint, 0).hasValue());
+ EXPECT_TRUE(CBORWriter::write(simpleString, 0).hasValue());
+ EXPECT_TRUE(CBORWriter::write(simpleBytestring, 0).hasValue());
</ins><span class="cx">
</span><del>- EXPECT_TRUE(CBORWriter::write(emptyArrayValue, 0).has_value());
- EXPECT_TRUE(CBORWriter::write(emptyMapValue, 0).has_value());
</del><ins>+ EXPECT_TRUE(CBORWriter::write(emptyArrayValue, 0).hasValue());
+ EXPECT_TRUE(CBORWriter::write(emptyMapValue, 0).hasValue());
</ins><span class="cx">
</span><del>- EXPECT_FALSE(CBORWriter::write(singleLayerCborArray, \
0).has_value());
- EXPECT_TRUE(CBORWriter::write(singleLayerCborArray, 1).has_value());
</del><ins>+ EXPECT_FALSE(CBORWriter::write(singleLayerCborArray, 0).hasValue());
+ EXPECT_TRUE(CBORWriter::write(singleLayerCborArray, 1).hasValue());
</ins><span class="cx">
</span><del>- EXPECT_FALSE(CBORWriter::write(singleLayerCborMap, 0).has_value());
- EXPECT_TRUE(CBORWriter::write(singleLayerCborMap, 1).has_value());
</del><ins>+ EXPECT_FALSE(CBORWriter::write(singleLayerCborMap, 0).hasValue());
+ EXPECT_TRUE(CBORWriter::write(singleLayerCborMap, 1).hasValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Major type 5 nested CBOR map value with following \
structure. </span><span class="lines">@@ -396,8 +396,8 @@
</span><span class="cx"> nestedMap[CBORValue("c")] = CBORValue(2);
</span><span class="cx"> nestedMap[CBORValue("d")] = CBORValue(3);
</span><span class="cx"> cborMap[CBORValue("b")] = \
CBORValue(nestedMap); </span><del>- \
EXPECT_TRUE(CBORWriter::write(CBORValue(cborMap), 2).has_value());
- EXPECT_FALSE(CBORWriter::write(CBORValue(cborMap), 1).has_value());
</del><ins>+ EXPECT_TRUE(CBORWriter::write(CBORValue(cborMap), 2).hasValue());
+ EXPECT_FALSE(CBORWriter::write(CBORValue(cborMap), 1).hasValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Testing Write() function for following CBOR structure \
with depth of 3. </span><span class="lines">@@ -422,8 +422,8 @@
</span><span class="cx"> cborArray.append(CBORValue(3));
</span><span class="cx"> cborArray.append(CBORValue(cborMap));
</span><span class="cx">
</span><del>- EXPECT_TRUE(CBORWriter::write(CBORValue(cborArray), 3).has_value());
- EXPECT_FALSE(CBORWriter::write(CBORValue(cborArray), 2).has_value());
</del><ins>+ EXPECT_TRUE(CBORWriter::write(CBORValue(cborArray), 3).hasValue());
+ EXPECT_FALSE(CBORWriter::write(CBORValue(cborArray), 2).hasValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Testing Write() function for following CBOR structure.
</span><span class="lines">@@ -456,8 +456,8 @@
</span><span class="cx"> nestedMap[CBORValue("h")] = \
CBORValue(innerNestedMap); </span><span class="cx"> map[CBORValue("b")] \
= CBORValue(nestedMap); </span><span class="cx">
</span><del>- EXPECT_TRUE(CBORWriter::write(CBORValue(map), 5).has_value());
- EXPECT_FALSE(CBORWriter::write(CBORValue(map), 4).has_value());
</del><ins>+ EXPECT_TRUE(CBORWriter::write(CBORValue(map), 5).hasValue());
+ EXPECT_FALSE(CBORWriter::write(CBORValue(map), 4).hasValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreFileSystemcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp (239476 => 239477)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp 2018-12-21 00:38:25 UTC (rev \
239476)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp 2018-12-21 00:40:09 UTC \
(rev 239477) </span><span class="lines">@@ -129,12 +129,12 @@
</span><span class="cx"> TEST_F(FileSystemTest, GetFileMetadataSymlink)
</span><span class="cx"> {
</span><span class="cx"> auto symlinkMetadata = \
FileSystem::fileMetadata(tempFileSymlinkPath()); </span><del>- \
ASSERT_TRUE(symlinkMetadata.has_value()); </del><ins>+ \
ASSERT_TRUE(symlinkMetadata.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(symlinkMetadata.value().type == FileMetadata::Type::SymbolicLink); \
</span><span class="cx"> \
EXPECT_FALSE(static_cast<size_t>(symlinkMetadata.value().length) == \
strlen(FileSystemTestData)); </span><span class="cx">
</span><span class="cx"> auto targetMetadata = \
FileSystem::fileMetadataFollowingSymlinks(tempFileSymlinkPath()); </span><del>- \
ASSERT_TRUE(targetMetadata.has_value()); </del><ins>+ \
ASSERT_TRUE(targetMetadata.hasValue()); </ins><span class="cx"> \
EXPECT_TRUE(targetMetadata.value().type == FileMetadata::Type::File); </span><span \
class="cx"> EXPECT_EQ(strlen(FileSystemTestData), \
static_cast<size_t>(targetMetadata.value().length)); </span><span class="cx"> }
</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