1 files changed, 25 insertions, 25 deletions
diff --git a/Source/WebCore/page/Performance.idl b/Source/WebCore/page/Performance.idl
index 53e8390db..47059b951 100644
--- a/Source/WebCore/page/Performance.idl
+++ b/Source/WebCore/page/Performance.idl
@@ -29,37 +29,37 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// See: http://dev.w3.org/2006/webapi/WebTiming/
+// https://w3c.github.io/hr-time/
+
+typedef double DOMHighResTimeStamp;
+
 [
     Conditional=WEB_TIMING,
-    EventTarget,
-] interface Performance {
-    readonly attribute PerformanceNavigation navigation;
-    readonly attribute PerformanceTiming timing;
+    Exposed=(Window,Worker),
+    GenerateIsReachable=ImplScriptExecutionContext,
+] interface Performance : EventTarget {
 
-#if defined(ENABLE_PERFORMANCE_TIMELINE) && ENABLE_PERFORMANCE_TIMELINE
-    PerformanceEntryList webkitGetEntries();
-    PerformanceEntryList webkitGetEntriesByType(DOMString entryType);
-    PerformanceEntryList webkitGetEntriesByName(DOMString name, [Default=NullString] optional DOMString entryType);
-#endif
+    DOMHighResTimeStamp now();
 
-#if defined(ENABLE_RESOURCE_TIMING) && ENABLE_RESOURCE_TIMING
-    void webkitClearResourceTimings();
-    void webkitSetResourceTimingBufferSize(unsigned long maxSize);
-
-    attribute EventListener onwebkitresourcetimingbufferfull;
-#endif
+    // https://w3c.github.io/navigation-timing/
+    readonly attribute PerformanceNavigation navigation;
+    readonly attribute PerformanceTiming timing;
 
-    // See http://www.w3.org/TR/2012/CR-user-timing-20120726/
-#if defined(ENABLE_USER_TIMING) && ENABLE_USER_TIMING
-    [RaisesException] void webkitMark(DOMString markName);
-    void webkitClearMarks([Default=NullString] optional  DOMString markName);
+    // https://w3c.github.io/performance-timeline/
+    [EnabledAtRuntime=PerformanceTimeline] PerformanceEntryList getEntries();
+    [EnabledAtRuntime=PerformanceTimeline] PerformanceEntryList getEntriesByType(DOMString entryType);
+    [EnabledAtRuntime=PerformanceTimeline] PerformanceEntryList getEntriesByName(DOMString name, optional DOMString entryType);
 
-    [RaisesException] void webkitMeasure(DOMString measureName, [Default=NullString] optional DOMString startMark, [Default=NullString] optional DOMString endMark);
-    void webkitClearMeasures([Default=NullString] optional DOMString measureName);
-#endif
+    // https://w3c.github.io/resource-timing/
+    [EnabledAtRuntime=ResourceTiming] void clearResourceTimings();
+    [EnabledAtRuntime=ResourceTiming] void setResourceTimingBufferSize(unsigned long maxSize);
+    [EnabledAtRuntime=ResourceTiming] attribute EventHandler onresourcetimingbufferfull;
 
-    // See http://www.w3.org/TR/hr-time/ for details.
-    double now();
+    // https://w3c.github.io/user-timing/
+    [EnabledAtRuntime=UserTiming, MayThrowException] void mark(DOMString markName);
+    [EnabledAtRuntime=UserTiming] void clearMarks(optional DOMString markName);
+    [EnabledAtRuntime=UserTiming, MayThrowException] void measure(DOMString measureName, optional DOMString startMark, optional DOMString endMark);
+    [EnabledAtRuntime=UserTiming] void clearMeasures(optional DOMString measureName);
 };
 
+typedef sequence<PerformanceEntry> PerformanceEntryList;