Attachment 343416 Details for Bug 186959 – Patch

[patch] Patch

bug-186959-20180622202605.patch (text/plain), 2.78 KB, created by zalan on 2018-06-22 20:26:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-06-22 20:26:06 PDT

Size: 2.78 KB

patch

obsolete

>Subversion Revision: 233112
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a976634885d98bf31d9f880af0f4f937cb509d1f..c599ee7b9c2cb3cc8cde1a41a0c712caa91b86c6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-22  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Relatively positioned renderer needs offsetting for validation
>+        https://bugs.webkit.org/show_bug.cgi?id=186959
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/FormattingContextGeometry.cpp:
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
>+        * layout/Verification.cpp:
>+        (WebCore::Layout::outputMismatchingBoxInformationIfNeeded):
>+
> 2018-06-22  Jer Noble  <jer.noble@apple.com>
> 
>         [Fullscreen] Restore ASSERT_NOT_REACHED() checks in exit fullscreen handler after r231924
>diff --git a/Source/WebCore/layout/FormattingContextGeometry.cpp b/Source/WebCore/layout/FormattingContextGeometry.cpp
>index c76843995af566a6ebe33389ec49f8f077a3f8a2..f5fa05c791433f083f00db18ce62d0171ca04b6d 100644
>--- a/Source/WebCore/layout/FormattingContextGeometry.cpp
>+++ b/Source/WebCore/layout/FormattingContextGeometry.cpp
>@@ -188,7 +188,7 @@ FormattingContext::Geometry::VerticalGeometry FormattingContext::Geometry::outOf
>     ASSERT(marginBottom);
> 
>     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Position][Height][Margin] -> out-of-flow non-replaced -> top(" << *top << "px) bottom("  << *bottom << "px) height(" << *height << "px) margin(" << *marginTop << "px, "  << *marginBottom << "px) layoutBox(" << &layoutBox << ")");
>-    return { *top, *bottom, { *height, { *marginTop, *marginBottom} } };
>+    return { *top, *bottom, { *height, { *marginTop, *marginBottom } } };
> }
> 
> FormattingContext::Geometry::HorizontalGeometry FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry(LayoutContext& layoutContext, const Box& layoutBox)
>diff --git a/Source/WebCore/layout/Verification.cpp b/Source/WebCore/layout/Verification.cpp
>index 357d41bb918713749b9f534cae7759a7cb52c4d5..c7fd79079cbae4275d3488d635ce4170fc552de3 100644
>--- a/Source/WebCore/layout/Verification.cpp
>+++ b/Source/WebCore/layout/Verification.cpp
>@@ -57,7 +57,12 @@ static bool outputMismatchingBoxInformationIfNeeded(TextStream& stream, const La
>     auto* displayBox = context.displayBoxForLayoutBox(layoutBox);
>     ASSERT(displayBox);
> 
>-    if (renderer.frameRect() != displayBox->rect())  {
>+    auto frameRect = renderer.frameRect();
>+    // rendering does not offset for relative positioned boxes.
>+    if (renderer.isInFlowPositioned())
>+        frameRect.move(renderer.offsetForInFlowPosition());
>+
>+    if (frameRect != displayBox->rect()) {
>         outputRect("frameBox", renderer.frameRect(), displayBox->rect());
>         return true;
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 186959: 343416