Title: [254468] trunk/Source/WebCore
- Revision
- 254468
- Author
- [email protected]
- Date
- 2020-01-13 16:11:32 -0800 (Mon, 13 Jan 2020)
Log Message
Unreviewed, rolling out r254463.
Broke all Mac and iOS Builds.
Reverted changeset:
"Unreviewed build fix for PlayStation and clang-cl."
https://trac.webkit.org/changeset/254463
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254467 => 254468)
--- trunk/Source/WebCore/ChangeLog 2020-01-14 00:08:44 UTC (rev 254467)
+++ trunk/Source/WebCore/ChangeLog 2020-01-14 00:11:32 UTC (rev 254468)
@@ -1,3 +1,14 @@
+2020-01-13 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r254463.
+
+ Broke all Mac and iOS Builds.
+
+ Reverted changeset:
+
+ "Unreviewed build fix for PlayStation and clang-cl."
+ https://trac.webkit.org/changeset/254463
+
2020-01-13 youenn fablet <[email protected]>
Clean-up MediaPlayerPrivateMediaStreamAVFObjC.h/.mm
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (254467 => 254468)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2020-01-14 00:08:44 UTC (rev 254467)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2020-01-14 00:11:32 UTC (rev 254468)
@@ -1039,11 +1039,11 @@
Vector<MarkedText> markedTexts;
auto& parentRenderer = parent()->renderer();
auto& parentStyle = parentRenderer.style();
- for (auto& entry : renderer().document().highlightMap().map()) {
- auto renderStyle = parentRenderer.getUncachedPseudoStyle({ PseudoId::Highlight, entry.highlightKey }, &parentStyle);
+ for (auto& [highlightKey, highlightGroup] : renderer().document().highlightMap().map()) {
+ auto renderStyle = parentRenderer.getUncachedPseudoStyle({ PseudoId::Highlight, highlightKey }, &parentStyle);
if (!renderStyle)
continue;
- for (auto& staticRange : entry.highlightGroup->ranges()) {
+ for (auto& staticRange : 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, entry.highlightKey });
+ markedTexts.append({ highlightStart, highlightEnd, MarkedText::Highlight, nullptr, highlightKey });
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
