Migrate websockets from url+lineNumber to SourceLocation.

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 86 matching lines @@
     explicit WebSocketChannelSyncHelper(PassOwnPtr<WaitableEvent> event)
         : m_event(std::move(event))
         , m_connectRequestResult(false)
     {
     }
 
     OwnPtr<WaitableEvent> m_event;
     bool m_connectRequestResult;
 };
 
-WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
+WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, PassOwnPtr<SourceLocation> location)
     : m_bridge(new Bridge(client, workerGlobalScope))
-    , m_sourceURLAtConnection(sourceURL)
-    , m_lineNumberAtConnection(lineNumber)
+    , m_locationAtConnection(std::move(location))
 {
-    m_bridge->initialize(sourceURL, lineNumber);
+    m_bridge->initialize(m_locationAtConnection->clone());
 }
 
 WorkerWebSocketChannel::~WorkerWebSocketChannel()
 {
     ASSERT(!m_bridge);
 }
 
 bool WorkerWebSocketChannel::connect(const KURL& url, const String& protocol)
 {
     ASSERT(m_bridge);
@@ skipping 17 matching lines @@
     ASSERT(m_bridge);
     m_bridge->send(blobData);
 }
 
 void WorkerWebSocketChannel::close(int code, const String& reason)
 {
     ASSERT(m_bridge);
     m_bridge->close(code, reason);
 }
 
