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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 44fc828aed782b461c71cfd8c010fc124268d072
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 06:49:09 2010 +0000

    2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Enable Web Timing for Qt
            https://bugs.webkit.org/show_bug.cgi?id=42433
    
            * fast/dom/webtiming-document-open-expected.txt:
              Add an extra line to the expected results.
    
            * platform/qt/Skipped: Enable Web Timing tests.
    
            * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
              Add webkitPerformance property.
    2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Enable Web Timing for Qt
            https://bugs.webkit.org/show_bug.cgi?id=42433
    
            * features.pri: Enable Web Timing for trunk (but not yet for
              production)
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 88f5e87..0910b70 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Enable Web Timing for Qt
+        https://bugs.webkit.org/show_bug.cgi?id=42433
+
+        * fast/dom/webtiming-document-open-expected.txt:
+          Add an extra line to the expected results.
+
+        * platform/qt/Skipped: Enable Web Timing tests.
+
+        * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
+          Add webkitPerformance property.
+
 2010-12-02  Yuta Kitamura  <yutak at chromium.org>
 
         Unreviewed.
diff --git a/LayoutTests/fast/dom/webtiming-document-open-expected.txt b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
index 7080cf6..fcb12e6 100644
--- a/LayoutTests/fast/dom/webtiming-document-open-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
@@ -26,3 +26,4 @@ PASS timing.unloadEventStart is originalTiming.unloadEventStart
 PASS successfullyParsed is true
 
 TEST COMPLETE
+
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 4840a79..34f49a2 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5202,15 +5202,7 @@ printing/setPrinting.html
 
 # Web Timing is not enabled.
 # https://bugs.webkit.org/show_bug.cgi?id=42433
-fast/dom/Window/window-properties-performance.html
-fast/dom/navigation-type-back-forward.html
-fast/dom/navigation-type-navigate.html
-fast/dom/navigation-type-reload.html
 fast/dom/webtiming.html
-fast/dom/webtiming-document-open.html
-fast/dom/webtiming-navigate-within-document.html
-http/tests/misc/webtiming-one-redirect.php
-http/tests/misc/webtiming-two-redirects.php
 
 # Advanced credential handling
 http/tests/security/401-logout/401-logout.php
diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt
index f8bc62d..2dd9452 100644
--- a/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt
@@ -472,6 +472,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'top') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitNotifications') is 'object'
+PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitPerformance') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object'
 PASS Object.getOwnPropertyDescriptor(window, '__defineGetter__') is undefined.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2941f0c..eb4bc73 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Enable Web Timing for Qt
+        https://bugs.webkit.org/show_bug.cgi?id=42433
+
+        * features.pri: Enable Web Timing for trunk (but not yet for
+          production)
+
 2010-12-02  Andy Estes  <aestes at apple.com>
 
         Rubber-stamped by Mark Rowe.
diff --git a/WebCore/features.pri b/WebCore/features.pri
index 3ed1da1..72be70f 100644
--- a/WebCore/features.pri
+++ b/WebCore/features.pri
@@ -6,6 +6,7 @@ CONFIG(minimal) {
 
 CONFIG(production) {
     DEFINES += ENABLE_XSLT=0
+    DEFINES += ENABLE_WEB_TIMING=0
 }
 
 meegotouch {
@@ -104,7 +105,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
 
 # Web Timing support.
-!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=0
+!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=1
 
 # XSLT support with QtXmlPatterns
 !contains(DEFINES, ENABLE_XSLT=.) {

-- 
WebKit Debian packaging