131784 2014-04-16 19:54:45 -0700 [Win] A few final cleanups to the DataObject classes 2014-04-17 11:15:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 131631 131735 1 bfulgham bfulgham andersca bfulgham darin oldest_to_newest 1001465 0 bfulgham 2014-04-16 19:54:45 -0700 While working on Bug 131631, we noticed a few improvements that could be made once the Vector class had been updated with additional move-handling operators. 1. Use "someVector.last()" rather than "someVector[someVector.size() - 1]" 2. Use Vectors "takeLast()" method, rather than the hand-coded implementation in these classes. 1001475 1 229517 bfulgham 2014-04-16 20:26:41 -0700 Created attachment 229517 Patch 1001600 2 229517 darin 2014-04-17 10:29:26 -0700 Comment on attachment 229517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229517&action=review > Source/WebCore/platform/win/WCDataObject.cpp:361 > + m_formats[ptr] = std::move(m_formats.last()); > m_formats.removeLast(); Should be takeLast, not last/removeLast. > Source/WebCore/platform/win/WCDataObject.cpp:363 > + m_medium[ptr] = std::move(m_medium.last()); > m_medium.removeLast(); Should be takeLast, not last/removeLast. > Tools/DumpRenderTree/win/DRTDataObject.cpp:350 > + m_formats[position] = std::move(m_formats.last()); > m_formats.removeLast(); Should be takeLast, not last/removeLast. > Tools/DumpRenderTree/win/DRTDataObject.cpp:352 > + m_medium[position] = std::move(m_medium.last()); > m_medium.removeLast(); Should be takeLast, not last/removeLast. 1001608 3 229559 bfulgham 2014-04-17 10:55:27 -0700 Created attachment 229559 Whoops! Left some unrelated debugging code in my tree. 1001610 4 bfulgham 2014-04-17 10:56:08 -0700 Anders, do I need to add a std::move() in these uses of takeLast to ensure proper move semantics? 1001611 5 229560 bfulgham 2014-04-17 10:58:00 -0700 Created attachment 229560 Patch 1001616 6 bfulgham 2014-04-17 11:15:08 -0700 Committed r167442: <http://trac.webkit.org/changeset/167442> 229517 2014-04-16 20:26:41 -0700 2014-04-17 10:55:23 -0700 Patch bug-131784-20140416202619.patch text/plain 3672 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA0LTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFs IGNsZWFudXBzIHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9XQ0RhdGFPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6V0NEYXRhT2JqZWN0OjpjbGVhckRhdGEpOiBVc2UgJ2xh c3QoKScgbWV0aG9kLgorCiAyMDE0LTA0LTE2ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1 QGFkb2JlLmNvbT4KIAogICAgICAgICBJbXByb3ZlIHBlcmZvcm1hbmNlIG9mIHRoZSBSZW5kZXJM YXllckNvbXBvc2l0b3I6Ok92ZXJsYXBNYXAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9XQ0RhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9XQ0RhdGFPYmplY3QuY3BwCShyZXZpc2lvbiAxNjc0MTApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vV0NEYXRhT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU3 LDkgKzM1Nyw5IEBAIHZvaWQgV0NEYXRhT2JqZWN0OjpjbGVhckRhdGEoQ0xJUEZPUk1BVAogICAg IHNpemVfdCBwdHIgPSAwOwogICAgIHdoaWxlIChwdHIgPCBtX2Zvcm1hdHMuc2l6ZSgpKSB7CiAg ICAgICAgIGlmIChtX2Zvcm1hdHNbcHRyXS0+Y2ZGb3JtYXQgPT0gZm9ybWF0KSB7Ci0gICAgICAg ICAgICBtX2Zvcm1hdHNbcHRyXSA9IHN0ZDo6bW92ZShtX2Zvcm1hdHNbbV9mb3JtYXRzLnNpemUo KSAtIDFdKTsKKyAgICAgICAgICAgIG1fZm9ybWF0c1twdHJdID0gc3RkOjptb3ZlKG1fZm9ybWF0 cy5sYXN0KCkpOwogICAgICAgICAgICAgbV9mb3JtYXRzLnJlbW92ZUxhc3QoKTsKLSAgICAgICAg ICAgIG1fbWVkaXVtW3B0cl0gPSBzdGQ6Om1vdmUobV9tZWRpdW1bbV9tZWRpdW0uc2l6ZSgpIC0g MV0pOworICAgICAgICAgICAgbV9tZWRpdW1bcHRyXSA9IHN0ZDo6bW92ZShtX21lZGl1bS5sYXN0 KCkpOwogICAgICAgICAgICAgbV9tZWRpdW0ucmVtb3ZlTGFzdCgpOwogICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgIH0KSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTE2ICBCcmVudCBGdWxnaGFtICA8 YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFsIGNsZWFudXBz IHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0LmNw cDoKKyAgICAgICAgKERSVERhdGFPYmplY3Q6OmNsZWFyRGF0YSk6IFVzZSAnbGFzdCgpJyBtZXRo b2QuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwOgorICAgICAg ICAoRFJUVW5kb1N0YWNrOjpwb3ApOiBVc2UgJ3Rha2VMYXN0KCknIG1ldGhvZC4KKwogMjAxNC0w NC0xNiAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAgICBb V2luXSBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMgZmFpbHMgdG8gcnVuLgpJbmRleDogVG9vbHMv RHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0LmNwcAkocmV2aXNpb24gMTY3NDEwKQor KysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNDYsOSArMzQ2LDkgQEAgdm9pZCBEUlREYXRhT2JqZWN0OjpjbGVhckRhdGEoQ0xJ UEZPUk1BVAogICAgIHNpemVfdCBwb3NpdGlvbiA9IDA7CiAgICAgd2hpbGUgKHBvc2l0aW9uIDwg bV9mb3JtYXRzLnNpemUoKSkgewogICAgICAgICBpZiAobV9mb3JtYXRzW3Bvc2l0aW9uXS0+Y2ZG b3JtYXQgPT0gZm9ybWF0KSB7Ci0gICAgICAgICAgICBtX2Zvcm1hdHNbcG9zaXRpb25dID0gc3Rk Ojptb3ZlKG1fZm9ybWF0c1ttX2Zvcm1hdHMuc2l6ZSgpIC0gMV0pOworICAgICAgICAgICAgbV9m b3JtYXRzW3Bvc2l0aW9uXSA9IHN0ZDo6bW92ZShtX2Zvcm1hdHMubGFzdCgpKTsKICAgICAgICAg ICAgIG1fZm9ybWF0cy5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAgICBtX21lZGl1bVtwb3NpdGlv bl0gPSBzdGQ6Om1vdmUobV9tZWRpdW1bbV9tZWRpdW0uc2l6ZSgpIC0gMV0pOworICAgICAgICAg ICAgbV9tZWRpdW1bcG9zaXRpb25dID0gc3RkOjptb3ZlKG1fbWVkaXVtLmxhc3QoKSk7CiAgICAg ICAgICAgICBtX21lZGl1bS5yZW1vdmVMYXN0KCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9VSURlbGVnYXRlLmNwcAkocmV2 aXNpb24gMTY3NDEwKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFy KCkgeyBtX3VuZG9WZWN0b3IuY2xlYXIoKTsgfQogCiAgICAgdm9pZCBwdXNoKERSVFVuZG9PYmpl Y3QqIHVuZG9PYmplY3QpIHsgbV91bmRvVmVjdG9yLmFwcGVuZCh1bmRvT2JqZWN0KTsgfQotICAg IHN0ZDo6dW5pcXVlX3B0cjxEUlRVbmRvT2JqZWN0PiBwb3AoKSB7IHN0ZDo6dW5pcXVlX3B0cjxE UlRVbmRvT2JqZWN0PiB0b3AgPSBzdGQ6Om1vdmUobV91bmRvVmVjdG9yLmxhc3QoKSk7IG1fdW5k b1ZlY3Rvci5yZW1vdmVMYXN0KCk7IHJldHVybiBzdGQ6Om1vdmUodG9wKTsgfQorICAgIHN0ZDo6 dW5pcXVlX3B0cjxEUlRVbmRvT2JqZWN0PiBwb3AoKSB7IHJldHVybiBtX3VuZG9WZWN0b3IudGFr ZUxhc3QoKTsgfQogCiBwcml2YXRlOgogICAgIFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8RFJUVW5k b09iamVjdD4+IG1fdW5kb1ZlY3RvcjsK 229559 2014-04-17 10:55:27 -0700 2014-04-17 10:57:57 -0700 Whoops! Left some unrelated debugging code in my tree. bug-131784-20140417105506.patch text/plain 4096 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA0LTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFs IGNsZWFudXBzIHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9XQ0RhdGFPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6V0NEYXRhT2JqZWN0OjpjbGVhckRhdGEpOiBVc2UgJ2xh c3QoKScgbWV0aG9kLgorCiAyMDE0LTA0LTE2ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1 QGFkb2JlLmNvbT4KIAogICAgICAgICBJbXByb3ZlIHBlcmZvcm1hbmNlIG9mIHRoZSBSZW5kZXJM YXllckNvbXBvc2l0b3I6Ok92ZXJsYXBNYXAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9XQ0RhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9XQ0RhdGFPYmplY3QuY3BwCShyZXZpc2lvbiAxNjc0MTApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vV0NEYXRhT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU3 LDEwICszNTcsOCBAQCB2b2lkIFdDRGF0YU9iamVjdDo6Y2xlYXJEYXRhKENMSVBGT1JNQVQKICAg ICBzaXplX3QgcHRyID0gMDsKICAgICB3aGlsZSAocHRyIDwgbV9mb3JtYXRzLnNpemUoKSkgewog ICAgICAgICBpZiAobV9mb3JtYXRzW3B0cl0tPmNmRm9ybWF0ID09IGZvcm1hdCkgewotICAgICAg ICAgICAgbV9mb3JtYXRzW3B0cl0gPSBzdGQ6Om1vdmUobV9mb3JtYXRzW21fZm9ybWF0cy5zaXpl KCkgLSAxXSk7Ci0gICAgICAgICAgICBtX2Zvcm1hdHMucmVtb3ZlTGFzdCgpOwotICAgICAgICAg ICAgbV9tZWRpdW1bcHRyXSA9IHN0ZDo6bW92ZShtX21lZGl1bVttX21lZGl1bS5zaXplKCkgLSAx XSk7Ci0gICAgICAgICAgICBtX21lZGl1bS5yZW1vdmVMYXN0KCk7CisgICAgICAgICAgICBtX2Zv cm1hdHNbcHRyXSA9IG1fZm9ybWF0cy50YWtlTGFzdCgpOworICAgICAgICAgICAgbV9tZWRpdW1b cHRyXSA9IG1fbWVkaXVtLnRha2VMYXN0KCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogICAgICAgICBwdHIrKzsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTE2ICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFsIGNsZWFu dXBzIHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0 LmNwcDoKKyAgICAgICAgKERSVERhdGFPYmplY3Q6OmNsZWFyRGF0YSk6IFVzZSAnbGFzdCgpJyBt ZXRob2QuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwOgorICAg ICAgICAoRFJUVW5kb1N0YWNrOjpwb3ApOiBVc2UgJ3Rha2VMYXN0KCknIG1ldGhvZC4KKwogMjAx NC0wNC0xNiAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAg ICBbV2luXSBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMgZmFpbHMgdG8gcnVuLgpJbmRleDogVG9v bHMvRHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0LmNwcAkocmV2aXNpb24gMTY3NDEw KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNDYsMTAgKzM0Niw4IEBAIHZvaWQgRFJURGF0YU9iamVjdDo6Y2xlYXJEYXRh KENMSVBGT1JNQVQKICAgICBzaXplX3QgcG9zaXRpb24gPSAwOwogICAgIHdoaWxlIChwb3NpdGlv biA8IG1fZm9ybWF0cy5zaXplKCkpIHsKICAgICAgICAgaWYgKG1fZm9ybWF0c1twb3NpdGlvbl0t PmNmRm9ybWF0ID09IGZvcm1hdCkgewotICAgICAgICAgICAgbV9mb3JtYXRzW3Bvc2l0aW9uXSA9 IHN0ZDo6bW92ZShtX2Zvcm1hdHNbbV9mb3JtYXRzLnNpemUoKSAtIDFdKTsKLSAgICAgICAgICAg IG1fZm9ybWF0cy5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAgICBtX21lZGl1bVtwb3NpdGlvbl0g PSBzdGQ6Om1vdmUobV9tZWRpdW1bbV9tZWRpdW0uc2l6ZSgpIC0gMV0pOwotICAgICAgICAgICAg bV9tZWRpdW0ucmVtb3ZlTGFzdCgpOworICAgICAgICAgICAgbV9mb3JtYXRzW3Bvc2l0aW9uXSA9 IG1fZm9ybWF0cy50YWtlTGFzdCgpOworICAgICAgICAgICAgbV9tZWRpdW1bcG9zaXRpb25dID0g bV9tZWRpdW0udGFrZUxhc3QoKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAg ICAgICAgIHBvc2l0aW9uKys7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxl Z2F0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdh dGUuY3BwCShyZXZpc2lvbiAxNjc0MTApCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlE ZWxlZ2F0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAgcHVibGljOgogICAg IHZvaWQgY2xlYXIoKSB7IG1fdW5kb1ZlY3Rvci5jbGVhcigpOyB9CiAKICAgICB2b2lkIHB1c2go RFJUVW5kb09iamVjdCogdW5kb09iamVjdCkgeyBtX3VuZG9WZWN0b3IuYXBwZW5kKHVuZG9PYmpl Y3QpOyB9Ci0gICAgc3RkOjp1bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHBvcCgpIHsgc3RkOjp1 bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHRvcCA9IHN0ZDo6bW92ZShtX3VuZG9WZWN0b3IubGFz dCgpKTsgbV91bmRvVmVjdG9yLnJlbW92ZUxhc3QoKTsgcmV0dXJuIHN0ZDo6bW92ZSh0b3ApOyB9 CisgICAgc3RkOjp1bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHBvcCgpIHsgcmV0dXJuIG1fdW5k b1ZlY3Rvci50YWtlTGFzdCgpOyB9CiAKIHByaXZhdGU6CiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVl X3B0cjxEUlRVbmRvT2JqZWN0Pj4gbV91bmRvVmVjdG9yOwpJbmRleDogVG9vbHMvU2NyaXB0cy9y dW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9ydW4t amF2YXNjcmlwdGNvcmUtdGVzdHMJKHJldmlzaW9uIDE2NzQxMCkKKysrIFRvb2xzL1NjcmlwdHMv cnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw3IEBA IG15ICRyb290OwogbXkgJHNob3dIZWxwOwogbXkgJGV4dHJhVGVzdHM7CiAKLW15ICRidWlsZEpT QyA9IDE7CitteSAkYnVpbGRKU0MgPSAwOwogCiBteSAkcnVuVGVzdEFQSSA9IGlzQXBwbGVNYWNX ZWJLaXQoKSB8fCBpc0FwcGxlV2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpOwogCg== 229560 2014-04-17 10:58:00 -0700 2014-04-17 11:00:19 -0700 Patch bug-131784-20140417105739.patch text/plain 3683 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA0LTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFs IGNsZWFudXBzIHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9XQ0RhdGFPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6V0NEYXRhT2JqZWN0OjpjbGVhckRhdGEpOiBVc2UgJ2xh c3QoKScgbWV0aG9kLgorCiAyMDE0LTA0LTE2ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1 QGFkb2JlLmNvbT4KIAogICAgICAgICBJbXByb3ZlIHBlcmZvcm1hbmNlIG9mIHRoZSBSZW5kZXJM YXllckNvbXBvc2l0b3I6Ok92ZXJsYXBNYXAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9XQ0RhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9XQ0RhdGFPYmplY3QuY3BwCShyZXZpc2lvbiAxNjc0MTApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vV0NEYXRhT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU3 LDEwICszNTcsOCBAQCB2b2lkIFdDRGF0YU9iamVjdDo6Y2xlYXJEYXRhKENMSVBGT1JNQVQKICAg ICBzaXplX3QgcHRyID0gMDsKICAgICB3aGlsZSAocHRyIDwgbV9mb3JtYXRzLnNpemUoKSkgewog ICAgICAgICBpZiAobV9mb3JtYXRzW3B0cl0tPmNmRm9ybWF0ID09IGZvcm1hdCkgewotICAgICAg ICAgICAgbV9mb3JtYXRzW3B0cl0gPSBzdGQ6Om1vdmUobV9mb3JtYXRzW21fZm9ybWF0cy5zaXpl KCkgLSAxXSk7Ci0gICAgICAgICAgICBtX2Zvcm1hdHMucmVtb3ZlTGFzdCgpOwotICAgICAgICAg ICAgbV9tZWRpdW1bcHRyXSA9IHN0ZDo6bW92ZShtX21lZGl1bVttX21lZGl1bS5zaXplKCkgLSAx XSk7Ci0gICAgICAgICAgICBtX21lZGl1bS5yZW1vdmVMYXN0KCk7CisgICAgICAgICAgICBtX2Zv cm1hdHNbcHRyXSA9IG1fZm9ybWF0cy50YWtlTGFzdCgpOworICAgICAgICAgICAgbV9tZWRpdW1b cHRyXSA9IG1fbWVkaXVtLnRha2VMYXN0KCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogICAgICAgICBwdHIrKzsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTE2ICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEEgZmV3IGZpbmFsIGNsZWFu dXBzIHRvIHRoZSBEYXRhT2JqZWN0IGNsYXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0 LmNwcDoKKyAgICAgICAgKERSVERhdGFPYmplY3Q6OmNsZWFyRGF0YSk6IFVzZSAnbGFzdCgpJyBt ZXRob2QuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwOgorICAg ICAgICAoRFJUVW5kb1N0YWNrOjpwb3ApOiBVc2UgJ3Rha2VMYXN0KCknIG1ldGhvZC4KKwogMjAx NC0wNC0xNiAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAg ICBbV2luXSBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMgZmFpbHMgdG8gcnVuLgpJbmRleDogVG9v bHMvRHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EUlREYXRhT2JqZWN0LmNwcAkocmV2aXNpb24gMTY3NDEw KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0RSVERhdGFPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNDYsMTAgKzM0Niw4IEBAIHZvaWQgRFJURGF0YU9iamVjdDo6Y2xlYXJEYXRh KENMSVBGT1JNQVQKICAgICBzaXplX3QgcG9zaXRpb24gPSAwOwogICAgIHdoaWxlIChwb3NpdGlv biA8IG1fZm9ybWF0cy5zaXplKCkpIHsKICAgICAgICAgaWYgKG1fZm9ybWF0c1twb3NpdGlvbl0t PmNmRm9ybWF0ID09IGZvcm1hdCkgewotICAgICAgICAgICAgbV9mb3JtYXRzW3Bvc2l0aW9uXSA9 IHN0ZDo6bW92ZShtX2Zvcm1hdHNbbV9mb3JtYXRzLnNpemUoKSAtIDFdKTsKLSAgICAgICAgICAg IG1fZm9ybWF0cy5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAgICBtX21lZGl1bVtwb3NpdGlvbl0g PSBzdGQ6Om1vdmUobV9tZWRpdW1bbV9tZWRpdW0uc2l6ZSgpIC0gMV0pOwotICAgICAgICAgICAg bV9tZWRpdW0ucmVtb3ZlTGFzdCgpOworICAgICAgICAgICAgbV9mb3JtYXRzW3Bvc2l0aW9uXSA9 IG1fZm9ybWF0cy50YWtlTGFzdCgpOworICAgICAgICAgICAgbV9tZWRpdW1bcG9zaXRpb25dID0g bV9tZWRpdW0udGFrZUxhc3QoKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAg ICAgICAgIHBvc2l0aW9uKys7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxl Z2F0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdh dGUuY3BwCShyZXZpc2lvbiAxNjc0MTApCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlE ZWxlZ2F0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAgcHVibGljOgogICAg IHZvaWQgY2xlYXIoKSB7IG1fdW5kb1ZlY3Rvci5jbGVhcigpOyB9CiAKICAgICB2b2lkIHB1c2go RFJUVW5kb09iamVjdCogdW5kb09iamVjdCkgeyBtX3VuZG9WZWN0b3IuYXBwZW5kKHVuZG9PYmpl Y3QpOyB9Ci0gICAgc3RkOjp1bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHBvcCgpIHsgc3RkOjp1 bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHRvcCA9IHN0ZDo6bW92ZShtX3VuZG9WZWN0b3IubGFz dCgpKTsgbV91bmRvVmVjdG9yLnJlbW92ZUxhc3QoKTsgcmV0dXJuIHN0ZDo6bW92ZSh0b3ApOyB9 CisgICAgc3RkOjp1bmlxdWVfcHRyPERSVFVuZG9PYmplY3Q+IHBvcCgpIHsgcmV0dXJuIG1fdW5k b1ZlY3Rvci50YWtlTGFzdCgpOyB9CiAKIHByaXZhdGU6CiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVl X3B0cjxEUlRVbmRvT2JqZWN0Pj4gbV91bmRvVmVjdG9yOwo=