132905 2014-05-14 06:59:02 -0700 [GTK][EFL] Video is resumed with old playback rate. 2014-05-22 07:58:37 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 piotr.grad webkit-unassigned agomez calvaris cgarcia commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson philipj pnormand sergio vjaquez oldest_to_newest 1009239 0 piotr.grad 2014-05-14 06:59:02 -0700 Video is resumed with old playback rate after changing it to '0' and requesting play. 1009241 1 231447 piotr.grad 2014-05-14 07:19:32 -0700 Created attachment 231447 Patch & layout test 1009242 2 commit-queue 2014-05-14 07:20:56 -0700 Attachment 231447 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:410: Missing space before ( in if( [whitespace/parens] [5] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:565: Missing space before ( in if( [whitespace/parens] [5] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:623: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1009245 3 231449 piotr.grad 2014-05-14 07:25:58 -0700 Created attachment 231449 Patch & layout test 1009246 4 commit-queue 2014-05-14 07:28:27 -0700 Attachment 231449 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:565: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1009249 5 231451 piotr.grad 2014-05-14 07:34:10 -0700 Created attachment 231451 Patch & layout test 1010422 6 231451 pnormand 2014-05-20 00:34:20 -0700 Comment on attachment 231451 Patch & layout test View in context: https://bugs.webkit.org/attachment.cgi?id=231451&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:568 > + if (!rate) { > + return gst_element_seek(m_playBin.get(), 1.0, GST_FORMAT_TIME, seekType, > + GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime); > + } Perhaps this could be if(!rate) rate = 1.0 ? 1010829 7 231840 piotr.grad 2014-05-21 13:48:49 -0700 Created attachment 231840 Patch & layout test 1010972 8 231840 commit-queue 2014-05-22 07:58:29 -0700 Comment on attachment 231840 Patch & layout test Clearing flags on attachment: 231840 Committed r169200: <http://trac.webkit.org/changeset/169200> 1010973 9 commit-queue 2014-05-22 07:58:37 -0700 All reviewed patches have been landed. Closing bug. 231447 2014-05-14 07:19:32 -0700 2014-05-14 07:25:58 -0700 Patch & layout test patch2.txt text/plain 8957 piotr.grad ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MTU3ODM1Li4xMGNkYmEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDUt MTQgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgVmlkZW8gaXMg cmVzdW1lZCB3aXRoIG9sZCBwbGF5YmFjayByYXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS5odG1s OiBBZGRlZC4KKwogMjAxNC0wNS0xMyAgTG9yZW56byBUaWx2ZSAgPGx0aWx2ZUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjcyOTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACisKK1Rlc3QgdGhhdCBzZXR0aW5nICcwJyBwbGF5YmFja1JhdGUgd29ya3MgY29ycmVj dGx5LgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VYUEVDVEVEICh2aWRlby5jdXJyZW50VGlt ZSA9PSAnMCcpIE9LCitFWFBFQ1RFRCAodmlkZW8ucGF1c2VkID09ICdmYWxzZScpIE9LCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1y YXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWJkY2M0NwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBhdXNlZC0wLXJhdGUuaHRtbApAQCAtMCwwICsx LDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHRp bWVVcGRhdGVXYXNDYWxsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90 ZXN0Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50QW5kRmFpbCgnZW5kZWQnKTsKKyAg ICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCd0aW1ldXBkYXRlJywgdGltZXVw ZGF0ZSk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnY2FucGxheXRocm91Z2gn LCBjYW5QbGF5VGhyb3VnaCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNhblBsYXlUaHJvdWdoKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2aWRlby5w bGF5YmFja1JhdGUgPSAwOworICAgICAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGltZXVwZGF0ZSgpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCd2aWRlby5jdXJyZW50VGltZScsIDApOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywgZmFsc2UpOworICAg ICAgICAgICAgICAgIGlmKHRpbWVVcGRhdGVXYXNDYWxsZWQpCisgICAgICAgICAgICAgICAgICAg IGZhaWxUZXN0KCJUaW1lIHdhcyB1cGRhdGVkLCBidXQgc2hvdWxkIG5vdCBjaGFuZ2UuIik7Cisg ICAgICAgICAgICAgICAgdGltZVVwZGF0ZVdhc0NhbGxlZCA9IHRydWU7CisgICAgICAgICAgICAg ICAgc2V0VGltZW91dCgiZW5kVGVzdCgpIiwgMTUwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAg ICAgIDx2aWRlbz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0IHRoYXQgc2V0dGluZyAnMCcgcGxh eWJhY2tSYXRlIHdvcmtzIGNvcnJlY3RseS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGE3MTAxYTAuLmQyZTY1ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxNC0wNS0xNCAgUGlvdHIgR3JhZCAgPHAuZ3JhZEBzYW1zdW5nLmNvbT4KKworICAgICAgICBW aWRlbyBpcyByZXN1bWVkIHdpdGggb2xkIHBsYXliYWNrIHJhdGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nICcwJyBwbGF5YmFjayByYXRl IGlzIGNhdXNpbmcgcGlwZWxpbmUgdG8gcGF1c2UuCisgICAgICAgIEdTdHJlYW1lciBwbGF5ZXIg aW1wbC4gZXhwb3NlZCB0aGlzIGluZm9ybWF0aW9uIHRvIHVwcGVyIGxheWVycyBidXQgaXQgc2hv dWxkIG5vdC4KKyAgICAgICAgU29sdXRpb24gaXMgdG8gaGlkZGVuIHN1Y2ggc2l0dWF0aW9uIGJl aGluZCBtX3BsYXliYWNrUmF0ZVBhdXNlIGZsYWcuCisKKyAgICAgICAgVGVzdDogbWVkaWEvdmlk ZW8tcGF1c2VkLTAtcmF0ZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGxheSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhdXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlUGxh eWJhY2tSYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6cGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnVwZGF0ZVN0YXRlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDE0LTA1LTEzICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSBiYWNrZ3Jv dW5kLWF0dGFjaG1lbnQ6Zml4ZWQgYmVoYXZlcyB2ZXJ5IHBvb3JseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBiNjkxMWQyLi4zY2NkNGY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApA QCAtMTg5LDYgKzE4OSw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgLCBtX21lZGlhTG9j YXRpb25DdXJyZW50SW5kZXgoMCkKICAgICAsIG1fcmVzZXRQaXBlbGluZShmYWxzZSkKICAgICAs IG1fcGF1c2VkKHRydWUpCisgICAgLCBtX3BsYXliYWNrUmF0ZVBhdXNlKGZhbHNlKQogICAgICwg bV9zZWVraW5nKGZhbHNlKQogICAgICwgbV9zZWVrSXNQZW5kaW5nKGZhbHNlKQogICAgICwgbV90 aW1lT2ZPdmVybGFwcGluZ1NlZWsoLTEpCkBAIC00MDYsNiArNDA3LDExIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwcmVwYXJlVG9QbGF5KCkKIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBsYXkoKQogeworICAgIGlmKCFtX3BsYXliYWNrUmF0ZSkgewor ICAgICAgICBtX3BsYXliYWNrUmF0ZVBhdXNlID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKwogICAgIGlmIChjaGFuZ2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QTEFZSU5HKSkgewog ICAgICAgICBtX2lzRW5kUmVhY2hlZCA9IGZhbHNlOwogICAgICAgICBtX2RlbGF5aW5nTG9hZCA9 IGZhbHNlOwpAQCAtNDE5LDYgKzQyNSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpwbGF5KCkKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhdXNlKCkK IHsKKyAgICBtX3BsYXliYWNrUmF0ZVBhdXNlID0gZmFsc2U7CiAgICAgR3N0U3RhdGUgY3VycmVu dFN0YXRlLCBwZW5kaW5nU3RhdGU7CiAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRlKG1fcGxheUJp bi5nZXQoKSwgJmN1cnJlbnRTdGF0ZSwgJnBlbmRpbmdTdGF0ZSwgMCk7CiAgICAgaWYgKGN1cnJl bnRTdGF0ZSA8IEdTVF9TVEFURV9QQVVTRUQgJiYgcGVuZGluZ1N0YXRlIDw9IEdTVF9TVEFURV9Q QVVTRUQpCkBAIC01NTUsNiArNTYyLDEwIEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpkb1NlZWsoZ2ludDY0IHBvc2l0aW9uLCBmbG9hdCByYXRlLCBHc3RTZWVrRmxhCiAgICAg ICAgICAgICBlbmRUaW1lID0gcG9zaXRpb247CiAgICAgfQogCisgICAgaWYoIXJhdGUpCisgICAg ICAgIHJldHVybiBnc3RfZWxlbWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgMS4wLCBHU1RfRk9S TUFUX1RJTUUsIHNlZWtUeXBlLAorICAgICAgICAgICAgR1NUX1NFRUtfVFlQRV9TRVQsIHN0YXJ0 VGltZSwgR1NUX1NFRUtfVFlQRV9TRVQsIGVuZFRpbWUpOworCiAgICAgcmV0dXJuIGdzdF9lbGVt ZW50X3NlZWsobV9wbGF5QmluLmdldCgpLCByYXRlLCBHU1RfRk9STUFUX1RJTUUsIHNlZWtUeXBl LAogICAgICAgICBHU1RfU0VFS19UWVBFX1NFVCwgc3RhcnRUaW1lLCBHU1RfU0VFS19UWVBFX1NF VCwgZW5kVGltZSk7CiB9CkBAIC01ODcsNiArNTk4LDE3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjp1cGRhdGVQbGF5YmFja1JhdGUoKQogICAgICAgICBtX3BsYXliYWNrUmF0 ZSA9IG1fbGFzdFBsYXliYWNrUmF0ZTsKICAgICAgICAgRVJST1JfTUVESUFfTUVTU0FHRSgiU2V0 IHJhdGUgdG8gJWYgZmFpbGVkIiwgbV9wbGF5YmFja1JhdGUpOwogICAgIH0KKworICAgIGlmICht X3BsYXliYWNrUmF0ZVBhdXNlKSB7CisgICAgICAgIEdzdFN0YXRlIHN0YXRlOworICAgICAgICBH c3RTdGF0ZSBwZW5kaW5nOworCisgICAgICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlC aW4uZ2V0KCksICZzdGF0ZSwgJnBlbmRpbmcsIDApOworICAgICAgICBpZiAoc3RhdGUgIT0gR1NU X1NUQVRFX1BMQVlJTkcgJiYgcGVuZGluZyAhPSBHU1RfU1RBVEVfUExBWUlORykKKyAgICAgICAg ICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOworICAgICAgICBtX3Bs YXliYWNrUmF0ZVBhdXNlID0gZmFsc2U7CisgICAgfQorCiAgICAgbV9jaGFuZ2luZ1JhdGUgPSBm YWxzZTsKICAgICBtX3BsYXllci0+cmF0ZUNoYW5nZWQoKTsKIH0KQEAgLTU5OCw2ICs2MjAsOSBA QCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGF1c2VkKCkgY29uc3QKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQogCisgICAgaWYobV9wbGF5YmFja1JhdGVQYXVzZSkKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgR3N0U3RhdGUgc3RhdGU7CiAgICAgZ3N0X2VsZW1l bnRfZ2V0X3N0YXRlKG1fcGxheUJpbi5nZXQoKSwgJnN0YXRlLCAwLCAwKTsKICAgICByZXR1cm4g c3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRDsKQEAgLTc5OSwxNSArODI0LDE5IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRSYXRlKGZsb2F0IHJhdGUpCiAgICAgbV9jaGFu Z2luZ1JhdGUgPSB0cnVlOwogCiAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRlKG1fcGxheUJpbi5n ZXQoKSwgJnN0YXRlLCAmcGVuZGluZywgMCk7Ci0gICAgaWYgKChzdGF0ZSAhPSBHU1RfU1RBVEVf UExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVfUEFVU0VEKQotICAgICAgICB8fCAocGVuZGlu ZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKLSAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFyYXRl KSB7Ci0gICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCk7CisgICAg ICAgIG1fY2hhbmdpbmdSYXRlID0gZmFsc2U7CisgICAgICAgIG1fcGxheWJhY2tSYXRlUGF1c2Ug PSB0cnVlOworICAgICAgICBpZiAoc3RhdGUgIT0gR1NUX1NUQVRFX1BBVVNFRCAmJiBwZW5kaW5n ICE9IEdTVF9TVEFURV9QQVVTRUQpCisgICAgICAgICAgICBjaGFuZ2VQaXBlbGluZVN0YXRlKEdT VF9TVEFURV9QQVVTRUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKChzdGF0 ZSAhPSBHU1RfU1RBVEVfUExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVfUEFVU0VEKQorICAg ICAgICB8fCAocGVuZGluZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKKyAgICAgICAgcmV0dXJuOwor CiAgICAgdXBkYXRlUGxheWJhY2tSYXRlKCk7CiB9CiAKQEAgLTEzNzksMTQgKzE0MDgsMTQgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAgICAgICAg ICAgICAgICAgbV92b2x1bWVBbmRNdXRlSW5pdGlhbGl6ZWQgPSB0cnVlOwogICAgICAgICAgICAg fQogCi0gICAgICAgICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2J1ZmZlcmluZyAmJiAhbV9w YXVzZWQpIHsKKyAgICAgICAgICAgIGlmIChkaWRCdWZmZXJpbmcgJiYgIW1fYnVmZmVyaW5nICYm ICFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgewogICAgICAgICAgICAgICAgIExPR19NRURJ QV9NRVNTQUdFKCJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAgICAg ICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7CiAg ICAgICAgICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCi0gICAgICAgICAgICBpZiAobV9idWZmZXJp bmcgJiYgIWlzTGl2ZVN0cmVhbSgpKSB7CisgICAgICAgICAgICBpZiAoKG1fYnVmZmVyaW5nICYm ICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAgICAg TE9HX01FRElBX01FU1NBR0UoIltCdWZmZXJpbmddIFBhdXNpbmcgc3RyZWFtIGZvciBidWZmZXJp bmcuIik7CiAgICAgICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUEFV U0VEKTsKICAgICAgICAgICAgIH0KQEAgLTE0MjMsNyArMTQ1Miw3IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICB9IGVsc2UgaWYgKHN0 YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKQogICAgICAgICAgICAgbV9wYXVzZWQgPSBmYWxzZTsK IAotICAgICAgICBpZiAoIW1fcGF1c2VkKQorICAgICAgICBpZiAoIW1fcGF1c2VkICYmIG1fcGxh eWJhY2tSYXRlKQogICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExB WUlORyk7CiAKICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGluZzsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCAzNTFi ZTk1Li5hMTVmZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgcHJpdmF0ZToKICAgICBpbnQgbV9tZWRpYUxvY2F0 aW9uQ3VycmVudEluZGV4OwogICAgIGJvb2wgbV9yZXNldFBpcGVsaW5lOwogICAgIGJvb2wgbV9w YXVzZWQ7CisgICAgYm9vbCBtX3BsYXliYWNrUmF0ZVBhdXNlOwogICAgIGJvb2wgbV9zZWVraW5n OwogICAgIGJvb2wgbV9zZWVrSXNQZW5kaW5nOwogICAgIGZsb2F0IG1fdGltZU9mT3ZlcmxhcHBp bmdTZWVrOwo= 231449 2014-05-14 07:25:58 -0700 2014-05-14 07:34:10 -0700 Patch & layout test patch2.txt text/plain 8960 piotr.grad ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MTU3ODM1Li4xMGNkYmEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDUt MTQgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgVmlkZW8gaXMg cmVzdW1lZCB3aXRoIG9sZCBwbGF5YmFjayByYXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS5odG1s OiBBZGRlZC4KKwogMjAxNC0wNS0xMyAgTG9yZW56byBUaWx2ZSAgPGx0aWx2ZUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjcyOTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACisKK1Rlc3QgdGhhdCBzZXR0aW5nICcwJyBwbGF5YmFja1JhdGUgd29ya3MgY29ycmVj dGx5LgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VYUEVDVEVEICh2aWRlby5jdXJyZW50VGlt ZSA9PSAnMCcpIE9LCitFWFBFQ1RFRCAodmlkZW8ucGF1c2VkID09ICdmYWxzZScpIE9LCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1y YXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWJkY2M0NwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBhdXNlZC0wLXJhdGUuaHRtbApAQCAtMCwwICsx LDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHRp bWVVcGRhdGVXYXNDYWxsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90 ZXN0Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50QW5kRmFpbCgnZW5kZWQnKTsKKyAg ICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCd0aW1ldXBkYXRlJywgdGltZXVw ZGF0ZSk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnY2FucGxheXRocm91Z2gn LCBjYW5QbGF5VGhyb3VnaCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNhblBsYXlUaHJvdWdoKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2aWRlby5w bGF5YmFja1JhdGUgPSAwOworICAgICAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGltZXVwZGF0ZSgpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCd2aWRlby5jdXJyZW50VGltZScsIDApOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywgZmFsc2UpOworICAg ICAgICAgICAgICAgIGlmKHRpbWVVcGRhdGVXYXNDYWxsZWQpCisgICAgICAgICAgICAgICAgICAg IGZhaWxUZXN0KCJUaW1lIHdhcyB1cGRhdGVkLCBidXQgc2hvdWxkIG5vdCBjaGFuZ2UuIik7Cisg ICAgICAgICAgICAgICAgdGltZVVwZGF0ZVdhc0NhbGxlZCA9IHRydWU7CisgICAgICAgICAgICAg ICAgc2V0VGltZW91dCgiZW5kVGVzdCgpIiwgMTUwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAg ICAgIDx2aWRlbz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0IHRoYXQgc2V0dGluZyAnMCcgcGxh eWJhY2tSYXRlIHdvcmtzIGNvcnJlY3RseS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGE3MTAxYTAuLmQyZTY1ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxNC0wNS0xNCAgUGlvdHIgR3JhZCAgPHAuZ3JhZEBzYW1zdW5nLmNvbT4KKworICAgICAgICBW aWRlbyBpcyByZXN1bWVkIHdpdGggb2xkIHBsYXliYWNrIHJhdGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nICcwJyBwbGF5YmFjayByYXRl IGlzIGNhdXNpbmcgcGlwZWxpbmUgdG8gcGF1c2UuCisgICAgICAgIEdTdHJlYW1lciBwbGF5ZXIg aW1wbC4gZXhwb3NlZCB0aGlzIGluZm9ybWF0aW9uIHRvIHVwcGVyIGxheWVycyBidXQgaXQgc2hv dWxkIG5vdC4KKyAgICAgICAgU29sdXRpb24gaXMgdG8gaGlkZGVuIHN1Y2ggc2l0dWF0aW9uIGJl aGluZCBtX3BsYXliYWNrUmF0ZVBhdXNlIGZsYWcuCisKKyAgICAgICAgVGVzdDogbWVkaWEvdmlk ZW8tcGF1c2VkLTAtcmF0ZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGxheSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhdXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlUGxh eWJhY2tSYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6cGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnVwZGF0ZVN0YXRlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDE0LTA1LTEzICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSBiYWNrZ3Jv dW5kLWF0dGFjaG1lbnQ6Zml4ZWQgYmVoYXZlcyB2ZXJ5IHBvb3JseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBiNjkxMWQyLi4zZjkzNDgy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApA QCAtMTg5LDYgKzE4OSw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgLCBtX21lZGlhTG9j YXRpb25DdXJyZW50SW5kZXgoMCkKICAgICAsIG1fcmVzZXRQaXBlbGluZShmYWxzZSkKICAgICAs IG1fcGF1c2VkKHRydWUpCisgICAgLCBtX3BsYXliYWNrUmF0ZVBhdXNlKGZhbHNlKQogICAgICwg bV9zZWVraW5nKGZhbHNlKQogICAgICwgbV9zZWVrSXNQZW5kaW5nKGZhbHNlKQogICAgICwgbV90 aW1lT2ZPdmVybGFwcGluZ1NlZWsoLTEpCkBAIC00MDYsNiArNDA3LDExIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwcmVwYXJlVG9QbGF5KCkKIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBsYXkoKQogeworICAgIGlmICghbV9wbGF5YmFja1JhdGUpIHsK KyAgICAgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICBpZiAoY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORykpIHsK ICAgICAgICAgbV9pc0VuZFJlYWNoZWQgPSBmYWxzZTsKICAgICAgICAgbV9kZWxheWluZ0xvYWQg PSBmYWxzZTsKQEAgLTQxOSw2ICs0MjUsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6cGxheSgpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZSgp CiB7CisgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IGZhbHNlOwogICAgIEdzdFN0YXRlIGN1cnJl bnRTdGF0ZSwgcGVuZGluZ1N0YXRlOwogICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlC aW4uZ2V0KCksICZjdXJyZW50U3RhdGUsICZwZW5kaW5nU3RhdGUsIDApOwogICAgIGlmIChjdXJy ZW50U3RhdGUgPCBHU1RfU1RBVEVfUEFVU0VEICYmIHBlbmRpbmdTdGF0ZSA8PSBHU1RfU1RBVEVf UEFVU0VEKQpAQCAtNTU1LDYgKzU2MiwxMCBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6ZG9TZWVrKGdpbnQ2NCBwb3NpdGlvbiwgZmxvYXQgcmF0ZSwgR3N0U2Vla0ZsYQogICAg ICAgICAgICAgZW5kVGltZSA9IHBvc2l0aW9uOwogICAgIH0KIAorICAgIGlmICghcmF0ZSkKKyAg ICAgICAgcmV0dXJuIGdzdF9lbGVtZW50X3NlZWsobV9wbGF5QmluLmdldCgpLCAxLjAsIEdTVF9G T1JNQVRfVElNRSwgc2Vla1R5cGUsCisgICAgICAgICAgICBHU1RfU0VFS19UWVBFX1NFVCwgc3Rh cnRUaW1lLCBHU1RfU0VFS19UWVBFX1NFVCwgZW5kVGltZSk7CisKICAgICByZXR1cm4gZ3N0X2Vs ZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCksIHJhdGUsIEdTVF9GT1JNQVRfVElNRSwgc2Vla1R5 cGUsCiAgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzdGFydFRpbWUsIEdTVF9TRUVLX1RZUEVf U0VULCBlbmRUaW1lKTsKIH0KQEAgLTU4Nyw2ICs1OTgsMTcgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVBsYXliYWNrUmF0ZSgpCiAgICAgICAgIG1fcGxheWJhY2tS YXRlID0gbV9sYXN0UGxheWJhY2tSYXRlOwogICAgICAgICBFUlJPUl9NRURJQV9NRVNTQUdFKCJT ZXQgcmF0ZSB0byAlZiBmYWlsZWQiLCBtX3BsYXliYWNrUmF0ZSk7CiAgICAgfQorCisgICAgaWYg KG1fcGxheWJhY2tSYXRlUGF1c2UpIHsKKyAgICAgICAgR3N0U3RhdGUgc3RhdGU7CisgICAgICAg IEdzdFN0YXRlIHBlbmRpbmc7CisKKyAgICAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRlKG1fcGxh eUJpbi5nZXQoKSwgJnN0YXRlLCAmcGVuZGluZywgMCk7CisgICAgICAgIGlmIChzdGF0ZSAhPSBH U1RfU1RBVEVfUExBWUlORyAmJiBwZW5kaW5nICE9IEdTVF9TVEFURV9QTEFZSU5HKQorICAgICAg ICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORyk7CisgICAgICAgIG1f cGxheWJhY2tSYXRlUGF1c2UgPSBmYWxzZTsKKyAgICB9CisKICAgICBtX2NoYW5naW5nUmF0ZSA9 IGZhbHNlOwogICAgIG1fcGxheWVyLT5yYXRlQ2hhbmdlZCgpOwogfQpAQCAtNTk4LDYgKzYyMCw5 IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZWQoKSBjb25zdAogICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKKyAgICBpZiAobV9wbGF5YmFja1JhdGVQYXVzZSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgR3N0U3RhdGUgc3RhdGU7CiAgICAgZ3N0X2Vs ZW1lbnRfZ2V0X3N0YXRlKG1fcGxheUJpbi5nZXQoKSwgJnN0YXRlLCAwLCAwKTsKICAgICByZXR1 cm4gc3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRDsKQEAgLTc5OSwxNSArODI0LDE5IEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRSYXRlKGZsb2F0IHJhdGUpCiAgICAgbV9j aGFuZ2luZ1JhdGUgPSB0cnVlOwogCiAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRlKG1fcGxheUJp bi5nZXQoKSwgJnN0YXRlLCAmcGVuZGluZywgMCk7Ci0gICAgaWYgKChzdGF0ZSAhPSBHU1RfU1RB VEVfUExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVfUEFVU0VEKQotICAgICAgICB8fCAocGVu ZGluZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKLSAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFy YXRlKSB7Ci0gICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCk7Cisg ICAgICAgIG1fY2hhbmdpbmdSYXRlID0gZmFsc2U7CisgICAgICAgIG1fcGxheWJhY2tSYXRlUGF1 c2UgPSB0cnVlOworICAgICAgICBpZiAoc3RhdGUgIT0gR1NUX1NUQVRFX1BBVVNFRCAmJiBwZW5k aW5nICE9IEdTVF9TVEFURV9QQVVTRUQpCisgICAgICAgICAgICBjaGFuZ2VQaXBlbGluZVN0YXRl KEdTVF9TVEFURV9QQVVTRUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKChz dGF0ZSAhPSBHU1RfU1RBVEVfUExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVfUEFVU0VEKQor ICAgICAgICB8fCAocGVuZGluZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKKyAgICAgICAgcmV0dXJu OworCiAgICAgdXBkYXRlUGxheWJhY2tSYXRlKCk7CiB9CiAKQEAgLTEzNzksMTQgKzE0MDgsMTQg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAgICAg ICAgICAgICAgICAgbV92b2x1bWVBbmRNdXRlSW5pdGlhbGl6ZWQgPSB0cnVlOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2J1ZmZlcmluZyAmJiAh bV9wYXVzZWQpIHsKKyAgICAgICAgICAgIGlmIChkaWRCdWZmZXJpbmcgJiYgIW1fYnVmZmVyaW5n ICYmICFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgewogICAgICAgICAgICAgICAgIExPR19N RURJQV9NRVNTQUdFKCJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAg ICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAg ICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7 CiAgICAgICAgICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCi0gICAgICAgICAgICBpZiAobV9idWZm ZXJpbmcgJiYgIWlzTGl2ZVN0cmVhbSgpKSB7CisgICAgICAgICAgICBpZiAoKG1fYnVmZmVyaW5n ICYmICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAg ICAgTE9HX01FRElBX01FU1NBR0UoIltCdWZmZXJpbmddIFBhdXNpbmcgc3RyZWFtIGZvciBidWZm ZXJpbmcuIik7CiAgICAgICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVf UEFVU0VEKTsKICAgICAgICAgICAgIH0KQEAgLTE0MjMsNyArMTQ1Miw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICB9IGVsc2UgaWYg KHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKQogICAgICAgICAgICAgbV9wYXVzZWQgPSBmYWxz ZTsKIAotICAgICAgICBpZiAoIW1fcGF1c2VkKQorICAgICAgICBpZiAoIW1fcGF1c2VkICYmIG1f cGxheWJhY2tSYXRlKQogICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVf UExBWUlORyk7CiAKICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGlu ZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCAz NTFiZTk1Li5hMTVmZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgcHJpdmF0ZToKICAgICBpbnQgbV9tZWRpYUxv Y2F0aW9uQ3VycmVudEluZGV4OwogICAgIGJvb2wgbV9yZXNldFBpcGVsaW5lOwogICAgIGJvb2wg bV9wYXVzZWQ7CisgICAgYm9vbCBtX3BsYXliYWNrUmF0ZVBhdXNlOwogICAgIGJvb2wgbV9zZWVr aW5nOwogICAgIGJvb2wgbV9zZWVrSXNQZW5kaW5nOwogICAgIGZsb2F0IG1fdGltZU9mT3Zlcmxh cHBpbmdTZWVrOwo= 231451 2014-05-14 07:34:10 -0700 2014-05-21 13:48:49 -0700 Patch & layout test patch2.txt text/plain 8969 piotr.grad ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MTU3ODM1Li4xMGNkYmEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDUt MTQgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgVmlkZW8gaXMg cmVzdW1lZCB3aXRoIG9sZCBwbGF5YmFjayByYXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS5odG1s OiBBZGRlZC4KKwogMjAxNC0wNS0xMyAgTG9yZW56byBUaWx2ZSAgPGx0aWx2ZUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjcyOTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACisKK1Rlc3QgdGhhdCBzZXR0aW5nICcwJyBwbGF5YmFja1JhdGUgd29ya3MgY29ycmVj dGx5LgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VYUEVDVEVEICh2aWRlby5jdXJyZW50VGlt ZSA9PSAnMCcpIE9LCitFWFBFQ1RFRCAodmlkZW8ucGF1c2VkID09ICdmYWxzZScpIE9LCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1y YXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWJkY2M0NwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBhdXNlZC0wLXJhdGUuaHRtbApAQCAtMCwwICsx LDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHRp bWVVcGRhdGVXYXNDYWxsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90 ZXN0Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50QW5kRmFpbCgnZW5kZWQnKTsKKyAg ICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCd0aW1ldXBkYXRlJywgdGltZXVw ZGF0ZSk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnY2FucGxheXRocm91Z2gn LCBjYW5QbGF5VGhyb3VnaCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNhblBsYXlUaHJvdWdoKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2aWRlby5w bGF5YmFja1JhdGUgPSAwOworICAgICAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGltZXVwZGF0ZSgpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCd2aWRlby5jdXJyZW50VGltZScsIDApOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywgZmFsc2UpOworICAg ICAgICAgICAgICAgIGlmKHRpbWVVcGRhdGVXYXNDYWxsZWQpCisgICAgICAgICAgICAgICAgICAg IGZhaWxUZXN0KCJUaW1lIHdhcyB1cGRhdGVkLCBidXQgc2hvdWxkIG5vdCBjaGFuZ2UuIik7Cisg ICAgICAgICAgICAgICAgdGltZVVwZGF0ZVdhc0NhbGxlZCA9IHRydWU7CisgICAgICAgICAgICAg ICAgc2V0VGltZW91dCgiZW5kVGVzdCgpIiwgMTUwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAg ICAgIDx2aWRlbz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0IHRoYXQgc2V0dGluZyAnMCcgcGxh eWJhY2tSYXRlIHdvcmtzIGNvcnJlY3RseS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGE3MTAxYTAuLmQyZTY1ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxNC0wNS0xNCAgUGlvdHIgR3JhZCAgPHAuZ3JhZEBzYW1zdW5nLmNvbT4KKworICAgICAgICBW aWRlbyBpcyByZXN1bWVkIHdpdGggb2xkIHBsYXliYWNrIHJhdGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nICcwJyBwbGF5YmFjayByYXRl IGlzIGNhdXNpbmcgcGlwZWxpbmUgdG8gcGF1c2UuCisgICAgICAgIEdTdHJlYW1lciBwbGF5ZXIg aW1wbC4gZXhwb3NlZCB0aGlzIGluZm9ybWF0aW9uIHRvIHVwcGVyIGxheWVycyBidXQgaXQgc2hv dWxkIG5vdC4KKyAgICAgICAgU29sdXRpb24gaXMgdG8gaGlkZGVuIHN1Y2ggc2l0dWF0aW9uIGJl aGluZCBtX3BsYXliYWNrUmF0ZVBhdXNlIGZsYWcuCisKKyAgICAgICAgVGVzdDogbWVkaWEvdmlk ZW8tcGF1c2VkLTAtcmF0ZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGxheSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhdXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlUGxh eWJhY2tSYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6cGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnVwZGF0ZVN0YXRlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDE0LTA1LTEzICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSBiYWNrZ3Jv dW5kLWF0dGFjaG1lbnQ6Zml4ZWQgYmVoYXZlcyB2ZXJ5IHBvb3JseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBiNjkxMWQyLi43MjVlMjE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApA QCAtMTg5LDYgKzE4OSw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgLCBtX21lZGlhTG9j YXRpb25DdXJyZW50SW5kZXgoMCkKICAgICAsIG1fcmVzZXRQaXBlbGluZShmYWxzZSkKICAgICAs IG1fcGF1c2VkKHRydWUpCisgICAgLCBtX3BsYXliYWNrUmF0ZVBhdXNlKGZhbHNlKQogICAgICwg bV9zZWVraW5nKGZhbHNlKQogICAgICwgbV9zZWVrSXNQZW5kaW5nKGZhbHNlKQogICAgICwgbV90 aW1lT2ZPdmVybGFwcGluZ1NlZWsoLTEpCkBAIC00MDYsNiArNDA3LDExIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwcmVwYXJlVG9QbGF5KCkKIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBsYXkoKQogeworICAgIGlmICghbV9wbGF5YmFja1JhdGUpIHsK KyAgICAgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICBpZiAoY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORykpIHsK ICAgICAgICAgbV9pc0VuZFJlYWNoZWQgPSBmYWxzZTsKICAgICAgICAgbV9kZWxheWluZ0xvYWQg PSBmYWxzZTsKQEAgLTQxOSw2ICs0MjUsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6cGxheSgpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZSgp CiB7CisgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IGZhbHNlOwogICAgIEdzdFN0YXRlIGN1cnJl bnRTdGF0ZSwgcGVuZGluZ1N0YXRlOwogICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlC aW4uZ2V0KCksICZjdXJyZW50U3RhdGUsICZwZW5kaW5nU3RhdGUsIDApOwogICAgIGlmIChjdXJy ZW50U3RhdGUgPCBHU1RfU1RBVEVfUEFVU0VEICYmIHBlbmRpbmdTdGF0ZSA8PSBHU1RfU1RBVEVf UEFVU0VEKQpAQCAtNTU1LDYgKzU2MiwxMSBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6ZG9TZWVrKGdpbnQ2NCBwb3NpdGlvbiwgZmxvYXQgcmF0ZSwgR3N0U2Vla0ZsYQogICAg ICAgICAgICAgZW5kVGltZSA9IHBvc2l0aW9uOwogICAgIH0KIAorICAgIGlmICghcmF0ZSkgewor ICAgICAgICByZXR1cm4gZ3N0X2VsZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCksIDEuMCwgR1NU X0ZPUk1BVF9USU1FLCBzZWVrVHlwZSwKKyAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VULCBz dGFydFRpbWUsIEdTVF9TRUVLX1RZUEVfU0VULCBlbmRUaW1lKTsKKyAgICB9CisKICAgICByZXR1 cm4gZ3N0X2VsZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCksIHJhdGUsIEdTVF9GT1JNQVRfVElN RSwgc2Vla1R5cGUsCiAgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzdGFydFRpbWUsIEdTVF9T RUVLX1RZUEVfU0VULCBlbmRUaW1lKTsKIH0KQEAgLTU4Nyw2ICs1OTksMTcgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVBsYXliYWNrUmF0ZSgpCiAgICAgICAgIG1f cGxheWJhY2tSYXRlID0gbV9sYXN0UGxheWJhY2tSYXRlOwogICAgICAgICBFUlJPUl9NRURJQV9N RVNTQUdFKCJTZXQgcmF0ZSB0byAlZiBmYWlsZWQiLCBtX3BsYXliYWNrUmF0ZSk7CiAgICAgfQor CisgICAgaWYgKG1fcGxheWJhY2tSYXRlUGF1c2UpIHsKKyAgICAgICAgR3N0U3RhdGUgc3RhdGU7 CisgICAgICAgIEdzdFN0YXRlIHBlbmRpbmc7CisKKyAgICAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0 YXRlKG1fcGxheUJpbi5nZXQoKSwgJnN0YXRlLCAmcGVuZGluZywgMCk7CisgICAgICAgIGlmIChz dGF0ZSAhPSBHU1RfU1RBVEVfUExBWUlORyAmJiBwZW5kaW5nICE9IEdTVF9TVEFURV9QTEFZSU5H KQorICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORyk7Cisg ICAgICAgIG1fcGxheWJhY2tSYXRlUGF1c2UgPSBmYWxzZTsKKyAgICB9CisKICAgICBtX2NoYW5n aW5nUmF0ZSA9IGZhbHNlOwogICAgIG1fcGxheWVyLT5yYXRlQ2hhbmdlZCgpOwogfQpAQCAtNTk4 LDYgKzYyMSw5IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZWQoKSBj b25zdAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKKyAgICBpZiAobV9wbGF5YmFja1Jh dGVQYXVzZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgR3N0U3RhdGUgc3RhdGU7CiAg ICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRlKG1fcGxheUJpbi5nZXQoKSwgJnN0YXRlLCAwLCAwKTsK ICAgICByZXR1cm4gc3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRDsKQEAgLTc5OSwxNSArODI1LDE5 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRSYXRlKGZsb2F0IHJhdGUp CiAgICAgbV9jaGFuZ2luZ1JhdGUgPSB0cnVlOwogCiAgICAgZ3N0X2VsZW1lbnRfZ2V0X3N0YXRl KG1fcGxheUJpbi5nZXQoKSwgJnN0YXRlLCAmcGVuZGluZywgMCk7Ci0gICAgaWYgKChzdGF0ZSAh PSBHU1RfU1RBVEVfUExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVfUEFVU0VEKQotICAgICAg ICB8fCAocGVuZGluZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKLSAgICAgICAgcmV0dXJuOwogCiAg ICAgaWYgKCFyYXRlKSB7Ci0gICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BB VVNFRCk7CisgICAgICAgIG1fY2hhbmdpbmdSYXRlID0gZmFsc2U7CisgICAgICAgIG1fcGxheWJh Y2tSYXRlUGF1c2UgPSB0cnVlOworICAgICAgICBpZiAoc3RhdGUgIT0gR1NUX1NUQVRFX1BBVVNF RCAmJiBwZW5kaW5nICE9IEdTVF9TVEFURV9QQVVTRUQpCisgICAgICAgICAgICBjaGFuZ2VQaXBl bGluZVN0YXRlKEdTVF9TVEFURV9QQVVTRUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisg ICAgaWYgKChzdGF0ZSAhPSBHU1RfU1RBVEVfUExBWUlORyAmJiBzdGF0ZSAhPSBHU1RfU1RBVEVf UEFVU0VEKQorICAgICAgICB8fCAocGVuZGluZyA9PSBHU1RfU1RBVEVfUEFVU0VEKSkKKyAgICAg ICAgcmV0dXJuOworCiAgICAgdXBkYXRlUGxheWJhY2tSYXRlKCk7CiB9CiAKQEAgLTEzNzksMTQg KzE0MDksMTQgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRl cygpCiAgICAgICAgICAgICAgICAgbV92b2x1bWVBbmRNdXRlSW5pdGlhbGl6ZWQgPSB0cnVlOwog ICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2J1ZmZl cmluZyAmJiAhbV9wYXVzZWQpIHsKKyAgICAgICAgICAgIGlmIChkaWRCdWZmZXJpbmcgJiYgIW1f YnVmZmVyaW5nICYmICFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgewogICAgICAgICAgICAg ICAgIExPR19NRURJQV9NRVNTQUdFKCJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIp OwogICAgICAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcp OwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9Q TEFZSU5HKSB7CiAgICAgICAgICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCi0gICAgICAgICAgICBp ZiAobV9idWZmZXJpbmcgJiYgIWlzTGl2ZVN0cmVhbSgpKSB7CisgICAgICAgICAgICBpZiAoKG1f YnVmZmVyaW5nICYmICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CiAgICAg ICAgICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIltCdWZmZXJpbmddIFBhdXNpbmcgc3RyZWFt IGZvciBidWZmZXJpbmcuIik7CiAgICAgICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShH U1RfU1RBVEVfUEFVU0VEKTsKICAgICAgICAgICAgIH0KQEAgLTE0MjMsNyArMTQ1Myw3IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICB9 IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKQogICAgICAgICAgICAgbV9wYXVz ZWQgPSBmYWxzZTsKIAotICAgICAgICBpZiAoIW1fcGF1c2VkKQorICAgICAgICBpZiAoIW1fcGF1 c2VkICYmIG1fcGxheWJhY2tSYXRlKQogICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShH U1RfU1RBVEVfUExBWUlORyk7CiAKICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXll cjo6TG9hZGluZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu aAppbmRleCAzNTFiZTk1Li5hMTVmZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgcHJpdmF0ZToKICAgICBpbnQg bV9tZWRpYUxvY2F0aW9uQ3VycmVudEluZGV4OwogICAgIGJvb2wgbV9yZXNldFBpcGVsaW5lOwog ICAgIGJvb2wgbV9wYXVzZWQ7CisgICAgYm9vbCBtX3BsYXliYWNrUmF0ZVBhdXNlOwogICAgIGJv b2wgbV9zZWVraW5nOwogICAgIGJvb2wgbV9zZWVrSXNQZW5kaW5nOwogICAgIGZsb2F0IG1fdGlt ZU9mT3ZlcmxhcHBpbmdTZWVrOwo= 231840 2014-05-21 13:48:49 -0700 2014-05-22 07:58:28 -0700 Patch & layout test patch10.txt text/plain 8826 piotr.grad ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MTU3ODM1Li4xMGNkYmEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDUt MTQgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgVmlkZW8gaXMg cmVzdW1lZCB3aXRoIG9sZCBwbGF5YmFjayByYXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS5odG1s OiBBZGRlZC4KKwogMjAxNC0wNS0xMyAgTG9yZW56byBUaWx2ZSAgPGx0aWx2ZUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjcyOTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tcGF1c2VkLTAtcmF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACisKK1Rlc3QgdGhhdCBzZXR0aW5nICcwJyBwbGF5YmFja1JhdGUgd29ya3MgY29ycmVj dGx5LgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VYUEVDVEVEICh2aWRlby5jdXJyZW50VGlt ZSA9PSAnMCcpIE9LCitFWFBFQ1RFRCAodmlkZW8ucGF1c2VkID09ICdmYWxzZScpIE9LCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1y YXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wYXVzZWQtMC1yYXRlLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWJkY2M0NwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBhdXNlZC0wLXJhdGUuaHRtbApAQCAtMCwwICsx LDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHRp bWVVcGRhdGVXYXNDYWxsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90 ZXN0Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50QW5kRmFpbCgnZW5kZWQnKTsKKyAg ICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCd0aW1ldXBkYXRlJywgdGltZXVw ZGF0ZSk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnY2FucGxheXRocm91Z2gn LCBjYW5QbGF5VGhyb3VnaCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNhblBsYXlUaHJvdWdoKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2aWRlby5w bGF5YmFja1JhdGUgPSAwOworICAgICAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGltZXVwZGF0ZSgpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCd2aWRlby5jdXJyZW50VGltZScsIDApOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywgZmFsc2UpOworICAg ICAgICAgICAgICAgIGlmKHRpbWVVcGRhdGVXYXNDYWxsZWQpCisgICAgICAgICAgICAgICAgICAg IGZhaWxUZXN0KCJUaW1lIHdhcyB1cGRhdGVkLCBidXQgc2hvdWxkIG5vdCBjaGFuZ2UuIik7Cisg ICAgICAgICAgICAgICAgdGltZVVwZGF0ZVdhc0NhbGxlZCA9IHRydWU7CisgICAgICAgICAgICAg ICAgc2V0VGltZW91dCgiZW5kVGVzdCgpIiwgMTUwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAg ICAgIDx2aWRlbz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0IHRoYXQgc2V0dGluZyAnMCcgcGxh eWJhY2tSYXRlIHdvcmtzIGNvcnJlY3RseS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGE3MTAxYTAuLmQyZTY1ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxNC0wNS0xNCAgUGlvdHIgR3JhZCAgPHAuZ3JhZEBzYW1zdW5nLmNvbT4KKworICAgICAgICBW aWRlbyBpcyByZXN1bWVkIHdpdGggb2xkIHBsYXliYWNrIHJhdGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nICcwJyBwbGF5YmFjayByYXRl IGlzIGNhdXNpbmcgcGlwZWxpbmUgdG8gcGF1c2UuCisgICAgICAgIEdTdHJlYW1lciBwbGF5ZXIg aW1wbC4gZXhwb3NlZCB0aGlzIGluZm9ybWF0aW9uIHRvIHVwcGVyIGxheWVycyBidXQgaXQgc2hv dWxkIG5vdC4KKyAgICAgICAgU29sdXRpb24gaXMgdG8gaGlkZGVuIHN1Y2ggc2l0dWF0aW9uIGJl aGluZCBtX3BsYXliYWNrUmF0ZVBhdXNlIGZsYWcuCisKKyAgICAgICAgVGVzdDogbWVkaWEvdmlk ZW8tcGF1c2VkLTAtcmF0ZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGxheSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhdXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlUGxh eWJhY2tSYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6cGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnVwZGF0ZVN0YXRlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDE0LTA1LTEzICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSBiYWNrZ3Jv dW5kLWF0dGFjaG1lbnQ6Zml4ZWQgYmVoYXZlcyB2ZXJ5IHBvb3JseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBiNjkxMWQyLi5kYzYyNWE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApA QCAtMTg5LDYgKzE4OSw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgLCBtX21lZGlhTG9j YXRpb25DdXJyZW50SW5kZXgoMCkKICAgICAsIG1fcmVzZXRQaXBlbGluZShmYWxzZSkKICAgICAs IG1fcGF1c2VkKHRydWUpCisgICAgLCBtX3BsYXliYWNrUmF0ZVBhdXNlKGZhbHNlKQogICAgICwg bV9zZWVraW5nKGZhbHNlKQogICAgICwgbV9zZWVrSXNQZW5kaW5nKGZhbHNlKQogICAgICwgbV90 aW1lT2ZPdmVybGFwcGluZ1NlZWsoLTEpCkBAIC00MDYsNiArNDA3LDExIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwcmVwYXJlVG9QbGF5KCkKIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBsYXkoKQogeworICAgIGlmICghbV9wbGF5YmFja1JhdGUpIHsK KyAgICAgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICBpZiAoY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORykpIHsK ICAgICAgICAgbV9pc0VuZFJlYWNoZWQgPSBmYWxzZTsKICAgICAgICAgbV9kZWxheWluZ0xvYWQg PSBmYWxzZTsKQEAgLTQxOSw2ICs0MjUsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6cGxheSgpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZSgp CiB7CisgICAgbV9wbGF5YmFja1JhdGVQYXVzZSA9IGZhbHNlOwogICAgIEdzdFN0YXRlIGN1cnJl bnRTdGF0ZSwgcGVuZGluZ1N0YXRlOwogICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlC aW4uZ2V0KCksICZjdXJyZW50U3RhdGUsICZwZW5kaW5nU3RhdGUsIDApOwogICAgIGlmIChjdXJy ZW50U3RhdGUgPCBHU1RfU1RBVEVfUEFVU0VEICYmIHBlbmRpbmdTdGF0ZSA8PSBHU1RfU1RBVEVf UEFVU0VEKQpAQCAtNTU1LDYgKzU2Miw5IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpkb1NlZWsoZ2ludDY0IHBvc2l0aW9uLCBmbG9hdCByYXRlLCBHc3RTZWVrRmxhCiAgICAg ICAgICAgICBlbmRUaW1lID0gcG9zaXRpb247CiAgICAgfQogCisgICAgaWYgKCFyYXRlKQorICAg ICAgICByYXRlID0gMS4wOworCiAgICAgcmV0dXJuIGdzdF9lbGVtZW50X3NlZWsobV9wbGF5Qmlu LmdldCgpLCByYXRlLCBHU1RfRk9STUFUX1RJTUUsIHNlZWtUeXBlLAogICAgICAgICBHU1RfU0VF S19UWVBFX1NFVCwgc3RhcnRUaW1lLCBHU1RfU0VFS19UWVBFX1NFVCwgZW5kVGltZSk7CiB9CkBA IC01ODcsNiArNTk3LDE3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRh dGVQbGF5YmFja1JhdGUoKQogICAgICAgICBtX3BsYXliYWNrUmF0ZSA9IG1fbGFzdFBsYXliYWNr UmF0ZTsKICAgICAgICAgRVJST1JfTUVESUFfTUVTU0FHRSgiU2V0IHJhdGUgdG8gJWYgZmFpbGVk IiwgbV9wbGF5YmFja1JhdGUpOwogICAgIH0KKworICAgIGlmIChtX3BsYXliYWNrUmF0ZVBhdXNl KSB7CisgICAgICAgIEdzdFN0YXRlIHN0YXRlOworICAgICAgICBHc3RTdGF0ZSBwZW5kaW5nOwor CisgICAgICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlCaW4uZ2V0KCksICZzdGF0ZSwg JnBlbmRpbmcsIDApOworICAgICAgICBpZiAoc3RhdGUgIT0gR1NUX1NUQVRFX1BMQVlJTkcgJiYg cGVuZGluZyAhPSBHU1RfU1RBVEVfUExBWUlORykKKyAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5l U3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOworICAgICAgICBtX3BsYXliYWNrUmF0ZVBhdXNlID0g ZmFsc2U7CisgICAgfQorCiAgICAgbV9jaGFuZ2luZ1JhdGUgPSBmYWxzZTsKICAgICBtX3BsYXll ci0+cmF0ZUNoYW5nZWQoKTsKIH0KQEAgLTU5OCw2ICs2MTksOSBAQCBib29sIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6cGF1c2VkKCkgY29uc3QKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCisgICAgaWYgKG1fcGxheWJhY2tSYXRlUGF1c2UpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKwogICAgIEdzdFN0YXRlIHN0YXRlOwogICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3Bs YXlCaW4uZ2V0KCksICZzdGF0ZSwgMCwgMCk7CiAgICAgcmV0dXJuIHN0YXRlID09IEdTVF9TVEFU RV9QQVVTRUQ7CkBAIC03OTksMTUgKzgyMywxOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6c2V0UmF0ZShmbG9hdCByYXRlKQogICAgIG1fY2hhbmdpbmdSYXRlID0gdHJ1ZTsK IAogICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlCaW4uZ2V0KCksICZzdGF0ZSwgJnBl bmRpbmcsIDApOwotICAgIGlmICgoc3RhdGUgIT0gR1NUX1NUQVRFX1BMQVlJTkcgJiYgc3RhdGUg IT0gR1NUX1NUQVRFX1BBVVNFRCkKLSAgICAgICAgfHwgKHBlbmRpbmcgPT0gR1NUX1NUQVRFX1BB VVNFRCkpCi0gICAgICAgIHJldHVybjsKIAogICAgIGlmICghcmF0ZSkgewotICAgICAgICBjaGFu Z2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QQVVTRUQpOworICAgICAgICBtX2NoYW5naW5nUmF0 ZSA9IGZhbHNlOworICAgICAgICBtX3BsYXliYWNrUmF0ZVBhdXNlID0gdHJ1ZTsKKyAgICAgICAg aWYgKHN0YXRlICE9IEdTVF9TVEFURV9QQVVTRUQgJiYgcGVuZGluZyAhPSBHU1RfU1RBVEVfUEFV U0VEKQorICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUEFVU0VEKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIGlmICgoc3RhdGUgIT0gR1NUX1NUQVRFX1BM QVlJTkcgJiYgc3RhdGUgIT0gR1NUX1NUQVRFX1BBVVNFRCkKKyAgICAgICAgfHwgKHBlbmRpbmcg PT0gR1NUX1NUQVRFX1BBVVNFRCkpCisgICAgICAgIHJldHVybjsKKwogICAgIHVwZGF0ZVBsYXli YWNrUmF0ZSgpOwogfQogCkBAIC0xMzc5LDE0ICsxNDA3LDE0IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICAgICAgICAgIG1fdm9sdW1l QW5kTXV0ZUluaXRpYWxpemVkID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg aWYgKGRpZEJ1ZmZlcmluZyAmJiAhbV9idWZmZXJpbmcgJiYgIW1fcGF1c2VkKSB7CisgICAgICAg ICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2J1ZmZlcmluZyAmJiAhbV9wYXVzZWQgJiYgbV9w bGF5YmFja1JhdGUpIHsKICAgICAgICAgICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiW0J1ZmZl cmluZ10gUmVzdGFydGluZyBwbGF5YmFjay4iKTsKICAgICAgICAgICAgICAgICBjaGFuZ2VQaXBl bGluZVN0YXRlKEdTVF9TVEFURV9QTEFZSU5HKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBl bHNlIGlmIChzdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykgewogICAgICAgICAgICAgbV9wYXVz ZWQgPSBmYWxzZTsKIAotICAgICAgICAgICAgaWYgKG1fYnVmZmVyaW5nICYmICFpc0xpdmVTdHJl YW0oKSkgeworICAgICAgICAgICAgaWYgKChtX2J1ZmZlcmluZyAmJiAhaXNMaXZlU3RyZWFtKCkp IHx8ICFtX3BsYXliYWNrUmF0ZSkgewogICAgICAgICAgICAgICAgIExPR19NRURJQV9NRVNTQUdF KCJbQnVmZmVyaW5nXSBQYXVzaW5nIHN0cmVhbSBmb3IgYnVmZmVyaW5nLiIpOwogICAgICAgICAg ICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCk7CiAgICAgICAgICAg ICB9CkBAIC0xNDIzLDcgKzE0NTEsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PSBHU1RfU1RBVEVf UExBWUlORykKICAgICAgICAgICAgIG1fcGF1c2VkID0gZmFsc2U7CiAKLSAgICAgICAgaWYgKCFt X3BhdXNlZCkKKyAgICAgICAgaWYgKCFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkKICAgICAg ICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogCiAgICAgICAg IG1fbmV0d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6OkxvYWRpbmc7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggMzUxYmU5NS4uYTE1ZmZjZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTc3LDYg KzE3Nyw3IEBAIHByaXZhdGU6CiAgICAgaW50IG1fbWVkaWFMb2NhdGlvbkN1cnJlbnRJbmRleDsK ICAgICBib29sIG1fcmVzZXRQaXBlbGluZTsKICAgICBib29sIG1fcGF1c2VkOworICAgIGJvb2wg bV9wbGF5YmFja1JhdGVQYXVzZTsKICAgICBib29sIG1fc2Vla2luZzsKICAgICBib29sIG1fc2Vl a0lzUGVuZGluZzsKICAgICBmbG9hdCBtX3RpbWVPZk92ZXJsYXBwaW5nU2VlazsK