Chromium Code Reviews| Index: Source/bindings/core/v8/PageScriptDebugServer.h |
| diff --git a/Source/bindings/core/v8/PageScriptDebugServer.h b/Source/bindings/core/v8/PageScriptDebugServer.h |
| index d9ab68e33bb6433348c3557f214f248ac9b7be61..ccfe53390db3f986bf1a77be70d41fcbeacc7458 100644 |
| --- a/Source/bindings/core/v8/PageScriptDebugServer.h |
| +++ b/Source/bindings/core/v8/PageScriptDebugServer.h |
| @@ -31,21 +31,24 @@ |
| #ifndef PageScriptDebugServer_h |
| #define PageScriptDebugServer_h |
| +#include "bindings/core/v8/Nullable.h" |
| #include "bindings/core/v8/ScriptDebugServer.h" |
| -#include "bindings/core/v8/ScriptPreprocessor.h" |
| +#include "bindings/core/v8/ScriptSourceCode.h" |
| #include <v8.h> |
| namespace blink { |
| class Page; |
| class ScriptPreprocessor; |
| -class ScriptSourceCode; |
| class PageScriptDebugServer final : public ScriptDebugServer { |
| WTF_MAKE_NONCOPYABLE(PageScriptDebugServer); |
| public: |
| static PageScriptDebugServer& shared(); |
| + ~PageScriptDebugServer() override; |
| + void trace(Visitor*) override; |
| + |
| static void setMainThreadIsolate(v8::Isolate*); |
| void addListener(ScriptDebugListener*, Page*); |
| @@ -66,7 +69,7 @@ public: |
| void runScript(ScriptState*, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace) override; |
| void setPreprocessorSource(const String&) override; |
| void preprocessBeforeCompile(const v8::Debug::EventDetails&) override; |
| - PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&) override; |
| + Nullable<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&) override; |
|
haraken
2015/01/22 02:11:54
Using Nullable<> looks a bit tricky. At the moment
|
| String preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName) override; |
| void clearPreprocessor() override; |
| @@ -75,19 +78,18 @@ public: |
| private: |
| PageScriptDebugServer(); |
| - ~PageScriptDebugServer() override; |
| ScriptDebugListener* getDebugListenerForContext(v8::Handle<v8::Context>) override; |
| void runMessageLoopOnPause(v8::Handle<v8::Context>) override; |
| void quitMessageLoopOnPause() override; |
| - typedef HashMap<Page*, ScriptDebugListener*> ListenersMap; |
| + using ListenersMap = WillBeHeapHashMap<RawPtrWillBeMember<Page>, ScriptDebugListener*>; |
| ListenersMap m_listenersMap; |
| OwnPtr<ClientMessageLoop> m_clientMessageLoop; |
| - Page* m_pausedPage; |
| + RawPtrWillBeMember<Page> m_pausedPage; |
| HashMap<String, String> m_compiledScriptURLs; |
| - OwnPtr<ScriptSourceCode> m_preprocessorSourceCode; |
| + Nullable<ScriptSourceCode> m_preprocessorSourceCode; |
| OwnPtr<ScriptPreprocessor> m_scriptPreprocessor; |
| bool canPreprocess(LocalFrame*); |
| static v8::Isolate* s_mainThreadIsolate; |