[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit c6c104a4385509aef17a615e94daa95c75576b7d
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 10:17:03 2010 +0000

    2010-02-27  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: callerScriptName and callerScriptLine should be obfuscated for timeline tests.
            https://bugs.webkit.org/show_bug.cgi?id=35478
    
            * ../../LayoutTests/inspector/timeline-test.js:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 48719b9..4a7b3fe 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-27  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: callerScriptName and callerScriptLine should be obfuscated for timeline tests.
+        https://bugs.webkit.org/show_bug.cgi?id=35478
+
+        * ../../LayoutTests/inspector/timeline-test.js:
+
 2010-02-28  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/inspector/timeline-test.js b/LayoutTests/inspector/timeline-test.js
index d9b2fec..b022524 100644
--- a/LayoutTests/inspector/timeline-test.js
+++ b/LayoutTests/inspector/timeline-test.js
@@ -8,6 +8,8 @@ var timelineNonDeterministicProps = {
     identifier : 1,
     startTime : 1,
     width : 1,
+    callerScriptName: 1,
+    callerScriptLine: 1,
     url : 1
 };
 

-- 
WebKit Debian packaging