97577 2012-09-25 10:45:51 -0700 [CSSRegions]Refactor RenderFlowThread::contentLogical(Width/Height/Left)OfFirstRegion 2012-09-27 00:52:54 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea mihnea eric webkit.review.bot oldest_to_newest 727782 0 mihnea 2012-09-25 10:45:51 -0700 Make all of them use RenderFlowThread::firstRegion() instead of duplicating code. 727787 1 165641 mihnea 2012-09-25 10:53:02 -0700 Created attachment 165641 Patch 728553 2 165641 kling 2012-09-26 07:52:44 -0700 Comment on attachment 165641 Patch r=me 728579 3 165641 webkit.review.bot 2012-09-26 08:20:11 -0700 Comment on attachment 165641 Patch Rejecting attachment 165641 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Reorder Qt WebCore includes When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/14036446 729222 4 165932 mihnea 2012-09-26 22:58:18 -0700 Created attachment 165932 Patch for landing 729291 5 165932 webkit.review.bot 2012-09-27 00:52:51 -0700 Comment on attachment 165932 Patch for landing Clearing flags on attachment: 165932 Committed r129733: <http://trac.webkit.org/changeset/129733> 729292 6 webkit.review.bot 2012-09-27 00:52:54 -0700 All reviewed patches have been landed. Closing bug. 165641 2012-09-25 10:53:02 -0700 2012-09-26 22:58:13 -0700 Patch 97577.patch text/plain 4270 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjY2M1ZTEzLi4yZDBmZmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDktMjUgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdUmVmYWN0b3IgUmVuZGVyRmxvd1RocmVhZDo6Y29udGVudExvZ2lj YWwoV2lkdGgvSGVpZ2h0L0xlZnQpT2ZGaXJzdFJlZ2lvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJGbG93VGhyZWFkIG1ldGhvZHMgY29udGVu dExvZ2ljYWxXaWR0aE9mRmlyc3RSZWdpb24sIGNvbnRlbnRMb2dpY2FsSGVpZ2h0T2ZGaXJzdFJl Z2lvbiwgY29udGVudExvZ2ljYWxMZWZ0T2ZGaXJzdFJlZ2lvbgorICAgICAgICB3ZXJlIHVzaW5n IGNvZGUgdG8gZ2V0IHRoZSBmaXJzdCB2YWxpZCByZWdpb24gYXNzb2NpYXRlZCB3aXRoIHRoZSBm bG93LiBXZSBjYW4gdXNlIFJlbmRlckZsb3dUaHJlYWQ6OmZpcnN0UmVnaW9uKCkgbWV0aG9kIGlu c3RlYWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMganVzdCByZWZhY3Rvcmlu ZyBvZiBleGlzdGluZyBjb2RlLCB0aGUgY2hhbmdlIGlzIGNvdmVyZWQgYnkgZXhpc3RpbmcgcmVn aW9ucyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmNvbnRlbnRMb2dpY2FsV2lkdGhP ZkZpcnN0UmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmNvbnRl bnRMb2dpY2FsSGVpZ2h0T2ZGaXJzdFJlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG bG93VGhyZWFkOjpjb250ZW50TG9naWNhbExlZnRPZkZpcnN0UmVnaW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmZpcnN0UmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckZsb3dUaHJlYWQ6Omxhc3RSZWdpb24pOgorCiAyMDEyLTA5LTI1ICBPdHRvIERlcmVr IENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFJldmVy dGluZyBpbXBsZW1lbnRhdGlvbiBmb3IgNDA3IGVycm9yIHBhZ2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKaW5kZXggZDVhOTliNy4uMDlhZGI3MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcApAQCAt NDg3LDQ0ICs0ODcsMjYgQEAgYm9vbCBSZW5kZXJGbG93VGhyZWFkOjpsb2dpY2FsV2lkdGhDaGFu Z2VkSW5SZWdpb25zKGNvbnN0IFJlbmRlckJsb2NrKiBibG9jaywgTGEKIAogTGF5b3V0VW5pdCBS ZW5kZXJGbG93VGhyZWFkOjpjb250ZW50TG9naWNhbFdpZHRoT2ZGaXJzdFJlZ2lvbigpIGNvbnN0 CiB7Ci0gICAgaWYgKCFoYXNWYWxpZFJlZ2lvbkluZm8oKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0g ICAgZm9yIChSZW5kZXJSZWdpb25MaXN0Ojpjb25zdF9pdGVyYXRvciBpdGVyID0gbV9yZWdpb25M aXN0LmJlZ2luKCk7IGl0ZXIgIT0gbV9yZWdpb25MaXN0LmVuZCgpOyArK2l0ZXIpIHsKLSAgICAg ICAgUmVuZGVyUmVnaW9uKiByZWdpb24gPSAqaXRlcjsKLSAgICAgICAgaWYgKCFyZWdpb24tPmlz VmFsaWQoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICByZXR1cm4gaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA/IHJlZ2lvbi0+Y29udGVudFdpZHRoKCkgOiByZWdpb24tPmNvbnRl bnRIZWlnaHQoKTsKLSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJu IDA7CisgICAgUmVuZGVyUmVnaW9uKiBmaXJzdFZhbGlkUmVnaW9uSW5GbG93ID0gZmlyc3RSZWdp b24oKTsKKyAgICBpZiAoIWZpcnN0VmFsaWRSZWdpb25JbkZsb3cpCisgICAgICAgIHJldHVybiBa RVJPX0xBWU9VVF9VTklUOworICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8g Zmlyc3RWYWxpZFJlZ2lvbkluRmxvdy0+Y29udGVudFdpZHRoKCkgOiBmaXJzdFZhbGlkUmVnaW9u SW5GbG93LT5jb250ZW50SGVpZ2h0KCk7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyRmxvd1RocmVh ZDo6Y29udGVudExvZ2ljYWxIZWlnaHRPZkZpcnN0UmVnaW9uKCkgY29uc3QKIHsKLSAgICBpZiAo IWhhc1ZhbGlkUmVnaW9uSW5mbygpKQotICAgICAgICByZXR1cm4gMDsKLSAgICBmb3IgKFJlbmRl clJlZ2lvbkxpc3Q6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBtX3JlZ2lvbkxpc3QuYmVnaW4oKTsg aXRlciAhPSBtX3JlZ2lvbkxpc3QuZW5kKCk7ICsraXRlcikgewotICAgICAgICBSZW5kZXJSZWdp b24qIHJlZ2lvbiA9ICppdGVyOwotICAgICAgICBpZiAoIXJlZ2lvbi0+aXNWYWxpZCgpKQotICAg ICAgICAgICAgY29udGludWU7Ci0gICAgICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9k ZSgpID8gcmVnaW9uLT5jb250ZW50SGVpZ2h0KCkgOiByZWdpb24tPmNvbnRlbnRXaWR0aCgpOwot ICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKKyAgICBSZW5k ZXJSZWdpb24qIGZpcnN0VmFsaWRSZWdpb25JbkZsb3cgPSBmaXJzdFJlZ2lvbigpOworICAgIGlm ICghZmlyc3RWYWxpZFJlZ2lvbkluRmxvdykKKyAgICAgICAgcmV0dXJuIFpFUk9fTEFZT1VUX1VO SVQ7CisgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmaXJzdFZhbGlkUmVn aW9uSW5GbG93LT5jb250ZW50SGVpZ2h0KCkgOiBmaXJzdFZhbGlkUmVnaW9uSW5GbG93LT5jb250 ZW50V2lkdGgoKTsKIH0KICAKIExheW91dFVuaXQgUmVuZGVyRmxvd1RocmVhZDo6Y29udGVudExv Z2ljYWxMZWZ0T2ZGaXJzdFJlZ2lvbigpIGNvbnN0CiB7Ci0gICAgaWYgKCFoYXNWYWxpZFJlZ2lv bkluZm8oKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgZm9yIChSZW5kZXJSZWdpb25MaXN0Ojpj b25zdF9pdGVyYXRvciBpdGVyID0gbV9yZWdpb25MaXN0LmJlZ2luKCk7IGl0ZXIgIT0gbV9yZWdp b25MaXN0LmVuZCgpOyArK2l0ZXIpIHsKLSAgICAgICAgUmVuZGVyUmVnaW9uKiByZWdpb24gPSAq aXRlcjsKLSAgICAgICAgaWYgKCFyZWdpb24tPmlzVmFsaWQoKSkKLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHJlZ2lvbi0+ Zmxvd1RocmVhZFBvcnRpb25SZWN0KCkueCgpIDogcmVnaW9uLT5mbG93VGhyZWFkUG9ydGlvblJl Y3QoKS55KCk7Ci0gICAgfQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiAw OworICAgIFJlbmRlclJlZ2lvbiogZmlyc3RWYWxpZFJlZ2lvbkluRmxvdyA9IGZpcnN0UmVnaW9u KCk7CisgICAgaWYgKCFmaXJzdFZhbGlkUmVnaW9uSW5GbG93KQorICAgICAgICByZXR1cm4gWkVS T19MQVlPVVRfVU5JVDsKKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGZp cnN0VmFsaWRSZWdpb25JbkZsb3ctPmZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLngoKSA6IGZpcnN0 VmFsaWRSZWdpb25JbkZsb3ctPmZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLnkoKTsKIH0KIAogUmVu ZGVyUmVnaW9uKiBSZW5kZXJGbG93VGhyZWFkOjpmaXJzdFJlZ2lvbigpIGNvbnN0CkBAIC01Mzcs NiArNTE5LDcgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJGbG93VGhyZWFkOjpmaXJzdFJlZ2lvbigp IGNvbnN0CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgcmV0dXJuIHJlZ2lvbjsKICAg ICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAKQEAgLTU1 MCw2ICs1MzMsNyBAQCBSZW5kZXJSZWdpb24qIFJlbmRlckZsb3dUaHJlYWQ6Omxhc3RSZWdpb24o KSBjb25zdAogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIHJldHVybiByZWdpb247CiAg ICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiAwOwogfQogCg== 165932 2012-09-26 22:58:18 -0700 2012-09-27 00:52:51 -0700 Patch for landing bug-97577-20120927085738.patch text/plain 6529 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M4OTJlM2RiNDU0MTRl YjMzYWEwYmJiOTk0NGE5YjljMGM2MGU5My4uMmM0ZjM0M2Q5MDhiZWYwNDVmMTc3N2E5OTQ2OTFj ZjFmN2M3NTdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTI2ICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1NSZWdpb25zXVJl ZmFjdG9yIFJlbmRlckZsb3dUaHJlYWQ6OmNvbnRlbnRMb2dpY2FsKFdpZHRoL0hlaWdodC9MZWZ0 KU9mRmlyc3RSZWdpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3NTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAg ICAgICBSZW5kZXJGbG93VGhyZWFkIG1ldGhvZHMgY29udGVudExvZ2ljYWxXaWR0aE9mRmlyc3RS ZWdpb24sIGNvbnRlbnRMb2dpY2FsSGVpZ2h0T2ZGaXJzdFJlZ2lvbiwgY29udGVudExvZ2ljYWxM ZWZ0T2ZGaXJzdFJlZ2lvbgorICAgICAgICB3ZXJlIHVzaW5nIGNvZGUgdG8gZ2V0IHRoZSBmaXJz dCB2YWxpZCByZWdpb24gYXNzb2NpYXRlZCB3aXRoIHRoZSBmbG93LiBXZSBjYW4gdXNlIFJlbmRl ckZsb3dUaHJlYWQ6OmZpcnN0UmVnaW9uKCkgbWV0aG9kIGluc3RlYWQuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzIGFzIHRoaXMgaXMganVzdCByZWZhY3RvcmluZyBvZiBleGlzdGluZyBjb2RlLCB0 aGUgY2hhbmdlIGlzIGNvdmVyZWQgYnkgZXhpc3RpbmcgcmVnaW9ucyB0ZXN0cy4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsb3dUaHJlYWQ6OmNvbnRlbnRMb2dpY2FsV2lkdGhPZkZpcnN0UmVnaW9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmNvbnRlbnRMb2dpY2FsSGVpZ2h0T2ZGaXJz dFJlZ2lvbik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZs b3dUaHJlYWQ6OmNvbnRlbnRMb2dpY2FsTGVmdE9mRmlyc3RSZWdpb24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRmxvd1RocmVhZDo6Zmlyc3RSZWdpb24pOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxvd1RocmVhZDo6bGFzdFJlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG bG93VGhyZWFkOjpjb21wdXRlT3ZlcmZsb3dTdGF0ZUZvclJlZ2lvbnMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0SW5GbG93UmVnaW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkN1cnJlbnRSZW5kZXJGbG93VGhyZWFkTWFpbnRhaW5lcjo6Q3VycmVudFJlbmRlckZs b3dUaHJlYWRNYWludGFpbmVyKToKKwogMjAxMi0wOC0wOSAgVGFrYXNoaSBTYWthbW90byAgPHRh c2FrQGdvb2dsZS5jb20+CiAKICAgICAgICAgTW92ZSBJREwgZXh0ZW5kZWQgYXR0cmlidXRlcyB0 byB0aGUgbG9jYXRpb24gc3BlY2lmaWVkIGluIFdlYklETApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCmluZGV4IGQ1YTk5YjdiYjBhN2E3ZGQzOWJhZWJk YzIyOGJiZmIyM2FjN2Y5NTIuLmU5NDIyNDJhZmMzMTYzYzI3YmQ5MzI2YjZiOTVkMjFiMjgxOGM1 ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFk LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAK QEAgLTQ4Nyw0NCArNDg3LDI2IEBAIGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6bG9naWNhbFdpZHRo Q2hhbmdlZEluUmVnaW9ucyhjb25zdCBSZW5kZXJCbG9jayogYmxvY2ssIExhCiAKIExheW91dFVu aXQgUmVuZGVyRmxvd1RocmVhZDo6Y29udGVudExvZ2ljYWxXaWR0aE9mRmlyc3RSZWdpb24oKSBj b25zdAogewotICAgIGlmICghaGFzVmFsaWRSZWdpb25JbmZvKCkpCi0gICAgICAgIHJldHVybiAw OwotICAgIGZvciAoUmVuZGVyUmVnaW9uTGlzdDo6Y29uc3RfaXRlcmF0b3IgaXRlciA9IG1fcmVn aW9uTGlzdC5iZWdpbigpOyBpdGVyICE9IG1fcmVnaW9uTGlzdC5lbmQoKTsgKytpdGVyKSB7Ci0g ICAgICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gKml0ZXI7Ci0gICAgICAgIGlmICghcmVnaW9u LT5pc1ZhbGlkKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgcmV0dXJuIGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyByZWdpb24tPmNvbnRlbnRXaWR0aCgpIDogcmVnaW9uLT5j b250ZW50SGVpZ2h0KCk7Ci0gICAgfQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJl dHVybiAwOworICAgIFJlbmRlclJlZ2lvbiogZmlyc3RWYWxpZFJlZ2lvbkluRmxvdyA9IGZpcnN0 UmVnaW9uKCk7CisgICAgaWYgKCFmaXJzdFZhbGlkUmVnaW9uSW5GbG93KQorICAgICAgICByZXR1 cm4gWkVST19MQVlPVVRfVU5JVDsKKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IGZpcnN0VmFsaWRSZWdpb25JbkZsb3ctPmNvbnRlbnRXaWR0aCgpIDogZmlyc3RWYWxpZFJl Z2lvbkluRmxvdy0+Y29udGVudEhlaWdodCgpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckZsb3dU aHJlYWQ6OmNvbnRlbnRMb2dpY2FsSGVpZ2h0T2ZGaXJzdFJlZ2lvbigpIGNvbnN0CiB7Ci0gICAg aWYgKCFoYXNWYWxpZFJlZ2lvbkluZm8oKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgZm9yIChS ZW5kZXJSZWdpb25MaXN0Ojpjb25zdF9pdGVyYXRvciBpdGVyID0gbV9yZWdpb25MaXN0LmJlZ2lu KCk7IGl0ZXIgIT0gbV9yZWdpb25MaXN0LmVuZCgpOyArK2l0ZXIpIHsKLSAgICAgICAgUmVuZGVy UmVnaW9uKiByZWdpb24gPSAqaXRlcjsKLSAgICAgICAgaWYgKCFyZWdpb24tPmlzVmFsaWQoKSkK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSA/IHJlZ2lvbi0+Y29udGVudEhlaWdodCgpIDogcmVnaW9uLT5jb250ZW50V2lkdGgo KTsKLSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIDA7CisgICAg UmVuZGVyUmVnaW9uKiBmaXJzdFZhbGlkUmVnaW9uSW5GbG93ID0gZmlyc3RSZWdpb24oKTsKKyAg ICBpZiAoIWZpcnN0VmFsaWRSZWdpb25JbkZsb3cpCisgICAgICAgIHJldHVybiBaRVJPX0xBWU9V VF9VTklUOworICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gZmlyc3RWYWxp ZFJlZ2lvbkluRmxvdy0+Y29udGVudEhlaWdodCgpIDogZmlyc3RWYWxpZFJlZ2lvbkluRmxvdy0+ Y29udGVudFdpZHRoKCk7CiB9Ci0gCisKIExheW91dFVuaXQgUmVuZGVyRmxvd1RocmVhZDo6Y29u dGVudExvZ2ljYWxMZWZ0T2ZGaXJzdFJlZ2lvbigpIGNvbnN0CiB7Ci0gICAgaWYgKCFoYXNWYWxp ZFJlZ2lvbkluZm8oKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgZm9yIChSZW5kZXJSZWdpb25M aXN0Ojpjb25zdF9pdGVyYXRvciBpdGVyID0gbV9yZWdpb25MaXN0LmJlZ2luKCk7IGl0ZXIgIT0g bV9yZWdpb25MaXN0LmVuZCgpOyArK2l0ZXIpIHsKLSAgICAgICAgUmVuZGVyUmVnaW9uKiByZWdp b24gPSAqaXRlcjsKLSAgICAgICAgaWYgKCFyZWdpb24tPmlzVmFsaWQoKSkKLSAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHJl Z2lvbi0+Zmxvd1RocmVhZFBvcnRpb25SZWN0KCkueCgpIDogcmVnaW9uLT5mbG93VGhyZWFkUG9y dGlvblJlY3QoKS55KCk7Ci0gICAgfQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJl dHVybiAwOworICAgIFJlbmRlclJlZ2lvbiogZmlyc3RWYWxpZFJlZ2lvbkluRmxvdyA9IGZpcnN0 UmVnaW9uKCk7CisgICAgaWYgKCFmaXJzdFZhbGlkUmVnaW9uSW5GbG93KQorICAgICAgICByZXR1 cm4gWkVST19MQVlPVVRfVU5JVDsKKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IGZpcnN0VmFsaWRSZWdpb25JbkZsb3ctPmZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLngoKSA6 IGZpcnN0VmFsaWRSZWdpb25JbkZsb3ctPmZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLnkoKTsKIH0K IAogUmVuZGVyUmVnaW9uKiBSZW5kZXJGbG93VGhyZWFkOjpmaXJzdFJlZ2lvbigpIGNvbnN0CkBA IC01MzcsNiArNTE5LDcgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJGbG93VGhyZWFkOjpmaXJzdFJl Z2lvbigpIGNvbnN0CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgcmV0dXJuIHJlZ2lv bjsKICAgICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAK QEAgLTU1MCw2ICs1MzMsNyBAQCBSZW5kZXJSZWdpb24qIFJlbmRlckZsb3dUaHJlYWQ6Omxhc3RS ZWdpb24oKSBjb25zdAogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIHJldHVybiByZWdp b247CiAgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiAwOwogfQog CkBAIC02MzgsOCArNjIyLDkgQEAgdm9pZCBSZW5kZXJGbG93VGhyZWFkOjpjb21wdXRlT3ZlcmZs b3dTdGF0ZUZvclJlZ2lvbnMoTGF5b3V0VW5pdCBvbGRDbGllbnRBZnRlckUKICAgICAvLyBtaWdo dCBub3QgYmUgdGFrZW4gaW50byBhY2NvdW50IGJlY2F1c2UgdGhlIHJlbmRlciBmbG93IHRocmVh ZCBoZWlnaHQgaXMgZ3JlYXRlciB0aGF0IHRoYXQgcmVnaW9ucyBoZWlnaHQgKyBpdHMgdmlzdWFs IG92ZXJmbG93CiAgICAgLy8gYmVjYXVzZSBvZiBob3cgY29tcHV0ZUxvZ2ljYWxIZWlnaHQgaXMg aW1wbGVtZW50ZWQgZm9yIFJlbmRlckZsb3dUaHJlYWQgKGFzIGEgc3VtIG9mIGFsbCByZWdpb25z IGhlaWdodCkuCiAgICAgLy8gVGhpcyBtZWFucyB0aGF0IHRoZSBtaWRkbGUgcmVnaW9uIHdpbGwg YmUgbWFya2VkIGFzIGZpdCAoZXZlbiBpZiBpdCBoYXMgdmlzdWFsIG92ZXJmbG93IGZsb3dpbmcg aW50byB0aGUgbmV4dCByZWdpb24pCi0gICAgaWYgKGhhc1JlbmRlck92ZXJmbG93KCkgJiYgKCAo aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiB2aXN1YWxPdmVyZmxvd1JlY3QoKS5tYXhZKCkg PiBjbGllbnRCb3hSZWN0KCkubWF4WSgpKSAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfHwgKCFpc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIHZpc3VhbE92ZXJmbG93UmVjdCgp Lm1heFgoKSA+IGNsaWVudEJveFJlY3QoKS5tYXhYKCkpKSkKKyAgICBpZiAoaGFzUmVuZGVyT3Zl cmZsb3coKQorICAgICAgICAmJiAoIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIHZpc3Vh bE92ZXJmbG93UmVjdCgpLm1heFkoKSA+IGNsaWVudEJveFJlY3QoKS5tYXhZKCkpCisgICAgICAg ICAgICB8fCAoIWlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgdmlzdWFsT3ZlcmZsb3dSZWN0 KCkubWF4WCgpID4gY2xpZW50Qm94UmVjdCgpLm1heFgoKSkpKQogICAgICAgICBoZWlnaHQgPSBp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gdmlzdWFsT3ZlcmZsb3dSZWN0KCkubWF4WSgpIDog dmlzdWFsT3ZlcmZsb3dSZWN0KCkubWF4WCgpOwogCiAgICAgUmVuZGVyUmVnaW9uKiBsYXN0UmVn ID0gbGFzdFJlZ2lvbigpOwpAQCAtNzIyLDcgKzcwNyw3IEBAIGJvb2wgUmVuZGVyRmxvd1RocmVh ZDo6b2JqZWN0SW5GbG93UmVnaW9uKGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBS ZW5kCiAgICAgUmVuZGVyUmVnaW9uKiBlbmNsb3NpbmdCb3hFbmRSZWdpb24gPSAwOwogICAgIGdl dFJlZ2lvblJhbmdlRm9yQm94KGVuY2xvc2luZ0JveCwgZW5jbG9zaW5nQm94U3RhcnRSZWdpb24s IGVuY2xvc2luZ0JveEVuZFJlZ2lvbik7CiAgICAgaWYgKCFyZWdpb25JblJhbmdlKHJlZ2lvbiwg ZW5jbG9zaW5nQm94U3RhcnRSZWdpb24sIGVuY2xvc2luZ0JveEVuZFJlZ2lvbikpCi0gICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAob2JqZWN0LT5p c0JveCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTc3Myw3ICs3NTgsNyBAQCB1bnNpZ25l ZCBSZW5kZXJGbG93VGhyZWFkOjphdXRvTG9naWNhbEhlaWdodFJlZ2lvbnNDb3VudCgpIGNvbnN0 CiAjZW5kaWYKIAogQ3VycmVudFJlbmRlckZsb3dUaHJlYWRNYWludGFpbmVyOjpDdXJyZW50UmVu ZGVyRmxvd1RocmVhZE1haW50YWluZXIoUmVuZGVyRmxvd1RocmVhZCogcmVuZGVyRmxvd1RocmVh ZCkKLSAgICAgICAgOiBtX3JlbmRlckZsb3dUaHJlYWQocmVuZGVyRmxvd1RocmVhZCkKKyAgICA6 IG1fcmVuZGVyRmxvd1RocmVhZChyZW5kZXJGbG93VGhyZWFkKQogewogICAgIGlmICghbV9yZW5k ZXJGbG93VGhyZWFkKQogICAgICAgICByZXR1cm47Cg==