Diff
Modified: trunk/LayoutTests/ChangeLog (270149 => 270150)
--- trunk/LayoutTests/ChangeLog 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/LayoutTests/ChangeLog 2020-11-21 19:43:11 UTC (rev 270150)
@@ -1,3 +1,13 @@
+2020-11-21 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Remove ensureLineBoxes call from RenderedPosition constructor
+ https://bugs.webkit.org/show_bug.cgi?id=219164
+
+ Reviewed by Zalan Bujtas.
+
+ * accessibility/mac/attachment-element-replacement-character-expected.txt:
+ * platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt:
+
2020-11-21 Brian Burg <[email protected]>
Web Inspector: implement Multimap.prototype.take()
Modified: trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt (270149 => 270150)
--- trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt 2020-11-21 19:43:11 UTC (rev 270150)
@@ -5,7 +5,7 @@
String:
-some[ATTACHMENT] test
+some [ATTACHMENT] test
This tests that attachment element replacements are present in strings.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt (270149 => 270150)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt 2020-11-21 19:43:11 UTC (rev 270150)
@@ -21,13 +21,11 @@
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {HR} at (0,198) size 784x2 [border: (1px inset #000000)]
RenderBlock {PRE} at (0,213) size 108x78 [border: (4px solid #0000FF)]
- RenderText {#text} at (4,4) size 100x70
- text run at (4,4) width 86: "This text"
- text run at (89,4) width 15: " "
+ RenderText {#text} at (4,4) size 94x70
+ text run at (4,4) width 86: "This text "
text run at (4,18) width 71: "will wrap"
text run at (74,18) width 1: " "
- text run at (4,32) width 71: "and fit"
- text run at (74,32) width 24: " "
+ text run at (4,32) width 94: "and fit "
text run at (4,46) width 79: "within the"
text run at (82,46) width 1: " "
text run at (4,60) width 32: "box."
Modified: trunk/Source/WebCore/ChangeLog (270149 => 270150)
--- trunk/Source/WebCore/ChangeLog 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/Source/WebCore/ChangeLog 2020-11-21 19:43:11 UTC (rev 270150)
@@ -1,3 +1,20 @@
+2020-11-21 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Remove ensureLineBoxes call from RenderedPosition constructor
+ https://bugs.webkit.org/show_bug.cgi?id=219164
+
+ Reviewed by Zalan Bujtas.
+
+ It is not needed anymore. We can use LFC line layout through the editing code.
+
+ * dom/Position.cpp:
+ (WebCore::Position::ensureLineBoxes const): Deleted.
+ * dom/Position.h:
+ * editing/RenderedPosition.cpp:
+ (WebCore::RenderedPosition::RenderedPosition):
+ * editing/RenderedPosition.h:
+ (WebCore::RenderedPosition::rootBox): Deleted.
+
2020-11-21 Aditya Keerthi <[email protected]>
Space between minute and meridiem fields in time inputs is too large
Modified: trunk/Source/WebCore/dom/Position.cpp (270149 => 270150)
--- trunk/Source/WebCore/dom/Position.cpp 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/Source/WebCore/dom/Position.cpp 2020-11-21 19:43:11 UTC (rev 270150)
@@ -1363,19 +1363,6 @@
return { run, caretOffset };
}
-void Position::ensureLineBoxes() const
-{
- auto node = deprecatedNode();
- if (!node)
- return;
- auto renderer = node->renderer();
- if (!renderer)
- return;
- auto* parent = renderer->parent();
- if (is<RenderBlockFlow>(parent))
- downcast<RenderBlockFlow>(*parent).ensureLineBoxes();
-}
-
TextDirection Position::primaryDirection() const
{
if (!m_anchorNode || !m_anchorNode->renderer())
Modified: trunk/Source/WebCore/dom/Position.h (270149 => 270150)
--- trunk/Source/WebCore/dom/Position.h 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/Source/WebCore/dom/Position.h 2020-11-21 19:43:11 UTC (rev 270150)
@@ -199,8 +199,6 @@
// FIXME: Combine this function with operator==
bool equals(const Position&) const;
- void ensureLineBoxes() const;
-
private:
// For creating legacy editing positions: (Anchor type will be determined from editingIgnoresContent(node))
enum class LegacyEditingPositionFlag { On };
Modified: trunk/Source/WebCore/editing/RenderedPosition.cpp (270149 => 270150)
--- trunk/Source/WebCore/editing/RenderedPosition.cpp 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/Source/WebCore/editing/RenderedPosition.cpp 2020-11-21 19:43:11 UTC (rev 270150)
@@ -85,9 +85,6 @@
if (position.isNull())
return;
- // FIXME: Remove.
- position.ensureLineBoxes();
-
auto runAndOffset = position.inlineRunAndOffset(affinity);
m_run = runAndOffset.run;
m_offset = runAndOffset.offset;
Modified: trunk/Source/WebCore/editing/RenderedPosition.h (270149 => 270150)
--- trunk/Source/WebCore/editing/RenderedPosition.h 2020-11-21 19:08:51 UTC (rev 270149)
+++ trunk/Source/WebCore/editing/RenderedPosition.h 2020-11-21 19:43:11 UTC (rev 270150)
@@ -51,8 +51,6 @@
bool isNull() const { return !m_renderer; }
LayoutIntegration::LineIterator line() const { return m_run ? m_run.line() : LayoutIntegration::LineIterator(); }
- RootInlineBox* rootBox() { return m_run ? &m_run->legacyInlineBox()->root() : nullptr; }
-
unsigned char bidiLevelOnLeft() const;
unsigned char bidiLevelOnRight() const;
RenderedPosition leftBoundaryOfBidiRun(unsigned char bidiLevelOfRun);
