Title: [141299] trunk
- Revision
- 141299
- Author
- [email protected]
- Date
- 2013-01-30 12:47:01 -0800 (Wed, 30 Jan 2013)
Log Message
[GTK] http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_entry_type.html is failing
https://bugs.webkit.org/show_bug.cgi?id=108100
Reviewed by Tony Gentilcore.
Source/WebCore:
Similarly to the changes to V8 bindings in r140882, wrap the PerformanceEntry
as a PerformanceMark or PerformanceMeasure if possible.
No new tests - the relevant test now passes.
* bindings/js/JSPerformanceEntryCustom.cpp:
(WebCore::toJS):
LayoutTests:
* platform/gtk/TestExpectations: Remove the failure expectation.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (141298 => 141299)
--- trunk/LayoutTests/ChangeLog 2013-01-30 20:46:15 UTC (rev 141298)
+++ trunk/LayoutTests/ChangeLog 2013-01-30 20:47:01 UTC (rev 141299)
@@ -1,3 +1,12 @@
+2013-01-30 Zan Dobersek <[email protected]>
+
+ [GTK] http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_entry_type.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=108100
+
+ Reviewed by Tony Gentilcore.
+
+ * platform/gtk/TestExpectations: Remove the failure expectation.
+
2013-01-30 Jussi Kukkonen <[email protected]>
[EFL] Gardening: Add expectations for flaky crashers
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (141298 => 141299)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-01-30 20:46:15 UTC (rev 141298)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-01-30 20:47:01 UTC (rev 141299)
@@ -1414,8 +1414,6 @@
webkit.org/b/106563 fast/css/image-orientation/image-orientation.html [ Failure ]
-webkit.org/b/108100 http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_entry_type.html [ Failure ]
-
webkit.org/b/108169 fast/dom/shadow/touch-event.html [ Failure ]
webkit.org/b/108363 fullscreen/full-screen-iframe-legacy.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (141298 => 141299)
--- trunk/Source/WebCore/ChangeLog 2013-01-30 20:46:15 UTC (rev 141298)
+++ trunk/Source/WebCore/ChangeLog 2013-01-30 20:47:01 UTC (rev 141299)
@@ -1,3 +1,18 @@
+2013-01-30 Zan Dobersek <[email protected]>
+
+ [GTK] http/tests/w3c/webperf/submission/Intel/user-timing/test_user_timing_entry_type.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=108100
+
+ Reviewed by Tony Gentilcore.
+
+ Similarly to the changes to V8 bindings in r140882, wrap the PerformanceEntry
+ as a PerformanceMark or PerformanceMeasure if possible.
+
+ No new tests - the relevant test now passes.
+
+ * bindings/js/JSPerformanceEntryCustom.cpp:
+ (WebCore::toJS):
+
2013-01-30 Adam Klein <[email protected]>
[JSC] MutationObservers should not create circular, leaky references
Modified: trunk/Source/WebCore/bindings/js/JSPerformanceEntryCustom.cpp (141298 => 141299)
--- trunk/Source/WebCore/bindings/js/JSPerformanceEntryCustom.cpp 2013-01-30 20:46:15 UTC (rev 141298)
+++ trunk/Source/WebCore/bindings/js/JSPerformanceEntryCustom.cpp 2013-01-30 20:47:01 UTC (rev 141299)
@@ -35,7 +35,11 @@
#include "JSPerformanceEntry.h"
#include "JSDOMBinding.h"
+#include "JSPerformanceMark.h"
+#include "JSPerformanceMeasure.h"
#include "JSPerformanceResourceTiming.h"
+#include "PerformanceMark.h"
+#include "PerformanceMeasure.h"
#include "PerformanceResourceTiming.h"
using namespace JSC;
@@ -52,6 +56,14 @@
return wrap<JSPerformanceResourceTiming>(exec, globalObject, static_cast<PerformanceResourceTiming*>(entry));
#endif
+#if ENABLE(USER_TIMING)
+ if (entry->isMark())
+ return wrap<JSPerformanceMark>(exec, globalObject, static_cast<PerformanceMark*>(entry));
+
+ if (entry->isMeasure())
+ return wrap<JSPerformanceMeasure>(exec, globalObject, static_cast<PerformanceMeasure*>(entry));
+#endif
+
return wrap<JSPerformanceEntry>(exec, globalObject, entry);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes