Title: [254463] trunk/Source/WebCore
- Revision
- 254463
- Author
- [email protected]
- Date
- 2020-01-13 15:52:20 -0800 (Mon, 13 Jan 2020)
Log Message
Unreviewed build fix for PlayStation and clang-cl.
clang for Windows (< v10.0.0) cannot destructure a const class. See also r249524.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::collectMarkedTextsForHighlights const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254462 => 254463)
--- trunk/Source/WebCore/ChangeLog 2020-01-13 23:37:02 UTC (rev 254462)
+++ trunk/Source/WebCore/ChangeLog 2020-01-13 23:52:20 UTC (rev 254463)
@@ -1,3 +1,12 @@
+2020-01-13 Ross Kirsling <[email protected]>
+
+ Unreviewed build fix for PlayStation and clang-cl.
+
+ clang for Windows (< v10.0.0) cannot destructure a const class. See also r249524.
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::collectMarkedTextsForHighlights const):
+
2020-01-13 Sunny He <[email protected]>
Fix computeFloatVisibleRectInContainer to handle non-SVG object parent
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (254462 => 254463)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2020-01-13 23:37:02 UTC (rev 254462)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2020-01-13 23:52:20 UTC (rev 254463)
@@ -1039,11 +1039,11 @@
Vector<MarkedText> markedTexts;
auto& parentRenderer = parent()->renderer();
auto& parentStyle = parentRenderer.style();
- for (auto& [highlightKey, highlightGroup] : renderer().document().highlightMap().map()) {
- auto renderStyle = parentRenderer.getUncachedPseudoStyle({ PseudoId::Highlight, highlightKey }, &parentStyle);
+ for (auto& entry : renderer().document().highlightMap().map()) {
+ auto renderStyle = parentRenderer.getUncachedPseudoStyle({ PseudoId::Highlight, entry.highlightKey }, &parentStyle);
if (!renderStyle)
continue;
- for (auto& staticRange : highlightGroup->ranges()) {
+ for (auto& staticRange : entry.highlightGroup->ranges()) {
Position startPos = createLegacyEditingPosition(staticRange->startContainer(), staticRange->startOffset());
Position endPos = createLegacyEditingPosition(staticRange->endContainer(), staticRange->endOffset());
@@ -1059,7 +1059,7 @@
highlightData.setContext({startRenderer, endRenderer, static_cast<unsigned>(startOffset), static_cast<unsigned>(endOffset)});
auto [highlightStart, highlightEnd] = highlightStartEnd(highlightData);
if (highlightStart < highlightEnd)
- markedTexts.append({ highlightStart, highlightEnd, MarkedText::Highlight, nullptr, highlightKey });
+ markedTexts.append({ highlightStart, highlightEnd, MarkedText::Highlight, nullptr, entry.highlightKey });
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
