[inspector] restore provisional breakpoints smarter

src/inspector/v8-debugger-script.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/inspector/v8-debugger-script.h"
 
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/string-util.h"
 #include "src/inspector/wasm-translation.h"
 
@@ skipping 115 matching lines @@
       m_endColumn = m_startColumn;
     }
 
     v8::Local<v8::Value> contextData;
     if (script->ContextData().ToLocal(&contextData) && contextData->IsInt32()) {
       m_executionContextId =
           static_cast<int>(contextData.As<v8::Int32>()->Value());
     }
 
     if (script->Source().ToLocal(&tmp)) {
-      m_sourceObj.Reset(m_isolate, tmp);
-      String16 source = toProtocolString(tmp);
+      m_source = toProtocolString(tmp);
       // V8 will not count last line if script source ends with \n.
-      if (source.length() > 1 && source[source.length() - 1] == '\n') {
+      if (m_source.length() > 1 && m_source[m_source.length() - 1] == '\n') {

[alph, 2017/02/28 00:47:26]

nit: > 0

[kozy, 2017/02/28 01:56:26]

Done.

         m_endLine++;
         m_endColumn = 0;
       }
     }
 
     m_isModule = script->IsModule();
 
     m_script.Reset(m_isolate, script);
   }
 
   bool isLiveEdit() const override { return m_isLiveEdit; }
   bool isModule() const override { return m_isModule; }
 
   const String16& sourceMappingURL() const override {
     return m_sourceMappingURL;
   }
 
-  String16 source(v8::Isolate* isolate) const override {
-    if (!m_sourceObj.IsEmpty())
-      return toProtocolString(m_sourceObj.Get(isolate));
-    return V8DebuggerScript::source(isolate);
-  }
-
   void setSourceMappingURL(const String16& sourceMappingURL) override {
     m_sourceMappingURL = sourceMappingURL;
   }
 
-  void setSource(v8::Local<v8::String> source) override {
-    m_source = String16();
-    m_sourceObj.Reset(m_isolate, source);
-    m_hash = String16();
-  }
-
   bool getPossibleBreakpoints(
       const v8::debug::Location& start, const v8::debug::Location& end,
       bool restrictToFunction,
       std::vector<v8::debug::Location>* locations) override {
     v8::HandleScope scope(m_isolate);
     v8::Local<v8::debug::Script> script = m_script.Get(m_isolate);
     return script->GetPossibleBreakpoints(start, end, restrictToFunction,
                                           locations);
   }
 
   void resetBlackboxedStateCache() override {
     v8::HandleScope scope(m_isolate);
     v8::debug::ResetBlackboxedStateCache(m_isolate, m_script.Get(m_isolate));
   }
 
+  int offset(int lineNumber, int columnNumber) const override {
+    v8::HandleScope scope(m_isolate);
+    return m_script.Get(m_isolate)->GetSourceOffset(
+        v8::debug::Location(lineNumber, columnNumber));
+  }
+
+  v8::debug::Location location(int offset) const override {
+    v8::HandleScope scope(m_isolate);
+    return m_script.Get(m_isolate)->GetSourceLocation(offset);
+  }
+
  private:
   String16 GetNameOrSourceUrl(v8::Local<v8::debug::Script> script) {
     v8::Local<v8::String> name;
     if (script->Name().ToLocal(&name) || script->SourceURL().ToLocal(&name))
       return toProtocolString(name);
     return String16();
   }
 
   String16 m_sourceMappingURL;
-  v8::Global<v8::String> m_sourceObj;
   bool m_isLiveEdit = false;
   bool m_isModule = false;
   v8::Global<v8::debug::Script> m_script;
 };
 
 class WasmVirtualScript : public V8DebuggerScript {
   friend class V8DebuggerScript;
 
  public:
   WasmVirtualScript(v8::Isolate* isolate, WasmTranslation* wasmTranslation,
@@ skipping 46 matching lines @@
         translatedStart, translatedEnd, restrictToFunction, locations);
     for (v8::debug::Location& loc : *locations) {
       TranslateV8LocationToProtocolLocation(m_wasmTranslation, &loc, v8ScriptId,
                                             scriptId());
     }
     return success;
   }
 
   void resetBlackboxedStateCache() override {}
 
+  int offset(int lineNumber, int columnNumber) const override {
+    return kNoOffset;
+  }
+
+  v8::debug::Location location(int offset) const override {
+    return v8::debug::Location();
+  }
+
  private:
   static const String16& emptyString() {
     static const String16 singleEmptyString;
     return singleEmptyString;
   }
 
   v8::Global<v8::debug::WasmScript> m_script;
   WasmTranslation* m_wasmTranslation;
 };
 
@@ skipping 18 matching lines @@
 V8DebuggerScript::V8DebuggerScript(v8::Isolate* isolate, String16 id,
                                    String16 url)
     : m_id(std::move(id)), m_url(std::move(url)), m_isolate(isolate) {}
 
 V8DebuggerScript::~V8DebuggerScript() {}
 
 const String16& V8DebuggerScript::sourceURL() const {
   return m_sourceURL.isEmpty() ? m_url : m_sourceURL;
 }
 
-const String16& V8DebuggerScript::hash(v8::Isolate* isolate) const {
-  if (m_hash.isEmpty()) m_hash = calculateHash(source(isolate));
+const String16& V8DebuggerScript::hash() const {
+  if (m_hash.isEmpty()) m_hash = calculateHash(source());
   DCHECK(!m_hash.isEmpty());
   return m_hash;
 }
 
 void V8DebuggerScript::setSourceURL(const String16& sourceURL) {
   m_sourceURL = sourceURL;
 }
 
 }  // namespace v8_inspector