Index: chrome/browser/printing/pdf_to_emf_converter.cc |
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc |
index e07bf6ab9ff43d9b9efb2feab03f7f3e36e1d37d..7fffbdc15d2196921eea74d1d82237f14a80d8a4 100644 |
--- a/chrome/browser/printing/pdf_to_emf_converter.cc |
+++ b/chrome/browser/printing/pdf_to_emf_converter.cc |
@@ -113,7 +113,7 @@ class PdfToEmfUtilityProcessHostClient |
private: |
class GetPageCallbackData { |
- MOVE_ONLY_TYPE_FOR_CPP_03(GetPageCallbackData, RValue); |
+ MOVE_ONLY_TYPE_FOR_CPP_03(GetPageCallbackData); |
public: |
GetPageCallbackData(int page_number, |
@@ -121,13 +121,13 @@ class PdfToEmfUtilityProcessHostClient |
: page_number_(page_number), callback_(callback) {} |
// Move constructor for STL. |
danakj
2015/10/15 23:35:06
uh maybe kill these comments? they're odd
dcheng
2015/10/16 00:40:01
Ah, I meant to comment on this.
So it's really we
danakj
2015/10/16 00:44:24
Uh, well, the old RValue things would not have bee
dcheng
2015/10/16 01:30:29
Thinking about this more, my original line of reas
dcheng
2015/10/19 21:29:50
Done.
danakj
2015/10/19 21:49:24
Wow ya, I agree. The problem is they are putting a
|
- GetPageCallbackData(RValue other) { this->operator=(other); } |
+ GetPageCallbackData(GetPageCallbackData&& other) { *this = other.Pass(); } |
// Move assignment for STL. |
- GetPageCallbackData& operator=(RValue rhs) { |
- page_number_ = rhs.object->page_number_; |
- callback_ = rhs.object->callback_; |
- emf_ = rhs.object->emf_.Pass(); |
+ GetPageCallbackData& operator=(GetPageCallbackData&& rhs) { |
+ page_number_ = rhs.page_number_; |
+ callback_ = rhs.callback_; |
+ emf_ = rhs.emf_.Pass(); |
return *this; |
} |