2011-01-06 James Simonsen <simonjam@chromium.org>
authorsimonjam@chromium.org <simonjam@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jan 2011 22:39:29 +0000 (22:39 +0000)
committersimonjam@chromium.org <simonjam@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jan 2011 22:39:29 +0000 (22:39 +0000)
        Reviewed by Darin Fisher.

        [Web Timing] Remove vendor prefix
        https://bugs.webkit.org/show_bug.cgi?id=48922

        * fast/dom/Window/window-properties-performance-expected.txt: Test replaceability.
        * fast/dom/Window/window-properties-performance.html: Ditto.
        * fast/dom/Window/window-properties.html: Rename to performance.
        * fast/dom/resources/navigation-type-matches-querystring.html: Ditto.
        * fast/dom/script-tests/prototype-inheritance.js: Ditto.
        * fast/dom/script-tests/webtiming-document-open.js: Ditto.
        * fast/dom/script-tests/webtiming-navigate-within-document.js: Ditto.
        * fast/dom/script-tests/webtiming.js: Ditto.
        * http/tests/misc/resources/webtiming-one-redirect.html: Ditto.
        * http/tests/misc/resources/webtiming-two-redirects.html: Ditto.
2011-01-06  James Simonsen  <simonjam@chromium.org>

        Reviewed by Darin Fisher.

        [Web Timing] Remove vendor prefix
        https://bugs.webkit.org/show_bug.cgi?id=48922

        * page/DOMWindow.cpp:
        (WebCore::DOMWindow::performance): Rename to performance.
        * page/DOMWindow.h:
        * page/DOMWindow.idl: Rename to performance and make replaceable.
2011-01-06  James Simonsen  <simonjam@chromium.org>

        Reviewed by Darin Fisher.

        [Web Timing] Remove vendor prefix
        https://bugs.webkit.org/show_bug.cgi?id=48922

        * src/WebFrameImpl.cpp:
        (WebKit::WebFrameImpl::performance): Rename to performance.

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

23 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
LayoutTests/fast/dom/Window/window-properties-performance.html
LayoutTests/fast/dom/Window/window-properties.html
LayoutTests/fast/dom/resources/navigation-type-matches-querystring.html
LayoutTests/fast/dom/script-tests/prototype-inheritance.js
LayoutTests/fast/dom/script-tests/webtiming-document-open.js
LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js
LayoutTests/fast/dom/script-tests/webtiming.js
LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html
LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html
LayoutTests/http/tests/misc/resources/webtiming-no-origin.html
LayoutTests/http/tests/misc/resources/webtiming-one-redirect.html
LayoutTests/http/tests/misc/resources/webtiming-ssl.html
LayoutTests/http/tests/misc/resources/webtiming-two-redirects.html
LayoutTests/http/tests/misc/webtiming-slow-load.php
LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt
WebCore/ChangeLog
WebCore/page/DOMWindow.cpp
WebCore/page/DOMWindow.h
WebCore/page/DOMWindow.idl
WebKit/chromium/ChangeLog
WebKit/chromium/src/WebFrameImpl.cpp

index a52e5ab..0d92c59 100644 (file)
@@ -1,3 +1,21 @@
+2011-01-06  James Simonsen  <simonjam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Web Timing] Remove vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=48922
+
+        * fast/dom/Window/window-properties-performance-expected.txt: Test replaceability.
+        * fast/dom/Window/window-properties-performance.html: Ditto.
+        * fast/dom/Window/window-properties.html: Rename to performance.
+        * fast/dom/resources/navigation-type-matches-querystring.html: Ditto.
+        * fast/dom/script-tests/prototype-inheritance.js: Ditto.
+        * fast/dom/script-tests/webtiming-document-open.js: Ditto.
+        * fast/dom/script-tests/webtiming-navigate-within-document.js: Ditto.
+        * fast/dom/script-tests/webtiming.js: Ditto.
+        * http/tests/misc/resources/webtiming-one-redirect.html: Ditto.
+        * http/tests/misc/resources/webtiming-two-redirects.html: Ditto.
+
 2011-01-06  Tony Gentilcore  <tonyg@chromium.org>
 
         Reviewed by Eric Seidel.
index 592e1e2..4276728 100644 (file)
@@ -1,36 +1,39 @@
-This test dumps all of the properties that are reachable from the window.webkitPerformance object, along with their types.
+This test dumps all of the properties that are reachable from the window.performance object, along with their types.
 
