Index: src/core/SkFindAndPlaceGlyph.h |
diff --git a/src/core/SkFindAndPlaceGlyph.h b/src/core/SkFindAndPlaceGlyph.h |
index bd6338d587448af77766122327e1236e6f531b99..90e65de103bb80f5407036b42f50f40584eae8ea 100644 |
--- a/src/core/SkFindAndPlaceGlyph.h |
+++ b/src/core/SkFindAndPlaceGlyph.h |
@@ -91,7 +91,7 @@ private: |
#define alignof __alignof |
#endif |
SkASSERT(alignof(Variant) <= alignof(Space)); |
- new(&fSpace) Variant(skstd::forward<Args>(args)...); |
+ new(&fSpace) Variant(std::forward<Args>(args)...); |
} |
private: |
@@ -609,7 +609,7 @@ inline void SkFindAndPlaceGlyph::ProcessPosText( |
SkPoint mappedPoint = mapper.TranslationMapper::map( |
positions.HorizontalPositions::nextPoint()); |
positioner.Positioner::findAndPositionGlyph( |
- &cursor, mappedPoint, skstd::forward<ProcessOneGlyph>(processOneGlyph)); |
+ &cursor, mappedPoint, std::forward<ProcessOneGlyph>(processOneGlyph)); |
} |
return; |
} |
@@ -681,7 +681,7 @@ inline void SkFindAndPlaceGlyph::ProcessPosText( |
while (text < stop) { |
SkPoint mappedPoint = mapper->map(positionReader->nextPoint()); |
findAndPosition->findAndPositionGlyph( |
- &text, mappedPoint, skstd::forward<ProcessOneGlyph>(processOneGlyph)); |
+ &text, mappedPoint, std::forward<ProcessOneGlyph>(processOneGlyph)); |
} |
} |
@@ -725,7 +725,7 @@ inline void SkFindAndPlaceGlyph::ProcessText( |
while (text < stop) { |
current = |
findAndPosition->findAndPositionGlyph( |
- &text, current, skstd::forward<ProcessOneGlyph>(processOneGlyph)); |
+ &text, current, std::forward<ProcessOneGlyph>(processOneGlyph)); |
} |
} |