63671 2011-06-29 16:59:53 -0700 Switch availableWidth/Height, logicalLeft/RightOffsetForLine to new layout types 2011-06-30 12:17:10 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 leviw leviw eae eric webkit.review.bot oldest_to_newest 429999 0 leviw 2011-06-29 16:59:53 -0700 More LayoutUnits... 430589 1 99349 leviw 2011-06-30 11:48:01 -0700 Created attachment 99349 Patch 430615 2 webkit.review.bot 2011-06-30 12:15:33 -0700 The commit-queue encountered the following flaky tests while processing attachment 99349: http/tests/local/fileapi/file-last-modified.html bug 63294 (author: jianli@chromium.org) The commit-queue is continuing to process your patch. 430618 3 99349 webkit.review.bot 2011-06-30 12:17:06 -0700 Comment on attachment 99349 Patch Clearing flags on attachment: 99349 Committed r90144: <http://trac.webkit.org/changeset/90144> 430619 4 webkit.review.bot 2011-06-30 12:17:10 -0700 All reviewed patches have been landed. Closing bug. 99349 2011-06-30 11:48:01 -0700 2011-06-30 12:17:06 -0700 Patch bug-63671-20110630114800.patch text/plain 10091 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwMDcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDYtMjkgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBhdmFpbGFibGVXaWR0aC9IZWlnaHQsIGxvZ2lj YWxMZWZ0L1JpZ2h0T2Zmc2V0Rm9yTGluZSB0byBuZXcgbGF5b3V0IHR5cGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzY3MQorCisgICAgICAgIFN3 aXRjaCBhdmFpbGFibGVXaWR0aC9IZWlnaHQsIGxvZ2ljYWxMZWZ0L1JpZ2h0T2Zmc2V0Rm9yTGlu ZSBmdW5jdGlvbnMgb3ZlciB0byB0aGUKKyAgICAgICAgbmV3IGxheW91dCB1bml0IGFic3RyYWN0 aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VzLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrOjpsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OmxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckxpbmUpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9jazo6bG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpzdGFydE9mZnNldEZvckxpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVp Z2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YXZhaWxhYmxlTG9naWNhbEhlaWdo dFVzaW5nKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3g6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmF2YWlsYWJsZVdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6YXZhaWxhYmxlSGVpZ2h0KToKKwogMjAxMS0wNi0yOSAgTGV2aSBXZWludHJhdWIgIDxsZXZp d0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDkwMDY5 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzQ1MSw5ICszNDUxLDkgQEAgSGFzaFNldDxSZW5kZXJCb3gqPiogUmVuZGVyQmxv Y2s6OnBlcmNlbgogLy8gZWFjaCBmbG9hdCBpbmRpdmlkdWFsbHksIHdlJ2QganVzdCB3YWxrIGJh Y2t3YXJkcyB0aHJvdWdoIHRoZSAibGluZXMiIGFuZCBzdG9wIHdoZW4gd2UgaGl0IGEgbGluZSB0 aGF0IGlzIGZ1bGx5IGFib3ZlCiAvLyB0aGUgdmVydGljYWwgb2Zmc2V0IHRoYXQgd2UnZCBsaWtl IHRvIGNoZWNrLiAgQ29tcHV0aW5nIHRoZSAibGluZXMiIHdvdWxkIGJlIHJhdGhlciBjb21wbGlj YXRlZCwgYnV0IGNvdWxkIHJlcGxhY2UgdGhlIGxlZnQKIC8vIG9iamVjdHMgYW5kIHJpZ2h0IG9i amVjdHMgY291bnQgaGFjayB0aGF0IGlzIGN1cnJlbnRseSB1c2VkIGhlcmUuCi1pbnQgUmVuZGVy QmxvY2s6OmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShpbnQgbG9naWNhbFRvcCwgaW50IGZpeGVk T2Zmc2V0LCBib29sIGFwcGx5VGV4dEluZGVudCwgaW50KiBoZWlnaHRSZW1haW5pbmcpIGNvbnN0 CitMYXlvdXRVbml0IFJlbmRlckJsb2NrOjpsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoTGF5b3V0 VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBib29sIGFwcGx5VGV4dElu ZGVudCwgTGF5b3V0VW5pdCogaGVpZ2h0UmVtYWluaW5nKSBjb25zdAogewotICAgIGludCBsZWZ0 ID0gZml4ZWRPZmZzZXQ7CisgICAgTGF5b3V0VW5pdCBsZWZ0ID0gZml4ZWRPZmZzZXQ7CiAgICAg aWYgKG1fZmxvYXRpbmdPYmplY3RzICYmIG1fZmxvYXRpbmdPYmplY3RzLT5oYXNMZWZ0T2JqZWN0 cygpKSB7CiAgICAgICAgIGlmIChoZWlnaHRSZW1haW5pbmcpCiAgICAgICAgICAgICAqaGVpZ2h0 UmVtYWluaW5nID0gMTsKQEAgLTM0NzgsNyArMzQ3OCw3IEBAIGludCBSZW5kZXJCbG9jazo6bG9n aWNhbExlZnRPZmZzZXRGb3JMaW4KICAgICB9CiAKICAgICBpZiAoYXBwbHlUZXh0SW5kZW50ICYm IHN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgewotICAgICAgICBpbnQgY3cgPSAw OworICAgICAgICBMYXlvdXRVbml0IGN3ID0gMDsKICAgICAgICAgaWYgKHN0eWxlKCktPnRleHRJ bmRlbnQoKS5pc1BlcmNlbnQoKSkKICAgICAgICAgICAgIGN3ID0gY29udGFpbmluZ0Jsb2NrKCkt PmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpOwogICAgICAgICBsZWZ0ICs9IHN0eWxlKCktPnRleHRJ bmRlbnQoKS5jYWxjTWluVmFsdWUoY3cpOwpAQCAtMzQ4Nyw5ICszNDg3LDkgQEAgaW50IFJlbmRl ckJsb2NrOjpsb2dpY2FsTGVmdE9mZnNldEZvckxpbgogICAgIHJldHVybiBsZWZ0OwogfQogCi1p bnQgUmVuZGVyQmxvY2s6OmxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoaW50IGxvZ2ljYWxUb3As IGludCBmaXhlZE9mZnNldCwgYm9vbCBhcHBseVRleHRJbmRlbnQsIGludCogaGVpZ2h0UmVtYWlu aW5nKSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9y TGluZShMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgZml4ZWRPZmZzZXQsIGJvb2wg YXBwbHlUZXh0SW5kZW50LCBMYXlvdXRVbml0KiBoZWlnaHRSZW1haW5pbmcpIGNvbnN0CiB7Ci0g ICAgaW50IHJpZ2h0ID0gZml4ZWRPZmZzZXQ7CisgICAgTGF5b3V0VW5pdCByaWdodCA9IGZpeGVk T2Zmc2V0OwogCiAgICAgaWYgKG1fZmxvYXRpbmdPYmplY3RzICYmIG1fZmxvYXRpbmdPYmplY3Rz LT5oYXNSaWdodE9iamVjdHMoKSkgewogICAgICAgICBpZiAoaGVpZ2h0UmVtYWluaW5nKQpAQCAt MzUxNSw3ICszNTE1LDcgQEAgaW50IFJlbmRlckJsb2NrOjpsb2dpY2FsUmlnaHRPZmZzZXRGb3JM aQogICAgIH0KICAgICAKICAgICBpZiAoYXBwbHlUZXh0SW5kZW50ICYmICFzdHlsZSgpLT5pc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKCkpIHsKLSAgICAgICAgaW50IGN3ID0gMDsKKyAgICAgICAgTGF5 b3V0VW5pdCBjdyA9IDA7CiAgICAgICAgIGlmIChzdHlsZSgpLT50ZXh0SW5kZW50KCkuaXNQZXJj ZW50KCkpCiAgICAgICAgICAgICBjdyA9IGNvbnRhaW5pbmdCbG9jaygpLT5hdmFpbGFibGVMb2dp Y2FsV2lkdGgoKTsKICAgICAgICAgcmlnaHQgLT0gc3R5bGUoKS0+dGV4dEluZGVudCgpLmNhbGNN aW5WYWx1ZShjdyk7CkBAIC0zNTI0LDkgKzM1MjQsOSBAQCBpbnQgUmVuZGVyQmxvY2s6OmxvZ2lj YWxSaWdodE9mZnNldEZvckxpCiAgICAgcmV0dXJuIHJpZ2h0OwogfQogCi1pbnQgUmVuZGVyQmxv Y2s6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckxpbmUoaW50IHBvc2l0aW9uLCBib29sIGZpcnN0 TGluZSkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0 aEZvckxpbmUoTGF5b3V0VW5pdCBwb3NpdGlvbiwgYm9vbCBmaXJzdExpbmUpIGNvbnN0CiB7Ci0g ICAgaW50IHJlc3VsdCA9IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUocG9zaXRpb24sIGZpcnN0 TGluZSkgLSBsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUocG9zaXRpb24sIGZpcnN0TGluZSk7Cisg ICAgTGF5b3V0VW5pdCByZXN1bHQgPSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKHBvc2l0aW9u LCBmaXJzdExpbmUpIC0gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBmaXJzdExp bmUpOwogICAgIHJldHVybiAocmVzdWx0IDwgMCkgPyAwIDogcmVzdWx0OwogfQogCkBAIC00MjUz LDcgKzQyNTMsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpvZmZzZXRGb3JDb250ZW50cyhJbnRQCiAg ICAgICAgIGFkanVzdFBvaW50VG9Db2x1bW5Db250ZW50cyhvZmZzZXQpOwogfQogCi1pbnQgUmVu ZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRl ckJsb2NrOjphdmFpbGFibGVMb2dpY2FsV2lkdGgoKSBjb25zdAogewogICAgIC8vIElmIHdlIGhh dmUgbXVsdGlwbGUgY29sdW1ucywgdGhlbiB0aGUgYXZhaWxhYmxlIGxvZ2ljYWwgd2lkdGggaXMg cmVkdWNlZCB0byBvdXIgY29sdW1uIHdpZHRoLgogICAgIGlmIChoYXNDb2x1bW5zKCkpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkocmV2aXNpb24gOTAwNjkpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkod29ya2luZyBjb3B5KQpA QCAtMTE1LDE1ICsxMTUsMTUgQEAgcHVibGljOgogICAgIGJvb2wgY29udGFpbnNGbG9hdHMoKSB7 IHJldHVybiBtX2Zsb2F0aW5nT2JqZWN0cyAmJiAhbV9mbG9hdGluZ09iamVjdHMtPnNldCgpLmlz RW1wdHkoKTsgfQogICAgIGJvb2wgY29udGFpbnNGbG9hdChSZW5kZXJCb3gqKTsKIAotICAgIGlu dCBhdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGludCBwb3NpdGlvbiwgYm9vbCBmaXJzdExp bmUpIGNvbnN0OwotICAgIGludCBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKGludCBwb3NpdGlv biwgYm9vbCBmaXJzdExpbmUpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxSaWdodE9mZnNldEZvckxp bmUocG9zaXRpb24sIGxvZ2ljYWxSaWdodE9mZnNldEZvckNvbnRlbnQoKSwgZmlyc3RMaW5lKTsg fQotICAgIGludCBsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoaW50IHBvc2l0aW9uLCBib29sIGZp cnN0TGluZSkgY29uc3QgeyByZXR1cm4gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKHBvc2l0aW9u LCBsb2dpY2FsTGVmdE9mZnNldEZvckNvbnRlbnQoKSwgZmlyc3RMaW5lKTsgfQotICAgIGludCBz dGFydE9mZnNldEZvckxpbmUoaW50IHBvc2l0aW9uLCBib29sIGZpcnN0TGluZSkgY29uc3QgeyBy ZXR1cm4gc3R5bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gbG9naWNhbExlZnRPZmZz ZXRGb3JMaW5lKHBvc2l0aW9uLCBmaXJzdExpbmUpIDogbG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGlu ZShwb3NpdGlvbiwgZmlyc3RMaW5lKTsgfQorICAgIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNh bFdpZHRoRm9yTGluZShMYXlvdXRVbml0IHBvc2l0aW9uLCBib29sIGZpcnN0TGluZSkgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgcG9z aXRpb24sIGJvb2wgZmlyc3RMaW5lKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmlnaHRPZmZzZXRG b3JMaW5lKHBvc2l0aW9uLCBsb2dpY2FsUmlnaHRPZmZzZXRGb3JDb250ZW50KCksIGZpcnN0TGlu ZSk7IH0KKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0 IHBvc2l0aW9uLCBib29sIGZpcnN0TGluZSkgY29uc3QgeyByZXR1cm4gbG9naWNhbExlZnRPZmZz ZXRGb3JMaW5lKHBvc2l0aW9uLCBsb2dpY2FsTGVmdE9mZnNldEZvckNvbnRlbnQoKSwgZmlyc3RM aW5lKTsgfQorICAgIExheW91dFVuaXQgc3RhcnRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgcG9z aXRpb24sIGJvb2wgZmlyc3RMaW5lKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKCkgPyBsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUocG9zaXRpb24sIGZpcnN0 TGluZSkgOiBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBmaXJzdExpbmUpOyB9 CiAKICAgICB2aXJ0dWFsIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbkZvclBvaW50KGNvbnN0IElu dFBvaW50Jik7CiAgICAgCiAgICAgLy8gQmxvY2sgZmxvd3Mgc3ViY2xhc3MgYXZhaWxhYmxlV2lk dGggdG8gaGFuZGxlIG11bHRpIGNvbHVtbiBsYXlvdXQgKHNocmlua2luZyB0aGUgd2lkdGggYXZh aWxhYmxlIHRvIGNoaWxkcmVuIHdoZW4gbGF5aW5nIG91dC4pCi0gICAgdmlydHVhbCBpbnQgYXZh aWxhYmxlTG9naWNhbFdpZHRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IGF2YWls YWJsZUxvZ2ljYWxXaWR0aCgpIGNvbnN0OwogCiAgICAgSW50UG9pbnQgZmxpcEZvcldyaXRpbmdN b2RlSW5jbHVkaW5nQ29sdW1ucyhjb25zdCBJbnRQb2ludCYpIGNvbnN0OwogICAgIHZvaWQgZmxp cEZvcldyaXRpbmdNb2RlSW5jbHVkaW5nQ29sdW1ucyhJbnRSZWN0JikgY29uc3Q7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24gOTAwNjkpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjAzMSwxMiArMjAzMSwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZVJlcGxhY2Vk TG9nCiAgICAgfQogfQogCi1pbnQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0KCkg Y29uc3QKK0xheW91dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0KCkgY29u c3QKIHsKICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbEhlaWdodFVzaW5nKHN0eWxlKCktPmxv Z2ljYWxIZWlnaHQoKSk7CiB9CiAKLWludCBSZW5kZXJCb3g6OmF2YWlsYWJsZUxvZ2ljYWxIZWln aHRVc2luZyhjb25zdCBMZW5ndGgmIGgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6YXZh aWxhYmxlTG9naWNhbEhlaWdodFVzaW5nKGNvbnN0IExlbmd0aCYgaCkgY29uc3QKIHsKICAgICBp ZiAoaC5pc0ZpeGVkKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlQ29udGVudEJveExvZ2ljYWxI ZWlnaHQoaC52YWx1ZSgpKTsKQEAgLTIwNTcsOSArMjA1Nyw5IEBAIGludCBSZW5kZXJCb3g6OmF2 YWlsYWJsZUxvZ2ljYWxIZWlnaHRVc2kKICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDY1MDAKICAgICBpZiAoaXNSZW5kZXJCbG9jaygpICYmIGlzUG9zaXRp b25lZCgpICYmIHN0eWxlKCktPmhlaWdodCgpLmlzQXV0bygpICYmICEoc3R5bGUoKS0+dG9wKCku aXNBdXRvKCkgfHwgc3R5bGUoKS0+Ym90dG9tKCkuaXNBdXRvKCkpKSB7CiAgICAgICAgIFJlbmRl ckJsb2NrKiBibG9jayA9IGNvbnN0X2Nhc3Q8UmVuZGVyQmxvY2sqPih0b1JlbmRlckJsb2NrKHRo aXMpKTsKLSAgICAgICAgaW50IG9sZEhlaWdodCA9IGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCk7Cisg ICAgICAgIExheW91dFVuaXQgb2xkSGVpZ2h0ID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKTsKICAg ICAgICAgYmxvY2stPmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgIGludCBuZXdIZWln aHQgPSBibG9jay0+Y29tcHV0ZUNvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0KGJsb2NrLT5jb250ZW50 TG9naWNhbEhlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBuZXdIZWlnaHQgPSBibG9jay0+ Y29tcHV0ZUNvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0KGJsb2NrLT5jb250ZW50TG9naWNhbEhlaWdo dCgpKTsKICAgICAgICAgYmxvY2stPnNldExvZ2ljYWxIZWlnaHQob2xkSGVpZ2h0KTsKICAgICAg ICAgcmV0dXJuIGNvbXB1dGVDb250ZW50Qm94TG9naWNhbEhlaWdodChuZXdIZWlnaHQpOwogICAg IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDkwMDY5 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCSh3b3JraW5nIGNvcHkp CkBAIC0zMTgsMTQgKzMxOCwxNCBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlUGVy Y2VudGFnZUxvZ2ljYWxIZWlnaHQoY29uc3QgTGVuZ3RoJiBoZWlnaHQpOwogCiAgICAgLy8gQmxv Y2sgZmxvd3Mgc3ViY2xhc3MgYXZhaWxhYmxlV2lkdGggdG8gaGFuZGxlIG11bHRpIGNvbHVtbiBs YXlvdXQgKHNocmlua2luZyB0aGUgd2lkdGggYXZhaWxhYmxlIHRvIGNoaWxkcmVuIHdoZW4gbGF5 aW5nIG91dC4pCi0gICAgdmlydHVhbCBpbnQgYXZhaWxhYmxlTG9naWNhbFdpZHRoKCkgY29uc3Qg eyByZXR1cm4gY29udGVudExvZ2ljYWxXaWR0aCgpOyB9Ci0gICAgaW50IGF2YWlsYWJsZUxvZ2lj YWxIZWlnaHQoKSBjb25zdDsKLSAgICBpbnQgYXZhaWxhYmxlTG9naWNhbEhlaWdodFVzaW5nKGNv bnN0IExlbmd0aCYpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dp Y2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7IH0KKyAgICBM YXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxIZWlnaHQoKSBjb25zdDsKKyAgICBMYXlvdXRVbml0 IGF2YWlsYWJsZUxvZ2ljYWxIZWlnaHRVc2luZyhjb25zdCBMZW5ndGgmKSBjb25zdDsKICAgICAK ICAgICAvLyBUaGVyZSBhcmUgYSBmZXcgY2FzZXMgd2hlcmUgd2UgbmVlZCB0byByZWZlciBzcGVj aWZpY2FsbHkgdG8gdGhlIGF2YWlsYWJsZSBwaHlzaWNhbCB3aWR0aCBhbmQgYXZhaWxhYmxlIHBo eXNpY2FsIGhlaWdodC4KICAgICAvLyBSZWxhdGl2ZSBwb3NpdGlvbmluZyBpcyBvbmUgb2YgdGhv c2UgY2FzZXMsIHNpbmNlIGxlZnQvdG9wIG9mZnNldHMgYXJlIHBoeXNpY2FsLgotICAgIGludCBh dmFpbGFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgPyBhdmFpbGFibGVMb2dpY2FsV2lkdGgoKSA6IGF2YWlsYWJsZUxvZ2ljYWxIZWln aHQoKTsgfQotICAgIGludCBhdmFpbGFibGVIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgp LT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIDog YXZhaWxhYmxlTG9naWNhbFdpZHRoKCk7IH0KKyAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGF2 YWlsYWJsZUxvZ2ljYWxXaWR0aCgpIDogYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpOyB9CisgICAg TGF5b3V0VW5pdCBhdmFpbGFibGVIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0hv cml6b250YWxXcml0aW5nTW9kZSgpID8gYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIDogYXZhaWxh YmxlTG9naWNhbFdpZHRoKCk7IH0KIAogICAgIHZpcnR1YWwgaW50IHZlcnRpY2FsU2Nyb2xsYmFy V2lkdGgoKSBjb25zdDsKICAgICBpbnQgaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpIGNvbnN0 Owo=