aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/ports
diff options
context:
space:
mode:
authorGravatar kjlubick <kjlubick@google.com>2016-02-08 10:20:12 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-08 10:20:12 -0800
commitf5b8b6dd54623be3938d6497ff46d3fd10a4089a (patch)
tree2fade8d48a329676f45f5b9a697f1d84a2d44275 /include/ports
parent793dc26ca6ba2543bf50e5215b858d1c265af50c (diff)
Reland of SkTArray to move when moving. (patchset #1 id:1 of https://codereview.chromium.org/1677103002/ )
Reason for revert: This was not the problem. Original issue's description: > Revert of SkTArray to move when moving. (patchset #3 id:40001 of https://codereview.chromium.org/1672063002/ ) > > Reason for revert: > This appears to have broken several things. > > Original issue's description: > > SkTArray to move when moving. > > > > This updates SkTArray to move elements when possible, instead of always > > copying them. > > > > TBR=reed > > Agreed moving is good. This should also become private. > > > > Committed: https://skia.googlesource.com/skia/+/3c69348e725131150e4ab962dec1b3ff1148a6bd > > TBR=reed@google.com,mtklein@google.com,bungeman@google.com > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://skia.googlesource.com/skia/+/2f8c9bf96ceea9d13fb0fc29285ecaf1673f2e8b TBR=reed@google.com,mtklein@google.com,bungeman@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1678923002
Diffstat (limited to 'include/ports')
-rw-r--r--include/ports/SkFontMgr_indirect.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
index 81cd7739a9..9d96fee687 100644
--- a/include/ports/SkFontMgr_indirect.h
+++ b/include/ports/SkFontMgr_indirect.h
@@ -70,8 +70,7 @@ private:
DataEntry() { }
- // This is a move!!!
- DataEntry(DataEntry& that)
+ DataEntry(DataEntry&& that)
: fDataId(that.fDataId)
, fTtcIndex(that.fTtcIndex)
, fTypeface(that.fTypeface)