<!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>[209326] trunk/Source</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/209326">209326</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-05 11:02:17 -0800 (Mon, 05 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/208985">r208985</a>): SafariForWebKitDevelopment Symbol Not Found looking for method with WTF::Optional
https://bugs.webkit.org/show_bug.cgi?id=165351
Reviewed by Yusuke Suzuki.
Source/JavaScriptCore:
Some versions of Safari expect:
Inspector::BackendDispatcher::reportProtocolError(WTF::Optional<long>, Inspector::BackendDispatcher::CommonErrorCode, WTF::String const&)
Which we had updated to use std::optional. Expose a version with the original
Symbol for these Safaris. This stub will just call through to the new version.
* inspector/InspectorBackendDispatcher.cpp:
(Inspector::BackendDispatcher::reportProtocolError):
* inspector/InspectorBackendDispatcher.h:
Source/WTF:
Include a slimmed down version of WTF::Optional which older versions
of Safari still depend on for a JavaScriptCore exported symbol.
To prevent misuse name it WTF::DeprecatedOptional and use it only in
the one instance it is needed.
* WTF.xcodeproj/project.pbxproj:
* wtf/DeprecatedOptional.h: Added.
(WTF::Optional::operator bool):
(WTF::Optional::value):
(WTF::Optional::asPtr):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfDeprecatedOptionalh">trunk/Source/WTF/wtf/DeprecatedOptional.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209325 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-05 18:19:25 UTC (rev 209325)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r208985): SafariForWebKitDevelopment Symbol Not Found looking for method with WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=165351
+
+ Reviewed by Yusuke Suzuki.
+
+ Some versions of Safari expect:
+
+ Inspector::BackendDispatcher::reportProtocolError(WTF::Optional<long>, Inspector::BackendDispatcher::CommonErrorCode, WTF::String const&)
+
+ Which we had updated to use std::optional. Expose a version with the original
+ Symbol for these Safaris. This stub will just call through to the new version.
+
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::BackendDispatcher::reportProtocolError):
+ * inspector/InspectorBackendDispatcher.h:
+
</ins><span class="cx"> 2016-12-05 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Add __STDC_FORMAT_MACROS before inttypes.h is included
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (209325 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2016-12-05 18:19:25 UTC (rev 209325)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -265,6 +265,16 @@
</span><span class="cx"> m_protocolErrors.append(std::tuple<CommonErrorCode, String>(errorCode, errorMessage));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+void BackendDispatcher::reportProtocolError(WTF::DeprecatedOptional<long> relatedRequestId, CommonErrorCode errorCode, const String& errorMessage)
+{
+ if (relatedRequestId)
+ reportProtocolError(relatedRequestId.value(), errorCode, errorMessage);
+ else
+ reportProtocolError(std::nullopt, errorCode, errorMessage);
+}
+#endif
+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> T BackendDispatcher::getPropertyValue(InspectorObject* object, const String& name, bool* out_optionalValueFound, T defaultValue, std::function<bool(InspectorValue&, T&)> asMethod, const char* typeName)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h (209325 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2016-12-05 18:19:25 UTC (rev 209325)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorFrontendRouter.h"
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <wtf/DeprecatedOptional.h>
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -104,6 +105,11 @@
</span><span class="cx"> private:
</span><span class="cx"> BackendDispatcher(Ref<FrontendRouter>&&);
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ // This is necessary for some versions of Safari. Remove it when those versions of Safari are no longer supported.
+ void reportProtocolError(WTF::DeprecatedOptional<long> relatedRequestId, CommonErrorCode, const String& errorMessage);
+#endif
+
</ins><span class="cx"> Ref<FrontendRouter> m_frontendRouter;
</span><span class="cx"> HashMap<String, SupplementalBackendDispatcher*> m_dispatchers;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (209325 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-12-05 18:19:25 UTC (rev 209325)
+++ trunk/Source/WTF/ChangeLog 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r208985): SafariForWebKitDevelopment Symbol Not Found looking for method with WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=165351
+
+ Reviewed by Yusuke Suzuki.
+
+ Include a slimmed down version of WTF::Optional which older versions
+ of Safari still depend on for a JavaScriptCore exported symbol.
+ To prevent misuse name it WTF::DeprecatedOptional and use it only in
+ the one instance it is needed.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/DeprecatedOptional.h: Added.
+ (WTF::Optional::operator bool):
+ (WTF::Optional::value):
+ (WTF::Optional::asPtr):
+
</ins><span class="cx"> 2016-12-05 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Add __STDC_FORMAT_MACROS before inttypes.h is included
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (209325 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-05 18:19:25 UTC (rev 209325)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> 9BD8F40B176C2B470002D865 /* AtomicStringTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD8F40A176C2AD80002D865 /* AtomicStringTable.h */; };
</span><span class="cx"> A5098B001C169E0700087797 /* SandboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A5098AFF1C169E0700087797 /* SandboxSPI.h */; };
</span><span class="cx"> A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A5098B011C16A4F900087797 /* SecuritySPI.h */; };
</span><ins>+ A561F3101DF2642100FF675D /* DeprecatedOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = A561F30F1DF2642100FF675D /* DeprecatedOptional.h */; };
</ins><span class="cx"> A5BA15F3182433A900A82E69 /* StringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F2182433A900A82E69 /* StringMac.mm */; };
</span><span class="cx"> A5BA15F51824348000A82E69 /* StringImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F41824348000A82E69 /* StringImplMac.mm */; };
</span><span class="cx"> A5BA15FA182435A600A82E69 /* AtomicStringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */; };
</span><span class="lines">@@ -528,6 +529,7 @@
</span><span class="cx"> 9C67C542589348E285B49699 /* IndexedContainerIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexedContainerIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> A5098AFF1C169E0700087797 /* SandboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> A5098B011C16A4F900087797 /* SecuritySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecuritySPI.h; sourceTree = "<group>"; };
</span><ins>+ A561F30F1DF2642100FF675D /* DeprecatedOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedOptional.h; sourceTree = "<group>"; };
</ins><span class="cx"> A5BA15F2182433A900A82E69 /* StringMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringMac.mm; path = mac/StringMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5BA15F41824348000A82E69 /* StringImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringImplMac.mm; path = mac/StringImplMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AtomicStringImplCF.cpp; path = cf/AtomicStringImplCF.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -914,6 +916,7 @@
</span><span class="cx"> A8A4727B151A825A004123FF /* DecimalNumber.cpp */,
</span><span class="cx"> A8A4727C151A825A004123FF /* DecimalNumber.h */,
</span><span class="cx"> 0F2B66A417B6B4F700A7AE3F /* DeferrableRefCounted.h */,
</span><ins>+ A561F30F1DF2642100FF675D /* DeprecatedOptional.h */,
</ins><span class="cx"> A8A4727E151A825A004123FF /* Deque.h */,
</span><span class="cx"> A8A4727F151A825A004123FF /* DisallowCType.h */,
</span><span class="cx"> 0F4570421BE5B58F0062A629 /* Dominators.h */,
</span><span class="lines">@@ -1431,6 +1434,7 @@
</span><span class="cx"> A8A47417151A825B004123FF /* RedBlackTree.h in Headers */,
</span><span class="cx"> 26299B6E17A9E5B800ADEBE5 /* Ref.h in Headers */,
</span><span class="cx"> A8A47418151A825B004123FF /* RefCounted.h in Headers */,
</span><ins>+ A561F3101DF2642100FF675D /* DeprecatedOptional.h in Headers */,
</ins><span class="cx"> A8A47419151A825B004123FF /* RefCountedArray.h in Headers */,
</span><span class="cx"> A8A4741B151A825B004123FF /* RefCountedLeakCounter.h in Headers */,
</span><span class="cx"> 86F46F611A2840EE00CCBF22 /* RefCounter.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfDeprecatedOptionalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/DeprecatedOptional.h (0 => 209326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DeprecatedOptional.h (rev 0)
+++ trunk/Source/WTF/wtf/DeprecatedOptional.h 2016-12-05 19:02:17 UTC (rev 209326)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// This file contains a deprecated version of WTF::Optional which a released
+// version of Safari uses. Once Safari stops using this, we can remove this.
+// New code should use std::optional.
+
+#pragma once
+
+#include <type_traits>
+
+namespace WTF {
+
+template<typename T>
+class Optional {
+public:
+ explicit operator bool() const { return m_isEngaged; }
+ T& value() { return *asPtr(); }
+
+private:
+ T* asPtr() { return reinterpret_cast<T*>(&m_value); }
+
+ bool m_isEngaged;
+ typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_value;
+};
+
+template<typename T> using DeprecatedOptional = WTF::Optional<T>;
+
+} // namespace WTF
</ins></span></pre>
</div>
</div>
</body>
</html>