<!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>[207546] trunk/Source/WebCore</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/207546">207546</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-19 11:09:50 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup WebCore/workers
https://bugs.webkit.org/show_bug.cgi?id=163635
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-19
Reviewed by Chris Dumez.
* workers/*:
Cleanup like pragma once, nullptr, remove stale includes, declarations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreworkersAbstractWorkercpp">trunk/Source/WebCore/workers/AbstractWorker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersAbstractWorkerh">trunk/Source/WebCore/workers/AbstractWorker.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkercpp">trunk/Source/WebCore/workers/Worker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerh">trunk/Source/WebCore/workers/Worker.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkeridl">trunk/Source/WebCore/workers/Worker.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerConsoleClienth">trunk/Source/WebCore/workers/WorkerConsoleClient.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerEventQueuecpp">trunk/Source/WebCore/workers/WorkerEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerEventQueueh">trunk/Source/WebCore/workers/WorkerEventQueue.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeidl">trunk/Source/WebCore/workers/WorkerGlobalScope.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeProxyh">trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerLoaderProxyh">trunk/Source/WebCore/workers/WorkerLoaderProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerLocationcpp">trunk/Source/WebCore/workers/WorkerLocation.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerLocationh">trunk/Source/WebCore/workers/WorkerLocation.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxyh">trunk/Source/WebCore/workers/WorkerMessagingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerObjectProxyh">trunk/Source/WebCore/workers/WorkerObjectProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerReportingProxyh">trunk/Source/WebCore/workers/WorkerReportingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLoopcpp">trunk/Source/WebCore/workers/WorkerRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLooph">trunk/Source/WebCore/workers/WorkerRunLoop.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoadercpp">trunk/Source/WebCore/workers/WorkerScriptLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoaderh">trunk/Source/WebCore/workers/WorkerScriptLoader.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoaderClienth">trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadh">trunk/Source/WebCore/workers/WorkerThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Cleanup WebCore/workers
+ https://bugs.webkit.org/show_bug.cgi?id=163635
+
+ Reviewed by Chris Dumez.
+
+ * workers/*:
+ Cleanup like pragma once, nullptr, remove stale includes, declarations.
+
</ins><span class="cx"> 2016-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> MouseEvent's coordinates should be 0 for simulated clicks
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersAbstractWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/AbstractWorker.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/AbstractWorker.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/AbstractWorker.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "AbstractWorker.h"
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "Event.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersAbstractWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/AbstractWorker.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/AbstractWorker.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/AbstractWorker.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,14 +28,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef AbstractWorker_h
-#define AbstractWorker_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -62,5 +60,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // AbstractWorker_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/Worker.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -22,27 +22,19 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "Worker.h"
</span><span class="cx">
</span><del>-#include "DOMWindow.h"
-#include "CachedResourceLoader.h"
</del><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "Document.h"
-#include "EventListener.h"
</del><ins>+#include "Event.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "Frame.h"
-#include "FrameLoader.h"
</del><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "MessageEvent.h"
</del><span class="cx"> #include "NetworkStateNotifier.h"
</span><ins>+#include "ResourceResponse.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include "TextEncoding.h"
</del><span class="cx"> #include "WorkerGlobalScopeProxy.h"
</span><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx"> #include "WorkerThread.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/Worker.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,16 +21,13 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Worker_h
-#define Worker_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "AbstractWorker.h"
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "ContentSecurityPolicyResponseHeaders.h"
</span><del>-#include "EventListener.h"
</del><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "MessagePort.h"
</span><span class="cx"> #include "WorkerScriptLoaderClient.h"
</span><span class="lines">@@ -87,5 +84,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // Worker_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkeridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.idl (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.idl 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/Worker.idl 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerConsoleClient.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerConsoleClient.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerConsoleClient.h 2016-10-19 18:09:50 UTC (rev 207546)
</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 WorkerConsoleClient_h
-#define WorkerConsoleClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include <runtime/ConsoleClient.h>
</span><span class="lines">@@ -57,5 +56,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerConsoleClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,16 +21,14 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkerEventQueue.h"
</span><span class="cx">
</span><del>-#include "DOMWindow.h"
-#include "Document.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><ins>+#include "EventTarget.h"
</ins><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -37,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> WorkerEventQueue::WorkerEventQueue(ScriptExecutionContext& context)
</span><span class="cx"> : m_scriptExecutionContext(context)
</span><del>- , m_isClosed(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,7 +49,6 @@
</span><span class="cx"> EventDispatcher(RefPtr<Event>&& event, WorkerEventQueue& eventQueue)
</span><span class="cx"> : m_event(WTFMove(event))
</span><span class="cx"> , m_eventQueue(eventQueue)
</span><del>- , m_isCancelled(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,7 +76,7 @@
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<Event> m_event;
</span><span class="cx"> WorkerEventQueue& m_eventQueue;
</span><del>- bool m_isCancelled;
</del><ins>+ bool m_isCancelled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool WorkerEventQueue::enqueueEvent(Ref<Event>&& event)
</span><span class="lines">@@ -115,4 +111,4 @@
</span><span class="cx"> m_eventDispatcherMap.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,11 +21,9 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerEventQueue_h
-#define WorkerEventQueue_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "EventQueue.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -45,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ScriptExecutionContext& m_scriptExecutionContext;
</span><del>- bool m_isClosed;
</del><ins>+ bool m_isClosed { false };
</ins><span class="cx">
</span><span class="cx"> class EventDispatcher;
</span><span class="cx"> typedef HashMap<RefPtr<Event>, EventDispatcher*> EventDispatcherMap;
</span><span class="lines">@@ -52,6 +50,4 @@
</span><span class="cx"> EventDispatcherMap m_eventDispatcherMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-}
-
-#endif // WorkerEventQueue_h
</del><ins>+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,18 +28,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx">
</span><del>-#include "ActiveDOMObject.h"
</del><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "Crypto.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><del>-#include "DOMURL.h"
-#include "DOMWindow.h"
-#include "ErrorEvent.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "IDBConnectionProxy.h"
</span><span class="cx"> #include "InspectorConsoleInstrumentation.h"
</span><del>-#include "MessagePort.h"
</del><span class="cx"> #include "ScheduledAction.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -49,19 +44,13 @@
</span><span class="cx"> #include "WorkerLoaderProxy.h"
</span><span class="cx"> #include "WorkerLocation.h"
</span><span class="cx"> #include "WorkerNavigator.h"
</span><del>-#include "WorkerObjectProxy.h"
</del><ins>+#include "WorkerReportingProxy.h"
</ins><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include "WorkerThreadableLoader.h"
</span><del>-#include <bindings/ScriptValue.h>
</del><span class="cx"> #include <inspector/ConsoleMessage.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><del>-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-#include "NotificationCenter.h"
-#endif
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -289,7 +278,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> thread().workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, 0, 0, String());
</span><del>- addMessageToWorkerConsole(source, level, message, String(), 0, 0, 0, 0, requestIdentifier);
</del><ins>+ addMessageToWorkerConsole(source, level, message, String(), 0, 0, nullptr, nullptr, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</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="lines">@@ -352,7 +341,7 @@
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(m_context->isContextThread());
</span><span class="cx"> m_context->unregisterObserver(this);
</span><del>- m_context = 0;
</del><ins>+ m_context = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerGlobalScope::registerObserver(Observer* observer)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "WorkerEventQueue.h"
</span><span class="cx"> #include "WorkerScriptController.h"
</span><span class="cx"> #include <memory>
</span><del>-#include <wtf/Assertions.h>
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -46,7 +45,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Blob;
</del><span class="cx"> class ContentSecurityPolicyResponseHeaders;
</span><span class="cx"> class Crypto;
</span><span class="cx"> class ScheduledAction;
</span><span class="lines">@@ -164,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override;
</span><span class="cx"> void addMessageToWorkerConsole(std::unique_ptr<Inspector::ConsoleMessage>);
</span><del>- void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</del><ins>+ void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void refScriptExecutionContext() override { ref(); }
</span><span class="lines">@@ -173,7 +171,7 @@
</span><span class="cx"> void refEventTarget() final { ref(); }
</span><span class="cx"> void derefEventTarget() final { deref(); }
</span><span class="cx">
</span><del>- void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</del><ins>+ void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><span class="cx"> EventTarget* errorEventTarget() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.idl (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.idl 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerGlobalScopeProxy_h
-#define WorkerGlobalScopeProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "MessagePort.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="lines">@@ -63,5 +62,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerGlobalScopeProxy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerLoaderProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerLoaderProxy.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,11 +28,9 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerLoaderProxy_h
-#define WorkerLoaderProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><del>-#include <wtf/Forward.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,5 +53,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerLoaderProxy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerLocation.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLocation.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerLocation.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerLocation.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLocation.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerLocation.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,15 +21,12 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerLocation_h
-#define WorkerLocation_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -62,5 +59,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerLocation_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerObjectDestroyed()
</span><span class="cx"> {
</span><del>- m_workerObject = 0;
</del><ins>+ m_workerObject = nullptr;
</ins><span class="cx"> m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</span><span class="cx"> m_mayBeDestroyed = true;
</span><span class="cx"> if (m_workerThread)
</span><span class="lines">@@ -218,12 +218,10 @@
</span><span class="cx"> m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</span><span class="cx"> workerGlobalScopeDestroyedInternal();
</span><span class="cx"> });
</span><del>- // Will execute workerGlobalScopeDestroyedInternal() on context's thread.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeClosed()
</span><span class="cx"> {
</span><del>- // Executes terminateWorkerGlobalScope() on parent context's thread.
</del><span class="cx"> m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</span><span class="cx"> terminateWorkerGlobalScope();
</span><span class="cx"> });
</span><span class="lines">@@ -231,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeDestroyedInternal()
</span><span class="cx"> {
</span><del>- // WorkerGlobalScopeDestroyedTask is always the last to be performed, so the proxy is not needed for communication
</del><ins>+ // This is always the last task to be performed, so the proxy is not needed for communication
</ins><span class="cx"> // in either side any more. However, the Worker object may still exist, and it assumes that the proxy exists, too.
</span><span class="cx"> m_askedToTerminate = true;
</span><span class="cx"> m_workerThread = nullptr;
</span><span class="lines">@@ -255,7 +253,6 @@
</span><span class="cx"> m_scriptExecutionContext->postTask([this, hasPendingActivity] (ScriptExecutionContext&) {
</span><span class="cx"> reportPendingActivityInternal(true, hasPendingActivity);
</span><span class="cx"> });
</span><del>- // Will execute reportPendingActivityInternal() on context's thread.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::reportPendingActivity(bool hasPendingActivity)
</span><span class="lines">@@ -263,7 +260,6 @@
</span><span class="cx"> m_scriptExecutionContext->postTask([this, hasPendingActivity] (ScriptExecutionContext&) {
</span><span class="cx"> reportPendingActivityInternal(false, hasPendingActivity);
</span><span class="cx"> });
</span><del>- // Will execute reportPendingActivityInternal() on context's thread.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::reportPendingActivityInternal(bool confirmingMessage, bool hasPendingActivity)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,11 +21,9 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerMessagingProxy_h
-#define WorkerMessagingProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "WorkerGlobalScopeProxy.h"
</span><span class="lines">@@ -42,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> class ContentSecurityPolicyResponseHeaders;
</span><span class="cx"> class DedicatedWorkerThread;
</span><del>- class ScriptExecutionContext;
</del><span class="cx"> class Worker;
</span><span class="cx">
</span><span class="cx"> class WorkerMessagingProxy : public WorkerGlobalScopeProxy, public WorkerObjectProxy, public WorkerLoaderProxy {
</span><span class="lines">@@ -84,11 +81,6 @@
</span><span class="cx"> virtual ~WorkerMessagingProxy();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- friend class MessageWorkerTask;
- friend class WorkerGlobalScopeDestroyedTask;
- friend class WorkerExceptionTask;
- friend class WorkerThreadActivityReportTask;
-
</del><span class="cx"> void workerGlobalScopeDestroyedInternal();
</span><span class="cx"> void reportPendingActivityInternal(bool confirmingMessage, bool hasPendingActivity);
</span><span class="cx"> Worker* workerObject() const { return m_workerObject; }
</span><span class="lines">@@ -107,5 +99,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerMessagingProxy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerObjectProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerObjectProxy.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerObjectProxy.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerObjectProxy.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerObjectProxy_h
-#define WorkerObjectProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "WorkerReportingProxy.h"
</span><span class="cx"> #include "MessagePort.h"
</span><span class="lines">@@ -52,5 +51,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerObjectProxy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerReportingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerReportingProxy.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerReportingProxy.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerReportingProxy.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,11 +28,9 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerReportingProxy_h
-#define WorkerReportingProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><del>-#include <wtf/Forward.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -53,5 +51,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerReportingProxy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_runLoop.m_nestedCount--;
</span><span class="cx"> if (!m_runLoop.m_nestedCount)
</span><del>- threadGlobalData().threadTimers().setSharedTimer(0);
</del><ins>+ threadGlobalData().threadTimers().setSharedTimer(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> private:
</span><span class="cx"> WorkerRunLoop& m_runLoop;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerRunLoop_h
-#define WorkerRunLoop_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <memory>
</span><span class="lines">@@ -92,5 +91,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerRunLoop_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -22,28 +22,24 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><del>-#include "SecurityOrigin.h"
</del><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerScriptLoaderClient.h"
</span><span class="cx"> #include "WorkerThreadableLoader.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> WorkerScriptLoader::WorkerScriptLoader()
</span><del>- : m_client(0)
</del><ins>+ : m_client(nullptr)
</ins><span class="cx"> , m_failed(false)
</span><span class="cx"> , m_identifier(0)
</span><span class="cx"> , m_finishing(false)
</span><span class="lines">@@ -114,7 +110,7 @@
</span><span class="cx"> std::unique_ptr<ResourceRequest> WorkerScriptLoader::createResourceRequest()
</span><span class="cx"> {
</span><span class="cx"> auto request = std::make_unique<ResourceRequest>(m_url);
</span><del>- request->setHTTPMethod("GET");
</del><ins>+ request->setHTTPMethod(ASCIILiteral("GET"));
</ins><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,9 +133,9 @@
</span><span class="cx">
</span><span class="cx"> if (!m_decoder) {
</span><span class="cx"> if (!m_responseEncoding.isEmpty())
</span><del>- m_decoder = TextResourceDecoder::create("text/javascript", m_responseEncoding);
</del><ins>+ m_decoder = TextResourceDecoder::create(ASCIILiteral("text/javascript"), m_responseEncoding);
</ins><span class="cx"> else
</span><del>- m_decoder = TextResourceDecoder::create("text/javascript", "UTF-8");
</del><ins>+ m_decoder = TextResourceDecoder::create(ASCIILiteral("text/javascript"), "UTF-8");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!len)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -22,11 +22,9 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerScriptLoader_h
-#define WorkerScriptLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="lines">@@ -92,5 +90,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerScriptLoader_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -22,11 +22,9 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerScriptLoaderClient_h
-#define WorkerScriptLoaderClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,5 +43,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // WorkerScriptLoaderClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -25,11 +25,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "WorkerThread.h"
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicyResponseHeaders.h"
</span><del>-#include "DedicatedWorkerGlobalScope.h"
</del><span class="cx"> #include "IDBConnectionProxy.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -36,6 +34,7 @@
</span><span class="cx"> #include "SocketProvider.h"
</span><span class="cx"> #include "ThreadGlobalData.h"
</span><span class="cx"> #include "URL.h"
</span><ins>+#include "WorkerGlobalScope.h"
</ins><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -99,9 +98,6 @@
</span><span class="cx"> , m_workerLoaderProxy(workerLoaderProxy)
</span><span class="cx"> , m_workerReportingProxy(workerReportingProxy)
</span><span class="cx"> , m_startupData(std::make_unique<WorkerThreadStartupData>(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, topOrigin))
</span><del>-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- , m_notificationClient(0)
-#endif
</del><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> , m_idbConnectionProxy(connectionProxy)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.h (207545 => 207546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.h 2016-10-19 17:47:30 UTC (rev 207545)
+++ trunk/Source/WebCore/workers/WorkerThread.h 2016-10-19 18:09:50 UTC (rev 207546)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="lines">@@ -102,7 +101,7 @@
</span><span class="cx"> std::unique_ptr<WorkerThreadStartupData> m_startupData;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- NotificationClient* m_notificationClient;
</del><ins>+ NotificationClient* m_notificationClient { nullptr };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="lines">@@ -114,4 +113,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
</del></span></pre>
</div>
</div>
</body>
</html>