Diff
Modified: trunk/LayoutTests/ChangeLog (136903 => 136904)
--- trunk/LayoutTests/ChangeLog 2012-12-06 23:47:58 UTC (rev 136903)
+++ trunk/LayoutTests/ChangeLog 2012-12-06 23:50:44 UTC (rev 136904)
@@ -1,3 +1,14 @@
+2012-12-06 James Simonsen <[email protected]>
+
+ [Chromium] Enable Resource Timing and User Timing
+ https://bugs.webkit.org/show_bug.cgi?id=103788
+
+ Reviewed by Tony Gentilcore.
+
+ * http/tests/w3c/webperf/submission/resource-timing/html/test_resource_iframe_navigation.html: Removed. Incomplete, shouldn't have been submitted.
+ * platform/chromium/TestExpectations: Remove 'Skip' expectations and add expected failures for iframes.
+ * platform/chromium/fast/dom/Window/window-properties-performance-expected.txt: Added. Now includes User Timing and Resource Timing properties.
+
2012-12-06 Adam Klein <[email protected]>
[HTMLTemplateElement] make content readonly and cloneNode(deep) clone content
Deleted: trunk/LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_iframe_navigation.html (136903 => 136904)
--- trunk/LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_iframe_navigation.html 2012-12-06 23:47:58 UTC (rev 136903)
+++ trunk/LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_iframe_navigation.html 2012-12-06 23:50:44 UTC (rev 136904)
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Resource Timing reparenting elements</title>
-<link rel="author" title="Google" href="" />
-<link rel="help" href=""
-<script src=""
-<script src=""
-<script src=""
-<script>
-setup({explicit_done: true});
-var iframe;
-function setup_iframe() {
- window.setup_iframe = onload_test;
- iframe = document.getElementById('frameContext');
- iframe.contentWindow.location = '/w3c/webperf/resources/inject_resource_test.html?id=2';
-}
-function onload_test() {
- var entries = iframe.contentWindow.performance.webkitGetEntries();
-
- var expected_entries = {
- '/w3c/webperf/resources/inject_resource_test.html?id=1': 'iframe',
- };
-
- test_resource_entries(entries, expected_entries);
- done();
-}
-window.setup_iframe = setup_iframe;
-</script>
-</head>
-<body>
-<h1>Description</h1>
-<p>This test validates that reparenting an element doesn't change the initiator document.</p>
-<div id="log"></div>
-<iframe id="frameContext" src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (136903 => 136904)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-06 23:47:58 UTC (rev 136903)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-06 23:50:44 UTC (rev 136904)
@@ -4011,9 +4011,6 @@
# Flaky crashing on debug
webkit.org/b/99604 [ Mac Win ] http/tests/workers/text-encoding.html [ Pass Crash ]
-# User Timing is not enable yet. so skip it.
-webkit.org/b/84893 http/tests/w3c/webperf/submission/Intel/user-timing [ Skip ]
-
# Expected to fail until WebGL extension implementation lands
webkit.org/b/98257 fast/canvas/webgl/oes-element-index-uint.html [ Failure Pass ]
webkit.org/b/98257 platform/chromium/virtual/gpu/fast/canvas/webgl/oes-element-index-uint.html [ Failure Pass ]
@@ -4171,8 +4168,11 @@
webkit.org/b/102724 svg/carto.net/colourpicker.svg [ ImageOnlyFailure ]
-# Fails until we enable the Resource Timing API.
-webkit.org/b/61138 http/tests/w3c/webperf/submission/resource-timing [ Skip ]
+webkit.org/b/103927 http/tests/w3c/webperf/submission/resource-timing/html/test_resource_attribute_order.html [ Text ]
+webkit.org/b/103927 http/tests/w3c/webperf/submission/resource-timing/html/test_resource_dynamic_insertion.html [ Text ]
+webkit.org/b/103927 http/tests/w3c/webperf/submission/resource-timing/html/test_resource_frame_initiator_type.html [ Text ]
+webkit.org/b/103927 http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html [ Text ]
+webkit.org/b/103927 http/tests/w3c/webperf/submission/resource-timing/html/test_resource_redirects.html [ Text ]
webkit.org/b/103062 [ Debug ] fast/canvas/canvas-strokePath-gradient-shadow.html [ Crash ]
webkit.org/b/103062 [ Debug ] fast/canvas/canvas-strokeRect-gradient-shadow.html [ Crash ]
Added: trunk/LayoutTests/platform/chromium/fast/dom/Window/window-properties-performance-expected.txt (0 => 136904)
--- trunk/LayoutTests/platform/chromium/fast/dom/Window/window-properties-performance-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/fast/dom/Window/window-properties-performance-expected.txt 2012-12-06 23:50:44 UTC (rev 136904)
@@ -0,0 +1,51 @@
+This test dumps all of the properties that are reachable from the window.performance object, along with their types.
+
+window.performance [object Performance]
+window.performance.memory [object MemoryInfo]
+window.performance.memory.jsHeapSizeLimit [number]
+window.performance.memory.totalJSHeapSize [number]
+window.performance.memory.usedJSHeapSize [number]
+window.performance.navigation [object PerformanceNavigation]
+window.performance.navigation.TYPE_BACK_FORWARD [number]
+window.performance.navigation.TYPE_NAVIGATE [number]
+window.performance.navigation.TYPE_RELOAD [number]
+window.performance.navigation.TYPE_RESERVED [number]
+window.performance.navigation.redirectCount [number]
+window.performance.navigation.type [number]
+window.performance.now [function]
+window.performance.onwebkitresourcetimingbufferfull [null]
+window.performance.timing [object PerformanceTiming]
+window.performance.timing.connectEnd [number]
+window.performance.timing.connectStart [number]
+window.performance.timing.domComplete [number]
+window.performance.timing.domContentLoadedEventEnd [number]
+window.performance.timing.domContentLoadedEventStart [number]
+window.performance.timing.domInteractive [number]
+window.performance.timing.domLoading [number]
+window.performance.timing.domainLookupEnd [number]
+window.performance.timing.domainLookupStart [number]
+window.performance.timing.fetchStart [number]
+window.performance.timing.loadEventEnd [number]
+window.performance.timing.loadEventStart [number]
+window.performance.timing.navigationStart [number]
+window.performance.timing.redirectEnd [number]
+window.performance.timing.redirectStart [number]
+window.performance.timing.requestStart [number]
+window.performance.timing.responseEnd [number]
+window.performance.timing.responseStart [number]
+window.performance.timing.secureConnectionStart [number]
+window.performance.timing.unloadEventEnd [number]
+window.performance.timing.unloadEventStart [number]
+window.performance.webkitClearMarks [function]
+window.performance.webkitClearMeasures [function]
+window.performance.webkitClearResourceTimings [function]
+window.performance.webkitGetEntries [function]
+window.performance.webkitGetEntriesByName [function]
+window.performance.webkitGetEntriesByType [function]
+window.performance.webkitMark [function]
+window.performance.webkitMeasure [function]
+window.performance.webkitSetResourceTimingBufferSize [function]
+window.performance.timing [printed above as window.performance.timing]
+window.performance.navigation [printed above as window.performance.navigation]
+window.performance [string]
+
Modified: trunk/Source/WebKit/chromium/ChangeLog (136903 => 136904)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-06 23:47:58 UTC (rev 136903)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-06 23:50:44 UTC (rev 136904)
@@ -1,3 +1,12 @@
+2012-12-06 James Simonsen <[email protected]>
+
+ [Chromium] Enable Resource Timing and User Timing
+ https://bugs.webkit.org/show_bug.cgi?id=103788
+
+ Reviewed by Tony Gentilcore.
+
+ * features.gypi:
+
2012-12-06 Jochen Eisinger <[email protected]>
[chromium] when forwarding events through the WebPluginContainer, create a UserGestureIndicator if processing a user gesture
Modified: trunk/Source/WebKit/chromium/features.gypi (136903 => 136904)
--- trunk/Source/WebKit/chromium/features.gypi 2012-12-06 23:47:58 UTC (rev 136903)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-12-06 23:50:44 UTC (rev 136904)
@@ -93,13 +93,15 @@
'ENABLE_MUTATION_OBSERVERS=<(enable_mutation_observers)',
'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
'ENABLE_PAGE_VISIBILITY_API=1',
+ 'ENABLE_PERFORMANCE_TIMELINE=1',
'ENABLE_POINTER_LOCK=1',
'ENABLE_PROGRESS_ELEMENT=1',
'ENABLE_PROXIMITY_EVENTS=0',
'ENABLE_QUOTA=1',
- 'ENABLE_RESOLUTION_MEDIA_QUERY=0',
'ENABLE_REQUEST_ANIMATION_FRAME=1',
'ENABLE_REQUEST_AUTOCOMPLETE=1',
+ 'ENABLE_RESOLUTION_MEDIA_QUERY=0',
+ 'ENABLE_RESOURCE_TIMING=1',
'ENABLE_RUBY=1',
'ENABLE_SANDBOX=1',
'ENABLE_SCRIPTED_SPEECH=1',
@@ -115,6 +117,7 @@
'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
'ENABLE_TOUCH_SLIDER=1',
+ 'ENABLE_USER_TIMING=1',
'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
'ENABLE_VIDEO=1',
'ENABLE_VIDEO_TRACK=1',
