<!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>[205313] 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/205313">205313</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-09-01 13:40:23 -0700 (Thu, 01 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>add BlockPtr::fromCallable
https://bugs.webkit.org/show_bug.cgi?id=161504
Reviewed by Tim Horton.
Source/WTF:
BlockPtr::fromCallable lets you create an Objective-C block from any callable object - including lambdas that contain move-only types.
The block will be allocated on the heap so it doesn't ever need to be copied (which is how it can work with move-only types).
* wtf/BlockPtr.h:
Tools:
Add a test.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WTF/BlockPtr.mm: Added.
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfBlockPtrh">trunk/Source/WTF/wtf/BlockPtr.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWTFBlockPtrmm">trunk/Tools/TestWebKitAPI/Tests/WTF/BlockPtr.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205312 => 205313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-01 20:33:31 UTC (rev 205312)
+++ trunk/Source/WTF/ChangeLog 2016-09-01 20:40:23 UTC (rev 205313)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-01 Anders Carlsson <andersca@apple.com>
+
+ add BlockPtr::fromCallable
+ https://bugs.webkit.org/show_bug.cgi?id=161504
+
+ Reviewed by Tim Horton.
+
+ BlockPtr::fromCallable lets you create an Objective-C block from any callable object - including lambdas that contain move-only types.
+ The block will be allocated on the heap so it doesn't ever need to be copied (which is how it can work with move-only types).
+
+ * wtf/BlockPtr.h:
+
</ins><span class="cx"> 2016-08-31 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
</span></span></pre></div>
<a id="trunkSourceWTFwtfBlockPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/BlockPtr.h (205312 => 205313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/BlockPtr.h 2016-09-01 20:33:31 UTC (rev 205312)
+++ trunk/Source/WTF/wtf/BlockPtr.h 2016-09-01 20:40:23 UTC (rev 205313)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef BlockPtr_h
-#define BlockPtr_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <Block.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="lines">@@ -31,17 +30,77 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+extern "C" void* _NSConcreteMallocBlock[32];
+
</ins><span class="cx"> template<typename> class BlockPtr;
</span><span class="cx">
</span><span class="cx"> template<typename R, typename... Args>
</span><span class="cx"> class BlockPtr<R (Args...)> {
</span><span class="cx"> public:
</span><ins>+ using BlockType = R (^)(Args...);
+
+ template<typename F>
+ static BlockPtr fromCallable(F function)
+ {
+ struct Descriptor {
+ uintptr_t reserved;
+ uintptr_t size;
+ void (*copy)(void *dst, const void *src);
+ void (*dispose)(const void *);
+ };
+
+ struct Block {
+ void* isa;
+ int32_t flags;
+ int32_t reserved;
+ R (*invoke)(void *, Args...);
+ const struct Descriptor* descriptor;
+ F f;
+ };
+
+ static const Descriptor descriptor {
+ 0,
+ sizeof(Block),
+
+ // We keep the copy function null - the block is already on the heap
+ // so it should never be copied.
+ nullptr,
+
+ [](const void* ptr) {
+ static_cast<Block*>(const_cast<void*>(ptr))->f.~F();
+ }
+ };
+
+ Block* block = static_cast<Block*>(malloc(sizeof(Block)));
+ block->isa = _NSConcreteMallocBlock;
+
+ enum {
+ BLOCK_NEEDS_FREE = (1 << 24),
+ BLOCK_HAS_COPY_DISPOSE = (1 << 25),
+ };
+ const unsigned retainCount = 1;
+
+ block->flags = BLOCK_HAS_COPY_DISPOSE | BLOCK_NEEDS_FREE | (retainCount << 1);
+ block->reserved = 0;
+ block->invoke = [](void *ptr, Args... args) -> R {
+ return static_cast<Block*>(ptr)->f(std::forward<Args>(args)...);
+ };
+ block->descriptor = &descriptor;
+
+ new (&block->f) F { std::move(function) };
+
+ BlockPtr blockPtr;
+ blockPtr.m_block = static_cast<BlockType>(block);
+
+ return blockPtr;
+ }
+
</ins><span class="cx"> BlockPtr()
</span><span class="cx"> : m_block(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- BlockPtr(R (^block)(Args...))
</del><ins>+ BlockPtr(BlockType block)
</ins><span class="cx"> : m_block(Block_copy(block))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -81,6 +140,8 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ BlockType get() const { return m_block; }
+
</ins><span class="cx"> explicit operator bool() const { return m_block; }
</span><span class="cx"> bool operator!() const { return !m_block; }
</span><span class="cx">
</span><span class="lines">@@ -90,9 +151,9 @@
</span><span class="cx">
</span><span class="cx"> return m_block(std::forward<Args>(arguments)...);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><del>- R (^m_block)(Args...);
</del><ins>+ BlockType m_block;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename R, typename... Args>
</span><span class="lines">@@ -106,4 +167,3 @@
</span><span class="cx"> using WTF::BlockPtr;
</span><span class="cx"> using WTF::makeBlockPtr;
</span><span class="cx">
</span><del>-#endif // BlockPtr_h
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205312 => 205313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-01 20:33:31 UTC (rev 205312)
+++ trunk/Tools/ChangeLog 2016-09-01 20:40:23 UTC (rev 205313)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-01 Anders Carlsson <andersca@apple.com>
+
+ add BlockPtr::fromCallable
+ https://bugs.webkit.org/show_bug.cgi?id=161504
+
+ Reviewed by Tim Horton.
+
+ Add a test.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WTF/BlockPtr.mm: Added.
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-09-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should handle . and .. in URL paths
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (205312 => 205313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-01 20:33:31 UTC (rev 205312)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-01 20:40:23 UTC (rev 205313)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
</span><span class="cx"> 1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
</span><span class="cx"> 1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
</span><ins>+ 1ADAD1501D77A9F600212586 /* BlockPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADAD14E1D77A9F600212586 /* BlockPtr.mm */; };
</ins><span class="cx"> 1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
</span><span class="cx"> 1AEDE22613E5E7E700E62FE8 /* InjectedBundleControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */; };
</span><span class="cx"> 1AF7B21F1D6CD14D008C126C /* EnumTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF7B21D1D6CD12E008C126C /* EnumTraits.cpp */; };
</span><span class="lines">@@ -676,6 +677,7 @@
</span><span class="cx"> 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EarlyKVOCrash.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AAD19F51C7CE20300831E47 /* Coding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Coding.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
</span><ins>+ 1ADAD14E1D77A9F600212586 /* BlockPtr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BlockPtr.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceRepaint.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "simple-accelerated-compositing.html"; sourceTree = "<group>"; };
</span><span class="cx"> 1AE72F47173EB214006362F0 /* TerminateTwice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TerminateTwice.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1451,6 +1453,7 @@
</span><span class="cx"> BC029B1A1486B23800817DA9 /* ns */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 1ADAD14E1D77A9F600212586 /* BlockPtr.mm */,
</ins><span class="cx"> BC029B1B1486B25900817DA9 /* RetainPtr.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = ns;
</span><span class="lines">@@ -2122,6 +2125,7 @@
</span><span class="cx"> 7C83DED21D0A590C00FEBCF3 /* HashMap.cpp in Sources */,
</span><span class="cx"> 7C83DED41D0A590C00FEBCF3 /* HashSet.cpp in Sources */,
</span><span class="cx"> 7C83DEE01D0A590C00FEBCF3 /* IntegerToStringConversion.cpp in Sources */,
</span><ins>+ 1ADAD1501D77A9F600212586 /* BlockPtr.mm in Sources */,
</ins><span class="cx"> 7C83DEE81D0A590C00FEBCF3 /* ListHashSet.cpp in Sources */,
</span><span class="cx"> 7C83DF1D1D0A590C00FEBCF3 /* Lock.cpp in Sources */,
</span><span class="cx"> 7C83DEED1D0A590C00FEBCF3 /* MathExtras.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFBlockPtrmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WTF/BlockPtr.mm (0 => 205313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/BlockPtr.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/BlockPtr.mm 2016-09-01 20:40:23 UTC (rev 205313)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 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.
+ */
+
+#import "config.h"
+
+#import "MoveOnly.h"
+#import <wtf/BlockPtr.h>
+
+namespace TestWebKitAPI {
+
+TEST(BlockPtr, FromBlock)
+{
+ BlockPtr<unsigned ()> block { ^{
+ return 10u;
+ } };
+
+ EXPECT_EQ(10u, block());
+}
+
+TEST(BlockPtr, FromLambda)
+{
+ MoveOnly moveOnly { 10 };
+ auto block = BlockPtr<unsigned ()>::fromCallable([moveOnly = WTFMove(moveOnly)] {
+ return moveOnly.value();
+ });
+
+ EXPECT_EQ(10u, block());
+}
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>