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

Side by Side Diff: Source/core/inspector/InspectorWorkerAgent.cpp

Issue 135703002: Update inspector classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No change under web/ Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorWorkerAgent.h ('k') | Source/core/inspector/PageConsoleAgent.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "wtf/PassOwnPtr.h" 42 #include "wtf/PassOwnPtr.h"
43 #include "wtf/RefPtr.h" 43 #include "wtf/RefPtr.h"
44 44
45 namespace WebCore { 45 namespace WebCore {
46 46
47 namespace WorkerAgentState { 47 namespace WorkerAgentState {
48 static const char workerInspectionEnabled[] = "workerInspectionEnabled"; 48 static const char workerInspectionEnabled[] = "workerInspectionEnabled";
49 static const char autoconnectToWorkers[] = "autoconnectToWorkers"; 49 static const char autoconnectToWorkers[] = "autoconnectToWorkers";
50 }; 50 };
51 51
52 class InspectorWorkerAgent::WorkerFrontendChannel : public WorkerGlobalScopeProx y::PageInspector { 52 class InspectorWorkerAgent::WorkerFrontendChannel FINAL : public WorkerGlobalSco peProxy::PageInspector {
53 WTF_MAKE_FAST_ALLOCATED; 53 WTF_MAKE_FAST_ALLOCATED;
54 public: 54 public:
55 explicit WorkerFrontendChannel(InspectorFrontend* frontend, WorkerGlobalScop eProxy* proxy) 55 explicit WorkerFrontendChannel(InspectorFrontend* frontend, WorkerGlobalScop eProxy* proxy)
56 : m_frontend(frontend) 56 : m_frontend(frontend)
57 , m_proxy(proxy) 57 , m_proxy(proxy)
58 , m_id(s_nextId++) 58 , m_id(s_nextId++)
59 , m_connected(false) 59 , m_connected(false)
60 { 60 {
61 } 61 }
62 virtual ~WorkerFrontendChannel() 62 virtual ~WorkerFrontendChannel()
(...skipping 15 matching lines...) Expand all
78 void disconnectFromWorkerGlobalScope() 78 void disconnectFromWorkerGlobalScope()
79 { 79 {
80 if (!m_connected) 80 if (!m_connected)
81 return; 81 return;
82 m_connected = false; 82 m_connected = false;
83 m_proxy->disconnectFromInspector(); 83 m_proxy->disconnectFromInspector();
84 } 84 }
85 85
86 private: 86 private:
87 // WorkerGlobalScopeProxy::PageInspector implementation 87 // WorkerGlobalScopeProxy::PageInspector implementation
88 virtual void dispatchMessageFromWorker(const String& message) 88 virtual void dispatchMessageFromWorker(const String& message) OVERRIDE
89 { 89 {
90 RefPtr<JSONValue> value = parseJSON(message); 90 RefPtr<JSONValue> value = parseJSON(message);
91 if (!value) 91 if (!value)
92 return; 92 return;
93 RefPtr<JSONObject> messageObject = value->asObject(); 93 RefPtr<JSONObject> messageObject = value->asObject();
94 if (!messageObject) 94 if (!messageObject)
95 return; 95 return;
96 m_frontend->worker()->dispatchMessageFromWorker(m_id, messageObject); 96 m_frontend->worker()->dispatchMessageFromWorker(m_id, messageObject);
97 } 97 }
98 98
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 m_idToChannel.set(channel->id(), channel); 239 m_idToChannel.set(channel->id(), channel);
240 240
241 ASSERT(m_inspectorFrontend); 241 ASSERT(m_inspectorFrontend);
242 bool autoconnectToWorkers = m_state->getBoolean(WorkerAgentState::autoconnec tToWorkers); 242 bool autoconnectToWorkers = m_state->getBoolean(WorkerAgentState::autoconnec tToWorkers);
243 if (autoconnectToWorkers) 243 if (autoconnectToWorkers)
244 channel->connectToWorkerGlobalScope(); 244 channel->connectToWorkerGlobalScope();
245 m_inspectorFrontend->worker()->workerCreated(channel->id(), url, autoconnect ToWorkers); 245 m_inspectorFrontend->worker()->workerCreated(channel->id(), url, autoconnect ToWorkers);
246 } 246 }
247 247
248 } // namespace WebCore 248 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorWorkerAgent.h ('k') | Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698