Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

Issue 2010603002: Use SourceLocation when reporting runtime exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2004243002
Patch Set: test fixes Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/ScriptCallStack.h" 5 #include "bindings/core/v8/SourceLocation.h"
6 #include "bindings/core/v8/V8CacheOptions.h" 6 #include "bindings/core/v8/V8CacheOptions.h"
7 #include "bindings/core/v8/V8GCController.h" 7 #include "bindings/core/v8/V8GCController.h"
8 #include "core/frame/csp/ContentSecurityPolicy.h" 8 #include "core/frame/csp/ContentSecurityPolicy.h"
9 #include "core/inspector/ConsoleMessage.h" 9 #include "core/inspector/ConsoleMessage.h"
10 #include "core/workers/WorkerBackingThread.h" 10 #include "core/workers/WorkerBackingThread.h"
11 #include "core/workers/WorkerClients.h" 11 #include "core/workers/WorkerClients.h"
12 #include "core/workers/WorkerLoaderProxy.h" 12 #include "core/workers/WorkerLoaderProxy.h"
13 #include "core/workers/WorkerReportingProxy.h" 13 #include "core/workers/WorkerReportingProxy.h"
14 #include "core/workers/WorkerThread.h" 14 #include "core/workers/WorkerThread.h"
15 #include "core/workers/WorkerThreadStartupData.h" 15 #include "core/workers/WorkerThreadStartupData.h"
(...skipping 30 matching lines...) Expand all
46 NOTIMPLEMENTED(); 46 NOTIMPLEMENTED();
47 return false; 47 return false;
48 } 48 }
49 }; 49 };
50 50
51 class MockWorkerReportingProxy : public WorkerReportingProxy { 51 class MockWorkerReportingProxy : public WorkerReportingProxy {
52 public: 52 public:
53 MockWorkerReportingProxy() { } 53 MockWorkerReportingProxy() { }
54 ~MockWorkerReportingProxy() override { } 54 ~MockWorkerReportingProxy() override { }
55 55
56 MOCK_METHOD5(reportException, void(const String& errorMessage, int lineNumbe r, int columnNumber, const String& sourceURL, int exceptionId)); 56 MOCK_METHOD2(reportExceptionMock, void(const String& errorMessage, SourceLoc ation*));
57 void reportException(const String& errorMessage, PassOwnPtr<SourceLocation> location)
58 {
59 reportExceptionMock(errorMessage, location.get());
60 }
57 MOCK_METHOD1(reportConsoleMessage, void(ConsoleMessage*)); 61 MOCK_METHOD1(reportConsoleMessage, void(ConsoleMessage*));
58 MOCK_METHOD1(postMessageToPageInspector, void(const String&)); 62 MOCK_METHOD1(postMessageToPageInspector, void(const String&));
59 MOCK_METHOD0(postWorkerConsoleAgentEnabled, void()); 63 MOCK_METHOD0(postWorkerConsoleAgentEnabled, void());
60 MOCK_METHOD1(didEvaluateWorkerScript, void(bool success)); 64 MOCK_METHOD1(didEvaluateWorkerScript, void(bool success));
61 MOCK_METHOD1(workerGlobalScopeStarted, void(WorkerGlobalScope*)); 65 MOCK_METHOD1(workerGlobalScopeStarted, void(WorkerGlobalScope*));
62 MOCK_METHOD0(workerGlobalScopeClosed, void()); 66 MOCK_METHOD0(workerGlobalScopeClosed, void());
63 MOCK_METHOD0(workerThreadTerminated, void()); 67 MOCK_METHOD0(workerThreadTerminated, void());
64 MOCK_METHOD0(willDestroyWorkerGlobalScope, void()); 68 MOCK_METHOD0(willDestroyWorkerGlobalScope, void());
65 }; 69 };
66 70
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 { 145 {
142 m_thread->scriptLoaded(); 146 m_thread->scriptLoaded();
143 } 147 }
144 148
145 // EventTarget 149 // EventTarget
146 const AtomicString& interfaceName() const override 150 const AtomicString& interfaceName() const override
147 { 151 {
148 return EventTargetNames::DedicatedWorkerGlobalScope; 152 return EventTargetNames::DedicatedWorkerGlobalScope;
149 } 153 }
150 154
151 void logExceptionToConsole(const String&, int, const String&, int, int, Pass RefPtr<ScriptCallStack>) override 155 void logExceptionToConsole(const String&, PassOwnPtr<SourceLocation>) overri de
152 { 156 {
153 } 157 }
154 158
155 private: 159 private:
156 WorkerThreadForTest* m_thread; 160 WorkerThreadForTest* m_thread;
157 }; 161 };
158 162
159 inline WorkerGlobalScope* WorkerThreadForTest::createWorkerGlobalScope(PassOwnPt r<WorkerThreadStartupData> startupData) 163 inline WorkerGlobalScope* WorkerThreadForTest::createWorkerGlobalScope(PassOwnPt r<WorkerThreadStartupData> startupData)
160 { 164 {
161 return new FakeWorkerGlobalScope(startupData->m_scriptURL, startupData->m_us erAgent, this, std::move(startupData->m_starterOriginPrivilegeData), std::move(s tartupData->m_workerClients)); 165 return new FakeWorkerGlobalScope(startupData->m_scriptURL, startupData->m_us erAgent, this, std::move(startupData->m_starterOriginPrivilegeData), std::move(s tartupData->m_workerClients));
162 } 166 }
163 167
164 } // namespace blink 168 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698