Title: [197341] releases/WebKitGTK/webkit-2.12/Source/WebCore
Revision
197341
Author
[email protected]
Date
2016-02-29 03:21:28 -0800 (Mon, 29 Feb 2016)

Log Message

Merge r197298 - SVGToOTFFontConversion.cpp does not compile with libstdc++ 4.8
https://bugs.webkit.org/show_bug.cgi?id=154794

Patch by Konstantin Tokarev <[email protected]> on 2016-02-28
Reviewed by Michael Catanzaro.

No new tests needed.

* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendLigatureSubtable): Added const
qualifiers.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197340 => 197341)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-02-29 11:20:12 UTC (rev 197340)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-02-29 11:21:28 UTC (rev 197341)
@@ -1,3 +1,16 @@
+2016-02-28  Konstantin Tokarev  <[email protected]>
+
+        SVGToOTFFontConversion.cpp does not compile with libstdc++ 4.8
+        https://bugs.webkit.org/show_bug.cgi?id=154794
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests needed.
+
+        * svg/SVGToOTFFontConversion.cpp:
+        (WebCore::SVGToOTFFontConverter::appendLigatureSubtable): Added const
+        qualifiers.
+
 2016-02-27  Chris Dumez  <[email protected]>
 
         Prevent cross-origin access to Location.assign() / Location.reload()

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGToOTFFontConversion.cpp (197340 => 197341)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGToOTFFontConversion.cpp	2016-02-29 11:20:12 UTC (rev 197340)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGToOTFFontConversion.cpp	2016-02-29 11:21:28 UTC (rev 197341)
@@ -753,7 +753,7 @@
     }
     if (ligaturePairs.size() > std::numeric_limits<uint16_t>::max())
         ligaturePairs.clear();
-    std::sort(ligaturePairs.begin(), ligaturePairs.end(), [](LigaturePair& lhs, LigaturePair& rhs) {
+    std::sort(ligaturePairs.begin(), ligaturePairs.end(), [](const LigaturePair& lhs, const LigaturePair& rhs) {
         return lhs.first[0] < rhs.first[0];
     });
     Vector<size_t> overlappingFirstGlyphSegmentLengths;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to