Reviewed by Darin.

        Bug 9632: [Drosera] syntax highlighting is slow (reproducible 40 second hang)
        http://bugzilla.opendarwin.org/show_bug.cgi?id=9632

        Do not change the file source when normalizing the line endings.
        We use this file source to compare against new versions of the source
        as it comes in, so we can skip re-syntax highlighting if they are the same.
        The problem is apparent on yahoo.com since they have mixed line endings and
        once we normalize them the source will always be different. This was
        compounded by the fact that yahoo has around 40 inline scripts. Each
        inline script causes us to check if the main document has more loaded,
        that is when we compare the source strings. Since they are always different
        we would syntax highlight yahoo.com 40 times! We do check source length before
        doing a more expensive string comparison, but the lengths were the same.

        * Drosera/debugger.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4c115b9fea2af5cd4fd1adb476851721e595d149..91bfda47d09bbb0a5033cff7077a2de88ee09b54 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2006-08-02  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        Bug 9632: [Drosera] syntax highlighting is slow (reproducible 40 second hang)
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=9632
+
+        Do not change the file source when normalizing the line endings.
+        We use this file source to compare against new versions of the source
+        as it comes in, so we can skip re-syntax highlighting if they are the same.
+        The problem is apparent on yahoo.com since they have mixed line endings and
+        once we normalize them the source will always be different. This was
+        compounded by the fact that yahoo has around 40 inline scripts. Each
+        inline script causes us to check if the main document has more loaded,
+        that is when we compare the source strings. Since they are always different
+        we would syntax highlight yahoo.com 40 times! We do check source length before
+        doing a more expensive string comparison, but the lengths were the same.
+
+        * Drosera/debugger.js:
+
 2006-08-02  Niels Leenheer  <niels.leenheer@gmail.com>
 
         Reviewed by Timothy.

diff --git a/WebKitTools/Drosera/debugger.js b/WebKitTools/Drosera/debugger.js
index 40360c858b463d7ad855a8da2fd6d54dde319195..474d65b073f91e9693dcbd732d5fa7c5876691da 100644 (file)
--- a/WebKitTools/Drosera/debugger.js
+++ b/WebKitTools/Drosera/debugger.js
@@ -674,8 +674,6 @@ function loadFile(fileIndex, manageNavLists)
         files[currentFile].element.style.display = "none";
 
     if (!file.loaded) {
-        file.source = file.source.replace(/\r\n|\r/, "\n"); // normalize line endings
-
         var sourcesDocument = document.getElementById("sources").contentDocument;
         var sourcesDiv = sourcesDocument.body;
         var sourceDiv = sourcesDocument.createElement("div");
@@ -686,7 +684,8 @@ function loadFile(fileIndex, manageNavLists)
         var table = sourcesDocument.createElement("table");
         sourceDiv.appendChild(table);
 
-        var lines = syntaxHighlight(file.source).split("\n");
+        var normalizedSource = file.source.replace(/\r\n|\r/, "\n"); // normalize line endings
+        var lines = syntaxHighlight(normalizedSource).split("\n");
         for( var i = 0; i < lines.length; i++ ) {
             var tr = sourcesDocument.createElement("tr");
             var td = sourcesDocument.createElement("td");
@@ -756,6 +755,7 @@ function didParseScript(source, fileSource, url, sourceId, baseLineNumber)
     var fileIndex = filesLookup[url];
     var file = files[fileIndex];
     var firstLoad = false;
+
     if (!fileIndex || !file) {
         fileIndex = files.length + 1;
         if (url.length)