<!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>[207627] 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/207627">207627</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 11:27:28 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
https://bugs.webkit.org/show_bug.cgi?id=163713
Reviewed by Dan Bernstein.
Source/WebCore:
Switch uses of WTF::visit to use WTF::switchOn.
* dom/MessageEvent.cpp:
(WebCore::MessageEvent::source):
* dom/Node.cpp:
(WebCore::nodeSetPreTransformedFromNodeOrStringVector):
(WebCore::Node::convertNodesOrStringsIntoNode):
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::add):
* html/track/TrackEvent.cpp:
(WebCore::TrackEvent::TrackEvent):
* testing/TypeConversions.h:
(WebCore::TypeConversions::typeConversionsDictionaryUnionType):
Source/WTF:
- Add WTF::switchOn which merges WTF::visit with WTF::makeVisitor in the following
way:
WTF::visit(WTF::makeVisitor(...), variant)
* wtf/Variant.h:
(WTF::switchOn):
Tools:
* TestWebKitAPI/Tests/WTF/Variant.cpp:
Add test for WTF::switchOn()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfVarianth">trunk/Source/WTF/wtf/Variant.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventcpp">trunk/Source/WebCore/dom/MessageEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTrackEventcpp">trunk/Source/WebCore/html/track/TrackEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingTypeConversionsh">trunk/Source/WebCore/testing/TypeConversions.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFVariantcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Variant.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WTF/ChangeLog 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Sam Weinig <sam@webkit.org>
+
+ Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
+ https://bugs.webkit.org/show_bug.cgi?id=163713
+
+ Reviewed by Dan Bernstein.
+
+ - Add WTF::switchOn which merges WTF::visit with WTF::makeVisitor in the following
+ way:
+ WTF::visit(WTF::makeVisitor(...), variant)
+
+ * wtf/Variant.h:
+ (WTF::switchOn):
+
</ins><span class="cx"> 2016-10-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Revert r207151
</span></span></pre></div>
<a id="trunkSourceWTFwtfVarianth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Variant.h (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Variant.h 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WTF/wtf/Variant.h 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include <type_traits>
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/Compiler.h>
</span><ins>+#include <wtf/StdLibExtras.h>
</ins><span class="cx">
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> #pragma warning(push)
</span><span class="lines">@@ -2040,6 +2041,14 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// -- WebKit Additions --
+
+template<class V, class... F>
+auto switchOn(V&& v, F&&... f) -> decltype(visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v)))
+{
+ return visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v));
+}
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> namespace std {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-20 Sam Weinig <sam@webkit.org>
+
+ Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
+ https://bugs.webkit.org/show_bug.cgi?id=163713
+
+ Reviewed by Dan Bernstein.
+
+ Switch uses of WTF::visit to use WTF::switchOn.
+
+ * dom/MessageEvent.cpp:
+ (WebCore::MessageEvent::source):
+ * dom/Node.cpp:
+ (WebCore::nodeSetPreTransformedFromNodeOrStringVector):
+ (WebCore::Node::convertNodesOrStringsIntoNode):
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::add):
+ * html/track/TrackEvent.cpp:
+ (WebCore::TrackEvent::TrackEvent):
+ * testing/TypeConversions.h:
+ (WebCore::TypeConversions::typeConversionsDictionaryUnionType):
+
</ins><span class="cx"> 2016-10-20 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix font family parsing and add CSS region property parsing
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.cpp (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.cpp 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/dom/MessageEvent.cpp 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -172,12 +172,10 @@
</span><span class="cx"> if (!m_source)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto visitor = WTF::makeVisitor(
</del><ins>+ return WTF::switchOn(m_source.value(),
</ins><span class="cx"> [](const RefPtr<DOMWindow>& window) -> EventTarget* { return const_cast<EventTarget*>(static_cast<const EventTarget*>(window.get())); },
</span><span class="cx"> [](const RefPtr<MessagePort>& messagePort) -> EventTarget* { return const_cast<EventTarget*>(static_cast<const EventTarget*>(messagePort.get())); }
</span><span class="cx"> );
</span><del>-
- return WTF::visit(visitor, m_source.value());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<SerializedScriptValue> MessageEvent::trySerializeData(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -438,15 +438,13 @@
</span><span class="cx"> static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringVector(const Vector<NodeOrString>& vector)
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<Node>> nodeSet;
</span><ins>+ for (const auto& variant : vector) {
+ WTF::switchOn(variant,
+ [&](const RefPtr<Node>& node) { nodeSet.add(const_cast<Node*>(node.get())); },
+ [](const String&) { }
+ );
+ }
</ins><span class="cx">
</span><del>- auto visitor = WTF::makeVisitor(
- [&](const RefPtr<Node>& node) { nodeSet.add(const_cast<Node*>(node.get())); },
- [](const String&) { }
- );
-
- for (const auto& variant : vector)
- WTF::visit(visitor, variant);
-
</del><span class="cx"> return nodeSet;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -475,15 +473,13 @@
</span><span class="cx">
</span><span class="cx"> Vector<Ref<Node>> nodes;
</span><span class="cx"> nodes.reserveInitialCapacity(nodeOrStringVector.size());
</span><ins>+ for (auto& variant : nodeOrStringVector) {
+ WTF::switchOn(variant,
+ [&](RefPtr<Node>& node) { nodes.uncheckedAppend(*node.get()); },
+ [&](String& string) { nodes.uncheckedAppend(Text::create(document(), string)); }
+ );
+ }
</ins><span class="cx">
</span><del>- auto visitor = WTF::makeVisitor(
- [&](RefPtr<Node>& node) { nodes.uncheckedAppend(*node.get()); },
- [&](String& string) { nodes.uncheckedAppend(Text::create(document(), string)); }
- );
-
- for (auto& variant : nodeOrStringVector)
- WTF::visit(visitor, variant);
-
</del><span class="cx"> if (nodes.size() == 1)
</span><span class="cx"> return WTFMove(nodes.first());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -225,16 +225,14 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLElement* beforeElement = nullptr;
</span><span class="cx"> if (before) {
</span><del>- auto visitor = WTF::makeVisitor(
</del><ins>+ beforeElement = WTF::switchOn(before.value(),
</ins><span class="cx"> [](const RefPtr<HTMLElement>& element) -> HTMLElement* { return element.get(); },
</span><span class="cx"> [this](int index) -> HTMLElement* { return item(index); }
</span><span class="cx"> );
</span><del>-
- beforeElement = WTF::visit(visitor, before.value());
</del><span class="cx"> }
</span><del>- HTMLElement& toInsert = WTF::visit([](const auto& htmlElement) -> HTMLElement& {
- return *htmlElement;
- }, element);
</del><ins>+ HTMLElement& toInsert = WTF::switchOn(element,
+ [](const auto& htmlElement) -> HTMLElement& { return *htmlElement; }
+ );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTrackEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TrackEvent.cpp (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TrackEvent.cpp 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/html/track/TrackEvent.cpp 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> : Event(type, initializer, isTrusted)
</span><span class="cx"> {
</span><span class="cx"> if (initializer.track) {
</span><del>- m_track = WTF::visit([](const auto& trackbase) -> TrackBase* {
- return trackbase.get();
- }, *initializer.track);
</del><ins>+ m_track = WTF::switchOn(*initializer.track,
+ [](const auto& trackbase) -> TrackBase* { return trackbase.get(); }
+ );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingTypeConversionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/TypeConversions.h (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/TypeConversions.h 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Source/WebCore/testing/TypeConversions.h 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -111,11 +111,11 @@
</span><span class="cx"> Vector<String> typeConversionsDictionarySequenceValue() { return m_typeConversionsDictionarySequenceValue; }
</span><span class="cx"> UnionType typeConversionsDictionaryUnionType()
</span><span class="cx"> {
</span><del>- return WTF::visit(WTF::makeVisitor(
</del><ins>+ return WTF::switchOn(m_typeConversionsDictionaryUnionValue,
</ins><span class="cx"> [](const RefPtr<Node>&) -> UnionType { return UnionType::Node; },
</span><span class="cx"> [](const Vector<String>&) -> UnionType { return UnionType::Sequence; },
</span><span class="cx"> [](const OtherDictionary&) -> UnionType { return UnionType::Dictionary; }
</span><del>- ), m_typeConversionsDictionaryUnionValue);
</del><ins>+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Tools/ChangeLog 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-20 Sam Weinig <sam@webkit.org>
+
+ Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
+ https://bugs.webkit.org/show_bug.cgi?id=163713
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WTF/Variant.cpp:
+ Add test for WTF::switchOn()
+
</ins><span class="cx"> 2016-10-20 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [CMake] CMake does not support the dep files for implicit dependency
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFVariantcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Variant.cpp (207626 => 207627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Variant.cpp 2016-10-20 18:06:29 UTC (rev 207626)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Variant.cpp 2016-10-20 18:27:28 UTC (rev 207627)
</span><span class="lines">@@ -141,6 +141,44 @@
</span><span class="cx"> EXPECT_TRUE(Type::String == type);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_Variant, VisitorUsingSwitchOn)
+{
+ enum class Type {
+ None,
+ Int,
+ Float,
+ String,
+ };
+
+ Type type = Type::None;
+
+ Variant<int, float, String> variant = 8;
+ type = WTF::switchOn(variant,
+ [](int) { return Type::Int; },
+ [](float) { return Type::Float; },
+ [](String) { return Type::String; }
+ );
+ EXPECT_TRUE(Type::Int == type);
+
+
+ variant = 1.0f;
+ type = WTF::switchOn(variant,
+ [](int) { return Type::Int; },
+ [](float) { return Type::Float; },
+ [](String) { return Type::String; }
+ );
+ EXPECT_TRUE(Type::Float == type);
+
+
+ variant = "hello";
+ type = WTF::switchOn(variant,
+ [](int) { return Type::Int; },
+ [](float) { return Type::Float; },
+ [](String) { return Type::String; }
+ );
+ EXPECT_TRUE(Type::String == type);
+}
+
</ins><span class="cx"> TEST(WTF_Variant, ConstructorDestructor)
</span><span class="cx"> {
</span><span class="cx"> ConstructorDestructorCounter::TestingScope scope;
</span></span></pre>
</div>
</div>
</body>
</html>