169709 2017-03-15 15:43:33 -0700 Follow-up on comments for bug 169664 2017-03-22 18:54:53 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=169664 P2 Normal --- 169662 1 jonlee webkit-unassigned alex commit-queue youennf oldest_to_newest 1288301 0 jonlee 2017-03-15 15:43:33 -0700 From Youenn: > Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:865 > + Vector<RTCIceTransportState> transportStates; I know this is untouched code. Would you be able to use reserveInitialCapacity/uncheckedAppend > Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:870 > + m_peerConnection.updateIceConnectionState(static_cast<RTCIceConnectionState>(derivedState)); This looks bad, deriveAggregatedIceConnectionState should really be changed to return RTCIceConnectionState. 1289387 1 jonlee 2017-03-19 12:48:37 -0700 (In reply to comment #0) > From Youenn: > > Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:865 > > + Vector<RTCIceTransportState> transportStates; > > I know this is untouched code. > Would you be able to use reserveInitialCapacity/uncheckedAppend > > > Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:870 > > + m_peerConnection.updateIceConnectionState(static_cast<RTCIceConnectionState>(derivedState)); > > This looks bad, deriveAggregatedIceConnectionState should really be changed > to return RTCIceConnectionState. I have a patch for this, but should MediaEndpointPeerConnection be part of the xcodeproj at all? 1289434 2 304913 jonlee 2017-03-19 21:30:44 -0700 Created attachment 304913 Patch 1289471 3 304913 youennf 2017-03-20 08:24:59 -0700 Comment on attachment 304913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304913&action=review > Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:879 > + Vector<RTCIceTransportState> transportStates(m_peerConnection.getTransceivers().size()); Please use reserveInitialCapacity to preallocate without creating the objects. 1289585 4 304913 jonlee 2017-03-20 14:59:46 -0700 Comment on attachment 304913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304913&action=review >> Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp:879 >> + Vector<RTCIceTransportState> transportStates(m_peerConnection.getTransceivers().size()); > > Please use reserveInitialCapacity to preallocate without creating the objects. Done. 1289587 5 304954 jonlee 2017-03-20 15:01:50 -0700 Created attachment 304954 Patch for landing 1289677 6 304981 jonlee 2017-03-20 19:10:11 -0700 Created attachment 304981 Patch for landing 1289687 7 304981 commit-queue 2017-03-20 19:51:03 -0700 Comment on attachment 304981 Patch for landing Clearing flags on attachment: 304981 Committed r214207: <http://trac.webkit.org/changeset/214207> 304913 2017-03-19 21:30:44 -0700 2017-03-20 08:24:59 -0700 Patch 0001-Follow-up-on-comments-for-bug-169664.patch text/plain 4744 jonlee RnJvbSAwMjhhMzU0NTZlNTZkYmViMGFlNTVhMTg4YzlhZTY5ZmVjYjczZDVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBTdW4s IDE5IE1hciAyMDE3IDIxOjMwOjA0IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRm9sbG93LXVwIG9u IGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY5NzA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb24uY3BwOgooV2ViQ29yZTo6ZGVy aXZlQWdncmVnYXRlZEljZUNvbm5lY3Rpb25TdGF0ZSk6IFVwZGF0ZSBkZXJpdmVBZ2dyZWdhdGVk SWNlQ29ubmVjdGlvblN0YXRlLgooV2ViQ29yZTo6TWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9u OjppY2VUcmFuc3BvcnRTdGF0ZUNoYW5nZWQpOiBTZXQgYSBjYXBhY2l0eSBhbmQgdXNlZAp1bmNo ZWNrZWRBcHBlbmQuCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAxMiArKysrKysrKysrKwogLi4uL21lZGlhc3RyZWFtL01lZGlhRW5kcG9p bnRQZWVyQ29ubmVjdGlvbi5jcHAgICAgfCAyMyArKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBhOTQ4N2Y5Njc5MS4uZWVlODYwZTdhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBA QAogMjAxNy0wMy0xOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAKKyAgICAgICAgRm9s bG93LXVwIG9uIGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk3MDkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRw b2ludFBlZXJDb25uZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRlcml2ZUFnZ3JlZ2F0 ZWRJY2VDb25uZWN0aW9uU3RhdGUpOiBVcGRhdGUgZGVyaXZlQWdncmVnYXRlZEljZUNvbm5lY3Rp b25TdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbjo6 aWNlVHJhbnNwb3J0U3RhdGVDaGFuZ2VkKTogU2V0IGEgY2FwYWNpdHkgYW5kIHVzZWQKKyAgICAg ICAgdW5jaGVja2VkQXBwZW5kLgorCisyMDE3LTAzLTE5ICBKb24gTGVlICA8am9ubGVlQGFwcGxl LmNvbT4KKwogICAgICAgICBBZGQgaWNlQ2FuZGlkYXRlUG9vbFNpemUgdG8gUlRDQ29uZmlndXJh dGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5 ODY2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcAppbmRleCBjOWMyMTZjYmRm ZS4uMmY1ZWRkMDUwZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHAKQEAg LTgwNiw3ICs4MDYsNyBAQCB2b2lkIE1lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbjo6ZG9uZUdh dGhlcmluZ0NhbmRpZGF0ZXMoY29uc3QgU3RyaW5nJiBtaWQpCiAgICAgICAgIFBlZXJDb25uZWN0 aW9uQmFja2VuZDo6ZG9uZUdhdGhlcmluZ0NhbmRpZGF0ZXMoKTsKIH0KIAotc3RhdGljIFJUQ0lj ZVRyYW5zcG9ydFN0YXRlIGRlcml2ZUFnZ3JlZ2F0ZWRJY2VDb25uZWN0aW9uU3RhdGUoY29uc3Qg VmVjdG9yPFJUQ0ljZVRyYW5zcG9ydFN0YXRlPiYgc3RhdGVzKQorc3RhdGljIFJUQ0ljZUNvbm5l Y3Rpb25TdGF0ZSBkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlvblN0YXRlKGNvbnN0IFZlY3Rv cjxSVENJY2VUcmFuc3BvcnRTdGF0ZT4mIHN0YXRlcykKIHsKICAgICB1bnNpZ25lZCBuZXdDb3Vu dCA9IDA7CiAgICAgdW5zaWduZWQgY2hlY2tpbmdDb3VudCA9IDA7CkBAIC04NDQsMjUgKzg0NCwy NSBAQCBzdGF0aWMgUlRDSWNlVHJhbnNwb3J0U3RhdGUgZGVyaXZlQWdncmVnYXRlZEljZUNvbm5l Y3Rpb25TdGF0ZShjb25zdCBWZWN0b3I8UlRDSQogCiAgICAgLy8gVGhlIGFnZ3JlZ2F0ZWQgUlRD SWNlQ29ubmVjdGlvblN0YXRlIGlzIGRlcml2ZWQgZnJvbSB0aGUgUlRDSWNlVHJhbnNwb3J0U3Rh dGUgb2YgYWxsIFJUQ0ljZVRyYW5zcG9ydHMuCiAgICAgaWYgKChuZXdDb3VudCA+IDAgJiYgIWNo ZWNraW5nQ291bnQgJiYgIWZhaWxlZENvdW50ICYmICFkaXNjb25uZWN0ZWRDb3VudCkgfHwgKGNs b3NlZENvdW50ID09IHN0YXRlcy5zaXplKCkpKQotICAgICAgICByZXR1cm4gUlRDSWNlVHJhbnNw b3J0U3RhdGU6Ok5ldzsKKyAgICAgICAgcmV0dXJuIFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZTo6TmV3 OwogCiAgICAgaWYgKGNoZWNraW5nQ291bnQgPiAwICYmICFmYWlsZWRDb3VudCAmJiAhZGlzY29u bmVjdGVkQ291bnQpCi0gICAgICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRTdGF0ZTo6Q2hlY2tp bmc7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6OkNoZWNraW5nOwogCiAg ICAgaWYgKChjb25uZWN0ZWRDb3VudCArIGNvbXBsZXRlZENvdW50ICsgY2xvc2VkQ291bnQpID09 IHN0YXRlcy5zaXplKCkgJiYgY29ubmVjdGVkQ291bnQgPiAwKQotICAgICAgICByZXR1cm4gUlRD SWNlVHJhbnNwb3J0U3RhdGU6OkNvbm5lY3RlZDsKKyAgICAgICAgcmV0dXJuIFJUQ0ljZUNvbm5l Y3Rpb25TdGF0ZTo6Q29ubmVjdGVkOwogCiAgICAgaWYgKChjb21wbGV0ZWRDb3VudCArIGNsb3Nl ZENvdW50KSA9PSBzdGF0ZXMuc2l6ZSgpICYmIGNvbXBsZXRlZENvdW50ID4gMCkKLSAgICAgICAg cmV0dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpDb21wbGV0ZWQ7CisgICAgICAgIHJldHVybiBS VENJY2VDb25uZWN0aW9uU3RhdGU6OkNvbXBsZXRlZDsKIAogICAgIGlmIChmYWlsZWRDb3VudCA+ IDApCi0gICAgICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRTdGF0ZTo6RmFpbGVkOworICAgICAg ICByZXR1cm4gUlRDSWNlQ29ubmVjdGlvblN0YXRlOjpGYWlsZWQ7CiAKICAgICBpZiAoZGlzY29u bmVjdGVkQ291bnQgPiAwKSAvLyBBbnkgZmFpbGVkIGNhdWdodCBhYm92ZS4KLSAgICAgICAgcmV0 dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpEaXNjb25uZWN0ZWQ7CisgICAgICAgIHJldHVybiBS VENJY2VDb25uZWN0aW9uU3RhdGU6OkRpc2Nvbm5lY3RlZDsKIAogICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwotICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRTdGF0ZTo6TmV3OworICAgIHJldHVy biBSVENJY2VDb25uZWN0aW9uU3RhdGU6Ok5ldzsKIH0KIAogdm9pZCBNZWRpYUVuZHBvaW50UGVl ckNvbm5lY3Rpb246OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdlZChjb25zdCBTdHJpbmcmIG1pZCwg UlRDSWNlVHJhbnNwb3J0U3RhdGUgbWVkaWFFbmRwb2ludEljZVRyYW5zcG9ydFN0YXRlKQpAQCAt ODc2LDEyICs4NzYsMTEgQEAgdm9pZCBNZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb246OmljZVRy YW5zcG9ydFN0YXRlQ2hhbmdlZChjb25zdCBTdHJpbmcmIG1pZCwgUlQKICAgICB0cmFuc2NlaXZl ci0+aWNlVHJhbnNwb3J0KCkuc2V0U3RhdGUodHJhbnNwb3J0U3RhdGUpOwogCiAgICAgLy8gRGV0 ZXJtaW5lIGlmIHRoZSBzY3JpcHQgbmVlZHMgdG8gYmUgbm90aWZpZWQuCi0gICAgVmVjdG9yPFJU Q0ljZVRyYW5zcG9ydFN0YXRlPiB0cmFuc3BvcnRTdGF0ZXM7CisgICAgVmVjdG9yPFJUQ0ljZVRy YW5zcG9ydFN0YXRlPiB0cmFuc3BvcnRTdGF0ZXMobV9wZWVyQ29ubmVjdGlvbi5nZXRUcmFuc2Nl aXZlcnMoKS5zaXplKCkpOwogICAgIGZvciAoYXV0byYgdHJhbnNjZWl2ZXIgOiBtX3BlZXJDb25u ZWN0aW9uLmdldFRyYW5zY2VpdmVycygpKQotICAgICAgICB0cmFuc3BvcnRTdGF0ZXMuYXBwZW5k KHRyYW5zY2VpdmVyLT5pY2VUcmFuc3BvcnQoKS5zdGF0ZSgpKTsKKyAgICAgICAgdHJhbnNwb3J0 U3RhdGVzLnVuY2hlY2tlZEFwcGVuZCh0cmFuc2NlaXZlci0+aWNlVHJhbnNwb3J0KCkuc3RhdGUo KSk7CiAKLSAgICBSVENJY2VUcmFuc3BvcnRTdGF0ZSBkZXJpdmVkU3RhdGUgPSBkZXJpdmVBZ2dy ZWdhdGVkSWNlQ29ubmVjdGlvblN0YXRlKHRyYW5zcG9ydFN0YXRlcyk7Ci0gICAgbV9wZWVyQ29u bmVjdGlvbi51cGRhdGVJY2VDb25uZWN0aW9uU3RhdGUoc3RhdGljX2Nhc3Q8UlRDSWNlQ29ubmVj dGlvblN0YXRlPihkZXJpdmVkU3RhdGUpKTsKKyAgICBtX3BlZXJDb25uZWN0aW9uLnVwZGF0ZUlj ZUNvbm5lY3Rpb25TdGF0ZShkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlvblN0YXRlKHRyYW5z cG9ydFN0YXRlcykpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0tIAoyLjExLjAgKEFw cGxlIEdpdC04MCkKCg== 304954 2017-03-20 15:01:50 -0700 2017-03-20 19:10:11 -0700 Patch for landing 0001-Follow-up-on-comments-for-bug-169664.patch text/plain 4643 jonlee RnJvbSBhZTQxNDI4NjFiMzhlNDNmMWRhYzYzMzVhNDg2M2Q5ZjhjNzRjZjAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBNb24s IDIwIE1hciAyMDE3IDE1OjAxOjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRm9sbG93LXVwIG9u IGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY5NzA5CgpSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgoKKiBNb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHA6CihXZWJDb3JlOjpkZXJp dmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlvblN0YXRlKTogVXBkYXRlIGRlcml2ZUFnZ3JlZ2F0ZWRJ Y2VDb25uZWN0aW9uU3RhdGUuCihXZWJDb3JlOjpNZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb246 OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdlZCk6IFNldCBhIGNhcGFjaXR5IGFuZCB1c2VkCnVuY2hl Y2tlZEFwcGVuZC4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICB8IDEyICsrKysrKysrKysrKwogLi4uL21lZGlhc3RyZWFtL01lZGlhRW5kcG9p bnRQZWVyQ29ubmVjdGlvbi5jcHAgICAgfCAyMiArKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBmZWRkMDcxMzU4Yi4uNmE0ZmNjYjg1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAxNy0wMy0yMCAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9s bG93LXVwIG9uIGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk3MDkKKworICAgICAgICBSZXZpZXdlZCBieSBZ b3Vlbm4gRmFibGV0LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBv aW50UGVlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVyaXZlQWdncmVnYXRl ZEljZUNvbm5lY3Rpb25TdGF0ZSk6IFVwZGF0ZSBkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlv blN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjpp Y2VUcmFuc3BvcnRTdGF0ZUNoYW5nZWQpOiBTZXQgYSBjYXBhY2l0eSBhbmQgdXNlZAorICAgICAg ICB1bmNoZWNrZWRBcHBlbmQuCisKIDIwMTctMDMtMjAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2Fy bHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW01lZGlhU3RyZWFtXSBSZXNwZWN0IGNvbnN0cmFp bnRzIHBhc3NlZCB0byBnZXRVc2VyTWVkaWEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9u LmNwcAppbmRleCBjOWMyMTZjYmRmZS4uNzQ2NTc3OTE3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQ ZWVyQ29ubmVjdGlvbi5jcHAKQEAgLTgwNiw3ICs4MDYsNyBAQCB2b2lkIE1lZGlhRW5kcG9pbnRQ ZWVyQ29ubmVjdGlvbjo6ZG9uZUdhdGhlcmluZ0NhbmRpZGF0ZXMoY29uc3QgU3RyaW5nJiBtaWQp CiAgICAgICAgIFBlZXJDb25uZWN0aW9uQmFja2VuZDo6ZG9uZUdhdGhlcmluZ0NhbmRpZGF0ZXMo KTsKIH0KIAotc3RhdGljIFJUQ0ljZVRyYW5zcG9ydFN0YXRlIGRlcml2ZUFnZ3JlZ2F0ZWRJY2VD b25uZWN0aW9uU3RhdGUoY29uc3QgVmVjdG9yPFJUQ0ljZVRyYW5zcG9ydFN0YXRlPiYgc3RhdGVz KQorc3RhdGljIFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZSBkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVj dGlvblN0YXRlKGNvbnN0IFZlY3RvcjxSVENJY2VUcmFuc3BvcnRTdGF0ZT4mIHN0YXRlcykKIHsK ICAgICB1bnNpZ25lZCBuZXdDb3VudCA9IDA7CiAgICAgdW5zaWduZWQgY2hlY2tpbmdDb3VudCA9 IDA7CkBAIC04NDQsMjUgKzg0NCwyNSBAQCBzdGF0aWMgUlRDSWNlVHJhbnNwb3J0U3RhdGUgZGVy aXZlQWdncmVnYXRlZEljZUNvbm5lY3Rpb25TdGF0ZShjb25zdCBWZWN0b3I8UlRDSQogCiAgICAg Ly8gVGhlIGFnZ3JlZ2F0ZWQgUlRDSWNlQ29ubmVjdGlvblN0YXRlIGlzIGRlcml2ZWQgZnJvbSB0 aGUgUlRDSWNlVHJhbnNwb3J0U3RhdGUgb2YgYWxsIFJUQ0ljZVRyYW5zcG9ydHMuCiAgICAgaWYg KChuZXdDb3VudCA+IDAgJiYgIWNoZWNraW5nQ291bnQgJiYgIWZhaWxlZENvdW50ICYmICFkaXNj b25uZWN0ZWRDb3VudCkgfHwgKGNsb3NlZENvdW50ID09IHN0YXRlcy5zaXplKCkpKQotICAgICAg ICByZXR1cm4gUlRDSWNlVHJhbnNwb3J0U3RhdGU6Ok5ldzsKKyAgICAgICAgcmV0dXJuIFJUQ0lj ZUNvbm5lY3Rpb25TdGF0ZTo6TmV3OwogCiAgICAgaWYgKGNoZWNraW5nQ291bnQgPiAwICYmICFm YWlsZWRDb3VudCAmJiAhZGlzY29ubmVjdGVkQ291bnQpCi0gICAgICAgIHJldHVybiBSVENJY2VU cmFuc3BvcnRTdGF0ZTo6Q2hlY2tpbmc7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9u U3RhdGU6OkNoZWNraW5nOwogCiAgICAgaWYgKChjb25uZWN0ZWRDb3VudCArIGNvbXBsZXRlZENv dW50ICsgY2xvc2VkQ291bnQpID09IHN0YXRlcy5zaXplKCkgJiYgY29ubmVjdGVkQ291bnQgPiAw KQotICAgICAgICByZXR1cm4gUlRDSWNlVHJhbnNwb3J0U3RhdGU6OkNvbm5lY3RlZDsKKyAgICAg ICAgcmV0dXJuIFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZTo6Q29ubmVjdGVkOwogCiAgICAgaWYgKChj b21wbGV0ZWRDb3VudCArIGNsb3NlZENvdW50KSA9PSBzdGF0ZXMuc2l6ZSgpICYmIGNvbXBsZXRl ZENvdW50ID4gMCkKLSAgICAgICAgcmV0dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpDb21wbGV0 ZWQ7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6OkNvbXBsZXRlZDsKIAog ICAgIGlmIChmYWlsZWRDb3VudCA+IDApCi0gICAgICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRT dGF0ZTo6RmFpbGVkOworICAgICAgICByZXR1cm4gUlRDSWNlQ29ubmVjdGlvblN0YXRlOjpGYWls ZWQ7CiAKICAgICBpZiAoZGlzY29ubmVjdGVkQ291bnQgPiAwKSAvLyBBbnkgZmFpbGVkIGNhdWdo dCBhYm92ZS4KLSAgICAgICAgcmV0dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpEaXNjb25uZWN0 ZWQ7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6OkRpc2Nvbm5lY3RlZDsK IAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRT dGF0ZTo6TmV3OworICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6Ok5ldzsKIH0KIAog dm9pZCBNZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb246OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdl ZChjb25zdCBTdHJpbmcmIG1pZCwgUlRDSWNlVHJhbnNwb3J0U3RhdGUgbWVkaWFFbmRwb2ludElj ZVRyYW5zcG9ydFN0YXRlKQpAQCAtODc3LDExICs4NzcsMTEgQEAgdm9pZCBNZWRpYUVuZHBvaW50 UGVlckNvbm5lY3Rpb246OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdlZChjb25zdCBTdHJpbmcmIG1p ZCwgUlQKIAogICAgIC8vIERldGVybWluZSBpZiB0aGUgc2NyaXB0IG5lZWRzIHRvIGJlIG5vdGlm aWVkLgogICAgIFZlY3RvcjxSVENJY2VUcmFuc3BvcnRTdGF0ZT4gdHJhbnNwb3J0U3RhdGVzOwor ICAgIHRyYW5zcG9ydFN0YXRlcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fcGVlckNvbm5lY3Rp b24uZ2V0VHJhbnNjZWl2ZXJzKCkuc2l6ZSgpKTsKICAgICBmb3IgKGF1dG8mIHRyYW5zY2VpdmVy IDogbV9wZWVyQ29ubmVjdGlvbi5nZXRUcmFuc2NlaXZlcnMoKSkKLSAgICAgICAgdHJhbnNwb3J0 U3RhdGVzLmFwcGVuZCh0cmFuc2NlaXZlci0+aWNlVHJhbnNwb3J0KCkuc3RhdGUoKSk7CisgICAg ICAgIHRyYW5zcG9ydFN0YXRlcy51bmNoZWNrZWRBcHBlbmQodHJhbnNjZWl2ZXItPmljZVRyYW5z cG9ydCgpLnN0YXRlKCkpOwogCi0gICAgUlRDSWNlVHJhbnNwb3J0U3RhdGUgZGVyaXZlZFN0YXRl ID0gZGVyaXZlQWdncmVnYXRlZEljZUNvbm5lY3Rpb25TdGF0ZSh0cmFuc3BvcnRTdGF0ZXMpOwot ICAgIG1fcGVlckNvbm5lY3Rpb24udXBkYXRlSWNlQ29ubmVjdGlvblN0YXRlKHN0YXRpY19jYXN0 PFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZT4oZGVyaXZlZFN0YXRlKSk7CisgICAgbV9wZWVyQ29ubmVj dGlvbi51cGRhdGVJY2VDb25uZWN0aW9uU3RhdGUoZGVyaXZlQWdncmVnYXRlZEljZUNvbm5lY3Rp b25TdGF0ZSh0cmFuc3BvcnRTdGF0ZXMpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQot LSAKMi4xMS4wIChBcHBsZSBHaXQtODApCgo= 304981 2017-03-20 19:10:11 -0700 2017-03-20 19:51:03 -0700 Patch for landing 0001-Follow-up-on-comments-for-bug-169664.patch text/plain 4643 jonlee RnJvbSBhZTQxNDI4NjFiMzhlNDNmMWRhYzYzMzVhNDg2M2Q5ZjhjNzRjZjAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBNb24s IDIwIE1hciAyMDE3IDE1OjAxOjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRm9sbG93LXVwIG9u IGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY5NzA5CgpSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgoKKiBNb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHA6CihXZWJDb3JlOjpkZXJp dmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlvblN0YXRlKTogVXBkYXRlIGRlcml2ZUFnZ3JlZ2F0ZWRJ Y2VDb25uZWN0aW9uU3RhdGUuCihXZWJDb3JlOjpNZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb246 OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdlZCk6IFNldCBhIGNhcGFjaXR5IGFuZCB1c2VkCnVuY2hl Y2tlZEFwcGVuZC4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICB8IDEyICsrKysrKysrKysrKwogLi4uL21lZGlhc3RyZWFtL01lZGlhRW5kcG9p bnRQZWVyQ29ubmVjdGlvbi5jcHAgICAgfCAyMiArKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBmZWRkMDcxMzU4Yi4uNmE0ZmNjYjg1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAxNy0wMy0yMCAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9s bG93LXVwIG9uIGNvbW1lbnRzIGZvciBidWcgMTY5NjY0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk3MDkKKworICAgICAgICBSZXZpZXdlZCBieSBZ b3Vlbm4gRmFibGV0LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBv aW50UGVlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVyaXZlQWdncmVnYXRl ZEljZUNvbm5lY3Rpb25TdGF0ZSk6IFVwZGF0ZSBkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVjdGlv blN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjpp Y2VUcmFuc3BvcnRTdGF0ZUNoYW5nZWQpOiBTZXQgYSBjYXBhY2l0eSBhbmQgdXNlZAorICAgICAg ICB1bmNoZWNrZWRBcHBlbmQuCisKIDIwMTctMDMtMjAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2Fy bHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW01lZGlhU3RyZWFtXSBSZXNwZWN0IGNvbnN0cmFp bnRzIHBhc3NlZCB0byBnZXRVc2VyTWVkaWEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9u LmNwcAppbmRleCBjOWMyMTZjYmRmZS4uNzQ2NTc3OTE3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQ ZWVyQ29ubmVjdGlvbi5jcHAKQEAgLTgwNiw3ICs4MDYsNyBAQCB2b2lkIE1lZGlhRW5kcG9pbnRQ ZWVyQ29ubmVjdGlvbjo6ZG9uZUdhdGhlcmluZ0NhbmRpZGF0ZXMoY29uc3QgU3RyaW5nJiBtaWQp CiAgICAgICAgIFBlZXJDb25uZWN0aW9uQmFja2VuZDo6ZG9uZUdhdGhlcmluZ0NhbmRpZGF0ZXMo KTsKIH0KIAotc3RhdGljIFJUQ0ljZVRyYW5zcG9ydFN0YXRlIGRlcml2ZUFnZ3JlZ2F0ZWRJY2VD b25uZWN0aW9uU3RhdGUoY29uc3QgVmVjdG9yPFJUQ0ljZVRyYW5zcG9ydFN0YXRlPiYgc3RhdGVz KQorc3RhdGljIFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZSBkZXJpdmVBZ2dyZWdhdGVkSWNlQ29ubmVj dGlvblN0YXRlKGNvbnN0IFZlY3RvcjxSVENJY2VUcmFuc3BvcnRTdGF0ZT4mIHN0YXRlcykKIHsK ICAgICB1bnNpZ25lZCBuZXdDb3VudCA9IDA7CiAgICAgdW5zaWduZWQgY2hlY2tpbmdDb3VudCA9 IDA7CkBAIC04NDQsMjUgKzg0NCwyNSBAQCBzdGF0aWMgUlRDSWNlVHJhbnNwb3J0U3RhdGUgZGVy aXZlQWdncmVnYXRlZEljZUNvbm5lY3Rpb25TdGF0ZShjb25zdCBWZWN0b3I8UlRDSQogCiAgICAg Ly8gVGhlIGFnZ3JlZ2F0ZWQgUlRDSWNlQ29ubmVjdGlvblN0YXRlIGlzIGRlcml2ZWQgZnJvbSB0 aGUgUlRDSWNlVHJhbnNwb3J0U3RhdGUgb2YgYWxsIFJUQ0ljZVRyYW5zcG9ydHMuCiAgICAgaWYg KChuZXdDb3VudCA+IDAgJiYgIWNoZWNraW5nQ291bnQgJiYgIWZhaWxlZENvdW50ICYmICFkaXNj b25uZWN0ZWRDb3VudCkgfHwgKGNsb3NlZENvdW50ID09IHN0YXRlcy5zaXplKCkpKQotICAgICAg ICByZXR1cm4gUlRDSWNlVHJhbnNwb3J0U3RhdGU6Ok5ldzsKKyAgICAgICAgcmV0dXJuIFJUQ0lj ZUNvbm5lY3Rpb25TdGF0ZTo6TmV3OwogCiAgICAgaWYgKGNoZWNraW5nQ291bnQgPiAwICYmICFm YWlsZWRDb3VudCAmJiAhZGlzY29ubmVjdGVkQ291bnQpCi0gICAgICAgIHJldHVybiBSVENJY2VU cmFuc3BvcnRTdGF0ZTo6Q2hlY2tpbmc7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9u U3RhdGU6OkNoZWNraW5nOwogCiAgICAgaWYgKChjb25uZWN0ZWRDb3VudCArIGNvbXBsZXRlZENv dW50ICsgY2xvc2VkQ291bnQpID09IHN0YXRlcy5zaXplKCkgJiYgY29ubmVjdGVkQ291bnQgPiAw KQotICAgICAgICByZXR1cm4gUlRDSWNlVHJhbnNwb3J0U3RhdGU6OkNvbm5lY3RlZDsKKyAgICAg ICAgcmV0dXJuIFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZTo6Q29ubmVjdGVkOwogCiAgICAgaWYgKChj b21wbGV0ZWRDb3VudCArIGNsb3NlZENvdW50KSA9PSBzdGF0ZXMuc2l6ZSgpICYmIGNvbXBsZXRl ZENvdW50ID4gMCkKLSAgICAgICAgcmV0dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpDb21wbGV0 ZWQ7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6OkNvbXBsZXRlZDsKIAog ICAgIGlmIChmYWlsZWRDb3VudCA+IDApCi0gICAgICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRT dGF0ZTo6RmFpbGVkOworICAgICAgICByZXR1cm4gUlRDSWNlQ29ubmVjdGlvblN0YXRlOjpGYWls ZWQ7CiAKICAgICBpZiAoZGlzY29ubmVjdGVkQ291bnQgPiAwKSAvLyBBbnkgZmFpbGVkIGNhdWdo dCBhYm92ZS4KLSAgICAgICAgcmV0dXJuIFJUQ0ljZVRyYW5zcG9ydFN0YXRlOjpEaXNjb25uZWN0 ZWQ7CisgICAgICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6OkRpc2Nvbm5lY3RlZDsK IAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBSVENJY2VUcmFuc3BvcnRT dGF0ZTo6TmV3OworICAgIHJldHVybiBSVENJY2VDb25uZWN0aW9uU3RhdGU6Ok5ldzsKIH0KIAog dm9pZCBNZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb246OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdl ZChjb25zdCBTdHJpbmcmIG1pZCwgUlRDSWNlVHJhbnNwb3J0U3RhdGUgbWVkaWFFbmRwb2ludElj ZVRyYW5zcG9ydFN0YXRlKQpAQCAtODc3LDExICs4NzcsMTEgQEAgdm9pZCBNZWRpYUVuZHBvaW50 UGVlckNvbm5lY3Rpb246OmljZVRyYW5zcG9ydFN0YXRlQ2hhbmdlZChjb25zdCBTdHJpbmcmIG1p ZCwgUlQKIAogICAgIC8vIERldGVybWluZSBpZiB0aGUgc2NyaXB0IG5lZWRzIHRvIGJlIG5vdGlm aWVkLgogICAgIFZlY3RvcjxSVENJY2VUcmFuc3BvcnRTdGF0ZT4gdHJhbnNwb3J0U3RhdGVzOwor ICAgIHRyYW5zcG9ydFN0YXRlcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fcGVlckNvbm5lY3Rp b24uZ2V0VHJhbnNjZWl2ZXJzKCkuc2l6ZSgpKTsKICAgICBmb3IgKGF1dG8mIHRyYW5zY2VpdmVy IDogbV9wZWVyQ29ubmVjdGlvbi5nZXRUcmFuc2NlaXZlcnMoKSkKLSAgICAgICAgdHJhbnNwb3J0 U3RhdGVzLmFwcGVuZCh0cmFuc2NlaXZlci0+aWNlVHJhbnNwb3J0KCkuc3RhdGUoKSk7CisgICAg ICAgIHRyYW5zcG9ydFN0YXRlcy51bmNoZWNrZWRBcHBlbmQodHJhbnNjZWl2ZXItPmljZVRyYW5z cG9ydCgpLnN0YXRlKCkpOwogCi0gICAgUlRDSWNlVHJhbnNwb3J0U3RhdGUgZGVyaXZlZFN0YXRl ID0gZGVyaXZlQWdncmVnYXRlZEljZUNvbm5lY3Rpb25TdGF0ZSh0cmFuc3BvcnRTdGF0ZXMpOwot ICAgIG1fcGVlckNvbm5lY3Rpb24udXBkYXRlSWNlQ29ubmVjdGlvblN0YXRlKHN0YXRpY19jYXN0 PFJUQ0ljZUNvbm5lY3Rpb25TdGF0ZT4oZGVyaXZlZFN0YXRlKSk7CisgICAgbV9wZWVyQ29ubmVj dGlvbi51cGRhdGVJY2VDb25uZWN0aW9uU3RhdGUoZGVyaXZlQWdncmVnYXRlZEljZUNvbm5lY3Rp b25TdGF0ZSh0cmFuc3BvcnRTdGF0ZXMpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQot LSAKMi4xMS4wIChBcHBsZSBHaXQtODApCgo=