Diff
Modified: trunk/Source/WebCore/ChangeLog (291724 => 291725)
--- trunk/Source/WebCore/ChangeLog 2022-03-22 23:37:42 UTC (rev 291724)
+++ trunk/Source/WebCore/ChangeLog 2022-03-22 23:46:50 UTC (rev 291725)
@@ -1,3 +1,28 @@
+2022-03-22 Alan Bujtas <[email protected]>
+
+ [IFC][Integration] Rename InlineIteratorLine.cpp to InlineIteratorLineBox.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=238219
+
+ Unreviewed.
+
+ r291548 should have included this rename.
+
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * layout/integration/InlineIteratorLineBox.cpp: Renamed from Source/WebCore/layout/integration/InlineIteratorLine.cpp.
+ (WebCore::InlineIterator::LineBoxIterator::LineBoxIterator):
+ (WebCore::InlineIterator::LineBoxIterator::atEnd const):
+ (WebCore::InlineIterator::LineBoxIterator::traverseNext):
+ (WebCore::InlineIterator::LineBoxIterator::traversePrevious):
+ (WebCore::InlineIterator::LineBoxIterator::operator== const):
+ (WebCore::InlineIterator::firstLineBoxFor):
+ (WebCore::InlineIterator::lastLineBoxFor):
+ (WebCore::InlineIterator::LineBox::next const):
+ (WebCore::InlineIterator::LineBox::previous const):
+ (WebCore::InlineIterator::LineBox::firstLeafBox const):
+ (WebCore::InlineIterator::LineBox::lastLeafBox const):
+ (WebCore::InlineIterator::closestBoxForHorizontalPosition):
+
2022-03-22 Fujii Hironori <[email protected]>
[WinCairo] RemoteGraphicsContextGL.h(78): error C2027: use of undefined type 'WebCore::GraphicsContextGL'
Modified: trunk/Source/WebCore/Sources.txt (291724 => 291725)
--- trunk/Source/WebCore/Sources.txt 2022-03-22 23:37:42 UTC (rev 291724)
+++ trunk/Source/WebCore/Sources.txt 2022-03-22 23:46:50 UTC (rev 291725)
@@ -1577,7 +1577,7 @@
layout/formattingContexts/inline/text/TextUtil.cpp
layout/integration/InlineIteratorBox.cpp
layout/integration/InlineIteratorInlineBox.cpp
-layout/integration/InlineIteratorLine.cpp
+layout/integration/InlineIteratorLineBox.cpp
layout/integration/InlineIteratorLogicalOrderTraversal.cpp
layout/integration/InlineIteratorTextBox.cpp
layout/integration/LayoutIntegrationBoxTree.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (291724 => 291725)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-03-22 23:37:42 UTC (rev 291724)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-03-22 23:46:50 UTC (rev 291725)
@@ -17621,7 +17621,7 @@
E4C91A17180999FB00A17F6D /* RenderTextLineBoxes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextLineBoxes.cpp; sourceTree = "<group>"; };
E4D33F39252AEECC00837D05 /* InlineRunAndOffset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineRunAndOffset.h; sourceTree = "<group>"; };
E4D33F3F252C4B8200837D05 /* InlineIteratorLineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBox.h; sourceTree = "<group>"; };
- E4D33F42252C50A800837D05 /* InlineIteratorLine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InlineIteratorLine.cpp; sourceTree = "<group>"; };
+ E4D33F42252C50A800837D05 /* InlineIteratorLineBox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InlineIteratorLineBox.cpp; sourceTree = "<group>"; };
E4D33F43252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBoxLegacyPath.h; sourceTree = "<group>"; };
E4D33F45252C50FB00837D05 /* InlineIteratorLineBoxModernPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBoxModernPath.h; sourceTree = "<group>"; };
E4D58EB217B4DBDC00CBDCA8 /* StyleResolveForDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleResolveForDocument.cpp; sourceTree = "<group>"; };
@@ -31536,7 +31536,7 @@
E4A664C42521B777007081DC /* InlineIteratorBoxModernPath.h */,
E415EB14270C353700E8DA1B /* InlineIteratorInlineBox.cpp */,
E415EB11270C351200E8DA1B /* InlineIteratorInlineBox.h */,
- E4D33F42252C50A800837D05 /* InlineIteratorLine.cpp */,
+ E4D33F42252C50A800837D05 /* InlineIteratorLineBox.cpp */,
E4D33F3F252C4B8200837D05 /* InlineIteratorLineBox.h */,
E4D33F43252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h */,
E4D33F45252C50FB00837D05 /* InlineIteratorLineBoxModernPath.h */,
Deleted: trunk/Source/WebCore/layout/integration/InlineIteratorLine.cpp (291724 => 291725)
--- trunk/Source/WebCore/layout/integration/InlineIteratorLine.cpp 2022-03-22 23:37:42 UTC (rev 291724)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorLine.cpp 2022-03-22 23:46:50 UTC (rev 291725)
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InlineIteratorLineBox.h"
-
-#include "InlineIteratorBox.h"
-#include "LayoutIntegrationLineLayout.h"
-#include "RenderBlockFlow.h"
-
-namespace WebCore {
-namespace InlineIterator {
-
-LineBoxIterator::LineBoxIterator(LineBox::PathVariant&& pathVariant)
- : m_lineBox(WTFMove(pathVariant))
-{
-}
-
-LineBoxIterator::LineBoxIterator(const LineBox& lineBox)
- : m_lineBox(lineBox)
-{
-}
-
-bool LineBoxIterator::atEnd() const
-{
- return WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
- return path.atEnd();
- });
-}
-
-LineBoxIterator& LineBoxIterator::traverseNext()
-{
- WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
- return path.traverseNext();
- });
- return *this;
-}
-
-LineBoxIterator& LineBoxIterator::traversePrevious()
-{
- WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
- return path.traversePrevious();
- });
- return *this;
-}
-
-bool LineBoxIterator::operator==(const LineBoxIterator& other) const
-{
- return m_lineBox.m_pathVariant == other.m_lineBox.m_pathVariant;
-}
-
-LineBoxIterator firstLineBoxFor(const RenderBlockFlow& flow)
-{
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
- if (auto* lineLayout = flow.modernLineLayout())
- return lineLayout->firstLineBox();
-#endif
-
- return { LineBoxIteratorLegacyPath { flow.firstRootBox() } };
-}
-
-LineBoxIterator lastLineBoxFor(const RenderBlockFlow& flow)
-{
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
- if (auto* lineLayout = flow.modernLineLayout())
- return lineLayout->lastLineBox();
-#endif
-
- return { LineBoxIteratorLegacyPath { flow.lastRootBox() } };
-}
-
-LineBoxIterator LineBox::next() const
-{
- return LineBoxIterator(*this).traverseNext();
-}
-
-LineBoxIterator LineBox::previous() const
-{
- return LineBoxIterator(*this).traversePrevious();
-}
-
-LeafBoxIterator LineBox::firstLeafBox() const
-{
- return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
- return { path.firstLeafBox() };
- });
-}
-
-LeafBoxIterator LineBox::lastLeafBox() const
-{
- return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
- return { path.lastLeafBox() };
- });
-}
-
-LeafBoxIterator closestBoxForHorizontalPosition(const LineBox& lineBox, float horizontalPosition, bool editableOnly)
-{
- auto isEditable = [&](auto box) {
- return box && box->renderer().node() && box->renderer().node()->hasEditableStyle();
- };
-
- auto firstBox = lineBox.firstLeafBox();
- auto lastBox = lineBox.lastLeafBox();
-
- if (firstBox != lastBox) {
- if (firstBox->isLineBreak())
- firstBox = firstBox->nextOnLineIgnoringLineBreak();
- else if (lastBox->isLineBreak())
- lastBox = lastBox->previousOnLineIgnoringLineBreak();
- }
-
- if (firstBox == lastBox && (!editableOnly || isEditable(firstBox)))
- return firstBox;
-
- if (firstBox && horizontalPosition <= firstBox->logicalLeft() && !firstBox->renderer().isListMarker() && (!editableOnly || isEditable(firstBox)))
- return firstBox;
-
- if (lastBox && horizontalPosition >= lastBox->logicalRight() && !lastBox->renderer().isListMarker() && (!editableOnly || isEditable(lastBox)))
- return lastBox;
-
- auto closestBox = lastBox;
- for (auto box = firstBox; box; box = box.traverseNextOnLineIgnoringLineBreak()) {
- if (!box->renderer().isListMarker() && (!editableOnly || isEditable(box))) {
- if (horizontalPosition < box->logicalRight())
- return box;
- closestBox = box;
- }
- }
-
- return closestBox;
-}
-
-}
-}
-
Copied: trunk/Source/WebCore/layout/integration/InlineIteratorLineBox.cpp (from rev 291724, trunk/Source/WebCore/layout/integration/InlineIteratorLine.cpp) (0 => 291725)
--- trunk/Source/WebCore/layout/integration/InlineIteratorLineBox.cpp (rev 0)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorLineBox.cpp 2022-03-22 23:46:50 UTC (rev 291725)
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "InlineIteratorLineBox.h"
+
+#include "InlineIteratorBox.h"
+#include "LayoutIntegrationLineLayout.h"
+#include "RenderBlockFlow.h"
+
+namespace WebCore {
+namespace InlineIterator {
+
+LineBoxIterator::LineBoxIterator(LineBox::PathVariant&& pathVariant)
+ : m_lineBox(WTFMove(pathVariant))
+{
+}
+
+LineBoxIterator::LineBoxIterator(const LineBox& lineBox)
+ : m_lineBox(lineBox)
+{
+}
+
+bool LineBoxIterator::atEnd() const
+{
+ return WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
+ return path.atEnd();
+ });
+}
+
+LineBoxIterator& LineBoxIterator::traverseNext()
+{
+ WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
+ return path.traverseNext();
+ });
+ return *this;
+}
+
+LineBoxIterator& LineBoxIterator::traversePrevious()
+{
+ WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
+ return path.traversePrevious();
+ });
+ return *this;
+}
+
+bool LineBoxIterator::operator==(const LineBoxIterator& other) const
+{
+ return m_lineBox.m_pathVariant == other.m_lineBox.m_pathVariant;
+}
+
+LineBoxIterator firstLineBoxFor(const RenderBlockFlow& flow)
+{
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+ if (auto* lineLayout = flow.modernLineLayout())
+ return lineLayout->firstLineBox();
+#endif
+
+ return { LineBoxIteratorLegacyPath { flow.firstRootBox() } };
+}
+
+LineBoxIterator lastLineBoxFor(const RenderBlockFlow& flow)
+{
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+ if (auto* lineLayout = flow.modernLineLayout())
+ return lineLayout->lastLineBox();
+#endif
+
+ return { LineBoxIteratorLegacyPath { flow.lastRootBox() } };
+}
+
+LineBoxIterator LineBox::next() const
+{
+ return LineBoxIterator(*this).traverseNext();
+}
+
+LineBoxIterator LineBox::previous() const
+{
+ return LineBoxIterator(*this).traversePrevious();
+}
+
+LeafBoxIterator LineBox::firstLeafBox() const
+{
+ return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
+ return { path.firstLeafBox() };
+ });
+}
+
+LeafBoxIterator LineBox::lastLeafBox() const
+{
+ return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
+ return { path.lastLeafBox() };
+ });
+}
+
+LeafBoxIterator closestBoxForHorizontalPosition(const LineBox& lineBox, float horizontalPosition, bool editableOnly)
+{
+ auto isEditable = [&](auto box) {
+ return box && box->renderer().node() && box->renderer().node()->hasEditableStyle();
+ };
+
+ auto firstBox = lineBox.firstLeafBox();
+ auto lastBox = lineBox.lastLeafBox();
+
+ if (firstBox != lastBox) {
+ if (firstBox->isLineBreak())
+ firstBox = firstBox->nextOnLineIgnoringLineBreak();
+ else if (lastBox->isLineBreak())
+ lastBox = lastBox->previousOnLineIgnoringLineBreak();
+ }
+
+ if (firstBox == lastBox && (!editableOnly || isEditable(firstBox)))
+ return firstBox;
+
+ if (firstBox && horizontalPosition <= firstBox->logicalLeft() && !firstBox->renderer().isListMarker() && (!editableOnly || isEditable(firstBox)))
+ return firstBox;
+
+ if (lastBox && horizontalPosition >= lastBox->logicalRight() && !lastBox->renderer().isListMarker() && (!editableOnly || isEditable(lastBox)))
+ return lastBox;
+
+ auto closestBox = lastBox;
+ for (auto box = firstBox; box; box = box.traverseNextOnLineIgnoringLineBreak()) {
+ if (!box->renderer().isListMarker() && (!editableOnly || isEditable(box))) {
+ if (horizontalPosition < box->logicalRight())
+ return box;
+ closestBox = box;
+ }
+ }
+
+ return closestBox;
+}
+
+}
+}
+