-window.webkitPerformance [object Performance]
-window.webkitPerformance.memory [object MemoryInfo]
-window.webkitPerformance.memory.totalJSHeapSize [number]
-window.webkitPerformance.memory.usedJSHeapSize [number]
-window.webkitPerformance.navigation [object PerformanceNavigation]
-window.webkitPerformance.navigation.TYPE_BACK_FORWARD [number]
-window.webkitPerformance.navigation.TYPE_NAVIGATE [number]
-window.webkitPerformance.navigation.TYPE_RELOAD [number]
-window.webkitPerformance.navigation.TYPE_RESERVED [number]
-window.webkitPerformance.navigation.redirectCount [number]
-window.webkitPerformance.navigation.type [number]
-window.webkitPerformance.timing [object PerformanceTiming]
-window.webkitPerformance.timing.connectEnd [number]
-window.webkitPerformance.timing.connectStart [number]
-window.webkitPerformance.timing.domComplete [number]
-window.webkitPerformance.timing.domContentLoadedEventEnd [number]
-window.webkitPerformance.timing.domContentLoadedEventStart [number]
-window.webkitPerformance.timing.domInteractive [number]
-window.webkitPerformance.timing.domLoading [number]
-window.webkitPerformance.timing.domainLookupEnd [number]
-window.webkitPerformance.timing.domainLookupStart [number]
-window.webkitPerformance.timing.fetchStart [number]
-window.webkitPerformance.timing.loadEventEnd [number]
-window.webkitPerformance.timing.loadEventStart [number]
-window.webkitPerformance.timing.navigationStart [number]
-window.webkitPerformance.timing.redirectEnd [number]
-window.webkitPerformance.timing.redirectStart [number]
-window.webkitPerformance.timing.requestStart [number]
-window.webkitPerformance.timing.responseEnd [number]
-window.webkitPerformance.timing.responseStart [number]
-window.webkitPerformance.timing.sslHandshakeStart [number]
-window.webkitPerformance.timing.unloadEventEnd [number]
-window.webkitPerformance.timing.unloadEventStart [number]
+window.performance [object Performance]
+window.performance.memory [object MemoryInfo]
+window.performance.memory.totalJSHeapSize [number]
+window.performance.memory.usedJSHeapSize [number]
+window.performance.navigation [object PerformanceNavigation]
+window.performance.navigation.TYPE_BACK_FORWARD [number]
+window.performance.navigation.TYPE_NAVIGATE [number]
+window.performance.navigation.TYPE_RELOAD [number]
+window.performance.navigation.TYPE_RESERVED [number]
+window.performance.navigation.redirectCount [number]
+window.performance.navigation.type [number]
+window.performance.timing [object PerformanceTiming]
+window.performance.timing.connectEnd [number]
+window.performance.timing.connectStart [number]
+window.performance.timing.domComplete [number]
+window.performance.timing.domContentLoadedEventEnd [number]
+window.performance.timing.domContentLoadedEventStart [number]
+window.performance.timing.domInteractive [number]
+window.performance.timing.domLoading [number]
+window.performance.timing.domainLookupEnd [number]
+window.performance.timing.domainLookupStart [number]
+window.performance.timing.fetchStart [number]
+window.performance.timing.loadEventEnd [number]
+window.performance.timing.loadEventStart [number]
+window.performance.timing.navigationStart [number]
+window.performance.timing.redirectEnd [number]
+window.performance.timing.redirectStart [number]
+window.performance.timing.requestStart [number]
+window.performance.timing.responseEnd [number]
+window.performance.timing.responseStart [number]
+window.performance.timing.sslHandshakeStart [number]
+window.performance.timing.unloadEventEnd [number]
+window.performance.timing.unloadEventStart [number]
+window.performance.timing [printed above as window.performance.timing]
+window.performance.navigation [printed above as window.performance.navigation]
+window.performance [string]
 
index f3ecc95..ac4eda0 100644 (file)
@@ -1,4 +1,4 @@
-<p>This test dumps all of the properties that are reachable from the window.webkitPerformance object, along with their types.</p>
+<p>This test dumps all of the properties that are reachable from the window.performance object, along with their types.</p>
 <hr>
 <pre id="pre"></pre>
 
@@ -88,6 +88,12 @@ function logProperties(object, objectName)
     }
 }
 
-logValue('window.webkitPerformance');
+logValue('window.performance');
+window.performance.timing = 'timing is not replaceable';
+logValue('window.performance.timing');
+window.performance.navigation = 'navigation is not replaceable';
+logValue('window.performance.navigation');
+window.performance = 'performance is replaceable';
+logValue('window.performance');
 flushLog();
 </script>
