ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for [Gtk] [EFL] , currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893

        Reviewed by NOBODY (OOPS!).

        * Source/cmake/OptionsBlackBerry.cmake:

        * Source/cmake/OptionsEfl.cmake:

        * Source/cmake/WebKitFeatures.cmake:

        * Source/cmakeconfig.h.cmake:

        * configure.ac:

2012-07-06  Thiago Marcos P. Santos  <thiago.santos@intel.com>

        [EFL][CMake] Move gtest sources to an upper level

122104

configure.ac

@@AC_ARG_ENABLE(web_timing,

              [],[enable_web_timing=$enable_unstable_features])

AC_MSG_RESULT([$enable_web_timing])

# check whether to enable User Timing support

AC_MSG_CHECKING([whether to enable User Timing support])

AC_ARG_ENABLE(user_timing,

              AC_HELP_STRING([--enable-user-timing],

                             [enable support for User Timing [default=no]]),

              [],[enable_user_timing="no"])

AC_MSG_RESULT([$enable_user_timing])

# check whether to enable Blob support

AC_MSG_CHECKING([whether to enable Blob support])

AC_ARG_ENABLE(blob,

@@AM_CONDITIONAL([ENABLE_IFRAME_SEAMLESS],

AM_CONDITIONAL([ENABLE_TEXT_AUTOSIZING],[test "$enable_text_autosizing" = "yes"])

AM_CONDITIONAL([ENABLE_CSS_EXCLUSIONS],[test "$enable_css_exclusions" = "yes"])

AM_CONDITIONAL([ENABLE_CSS_REGIONS],[test "$enable_css_regions" = "yes"])

1476AM_CONDITIONAL([ENABLE_USER_TIMING],[test "$enable_user_timing" = "yes"])

# Gtk conditionals

AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])

@@Features:

 Web Timing support                                       : $enable_web_timing

 Web Workers support                                      : $enable_workers

 XSLT support                                             : $enable_xslt

1586 User Timing support : $enable_user_timing

WebKit2 support:

 WebKit2 support                                          : $enable_webkit2

122099

Source/cmakeconfig.h.cmake

#cmakedefine01 ENABLE_TOUCH_EVENTS

#cmakedefine01 ENABLE_TOUCH_ICON_LOADING

#cmakedefine01 ENABLE_UNDO_MANAGER

82#cmakedefine01 ENABLE_USER_TIMING

#cmakedefine01 ENABLE_VIBRATION

#cmakedefine01 ENABLE_VIDEO

#cmakedefine01 ENABLE_VIDEO_TRACK

122099

Source/JavaScriptCore/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for mac, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893 

        Reviewed by NOBODY (OOPS!).

        * Configurations/FeatureDefines.xcconfig:

2012-07-08  Ryosuke Niwa  <rniwa@webkit.org>

        gcc build fix after r121925.

122104

Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ENABLE_TEXT_AUTOSIZING = ;

ENABLE_TEXT_NOTIFICATIONS_ONLY = ENABLE_TEXT_NOTIFICATIONS_ONLY;

ENABLE_TOUCH_ICON_LOADING = ;

ENABLE_UNDO_MANAGER = ;

125ENABLE_USER_TIMING = ;

ENABLE_VIDEO = ENABLE_VIDEO;

ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));

ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;

@@ENABLE_WEB_TIMING = ;

ENABLE_WORKERS = ENABLE_WORKERS;

ENABLE_XSLT = ENABLE_XSLT;

135 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

136FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_USER_TIMING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

122099

Source/WebCore/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        [User Timing] Implement User Timing interface

        https://bugs.webkit.org/show_bug.cgi?id=84893

        This patch implements extensions to 'Performance' interface of User Timing with V8/JSC custom bindings. PerformanceMark interface and PerformanceMeasure interface will be implemented later.

        https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/UserTiming/Overview.html

        Reviewed by NOBODY (OOPS!).

        Test: fast/webperf/user-timing.html

        * CMakeLists.txt:

        * Configurations/FeatureDefines.xcconfig:

        * GNUmakefile.am:

        * GNUmakefile.list.am:

        * Target.pri:

        * UseJSC.cmake:

        * WebCore.gypi:

        * WebCore.vcproj/WebCore.vcproj:

        * WebCore.xcodeproj/project.pbxproj:

        * bindings/js/JSPerformanceCustom.cpp: Added.

        (WebCore):

        (WebCore::convertMarksToJSArray):

        (WebCore::convertMeasuresToJSArray):

        (WebCore::convertMarksToJSDict):

        (WebCore::convertMeasuresToJSDict):

        (WebCore::JSPerformance::getMarks):

        (WebCore::JSPerformance::getMeasures):

        * bindings/v8/custom/V8PerformanceCustom.cpp: 

        (WebCore):

        (WebCore::convertMarksToV8Array):

        (WebCore::convertMeasuresToV8Array):

        (WebCore::convertMarksToV8Dict):

        (WebCore::convertMeasuresToV8Dict):

        (WebCore::V8Performance::memoryAccessorGetter):

        (WebCore::V8Performance::getMarksCallback):

        (WebCore::V8Performance::getMeasuresCallback):

        * page/Performance.cpp:

        (WebCore):

        (WebCore::Performance::mark):

        (WebCore::Performance::getMarksImpl):

        (WebCore::Performance::clearMarks):

        (WebCore::Performance::measure):

        (WebCore::Performance::getMeasuresImpl):

        (WebCore::Performance::clearMeasures):

        (WebCore::Performance::Now):

        * page/Performance.h:

        (WebCore):

        (Performance):

        * page/Performance.idl:

        * page/PerformanceUserTiming.cpp: Added.

        (WebCore):

        (WebCore::UserTiming::UserTiming):

        (WebCore::UserTiming::mark):

        (WebCore::UserTiming::getMarks):

        (WebCore::UserTiming::clearMarks):

        (WebCore::UserTiming::lookUpRecentMarks):

        (WebCore::UserTiming::measure):

        (WebCore::UserTiming::getMeasures):

        (WebCore::UserTiming::clearMeasures):

        * page/PerformanceUserTiming.h: Added.

        (WebCore):

        (PerfTimeData):

        (UserTiming):

        (WebCore::UserTiming::create):

2012-07-09  Taiju Tsuiki  <tzik@chromium.org>

        Web Inspector: Add FileContentView for FileSystemView

122104

Source/WebCore/CMakeLists.txt

