[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit bc7d9e244985cf28c4c51332ae02448db5e00c09
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 4 01:46:22 2010 +0000

    2010-12-03  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            Rebaseline server: use pretty text diff output
            https://bugs.webkit.org/show_bug.cgi?id=50484
    
            Serve *-pretty-diff.html for text diff output.
    
            * Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html:
            * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css:
            * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js:
            * Scripts/webkitpy/tool/commands/rebaselineserver.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ea0f836..f35a4ea 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-03  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Rebaseline server: use pretty text diff output
+        https://bugs.webkit.org/show_bug.cgi?id=50484
+        
+        Serve *-pretty-diff.html for text diff output.
+
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html:
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css:
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js:
+        * Scripts/webkitpy/tool/commands/rebaselineserver.py:
+
 2010-12-03  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r73302.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html
index 5b58301..8bdf7c2 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html
@@ -112,9 +112,9 @@
       <td colspan="3"><h2>Text</h2></td>
     </tr>
     <tr>
-      <td><pre id="expected-text"></pre></td>
-      <td><pre id="actual-text"></pre></td>
-      <td><pre id="diff-text"><pre></td>
+      <td><pre id="expected-text" class="text-output"></pre></td>
+      <td><pre id="actual-text" class="text-output"></pre></td>
+      <td><div id="diff-text-pretty" class="text-output"></div></td>
     </tr>
   </tbody>
 </table>
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css
index aff2bf6..76643c5 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css
@@ -180,7 +180,7 @@ a, .link {
   color: #666;
 }
 
-#text-outputs pre {
+#text-outputs .text-output {
   height: 600px;
   width: 800px;
   overflow: auto;
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js
index 92f7b7d..aeaac04 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js
@@ -486,10 +486,14 @@ function updateImageDiff() {
     }
 }
 
-function loadTextResult(testName, mode)
+function loadTextResult(testName, mode, responseIsHtml)
 {
     loadText(getTestResultUrl(testName, mode), function(text) {
-        $(mode).textContent = text;
+        if (responseIsHtml) {
+            $(mode).innerHTML = text;
+        } else {
+            $(mode).textContent = text;
+        }
     });
 }
 
@@ -497,7 +501,7 @@ function displayTextResults(testName)
 {
     loadTextResult(testName, 'expected-text');
     loadTextResult(testName, 'actual-text');
-    loadTextResult(testName, 'diff-text');
+    loadTextResult(testName, 'diff-text-pretty', true);
 }
 
 function nextTest()
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py b/WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py
index ad51f2d..56780b5 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py
@@ -173,6 +173,8 @@ class RebaselineHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             file_name = test_name + '-actual.txt'
         elif mode == 'diff-text':
             file_name = test_name + '-diff.txt'
+        elif mode == 'diff-text-pretty':
+            file_name = test_name + '-pretty-diff.html'
 
         file_path = os.path.join(self.server.test_config.results_directory, file_name)
 

-- 
WebKit Debian packaging