@@ -863,7 +863,7 @@ void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
863863}
864864void DisplayListBuilder::drawSkVertices (const sk_sp<SkVertices> vertices,
865865 SkBlendMode mode) {
866- Push<DrawSkVerticesOp>(0 , 1 , std::move ( vertices) , mode);
866+ Push<DrawSkVerticesOp>(0 , 1 , vertices, mode);
867867 // DrawVertices applies its colors to the paint so we have no way
868868 // of controlling opacity using the current paint attributes.
869869 // Although, examination of the |mode| might find some predictable
@@ -892,8 +892,8 @@ void DisplayListBuilder::drawImage(const sk_sp<DlImage> image,
892892 DlImageSampling sampling,
893893 bool render_with_attributes) {
894894 render_with_attributes
895- ? Push<DrawImageWithAttrOp>(0 , 1 , std::move ( image) , point, sampling)
896- : Push<DrawImageOp>(0 , 1 , std::move ( image) , point, sampling);
895+ ? Push<DrawImageWithAttrOp>(0 , 1 , image, point, sampling)
896+ : Push<DrawImageOp>(0 , 1 , image, point, sampling);
897897 CheckLayerOpacityCompatibility (render_with_attributes);
898898}
899899void DisplayListBuilder::drawImage (const sk_sp<DlImage>& image,
@@ -914,8 +914,8 @@ void DisplayListBuilder::drawImageRect(const sk_sp<DlImage> image,
914914 DlImageSampling sampling,
915915 bool render_with_attributes,
916916 SkCanvas::SrcRectConstraint constraint) {
917- Push<DrawImageRectOp>(0 , 1 , std::move ( image) , src, dst, sampling,
918- render_with_attributes, constraint);
917+ Push<DrawImageRectOp>(0 , 1 , image, src, dst, sampling, render_with_attributes ,
918+ constraint);
919919 CheckLayerOpacityCompatibility (render_with_attributes);
920920}
921921void DisplayListBuilder::drawImageRect (const sk_sp<DlImage>& image,
@@ -938,9 +938,8 @@ void DisplayListBuilder::drawImageNine(const sk_sp<DlImage> image,
938938 DlFilterMode filter,
939939 bool render_with_attributes) {
940940 render_with_attributes
941- ? Push<DrawImageNineWithAttrOp>(0 , 1 , std::move (image), center, dst,
942- filter)
943- : Push<DrawImageNineOp>(0 , 1 , std::move (image), center, dst, filter);
941+ ? Push<DrawImageNineWithAttrOp>(0 , 1 , image, center, dst, filter)
942+ : Push<DrawImageNineOp>(0 , 1 , image, center, dst, filter);
944943 CheckLayerOpacityCompatibility (render_with_attributes);
945944}
946945void DisplayListBuilder::drawImageNine (const sk_sp<DlImage>& image,
@@ -971,9 +970,9 @@ void DisplayListBuilder::drawImageLattice(const sk_sp<DlImage> image,
971970 (x_div_count + y_div_count) * sizeof (int ) +
972971 cell_count * (sizeof (SkColor) + sizeof (SkCanvas::Lattice::RectType));
973972 SkIRect src = lattice.fBounds ? *lattice.fBounds : image->bounds ();
974- void * pod = this ->Push <DrawImageLatticeOp>(
975- bytes, 1 , std::move (image), x_div_count, y_div_count, cell_count, src,
976- dst, filter, render_with_attributes);
973+ void * pod = this ->Push <DrawImageLatticeOp>(bytes, 1 , image, x_div_count,
974+ y_div_count, cell_count, src, dst ,
975+ filter, render_with_attributes);
977976 CopyV (pod, lattice.fXDivs , x_div_count, lattice.fYDivs , y_div_count,
978977 lattice.fColors , cell_count, lattice.fRectTypes , cell_count);
979978 CheckLayerOpacityCompatibility (render_with_attributes);
@@ -992,22 +991,22 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
992991 if (colors != nullptr ) {
993992 bytes += count * sizeof (DlColor);
994993 if (cull_rect != nullptr ) {
995- data_ptr = Push<DrawAtlasCulledOp>(bytes, 1 , std::move (atlas), count,
996- mode, sampling, true , *cull_rect ,
997- render_with_attributes);
994+ data_ptr =
995+ Push<DrawAtlasCulledOp>(bytes, 1 , atlas, count, mode, sampling, true ,
996+ *cull_rect, render_with_attributes);
998997 } else {
999- data_ptr = Push<DrawAtlasOp>(bytes, 1 , std::move ( atlas) , count, mode,
1000- sampling, true , render_with_attributes);
998+ data_ptr = Push<DrawAtlasOp>(bytes, 1 , atlas, count, mode, sampling, true ,
999+ render_with_attributes);
10011000 }
10021001 CopyV (data_ptr, xform, count, tex, count, colors, count);
10031002 } else {
10041003 if (cull_rect != nullptr ) {
1005- data_ptr = Push<DrawAtlasCulledOp>(bytes, 1 , std::move (atlas), count,
1006- mode, sampling, false , *cull_rect ,
1007- render_with_attributes);
1004+ data_ptr =
1005+ Push<DrawAtlasCulledOp>(bytes, 1 , atlas, count, mode, sampling, false ,
1006+ *cull_rect, render_with_attributes);
10081007 } else {
1009- data_ptr = Push<DrawAtlasOp>(bytes, 1 , std::move ( atlas) , count, mode,
1010- sampling, false , render_with_attributes);
1008+ data_ptr = Push<DrawAtlasOp>(bytes, 1 , atlas, count, mode, sampling ,
1009+ false , render_with_attributes);
10111010 }
10121011 CopyV (data_ptr, xform, count, tex, count);
10131012 }
@@ -1069,7 +1068,7 @@ void DisplayListBuilder::drawDisplayList(
10691068void DisplayListBuilder::drawTextBlob (const sk_sp<SkTextBlob> blob,
10701069 SkScalar x,
10711070 SkScalar y) {
1072- Push<DrawTextBlobOp>(0 , 1 , std::move ( blob) , x, y);
1071+ Push<DrawTextBlobOp>(0 , 1 , blob, x, y);
10731072 CheckLayerOpacityCompatibility ();
10741073}
10751074void DisplayListBuilder::drawShadow (const SkPath& path,
0 commit comments