<!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>[201594] 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/201594">201594</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-01 22:47:12 -0700 (Wed, 01 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of StringCapture.
https://bugs.webkit.org/show_bug.cgi?id=158285
Reviewed by Chris Dumez.
Source/WebCore:
No new tests (Refactor, no behavior change).
* dom/Document.cpp:
(WebCore::Document::addConsoleMessage):
(WebCore::Document::addMessage):
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::installContentFilterUnblockHandler):
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(WebVideoFullscreenControllerContext::setExternalPlayback):
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::addConsoleMessage):
(WebCore::WorkerGlobalScope::addMessage):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
(WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
Source/WTF:
* wtf/text/WTFString.h:
(WTF::StringCapture::StringCapture): Deleted.
(WTF::StringCapture::string): Deleted.
(WTF::StringCapture::releaseString): Deleted.
(WTF::StringCapture::operator=): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WTF/ChangeLog 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-01 Brady Eidson <beidson@apple.com>
+
+ Get rid of StringCapture.
+ https://bugs.webkit.org/show_bug.cgi?id=158285
+
+ Reviewed by Chris Dumez.
+
+ * wtf/text/WTFString.h:
+ (WTF::StringCapture::StringCapture): Deleted.
+ (WTF::StringCapture::string): Deleted.
+ (WTF::StringCapture::releaseString): Deleted.
+ (WTF::StringCapture::operator=): Deleted.
+
</ins><span class="cx"> 2016-06-01 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Some setters for components of Date do not timeClip() their result
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -690,25 +690,6 @@
</span><span class="cx"> const char* m_characters;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// For thread-safe lambda capture:
-// StringCapture stringCapture(string);
-// auto lambdaThatRunsInOtherThread = [stringCapture] { String string = stringCapture.string(); ... }
-// FIXME: Remove when we can use C++14 initialized lambda capture: [string = string.isolatedCopy()].
-class StringCapture {
-public:
- StringCapture() { }
- StringCapture(const String& string) : m_string(string) { }
- explicit StringCapture(String&& string) : m_string(string) { }
- StringCapture(const StringCapture& other) : m_string(other.m_string.isolatedCopy()) { }
- const String& string() const { return m_string; }
- String releaseString() { return WTFMove(m_string); }
-
- void operator=(const StringCapture& other) { m_string = other.m_string.isolatedCopy(); }
-
-private:
- String m_string;
-};
-
</del><span class="cx"> // Shared global empty string.
</span><span class="cx"> WTF_EXPORT_STRING_API const String& emptyString();
</span><span class="cx">
</span><span class="lines">@@ -758,7 +739,6 @@
</span><span class="cx"> using WTF::isSpaceOrNewline;
</span><span class="cx"> using WTF::reverseFind;
</span><span class="cx"> using WTF::ASCIILiteral;
</span><del>-using WTF::StringCapture;
</del><span class="cx">
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/ChangeLog 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-06-01 Brady Eidson <beidson@apple.com>
+
+ Get rid of StringCapture.
+ https://bugs.webkit.org/show_bug.cgi?id=158285
+
+ Reviewed by Chris Dumez.
+
+ No new tests (Refactor, no behavior change).
+
+ * dom/Document.cpp:
+ (WebCore::Document::addConsoleMessage):
+ (WebCore::Document::addMessage):
+
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::installContentFilterUnblockHandler):
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (WebVideoFullscreenControllerContext::setExternalPlayback):
+
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::addConsoleMessage):
+ (WebCore::WorkerGlobalScope::addMessage):
+
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
+ (WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
+
</ins><span class="cx"> 2016-05-31 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Audit RenderObject casts and fix problems and style issues found
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -5333,7 +5333,7 @@
</span><span class="cx"> void Document::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5344,7 +5344,7 @@
</span><span class="cx"> void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -210,9 +210,9 @@
</span><span class="cx"> protected:
</span><span class="cx"> class AddConsoleMessageTask : public Task {
</span><span class="cx"> public:
</span><del>- AddConsoleMessageTask(MessageSource source, MessageLevel level, const StringCapture& message)
- : Task([source, level, message](ScriptExecutionContext& context) {
- context.addConsoleMessage(source, level, message.string());
</del><ins>+ AddConsoleMessageTask(MessageSource source, MessageLevel level, const String& message)
+ : Task([source, level, message = message.isolatedCopy()](ScriptExecutionContext& context) {
+ context.addConsoleMessage(source, level, message);
</ins><span class="cx"> })
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -1703,10 +1703,9 @@
</span><span class="cx"> String unblockRequestDeniedScript { contentFilter.unblockRequestDeniedScript() };
</span><span class="cx"> if (!unblockRequestDeniedScript.isEmpty() && frame) {
</span><span class="cx"> static_assert(std::is_base_of<ThreadSafeRefCounted<Frame>, Frame>::value, "Frame must be ThreadSafeRefCounted.");
</span><del>- StringCapture capturedScript { unblockRequestDeniedScript };
- unblockHandler.wrapWithDecisionHandler([frame, capturedScript](bool unblocked) {
</del><ins>+ unblockHandler.wrapWithDecisionHandler([frame = WTFMove(frame), script = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
</ins><span class="cx"> if (!unblocked)
</span><del>- frame->script().executeScript(capturedScript.string());
</del><ins>+ frame->script().executeScript(script);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> frameLoader()->client().contentFilterDidBlockLoad(WTFMove(unblockHandler));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -90,28 +90,23 @@
</span><span class="cx"> , m_loaderProxy(loaderProxy)
</span><span class="cx"> , m_taskMode(taskMode.isolatedCopy())
</span><span class="cx"> {
</span><del>- auto* requestData = request.copyData().release();
- auto* optionsCopy = options.isolatedCopy().release();
-
</del><span class="cx"> ASSERT(securityOrigin);
</span><span class="cx"> ASSERT(contentSecurityPolicy);
</span><del>- auto* contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin).release();
</del><ins>+
+ auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin);
</ins><span class="cx"> contentSecurityPolicyCopy->copyStateFrom(contentSecurityPolicy);
</span><span class="cx">
</span><del>- StringCapture capturedOutgoingReferrer(outgoingReferrer);
- m_loaderProxy.postTaskToLoader([this, requestData, optionsCopy, contentSecurityPolicyCopy, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([this, requestData = request.copyData(), options = options.isolatedCopy(), contentSecurityPolicyCopy = WTFMove(contentSecurityPolicyCopy), outgoingReferrer = outgoingReferrer.isolatedCopy()](ScriptExecutionContext& context) mutable {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><del>- auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
- request->setHTTPReferrer(capturedOutgoingReferrer.string());
</del><ins>+ auto request = ResourceRequest::adopt(WTFMove(requestData));
+ request->setHTTPReferrer(outgoingReferrer);
</ins><span class="cx">
</span><del>- auto options = std::unique_ptr<ThreadableLoaderOptions>(optionsCopy);
-
</del><span class="cx"> // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
</span><span class="cx"> // will return a 0 value. Either this should return 0 or the other code path should do a callback with
</span><span class="cx"> // a failure.
</span><del>- m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, *request, *options, std::unique_ptr<ContentSecurityPolicy>(contentSecurityPolicyCopy));
</del><ins>+ m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, *request, *options, WTFMove(contentSecurityPolicyCopy));
</ins><span class="cx"> ASSERT(m_mainThreadLoader || m_loadingFinished);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -434,11 +434,9 @@
</span><span class="cx"> void WebVideoFullscreenControllerContext::setExternalPlayback(bool enabled, ExternalPlaybackTargetType type, String localizedDeviceName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><del>- RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
- StringCapture capturedLocalizedDeviceName(localizedDeviceName);
- dispatch_async(dispatch_get_main_queue(), [protectedThis, this, enabled, type, capturedLocalizedDeviceName] {
</del><ins>+ callOnMainThread([protectedThis = Ref<WebVideoFullscreenControllerContext>(*this), this, enabled, type, localizedDeviceName = localizedDeviceName.isolatedCopy()] {
</ins><span class="cx"> if (m_interface)
</span><del>- m_interface->setExternalPlayback(enabled, type, capturedLocalizedDeviceName.string());
</del><ins>+ m_interface->setExternalPlayback(enabled, type, localizedDeviceName);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> void WorkerGlobalScope::addConsoleMessage(std::unique_ptr<Inspector::ConsoleMessage> message)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(message->source(), message->level(), StringCapture(message->message())));
</del><ins>+ postTask(AddConsoleMessageTask(message->source(), message->level(), message->message()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (201593 => 201594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-06-02 05:39:52 UTC (rev 201593)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-06-02 05:47:12 UTC (rev 201594)
</span><span class="lines">@@ -141,9 +141,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- StringCapture capturedErrorMessage(errorMessage);
- StringCapture capturedSourceURL(sourceURL);
- m_scriptExecutionContext->postTask([this, capturedErrorMessage, capturedSourceURL, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ m_scriptExecutionContext->postTask([this, errorMessage = errorMessage.isolatedCopy(), sourceURL = sourceURL.isolatedCopy(), lineNumber, columnNumber] (ScriptExecutionContext& context) {
</ins><span class="cx"> Worker* workerObject = this->workerObject();
</span><span class="cx"> if (!workerObject)
</span><span class="cx"> return;
</span><span class="lines">@@ -151,20 +149,18 @@
</span><span class="cx"> // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
</span><span class="cx"> // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
</span><span class="cx">
</span><del>- bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(capturedErrorMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber));
</del><ins>+ bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(errorMessage, sourceURL, lineNumber, columnNumber));
</ins><span class="cx"> if (!errorHandled)
</span><del>- context.reportException(capturedErrorMessage.string(), lineNumber, columnNumber, capturedSourceURL.string(), 0);
</del><ins>+ context.reportException(errorMessage, lineNumber, columnNumber, sourceURL, 0);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- StringCapture capturedMessage(message);
- StringCapture capturedSourceURL(sourceURL);
- m_scriptExecutionContext->postTask([this, source, level, capturedMessage, capturedSourceURL, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ m_scriptExecutionContext->postTask([this, source, level, message = message.isolatedCopy(), sourceURL = sourceURL.isolatedCopy(), lineNumber, columnNumber] (ScriptExecutionContext& context) {
</ins><span class="cx"> if (askedToTerminate())
</span><span class="cx"> return;
</span><del>- context.addConsoleMessage(source, level, capturedMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber);
</del><ins>+ context.addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>