@@SET(WebCore_SOURCES

    page/PerformanceNavigation.cpp

    page/PerformanceResourceTiming.cpp

    page/PerformanceTiming.cpp

1096 page/PerformanceUserTiming.cpp

    page/PrintContext.cpp

    page/Screen.cpp

    page/SecurityOrigin.cpp

122099

Source/WebCore/GNUmakefile.am

@@FEATURE_DEFINES += ENABLE_LINK_PREFETCH=

webcore_cppflags += -DENABLE_LINK_PREFETCH=1

endif  # END ENABLE_LINK_PREFETCH

# ---

# User Timing support

# ---

if ENABLE_USER_TIMING

FEATURE_DEFINES += ENABLE_USER_TIMING=1

webcore_cppflags += -DENABLE_USER_TIMING=1

endif  # END ENABLE_USER_TIMING

DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h

DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl

	$(AM_V_GEN)

122099

Source/WebCore/GNUmakefile.list.am

@@webcore_sources += \

	Source/WebCore/bindings/js/JSNodeFilterCustom.cpp \

	Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp \

	Source/WebCore/bindings/js/JSNodeListCustom.cpp \

1491 Source/WebCore/bindings/js/JSPerformanceCustom.cpp \

	Source/WebCore/bindings/js/JSPluginElementFunctions.cpp \

	Source/WebCore/bindings/js/JSPluginElementFunctions.h \

	Source/WebCore/bindings/js/JSPopStateEventCustom.cpp \

@@webcore_sources += \

	Source/WebCore/page/PerformanceResourceTiming.h \

	Source/WebCore/page/PerformanceTiming.cpp \

	Source/WebCore/page/PerformanceTiming.h \

3075 Source/WebCore/page/PerformanceUserTiming.cpp \

3076 Source/WebCore/page/PerformanceUserTiming.h \

	Source/WebCore/page/PointerLock.h \

	Source/WebCore/page/PointerLockController.cpp \

	Source/WebCore/page/PointerLockController.h \

122099

Source/WebCore/Target.pri

@@v8 {

        bindings/js/JSNodeIteratorCustom.cpp \

        bindings/js/JSNodeListCustom.cpp \

        bindings/js/JSNotificationCustom.cpp \

343 bindings/js/JSPerformanceCustom.cpp \

        bindings/js/JSPluginElementFunctions.cpp \

        bindings/js/JSPopStateEventCustom.cpp \

        bindings/js/JSProcessingInstructionCustom.cpp \

@@SOURCES += \

    page/PerformanceNavigation.cpp \

    page/PerformanceResourceTiming.cpp \

    page/PerformanceTiming.cpp \

1056 page/PerformanceUserTiming.cpp \

    page/PrintContext.cpp \

    page/Screen.cpp \

    page/scrolling/ScrollingCoordinator.cpp \

122099

Source/WebCore/UseJSC.cmake

@@LIST(APPEND WebCore_SOURCES

    bindings/js/JSNodeIteratorCustom.cpp

    bindings/js/JSNodeListCustom.cpp

    bindings/js/JSNotificationCustom.cpp

126 bindings/js/JSPerformanceCustom.cpp

    bindings/js/JSPluginElementFunctions.cpp

    bindings/js/JSPopStateEventCustom.cpp

    bindings/js/JSProcessingInstructionCustom.cpp

122099

Source/WebCore/WebCore.gypi

            'page/PagePopupClient.h',

            'page/PageSerializer.h',

            'page/PageVisibilityState.h',

248 'page/PerformanceUserTiming.h',

            'page/PrintContext.h',

            'page/SecurityOrigin.h',

            'page/SecurityOriginHash.h',

            'bindings/js/JSNodeIteratorCustom.cpp',

            'bindings/js/JSNodeListCustom.cpp',

            'bindings/js/JSNotificationCustom.cpp',

2043 'bindings/js/JSPerformanceCustom.cpp',

            'bindings/js/JSPluginElementFunctions.cpp',

            'bindings/js/JSPopStateEventCustom.cpp',

            'bindings/js/JSProcessingInstructionCustom.cpp',

            'page/PerformanceResourceTiming.h',

            'page/PerformanceTiming.cpp',

            'page/PerformanceTiming.h',

3088 'page/PerformanceUserTiming.cpp',

3089 'page/PerformanceUserTiming.h',

            'page/PointerLock.cpp',

            'page/PointerLock.h',

            'page/PointerLockController.cpp',

122099

Source/WebCore/Configurations/FeatureDefines.xcconfig

@@ENABLE_TEXT_AUTOSIZING = ;

ENABLE_TEXT_NOTIFICATIONS_ONLY = ENABLE_TEXT_NOTIFICATIONS_ONLY;

ENABLE_TOUCH_ICON_LOADING = ;

ENABLE_UNDO_MANAGER = ;

126ENABLE_USER_TIMING = ;

ENABLE_VIDEO = ENABLE_VIDEO;

ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));

ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;

@@ENABLE_WEB_TIMING = ;

ENABLE_WORKERS = ENABLE_WORKERS;

ENABLE_XSLT = ENABLE_XSLT;

136 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

137FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_USER_TIMING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

122099

Source/WebCore/WebCore.vcproj/WebCore.vcproj

				>

			</File>

			<File

				RelativePath="..\page\PerformanceUserTiming.cpp"

				>

			</File>

			<File

				RelativePath="..\page\PerformanceUserTiming.h"

				>

			</File>

			<File

				RelativePath="..\page\PrintContext.cpp"

				>

			</File>

					>

					<FileConfiguration

						Name="Debug|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Release|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Debug_Cairo_CFLite|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Release_Cairo_CFLite|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Debug_All|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Production|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

				</File>

				<File

					RelativePath="..\bindings\js\JSPerformanceCustom.cpp"

					>

					<FileConfiguration

						Name="Debug|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

122099

Source/WebCore/WebCore.xcodeproj/project.pbxproj

		6ED878C3147493F4004C3597 /* RenderTableCaption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTableCaption.h; sourceTree = "<group>"; };

		6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLContextAttributes.cpp; sourceTree = "<group>"; };

		6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLContextAttributes.h; sourceTree = "<group>"; };

		701EB2F115AAA03C008DCD2E /* PerformanceUserTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceUserTiming.cpp; sourceTree = "<group>"; };

		701EB2F315AAA0C4008DCD2E /* PerformanceUserTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceUserTiming.h; sourceTree = "<group>"; };

		701EB2F415AAA1CE008DCD2E /* JSPerformanceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformanceCustom.cpp; sourceTree = "<group>"; };

		710867D51568644B00AA779B /* DOMSVGViewSpecInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGViewSpecInternal.h; sourceTree = "<group>"; };

		7117445614BC34E200EE5FC8 /* SVGTextMetricsBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextMetricsBuilder.cpp; sourceTree = "<group>"; };

		7117445714BC34E200EE5FC8 /* SVGTextMetricsBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextMetricsBuilder.h; sourceTree = "<group>"; };

				E1271A130EEEC80400F61213 /* WorkerNavigator.cpp */,

				E1271A0A0EEEC77A00F61213 /* WorkerNavigator.h */,

				E1271A510EEECD1C00F61213 /* WorkerNavigator.idl */,

15713 701EB2F115AAA03C008DCD2E /* PerformanceUserTiming.cpp */,

15714 701EB2F315AAA0C4008DCD2E /* PerformanceUserTiming.h */,

			);

			path = page;

			sourceTree = "<group>";

				E1A643F10EC0972500779668 /* WorkerScriptController.h */,

				F34742E61343635000531BC2 /* WorkerScriptDebugServer.cpp */,

				F34742E71343635000531BC2 /* WorkerScriptDebugServer.h */,

19992 701EB2F415AAA1CE008DCD2E /* JSPerformanceCustom.cpp */,

			);

			path = js;

			sourceTree = "<group>";

122099

Source/WebCore/bindings/js/JSPerformanceCustom.cpp

