Changeset 139777 in webkit

Timestamp:

Jan 15, 2013 12:57:59 PM (11 years ago)

Author:

simonjam@chromium.org

Message:

[User Timing] INVALID_ACCESS_ERR should be thrown if measuring from a 0 Nav Timing value
​https://bugs.webkit.org/show_bug.cgi?id=106935

Reviewed by Tony Gentilcore.

Source/WebCore:

Test: http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html

• page/PerformanceUserTiming.cpp:

(WebCore::UserTiming::findExistingMarkStartTime):

LayoutTests:

• http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception-expected.txt:
• http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/PerformanceUserTiming.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-15  James Simonsen  <simonjam@chromium.org>
+
+        [User Timing] INVALID_ACCESS_ERR should be thrown if measuring from a 0 Nav Timing value
+        https://bugs.webkit.org/show_bug.cgi?id=106935
+
+        Reviewed by Tony Gentilcore.
+
+        * http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception-expected.txt:
+        * http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html:
+
 2013-01-13  Dirk Schulze  <dschulze@adobe.com>
 

trunk/LayoutTests/http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception-expected.txt

@@ -11 +11 @@
 PASS Invocation of context.measure("Exception5", "ExistMark", "NonExistMark1") should throw SYNTAX_ERR Exception. 
 PASS Invocation of context.measure("Exception6", "NonExistMark1", "NonExistMark2") should throw SYNTAX_ERR Exception. 
+PASS Invocation of context.measure("Exception7", "redirectStart") should throw INVALID_ACCESS_ERR Exception. 
 

trunk/LayoutTests/http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html

@@ -26 +26 @@
         test_method_throw_exception('context.measure("Exception5", "ExistMark", "NonExistMark1")', 'SYNTAX_ERR');
         test_method_throw_exception('context.measure("Exception6", "NonExistMark1", "NonExistMark2")', 'SYNTAX_ERR');
+        test_method_throw_exception('context.measure("Exception7", "redirectStart")', 'INVALID_ACCESS_ERR');
         </script>
     </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  James Simonsen  <simonjam@chromium.org>
+
+        [User Timing] INVALID_ACCESS_ERR should be thrown if measuring from a 0 Nav Timing value
+        https://bugs.webkit.org/show_bug.cgi?id=106935
+
+        Reviewed by Tony Gentilcore.
+
+        Test: http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_measure_exception.html
+
+        * page/PerformanceUserTiming.cpp:
+        (WebCore::UserTiming::findExistingMarkStartTime):
+
 2013-01-15  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/page/PerformanceUserTiming.cpp

@@ -124 +124 @@
         return m_marksMap.get(markName).last()->startTime();
 
-    if (restrictedKeyMap().contains(markName))
-        return static_cast<double>((m_performance->timing()->*(restrictedKeyMap().get(markName)))()) - m_performance->timing()->navigationStart();
+    if (restrictedKeyMap().contains(markName)) {
+        double value = static_cast<double>((m_performance->timing()->*(restrictedKeyMap().get(markName)))());
+        if (!value) {
+            ec = INVALID_ACCESS_ERR;
+            return 0.0;
+        }
+        return value - m_performance->timing()->navigationStart();
+    }
 
     ec = SYNTAX_ERR;