Title: [172054] branches/safari-600.1-branch/Source
- Revision
- 172054
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 13:19:35 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171866. <rdar://problem/17872676>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172053 => 172054)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 20:15:40 UTC (rev 172053)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 20:19:35 UTC (rev 172054)
@@ -39,6 +39,45 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171866
+
+ 2014-07-31 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: console.profile missing profile information
+ https://bugs.webkit.org/show_bug.cgi?id=135432
+
+ Reviewed by Timothy Hatcher.
+
+ By switching console.profile to start/stop the timeline we would
+ not have a chance to recompile JS functions with profiling information.
+ This used to work because whenever the inspector was open we would
+ have profiling information enabled. Go back to that behavior.
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::profilerEnabled):
+ Instead of checking if the timeline agent has started, check if the
+ timeline agent has been created. Going back to the normal behavior
+ of always having profiling information when the inspector is open.
+
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
+ Recompile initializing the timeline agent to include profiling information.
+
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ Recompile destrying the timeline agent, only if needed.
+
+ (WebCore::InspectorTimelineAgent::willCallFunction):
+ (WebCore::InspectorTimelineAgent::didCallFunction):
+ (WebCore::InspectorTimelineAgent::willEvaluateScript):
+ (WebCore::InspectorTimelineAgent::didEvaluateScript):
+ Using a boolean to track nested calls would not give expected
+ behavior when un-nesting. Switch to a counter to ensure that
+ as we start profiling in the outermost level we then stop
+ profiling at that same level and not inside an inner nesting.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171851
2014-07-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172053 => 172054)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 20:15:40 UTC (rev 172053)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 20:19:35 UTC (rev 172054)
@@ -13,6 +13,21 @@
Delete the payload information as soon as it has been processed.
It is no longer needed anymore and can be garbage collected.
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r171866
+
+ 2014-07-31 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: console.profile missing profile information
+ https://bugs.webkit.org/show_bug.cgi?id=135432
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/ScriptTimelineRecord.js:
+ Delete the payload information as soon as it has been processed.
+ It is no longer needed anymore and can be garbage collected.
+
2014-07-30 Lucas Forschler <lforsch...@apple.com>
Merge r171790
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
