Commit c3102502 authored by Jakob Kummerow's avatar Jakob Kummerow Committed by Commit Bot

[cleanup] Eliminate "using namespace" from src/

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I1be2bb5eab7bb869155c526897f32d2c26891aa1
Reviewed-on: https://chromium-review.googlesource.com/646850
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
Reviewed-by: 's avatarBen Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47777}
parent 2859dba7
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <algorithm> #include <algorithm>
#include "src/debug/debug-interface.h" #include "src/debug/debug-interface.h"
#include "src/inspector/protocol/Debugger.h"
#include "src/inspector/script-breakpoint.h" #include "src/inspector/script-breakpoint.h"
#include "src/inspector/string-util.h" #include "src/inspector/string-util.h"
#include "src/inspector/v8-debugger-agent-impl.h" #include "src/inspector/v8-debugger-agent-impl.h"
...@@ -15,19 +14,7 @@ ...@@ -15,19 +14,7 @@
#include "src/inspector/v8-debugger.h" #include "src/inspector/v8-debugger.h"
#include "src/inspector/v8-inspector-impl.h" #include "src/inspector/v8-inspector-impl.h"
#if __clang__ namespace v8_inspector {
// TODO(mostynb@opera.com): remove the using statements and these pragmas.
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wheader-hygiene"
#endif
using namespace v8_inspector;
using namespace v8;
#if __clang__
// TODO(mostynb@opera.com): remove the using statements and these pragmas.
#pragma clang diagnostic pop
#endif
class WasmTranslation::TranslatorImpl { class WasmTranslation::TranslatorImpl {
public: public:
...@@ -44,7 +31,7 @@ class WasmTranslation::TranslatorImpl { ...@@ -44,7 +31,7 @@ class WasmTranslation::TranslatorImpl {
column(column) {} column(column) {}
}; };
virtual void Init(Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) = 0; virtual void Init(v8::Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) = 0;
virtual void Translate(TransLocation*) = 0; virtual void Translate(TransLocation*) = 0;
virtual void TranslateBack(TransLocation*) = 0; virtual void TranslateBack(TransLocation*) = 0;
virtual ~TranslatorImpl() {} virtual ~TranslatorImpl() {}
...@@ -56,23 +43,24 @@ class WasmTranslation::TranslatorImpl { ...@@ -56,23 +43,24 @@ class WasmTranslation::TranslatorImpl {
class WasmTranslation::TranslatorImpl::RawTranslator class WasmTranslation::TranslatorImpl::RawTranslator
: public WasmTranslation::TranslatorImpl { : public WasmTranslation::TranslatorImpl {
public: public:
void Init(Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) {} void Init(v8::Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) {}
void Translate(TransLocation*) {} void Translate(TransLocation*) {}
void TranslateBack(TransLocation*) {} void TranslateBack(TransLocation*) {}
}; };
class WasmTranslation::TranslatorImpl::DisassemblingTranslator class WasmTranslation::TranslatorImpl::DisassemblingTranslator
: public WasmTranslation::TranslatorImpl { : public WasmTranslation::TranslatorImpl {
using OffsetTable = debug::WasmDisassembly::OffsetTable; using OffsetTable = v8::debug::WasmDisassembly::OffsetTable;
public: public:
DisassemblingTranslator(Isolate* isolate, Local<debug::WasmScript> script) DisassemblingTranslator(v8::Isolate* isolate,
v8::Local<v8::debug::WasmScript> script)
: script_(isolate, script) {} : script_(isolate, script) {}
void Init(Isolate* isolate, WasmTranslation* translation, void Init(v8::Isolate* isolate, WasmTranslation* translation,
V8DebuggerAgentImpl* agent) override { V8DebuggerAgentImpl* agent) override {
// Register fake scripts for each function in this wasm module/script. // Register fake scripts for each function in this wasm module/script.
Local<debug::WasmScript> script = script_.Get(isolate); v8::Local<v8::debug::WasmScript> script = script_.Get(isolate);
int num_functions = script->NumFunctions(); int num_functions = script->NumFunctions();
int num_imported_functions = script->NumImportedFunctions(); int num_imported_functions = script->NumImportedFunctions();
DCHECK_LE(0, num_imported_functions); DCHECK_LE(0, num_imported_functions);
...@@ -163,7 +151,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator ...@@ -163,7 +151,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
private: private:
String16 GetFakeScriptUrl(v8::Isolate* isolate, int func_index) { String16 GetFakeScriptUrl(v8::Isolate* isolate, int func_index) {
Local<debug::WasmScript> script = script_.Get(isolate); v8::Local<v8::debug::WasmScript> script = script_.Get(isolate);
String16 script_name = toProtocolString(script->Name().ToLocalChecked()); String16 script_name = toProtocolString(script->Name().ToLocalChecked());
int numFunctions = script->NumFunctions(); int numFunctions = script->NumFunctions();
int numImported = script->NumImportedFunctions(); int numImported = script->NumImportedFunctions();
...@@ -195,9 +183,10 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator ...@@ -195,9 +183,10 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
String16 fake_script_id = GetFakeScriptId(underlyingScriptId, func_idx); String16 fake_script_id = GetFakeScriptId(underlyingScriptId, func_idx);
String16 fake_script_url = GetFakeScriptUrl(isolate, func_idx); String16 fake_script_url = GetFakeScriptUrl(isolate, func_idx);
v8::Local<debug::WasmScript> script = script_.Get(isolate); v8::Local<v8::debug::WasmScript> script = script_.Get(isolate);
// TODO(clemensh): Generate disassembly lazily when queried by the frontend. // TODO(clemensh): Generate disassembly lazily when queried by the frontend.
debug::WasmDisassembly disassembly = script->DisassembleFunction(func_idx); v8::debug::WasmDisassembly disassembly =
script->DisassembleFunction(func_idx);
DCHECK_EQ(0, offset_tables_.count(func_idx)); DCHECK_EQ(0, offset_tables_.count(func_idx));
offset_tables_.insert( offset_tables_.insert(
...@@ -254,7 +243,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator ...@@ -254,7 +243,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
return &inserted.first->second; return &inserted.first->second;
} }
Global<debug::WasmScript> script_; v8::Global<v8::debug::WasmScript> script_;
// We assume to only disassemble a subset of the functions, so store them in a // We assume to only disassemble a subset of the functions, so store them in a
// map instead of an array. // map instead of an array.
...@@ -267,7 +256,7 @@ WasmTranslation::WasmTranslation(v8::Isolate* isolate) ...@@ -267,7 +256,7 @@ WasmTranslation::WasmTranslation(v8::Isolate* isolate)
WasmTranslation::~WasmTranslation() { Clear(); } WasmTranslation::~WasmTranslation() { Clear(); }
void WasmTranslation::AddScript(Local<debug::WasmScript> script, void WasmTranslation::AddScript(v8::Local<v8::debug::WasmScript> script,
V8DebuggerAgentImpl* agent) { V8DebuggerAgentImpl* agent) {
std::unique_ptr<TranslatorImpl> impl; std::unique_ptr<TranslatorImpl> impl;
switch (mode_) { switch (mode_) {
...@@ -338,3 +327,5 @@ void WasmTranslation::AddFakeScript(const String16& scriptId, ...@@ -338,3 +327,5 @@ void WasmTranslation::AddFakeScript(const String16& scriptId,
DCHECK_EQ(0, fake_scripts_.count(scriptId)); DCHECK_EQ(0, fake_scripts_.count(scriptId));
fake_scripts_.insert(std::make_pair(scriptId, translator)); fake_scripts_.insert(std::make_pair(scriptId, translator));
} }
} // namespace v8_inspector
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment