Title: [223260] trunk/Source/WebCore
- Revision
- 223260
- Author
- [email protected]
- Date
- 2017-10-12 14:38:04 -0700 (Thu, 12 Oct 2017)
Log Message
Mark more InlineBox member functions as const
https://bugs.webkit.org/show_bug.cgi?id=178217
Reviewed by Andy Estes.
* rendering/InlineBox.cpp:
(WebCore::InlineBox::locationIncludingFlipping const): Mark as const. Also fix some style
nits while I am here.
(WebCore::InlineBox::flipForWritingMode const): Mark as const.
(WebCore::InlineBox::locationIncludingFlipping): Deleted.
(WebCore::InlineBox::flipForWritingMode): Deleted.
* rendering/InlineBox.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223259 => 223260)
--- trunk/Source/WebCore/ChangeLog 2017-10-12 21:31:36 UTC (rev 223259)
+++ trunk/Source/WebCore/ChangeLog 2017-10-12 21:38:04 UTC (rev 223260)
@@ -1,5 +1,20 @@
2017-10-12 Daniel Bates <[email protected]>
+ Mark more InlineBox member functions as const
+ https://bugs.webkit.org/show_bug.cgi?id=178217
+
+ Reviewed by Andy Estes.
+
+ * rendering/InlineBox.cpp:
+ (WebCore::InlineBox::locationIncludingFlipping const): Mark as const. Also fix some style
+ nits while I am here.
+ (WebCore::InlineBox::flipForWritingMode const): Mark as const.
+ (WebCore::InlineBox::locationIncludingFlipping): Deleted.
+ (WebCore::InlineBox::flipForWritingMode): Deleted.
+ * rendering/InlineBox.h:
+
+2017-10-12 Daniel Bates <[email protected]>
+
Teach InlineTextBox::clampOffset() about combined text and hyphenation
https://bugs.webkit.org/show_bug.cgi?id=178032
Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (223259 => 223260)
--- trunk/Source/WebCore/rendering/InlineBox.cpp 2017-10-12 21:31:36 UTC (rev 223259)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2017-10-12 21:38:04 UTC (rev 223260)
@@ -288,18 +288,17 @@
parent()->clearKnownToHaveNoOverflow();
}
-FloatPoint InlineBox::locationIncludingFlipping()
+FloatPoint InlineBox::locationIncludingFlipping() const
{
if (!m_renderer.style().isFlippedBlocksWritingMode())
- return FloatPoint(x(), y());
+ return topLeft();
RenderBlockFlow& block = root().blockFlow();
if (block.style().isHorizontalWritingMode())
- return FloatPoint(x(), block.height() - height() - y());
- else
- return FloatPoint(block.width() - width() - x(), y());
+ return { x(), block.height() - height() - y() };
+ return { block.width() - width() - x(), y() };
}
-void InlineBox::flipForWritingMode(FloatRect& rect)
+void InlineBox::flipForWritingMode(FloatRect& rect) const
{
if (!m_renderer.style().isFlippedBlocksWritingMode())
return;
@@ -306,7 +305,7 @@
root().blockFlow().flipForWritingMode(rect);
}
-FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point)
+FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) const
{
if (!m_renderer.style().isFlippedBlocksWritingMode())
return point;
@@ -313,7 +312,7 @@
return root().blockFlow().flipForWritingMode(point);
}
-void InlineBox::flipForWritingMode(LayoutRect& rect)
+void InlineBox::flipForWritingMode(LayoutRect& rect) const
{
if (!m_renderer.style().isFlippedBlocksWritingMode())
return;
@@ -320,7 +319,7 @@
root().blockFlow().flipForWritingMode(rect);
}
-LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point)
+LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) const
{
if (!m_renderer.style().isFlippedBlocksWritingMode())
return point;
Modified: trunk/Source/WebCore/rendering/InlineBox.h (223259 => 223260)
--- trunk/Source/WebCore/rendering/InlineBox.h 2017-10-12 21:31:36 UTC (rev 223259)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2017-10-12 21:38:04 UTC (rev 223260)
@@ -254,11 +254,11 @@
return nullptr;
}
- FloatPoint locationIncludingFlipping();
- void flipForWritingMode(FloatRect&);
- FloatPoint flipForWritingMode(const FloatPoint&);
- void flipForWritingMode(LayoutRect&);
- LayoutPoint flipForWritingMode(const LayoutPoint&);
+ FloatPoint locationIncludingFlipping() const;
+ void flipForWritingMode(FloatRect&) const;
+ FloatPoint flipForWritingMode(const FloatPoint&) const;
+ void flipForWritingMode(LayoutRect&) const;
+ LayoutPoint flipForWritingMode(const LayoutPoint&) const;
bool knownToHaveNoOverflow() const { return m_bitfields.knownToHaveNoOverflow(); }
void clearKnownToHaveNoOverflow();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
