46474 2010-09-24 09:51:04 -0700 Patch computeWidthUsing to be block-flow-aware 2010-09-24 10:23:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 284449 0 hyatt 2010-09-24 09:51:04 -0700 Patch computeWidthUsing to be block-flow-aware. 284453 1 68695 hyatt 2010-09-24 09:54:05 -0700 Created attachment 68695 Patch 284464 2 68698 hyatt 2010-09-24 10:01:20 -0700 Created attachment 68698 Patch Fix typos. 284466 3 68698 sam 2010-09-24 10:03:43 -0700 Comment on attachment 68698 Patch You are a little inconsistent about when you use containerWidth and when you use availableWidth. 284492 4 hyatt 2010-09-24 10:23:40 -0700 Fixed in r68270. 68695 2010-09-24 09:54:05 -0700 2010-09-24 10:01:20 -0700 Patch patch.txt text/plain 8566 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODI2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDktMjQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ3NAorICAgICAgICAKKyAgICAg ICAgUGF0Y2ggY29tcHV0ZVdpZHRoVXNpbmcgdG8gYmUgYmxvY2stZmxvdy1hd2FyZS4gIFJlbmFt ZSB0aGUgV2lkdGhUeXBlIGVudW0gdG8gTG9naWNhbFdpZHRoVHlwZS4gIE1ha2UgY29tcHV0ZUxv Y2lhbFdpZHRoVXNpbmcKKyAgICAgICAgcXVlcnkgdGhlIHN0eWxlIGZvciBsb2dpY2FsIHdpZHRo IHByb3BlcnRpZXMgaW5zdGVhZCBvZiB3aWR0aCBwcm9wZXJ0aWVzLgorICAgICAgICAKKyAgICAg ICAgTm90IHRlc3RhYmxlIHVudGlsIG1vcmUgbGF5b3V0IGNvZGUgdGhhdCBjYWxscyB0aGlzIGZ1 bmN0aW9uIGlzIHBhdGNoZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhVc2luZyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNpemVzVG9JbnRyaW5zaWNXaWR0aCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorCiAyMDEwLTA5LTI0ICBBbmRyZXkgS29zeWFrb3Yg IDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1h bi4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24gNjgyMzkpCisrKyBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzkzLDExICsx MzkzLDExIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoKCkKICAgICAgICAg c2V0V2lkdGgody52YWx1ZSgpICsgYm9yZGVyQW5kUGFkZGluZ1dpZHRoKCkpOwogICAgIGVsc2Ug ewogICAgICAgICAvLyBDYWxjdWxhdGUgV2lkdGgKLSAgICAgICAgc2V0V2lkdGgoY29tcHV0ZUxv Z2ljYWxXaWR0aFVzaW5nKFdpZHRoLCBjb250YWluZXJXaWR0aCkpOworICAgICAgICBzZXRXaWR0 aChjb21wdXRlTG9naWNhbFdpZHRoVXNpbmcoTG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aCkp OwogCiAgICAgICAgIC8vIENhbGN1bGF0ZSBNYXhXaWR0aAogICAgICAgICBpZiAoIXN0eWxlKCkt Pm1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkgewotICAgICAgICAgICAgaW50IG1heFcgPSBjb21w dXRlTG9naWNhbFdpZHRoVXNpbmcoTWF4V2lkdGgsIGNvbnRhaW5lcldpZHRoKTsKKyAgICAgICAg ICAgIGludCBtYXhXID0gY29tcHV0ZUxvZ2ljYWxXaWR0aFVzaW5nKE1heExvZ2ljYWxXaWR0aCwg Y29udGFpbmVyV2lkdGgpOwogICAgICAgICAgICAgaWYgKHdpZHRoKCkgPiBtYXhXKSB7CiAgICAg ICAgICAgICAgICAgc2V0V2lkdGgobWF4Vyk7CiAgICAgICAgICAgICAgICAgdyA9IHN0eWxlKCkt Pm1heFdpZHRoKCk7CkBAIC0xNDA1LDcgKzE0MDUsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0 ZUxvZ2ljYWxXaWR0aCgpCiAgICAgICAgIH0KIAogICAgICAgICAvLyBDYWxjdWxhdGUgTWluV2lk dGgKLSAgICAgICAgaW50IG1pblcgPSBjb21wdXRlTG9naWNhbFdpZHRoVXNpbmcoTWluV2lkdGgs IGNvbnRhaW5lcldpZHRoKTsKKyAgICAgICAgaW50IG1pblcgPSBjb21wdXRlTG9naWNhbFdpZHRo VXNpbmcoTWluTG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aCk7CiAgICAgICAgIGlmICh3aWR0 aCgpIDwgbWluVykgewogICAgICAgICAgICAgc2V0V2lkdGgobWluVyk7CiAgICAgICAgICAgICB3 ID0gc3R5bGUoKS0+bWluV2lkdGgoKTsKQEAgLTE0MzYsMzQgKzE0MzYsMzQgQEAgdm9pZCBSZW5k ZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGgoKQogICAgIH0KIH0KIAotaW50IFJlbmRlckJveDo6 Y29tcHV0ZUxvZ2ljYWxXaWR0aFVzaW5nKFdpZHRoVHlwZSB3aWR0aFR5cGUsIGludCBjdykKK2lu dCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhVc2luZyhMb2dpY2FsV2lkdGhUeXBlIHdp ZHRoVHlwZSwgaW50IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkKIHsKLSAgICBpbnQgd2lkdGhSZXN1 bHQgPSB3aWR0aCgpOwotICAgIExlbmd0aCB3OwotICAgIGlmICh3aWR0aFR5cGUgPT0gV2lkdGgp Ci0gICAgICAgIHcgPSBzdHlsZSgpLT53aWR0aCgpOwotICAgIGVsc2UgaWYgKHdpZHRoVHlwZSA9 PSBNaW5XaWR0aCkKLSAgICAgICAgdyA9IHN0eWxlKCktPm1pbldpZHRoKCk7CisgICAgaW50IGxv Z2ljYWxXaWR0aFJlc3VsdCA9IGxvZ2ljYWxXaWR0aCgpOworICAgIExlbmd0aCBsb2dpY2FsV2lk dGg7CisgICAgaWYgKHdpZHRoVHlwZSA9PSBMb2dpY2FsV2lkdGgpCisgICAgICAgIGxvZ2ljYWxX aWR0aCA9IHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpOworICAgIGVsc2UgaWYgKHdpZHRoVHlwZSA9 PSBNaW5Mb2dpY2FsV2lkdGgpCisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0eWxlKCktPmxvZ2lj YWxNaW5XaWR0aCgpOwogICAgIGVsc2UKLSAgICAgICAgdyA9IHN0eWxlKCktPm1heFdpZHRoKCk7 CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0eWxlKCktPmxvZ2ljYWxNYXhXaWR0aCgpOwogCi0g ICAgaWYgKHcuaXNJbnRyaW5zaWNPckF1dG8oKSkgewotICAgICAgICBpbnQgbWFyZ2luTGVmdCA9 IHN0eWxlKCktPm1hcmdpbkxlZnQoKS5jYWxjTWluVmFsdWUoY3cpOwotICAgICAgICBpbnQgbWFy Z2luUmlnaHQgPSBzdHlsZSgpLT5tYXJnaW5SaWdodCgpLmNhbGNNaW5WYWx1ZShjdyk7Ci0gICAg ICAgIGlmIChjdykKLSAgICAgICAgICAgIHdpZHRoUmVzdWx0ID0gY3cgLSBtYXJnaW5MZWZ0IC0g bWFyZ2luUmlnaHQ7CisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpY09yQXV0bygpKSB7 CisgICAgICAgIGludCBtYXJnaW5TdGFydCA9IHN0eWxlKCktPm1hcmdpblN0YXJ0KCkuY2FsY01p blZhbHVlKGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7CisgICAgICAgIGludCBtYXJnaW5FbmQgPSBz dHlsZSgpLT5tYXJnaW5FbmQoKS5jYWxjTWluVmFsdWUoYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsK KyAgICAgICAgaWYgKGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkKKyAgICAgICAgICAgIGxvZ2ljYWxX aWR0aFJlc3VsdCA9IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IC0gbWFyZ2lu RW5kOwogCiAgICAgICAgIGlmIChzaXplc1RvSW50cmluc2ljV2lkdGgod2lkdGhUeXBlKSkgewot ICAgICAgICAgICAgd2lkdGhSZXN1bHQgPSBtYXgod2lkdGhSZXN1bHQsIG1pblByZWZXaWR0aCgp KTsKLSAgICAgICAgICAgIHdpZHRoUmVzdWx0ID0gbWluKHdpZHRoUmVzdWx0LCBtYXhQcmVmV2lk dGgoKSk7CisgICAgICAgICAgICBsb2dpY2FsV2lkdGhSZXN1bHQgPSBtYXgobG9naWNhbFdpZHRo UmVzdWx0LCBtaW5QcmVmV2lkdGgoKSk7CisgICAgICAgICAgICBsb2dpY2FsV2lkdGhSZXN1bHQg PSBtaW4obG9naWNhbFdpZHRoUmVzdWx0LCBtYXhQcmVmV2lkdGgoKSk7CiAgICAgICAgIH0KLSAg ICB9IGVsc2UKLSAgICAgICAgd2lkdGhSZXN1bHQgPSBjb21wdXRlQm9yZGVyQm94TG9naWNhbFdp ZHRoKHcuY2FsY1ZhbHVlKGN3KSk7CisgICAgfSBlbHNlIC8vIEZJWE1FOiBJZiB0aGUgY29udGFp bmluZyBibG9jayBmbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gb3VyIGRpcmVjdGlvbiB3ZSBuZWVk IHRvIHVzZSB0aGUgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0IGluc3RlYWQuCisgICAgICAgIGxv Z2ljYWxXaWR0aFJlc3VsdCA9IGNvbXB1dGVCb3JkZXJCb3hMb2dpY2FsV2lkdGgobG9naWNhbFdp ZHRoLmNhbGNWYWx1ZShhdmFpbGFibGVMb2dpY2FsV2lkdGgpKTsgCiAKLSAgICByZXR1cm4gd2lk dGhSZXN1bHQ7CisgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aFJlc3VsdDsKIH0KIAotYm9vbCBSZW5k ZXJCb3g6OnNpemVzVG9JbnRyaW5zaWNXaWR0aChXaWR0aFR5cGUgd2lkdGhUeXBlKSBjb25zdAor Ym9vbCBSZW5kZXJCb3g6OnNpemVzVG9JbnRyaW5zaWNXaWR0aChMb2dpY2FsV2lkdGhUeXBlIHdp ZHRoVHlwZSkgY29uc3QKIHsKICAgICAvLyBNYXJxdWVlcyBpbiBXaW5JRSBhcmUgbGlrZSBhIG1p eHR1cmUgb2YgYmxvY2tzIGFuZCBpbmxpbmUtYmxvY2tzLiAgVGhleSBzaXplIGFzIHRob3VnaCB0 aGV5J3JlIGJsb2NrcywKICAgICAvLyBidXQgdGhleSBhbGxvdyB0ZXh0IHRvIHNpdCBvbiB0aGUg c2FtZSBsaW5lIGFzIHRoZSBtYXJxdWVlLgpAQCAtMTQ3MiwxMiArMTQ3MiwxNSBAQCBib29sIFJl bmRlckJveDo6c2l6ZXNUb0ludHJpbnNpY1dpZHRoKFdpCiAKICAgICAvLyBUaGlzIGNvZGUgbWF5 IGxvb2sgYSBiaXQgc3RyYW5nZS4gIEJhc2ljYWxseSB3aWR0aDppbnRyaW5zaWMgc2hvdWxkIGNs YW1wIHRoZSBzaXplIHdoZW4gdGVzdGluZyBib3RoCiAgICAgLy8gbWluLXdpZHRoIGFuZCB3aWR0 aC4gIG1heC13aWR0aCBpcyBvbmx5IGNsYW1wZWQgaWYgaXQgaXMgYWxzbyBpbnRyaW5zaWMuCi0g ICAgTGVuZ3RoIHdpZHRoID0gKHdpZHRoVHlwZSA9PSBNYXhXaWR0aCkgPyBzdHlsZSgpLT5tYXhX aWR0aCgpIDogc3R5bGUoKS0+d2lkdGgoKTsKLSAgICBpZiAod2lkdGgudHlwZSgpID09IEludHJp bnNpYykKKyAgICBMZW5ndGggbG9naWNhbFdpZHRoID0gKHdpZHRoVHlwZSA9PSBNYXhMb2dpY2Fs V2lkdGgpID8gc3R5bGUoKS0+bG9naWNhbE1heFdpZHRoKCkgOiBzdHlsZSgpLT5sb2dpY2FsTWlu V2lkdGgoKTsKKyAgICBpZiAobG9naWNhbFdpZHRoLnR5cGUoKSA9PSBJbnRyaW5zaWMpCiAgICAg ICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gQ2hpbGRyZW4gb2YgYSBob3Jpem9udGFsIG1hcnF1 ZWUgZG8gbm90IGZpbGwgdGhlIGNvbnRhaW5lciBieSBkZWZhdWx0LgogICAgIC8vIEZJWE1FOiBO ZWVkIHRvIGRlYWwgd2l0aCBNQVVUTyB2YWx1ZSBwcm9wZXJseS4gIEl0IGNvdWxkIGJlIHZlcnRp Y2FsLgorICAgIC8vIEZJWE1FOiBUaGluayBhYm91dCBibG9jay1mbG93IGhlcmUuICBOZWVkIHRv IGZpbmQgb3V0IGhvdyBtYXJxdWVlIGRpcmVjdGlvbiByZWxhdGVzIHRvCisgICAgLy8gYmxvY2st ZmxvdyAoYXMgd2VsbCBhcyBob3cgbWFycXVlZSBvdmVyZmxvdyBzaG91bGQgcmVsYXRlIHRvIGJs b2NrIGZsb3cpLgorICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NjQ3MgogICAgIGlmIChwYXJlbnQoKS0+c3R5bGUoKS0+b3ZlcmZsb3dYKCkgPT0gT01BUlFV RUUpIHsKICAgICAgICAgRU1hcnF1ZWVEaXJlY3Rpb24gZGlyID0gcGFyZW50KCktPnN0eWxlKCkt Pm1hcnF1ZWVEaXJlY3Rpb24oKTsKICAgICAgICAgaWYgKGRpciA9PSBNQVVUTyB8fCBkaXIgPT0g TUZPUldBUkQgfHwgZGlyID09IE1CQUNLV0FSRCB8fCBkaXIgPT0gTUxFRlQgfHwgZGlyID09IE1S SUdIVCkKQEAgLTE0ODYsNiArMTQ4OSw4IEBAIGJvb2wgUmVuZGVyQm94OjpzaXplc1RvSW50cmlu c2ljV2lkdGgoV2kKIAogICAgIC8vIEZsZXhpYmxlIGhvcml6b250YWwgYm94ZXMgbGF5IG91dCBj aGlsZHJlbiBhdCB0aGVpciBpbnRyaW5zaWMgd2lkdGhzLiAgQWxzbyB2ZXJ0aWNhbCBib3hlcwog ICAgIC8vIHRoYXQgZG9uJ3Qgc3RyZXRjaCB0aGVpciBraWRzIGxheSBvdXQgdGhlaXIgY2hpbGRy ZW4gYXQgdGhlaXIgaW50cmluc2ljIHdpZHRocy4KKyAgICAvLyBGSVhNRTogVGhpbmsgYWJvdXQg YmxvY2stZmxvdyBoZXJlLgorICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00NjQ3MwogICAgIGlmIChwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpCiAgICAgICAg ICAgICAmJiAocGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgpID09IEhPUklaT05UQUwgfHwg cGFyZW50KCktPnN0eWxlKCktPmJveEFsaWduKCkgIT0gQlNUUkVUQ0gpKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKQEAgLTE0OTMsNyArMTQ5OCw5IEBAIGJvb2wgUmVuZGVyQm94OjpzaXplc1RvSW50 cmluc2ljV2lkdGgoV2kKICAgICAvLyBCdXR0b24sIGlucHV0LCBzZWxlY3QsIHRleHRhcmVhLCBs ZWdlbmQgYW5kIGRhdGFncmlkIHRyZWF0CiAgICAgLy8gd2lkdGggdmFsdWUgb2YgJ2F1dG8nIGFz ICdpbnRyaW5zaWMnIHVubGVzcyBpdCdzIGluIGEKICAgICAvLyBzdHJldGNoaW5nIHZlcnRpY2Fs IGZsZXhib3guCi0gICAgaWYgKHdpZHRoLnR5cGUoKSA9PSBBdXRvICYmICEocGFyZW50KCktPmlz RmxleGlibGVCb3goKSAmJiBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94T3JpZW50KCkgPT0gVkVSVElD QUwgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveEFsaWduKCkgPT0gQlNUUkVUQ0gpICYmIG5vZGUo KSAmJiAobm9kZSgpLT5oYXNUYWdOYW1lKGlucHV0VGFnKSB8fCBub2RlKCktPmhhc1RhZ05hbWUo c2VsZWN0VGFnKSB8fCBub2RlKCktPmhhc1RhZ05hbWUoYnV0dG9uVGFnKSB8fCBub2RlKCktPmhh c1RhZ05hbWUodGV4dGFyZWFUYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZShsZWdlbmRUYWcpIHx8 IG5vZGUoKS0+aGFzVGFnTmFtZShkYXRhZ3JpZFRhZykpKQorICAgIC8vIEZJWE1FOiBUaGluayBh Ym91dCBibG9jay1mbG93IGhlcmUuCisgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ2NDczCisgICAgaWYgKGxvZ2ljYWxXaWR0aC50eXBlKCkgPT0gQXV0byAm JiAhKHBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveE9y aWVudCgpID09IFZFUlRJQ0FMICYmIHBhcmVudCgpLT5zdHlsZSgpLT5ib3hBbGlnbigpID09IEJT VFJFVENIKSAmJiBub2RlKCkgJiYgKG5vZGUoKS0+aGFzVGFnTmFtZShpbnB1dFRhZykgfHwgbm9k ZSgpLT5oYXNUYWdOYW1lKHNlbGVjdFRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGJ1dHRvblRh ZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKHRleHRhcmVhVGFnKSB8fCBub2RlKCktPmhhc1RhZ05h bWUobGVnZW5kVGFnKSB8fCBub2RlKCktPmhhc1RhZ05hbWUoZGF0YWdyaWRUYWcpKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaAkocmV2aXNpb24gNjgyMzkpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAko d29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LWVudW0gV2lkdGhUeXBlIHsgV2lkdGgsIE1pbldpZHRoLCBNYXhXaWR0aCB9OworZW51bSBMb2dp Y2FsV2lkdGhUeXBlIHsgTG9naWNhbFdpZHRoLCBNaW5Mb2dpY2FsV2lkdGgsIE1heExvZ2ljYWxX aWR0aCB9OwogCiBjbGFzcyBSZW5kZXJCb3ggOiBwdWJsaWMgUmVuZGVyQm94TW9kZWxPYmplY3Qg ewogcHVibGljOgpAQCAtMjMzLDEwICsyMzMsMTAgQEAgcHVibGljOgogCiAgICAgLy8gV2hldGhl ciBvciBub3QgdGhlIGVsZW1lbnQgc2hyaW5rcyB0byBpdHMgaW50cmluc2ljIHdpZHRoIChyYXRo ZXIgdGhhbiBmaWxsaW5nIHRoZSB3aWR0aAogICAgIC8vIG9mIGEgY29udGFpbmluZyBibG9jayku ICBIVE1MNCBidXR0b25zLCA8c2VsZWN0PnMsIDxpbnB1dD5zLCBsZWdlbmRzLCBhbmQgZmxvYXRp bmcvY29tcGFjdCBlbGVtZW50cyBkbyB0aGlzLgotICAgIGJvb2wgc2l6ZXNUb0ludHJpbnNpY1dp ZHRoKFdpZHRoVHlwZSkgY29uc3Q7CisgICAgYm9vbCBzaXplc1RvSW50cmluc2ljV2lkdGgoTG9n aWNhbFdpZHRoVHlwZSkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHN0cmV0Y2hlc1RvTWluSW50 cmluc2ljV2lkdGgoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCi0gICAgaW50IGNvbXB1dGVM b2dpY2FsV2lkdGhVc2luZyhXaWR0aFR5cGUsIGludCBjb250YWluZXJXaWR0aCk7CisgICAgaW50 IGNvbXB1dGVMb2dpY2FsV2lkdGhVc2luZyhMb2dpY2FsV2lkdGhUeXBlLCBpbnQgYXZhaWxhYmxl TG9naWNhbFdpZHRoKTsKICAgICBpbnQgY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhjb25zdCBM ZW5ndGgmIGhlaWdodCk7CiAgICAgaW50IGNvbXB1dGVSZXBsYWNlZFdpZHRoVXNpbmcoTGVuZ3Ro IHdpZHRoKSBjb25zdDsKICAgICBpbnQgY29tcHV0ZVJlcGxhY2VkSGVpZ2h0VXNpbmcoTGVuZ3Ro IGhlaWdodCkgY29uc3Q7Cg== 68698 2010-09-24 10:01:20 -0700 2010-09-24 10:03:43 -0700 Patch patch.txt text/plain 8564 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODI2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDktMjQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ3NAorICAgICAgICAKKyAgICAg ICAgUGF0Y2ggY29tcHV0ZVdpZHRoVXNpbmcgdG8gYmUgYmxvY2stZmxvdy1hd2FyZS4gIFJlbmFt ZSB0aGUgV2lkdGhUeXBlIGVudW0gdG8gTG9naWNhbFdpZHRoVHlwZS4gIE1ha2UgY29tcHV0ZUxv Z2ljYWxXaWR0aFVzaW5nCisgICAgICAgIHF1ZXJ5IHRoZSBzdHlsZSBmb3IgbG9naWNhbCB3aWR0 aCBwcm9wZXJ0aWVzIGluc3RlYWQgb2Ygd2lkdGggcHJvcGVydGllcy4KKyAgICAgICAgCisgICAg ICAgIE5vdCB0ZXN0YWJsZSB1bnRpbCBtb3JlIGxheW91dCBjb2RlIHRoYXQgY2FsbHMgdGhpcyBm dW5jdGlvbiBpcyBwYXRjaGVkLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGgpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoVXNpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaXplc1RvSW50cmluc2ljV2lkdGgpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAxMC0wOS0yNCAgQW5kcmV5IEtvc3lha292 ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRt YW4uCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlzaW9uIDY4MjM5KQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM5MywxMSAr MTM5MywxMSBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCgpCiAgICAgICAg IHNldFdpZHRoKHcudmFsdWUoKSArIGJvcmRlckFuZFBhZGRpbmdXaWR0aCgpKTsKICAgICBlbHNl IHsKICAgICAgICAgLy8gQ2FsY3VsYXRlIFdpZHRoCi0gICAgICAgIHNldFdpZHRoKGNvbXB1dGVM b2dpY2FsV2lkdGhVc2luZyhXaWR0aCwgY29udGFpbmVyV2lkdGgpKTsKKyAgICAgICAgc2V0V2lk dGgoY29tcHV0ZUxvZ2ljYWxXaWR0aFVzaW5nKExvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGgp KTsKIAogICAgICAgICAvLyBDYWxjdWxhdGUgTWF4V2lkdGgKICAgICAgICAgaWYgKCFzdHlsZSgp LT5tYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgICAgIGludCBtYXhXID0gY29t cHV0ZUxvZ2ljYWxXaWR0aFVzaW5nKE1heFdpZHRoLCBjb250YWluZXJXaWR0aCk7CisgICAgICAg ICAgICBpbnQgbWF4VyA9IGNvbXB1dGVMb2dpY2FsV2lkdGhVc2luZyhNYXhMb2dpY2FsV2lkdGgs IGNvbnRhaW5lcldpZHRoKTsKICAgICAgICAgICAgIGlmICh3aWR0aCgpID4gbWF4VykgewogICAg ICAgICAgICAgICAgIHNldFdpZHRoKG1heFcpOwogICAgICAgICAgICAgICAgIHcgPSBzdHlsZSgp LT5tYXhXaWR0aCgpOwpAQCAtMTQwNSw3ICsxNDA1LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1 dGVMb2dpY2FsV2lkdGgoKQogICAgICAgICB9CiAKICAgICAgICAgLy8gQ2FsY3VsYXRlIE1pbldp ZHRoCi0gICAgICAgIGludCBtaW5XID0gY29tcHV0ZUxvZ2ljYWxXaWR0aFVzaW5nKE1pbldpZHRo LCBjb250YWluZXJXaWR0aCk7CisgICAgICAgIGludCBtaW5XID0gY29tcHV0ZUxvZ2ljYWxXaWR0 aFVzaW5nKE1pbkxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGgpOwogICAgICAgICBpZiAod2lk dGgoKSA8IG1pblcpIHsKICAgICAgICAgICAgIHNldFdpZHRoKG1pblcpOwogICAgICAgICAgICAg dyA9IHN0eWxlKCktPm1pbldpZHRoKCk7CkBAIC0xNDM2LDM0ICsxNDM2LDM0IEBAIHZvaWQgUmVu ZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoKCkKICAgICB9CiB9CiAKLWludCBSZW5kZXJCb3g6 OmNvbXB1dGVMb2dpY2FsV2lkdGhVc2luZyhXaWR0aFR5cGUgd2lkdGhUeXBlLCBpbnQgY3cpCitp bnQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoVXNpbmcoTG9naWNhbFdpZHRoVHlwZSB3 aWR0aFR5cGUsIGludCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpCiB7Ci0gICAgaW50IHdpZHRoUmVz dWx0ID0gd2lkdGgoKTsKLSAgICBMZW5ndGggdzsKLSAgICBpZiAod2lkdGhUeXBlID09IFdpZHRo KQotICAgICAgICB3ID0gc3R5bGUoKS0+d2lkdGgoKTsKLSAgICBlbHNlIGlmICh3aWR0aFR5cGUg PT0gTWluV2lkdGgpCi0gICAgICAgIHcgPSBzdHlsZSgpLT5taW5XaWR0aCgpOworICAgIGludCBs b2dpY2FsV2lkdGhSZXN1bHQgPSBsb2dpY2FsV2lkdGgoKTsKKyAgICBMZW5ndGggbG9naWNhbFdp ZHRoOworICAgIGlmICh3aWR0aFR5cGUgPT0gTG9naWNhbFdpZHRoKQorICAgICAgICBsb2dpY2Fs V2lkdGggPSBzdHlsZSgpLT5sb2dpY2FsV2lkdGgoKTsKKyAgICBlbHNlIGlmICh3aWR0aFR5cGUg PT0gTWluTG9naWNhbFdpZHRoKQorICAgICAgICBsb2dpY2FsV2lkdGggPSBzdHlsZSgpLT5sb2dp Y2FsTWluV2lkdGgoKTsKICAgICBlbHNlCi0gICAgICAgIHcgPSBzdHlsZSgpLT5tYXhXaWR0aCgp OworICAgICAgICBsb2dpY2FsV2lkdGggPSBzdHlsZSgpLT5sb2dpY2FsTWF4V2lkdGgoKTsKIAot ICAgIGlmICh3LmlzSW50cmluc2ljT3JBdXRvKCkpIHsKLSAgICAgICAgaW50IG1hcmdpbkxlZnQg PSBzdHlsZSgpLT5tYXJnaW5MZWZ0KCkuY2FsY01pblZhbHVlKGN3KTsKLSAgICAgICAgaW50IG1h cmdpblJpZ2h0ID0gc3R5bGUoKS0+bWFyZ2luUmlnaHQoKS5jYWxjTWluVmFsdWUoY3cpOwotICAg ICAgICBpZiAoY3cpCi0gICAgICAgICAgICB3aWR0aFJlc3VsdCA9IGN3IC0gbWFyZ2luTGVmdCAt IG1hcmdpblJpZ2h0OworICAgIGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSkg eworICAgICAgICBpbnQgbWFyZ2luU3RhcnQgPSBzdHlsZSgpLT5tYXJnaW5TdGFydCgpLmNhbGNN aW5WYWx1ZShhdmFpbGFibGVMb2dpY2FsV2lkdGgpOworICAgICAgICBpbnQgbWFyZ2luRW5kID0g c3R5bGUoKS0+bWFyZ2luRW5kKCkuY2FsY01pblZhbHVlKGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7 CisgICAgICAgIGlmIChhdmFpbGFibGVMb2dpY2FsV2lkdGgpCisgICAgICAgICAgICBsb2dpY2Fs V2lkdGhSZXN1bHQgPSBhdmFpbGFibGVMb2dpY2FsV2lkdGggLSBtYXJnaW5TdGFydCAtIG1hcmdp bkVuZDsKIAogICAgICAgICBpZiAoc2l6ZXNUb0ludHJpbnNpY1dpZHRoKHdpZHRoVHlwZSkpIHsK LSAgICAgICAgICAgIHdpZHRoUmVzdWx0ID0gbWF4KHdpZHRoUmVzdWx0LCBtaW5QcmVmV2lkdGgo KSk7Ci0gICAgICAgICAgICB3aWR0aFJlc3VsdCA9IG1pbih3aWR0aFJlc3VsdCwgbWF4UHJlZldp ZHRoKCkpOworICAgICAgICAgICAgbG9naWNhbFdpZHRoUmVzdWx0ID0gbWF4KGxvZ2ljYWxXaWR0 aFJlc3VsdCwgbWluUHJlZldpZHRoKCkpOworICAgICAgICAgICAgbG9naWNhbFdpZHRoUmVzdWx0 ID0gbWluKGxvZ2ljYWxXaWR0aFJlc3VsdCwgbWF4UHJlZldpZHRoKCkpOwogICAgICAgICB9Ci0g ICAgfSBlbHNlCi0gICAgICAgIHdpZHRoUmVzdWx0ID0gY29tcHV0ZUJvcmRlckJveExvZ2ljYWxX aWR0aCh3LmNhbGNWYWx1ZShjdykpOworICAgIH0gZWxzZSAvLyBGSVhNRTogSWYgdGhlIGNvbnRh aW5pbmcgYmxvY2sgZmxvdyBpcyBwZXJwZW5kaWN1bGFyIHRvIG91ciBkaXJlY3Rpb24gd2UgbmVl ZCB0byB1c2UgdGhlIGF2YWlsYWJsZSBsb2dpY2FsIGhlaWdodCBpbnN0ZWFkLgorICAgICAgICBs b2dpY2FsV2lkdGhSZXN1bHQgPSBjb21wdXRlQm9yZGVyQm94TG9naWNhbFdpZHRoKGxvZ2ljYWxX aWR0aC5jYWxjVmFsdWUoYXZhaWxhYmxlTG9naWNhbFdpZHRoKSk7IAogCi0gICAgcmV0dXJuIHdp ZHRoUmVzdWx0OworICAgIHJldHVybiBsb2dpY2FsV2lkdGhSZXN1bHQ7CiB9CiAKLWJvb2wgUmVu ZGVyQm94OjpzaXplc1RvSW50cmluc2ljV2lkdGgoV2lkdGhUeXBlIHdpZHRoVHlwZSkgY29uc3QK K2Jvb2wgUmVuZGVyQm94OjpzaXplc1RvSW50cmluc2ljV2lkdGgoTG9naWNhbFdpZHRoVHlwZSB3 aWR0aFR5cGUpIGNvbnN0CiB7CiAgICAgLy8gTWFycXVlZXMgaW4gV2luSUUgYXJlIGxpa2UgYSBt aXh0dXJlIG9mIGJsb2NrcyBhbmQgaW5saW5lLWJsb2Nrcy4gIFRoZXkgc2l6ZSBhcyB0aG91Z2gg dGhleSdyZSBibG9ja3MsCiAgICAgLy8gYnV0IHRoZXkgYWxsb3cgdGV4dCB0byBzaXQgb24gdGhl IHNhbWUgbGluZSBhcyB0aGUgbWFycXVlZS4KQEAgLTE0NzIsMTIgKzE0NzIsMTUgQEAgYm9vbCBS ZW5kZXJCb3g6OnNpemVzVG9JbnRyaW5zaWNXaWR0aChXaQogCiAgICAgLy8gVGhpcyBjb2RlIG1h eSBsb29rIGEgYml0IHN0cmFuZ2UuICBCYXNpY2FsbHkgd2lkdGg6aW50cmluc2ljIHNob3VsZCBj bGFtcCB0aGUgc2l6ZSB3aGVuIHRlc3RpbmcgYm90aAogICAgIC8vIG1pbi13aWR0aCBhbmQgd2lk dGguICBtYXgtd2lkdGggaXMgb25seSBjbGFtcGVkIGlmIGl0IGlzIGFsc28gaW50cmluc2ljLgot ICAgIExlbmd0aCB3aWR0aCA9ICh3aWR0aFR5cGUgPT0gTWF4V2lkdGgpID8gc3R5bGUoKS0+bWF4 V2lkdGgoKSA6IHN0eWxlKCktPndpZHRoKCk7Ci0gICAgaWYgKHdpZHRoLnR5cGUoKSA9PSBJbnRy aW5zaWMpCisgICAgTGVuZ3RoIGxvZ2ljYWxXaWR0aCA9ICh3aWR0aFR5cGUgPT0gTWF4TG9naWNh bFdpZHRoKSA/IHN0eWxlKCktPmxvZ2ljYWxNYXhXaWR0aCgpIDogc3R5bGUoKS0+bG9naWNhbFdp ZHRoKCk7CisgICAgaWYgKGxvZ2ljYWxXaWR0aC50eXBlKCkgPT0gSW50cmluc2ljKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIENoaWxkcmVuIG9mIGEgaG9yaXpvbnRhbCBtYXJxdWVl IGRvIG5vdCBmaWxsIHRoZSBjb250YWluZXIgYnkgZGVmYXVsdC4KICAgICAvLyBGSVhNRTogTmVl ZCB0byBkZWFsIHdpdGggTUFVVE8gdmFsdWUgcHJvcGVybHkuICBJdCBjb3VsZCBiZSB2ZXJ0aWNh bC4KKyAgICAvLyBGSVhNRTogVGhpbmsgYWJvdXQgYmxvY2stZmxvdyBoZXJlLiAgTmVlZCB0byBm aW5kIG91dCBob3cgbWFycXVlZSBkaXJlY3Rpb24gcmVsYXRlcyB0bworICAgIC8vIGJsb2NrLWZs b3cgKGFzIHdlbGwgYXMgaG93IG1hcnF1ZWUgb3ZlcmZsb3cgc2hvdWxkIHJlbGF0ZSB0byBibG9j ayBmbG93KS4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDY0NzIKICAgICBpZiAocGFyZW50KCktPnN0eWxlKCktPm92ZXJmbG93WCgpID09IE9NQVJRVUVF KSB7CiAgICAgICAgIEVNYXJxdWVlRGlyZWN0aW9uIGRpciA9IHBhcmVudCgpLT5zdHlsZSgpLT5t YXJxdWVlRGlyZWN0aW9uKCk7CiAgICAgICAgIGlmIChkaXIgPT0gTUFVVE8gfHwgZGlyID09IE1G T1JXQVJEIHx8IGRpciA9PSBNQkFDS1dBUkQgfHwgZGlyID09IE1MRUZUIHx8IGRpciA9PSBNUklH SFQpCkBAIC0xNDg2LDYgKzE0ODksOCBAQCBib29sIFJlbmRlckJveDo6c2l6ZXNUb0ludHJpbnNp Y1dpZHRoKFdpCiAKICAgICAvLyBGbGV4aWJsZSBob3Jpem9udGFsIGJveGVzIGxheSBvdXQgY2hp bGRyZW4gYXQgdGhlaXIgaW50cmluc2ljIHdpZHRocy4gIEFsc28gdmVydGljYWwgYm94ZXMKICAg ICAvLyB0aGF0IGRvbid0IHN0cmV0Y2ggdGhlaXIga2lkcyBsYXkgb3V0IHRoZWlyIGNoaWxkcmVu IGF0IHRoZWlyIGludHJpbnNpYyB3aWR0aHMuCisgICAgLy8gRklYTUU6IFRoaW5rIGFib3V0IGJs b2NrLWZsb3cgaGVyZS4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDY0NzMKICAgICBpZiAocGFyZW50KCktPmlzRmxleGlibGVCb3goKQogICAgICAgICAg ICAgJiYgKHBhcmVudCgpLT5zdHlsZSgpLT5ib3hPcmllbnQoKSA9PSBIT1JJWk9OVEFMIHx8IHBh cmVudCgpLT5zdHlsZSgpLT5ib3hBbGlnbigpICE9IEJTVFJFVENIKSkKICAgICAgICAgcmV0dXJu IHRydWU7CkBAIC0xNDkzLDcgKzE0OTgsOSBAQCBib29sIFJlbmRlckJveDo6c2l6ZXNUb0ludHJp bnNpY1dpZHRoKFdpCiAgICAgLy8gQnV0dG9uLCBpbnB1dCwgc2VsZWN0LCB0ZXh0YXJlYSwgbGVn ZW5kIGFuZCBkYXRhZ3JpZCB0cmVhdAogICAgIC8vIHdpZHRoIHZhbHVlIG9mICdhdXRvJyBhcyAn aW50cmluc2ljJyB1bmxlc3MgaXQncyBpbiBhCiAgICAgLy8gc3RyZXRjaGluZyB2ZXJ0aWNhbCBm bGV4Ym94LgotICAgIGlmICh3aWR0aC50eXBlKCkgPT0gQXV0byAmJiAhKHBhcmVudCgpLT5pc0Zs ZXhpYmxlQm94KCkgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgpID09IFZFUlRJQ0FM ICYmIHBhcmVudCgpLT5zdHlsZSgpLT5ib3hBbGlnbigpID09IEJTVFJFVENIKSAmJiBub2RlKCkg JiYgKG5vZGUoKS0+aGFzVGFnTmFtZShpbnB1dFRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKHNl bGVjdFRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGJ1dHRvblRhZykgfHwgbm9kZSgpLT5oYXNU YWdOYW1lKHRleHRhcmVhVGFnKSB8fCBub2RlKCktPmhhc1RhZ05hbWUobGVnZW5kVGFnKSB8fCBu b2RlKCktPmhhc1RhZ05hbWUoZGF0YWdyaWRUYWcpKSkKKyAgICAvLyBGSVhNRTogVGhpbmsgYWJv dXQgYmxvY2stZmxvdyBoZXJlLgorICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjQ3MworICAgIGlmIChsb2dpY2FsV2lkdGgudHlwZSgpID09IEF1dG8gJiYg IShwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLT5ib3hPcmll bnQoKSA9PSBWRVJUSUNBTCAmJiBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94QWxpZ24oKSA9PSBCU1RS RVRDSCkgJiYgbm9kZSgpICYmIChub2RlKCktPmhhc1RhZ05hbWUoaW5wdXRUYWcpIHx8IG5vZGUo KS0+aGFzVGFnTmFtZShzZWxlY3RUYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZShidXR0b25UYWcp IHx8IG5vZGUoKS0+aGFzVGFnTmFtZSh0ZXh0YXJlYVRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1l KGxlZ2VuZFRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGRhdGFncmlkVGFnKSkpCiAgICAgICAg IHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDogV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgJKHJldmlzaW9uIDY4MjM5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHdv cmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1l bnVtIFdpZHRoVHlwZSB7IFdpZHRoLCBNaW5XaWR0aCwgTWF4V2lkdGggfTsKK2VudW0gTG9naWNh bFdpZHRoVHlwZSB7IExvZ2ljYWxXaWR0aCwgTWluTG9naWNhbFdpZHRoLCBNYXhMb2dpY2FsV2lk dGggfTsKIAogY2xhc3MgUmVuZGVyQm94IDogcHVibGljIFJlbmRlckJveE1vZGVsT2JqZWN0IHsK IHB1YmxpYzoKQEAgLTIzMywxMCArMjMzLDEwIEBAIHB1YmxpYzoKIAogICAgIC8vIFdoZXRoZXIg b3Igbm90IHRoZSBlbGVtZW50IHNocmlua3MgdG8gaXRzIGludHJpbnNpYyB3aWR0aCAocmF0aGVy IHRoYW4gZmlsbGluZyB0aGUgd2lkdGgKICAgICAvLyBvZiBhIGNvbnRhaW5pbmcgYmxvY2spLiAg SFRNTDQgYnV0dG9ucywgPHNlbGVjdD5zLCA8aW5wdXQ+cywgbGVnZW5kcywgYW5kIGZsb2F0aW5n L2NvbXBhY3QgZWxlbWVudHMgZG8gdGhpcy4KLSAgICBib29sIHNpemVzVG9JbnRyaW5zaWNXaWR0 aChXaWR0aFR5cGUpIGNvbnN0OworICAgIGJvb2wgc2l6ZXNUb0ludHJpbnNpY1dpZHRoKExvZ2lj YWxXaWR0aFR5cGUpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBzdHJldGNoZXNUb01pbkludHJp bnNpY1dpZHRoKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAotICAgIGludCBjb21wdXRlTG9n aWNhbFdpZHRoVXNpbmcoV2lkdGhUeXBlLCBpbnQgY29udGFpbmVyV2lkdGgpOworICAgIGludCBj b21wdXRlTG9naWNhbFdpZHRoVXNpbmcoTG9naWNhbFdpZHRoVHlwZSwgaW50IGF2YWlsYWJsZUxv Z2ljYWxXaWR0aCk7CiAgICAgaW50IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29uc3QgTGVu Z3RoJiBoZWlnaHQpOwogICAgIGludCBjb21wdXRlUmVwbGFjZWRXaWR0aFVzaW5nKExlbmd0aCB3 aWR0aCkgY29uc3Q7CiAgICAgaW50IGNvbXB1dGVSZXBsYWNlZEhlaWdodFVzaW5nKExlbmd0aCBo ZWlnaHQpIGNvbnN0Owo=