diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 80ae9b6ad6d0..349b55dbd420 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2017-10-12  Daniel Bates  <dabates@apple.com>
+
+        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  <dabates@apple.com>
 
         Teach InlineTextBox::clampOffset() about combined text and hyphenation
diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp
index 310260be9e3a..73ea5e2a35a9 100644
--- a/Source/WebCore/rendering/InlineBox.cpp
+++ b/Source/WebCore/rendering/InlineBox.cpp
@@ -288,39 +288,38 @@ void InlineBox::clearKnownToHaveNoOverflow()
         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;
     root().blockFlow().flipForWritingMode(rect);
 }
 
-FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point)
+FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) const
 {
     if (!m_renderer.style().isFlippedBlocksWritingMode())
         return point;
     return root().blockFlow().flipForWritingMode(point);
 }
 
-void InlineBox::flipForWritingMode(LayoutRect& rect)
+void InlineBox::flipForWritingMode(LayoutRect& rect) const
 {
     if (!m_renderer.style().isFlippedBlocksWritingMode())
         return;
     root().blockFlow().flipForWritingMode(rect);
 }
 
-LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point)
+LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) const
 {
     if (!m_renderer.style().isFlippedBlocksWritingMode())
         return point;
diff --git a/Source/WebCore/rendering/InlineBox.h b/Source/WebCore/rendering/InlineBox.h
index 5bee8693a07c..ac0ac0190005 100644
--- a/Source/WebCore/rendering/InlineBox.h
+++ b/Source/WebCore/rendering/InlineBox.h
@@ -254,11 +254,11 @@ class InlineBox {
         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();