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

Side by Side Diff: Source/core/workers/WorkerMessagingProxy.h

Issue 631133003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/workers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/workers/WorkerLocation.h ('k') | Source/core/workers/WorkerNavigator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 39
40 namespace blink { 40 namespace blink {
41 41
42 class WorkerObjectProxy; 42 class WorkerObjectProxy;
43 class DedicatedWorkerThread; 43 class DedicatedWorkerThread;
44 class ExecutionContext; 44 class ExecutionContext;
45 class Worker; 45 class Worker;
46 class WorkerClients; 46 class WorkerClients;
47 class WorkerInspectorProxy; 47 class WorkerInspectorProxy;
48 48
49 class WorkerMessagingProxy FINAL : public WorkerGlobalScopeProxy, public WorkerL oaderProxy { 49 class WorkerMessagingProxy final : public WorkerGlobalScopeProxy, public WorkerL oaderProxy {
50 WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); WTF_MAKE_FAST_ALLOCATED; 50 WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); WTF_MAKE_FAST_ALLOCATED;
51 public: 51 public:
52 WorkerMessagingProxy(Worker*, PassOwnPtrWillBeRawPtr<WorkerClients>); 52 WorkerMessagingProxy(Worker*, PassOwnPtrWillBeRawPtr<WorkerClients>);
53 53
54 // Implementations of WorkerGlobalScopeProxy. 54 // Implementations of WorkerGlobalScopeProxy.
55 // (Only use these methods in the worker object thread.) 55 // (Only use these methods in the worker object thread.)
56 virtual void startWorkerGlobalScope(const KURL& scriptURL, const String& use rAgent, const String& sourceCode, WorkerThreadStartMode) OVERRIDE; 56 virtual void startWorkerGlobalScope(const KURL& scriptURL, const String& use rAgent, const String& sourceCode, WorkerThreadStartMode) override;
57 virtual void terminateWorkerGlobalScope() OVERRIDE; 57 virtual void terminateWorkerGlobalScope() override;
58 virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue >, PassOwnPtr<MessagePortChannelArray>) OVERRIDE; 58 virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue >, PassOwnPtr<MessagePortChannelArray>) override;
59 virtual bool hasPendingActivity() const OVERRIDE; 59 virtual bool hasPendingActivity() const override;
60 virtual void workerObjectDestroyed() OVERRIDE; 60 virtual void workerObjectDestroyed() override;
61 61
62 // These methods come from worker context thread via WorkerObjectProxy 62 // These methods come from worker context thread via WorkerObjectProxy
63 // and are called on the worker object thread (e.g. main thread). 63 // and are called on the worker object thread (e.g. main thread).
64 void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr <MessagePortChannelArray>); 64 void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr <MessagePortChannelArray>);
65 void reportException(const String& errorMessage, int lineNumber, int columnN umber, const String& sourceURL); 65 void reportException(const String& errorMessage, int lineNumber, int columnN umber, const String& sourceURL);
66 void reportConsoleMessage(MessageSource, MessageLevel, const String& message , int lineNumber, const String& sourceURL); 66 void reportConsoleMessage(MessageSource, MessageLevel, const String& message , int lineNumber, const String& sourceURL);
67 void postMessageToPageInspector(const String&); 67 void postMessageToPageInspector(const String&);
68 WorkerInspectorProxy* workerInspectorProxy(); 68 WorkerInspectorProxy* workerInspectorProxy();
69 void confirmMessageFromWorkerObject(bool hasPendingActivity); 69 void confirmMessageFromWorkerObject(bool hasPendingActivity);
70 void reportPendingActivity(bool hasPendingActivity); 70 void reportPendingActivity(bool hasPendingActivity);
71 void workerGlobalScopeClosed(); 71 void workerGlobalScopeClosed();
72 void workerThreadTerminated(); 72 void workerThreadTerminated();
73 73
74 // Implementation of WorkerLoaderProxy. 74 // Implementation of WorkerLoaderProxy.
75 // These methods are called on different threads to schedule loading 75 // These methods are called on different threads to schedule loading
76 // requests and to send callbacks back to WorkerGlobalScope. 76 // requests and to send callbacks back to WorkerGlobalScope.
77 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) OVERRIDE; 77 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
78 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) O VERRIDE; 78 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) o verride;
79 79
80 void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>); 80 void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>);
81 81
82 protected: 82 protected:
83 virtual ~WorkerMessagingProxy(); 83 virtual ~WorkerMessagingProxy();
84 84
85 private: 85 private:
86 static void workerObjectDestroyedInternal(ExecutionContext*, WorkerMessaging Proxy*); 86 static void workerObjectDestroyedInternal(ExecutionContext*, WorkerMessaging Proxy*);
87 void terminateInternally(); 87 void terminateInternally();
88 88
(...skipping 10 matching lines...) Expand all
99 99
100 Vector<OwnPtr<ExecutionContextTask> > m_queuedEarlyTasks; // Tasks are queue d here until there's a thread object created. 100 Vector<OwnPtr<ExecutionContextTask> > m_queuedEarlyTasks; // Tasks are queue d here until there's a thread object created.
101 OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy; 101 OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy;
102 102
103 OwnPtrWillBePersistent<WorkerClients> m_workerClients; 103 OwnPtrWillBePersistent<WorkerClients> m_workerClients;
104 }; 104 };
105 105
106 } // namespace blink 106 } // namespace blink
107 107
108 #endif // WorkerMessagingProxy_h 108 #endif // WorkerMessagingProxy_h
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerLocation.h ('k') | Source/core/workers/WorkerNavigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698