Title: [207074] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207074
- Author
- carlo...@webkit.org
- Date
- 2016-10-11 03:21:30 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r205920 - ShowRenderTree should take position offset into account when printing inflow positioned renderers.
https://bugs.webkit.org/show_bug.cgi?id=161978
Reviewed by Simon Fraser.
Adjust (x, y) with the inflow positioned renderer's offset.
Not testable.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::showRenderObject):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207073 => 207074)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 09:53:39 UTC (rev 207073)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 10:21:30 UTC (rev 207074)
@@ -1,3 +1,17 @@
+2016-09-14 Zalan Bujtas <za...@apple.com>
+
+ ShowRenderTree should take position offset into account when printing inflow positioned renderers.
+ https://bugs.webkit.org/show_bug.cgi?id=161978
+
+ Reviewed by Simon Fraser.
+
+ Adjust (x, y) with the inflow positioned renderer's offset.
+
+ Not testable.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::showRenderObject):
+
2016-09-12 Zalan Bujtas <za...@apple.com>
Input type object and the associated render can go out of sync.
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderObject.cpp (207073 => 207074)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderObject.cpp 2016-10-11 09:53:39 UTC (rev 207073)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderObject.cpp 2016-10-11 10:21:30 UTC (rev 207074)
@@ -1116,7 +1116,10 @@
fprintf(stderr, "%s", name.utf8().data());
if (is<RenderBox>(*this)) {
- FloatRect boxRect = downcast<RenderBox>(*this).frameRect();
+ auto& renderBox = downcast<RenderBox>(*this);
+ FloatRect boxRect = renderBox.frameRect();
+ if (renderBox.isInFlowPositioned())
+ boxRect.move(renderBox.offsetForInFlowPosition());
fprintf(stderr, " (%.2f, %.2f) (%.2f, %.2f)", boxRect.x(), boxRect.y(), boxRect.width(), boxRect.height());
} else if (is<RenderInline>(*this) && isInFlowPositioned()) {
FloatSize inlineOffset = downcast<RenderInline>(*this).offsetForInFlowPosition();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