index 241113a..83bcc77 100644 (file)
@@ -88,7 +88,7 @@ var __skip__ = {
     "window.ondeviceorientation" : 1,
     "window.DeviceMotionEvent" : 1,
     "window.ondevicemotion" : 1,
-    "window.webkitPerformance" : 1,
+    "window.performance" : 1,
     "window.createObjectURL" : 1,
     "window.revokeObjectURL" : 1,
 
index 94dc1dc..4d15b0a 100644 (file)
@@ -12,7 +12,7 @@
 
     description("This tests that performance.navigation.type is " + expectedType);
 
-    var performance = window.webkitPerformance || {};
+    var performance = window.performance || {};
     var navigation = performance.navigation || {};
     shouldBe("navigation.type", stringify(expectedType));
 
index 921aa34..eb78009 100644 (file)
@@ -14,7 +14,7 @@ var skippedProperties = [
     "appleScriptController", "plainText", "accessibilityController",
     // Ignore these properties because they do not exist in all implementations. They will be tested separately
     "webkitNotifications",
-    "webkitPerformance",
+    "performance",
     "WebGLRenderingContext", "WebGLActiveInfo", "WebGLBuffer", "WebGLFramebuffer", "WebGLProgram", "WebGLRenderbuffer", "WebGLShader", "WebGLTexture", "WebGLUniformLocation",
     "ArrayBuffer",
     "DataView", "Int8Array", "Uint8Array", "Int16Array", "Uint16Array", "Int32Array", "Uint32Array", "Float32Array",
index d0679a2..257d2d8 100644 (file)
@@ -1,4 +1,4 @@
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 var originalTiming = {};
index b635305..af862e3 100644 (file)
@@ -1,6 +1,6 @@
 description("This test checks that navigating within the document does not reset Web Timing numbers.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var timing = performance.timing || {};
 
 function checkTimingNotChanged()
index 3016021..9621f8b 100644 (file)
@@ -1,6 +1,6 @@
 description("This test checks that all of the <a href='http://dev.w3.org/2006/webapi/WebTiming/'>Web Timing</a> attributes are available and have reasonable values in the right order.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index d66a05f..fccf25c 100644 (file)
@@ -10,7 +10,7 @@
 <script>
 description("If the destination and previous page have the same origin, then Web Timing should report unload timing.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index 7dd3dc1..5cf1d25 100644 (file)
@@ -10,7 +10,7 @@
 <script>
 description("Web Timing should zero out redirect stats after a cross-origin redirect.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index ed361eb..ba5a513 100644 (file)
@@ -10,7 +10,7 @@
 <script>
 description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index 2dfd807..592c15d 100644 (file)
@@ -10,7 +10,7 @@
 <script>
 description("This test checks that Web Timing reports redirectCount correctly and has reasonable values for redirectStart and redirectCount.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index 72dcc2c..c085000 100644 (file)
@@ -12,7 +12,7 @@
 <script>
 description("This test checks that Web Timing reports sslHandshakeStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set sslHandshakeStart.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index e4bfa04..c2ce697 100644 (file)
@@ -10,7 +10,7 @@
 <script>
 description("This test checks that Web Timing reports redirectCount correctly and has reasonable values for redirectStart and redirectCount.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index 905944c..693280d 100644 (file)
@@ -12,7 +12,7 @@
 <script>
 description("Verifies that requestStart and responseStart are available before the main document has finished loading.");
 
-var performance = window.webkitPerformance || {};
+var performance = window.performance || {};
 var navigation = performance.navigation || {};
 var timing = performance.timing || {};
 
index dc1ece8..877705e 100644 (file)
@@ -440,6 +440,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'pageYOffset') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'parent') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'parseFloat') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'parseInt') is 'object'
+PASS typeof Object.getOwnPropertyDescriptor(window, 'performance') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'personalbar') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'protoPropertyNames') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'protoPropertySet') is 'object'
@@ -479,7 +480,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') 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.
index 9c5fd00..4101c31 100644 (file)
@@ -1,3 +1,15 @@
+2011-01-06  James Simonsen  <simonjam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Web Timing] Remove vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=48922
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::performance): Rename to performance.
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl: Rename to performance and make replaceable.
+
 2011-01-06  Chris Marrin  <cmarrin@apple.com>
 
         Reviewed by Simon Fraser.
index 0ab8912..99bf6ea 100644 (file)
@@ -592,7 +592,7 @@ Navigator* DOMWindow::navigator() const
 }
 
 #if ENABLE(WEB_TIMING)
-Performance* DOMWindow::webkitPerformance() const
+Performance* DOMWindow::performance() const
 {
     if (!m_performance)
         m_performance = Performance::create(m_frame);
index 4f68ed3..8680bc5 100644 (file)
@@ -409,8 +409,8 @@ namespace WebCore {
 #endif
 
 #if ENABLE(WEB_TIMING)
-        Performance* webkitPerformance() const;
-        Performance* optionalWebkitPerformance() const { return m_performance.get(); }
+        Performance* performance() const;
+        Performance* optionalPerformance() const { return m_performance.get(); }
 #endif
 
     private:
index 3718108..89b37c1 100644 (file)
@@ -222,8 +222,7 @@ module window {
 #endif
 
 #if defined(ENABLE_WEB_TIMING) && ENABLE_WEB_TIMING
-        // FIXME: Remove vendor prefix.
-        readonly attribute Performance webkitPerformance;
+        attribute [Replaceable] Performance performance;
 #endif
 
         // Timers
index 7d512b0..78d4657 100644 (file)
@@ -1,3 +1,13 @@
+2011-01-06  James Simonsen  <simonjam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Web Timing] Remove vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=48922
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::performance): Rename to performance.
+
 2011-01-06  James Robinson  <jamesr@chromium.org>
 
         Reviewed by Simon Fraser.
index 1519d35..5baf73b 100644 (file)
@@ -713,7 +713,7 @@ WebPerformance WebFrameImpl::performance() const
     if (!m_frame || !m_frame->domWindow())
         return WebPerformance();
 
-    return WebPerformance(m_frame->domWindow()->webkitPerformance());
+    return WebPerformance(m_frame->domWindow()->performance());
 }
 
 WebSecurityOrigin WebFrameImpl::securityOrigin() const