Changeset 238479 in webkit

Timestamp:

Nov 25, 2018, 1:28:33 PM (8 years ago)

Author:

Alan Bujtas

Message:

Fix build after r238472.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::InlineFormattingContext::Geometry::runWidth):

• layout/inlineformatting/InlineLineBreaker.cpp:

(WebCore::Layout::InlineLineBreaker::textWidth const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBreaker.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        Fix build after r238472.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::InlineFormattingContext::Geometry::runWidth):
+        * layout/inlineformatting/InlineLineBreaker.cpp:
+        (WebCore::Layout::InlineLineBreaker::textWidth const):
+
 2018-11-25  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -163 +163 @@
     };
 
-    for (auto iterator = inlineContent.find(&inlineRun.inlineItem()); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
+    for (auto iterator = inlineContent.find(const_cast<InlineItem*>(&inlineRun.inlineItem())); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
         auto& inlineItem = **iterator;
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp

@@ -181 +181 @@
     LayoutUnit width;
     auto startPosition = from;
-    auto iterator = inlineContent.find(&inlineItem);
+    auto iterator = inlineContent.find(const_cast<InlineItem*>(&inlineItem));
     auto inlineItemEnd = inlineContent.end();
     while (length) {

trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp

@@ -162 +162 @@
     // FIXME: It does not do proper kerning/ligature handling.
     LayoutUnit width;
-    auto iterator = m_inlineContent.find(&inlineItem);
+    auto iterator = m_inlineContent.find(const_cast<InlineItem*>(&inlineItem));
     auto inlineItemEnd = m_inlineContent.end();
     while (length) {