-void WorkerWebSocketChannel::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
+void WorkerWebSocketChannel::fail(const String& reason, MessageLevel level, PassOwnPtr<SourceLocation> location)
 {
     if (!m_bridge)
         return;
 
-    RefPtr<ScriptCallStack> callStack = ScriptCallStack::capture(1);
-    if (callStack && !callStack->isEmpty())  {
-        // In order to emulate the ConsoleMessage behavior,
-        // we should ignore the specified url and line number if
-        // we can get the JavaScript context.
-        m_bridge->fail(reason, level, callStack->topSourceURL(), callStack->topLineNumber());
-    } else if (sourceURL.isEmpty() && !lineNumber) {
+    OwnPtr<SourceLocation> capturedLocation = SourceLocation::capture();
+    if (!capturedLocation->isEmpty()) {

[yhirano, 2016/05/24 11:30:18]

Can you leave some comments saying we ignore the passed location intentionally
in this case?

[dgozman, 2016/05/24 22:12:50]

Done.

+        m_bridge->fail(reason, level, std::move(capturedLocation));
+    } else if (!location || location->isEmpty()) {
         // No information is specified by the caller - use the url
         // and the line number at the connection.
-        m_bridge->fail(reason, level, m_sourceURLAtConnection, m_lineNumberAtConnection);
+        m_bridge->fail(reason, level, m_locationAtConnection->clone());
     } else {
         // Use the specified information.
-        m_bridge->fail(reason, level, sourceURL, lineNumber);
+        m_bridge->fail(reason, level, std::move(location));
     }
 }
 
 void WorkerWebSocketChannel::disconnect()
 {
     m_bridge->disconnect();
     m_bridge.clear();
 }
 
 DEFINE_TRACE(WorkerWebSocketChannel)
 {
     visitor->trace(m_bridge);
     WebSocketChannel::trace(visitor);
 }
 
 Peer::Peer(Bridge* bridge, PassRefPtr<WorkerLoaderProxy> loaderProxy, WebSocketChannelSyncHelper* syncHelper)
     : m_bridge(bridge)
     , m_loaderProxy(loaderProxy)
     , m_mainWebSocketChannel(nullptr)
     , m_syncHelper(syncHelper)
 {
     ASSERT(!isMainThread());
 }
 
 Peer::~Peer()
 {
     ASSERT(!isMainThread());
 }
 
-void Peer::initialize(const String& sourceURL, unsigned lineNumber, ExecutionContext* context)
+void Peer::initialize(PassOwnPtr<SourceLocation> location, ExecutionContext* context)
 {
     ASSERT(isMainThread());
     Document* document = toDocument(context);
-    m_mainWebSocketChannel = DocumentWebSocketChannel::create(document, this, sourceURL, lineNumber);
+    m_mainWebSocketChannel = DocumentWebSocketChannel::create(document, this, std::move(location));
     m_syncHelper->signalWorkerThread();
 }
 
 void Peer::connect(const KURL& url, const String& protocol)
 {
     ASSERT(isMainThread());
     ASSERT(m_syncHelper);
     if (!m_mainWebSocketChannel) {
         m_syncHelper->setConnectRequestResult(false);
     } else {
@@ skipping 26 matching lines @@
 
 void Peer::close(int code, const String& reason)
 {
     ASSERT(isMainThread());
     ASSERT(m_syncHelper);
     if (!m_mainWebSocketChannel)
         return;
     m_mainWebSocketChannel->close(code, reason);
 }
 
-void Peer::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
+void Peer::fail(const String& reason, MessageLevel level, PassOwnPtr<SourceLocation> location)
 {
     ASSERT(isMainThread());
     ASSERT(m_syncHelper);
     if (!m_mainWebSocketChannel)
         return;
-    m_mainWebSocketChannel->fail(reason, level, sourceURL, lineNumber);
+    m_mainWebSocketChannel->fail(reason, level, std::move(location));
 }
 
 void Peer::disconnect()
 {
     ASSERT(isMainThread());
     ASSERT(m_syncHelper);
     if (m_mainWebSocketChannel) {
         m_mainWebSocketChannel->disconnect();
         m_mainWebSocketChannel = nullptr;
     }
@@ skipping 110 matching lines @@
     , m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(new WaitableEvent())))
     , m_peer(new Peer(this, m_loaderProxy, m_syncHelper))
 {
 }
 
 Bridge::~Bridge()
 {
     ASSERT(!m_peer);
 }
 
-void Bridge::initialize(const String& sourceURL, unsigned lineNumber)
+void Bridge::initialize(PassOwnPtr<SourceLocation> location)
 {
-    if (!waitForMethodCompletion(createCrossThreadTask(&Peer::initialize, wrapCrossThreadPersistent(m_peer.get()), sourceURL, lineNumber))) {
+    if (!waitForMethodCompletion(createCrossThreadTask(&Peer::initialize, wrapCrossThreadPersistent(m_peer.get()), passed(std::move(location))))) {
         // The worker thread has been signalled to shutdown before method completion.
         disconnect();
     }
 }
 
 bool Bridge::connect(const KURL& url, const String& protocol)
 {
     if (!m_peer)
         return false;
 
@@ skipping 29 matching lines @@
     ASSERT(m_peer);
     m_loaderProxy->postTaskToLoader(createCrossThreadTask(&Peer::sendBlob, wrapCrossThreadPersistent(m_peer.get()), data));
 }
 
 void Bridge::close(int code, const String& reason)
 {
     ASSERT(m_peer);
     m_loaderProxy->postTaskToLoader(createCrossThreadTask(&Peer::close, wrapCrossThreadPersistent(m_peer.get()), code, reason));
 }
 
-void Bridge::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
+void Bridge::fail(const String& reason, MessageLevel level, PassOwnPtr<SourceLocation> location)
 {
     ASSERT(m_peer);
-    m_loaderProxy->postTaskToLoader(createCrossThreadTask(&Peer::fail, wrapCrossThreadPersistent(m_peer.get()), reason, level, sourceURL, lineNumber));
+    m_loaderProxy->postTaskToLoader(createCrossThreadTask(&Peer::fail, wrapCrossThreadPersistent(m_peer.get()), reason, level, passed(std::move(location))));
 }
 
 void Bridge::disconnect()
 {
     if (!m_peer)
         return;
 
     waitForMethodCompletion(createCrossThreadTask(&Peer::disconnect, wrapCrossThreadPersistent(m_peer.get())));
     // Here |m_peer| is detached from the main thread and we can delete it.
 
@@ skipping 23 matching lines @@
 
 DEFINE_TRACE(Bridge)
 {
     visitor->trace(m_client);
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_syncHelper);
     visitor->trace(m_peer);
 }
 
 } // namespace blink