commit b9aaa92f635d599037bb614895561fce1b17d1eb
author tsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jan 14 00:11:32 2020 +0000
committer tsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jan 14 00:11:32 2020 +0000
tree ae18d17c4d58a48690fd6bf99c6b19345635b712
parent 5e7c33646a4e21127522a77725369b92c7b98c66

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 519c836..23a9478 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-13  Truitt Savell  <tsavell@apple.com>
+
+        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  <youenn@apple.com>
 
         Clean-up MediaPlayerPrivateMediaStreamAVFObjC.h/.mm

Source/WebCore/rendering/InlineTextBox.cpp

diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
index 89859ef..300d480 100644
--- a/Source/WebCore/rendering/InlineTextBox.cpp
+++ b/Source/WebCore/rendering/InlineTextBox.cpp
@@ -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 });
             }
         }
     }