Title: [238479] trunk/Source/WebCore
- Revision
- 238479
- Author
- [email protected]
- Date
- 2018-11-25 13:28:33 -0800 (Sun, 25 Nov 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238478 => 238479)
--- trunk/Source/WebCore/ChangeLog 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/ChangeLog 2018-11-25 21:28:33 UTC (rev 238479)
@@ -1,3 +1,14 @@
+2018-11-25 Zalan Bujtas <[email protected]>
+
+ 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 <[email protected]>
Make it possible to insert editable images with a gesture
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -162,7 +162,7 @@
uncommitted = { };
};
- 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;
// Skip all non-inflow boxes (floats, out-of-flow positioned elements). They don't participate in the inline run context.
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -180,7 +180,7 @@
{
LayoutUnit width;
auto startPosition = from;
- auto iterator = inlineContent.find(&inlineItem);
+ auto iterator = inlineContent.find(const_cast<InlineItem*>(&inlineItem));
auto inlineItemEnd = inlineContent.end();
while (length) {
ASSERT(iterator != inlineItemEnd);
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -161,7 +161,7 @@
// 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) {
ASSERT(iterator != inlineItemEnd);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
