Simplify remote debugging

As @iradul suggested, simplify resource loading in remote debug mode. After this change we don't need remote_debugger_harness.html anymore. And breakpoints will work now again. Issue #12864
ariya · Aug 6, 2015 · 8b79f62 · 8b79f62
1 parent 44e50f4
commit 8b79f62
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/src/phantomjs.qrc b/src/phantomjs.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>remote_debugger_harness.html</file>
         <file>phantomjs-icon.png</file>
         <file>bootstrap.js</file>
         <file>configurator.js</file>

diff --git a/src/remote_debugger_harness.html b/src/remote_debugger_harness.html
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -147,9 +147,8 @@ bool loadJSForDebug(const QString& jsFilePath, const QString& jsFileLanguage, co
     QString scriptPath = findScript(jsFilePath, libraryPath);
     QString scriptBody = jsFromScriptFile(scriptPath, jsFileLanguage, jsFileEnc);
 
-    QString remoteDebuggerHarnessSrc =  readResourceFileUtf8(":/remote_debugger_harness.html");
-    remoteDebuggerHarnessSrc = remoteDebuggerHarnessSrc.arg(scriptBody);
-    targetFrame->setHtml(remoteDebuggerHarnessSrc);
+    scriptBody = QString("function __run() {\n%1\n}").arg(scriptBody);
+    targetFrame->evaluateJavaScript(scriptBody);
 
     if (autorun) {
         targetFrame->evaluateJavaScript("__run()", QString());