Attachment 339418 Details for Bug 185256 – ROLLOUT of r231223

[patch] ROLLOUT of r231223

bug-185256-20180503123442.patch (text/plain), 20.44 KB, created by WebKit Commit Bot on 2018-05-03 09:34:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-05-03 09:34:42 PDT

Size: 20.44 KB

patch

obsolete

>Subversion Revision: 231307
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index f0f705544e654e89acc8635ea392675f720c1c1b..94545613a3255580ca62d4fb638c6f438bda0bf0 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-03  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231223 and r231288.
>+        https://bugs.webkit.org/show_bug.cgi?id=185256
>+
>+        The change in r231223 breaks internal builds, and r231288 is a
>+        dependent change. (Requested by ryanhaddad on #webkit).
>+
>+        Reverted changesets:
>+
>+        "Use default std::optional if it is provided"
>+        https://bugs.webkit.org/show_bug.cgi?id=185159
>+        https://trac.webkit.org/changeset/231223
>+
>+        "Use pointer instead of
>+        std::optional<std::reference_wrapper<>>"
>+        https://bugs.webkit.org/show_bug.cgi?id=185186
>+        https://trac.webkit.org/changeset/231288
>+
> 2018-05-02  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r231251.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bee00c2c6c681b3d725ec9f576ded3cec8bd05ff..9842893d862ff5adcd77a16cdf10816d9c581b3d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-03  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231223 and r231288.
>+        https://bugs.webkit.org/show_bug.cgi?id=185256
>+
>+        The change in r231223 breaks internal builds, and r231288 is a
>+        dependent change. (Requested by ryanhaddad on #webkit).
>+
>+        Reverted changesets:
>+
>+        "Use default std::optional if it is provided"
>+        https://bugs.webkit.org/show_bug.cgi?id=185159
>+        https://trac.webkit.org/changeset/231223
>+
>+        "Use pointer instead of
>+        std::optional<std::reference_wrapper<>>"
>+        https://bugs.webkit.org/show_bug.cgi?id=185186
>+        https://trac.webkit.org/changeset/231288
>+
> 2018-05-03  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r231253.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9cc3cda08395396b76fd652048968f6100860f59..a48a7c759a587e4b8465847c515856b060ee8fc3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-03  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231223 and r231288.
>+        https://bugs.webkit.org/show_bug.cgi?id=185256
>+
>+        The change in r231223 breaks internal builds, and r231288 is a
>+        dependent change. (Requested by ryanhaddad on #webkit).
>+
>+        Reverted changesets:
>+
>+        "Use default std::optional if it is provided"
>+        https://bugs.webkit.org/show_bug.cgi?id=185159
>+        https://trac.webkit.org/changeset/231223
>+
>+        "Use pointer instead of
>+        std::optional<std::reference_wrapper<>>"
>+        https://bugs.webkit.org/show_bug.cgi?id=185186
>+        https://trac.webkit.org/changeset/231288
>+
> 2018-05-03  Per Arne Vollan  <pvollan@apple.com>
> 
>         An error message is written to stderr when the WebContent process is blocking WindowServer access.
>diff --git a/Source/WTF/wtf/Expected.h b/Source/WTF/wtf/Expected.h
>index e9b0ec9f9e645eceedd6f40e42cf891405737a54..dd045e59875e4f4767eb2eb179c1c2719e0af2e2 100644
>--- a/Source/WTF/wtf/Expected.h
>+++ b/Source/WTF/wtf/Expected.h
>@@ -573,5 +573,5 @@ template<typename T, typename E> void swap(expected<T, E>& x, expected<T, E>& y)
> 
> }}} // namespace std::experimental::fundamentals_v3
> 
>-__EXPECTED_INLINE_VARIABLE constexpr auto& unexpect = std::experimental::unexpect;
>+__EXPECTED_INLINE_VARIABLE constexpr std::experimental::unexpected_t& unexpect = std::experimental::unexpect;
> template<class T, class E> using Expected = std::experimental::expected<T, E>;
>diff --git a/Source/WTF/wtf/Optional.h b/Source/WTF/wtf/Optional.h
>index aac45a71c1b2f343c8bfd615a226d1b2334831f5..a3fc58908345ac1b0a224bc2f179846916d9d2d7 100644
>--- a/Source/WTF/wtf/Optional.h
>+++ b/Source/WTF/wtf/Optional.h
>@@ -47,16 +47,6 @@
> # include <wtf/Compiler.h>
> # include <wtf/StdLibExtras.h>
> 
>-#if !COMPILER(MSVC) && __has_include(<optional>)
>-# include <optional>
>-#endif
>-
>-#if !COMPILER(MSVC) && defined(__cpp_lib_optional) && __cpp_lib_optional >= 201603
>-
>-// Use default std::optional.
>-
>-#else
>-
> # define TR2_OPTIONAL_REQUIRES(...) typename std::enable_if<__VA_ARGS__::value, bool>::type = false
> 
> # if defined __GNUC__ // NOTE: GNUC is also defined for Clang
>@@ -1022,6 +1012,20 @@ constexpr optional<X&> make_optional(std::reference_wrapper<X> v)
> 
> } // namespace std
> 
>+namespace WTF {
>+
>+// -- WebKit Additions --
>+template <class OptionalType, class Callback>
>+ALWAYS_INLINE
>+auto valueOrCompute(OptionalType optional, Callback callback) -> typename OptionalType::value_type
>+{
>+    if (optional)
>+        return *optional;
>+    return callback();
>+}
>+
>+} // namespace WTF
>+
> namespace std
> {
>   template <typename T>
>@@ -1050,20 +1054,4 @@ namespace std
> # undef TR2_OPTIONAL_REQUIRES
> # undef TR2_OPTIONAL_ASSERTED_EXPRESSION
> 
>-#endif // defined(__cpp_lib_optional)
>-
>-namespace WTF {
>-
>-// -- WebKit Additions --
>-template <class OptionalType, class Callback>
>-ALWAYS_INLINE
>-auto valueOrCompute(OptionalType optional, Callback callback) -> typename OptionalType::value_type
>-{
>-    if (optional)
>-        return *optional;
>-    return callback();
>-}
>-
>-} // namespace WTF
>-
> using WTF::valueOrCompute;
>diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
>index 0e3c4f603d94ffb1a59be64cf168795f7678a126..851c9c82af4097eed35f610c7acf5d25dbd44b35 100644
>--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
>+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
>@@ -301,7 +301,7 @@ void RTCPeerConnection::queuedAddIceCandidate(RTCIceCandidate* rtcCandidate, DOM
> }
> 
> // Implementation of https://w3c.github.io/webrtc-pc/#set-pc-configuration
>-static inline ExceptionOr<Vector<MediaEndpointConfiguration::IceServerInfo>> iceServersFromConfiguration(RTCConfiguration& newConfiguration, const RTCConfiguration* existingConfiguration, bool isLocalDescriptionSet)
>+static inline ExceptionOr<Vector<MediaEndpointConfiguration::IceServerInfo>> iceServersFromConfiguration(RTCConfiguration& newConfiguration, std::optional<const RTCConfiguration&> existingConfiguration, bool isLocalDescriptionSet)
> {
>     if (existingConfiguration && newConfiguration.bundlePolicy != existingConfiguration->bundlePolicy)
>         return Exception { InvalidModificationError, "IceTransportPolicy does not match existing policy" };
>@@ -342,7 +342,7 @@ ExceptionOr<void> RTCPeerConnection::initializeConfiguration(RTCConfiguration&&
> {
>     INFO_LOG(LOGIDENTIFIER);
> 
>-    auto servers = iceServersFromConfiguration(configuration, nullptr, false);
>+    auto servers = iceServersFromConfiguration(configuration, std::nullopt, false);
>     if (servers.hasException())
>         return servers.releaseException();
> 
>@@ -360,7 +360,7 @@ ExceptionOr<void> RTCPeerConnection::setConfiguration(RTCConfiguration&& configu
> 
>     INFO_LOG(LOGIDENTIFIER);
> 
>-    auto servers = iceServersFromConfiguration(configuration, &m_configuration, m_backend->isLocalDescriptionSet());
>+    auto servers = iceServersFromConfiguration(configuration, m_configuration, m_backend->isLocalDescriptionSet());
>     if (servers.hasException())
>         return servers.releaseException();
> 
>diff --git a/Source/WebCore/css/parser/CSSParser.cpp b/Source/WebCore/css/parser/CSSParser.cpp
>index 84138018651470f9751960ca6bca17c46519e2dc..954ab082e9e663b65ba145864c767acbd67d36d6 100644
>--- a/Source/WebCore/css/parser/CSSParser.cpp
>+++ b/Source/WebCore/css/parser/CSSParser.cpp
>@@ -178,14 +178,14 @@ Color CSSParser::parseColor(const String& string, bool strict)
>     return primitiveValue.color();
> }
> 
>-Color CSSParser::parseSystemColor(const String& string, const CSSParserContext* context)
>+Color CSSParser::parseSystemColor(const String& string, std::optional<const CSSParserContext&> context)
> {
>     CSSValueID id = cssValueKeywordID(string);
>     if (!StyleColor::isSystemColor(id))
>         return Color();
> 
>     OptionSet<StyleColor::Options> options;
>-    if (context && context->useSystemAppearance)
>+    if (context && context.value().useSystemAppearance)
>         options |= StyleColor::Options::UseSystemAppearance;
>     return RenderTheme::singleton().systemColor(id, options);
> }
>diff --git a/Source/WebCore/css/parser/CSSParser.h b/Source/WebCore/css/parser/CSSParser.h
>index 2930d45098a10ba197137713ea0bd6071302ae7b..d92fa5a76c3d0c66decbe838dacc44d25d5b4aa4 100644
>--- a/Source/WebCore/css/parser/CSSParser.h
>+++ b/Source/WebCore/css/parser/CSSParser.h
>@@ -78,7 +78,7 @@ public:
>     RefPtr<CSSValue> parseValueWithVariableReferences(CSSPropertyID, const CSSValue&, const CustomPropertyValueMap& customProperties, TextDirection, WritingMode);
> 
>     static Color parseColor(const String&, bool strict = false);
>-    static Color parseSystemColor(const String&, const CSSParserContext*);
>+    static Color parseSystemColor(const String&, std::optional<const CSSParserContext&>);
> 
> private:
>     ParseResult parseValue(MutableStyleProperties&, CSSPropertyID, const String&, bool important);
>diff --git a/Source/WebCore/dom/DatasetDOMStringMap.cpp b/Source/WebCore/dom/DatasetDOMStringMap.cpp
>index ec6315c960b5a77e7992b4c6d9e23af25725c015..f2d84207b97a3364954d730a10b488e3e383c648 100644
>--- a/Source/WebCore/dom/DatasetDOMStringMap.cpp
>+++ b/Source/WebCore/dom/DatasetDOMStringMap.cpp
>@@ -188,7 +188,7 @@ Vector<String> DatasetDOMStringMap::supportedPropertyNames() const
>     return names;
> }
> 
>-const AtomicString* DatasetDOMStringMap::item(const String& propertyName) const
>+std::optional<const AtomicString&> DatasetDOMStringMap::item(const String& propertyName) const
> {
>     if (m_element.hasAttributes()) {
>         AttributeIteratorAccessor attributeIteratorAccessor = m_element.attributesIterator();
>@@ -198,24 +198,22 @@ const AtomicString* DatasetDOMStringMap::item(const String& propertyName) const
>             // Building a new AtomicString in that case is overkill so we do a direct character comparison.
>             const Attribute& attribute = *attributeIteratorAccessor.begin();
>             if (propertyNameMatchesAttributeName(propertyName, attribute.localName()))
>-                return &attribute.value();
>+                return attribute.value();
>         } else {
>             AtomicString attributeName = convertPropertyNameToAttributeName(propertyName);
>             for (const Attribute& attribute : attributeIteratorAccessor) {
>                 if (attribute.localName() == attributeName)
>-                    return &attribute.value();
>+                    return attribute.value();
>             }
>         }
>     }
> 
>-    return nullptr;
>+    return std::nullopt;
> }
> 
> String DatasetDOMStringMap::namedItem(const AtomicString& name) const
> {
>-    if (const auto* value = item(name))
>-        return *value;
>-    return String { };
>+    return item(name).value_or(String { });
> }
> 
> ExceptionOr<void> DatasetDOMStringMap::setNamedItem(const String& name, const String& value)
>diff --git a/Source/WebCore/dom/DatasetDOMStringMap.h b/Source/WebCore/dom/DatasetDOMStringMap.h
>index 9100db8c88ccade140eebd35a4a0e599c5ba115e..483f763cc16cf9641bea53f4dbe69b483ba1b7d3 100644
>--- a/Source/WebCore/dom/DatasetDOMStringMap.h
>+++ b/Source/WebCore/dom/DatasetDOMStringMap.h
>@@ -53,7 +53,7 @@ public:
>     Element& element() { return m_element; }
> 
> private:
>-    const AtomicString* item(const String& name) const;
>+    std::optional<const AtomicString&> item(const String& name) const;
> 
>     Element& m_element;
> };
>diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
>index 3a7a4e8592545330a5890a6d57a447649b2987ce..4d17f579cda6078ee4d8a7a4ca23f525ba0446d1 100644
>--- a/Source/WebCore/dom/Element.cpp
>+++ b/Source/WebCore/dom/Element.cpp
>@@ -3732,7 +3732,7 @@ static ExceptionOr<Ref<Element>> contextElementForInsertion(const String& where,
> }
> 
> // https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml
>-ExceptionOr<void> Element::insertAdjacentHTML(const String& where, const String& markup, NodeVector* addedNodes)
>+ExceptionOr<void> Element::insertAdjacentHTML(const String& where, const String& markup, std::optional<NodeVector&> addedNodes)
> {
>     // Steps 1 and 2.
>     auto contextElement = contextElementForInsertion(where, *this);
>@@ -3758,7 +3758,7 @@ ExceptionOr<void> Element::insertAdjacentHTML(const String& where, const String&
> 
> ExceptionOr<void> Element::insertAdjacentHTML(const String& where, const String& markup)
> {
>-    return insertAdjacentHTML(where, markup, nullptr);
>+    return insertAdjacentHTML(where, markup, std::nullopt);
> }
> 
> ExceptionOr<void> Element::insertAdjacentText(const String& where, const String& text)
>diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h
>index 1c4db86823c6e41ec5fc3ab3f20194516eaffa06..9e52d3315539945465703214117d7b206a3f2aa3 100644
>--- a/Source/WebCore/dom/Element.h
>+++ b/Source/WebCore/dom/Element.h
>@@ -314,7 +314,7 @@ public:
>     WEBCORE_EXPORT void setTabIndex(int);
>     virtual RefPtr<Element> focusDelegate();
> 
>-    ExceptionOr<void> insertAdjacentHTML(const String& where, const String& html, NodeVector* addedNodes);
>+    ExceptionOr<void> insertAdjacentHTML(const String& where, const String& html, std::optional<NodeVector&> addedNodes);
> 
>     WEBCORE_EXPORT ExceptionOr<Element*> insertAdjacentElement(const String& where, Element& newChild);
>     WEBCORE_EXPORT ExceptionOr<void> insertAdjacentHTML(const String& where, const String& html);
>diff --git a/Source/WebCore/html/canvas/CanvasStyle.cpp b/Source/WebCore/html/canvas/CanvasStyle.cpp
>index aca8a60d8c62b3ece8aaed4853a59001829bc1da..ff49ad108defd88d6f7388246d181c000b67837d 100644
>--- a/Source/WebCore/html/canvas/CanvasStyle.cpp
>+++ b/Source/WebCore/html/canvas/CanvasStyle.cpp
>@@ -53,7 +53,7 @@ static Color parseColor(const String& colorString)
>     Color color = CSSParser::parseColor(colorString);
>     if (color.isValid())
>         return color;
>-    return CSSParser::parseSystemColor(colorString, nullptr);
>+    return CSSParser::parseSystemColor(colorString, std::nullopt);
> }
> 
> Color currentColor(HTMLCanvasElement* canvas)
>diff --git a/Source/WebCore/inspector/DOMEditor.cpp b/Source/WebCore/inspector/DOMEditor.cpp
>index e0af0fdecc7f3861a9234fafe1a21ec8102868c3..3493b017ca06b9f29762327fa31353db8f958698 100644
>--- a/Source/WebCore/inspector/DOMEditor.cpp
>+++ b/Source/WebCore/inspector/DOMEditor.cpp
>@@ -266,7 +266,7 @@ private:
> 
>     ExceptionOr<void> redo() final
>     {
>-        auto result = m_element->insertAdjacentHTML(m_position, m_html, &m_addedNodes);
>+        auto result = m_element->insertAdjacentHTML(m_position, m_html, m_addedNodes);
>         if (result.hasException())
>             return result.releaseException();
>         return { };
>diff --git a/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp b/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp
>index 889892dce319b7a9771e0975d80d33453e6dbc85..84f5e2b942b8a21cc2c4500fc35e11df095a66e8 100644
>--- a/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp
>+++ b/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp
>@@ -69,15 +69,15 @@ void CurlFormDataStream::clean()
>     }
> }
> 
>-const Vector<char>* CurlFormDataStream::getPostData()
>+std::optional<const Vector<char>&> CurlFormDataStream::getPostData()
> {
>     if (!m_formData)
>-        return nullptr;
>+        return std::nullopt;
> 
>     if (!m_postData)
>         m_postData = std::make_unique<Vector<char>>(m_formData->flatten());
> 
>-    return m_postData.get();
>+    return *m_postData;
> }
> 
> bool CurlFormDataStream::shouldUseChunkTransfer()
>diff --git a/Source/WebCore/platform/network/curl/CurlFormDataStream.h b/Source/WebCore/platform/network/curl/CurlFormDataStream.h
>index 4f1b3081208416f7d35933efd8c2f46744781ba0..d1ca1ad5f00a676ffae209602767db26b59b00d1 100644
>--- a/Source/WebCore/platform/network/curl/CurlFormDataStream.h
>+++ b/Source/WebCore/platform/network/curl/CurlFormDataStream.h
>@@ -41,7 +41,7 @@ public:
> 
>     size_t elementSize() { return m_formData ? m_formData->elements().size() : 0; }
> 
>-    const Vector<char>* getPostData();
>+    std::optional<const Vector<char>&> getPostData();
>     bool shouldUseChunkTransfer();
>     unsigned long long totalSize();
> 
>diff --git a/Source/WebCore/platform/network/curl/CurlRequest.cpp b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>index f2d0c9b670e94c4a1d43c01bacc2b27959cd9743..0335a67b958b70078bf92eb31d141af91244b196 100644
>--- a/Source/WebCore/platform/network/curl/CurlRequest.cpp
>+++ b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>@@ -489,7 +489,7 @@ void CurlRequest::setupPOST(ResourceRequest& request)
> 
>     // Do not stream for simple POST data
>     if (elementSize == 1) {
>-        const auto* postData = m_formDataStream.getPostData();
>+        auto postData = m_formDataStream.getPostData();
>         if (postData && postData->size())
>             m_curlHandle->setPostFields(postData->data(), postData->size());
>     } else
>diff --git a/Source/WebCore/testing/MockCDMFactory.cpp b/Source/WebCore/testing/MockCDMFactory.cpp
>index e2fdfbc1ca4ca1b1eb58bc875990da9a4d96c6bc..95f7e6bdb28c85fe66f04e27800052d74389e7ad 100644
>--- a/Source/WebCore/testing/MockCDMFactory.cpp
>+++ b/Source/WebCore/testing/MockCDMFactory.cpp
>@@ -81,12 +81,12 @@ Vector<Ref<SharedBuffer>> MockCDMFactory::removeKeysFromSessionWithID(const Stri
>     return WTFMove(it->value);
> }
> 
>-const Vector<Ref<SharedBuffer>>* MockCDMFactory::keysForSessionWithID(const String& id) const
>+std::optional<const Vector<Ref<SharedBuffer>>&> MockCDMFactory::keysForSessionWithID(const String& id) const
> {
>     auto it = m_sessions.find(id);
>     if (it == m_sessions.end())
>-        return nullptr;
>-    return &it->value;
>+        return std::nullopt;
>+    return it->value;
> }
> 
> void MockCDMFactory::setSupportedDataTypes(Vector<String>&& types)
>@@ -314,7 +314,7 @@ void MockCDMInstance::updateLicense(const String& sessionID, LicenseType, const
> 
>     std::optional<KeyStatusVector> changedKeys;
>     if (responseVector.contains(String(ASCIILiteral("keys-changed")))) {
>-        const auto* keys = factory->keysForSessionWithID(sessionID);
>+        std::optional<const Vector<Ref<SharedBuffer>>&> keys = factory->keysForSessionWithID(sessionID);
>         if (keys) {
>             KeyStatusVector keyStatusVector;
>             keyStatusVector.reserveInitialCapacity(keys->size());
>diff --git a/Source/WebCore/testing/MockCDMFactory.h b/Source/WebCore/testing/MockCDMFactory.h
>index 418d390bf06d7fb7ddf90ea78435abadb5aaedd8..237b2b36426330bc75a04df350e081ab78861843 100644
>--- a/Source/WebCore/testing/MockCDMFactory.h
>+++ b/Source/WebCore/testing/MockCDMFactory.h
>@@ -73,7 +73,7 @@ public:
>     bool hasSessionWithID(const String& id) { return m_sessions.contains(id); }
>     void removeSessionWithID(const String& id) { m_sessions.remove(id); }
>     void addKeysToSessionWithID(const String& id, Vector<Ref<SharedBuffer>>&&);
>-    const Vector<Ref<SharedBuffer>>* keysForSessionWithID(const String& id) const;
>+    std::optional<const Vector<Ref<SharedBuffer>>&> keysForSessionWithID(const String& id) const;
>     Vector<Ref<SharedBuffer>> removeKeysFromSessionWithID(const String& id);
> 
> private:
>diff --git a/Source/WebKit/Shared/SandboxExtension.h b/Source/WebKit/Shared/SandboxExtension.h
>index cb53aade63e39f32e2bf62678de7c3cb942df382..1f76808564ed4db6e5c0ce1eb63021171e90ed1b 100644
>--- a/Source/WebKit/Shared/SandboxExtension.h
>+++ b/Source/WebKit/Shared/SandboxExtension.h
>@@ -120,7 +120,7 @@ private:
> inline SandboxExtension::Handle::Handle() { }
> inline SandboxExtension::Handle::~Handle() { }
> inline void SandboxExtension::Handle::encode(IPC::Encoder&) const { }
>-inline std::optional<SandboxExtension::Handle> SandboxExtension::Handle::decode(IPC::Decoder&) { return SandboxExtension::Handle { }; }
>+inline std::optional<SandboxExtension::Handle> SandboxExtension::Handle::decode(IPC::Decoder&) { return {{ }}; }
> inline SandboxExtension::HandleArray::HandleArray() { }
> inline SandboxExtension::HandleArray::~HandleArray() { }
> inline void SandboxExtension::HandleArray::allocate(size_t) { }
>diff --git a/Source/WebKit/Shared/TouchBarMenuItemData.cpp b/Source/WebKit/Shared/TouchBarMenuItemData.cpp
>index 3cdee82d0adf3435c8ed9cfcd7dbd4639f810180..d0226bb9a9ec1bae1835bbdde1348c12866bd103 100644
>--- a/Source/WebKit/Shared/TouchBarMenuItemData.cpp
>+++ b/Source/WebKit/Shared/TouchBarMenuItemData.cpp
>@@ -65,7 +65,7 @@ std::optional<TouchBarMenuItemData> TouchBarMenuItemData::decode(IPC::Decoder& d
>     if (!decoder.decode(result.priority))
>         return std::nullopt;
>     
>-    return std::make_optional(WTFMove(result));
>+    return WTFMove(result);
> }
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 185256: 339418