121154 2013-09-11 05:17:57 -0700 OwnPtr: Use copy/move-and-swap for assignment operators 2013-09-11 07:32:22 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mikhail.pozdnyakov mikhail.pozdnyakov andersca benjamin cmarcelo commit-queue darin kling oldest_to_newest 927731 0 mikhail.pozdnyakov 2013-09-11 05:17:57 -0700 Rationals: - decrease of repeated code - consistency with RefPtr 927746 1 211306 mikhail.pozdnyakov 2013-09-11 06:33:59 -0700 Created attachment 211306 patch 927766 2 211306 andersca 2013-09-11 07:17:16 -0700 Comment on attachment 211306 patch View in context: https://bugs.webkit.org/attachment.cgi?id=211306&action=review > Source/WTF/wtf/OwnPtr.h:140 > - PtrType ptr = m_ptr; > - m_ptr = o.leakPtr(); > - ASSERT(!ptr || m_ptr != ptr); > - deleteOwnedPtr(ptr); > + ASSERT(!o || o != m_ptr); > + OwnPtr ptr = o; > + swap(ptr); I wouldn't worry about modifying PassOwnPtr since then plan is to get rid of it. > Source/WTF/wtf/OwnPtr.h:148 > - PtrType ptr = m_ptr; > - m_ptr = o.leakPtr(); > - ASSERT(!ptr || m_ptr != ptr); > - deleteOwnedPtr(ptr); > + ASSERT(!o || o != m_ptr); > + OwnPtr ptr = o; > + swap(ptr); Ditto. > Source/WTF/wtf/OwnPtr.h:166 > + OwnPtr ptr = std::move(o); Can just use auto here. > Source/WTF/wtf/OwnPtr.h:174 > + OwnPtr ptr = std::move(o); Ditto. 927776 3 mikhail.pozdnyakov 2013-09-11 07:32:22 -0700 Committed r155526: <http://trac.webkit.org/changeset/155526> 211306 2013-09-11 06:33:59 -0700 2013-09-11 07:17:16 -0700 patch bug121154 text/plain 2413 mikhail.pozdnyakov Y29tbWl0IGFlMTFhY2ViMTNlZDAzOTdkZjgwNTc1YTkzYTEyMTYyNzAzOWM2NzIKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg V2VkIFNlcCAxMSAxNjozMjo0NyAyMDEzICswMzAwCgogICAgYnVnMTIxMTU0CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAzMDAy Yjc5Li4yZDU2MzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA5LTExICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIE93blB0 cjogVXNlIGNvcHkvbW92ZS1hbmQtc3dhcCBmb3IgYXNzaWdubWVudCBvcGVyYXRvcnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTE1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGlvbmFsczoKKyAg ICAgICAgLSBkZWNyZWFzZSBvZiByZXBlYXRlZCBjb2RlCisgICAgICAgIC0gY29uc2lzdGVuY3kg d2l0aCBSZWZQdHIKKworICAgICAgICAqIHd0Zi9Pd25QdHIuaDoKKyAgICAgICAgKFdURjo6PSk6 CisKIDIwMTMtMDktMTAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIFVwc3RyZWFtIHRleHQgYXV0b3NpemluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvT3duUHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9Pd25QdHIuaAppbmRleCA5MmE0YjQ5Li41 YTNhYjU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Pd25QdHIuaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9Pd25QdHIuaApAQCAtMTM1LDE5ICsxMzUsMTcgQEAgbmFtZXNwYWNlIFdURiB7CiAK ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgT3duUHRyPFQ+JiBPd25QdHI8VD46Om9w ZXJhdG9yPShjb25zdCBQYXNzT3duUHRyPFQ+JiBvKQogICAgIHsKLSAgICAgICAgUHRyVHlwZSBw dHIgPSBtX3B0cjsKLSAgICAgICAgbV9wdHIgPSBvLmxlYWtQdHIoKTsKLSAgICAgICAgQVNTRVJU KCFwdHIgfHwgbV9wdHIgIT0gcHRyKTsKLSAgICAgICAgZGVsZXRlT3duZWRQdHIocHRyKTsKKyAg ICAgICAgQVNTRVJUKCFvIHx8IG8gIT0gbV9wdHIpOworICAgICAgICBPd25QdHIgcHRyID0gbzsK KyAgICAgICAgc3dhcChwdHIpOwogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQogCiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gdGVtcGxhdGU8dHlwZW5hbWUgVT4gaW5saW5lIE93blB0cjxU PiYgT3duUHRyPFQ+OjpvcGVyYXRvcj0oY29uc3QgUGFzc093blB0cjxVPiYgbykKICAgICB7Ci0g ICAgICAgIFB0clR5cGUgcHRyID0gbV9wdHI7Ci0gICAgICAgIG1fcHRyID0gby5sZWFrUHRyKCk7 Ci0gICAgICAgIEFTU0VSVCghcHRyIHx8IG1fcHRyICE9IHB0cik7Ci0gICAgICAgIGRlbGV0ZU93 bmVkUHRyKHB0cik7CisgICAgICAgIEFTU0VSVCghbyB8fCBvICE9IG1fcHRyKTsKKyAgICAgICAg T3duUHRyIHB0ciA9IG87CisgICAgICAgIHN3YXAocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlz OwogICAgIH0KIApAQCAtMTY0LDIxICsxNjIsMTcgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgT3duUHRyPFQ+JiBPd25QdHI8VD46Om9wZXJhdG9y PShPd25QdHI8VD4mJiBvKQogICAgIHsKLSAgICAgICAgUHRyVHlwZSBwdHIgPSBtX3B0cjsKLSAg ICAgICAgbV9wdHIgPSBvLmxlYWtQdHIoKTsKLSAgICAgICAgQVNTRVJUKCFwdHIgfHwgbV9wdHIg IT0gcHRyKTsKLSAgICAgICAgZGVsZXRlT3duZWRQdHIocHRyKTsKLQorICAgICAgICBBU1NFUlQo IW8gfHwgbyAhPSBtX3B0cik7CisgICAgICAgIE93blB0ciBwdHIgPSBzdGQ6Om1vdmUobyk7Cisg ICAgICAgIHN3YXAocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgIH0KIAogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IHRlbXBsYXRlPHR5cGVuYW1lIFU+IGlubGluZSBPd25QdHI8VD4m IE93blB0cjxUPjo6b3BlcmF0b3I9KE93blB0cjxVPiYmIG8pCiAgICAgewotICAgICAgICBQdHJU eXBlIHB0ciA9IG1fcHRyOwotICAgICAgICBtX3B0ciA9IG8ubGVha1B0cigpOwotICAgICAgICBB U1NFUlQoIXB0ciB8fCBtX3B0ciAhPSBwdHIpOwotICAgICAgICBkZWxldGVPd25lZFB0cihwdHIp OwotCisgICAgICAgIEFTU0VSVCghbyB8fCBvICE9IG1fcHRyKTsKKyAgICAgICAgT3duUHRyIHB0 ciA9IHN0ZDo6bW92ZShvKTsKKyAgICAgICAgc3dhcChwdHIpOwogICAgICAgICByZXR1cm4gKnRo aXM7CiAgICAgfQogI2VuZGlmCg==