Title: [237457] trunk/Source/WebCore
- Revision
- 237457
- Author
- [email protected]
- Date
- 2018-10-26 07:45:51 -0700 (Fri, 26 Oct 2018)
Log Message
[LFC][IFC] Add more inline information to outputLayoutTree
https://bugs.webkit.org/show_bug.cgi?id=190945
Reviewed by Antti Koivisto.
* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::outputInlineRuns):
(WebCore::Layout::outputLayoutBox):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237456 => 237457)
--- trunk/Source/WebCore/ChangeLog 2018-10-26 14:42:06 UTC (rev 237456)
+++ trunk/Source/WebCore/ChangeLog 2018-10-26 14:45:51 UTC (rev 237457)
@@ -1,5 +1,16 @@
2018-10-26 Zalan Bujtas <[email protected]>
+ [LFC][IFC] Add more inline information to outputLayoutTree
+ https://bugs.webkit.org/show_bug.cgi?id=190945
+
+ Reviewed by Antti Koivisto.
+
+ * layout/layouttree/LayoutTreeBuilder.cpp:
+ (WebCore::Layout::outputInlineRuns):
+ (WebCore::Layout::outputLayoutBox):
+
+2018-10-26 Zalan Bujtas <[email protected]>
+
[LFC][IFC] Layout floats as part of the inline content
https://bugs.webkit.org/show_bug.cgi?id=190942
Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (237456 => 237457)
--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp 2018-10-26 14:42:06 UTC (rev 237456)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp 2018-10-26 14:45:51 UTC (rev 237457)
@@ -148,6 +148,8 @@
stream << "run";
if (inlineRun.textContext())
stream << "(" << inlineRun.textContext()->start() << ", " << inlineRun.textContext()->start() + inlineRun.textContext()->length() << ") ";
+ else
+ stream << "(x, x) ";
stream << "(" << inlineRun.logicalLeft() << ", " << inlineRun.logicalRight() << ")";
stream.nextLine();
}
@@ -161,9 +163,15 @@
if (is<InlineContainer>(layoutBox))
stream << "inline container";
- else if (is<InlineBox>(layoutBox))
- stream << "inline box";
- else if (is<BlockContainer>(layoutBox)) {
+ else if (is<InlineBox>(layoutBox)) {
+ if (layoutBox.replaced())
+ stream << "inline replaced box";
+ else if (downcast<InlineBox>(layoutBox).hasTextContent()) {
+ auto textContent = downcast<InlineBox>(layoutBox).textContent();
+ stream << "inline text [\"" << textContent.utf8().data() << "\"]";
+ } else
+ stream << "inline box";
+ } else if (is<BlockContainer>(layoutBox)) {
if (!layoutBox.parent())
stream << "initial ";
stream << "block container";
@@ -171,13 +179,13 @@
stream << "box";
// FIXME: Inline text runs don't create display boxes yet.
if (displayBox) {
- if (is<InlineBox>(layoutBox) || is<InlineContainer>(layoutBox)) {
- // FIXME: display box is not completely set yet.
+ // FIXME: display box is not completely set yet.
+ if ((is<InlineBox>(layoutBox) || is<InlineContainer>(layoutBox)) && !layoutBox.isFloatingPositioned())
stream << " at [" << "." << " " << "." << "] size [" << displayBox->width() << " " << displayBox->height() << "]";
- } else
+ else
stream << " at [" << displayBox->left() << " " << displayBox->top() << "] size [" << displayBox->width() << " " << displayBox->height() << "]";
}
- stream << " object [" << &layoutBox << "]";
+ stream << " [" << &layoutBox << "]";
stream.nextLine();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
