Title: [254649] branches/safari-609-branch/Source/WebCore
- Revision
- 254649
- Author
- alanc...@apple.com
- Date
- 2020-01-15 15:07:43 -0800 (Wed, 15 Jan 2020)
Log Message
Cherry-pick r254267. rdar://problem/58606290
Reformat FrameView logging
https://bugs.webkit.org/show_bug.cgi?id=205984
<rdar://problem/58431722>
Reviewed by Brent Fulgham.
Update the format used by FrameView in its RELEASE_LOG logging. Use
the format used by WebPageProxy and NetworkResourceLoader, which is
generally of the form:
<object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values>
So, for example:
0x4a1cf8010 - FrameView::fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame
becomes:
0x561be8010 - [frame=0x55d47e000, main=1] FrameView::fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame
No new tests -- no new or changed functionality.
* page/FrameView.cpp:
(WebCore::FrameView::paintContents):
(WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (254648 => 254649)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-15 23:07:41 UTC (rev 254648)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-15 23:07:43 UTC (rev 254649)
@@ -1,5 +1,66 @@
2020-01-15 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254267. rdar://problem/58606290
+
+ Reformat FrameView logging
+ https://bugs.webkit.org/show_bug.cgi?id=205984
+ <rdar://problem/58431722>
+
+ Reviewed by Brent Fulgham.
+
+ Update the format used by FrameView in its RELEASE_LOG logging. Use
+ the format used by WebPageProxy and NetworkResourceLoader, which is
+ generally of the form:
+
+ <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values>
+
+ So, for example:
+
+ 0x4a1cf8010 - FrameView::fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame
+
+ becomes:
+
+ 0x561be8010 - [frame=0x55d47e000, main=1] FrameView::fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame
+
+ No new tests -- no new or changed functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintContents):
+ (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-09 Keith Rollin <krol...@apple.com>
+
+ Reformat FrameView logging
+ https://bugs.webkit.org/show_bug.cgi?id=205984
+ <rdar://problem/58431722>
+
+ Reviewed by Brent Fulgham.
+
+ Update the format used by FrameView in its RELEASE_LOG logging. Use
+ the format used by WebPageProxy and NetworkResourceLoader, which is
+ generally of the form:
+
+ <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values>
+
+ So, for example:
+
+ 0x4a1cf8010 - FrameView::fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame
+
+ becomes:
+
+ 0x561be8010 - [frame=0x55d47e000, main=1] FrameView::fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame
+
+ No new tests -- no new or changed functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintContents):
+ (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
+
+2020-01-15 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254229. rdar://problem/58605950
<img>.naturalWidth should return the density-corrected intrinsic width
Modified: branches/safari-609-branch/Source/WebCore/page/FrameView.cpp (254648 => 254649)
--- branches/safari-609-branch/Source/WebCore/page/FrameView.cpp 2020-01-15 23:07:41 UTC (rev 254648)
+++ branches/safari-609-branch/Source/WebCore/page/FrameView.cpp 2020-01-15 23:07:43 UTC (rev 254649)
@@ -132,7 +132,7 @@
#include "LayoutContext.h"
#endif
-#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(frame().page() && frame().page()->isAlwaysOnLoggingAllowed(), Layout, "%p - FrameView::" fmt, this, ##__VA_ARGS__)
+#define FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(frame().page() && frame().page()->isAlwaysOnLoggingAllowed(), channel, "%p - [frame=%p, main=%d] FrameView::" fmt, this, &frame(), frame().isMainFrame(), ##__VA_ARGS__)
namespace WebCore {
@@ -4185,7 +4185,7 @@
ASSERT(!needsLayout());
if (needsLayout()) {
- RELEASE_LOG_IF_ALLOWED("FrameView::paintContents() - not painting because render tree needs layout (is main frame %d)", frame().isMainFrame());
+ FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Layout, "paintContents: Not painting because render tree needs layout");
return;
}
@@ -5155,7 +5155,7 @@
if (milestonesAchieved && frame().isMainFrame()) {
if (milestonesAchieved.contains(DidFirstVisuallyNonEmptyLayout))
- RELEASE_LOG_IF_ALLOWED("fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame");
+ FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Layout, "fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame");
frame().loader().didReachLayoutMilestone(milestonesAchieved);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