/*

 * Copyright (C) 2012 Intel Inc. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *

 *     * Redistributions of source code must retain the above copyright

 * notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above

 * copyright notice, this list of conditions and the following disclaimer

 * in the documentation and/or other materials provided with the

 * distribution.

 *     * Neither the name of Google Inc. nor the names of its

 * contributors may be used to endorse or promote products derived from

 * this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#include "config.h"

#include "JSPerformance.h"

#if ENABLE(WEB_TIMING)

#include "Performance.h"

#include <runtime/JSArray.h>

#include <runtime/JSValue.h>

using namespace JSC;

namespace WebCore {

static JSValue convertMarksToJSArray(Vector<PerfTimeData>* nativeArrayPtr, ExecState* exec)

{

    JSArray* jsArray = constructEmptyArray(exec);

    if (!nativeArrayPtr)

        return jsArray;

    for (size_t i = 0; i < nativeArrayPtr->size(); ++i)

        jsArray->putDirectIndex(exec, i, JSValue(nativeArrayPtr->at(i).start));

    return jsArray;

}

static JSValue convertMeasuresToJSArray(Vector<PerfTimeData>* nativeArrayPtr, ExecState* exec)

{

    JSArray* jsArray = constructEmptyArray(exec);

    if (!nativeArrayPtr)

        return jsArray;

    for (size_t i = 0; i < nativeArrayPtr->size(); ++i)

        jsArray->putDirectIndex(exec, i, JSValue(nativeArrayPtr->at(i).duration));

    return jsArray;

}

static JSValue convertMarksToJSDict(PerfTimeMap* nativeMapPtr, ExecState* exec)

{

    PerfTimeMap::iterator it;

    JSObject* jsDict = constructEmptyObject(exec);

    for (it = nativeMapPtr->begin(); it != nativeMapPtr->end(); ++it) {

        if (!it->second.size())

            continue;

        JSArray* marks = constructEmptyArray(exec);

        for (size_t j = 0; j < it->second.size(); ++j)

            marks->putDirectIndex(exec, j, JSValue(it->second[j].start));

        jsDict->putDirect(exec->globalData(), Identifier(exec, reinterpret_cast<const uint16_t*>(it->first.charactersWithNullTermination())), JSValue(marks));

    }

    return jsDict;

}

static JSValue convertMeasuresToJSDict(PerfTimeMap* nativeMapPtr, ExecState* exec)

{

    PerfTimeMap::iterator it;

    JSObject* jsDict = constructEmptyObject(exec);

    for (it = nativeMapPtr->begin(); it != nativeMapPtr->end(); ++it) {

        if (!it->second.size())

            continue;

        JSArray* measures = constructEmptyArray(exec);

        for (size_t j = 0; j < it->second.size(); ++j)

            measures->putDirectIndex(exec, j, JSValue(it->second[j].duration));

        jsDict->putDirect(exec->globalData(), Identifier(exec, reinterpret_cast<const uint16_t*>(it->first.charactersWithNullTermination())), JSValue(measures));

    }

    return jsDict;

}

JSValue JSPerformance::getMarks(ExecState* exec)

{

    if (exec->argumentCount() <= 0) {

        HashMap<String, Vector<PerfTimeData> > *marksMap = 0;

        marksMap = impl()->getMarksImpl();

        return convertMarksToJSDict(marksMap, exec);

    }

    Vector<PerfTimeData> *marksArray = 0;

    const String& markName(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).toString(exec)->value(exec)));

    if (exec->hadException())

        return jsUndefined();

    marksArray = impl()->getMarksImpl(markName);

    JSValue v = convertMarksToJSArray(marksArray, exec);

    return v;

}

JSValue JSPerformance::getMeasures(ExecState* exec)

{

    if (exec->argumentCount() <= 0) {

        HashMap<String, Vector<PerfTimeData> > *measuresMap = 0;

        measuresMap = impl()->getMeasuresImpl();

        return convertMeasuresToJSDict(measuresMap, exec);

    }

    Vector<PerfTimeData> *measuresArray = 0;

    const String& measureName(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).toString(exec)->value(exec)));

    if (exec->hadException())

        return jsUndefined();

    measuresArray = impl()->getMeasuresImpl(measureName);

    return convertMeasuresToJSArray(measuresArray, exec);

}

} // namespace WebCore

#endif // ENABLE(WEB_TIMING)

0

Source/WebCore/bindings/v8/custom/V8PerformanceCustom.cpp

11/*

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

namespace WebCore {

static v8::Handle<v8::Value> convertMarksToV8Array(Vector<PerfTimeData>* nativeArrayPtr)

{

    v8::Local<v8::Array> v8Array = v8::Array::New();

    if (!nativeArrayPtr)

        return v8Array;

    for (size_t i = 0; i < nativeArrayPtr->size(); ++i)

        v8Array->Set(i, v8::Number::New(nativeArrayPtr->at(i).start));

    return v8Array;

}

static v8::Handle<v8::Value> convertMeasuresToV8Array(Vector<PerfTimeData>* nativeArrayPtr)

{

    v8::Local<v8::Array> v8Array = v8::Array::New();

    if (!nativeArrayPtr)

        return v8Array;

    for (size_t i = 0; i < nativeArrayPtr->size(); ++i)

        v8Array->Set(i, v8::Number::New(nativeArrayPtr->at(i).duration));

    return v8Array;

}

static v8::Handle<v8::Value> convertMarksToV8Dict(PerfTimeMap* nativeMapPtr)

{

    PerfTimeMap::iterator it;

    v8::Local<v8::Object> v8Dict = v8::Object::New();

    for (it = nativeMapPtr->begin(); it != nativeMapPtr->end(); ++it) {

        if (!it->second.size())

            continue;

        v8::Local<v8::Array> measures = v8::Array::New();

        for (size_t j = 0; j < it->second.size(); ++j)

            measures->Set(v8::Number::New(j), v8::Number::New(it->second[j].start));

        v8Dict->Set(v8::String::New(reinterpret_cast<const uint16_t*>(it->first.charactersWithNullTermination())), measures);

    }

    return v8Dict;

}

static v8::Handle<v8::Value> convertMeasuresToV8Dict(PerfTimeMap* nativeMapPtr)

{

    PerfTimeMap::iterator it;

    v8::Local<v8::Object> v8Dict = v8::Object::New();

    for (it = nativeMapPtr->begin(); it != nativeMapPtr->end(); ++it) {

        if (!it->second.size())

            continue;

        v8::Local<v8::Array> measures = v8::Array::New();

        for (size_t j = 0; j < it->second.size(); ++j)

            measures->Set(v8::Number::New(j), v8::Number::New(it->second[j].duration));

        v8Dict->Set(v8::String::New(reinterpret_cast<const uint16_t*>(it->first.charactersWithNullTermination())), measures);

    }

    return v8Dict;

}

v8::Handle<v8::Value> V8Performance::memoryAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)

{

    INC_STATS("DOM.Performance.memoryAccessorGetter");

@@v8::Handle<v8::Value> V8Performance::mem

    return toV8(imp->memory(), info.GetIsolate());

}

v8::Handle<v8::Value> V8Performance::getMarksCallback(const v8::Arguments& args)

{

    INC_STATS("DOM.Performance.getMarks()");

    Performance* imp = V8Performance::toNative(args.Holder());

    if (args.Length() <= 0) {

        HashMap<String, Vector<PerfTimeData> > *marksMap = 0;

        marksMap = imp->getMarksImpl();

        return convertMarksToV8Dict(marksMap);

    }

    Vector<PerfTimeData> *marksArray = 0;

    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, markName, MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined));

    marksArray = imp->getMarksImpl(markName);

    return convertMarksToV8Array(marksArray);

}

v8::Handle<v8::Value> V8Performance::getMeasuresCallback(const v8::Arguments& args)

{

    INC_STATS("DOM.Performance.getMeasures()");

    Performance* imp = V8Performance::toNative(args.Holder());

    if (args.Length() <= 0) {

        HashMap<String, Vector<PerfTimeData> > *measuresMap = 0;

        measuresMap = imp->getMeasuresImpl();

        return convertMeasuresToV8Dict(measuresMap);

    }

    Vector<PerfTimeData> *measuresArray = 0;

    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, measureName, MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined));

    measuresArray = imp->getMeasuresImpl(measureName);

    return convertMeasuresToV8Array(measuresArray);

}

} // namespace WebCore

#endif // ENABLE(WEB_TIMING)

122099

Source/WebCore/page/Performance.cpp

11/*

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

@@EventTargetData* Performance::ensureEven

    return &m_eventTargetData;

}

#if ENABLE(USER_TIMING)

void Performance::mark(const String& markName, ExceptionCode& ec)

{

    ec = 0;

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    m_userTiming->mark(markName, ec, this);

}

Vector<PerfTimeData>* Performance::getMarksImpl(const String& markName) const

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    return m_userTiming->getMarks(markName);

}

PerfTimeMap* Performance::getMarksImpl() const

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    return m_userTiming->getMarks();

}

void Performance::clearMarks(const String& markName)

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    m_userTiming->clearMarks(markName);

}

void Performance::measure(const String& measureName, const String& startMark, const String& endMark, ExceptionCode& ec)

{

    ec = 0;

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    if (!m_timing)

        m_timing = PerformanceTiming::create(m_frame);

    m_userTiming->measure(measureName, startMark, endMark, ec, this);

    return;

}

Vector<PerfTimeData>* Performance::getMeasuresImpl(const String& measureName) const

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    return m_userTiming->getMeasures(measureName);

}

PerfTimeMap* Performance::getMeasuresImpl() const

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    return m_userTiming->getMeasures();

}

void Performance::clearMeasures(const String& measureName)

{

    if (!m_userTiming)

        m_userTiming = UserTiming::create();

    m_userTiming->clearMeasures(measureName);

    return;

}

double Performance::Now() const

{

    return webkitNow();

}

#endif // ENABLE(USER_TIMING)

double Performance::webkitNow() const

{

    return 1000.0 * m_frame->document()->loader()->timing()->convertMonotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());

122099

Source/WebCore/page/Performance.h

11/*

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

#include "PerformanceEntryList.h"

#include "PerformanceNavigation.h"

#include "PerformanceTiming.h"

43#include "PerformanceUserTiming.h"

44#include <wtf/HashMap.h>

#include <wtf/PassRefPtr.h>

#include <wtf/RefCounted.h>

#include <wtf/RefPtr.h>

namespace WebCore {

typedef int ExceptionCode;

struct PerfTimeData;

typedef HashMap<String, Vector<PerfTimeData> > PerfTimeMap;

class Document;

class ResourceRequest;

class ResourceResponse;

58class UserTiming;

class Performance : public RefCounted<Performance>, public DOMWindowProperty, public EventTarget {

public:

@@public:

    using RefCounted<Performance>::ref;

    using RefCounted<Performance>::deref;

#if ENABLE(USER_TIMING)

    double Now() const;

    void mark(const String& markName, ExceptionCode&);

    Vector<PerfTimeData>* getMarksImpl(const String& markName) const;

    PerfTimeMap* getMarksImpl() const;

    void clearMarks(const String& markName);

    void measure(const String& measureName, const String& startMark, const String& endMark, ExceptionCode&);

    Vector<PerfTimeData>* getMeasuresImpl(const String& measureName) const;

    PerfTimeMap* getMeasuresImpl() const;

    void clearMeasures(const String& measureName);

#endif // ENABLE(USER_TIMING)

private:

    explicit Performance(Frame*);

@@private:

#if ENABLE(RESOURCE_TIMING)

    Vector<RefPtr<PerformanceEntry> > m_resourceTimingBuffer;

#endif

#if ENABLE(USER_TIMING)

    mutable RefPtr<UserTiming> m_userTiming;

#endif // ENABLE(USER_TIMING)

};

}

122099

Source/WebCore/page/Performance.idl

11/*

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

@@module window {

#endif

        // See http://www.w3.org/TR/hr-time/ for details.

        double webkitNow();

        // See https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/UserTiming/Overview.html

#if defined(ENABLE_USER_TIMING) && ENABLE_USER_TIMING

        void mark(in DOMString markName)

            raises(DOMException);

        [Custom] Array getMarks(in [Optional] DOMString markName);

        void clearMarks(in [Optional=DefaultIsNullString]  DOMString markName);

        void measure(in DOMString measureName, in [Optional=DefaultIsNullString] DOMString startMark, in [Optional=DefaultIsNullString] DOMString endMark)

            raises(DOMException);

        [Custom] Array getMeasures(in [Optional=DefaultIsNullString] DOMString measureName);

        void clearMeasures(in [Optional=DefaultIsNullString] DOMString measureName);

#endif

    };

}

122099

Source/WebCore/page/PerformanceUserTiming.cpp

/*

 * Copyright (C) 2012 Intel Inc. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#include "config.h"

#include "PerformanceUserTiming.h"

#if ENABLE(USER_TIMING)

#include "Performance.h"

#include <wtf/text/CString.h>

#include <wtf/text/WTFString.h>

namespace WebCore {

UserTiming::UserTiming()

{

    static const struct restrictive_field {

      String key;

      bool active;

    } default_restrictions[] = {

        {"navigationStart", true},

        {"unloadEventStart", true},

        {"unloadEventEnd", true},

        {"redirectStart", true},

        {"redirectEnd", true},

        {"fetchStart", true},

        {"domainLookupStart", true},

        {"domainLookupEnd", true},

        {"connectStart", true},

        {"connectEnd", true},

        {"secureConnectionStart", true},

        {"requestStart", true},

        {"responseStart", true},

        {"responseEnd", true},

        {"domLoading", true},

        {"domInteractive", true},

        {"domContentLoadedEventStart", true},

        {"domContentLoadedEventEnd", true},

        {"domComplete", true},

        {"loadEventStart", true},

        {"loadEventEnd", true}

    };

    for (const struct restrictive_field* restriction = default_restrictions;

         restriction-default_restrictions <

         (int)(sizeof(default_restrictions) / sizeof(struct restrictive_field));

         ++restriction) {

        m_restrictiveKeyMap.add(restriction->key, restriction->active);

    }

}

void UserTiming::mark(const String& markName, ExceptionCode& ec, Performance* performance)

{

    ec = 0;

    if (m_restrictiveKeyMap.contains(markName)

       && m_restrictiveKeyMap.get(markName)) {

        ec = SYNTAX_ERR;

        return;

    }

    typedef PerfTimeMap::iterator Iterator;

    Iterator it = m_marksMap.find(markName);

    PerfTimeData ptd;

    ptd.start = performance->Now();

    ptd.duration = 0;

    if (it != m_marksMap.end())

        it->second.append(ptd);

    else {

        Vector<PerfTimeData> v(1);

        v[0] = ptd;

        m_marksMap.set(markName, v);

    }

}

PerfTimeMap* UserTiming::getMarks()

{

    return &m_marksMap;

}

Vector<PerfTimeData>*  UserTiming::getMarks(const String& markName)

{

    typedef PerfTimeMap::iterator Iterator;

    Iterator it = m_marksMap.find(markName);

    if (it != m_marksMap.end())

        return &(it->second);

    return 0;

}

void UserTiming::clearMarks(const String& markName)

{

    if (markName.isNull()) {

        m_marksMap.clear();

        return;

    }

    if (m_marksMap.contains(markName))

        m_marksMap.remove(markName);

    return;

}

double UserTiming::lookUpRecentMarks(const String& mark, ExceptionCode& ec, PerformanceTiming* navTiming)

{

    ec = 0;

    double ret = 0.0;

    String markName = mark;

    if (m_marksMap.contains(markName))

        return m_marksMap.get(markName).last().start;

    if (m_restrictiveKeyMap.contains(markName)) {

        if (!strcmp(markName.ascii().data(), "navigationStart"))

            return 0.0;

        if (!strcmp(markName.ascii().data(), "unloadEventStart"))

            return static_cast<double>(navTiming->unloadEventStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "unloadEventEnd"))

            return static_cast<double>(navTiming->unloadEventEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "redirectStart"))

            return static_cast<double>(navTiming->redirectStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "redirectEnd"))

            return static_cast<double>(navTiming->redirectEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "fetchStart"))

            return static_cast<double>(navTiming->fetchStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domainLookupStart"))

            return static_cast<double>(navTiming->domainLookupStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domainLookupEnd"))

            return static_cast<double>(navTiming->domainLookupEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "connectStart"))

            return static_cast<double>(navTiming->connectStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "connectEnd"))

            return static_cast<double>(navTiming->connectEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "secureConnectionStart"))

            return static_cast<double>(navTiming->secureConnectionStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "requestStart"))

            return static_cast<double>(navTiming->requestStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "responseStart"))

            return static_cast<double>(navTiming->responseStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "responseEnd"))

            return static_cast<double>(navTiming->responseEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domLoading"))

            return static_cast<double>(navTiming->domLoading() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domInteractive"))

            return static_cast<double>(navTiming->domInteractive() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domContentLoadedEventStart"))

            return static_cast<double>(navTiming->domContentLoadedEventStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domContentLoadedEventEnd"))

            return static_cast<double>(navTiming->domContentLoadedEventEnd() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "domComplete"))

            return static_cast<double>(navTiming->domComplete() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "loadEventStart"))

            return static_cast<double>(navTiming->loadEventStart() - navTiming->navigationStart());

        if (!strcmp(markName.ascii().data(), "loadEventEnd"))

            return static_cast<double>(navTiming->loadEventEnd() - navTiming->navigationStart());

    }

    // markName not exist

    ec = SYNTAX_ERR;

    return ret;

}

void UserTiming::measure(const String& measureName, const String& startMark, const String& endMark, ExceptionCode& ec, Performance* performance)

{

    double startTime = 0.0;

    double endTime = 0.0;

    if (startMark.isNull()) {

        endTime = performance->Now();

        goto measure;

    }

    if (endMark.isNull()) {

        endTime = performance->Now();

        startTime = lookUpRecentMarks(startMark, ec, performance->timing());

        goto measure;

    }

    endTime = lookUpRecentMarks(endMark, ec, performance->timing());

    if (ec)

        return;

    startTime = lookUpRecentMarks(startMark, ec, performance->timing());

    goto measure;

measure:

    if (ec)

        return;

    typedef PerfTimeMap::iterator Iterator;

    PerfTimeData ptd;

    ptd.start = startTime;

    ptd.duration = endTime - startTime;

    Iterator it = m_measuresMap.find(measureName);

    if (it != m_measuresMap.end())

        it->second.append(ptd);

    else {

        Vector<PerfTimeData> v(1);

        v[0] = ptd;

        m_measuresMap.set(measureName, v);

    }

    return;

}

PerfTimeMap* UserTiming::getMeasures()

{

    return &m_measuresMap;

}

Vector<PerfTimeData>* UserTiming::getMeasures(const String& measureName)

{

    typedef PerfTimeMap::iterator Iterator;

    Iterator it = m_measuresMap.find(measureName);

    if (it != m_measuresMap.end())

        return &(it->second);

    return 0;

}

void UserTiming::clearMeasures(const String& measureName)

{

    if (measureName.isNull()) {

        m_measuresMap.clear();

        return;

    }

    if (m_measuresMap.contains(measureName))

        m_measuresMap.remove(measureName);

    return;

}

} // namespace WebCore

#endif // ENABLE(USER_TIMING)

0

Source/WebCore/page/PerformanceUserTiming.h

/*

 * Copyright (C) 2012 Intel Inc. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#ifndef PerformanceUserTiming_h

#define PerformanceUserTiming_h

#if ENABLE(USER_TIMING)

#include "EventException.h"

#include "Performance.h"

#include "PerformanceTiming.h"

#include "PlatformString.h"

#include <wtf/HashMap.h>

#include <wtf/PassRefPtr.h>

#include <wtf/RefCounted.h>

#include <wtf/text/StringHash.h>

#include <wtf/text/WTFString.h>

namespace WebCore {

class Performance;

typedef int ExceptionCode;

typedef HashMap<String, bool> RestrictiveKeyMap;

typedef struct PerfTimeData {

    double start;

    double duration;

} PerfTimeData;

typedef HashMap<String, Vector<double> > TimingsMap;

typedef HashMap<String, Vector<PerfTimeData> > PerfTimeMap;

class UserTiming : public RefCounted<UserTiming> {

public:

    static PassRefPtr<UserTiming> create() { return adoptRef(new UserTiming()); }

    void mark(const String& markName, ExceptionCode&, Performance*);

    PerfTimeMap* getMarks();

    Vector<PerfTimeData>*  getMarks(const String& markName);

    void clearMarks(const String& markName);

    void measure(const String& measureName, const String& startMark, const String& endMark, ExceptionCode&, Performance*);

    PerfTimeMap* getMeasures();

    Vector<PerfTimeData>* getMeasures(const String& measureName);

    void clearMeasures(const String& measureName);

private:

    explicit UserTiming();

    double lookUpRecentMarks(const String& markName, ExceptionCode&, PerformanceTiming* navTiming);

    RestrictiveKeyMap m_restrictiveKeyMap;

    PerfTimeMap m_marksMap;

    PerfTimeMap m_measuresMap;

};

}

#endif // ENABLE(USER_TIMING)

#endif // !defined(PerformanceUserTiming_h)

0

Source/WebKit2/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for webkit2 mac, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893 

        Reviewed by NOBODY (OOPS!).

        * Configurations/FeatureDefines.xcconfig:

2012-07-09  Dan Bernstein  <mitz@apple.com>

        Fix the Mac build when codesign_allocate is not installed at /usr/bin.

122104

Source/WebKit2/Configurations/FeatureDefines.xcconfig

@@ENABLE_TEXT_AUTOSIZING = ;

ENABLE_TEXT_NOTIFICATIONS_ONLY = ENABLE_TEXT_NOTIFICATIONS_ONLY;

ENABLE_TOUCH_ICON_LOADING = ;

ENABLE_UNDO_MANAGER = ;

126ENABLE_USER_TIMING = ;

ENABLE_VIDEO = ENABLE_VIDEO;

ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));

ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;

@@ENABLE_WEB_TIMING = ;

ENABLE_WORKERS = ENABLE_WORKERS;

ENABLE_XSLT = ENABLE_XSLT;

136 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

137FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_USER_TIMING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

122099

Source/WebKit/blackberry/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for BlackBerry, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893

        Reviewed by NOBODY (OOPS!).

        * WebCoreSupport/AboutDataEnableFeatures.in:

2012-07-07  George Staikos  <staikos@webkit.org>

        Detach animation clients properly if we clear the web page pointer.

122104

Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in

@@THREADING_OPENMP

THREADING_SCROLLING

TOUCH_EVENTS

TOUCH_ICON_LOADING

144USER_TIMING

VALUE_PROFILER

VERBOSE_VALUE_PROFILE

VIBRATION

122099

Source/WebKit/chromium/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for chromium, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893

        Reviewed by NOBODY (OOPS!).

        * features.gypi:

2012-07-09  MORITA Hajime  <morrita@google.com>

        [Chromium] ContextFeaturesClient::isEnabled is slow

122104

Source/WebKit/chromium/features.gypi

      'ENABLE_TOUCH_ADJUSTMENT=1',

      'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',

      'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',

99 'ENABLE_USER_TIMING=<(enable_user_timing)',

      'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',

      'ENABLE_VIDEO=1',

      'ENABLE_VIDEO_TRACK=1',

      'use_accelerated_compositing%': 1,

      'enable_skia_text%': 1,

      'enable_svg%': 1,

128 'enable_user_timing%': 1,

      'enable_touch_events%': 1,

      'enable_touch_icon_loading%' : 0,

      'enable_mutation_observers%': 1,

122099

Source/WebKit/mac/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for mac, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893

        Reviewed by NOBODY (OOPS!).

        * Configurations/FeatureDefines.xcconfig:

2012-07-04  John Mellor  <johnme@chromium.org>

        Text Autosizing: Add compile flag and runtime setting

122104

Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

@@ENABLE_TEXT_AUTOSIZING = ;

ENABLE_TEXT_NOTIFICATIONS_ONLY = ENABLE_TEXT_NOTIFICATIONS_ONLY;

ENABLE_TOUCH_ICON_LOADING = ;

ENABLE_UNDO_MANAGER = ;

126ENABLE_USER_TIMING = ;

ENABLE_VIDEO = ENABLE_VIDEO;

ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));

ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;

@@ENABLE_WEB_TIMING = ;

ENABLE_WORKERS = ENABLE_WORKERS;

ENABLE_XSLT = ENABLE_XSLT;

136 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

137FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_USER_TIMING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);

122099

Source/cmake/OptionsBlackBerry.cmake

@@WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STYLE_SCOPED ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)

169WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_TIMING ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIBRATION ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)

122099

Source/cmake/OptionsEfl.cmake

@@WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHADOW_DOM ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)

99WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_TIMING ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIBRATION ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)

WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)

122099

Source/cmake/WebKitFeatures.cmake

@@MACRO (WEBKIT_OPTION_BEGIN)

    WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" OFF)

    WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_ICON_LOADING "Toggle Touch Icon Loading Support" OFF)

    WEBKIT_OPTION_DEFINE(ENABLE_UNDO_MANAGER "Toggle Undo Manager support" OFF)

96 WEBKIT_OPTION_DEFINE(ENABLE_USER_TIMING "Toggle User Timing support" OFF)

    WEBKIT_OPTION_DEFINE(ENABLE_VIBRATION "Toggle Vibration API support" OFF)

    WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" OFF)

    WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)

122099

Tools/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for Gtk and Qt platform, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893

        Reviewed by NOBODY (OOPS!)

        * Scripts/webkitperl/FeatureList.pm:

        * qmake/mkspecs/features/features.pri:

2012-07-08  Kent Tamura  <tkent@chromium.org>

        Unreviewed, rolling out r122076.

122104

Tools/Scripts/webkitperl/FeatureList.pm

@@my @features = (

    { option => "xslt", desc => "Toggle XSLT support",

      define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },

    
    { option => "user-timing", desc => "Toggle User Timing support",

      define => "ENABLE_USER_TIMING", default => (isBlackBerry() || isGtk() || isEfl()), value => \$webTimingSupport },

);

sub getFeatureOptionList()

122099

Tools/qmake/mkspecs/features/features.pri

@@FEATURE_DEFAULTS = \

    ENABLE_TOUCH_EVENTS=1 \

    ENABLE_TOUCH_ICON_LOADING=0 \

    ENABLE_UNDO_MANAGER=0 \

99 ENABLE_USER_TIMING=1 \

    ENABLE_VIBRATION=0 \

    ENABLE_VIDEO=0 \

    ENABLE_VIDEO_TRACK=0 \

122099

WebKitLibraries/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        Enable User Timing interface for win platform, currently the extensions of 'Performance' is available.

        https://bugs.webkit.org/show_bug.cgi?id=84893 

        Reviewed by NOBODY (OOPS!).

        * win/tools/vsprops/FeatureDefines.vsprops:

        * win/tools/vsprops/FeatureDefinesCairo.vsprops:

2012-07-04  John Mellor  <johnme@chromium.org>

        Text Autosizing: Add compile flag and runtime setting

122099

WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

		PerformEnvironmentSet="true"

	/>

  <UserMacro

		Name="ENABLE_USER_TIMING"

		Value=""

		PerformEnvironmentSet="true"

	/>

  <UserMacro

		Name="ENABLE_VIDEO"

		Value="ENABLE_VIDEO"

		PerformEnvironmentSet="true"

122099

WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

		PerformEnvironmentSet="true"

	/>

  <UserMacro

		Name="ENABLE_USER_TIMING"

		Value=""

		PerformEnvironmentSet="true"

	/>

  <UserMacro

		Name="ENABLE_VIDEO"

		Value=""

		PerformEnvironmentSet="true"

122099

LayoutTests/ChangeLog

2012-07-09  Pan Deng  <pan.deng@intel.com>

        User Timing Bug Entry, https://bugs.webkit.org/show_bug.cgi?id=84893

        This patch contains test cases for User Timing interface, currently cover the extensions of 'Performance' interface.

        Reviewed by NOBODY (OOPS!).

        * fast/webperf: Added.

        * fast/webperf/user-timing-expected.txt: Added.

        * fast/webperf/user-timing.html: Added.

2012-07-09  Zan Dobersek  <zandobersek@gmail.com>

        Unreviewed, unskipping CSS Exclusions tests for the Gtk port.

122099

LayoutTests/fast/webperf/user-timing-expected.txt

This tests API of W3C UserTiming Spec.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS testMarkWOMarkName() == 'TypeError' is true

PASS testMark('navigationStart') == 'SYNTAX_ERR' is true

PASS testMark('unloadEventStart') == 'SYNTAX_ERR' is true

PASS testMark('unloadEventEnd') == 'SYNTAX_ERR' is true

PASS testMark('redirectStart') == 'SYNTAX_ERR' is true

PASS testMark('redirectEnd') == 'SYNTAX_ERR' is true

PASS testMark('fetchStart') == 'SYNTAX_ERR' is true

PASS testMark('domainLookupStart') == 'SYNTAX_ERR' is true

PASS testMark('domainLookupEnd') == 'SYNTAX_ERR' is true

PASS testMark('connectStart') == 'SYNTAX_ERR' is true

PASS testMark('connectEnd') == 'SYNTAX_ERR' is true

PASS testMark('secureConnectionStart') == 'SYNTAX_ERR' is true

PASS testMark('requestStart') == 'SYNTAX_ERR' is true

PASS testMark('responseStart') == 'SYNTAX_ERR' is true

PASS testMark('responseEnd') == 'SYNTAX_ERR' is true

PASS testMark('domLoading') == 'SYNTAX_ERR' is true

PASS testMark('domInteractive') == 'SYNTAX_ERR' is true

PASS testMark('domContentLoadedEventStart') == 'SYNTAX_ERR' is true

PASS testMark('domContentLoadedEventEnd') == 'SYNTAX_ERR' is true

PASS testMark('domComplete') == 'SYNTAX_ERR' is true

PASS testMark('loadEventStart') == 'SYNTAX_ERR' is true

PASS testMark('loadEventEnd') == 'SYNTAX_ERR' is true

PASS testMark('') == 'success' is true

PASS testMark('abc') == 'success' is true

PASS testMark(123) == 'success' is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 0 is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12 is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('').length == 1 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('1').length == 1 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('a').length == 1 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('def').length == 1 && performance.getMarks('').every(isFinite) == true is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12 is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('').length == 4 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('1').length == 4 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('a').length == 4 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('')) && performance.getMarks('def').length == 4 && performance.getMarks('').every(isFinite) == true is true

PASS Array.isArray(performance.getMarks('klmn')) && performance.getMarks('klmn').length == 0 is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12 is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 11 is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 8 is true

PASS checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 0 is true

PASS testMeasureWOMeasureName() == 'TypeError' is true

PASS testMeasure('', '', 1) == 'success' is true

PASS testMeasure('') == 'success' is true

PASS testMeasure('x', 1) == 'success' is true

PASS testMeasure('y', 3, 'ghij') == 'success' is true

PASS testMeasure('y', 3, 'navigationStart') == 'success' is true

PASS testMeasure('y', 3, 'unloadEventStart') == 'success' is true

PASS testMeasure('y', 3, 'unloadEventEnd') == 'success' is true

PASS testMeasure('y', 3, 'redirectStart') == 'success' is true

PASS testMeasure('y', 3, 'redirectEnd') == 'success' is true

PASS testMeasure('y', 3, 'fetchStart') == 'success' is true

PASS testMeasure('y', 3, 'domainLookupStart') == 'success' is true

PASS testMeasure('y', 3, 'domainLookupEnd') == 'success' is true

PASS testMeasure('y', 3, 'connectStart') == 'success' is true

PASS testMeasure('y', 3, 'connectEnd') == 'success' is true

PASS testMeasure('y', 3, 'secureConnectionStart') == 'success' is true

PASS testMeasure('y', 3, 'requestStart') == 'success' is true

PASS testMeasure('y', 3, 'responseStart') == 'success' is true

PASS testMeasure('y', 3, 'responseEnd') == 'success' is true

PASS testMeasure('y', 3, 'domLoading') == 'success' is true

PASS testMeasure('y', 3, 'domInteractive') == 'success' is true

PASS testMeasure('y', 3, 'domContentLoadedEventStart') == 'success' is true

PASS testMeasure('y', 3, 'domContentLoadedEventEnd') == 'success' is true

PASS testMeasure('y', 3, 'domComplete') == 'success' is true

PASS testMeasure('y', 3, 'loadEventStart') == 'success' is true

PASS testMeasure('y', 3, 'loadEventEnd') == 'success' is true

PASS testMeasure('z', 8) == 'SYNTAX_ERR' is true

PASS testMeasure('z', 3, 8) == 'SYNTAX_ERR' is true

PASS testMeasure('y', 'domInteractive', 8) == 'SYNTAX_ERR' is true

PASS testMeasure('z', 8, 3) == 'SYNTAX_ERR' is true

PASS testMeasure('z', 8, 9) == 'SYNTAX_ERR' is true

PASS testMeasure('z', undefined, 4) == 'SYNTAX_ERR' is true

PASS testMeasure('z', 4, undefined) == 'SYNTAX_ERR' is true

PASS testMeasure('z', 3, 'navigationStart') == 'success' is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 0 is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16 is true

PASS performance.getMeasures('nav1')[0] <= performance.getMeasures('nav2')[0] is true

PASS performance.getMeasures('onloadEndToNow')[0] <= performance.getMeasures('nav1')[0] is true

PASS performance.getMeasures('loadTime')[0] > 0 is true

PASS performance.getMeasures('domCompleteToa').length > 0 is true

PASS performance.getMeasures('onloadStartToa').length > 0 is true

PASS performance.getMeasures('negativeValue')[0] < 0 is true

PASS performance.getMeasures('navToLoadStart')[0] > 0 is true

PASS performance.getMeasures('navToM')[0] > 0 is true

PASS performance.getMeasures('loadStartToM').length > 0 is true

PASS performance.getMeasures('navToM') - performance.getMeasures('loadStartToM') == performance.getMeasures('navToLoadStart') is true

PASS Array.isArray(performance.getMeasures('')) && performance.getMeasures('').length == 1 && performance.getMeasures('').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('x')) && performance.getMeasures('x').length == 1 && performance.getMeasures('x').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('y')) && performance.getMeasures('y').length == 1 && performance.getMeasures('y').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('zz')) && performance.getMeasures('zz').length == 0 is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16 is true

PASS Array.isArray(performance.getMeasures('')) && performance.getMeasures('').length == 2 && performance.getMeasures('').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('xx')) && performance.getMeasures('xx').length == 2 && performance.getMeasures('xx').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('yy')) && performance.getMeasures('yy').length == 2 && performance.getMeasures('yy').every(isFinite) == true is true

PASS Array.isArray(performance.getMeasures('zz')) && performance.getMeasures('zz').length == 0 is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16 is true

PASS performance.getMeasures('nav1').length == 3 && performance.getMeasures('nav1')[1] <= performance.getMeasures('nav1')[2] is true

PASS performance.getMeasures('loadTime').length == 3 && performance.getMeasures('loadTime')[1] == performance.getMeasures('loadTime')[2] is true

PASS performance.getMeasures('domCompleteToa').length == 3 && performance.getMeasures('domCompleteToa')[1] <= performance.getMeasures('domCompleteToa')[2] is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16 is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 12 is true

PASS checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 0 is true

PASS successfullyParsed is true

TEST COMPLETE

0

LayoutTests/fast/webperf/user-timing.html

<head>

<link rel="stylesheet" href="../js/resources/js-test-style.css">

<script src="../js/resources/js-test-pre.js"></script>

</head>

<body onload=runTest()>

<script>

    description("This tests API of W3C UserTiming Spec.")

    function testMarkWOMarkName(){

        try{

            performance.mark();

            return 'success? should fail!';

        }catch(e){

            return e.name;

        }

    }

    function testMeasureWOMeasureName(){

        try{

            performance.measure();

            return 'success? should fail';

        }catch(e){

            return e.name;

        }

    }

    function testMeasure(measureName, startMark, endMark){

        if (measureName == undefined)

            return 'fail';

        try{

            if (arguments.length == 1)

                performance.measure(measureName);

            if (arguments.length == 2)

                performance.measure(measureName, startMark);

            if (arguments.length == 3)

                performance.measure(measureName, startMark, endMark);

            return 'success';

        }catch(e){

            return e.name;

        }

    }

    function testMark(markName){

        try{

            performance.mark(markName);

            return 'success';

        }catch(e){

            return e.name;

        }

    }

    function prepareMarks(){

        performance.mark('');

        performance.mark(1);

        performance.mark(2);

        performance.mark(3);

        performance.mark(4);

        performance.mark(5);

        performance.mark(6);

        performance.mark('a');

        performance.mark('bc');

        performance.mark('def');

        performance.mark('ghij');

        performance.mark('M');

    }

    function prepareMeasures(){

        testMeasure('', '', 1);

        testMeasure('x', '1', 2);

        testMeasure('y', 3, '4');

        testMeasure('z', 3, 'a');

        testMeasure('xx', 'a', 'bc');

        testMeasure('yy', 'a', 'ghij');

        testMeasure('zz', 'a', 'lmnk'); //this one shall not work

        testMeasure('onloadEndToNow', 'loadEventEnd');

        testMeasure('nav1');

        testMeasure('nav2', 'navigationStart');

        testMeasure('loadTime', 'navigationStart', 'loadEventEnd');

        testMeasure('domCompleteToa', 'domComplete', 'a');

        testMeasure('onloadStartToa', 'loadEventStart', 'a');

        testMeasure('negativeValue', 3, 'navigationStart');

        testMeasure('navToLoadStart', 'navigationStart', 'loadEventStart');

        testMeasure('navToM', 'navigationStart', 'M');

        testMeasure('loadStartToM', 'loadEventStart', 'M');

    }

    function checkDictTypeMarksOrMeasures(obj){

        if (typeof obj != 'object')

            return false;

        for(var key in obj){

            //console.log(key);

            if (!Array.isArray(obj[key]))

                return false;

            if(!obj[key].every(isFinite))

                return false;

        }

        return true;

    }

    function dictTypeMarksOrMeasuresHasItemNum(obj){

        var num = 0;

        for(var key in obj){

           num++;

        }

        return num;

    }

    function runTest(){

        // mark

        shouldBeTrue("testMarkWOMarkName() == 'TypeError'");

        shouldBeTrue("testMark('navigationStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('unloadEventStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('unloadEventEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('redirectStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('redirectEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('fetchStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domainLookupStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domainLookupEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('connectStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('connectEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('secureConnectionStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('requestStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('responseStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('responseEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domLoading') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domInteractive') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domContentLoadedEventStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domContentLoadedEventEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('domComplete') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('loadEventStart') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('loadEventEnd') == 'SYNTAX_ERR'");

        shouldBeTrue("testMark('') == 'success'");

        shouldBeTrue("testMark('abc') == 'success'");

        shouldBeTrue("testMark(123) == 'success'");

        performance.clearMarks();

        // getMarks

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 0");

        prepareMarks();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('').length == 1 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('1').length == 1 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('a').length == 1 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('def').length == 1 && performance.getMarks('').every(isFinite) == true");

        prepareMarks();

        prepareMarks();

        prepareMarks();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('').length == 4 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('1').length == 4 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('a').length == 4 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('')) && performance.getMarks('def').length == 4 && performance.getMarks('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMarks('klmn')) && performance.getMarks('klmn').length == 0");

        performance.clearMarks();

        // clearMarks

        prepareMarks();

        prepareMarks();

        prepareMarks();

        prepareMarks();

        prepareMarks();

        prepareMarks();

        performance.clearMarks('klmn');

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 12");

        performance.clearMarks('ghij');

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 11");

        performance.clearMarks('');

        performance.clearMarks('1');

        performance.clearMarks('2');

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 8");

        performance.clearMarks();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMarks()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMarks())  == 0");

        // measure

        shouldBeTrue("testMeasureWOMeasureName() == 'TypeError'");

        prepareMarks();

        shouldBeTrue("testMeasure('', '', 1) == 'success'");

        shouldBeTrue("testMeasure('') == 'success'");

        shouldBeTrue("testMeasure('x', 1) == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'ghij') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'navigationStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'unloadEventStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'unloadEventEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'redirectStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'redirectEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'fetchStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domainLookupStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domainLookupEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'connectStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'connectEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'secureConnectionStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'requestStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'responseStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'responseEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domLoading') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domInteractive') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domContentLoadedEventStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domContentLoadedEventEnd') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'domComplete') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'loadEventStart') == 'success'");

        shouldBeTrue("testMeasure('y', 3, 'loadEventEnd') == 'success'");

        shouldBeTrue("testMeasure('z', 8) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', 3, 8) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('y', 'domInteractive', 8) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', 8, 3) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', 8, 9) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', undefined, 4) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', 4, undefined) == 'SYNTAX_ERR'");

        shouldBeTrue("testMeasure('z', 3, 'navigationStart') == 'success'");

        performance.clearMeasures();

        performance.clearMarks();

        // getMeasures

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 0");

        prepareMarks();

        prepareMeasures();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16");

        shouldBeTrue("performance.getMeasures('nav1')[0] <= performance.getMeasures('nav2')[0]");

        shouldBeTrue("performance.getMeasures('onloadEndToNow')[0] <= performance.getMeasures('nav1')[0]");

        shouldBeTrue("performance.getMeasures('loadTime')[0] > 0");

        shouldBeTrue("performance.getMeasures('domCompleteToa').length > 0");

        shouldBeTrue("performance.getMeasures('onloadStartToa').length > 0");

        shouldBeTrue("performance.getMeasures('negativeValue')[0] < 0");

        shouldBeTrue("performance.getMeasures('navToLoadStart')[0] > 0");

        shouldBeTrue("performance.getMeasures('navToM')[0] > 0");

        shouldBeTrue("performance.getMeasures('loadStartToM').length > 0");

        shouldBeTrue("performance.getMeasures('navToM') - performance.getMeasures('loadStartToM') == performance.getMeasures('navToLoadStart')");

        shouldBeTrue("Array.isArray(performance.getMeasures('')) && performance.getMeasures('').length == 1 && performance.getMeasures('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('x')) && performance.getMeasures('x').length == 1 && performance.getMeasures('x').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('y')) && performance.getMeasures('y').length == 1 && performance.getMeasures('y').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('zz')) && performance.getMeasures('zz').length == 0");

        prepareMeasures();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16");

        shouldBeTrue("Array.isArray(performance.getMeasures('')) && performance.getMeasures('').length == 2 && performance.getMeasures('').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('xx')) && performance.getMeasures('xx').length == 2 && performance.getMeasures('xx').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('yy')) && performance.getMeasures('yy').length == 2 && performance.getMeasures('yy').every(isFinite) == true");

        shouldBeTrue("Array.isArray(performance.getMeasures('zz')) && performance.getMeasures('zz').length == 0");

        prepareMarks();

        prepareMeasures();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16");

        shouldBeTrue("performance.getMeasures('nav1').length == 3 && performance.getMeasures('nav1')[1] <= performance.getMeasures('nav1')[2]");

        shouldBeTrue("performance.getMeasures('loadTime').length == 3 && performance.getMeasures('loadTime')[1] == performance.getMeasures('loadTime')[2]");

        shouldBeTrue("performance.getMeasures('domCompleteToa').length == 3 && performance.getMeasures('domCompleteToa')[1] <= performance.getMeasures('domCompleteToa')[2]");

        performance.clearMarks();

        performance.clearMeasures();

        // clearMeasures

        prepareMarks();

        prepareMeasures();

        prepareMarks();

        prepareMeasures();

        performance.clearMeasures('nonexist');

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 16");

        performance.clearMeasures('');

        performance.clearMeasures('x');

        performance.clearMeasures('xx');

        performance.clearMeasures('nav1');

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 12");

        performance.clearMeasures();

        shouldBeTrue("checkDictTypeMarksOrMeasures(performance.getMeasures()) && dictTypeMarksOrMeasuresHasItemNum(performance.getMeasures())  == 0");

        performance.clearMarks();

        var successfullyParsed = true;

        wasPostTestScriptParsed = true;

        if (window.jsTestIsAsync) {

            if (window.layoutTestController)

                layoutTestController.waitUntilDone();

            if (window.wasFinishJSTestCalled)

                finishJSTest();

        } else

            finishJSTest();

    }

</script>

</body>

0