144615 2015-05-04 18:11:58 -0700 Small cleanup in RenderText::computePreferredLogicalWidths() 2015-05-05 00:50:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino esprehn+autocc glenn hyatt kondapallykalyan simon.fraser thorton oldest_to_newest 1091636 0 mmaxfield 2015-05-04 18:11:58 -0700 Small cleanup in RenderText::computePreferredLogicalWidths() 1091637 1 252359 mmaxfield 2015-05-04 18:13:03 -0700 Created attachment 252359 Patch 1091640 2 252359 mmaxfield 2015-05-04 18:18:17 -0700 Comment on attachment 252359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252359&action=review > Source/WebCore/rendering/RenderText.cpp:907 > + glyphOverflow.left = firstGlyphLeftOverflow.value(); could use valueOr() 1091645 3 252359 mmaxfield 2015-05-04 18:41:51 -0700 Comment on attachment 252359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252359&action=review > Source/WebCore/rendering/RenderText.cpp:867 > currMinWidth = 0; Unnecessary > Source/WebCore/rendering/RenderText.cpp:877 > currMinWidth = 0; Unnecessary 1091667 4 252365 mmaxfield 2015-05-04 19:58:29 -0700 Created attachment 252365 Patch for landing 1091688 5 252365 commit-queue 2015-05-04 20:52:27 -0700 Comment on attachment 252365 Patch for landing Rejecting attachment 252365 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 252365, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/5014590802886656 1091713 6 mmaxfield 2015-05-05 00:50:32 -0700 Committed r183799: <http://trac.webkit.org/changeset/183799> 252359 2015-05-04 18:13:03 -0700 2015-05-04 18:17:14 -0700 Patch bug-144615-20150504181148.patch text/plain 5006 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBjYWY5YTAzYjZkMjhl YzgzMjRhZjliMjcwYTcwMWRmNzAyZjEwYi4uOWNiNDYxMmJmMzhmYjAxYjk5ODIxYTJjNzQ3NGE2 ZTBmYWY0ODdiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTA0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgU21hbGwgY2xl YW51cCBpbiBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ2MTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGxpdHRsZSBiaXQg b2YgY2xlYW51cCBiZWZvcmUgSSB0YWNrbGUgZGVwZW5kZW50IHdpZHRocyBpbiB0aGlzIGZ1bmN0 aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9y IGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKwog MjAxNS0wNS0wNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBU b2dnbGluZyB1bmRlcmxpbmUgb3Igc3RyaWtlIHRocm91Z2ggYWZmZWN0cyBlYWNoIG90aGVyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggYmQwNzhiZDAzZmZiMDBl MTEzYTc5MzBjOTMxZDcxN2QzYTIwYTk3MC4uZGVkODJmZjBkYTk2ZGQwZWQ3OGZmMTQyMjAxOTFj OTFhZTQxODBhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAt NjkyLDcgKzY5Miw2IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX aWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgbV9lbmRNaW5XaWR0 aCA9IDA7CiAgICAgbV9tYXhXaWR0aCA9IDA7CiAKLSAgICBmbG9hdCBjdXJyTWluV2lkdGggPSAw OwogICAgIGZsb2F0IGN1cnJNYXhXaWR0aCA9IDA7CiAgICAgbV9oYXNCcmVha2FibGVDaGFyID0g ZmFsc2U7CiAgICAgbV9oYXNCcmVhayA9IGZhbHNlOwpAQCAtNzM1LDEzICs3MzQsMTUgQEAgdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBsZWFkV2lk dGgsIEhhc2hTZXQ8Y29uc3QgRm8KICAgICAgICAgICAgIG1pbmltdW1TdWZmaXhMZW5ndGggPSAy OwogICAgIH0KIAotICAgIGludCBmaXJzdEdseXBoTGVmdE92ZXJmbG93ID0gLTE7CisgICAgT3B0 aW9uYWw8aW50PiBmaXJzdEdseXBoTGVmdE92ZXJmbG93OwogCiAgICAgYm9vbCBicmVha05CU1Ag PSBzdHlsZS5hdXRvV3JhcCgpICYmIHN0eWxlLm5ic3BNb2RlKCkgPT0gU1BBQ0U7CiAgICAgYm9v bCBicmVha0FsbCA9IChzdHlsZS53b3JkQnJlYWsoKSA9PSBCcmVha0FsbFdvcmRCcmVhayB8fCBz dHlsZS53b3JkQnJlYWsoKSA9PSBCcmVha1dvcmRCcmVhaykgJiYgc3R5bGUuYXV0b1dyYXAoKTsK ICAgICBib29sIGlzTG9vc2VDSktNb2RlID0gYnJlYWtJdGVyYXRvci5pc0xvb3NlQ0pLTW9kZSgp OwogCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW47IGkrKykgeworICAgICAgICBmbG9hdCBj dXJyTWluV2lkdGggPSAwOworCiAgICAgICAgIFVDaGFyIGMgPSB1bmNoZWNrZWRDaGFyYWN0ZXJB dChpKTsKIAogICAgICAgICBib29sIHByZXZpb3VzQ2hhcmFjdGVySXNTcGFjZSA9IGlzU3BhY2U7 CkBAIC03NjgsMTEgKzc2OSw4IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgIGlm ICgoaXNTcGFjZSB8fCBpc05ld2xpbmUpICYmIGkgPT0gbGVuIC0gMSkKICAgICAgICAgICAgIG1f aGFzRW5kV1MgPSB0cnVlOwogCi0gICAgICAgIGlmICghaWdub3JpbmdTcGFjZXMgJiYgc3R5bGUu Y29sbGFwc2VXaGl0ZVNwYWNlKCkgJiYgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlICYmIGlzU3Bh Y2UpCi0gICAgICAgICAgICBpZ25vcmluZ1NwYWNlcyA9IHRydWU7Ci0KLSAgICAgICAgaWYgKGln bm9yaW5nU3BhY2VzICYmICFpc1NwYWNlKQotICAgICAgICAgICAgaWdub3JpbmdTcGFjZXMgPSBm YWxzZTsKKyAgICAgICAgaWdub3JpbmdTcGFjZXMgfD0gc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNl KCkgJiYgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlICYmIGlzU3BhY2U7CisgICAgICAgIGlnbm9y aW5nU3BhY2VzICY9IGlzU3BhY2U7CiAKICAgICAgICAgLy8gSWdub3JlIHNwYWNlcyBhbmQgc29m dCBoeXBoZW5zCiAgICAgICAgIGlmIChpZ25vcmluZ1NwYWNlcykgewpAQCAtNzgxLDcgKzc3OSw3 IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQg bGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfSBlbHNlIGlmIChjID09IHNvZnRIeXBoZW4gJiYgc3R5bGUuaHlwaGVucygpICE9IEh5cGhl bnNOb25lKSB7CiAgICAgICAgICAgICBjdXJyTWF4V2lkdGggKz0gd2lkdGhGcm9tQ2FjaGUoZm9u dCwgbGFzdFdvcmRCb3VuZGFyeSwgaSAtIGxhc3RXb3JkQm91bmRhcnksIGxlYWRXaWR0aCArIGN1 cnJNYXhXaWR0aCwgJmZhbGxiYWNrRm9udHMsICZnbHlwaE92ZXJmbG93LCBzdHlsZSk7Ci0gICAg ICAgICAgICBpZiAoZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA8IDApCisgICAgICAgICAgICBpZiAo IWZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cpCiAgICAgICAgICAgICAgICAgZmlyc3RHbHlwaExlZnRP dmVyZmxvdyA9IGdseXBoT3ZlcmZsb3cubGVmdDsKICAgICAgICAgICAgIGxhc3RXb3JkQm91bmRh cnkgPSBpICsgMTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtODM0LDcgKzgzMiw3IEBAIHZv aWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdp ZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgICAgICAgICAgICAgIG1heFdvcmRXaWR0aCA9 IHc7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmIChmaXJzdEdseXBoTGVmdE92ZXJm bG93IDwgMCkKKyAgICAgICAgICAgIGlmICghZmlyc3RHbHlwaExlZnRPdmVyZmxvdykKICAgICAg ICAgICAgICAgICBmaXJzdEdseXBoTGVmdE92ZXJmbG93ID0gZ2x5cGhPdmVyZmxvdy5sZWZ0Owog ICAgICAgICAgICAgY3Vyck1pbldpZHRoICs9IHc7CiAgICAgICAgICAgICBpZiAoYmV0d2Vlbldv cmRzKSB7CkBAIC04NjUsOCArODYzLDcgQEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVy cmVkTG9naWNhbFdpZHRocyhmbG9hdCBsZWFkV2lkdGgsIEhhc2hTZXQ8Y29uc3QgRm8KICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIG1fZW5kTWluV2lkdGggPSBjdXJyTWluV2lkdGg7CiAKLSAg ICAgICAgICAgIGlmIChjdXJyTWluV2lkdGggPiBtX21pbldpZHRoKQotICAgICAgICAgICAgICAg IG1fbWluV2lkdGggPSBjdXJyTWluV2lkdGg7CisgICAgICAgICAgICBtX21pbldpZHRoID0gc3Rk OjptYXgoY3Vyck1pbldpZHRoLCBtX21pbldpZHRoKTsKICAgICAgICAgICAgIGN1cnJNaW5XaWR0 aCA9IDA7CiAKICAgICAgICAgICAgIGkgKz0gd29yZExlbiAtIDE7CkBAIC04NzYsOCArODczLDcg QEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBs ZWFkV2lkdGgsIEhhc2hTZXQ8Y29uc3QgRm8KICAgICAgICAgICAgIGlmIChzdHlsZS5hdXRvV3Jh cCgpIHx8IGlzTmV3bGluZSkKICAgICAgICAgICAgICAgICBtX2hhc0JyZWFrYWJsZUNoYXIgPSB0 cnVlOwogCi0gICAgICAgICAgICBpZiAoY3Vyck1pbldpZHRoID4gbV9taW5XaWR0aCkKLSAgICAg ICAgICAgICAgICBtX21pbldpZHRoID0gY3Vyck1pbldpZHRoOworICAgICAgICAgICAgbV9taW5X aWR0aCA9IHN0ZDo6bWF4KGN1cnJNaW5XaWR0aCwgbV9taW5XaWR0aCk7CiAgICAgICAgICAgICBj dXJyTWluV2lkdGggPSAwOwogCiAgICAgICAgICAgICBpZiAoaXNOZXdsaW5lKSB7IC8vIE9ubHkg c2V0IGlmIHByZXNlcnZlTmV3bGluZSB3YXMgdHJ1ZSBhbmQgd2Ugc2F3IGEgbmV3bGluZS4KQEAg LTkwNywxMyArOTAzLDEyIEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2lj YWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgIH0KICAg ICB9CiAKLSAgICBpZiAoZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA+IDApCi0gICAgICAgIGdseXBo T3ZlcmZsb3cubGVmdCA9IGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3c7CisgICAgaWYgKGZpcnN0R2x5 cGhMZWZ0T3ZlcmZsb3cpCisgICAgICAgIGdseXBoT3ZlcmZsb3cubGVmdCA9IGZpcnN0R2x5cGhM ZWZ0T3ZlcmZsb3cudmFsdWUoKTsKIAogICAgIGlmICgobmVlZHNXb3JkU3BhY2luZyAmJiBsZW4g PiAxKSB8fCAoaWdub3JpbmdTcGFjZXMgJiYgIWZpcnN0V29yZCkpCiAgICAgICAgIGN1cnJNYXhX aWR0aCArPSB3b3JkU3BhY2luZzsKIAotICAgIG1fbWluV2lkdGggPSBzdGQ6Om1heChjdXJyTWlu V2lkdGgsIG1fbWluV2lkdGgpOwogICAgIG1fbWF4V2lkdGggPSBzdGQ6Om1heChjdXJyTWF4V2lk dGgsIG1fbWF4V2lkdGgpOwogCiAgICAgaWYgKCFzdHlsZS5hdXRvV3JhcCgpKQo= 252365 2015-05-04 19:58:29 -0700 2015-05-04 20:52:27 -0700 Patch for landing bug-144615-20150504195714.patch text/plain 6147 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBjYWY5YTAzYjZkMjhl YzgzMjRhZjliMjcwYTcwMWRmNzAyZjEwYi4uOWNiNDYxMmJmMzhmYjAxYjk5ODIxYTJjNzQ3NGE2 ZTBmYWY0ODdiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTA0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgU21hbGwgY2xl YW51cCBpbiBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ2MTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGxpdHRsZSBiaXQg b2YgY2xlYW51cCBiZWZvcmUgSSB0YWNrbGUgZGVwZW5kZW50IHdpZHRocyBpbiB0aGlzIGZ1bmN0 aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9y IGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKwog MjAxNS0wNS0wNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBU b2dnbGluZyB1bmRlcmxpbmUgb3Igc3RyaWtlIHRocm91Z2ggYWZmZWN0cyBlYWNoIG90aGVyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggYmQwNzhiZDAzZmZiMDBl MTEzYTc5MzBjOTMxZDcxN2QzYTIwYTk3MC4uNTg0M2RhMWY1ZTA2MGY0ODg0ZDhmNjIxNDRjMDgw YzY2N2I3MzdlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAt NjkyLDcgKzY5Miw2IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX aWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgbV9lbmRNaW5XaWR0 aCA9IDA7CiAgICAgbV9tYXhXaWR0aCA9IDA7CiAKLSAgICBmbG9hdCBjdXJyTWluV2lkdGggPSAw OwogICAgIGZsb2F0IGN1cnJNYXhXaWR0aCA9IDA7CiAgICAgbV9oYXNCcmVha2FibGVDaGFyID0g ZmFsc2U7CiAgICAgbV9oYXNCcmVhayA9IGZhbHNlOwpAQCAtNzM1LDcgKzczNCw3IEBAIHZvaWQg UmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRo LCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgICAgICBtaW5pbXVtU3VmZml4TGVuZ3RoID0gMjsK ICAgICB9CiAKLSAgICBpbnQgZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA9IC0xOworICAgIE9wdGlv bmFsPGludD4gZmlyc3RHbHlwaExlZnRPdmVyZmxvdzsKIAogICAgIGJvb2wgYnJlYWtOQlNQID0g c3R5bGUuYXV0b1dyYXAoKSAmJiBzdHlsZS5uYnNwTW9kZSgpID09IFNQQUNFOwogICAgIGJvb2wg YnJlYWtBbGwgPSAoc3R5bGUud29yZEJyZWFrKCkgPT0gQnJlYWtBbGxXb3JkQnJlYWsgfHwgc3R5 bGUud29yZEJyZWFrKCkgPT0gQnJlYWtXb3JkQnJlYWspICYmIHN0eWxlLmF1dG9XcmFwKCk7CkBA IC03NjgsMTEgKzc2Nyw4IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2lj YWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgIGlmICgo aXNTcGFjZSB8fCBpc05ld2xpbmUpICYmIGkgPT0gbGVuIC0gMSkKICAgICAgICAgICAgIG1faGFz RW5kV1MgPSB0cnVlOwogCi0gICAgICAgIGlmICghaWdub3JpbmdTcGFjZXMgJiYgc3R5bGUuY29s bGFwc2VXaGl0ZVNwYWNlKCkgJiYgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlICYmIGlzU3BhY2Up Ci0gICAgICAgICAgICBpZ25vcmluZ1NwYWNlcyA9IHRydWU7Ci0KLSAgICAgICAgaWYgKGlnbm9y aW5nU3BhY2VzICYmICFpc1NwYWNlKQotICAgICAgICAgICAgaWdub3JpbmdTcGFjZXMgPSBmYWxz ZTsKKyAgICAgICAgaWdub3JpbmdTcGFjZXMgfD0gc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkg JiYgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlICYmIGlzU3BhY2U7CisgICAgICAgIGlnbm9yaW5n U3BhY2VzICY9IGlzU3BhY2U7CiAKICAgICAgICAgLy8gSWdub3JlIHNwYWNlcyBhbmQgc29mdCBo eXBoZW5zCiAgICAgICAgIGlmIChpZ25vcmluZ1NwYWNlcykgewpAQCAtNzgxLDcgKzc3Nyw3IEBA IHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVh ZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fSBlbHNlIGlmIChjID09IHNvZnRIeXBoZW4gJiYgc3R5bGUuaHlwaGVucygpICE9IEh5cGhlbnNO b25lKSB7CiAgICAgICAgICAgICBjdXJyTWF4V2lkdGggKz0gd2lkdGhGcm9tQ2FjaGUoZm9udCwg bGFzdFdvcmRCb3VuZGFyeSwgaSAtIGxhc3RXb3JkQm91bmRhcnksIGxlYWRXaWR0aCArIGN1cnJN YXhXaWR0aCwgJmZhbGxiYWNrRm9udHMsICZnbHlwaE92ZXJmbG93LCBzdHlsZSk7Ci0gICAgICAg ICAgICBpZiAoZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA8IDApCisgICAgICAgICAgICBpZiAoIWZp cnN0R2x5cGhMZWZ0T3ZlcmZsb3cpCiAgICAgICAgICAgICAgICAgZmlyc3RHbHlwaExlZnRPdmVy ZmxvdyA9IGdseXBoT3ZlcmZsb3cubGVmdDsKICAgICAgICAgICAgIGxhc3RXb3JkQm91bmRhcnkg PSBpICsgMTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtODA1LDYgKzgwMSw3IEBAIHZvaWQg UmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRo LCBIYXNoU2V0PGNvbnN0IEZvCiAKICAgICAgICAgaW50IHdvcmRMZW4gPSBqIC0gaTsKICAgICAg ICAgaWYgKHdvcmRMZW4pIHsKKyAgICAgICAgICAgIGZsb2F0IGN1cnJNaW5XaWR0aCA9IDA7CiAg ICAgICAgICAgICBib29sIGlzU3BhY2UgPSAoaiA8IGxlbikgJiYgaXNTcGFjZUFjY29yZGluZ1Rv U3R5bGUoYywgc3R5bGUpOwogICAgICAgICAgICAgZmxvYXQgdzsKICAgICAgICAgICAgIGlmICh3 b3JkVHJhaWxpbmdTcGFjZVdpZHRoICYmIGlzU3BhY2UpCkBAIC04MTIsNyArODA5LDcgQEAgdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBsZWFkV2lk dGgsIEhhc2hTZXQ8Y29uc3QgRm8KICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAg IHcgPSB3aWR0aEZyb21DYWNoZShmb250LCBpLCB3b3JkTGVuLCBsZWFkV2lkdGggKyBjdXJyTWF4 V2lkdGgsICZmYWxsYmFja0ZvbnRzLCAmZ2x5cGhPdmVyZmxvdywgc3R5bGUpOwogICAgICAgICAg ICAgICAgIGlmIChjID09IHNvZnRIeXBoZW4gJiYgc3R5bGUuaHlwaGVucygpICE9IEh5cGhlbnNO b25lKQotICAgICAgICAgICAgICAgICAgICBjdXJyTWluV2lkdGggKz0gaHlwaGVuV2lkdGgodGhp cywgZm9udCk7CisgICAgICAgICAgICAgICAgICAgIGN1cnJNaW5XaWR0aCA9IGh5cGhlbldpZHRo KHRoaXMsIGZvbnQpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAodyA+IG1heFdv cmRXaWR0aCkgewpAQCAtODM0LDcgKzgzMSw3IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVBy ZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAg ICAgICAgICAgICAgICAgICAgIG1heFdvcmRXaWR0aCA9IHc7CiAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgIGlmIChmaXJzdEdseXBoTGVmdE92ZXJmbG93IDwgMCkKKyAgICAgICAgICAgIGlm ICghZmlyc3RHbHlwaExlZnRPdmVyZmxvdykKICAgICAgICAgICAgICAgICBmaXJzdEdseXBoTGVm dE92ZXJmbG93ID0gZ2x5cGhPdmVyZmxvdy5sZWZ0OwogICAgICAgICAgICAgY3Vyck1pbldpZHRo ICs9IHc7CiAgICAgICAgICAgICBpZiAoYmV0d2VlbldvcmRzKSB7CkBAIC04NTEsNyArODQ4LDcg QEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBs ZWFkV2lkdGgsIEhhc2hTZXQ8Y29uc3QgRm8KIAogICAgICAgICAgICAgLy8gQWRkIGluIHdvcmRT cGFjaW5nIHRvIG91ciBjdXJyTWF4V2lkdGgsIGJ1dCBub3QgaWYgdGhpcyBpcyB0aGUgbGFzdCB3 b3JkIG9uIGEgbGluZSBvciB0aGUKICAgICAgICAgICAgIC8vIGxhc3Qgd29yZCBpbiB0aGUgcnVu LgotICAgICAgICAgICAgaWYgKHdvcmRTcGFjaW5nICYmIChpc1NwYWNlIHx8IGlzQ29sbGFwc2li bGVXaGl0ZVNwYWNlKSAmJiAhY29udGFpbnNPbmx5V2hpdGVzcGFjZShqLCBsZW4taikpCisgICAg ICAgICAgICBpZiAoKGlzU3BhY2UgfHwgaXNDb2xsYXBzaWJsZVdoaXRlU3BhY2UpICYmICFjb250 YWluc09ubHlXaGl0ZXNwYWNlKGosIGxlbi1qKSkKICAgICAgICAgICAgICAgICBjdXJyTWF4V2lk dGggKz0gd29yZFNwYWNpbmc7CiAKICAgICAgICAgICAgIGlmIChmaXJzdFdvcmQpIHsKQEAgLTg2 NSw5ICs4NjIsNyBAQCB2b2lkIFJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lk dGhzKGZsb2F0IGxlYWRXaWR0aCwgSGFzaFNldDxjb25zdCBGbwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgbV9lbmRNaW5XaWR0aCA9IGN1cnJNaW5XaWR0aDsKIAotICAgICAgICAgICAgaWYg KGN1cnJNaW5XaWR0aCA+IG1fbWluV2lkdGgpCi0gICAgICAgICAgICAgICAgbV9taW5XaWR0aCA9 IGN1cnJNaW5XaWR0aDsKLSAgICAgICAgICAgIGN1cnJNaW5XaWR0aCA9IDA7CisgICAgICAgICAg ICBtX21pbldpZHRoID0gc3RkOjptYXgoY3Vyck1pbldpZHRoLCBtX21pbldpZHRoKTsKIAogICAg ICAgICAgICAgaSArPSB3b3JkTGVuIC0gMTsKICAgICAgICAgfSBlbHNlIHsKQEAgLTg3NiwxMCAr ODcxLDYgQEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhm bG9hdCBsZWFkV2lkdGgsIEhhc2hTZXQ8Y29uc3QgRm8KICAgICAgICAgICAgIGlmIChzdHlsZS5h dXRvV3JhcCgpIHx8IGlzTmV3bGluZSkKICAgICAgICAgICAgICAgICBtX2hhc0JyZWFrYWJsZUNo YXIgPSB0cnVlOwogCi0gICAgICAgICAgICBpZiAoY3Vyck1pbldpZHRoID4gbV9taW5XaWR0aCkK LSAgICAgICAgICAgICAgICBtX21pbldpZHRoID0gY3Vyck1pbldpZHRoOwotICAgICAgICAgICAg Y3Vyck1pbldpZHRoID0gMDsKLQogICAgICAgICAgICAgaWYgKGlzTmV3bGluZSkgeyAvLyBPbmx5 IHNldCBpZiBwcmVzZXJ2ZU5ld2xpbmUgd2FzIHRydWUgYW5kIHdlIHNhdyBhIG5ld2xpbmUuCiAg ICAgICAgICAgICAgICAgaWYgKGZpcnN0TGluZSkgewogICAgICAgICAgICAgICAgICAgICBmaXJz dExpbmUgPSBmYWxzZTsKQEAgLTkwNywxMyArODk4LDExIEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29t cHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0 IEZvCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA+ IDApCi0gICAgICAgIGdseXBoT3ZlcmZsb3cubGVmdCA9IGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3c7 CisgICAgZ2x5cGhPdmVyZmxvdy5sZWZ0ID0gZmlyc3RHbHlwaExlZnRPdmVyZmxvdy52YWx1ZU9y KGdseXBoT3ZlcmZsb3cubGVmdCk7CiAKICAgICBpZiAoKG5lZWRzV29yZFNwYWNpbmcgJiYgbGVu ID4gMSkgfHwgKGlnbm9yaW5nU3BhY2VzICYmICFmaXJzdFdvcmQpKQogICAgICAgICBjdXJyTWF4 V2lkdGggKz0gd29yZFNwYWNpbmc7CiAKLSAgICBtX21pbldpZHRoID0gc3RkOjptYXgoY3Vyck1p bldpZHRoLCBtX21pbldpZHRoKTsKICAgICBtX21heFdpZHRoID0gc3RkOjptYXgoY3Vyck1heFdp ZHRoLCBtX21heFdpZHRoKTsKIAogICAgIGlmICghc3R5bGUuYXV0b1dyYXAoKSkK