Title: [256733] trunk
- Revision
- 256733
- Author
- [email protected]
- Date
- 2020-02-17 08:03:44 -0800 (Mon, 17 Feb 2020)
Log Message
[LFC] Remove ReplacedBox::m_layoutBox
https://bugs.webkit.org/show_bug.cgi?id=207830
<rdar://problem/59498829>
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html
This is not needed after r256380 ([LFC] Introduce Layout::ReplacedBox).
* layout/layouttree/LayoutReplacedBox.cpp:
(WebCore::Layout::ReplacedBox::hasIntrinsicWidth const):
(WebCore::Layout::ReplacedBox::hasIntrinsicHeight const):
(WebCore::Layout::ReplacedBox::intrinsicWidth const):
(WebCore::Layout::ReplacedBox::intrinsicHeight const):
(WebCore::Layout::ReplacedBox::hasAspectRatio const):
* layout/layouttree/LayoutReplacedBox.h:
LayoutTests:
* fast/layoutformattingcontext/simple-absolute-positioned-inline-element-expected.html: Added.
* fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (256732 => 256733)
--- trunk/LayoutTests/ChangeLog 2020-02-17 15:53:41 UTC (rev 256732)
+++ trunk/LayoutTests/ChangeLog 2020-02-17 16:03:44 UTC (rev 256733)
@@ -1,5 +1,16 @@
2020-02-17 Zalan Bujtas <[email protected]>
+ [LFC] Remove ReplacedBox::m_layoutBox
+ https://bugs.webkit.org/show_bug.cgi?id=207830
+ <rdar://problem/59498829>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/layoutformattingcontext/simple-absolute-positioned-inline-element-expected.html: Added.
+ * fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html: Added.
+
+2020-02-17 Zalan Bujtas <[email protected]>
+
[LFC] The initial containing block does not necessarily have in-flow content.
https://bugs.webkit.org/show_bug.cgi?id=207833
<rdar://problem/59500650>
Added: trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element-expected.html (0 => 256733)
--- trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element-expected.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element-expected.html 2020-02-17 16:03:44 UTC (rev 256733)
@@ -0,0 +1,9 @@
+<!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+div {
+ width: 100px;
+ height: 100px;
+ background-color: green;
+}
+</style>
+<div></div>
Added: trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html (0 => 256733)
--- trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html 2020-02-17 16:03:44 UTC (rev 256733)
@@ -0,0 +1,10 @@
+<!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+video {
+ position: absolute;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+}
+</style>
+<div><video></div>
Modified: trunk/Source/WebCore/ChangeLog (256732 => 256733)
--- trunk/Source/WebCore/ChangeLog 2020-02-17 15:53:41 UTC (rev 256732)
+++ trunk/Source/WebCore/ChangeLog 2020-02-17 16:03:44 UTC (rev 256733)
@@ -1,5 +1,25 @@
2020-02-17 Zalan Bujtas <[email protected]>
+ [LFC] Remove ReplacedBox::m_layoutBox
+ https://bugs.webkit.org/show_bug.cgi?id=207830
+ <rdar://problem/59498829>
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/layoutformattingcontext/simple-absolute-positioned-inline-element.html
+
+ This is not needed after r256380 ([LFC] Introduce Layout::ReplacedBox).
+
+ * layout/layouttree/LayoutReplacedBox.cpp:
+ (WebCore::Layout::ReplacedBox::hasIntrinsicWidth const):
+ (WebCore::Layout::ReplacedBox::hasIntrinsicHeight const):
+ (WebCore::Layout::ReplacedBox::intrinsicWidth const):
+ (WebCore::Layout::ReplacedBox::intrinsicHeight const):
+ (WebCore::Layout::ReplacedBox::hasAspectRatio const):
+ * layout/layouttree/LayoutReplacedBox.h:
+
+2020-02-17 Zalan Bujtas <[email protected]>
+
[LFC] The initial containing block does not necessarily have in-flow content.
https://bugs.webkit.org/show_bug.cgi?id=207833
<rdar://problem/59500650>
Modified: trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp (256732 => 256733)
--- trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp 2020-02-17 15:53:41 UTC (rev 256732)
+++ trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp 2020-02-17 16:03:44 UTC (rev 256733)
@@ -43,12 +43,12 @@
bool ReplacedBox::hasIntrinsicWidth() const
{
- return m_intrinsicSize || m_layoutBox->style().logicalWidth().isIntrinsic();
+ return m_intrinsicSize || style().logicalWidth().isIntrinsic();
}
bool ReplacedBox::hasIntrinsicHeight() const
{
- return m_intrinsicSize || m_layoutBox->style().logicalHeight().isIntrinsic();
+ return m_intrinsicSize || style().logicalHeight().isIntrinsic();
}
bool ReplacedBox::hasIntrinsicRatio() const
@@ -63,7 +63,7 @@
ASSERT(hasIntrinsicWidth());
if (m_intrinsicSize)
return m_intrinsicSize->width();
- return LayoutUnit(m_layoutBox->style().logicalWidth().value());
+ return LayoutUnit { style().logicalWidth().value() };
}
LayoutUnit ReplacedBox::intrinsicHeight() const
@@ -71,7 +71,7 @@
ASSERT(hasIntrinsicHeight());
if (m_intrinsicSize)
return m_intrinsicSize->height();
- return LayoutUnit(m_layoutBox->style().logicalHeight().value());
+ return LayoutUnit { style().logicalHeight().value() };
}
LayoutUnit ReplacedBox::intrinsicRatio() const
@@ -86,7 +86,7 @@
bool ReplacedBox::hasAspectRatio() const
{
- return m_layoutBox->isImage() || m_layoutBox->style().aspectRatioType() == AspectRatioType::FromIntrinsic;
+ return isImage() || style().aspectRatioType() == AspectRatioType::FromIntrinsic;
}
}
Modified: trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.h (256732 => 256733)
--- trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.h 2020-02-17 15:53:41 UTC (rev 256732)
+++ trunk/Source/WebCore/layout/layouttree/LayoutReplacedBox.h 2020-02-17 16:03:44 UTC (rev 256733)
@@ -60,7 +60,6 @@
private:
bool hasAspectRatio() const;
- WeakPtr<const Box> m_layoutBox;
Optional<LayoutSize> m_intrinsicSize;
Optional<LayoutUnit> m_intrinsicRatio;
CachedImage* m_cachedImage { nullptr };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
