120601 2013-09-02 06:18:20 -0700 [BlackBerry] Remove LayerData::LayerProgram 2013-09-03 00:28:20 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson commit-queue jkjiang rwlbuis oldest_to_newest 923680 0 anilsson 2013-09-02 06:18:20 -0700 These days, all layer contents are RGBA, so we don't need the BGRA shaders any more. The default setting of BGRA was only used by layers that wound up drawing display lists using BlackBerry::Platform::Graphics APIs anyway, and the display list code can take care of such details itself. 923686 1 210280 anilsson 2013-09-02 06:30:14 -0700 Created attachment 210280 Patch 923856 2 210280 anilsson 2013-09-02 23:34:55 -0700 Comment on attachment 210280 Patch Thanks Anders! 923858 3 210280 commit-queue 2013-09-02 23:35:45 -0700 Comment on attachment 210280 Patch Rejecting attachment 210280 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 210280, '--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/1691157 923859 4 210326 anilsson 2013-09-02 23:40:28 -0700 Created attachment 210326 Patch Removed Internally reviewed by section from ChangeLog, no internal review happened for this patch 923882 5 210326 commit-queue 2013-09-03 00:28:18 -0700 Comment on attachment 210326 Patch Clearing flags on attachment: 210326 Committed r154971: <http://trac.webkit.org/changeset/154971> 923883 6 commit-queue 2013-09-03 00:28:20 -0700 All reviewed patches have been landed. Closing bug. 210280 2013-09-02 06:30:14 -0700 2013-09-02 23:40:23 -0700 Patch bug-120601-20130902153009.patch text/plain 13047 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRjMTI0YWNjOTNiZDI0 MGQ3NjE5ZTk2YzFiNzhhMGYzNTM3ZTBiNS4uNmY5YjM3MTUyOWJlNjZlZjRmY2I5N2U1MmRlZDNi NTYxMTkxNzc5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTA5LTAyICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUmVt b3ZlIExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA2MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBKSVJBIDQ5MDY3MgorICAgICAgICBBbGwgbGF5ZXIgY29udGVudHMgYXJlIFJH QkEgbm93LCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gc3VwcG9ydCBCR1JBIGFueQorICAgICAgICBt b3JlIGFuZCB0aGUgTGF5ZXJEYXRhOjpMYXllclByb2dyYW0gZW51bSBjYW4gYmUgcmVtb3ZlZC4g UmVsYXRlZCBkZWFkCisgICAgICAgIGNvZGUgd2FzIHJlbW92ZWQuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9ibGFja2JlcnJ5L0VHTEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RUdMSW1hZ2VMYXllcldlYktpdFRocmVhZDo6RUdMSW1hZ2VMYXllcldlYktpdFRo cmVhZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllckRhdGEu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyRGF0YTo6TGF5ZXJEYXRhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5ZXJSZW5kZXJlcjo6Y29tcG9zaXRlTGF5ZXJzUmVjdXJzaXZlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXI6OmNyZWF0ZVByb2dyYW0pOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJXZWJLaXRUaHJlYWQuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1BsdWdpbkxheWVyV2ViS2l0VGhyZWFkLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkxheWVyV2ViS2l0VGhyZWFkOjpzZXRQbHVnaW5W aWV3KToKKwogMjAxMy0wOC0zMCAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAK ICAgICAgICAgW0JsYWNrQmVycnldIEltcHJvdmVkIHVucHJvamVjdCBhbGdvcml0aG0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvRUdMSW1h Z2VMYXllcldlYktpdFRocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L0VHTEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQuY3BwCmluZGV4IGIyOGQ1ZDU4 NWMzZmY3ZGY5YWY1ODY3ZDAzMTZiNTFiZjQyMDZjMWQuLmYzMTA1ZGY1NjI0YmY3YWZiMTk2MGRl NGQ0MzBiMzNlYzE1YTc0Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvRUdMSW1hZ2VMYXllcldlYktpdFRocmVhZC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9FR0xJbWFnZUxheWVyV2Vi S2l0VGhyZWFkLmNwcApAQCAtNDUsNyArNDUsNiBAQCBFR0xJbWFnZUxheWVyV2ViS2l0VGhyZWFk OjpFR0xJbWFnZUxheWVyV2ViS2l0VGhyZWFkKExheWVyVHlwZSB0eXBlKQogICAgICwgbV90ZXh0 dXJlQWNjZXNzb3IoMCkKIHsKICAgICBsYXllckNvbXBvc2l0aW5nVGhyZWFkKCktPnNldENsaWVu dChtX2NsaWVudC5nZXQoKSk7Ci0gICAgc2V0TGF5ZXJQcm9ncmFtKExheWVyUHJvZ3JhbVJHQkEp OwogfQogCiBFR0xJbWFnZUxheWVyV2ViS2l0VGhyZWFkOjp+RUdMSW1hZ2VMYXllcldlYktpdFRo cmVhZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L0xheWVyRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllckRhdGEuaAppbmRleCAwM2E0YTM0MWNiZTM5NDc0ODhmZTcwOTZiODNlMzgy YTQxZWQ1NWU2Li42NDAyZjZlNDZjMTYwNTA4MzBlOTk4YjUyNDZhOGVkYTYwYTBjZDFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVy RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJEYXRhLmgKQEAgLTU2LDExICs1Niw2IEBAIGNsYXNzIExheWVyRGF0YSB7CiBwdWJsaWM6 CiAgICAgZW51bSBMYXllclR5cGUgeyBMYXllciwgVHJhbnNmb3JtTGF5ZXIsIFdlYkdMTGF5ZXIs IENhbnZhc0xheWVyLCBDdXN0b21MYXllciB9OwogICAgIGVudW0gRmlsdGVyVHlwZSB7IExpbmVh ciwgTmVhcmVzdCwgVHJpbGluZWFyLCBMYW5jem9zIH07Ci0gICAgZW51bSBMYXllclByb2dyYW0g ewotICAgICAgICBMYXllclByb2dyYW1SR0JBID0gMCwKLSAgICAgICAgTGF5ZXJQcm9ncmFtQkdS QSwKLSAgICAgICAgTnVtYmVyT2ZMYXllclByb2dyYW1zCi0gICAgfTsKIAogI2lmIEVOQUJMRShD U1NfRklMVEVSUykKICAgICBlbnVtIENTU0ZpbHRlclNoYWRlcnMgewpAQCAtOTEsNyArODYsNiBA QCBwdWJsaWM6CiAgICAgICAgICwgbV9vcGFjaXR5KDEuMCkKICAgICAgICAgLCBtX2FuY2hvclBv aW50WigwLjApCiAgICAgICAgICwgbV9ib3JkZXJXaWR0aCgwLjApCi0gICAgICAgICwgbV9sYXll clByb2dyYW0oTGF5ZXJQcm9ncmFtQkdSQSkKICAgICAgICAgLCBtX3BsdWdpblZpZXcoMCkKICNp ZiBFTkFCTEUoVklERU8pCiAgICAgICAgICwgbV9tZWRpYVBsYXllcigwKQpAQCAtMTU5LDggKzE1 Myw2IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgbmVlZHNUZXh0dXJlKCkgY29uc3QgeyByZXR1cm4g bV9sYXllclR5cGUgPT0gV2ViR0xMYXllciB8fCBtX2xheWVyVHlwZSA9PSBDYW52YXNMYXllciB8 fCBtX25lZWRzVGV4dHVyZTsgfQogCi0gICAgTGF5ZXJQcm9ncmFtIGxheWVyUHJvZ3JhbSgpIGNv bnN0IHsgcmV0dXJuIG1fbGF5ZXJQcm9ncmFtOyB9Ci0KICAgICBib29sIGlzRml4ZWRQb3NpdGlv bigpIGNvbnN0IHsgcmV0dXJuIG1faXNGaXhlZFBvc2l0aW9uOyB9CiAgICAgYm9vbCBoYXNGaXhl ZENvbnRhaW5lcigpIGNvbnN0IHsgcmV0dXJuIG1faGFzRml4ZWRDb250YWluZXI7IH0KICAgICBi b29sIGhhc0ZpeGVkQW5jZXN0b3JJbkRPTVRyZWUoKSBjb25zdCB7IHJldHVybiBtX2hhc0ZpeGVk QW5jZXN0b3JJbkRPTVRyZWU7IH0KQEAgLTIxOSw4ICsyMTEsNiBAQCBwcm90ZWN0ZWQ6CiAgICAg ZmxvYXQgbV9hbmNob3JQb2ludFo7CiAgICAgZmxvYXQgbV9ib3JkZXJXaWR0aDsKIAotICAgIExh eWVyUHJvZ3JhbSBtX2xheWVyUHJvZ3JhbTsKLQogICAgIFBsdWdpblZpZXcqIG1fcGx1Z2luVmll dzsKICNpZiBFTkFCTEUoVklERU8pCiAgICAgTWVkaWFQbGF5ZXIqIG1fbWVkaWFQbGF5ZXI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xh eWVyUmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2ti ZXJyeS9MYXllclJlbmRlcmVyLmNwcAppbmRleCBhMDZhMWNlOTJiMzNhZmMwMWJhNTc5ZDQwYzYx YzNiNDk5MzE2YjJhLi41MmYwYzRiNjNlMDhmMmE1NDE3YTVlMGE3MTgxZGRiMTE4MjVmOTIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xh eWVyUmVuZGVyZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Js YWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAKQEAgLTk3NSwxMSArOTc1LDkgQEAgdm9pZCBMYXll clJlbmRlcmVyOjpjb21wb3NpdGVMYXllcnNSZWN1cnNpdmUoTGF5ZXJDb21wb3NpdGluZ1RocmVh ZCogbGF5ZXIsIGludAogCiAgICAgICAgIC8vIERyYXcgdGhlIHN1cmZhY2Ugb250byBhbm90aGVy IHN1cmZhY2Ugb3Igc2NyZWVuLgogICAgICAgICBib29sIGRyYXdTdXJmYWNlID0gbGF5ZXJBbHJl YWR5T25TdXJmYWNlKGxheWVyKTsKLSAgICAgICAgLy8gVGhlIHRleHR1cmUgZm9ybWF0IGZvciB0 aGUgc3VyZmFjZSBpcyBSR0JBLgotICAgICAgICBMYXllckRhdGE6OkxheWVyUHJvZ3JhbSBsYXll clByb2dyYW0gPSBkcmF3U3VyZmFjZSA/IExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtUkdCQSA6IGxh eWVyLT5sYXllclByb2dyYW0oKTsKIAogICAgICAgICBpZiAoIWRyYXdTdXJmYWNlKSB7Ci0gICAg ICAgICAgICBjb25zdCBHTEVTMlByb2dyYW0mIHByb2dyYW0gPSB1c2VMYXllclByb2dyYW0obGF5 ZXJQcm9ncmFtKTsKKyAgICAgICAgICAgIGNvbnN0IEdMRVMyUHJvZ3JhbSYgcHJvZ3JhbSA9IHVz ZVByb2dyYW0oTGF5ZXJQcm9ncmFtUkdCQSk7CiAgICAgICAgICAgICBsYXllci0+ZHJhd1RleHR1 cmVzKHByb2dyYW0sIG1fc2NhbGUsIG1fdmlzaWJsZVJlY3QsIGNsaXBSZWN0KTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIC8vIERyYXcgdGhlIHJlZmxlY3Rpb24gaWYgaXQgZXhpc3Rz LgpAQCAtOTkxLDExICs5ODksMTEgQEAgdm9pZCBMYXllclJlbmRlcmVyOjpjb21wb3NpdGVMYXll cnNSZWN1cnNpdmUoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIsIGludAogICAgICAgICAg ICAgICAgIGlmICghbWFzayAmJiBsYXllci0+cmVwbGljYUxheWVyKCkpCiAgICAgICAgICAgICAg ICAgICAgIG1hc2sgPSBsYXllci0+cmVwbGljYUxheWVyKCktPm1hc2tMYXllcigpOwogCi0gICAg ICAgICAgICAgICAgY29uc3QgR0xFUzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlTGF5ZXJQcm9ncmFt KGxheWVyUHJvZ3JhbSwgbWFzayk7CisgICAgICAgICAgICAgICAgY29uc3QgR0xFUzJQcm9ncmFt JiBwcm9ncmFtID0gdXNlUHJvZ3JhbShtYXNrID8gTGF5ZXJNYXNrUHJvZ3JhbVJHQkEgOiBMYXll clByb2dyYW1SR0JBKTsKICAgICAgICAgICAgICAgICBsYXllci0+ZHJhd1N1cmZhY2UocHJvZ3Jh bSwgbGF5ZXItPmxheWVyUmVuZGVyZXJTdXJmYWNlKCktPnJlcGxpY2FEcmF3VHJhbnNmb3JtKCks IG1hc2spOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBjb25zdCBHTEVTMlByb2dyYW0m IHByb2dyYW0gPSB1c2VMYXllclByb2dyYW0obGF5ZXJQcm9ncmFtLCBsYXllci0+bWFza0xheWVy KCkpOworICAgICAgICAgICAgY29uc3QgR0xFUzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlUHJvZ3Jh bShsYXllci0+bWFza0xheWVyKCkgPyBMYXllck1hc2tQcm9ncmFtUkdCQSA6IExheWVyUHJvZ3Jh bVJHQkEpOwogICAgICAgICAgICAgbGF5ZXItPmRyYXdTdXJmYWNlKHByb2dyYW0sIGxheWVyLT5s YXllclJlbmRlcmVyU3VyZmFjZSgpLT5kcmF3VHJhbnNmb3JtKCksIGxheWVyLT5tYXNrTGF5ZXIo KSk7CiAgICAgICAgIH0KICAgICB9CkBAIC0xMTY5LDE1ICsxMTY3LDYgQEAgYm9vbCBMYXllclJl bmRlcmVyOjpjcmVhdGVQcm9ncmFtKFByb2dyYW1JbmRleCBwcm9ncmFtKQogICAgICAgICAiICBn bF9GcmFnQ29sb3IgPSB0ZXh0dXJlMkQoc190ZXh0dXJlLCB2X3RleENvb3JkKSAqIGFscGhhOyBc biIKICAgICAgICAgIn0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXG4iOwogCi0gICAgY29uc3QgY2hhciogZnJhZ21lbnRTaGFkZXJTdHJp bmdCR1JBID0KLSAgICAgICAgInZhcnlpbmcgbWVkaXVtcCB2ZWMyIHZfdGV4Q29vcmQ7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSAgICAgICAgInVuaWZvcm0gbG93cCBzYW1w bGVyMkQgc190ZXh0dXJlOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSAgICAg ICAgInVuaWZvcm0gbG93cCBmbG9hdCBhbHBoYTsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcbiIKLSAgICAgICAgInZvaWQgbWFpbigpICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSAgICAgICAgInsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIK LSAgICAgICAgIiAgZ2xfRnJhZ0NvbG9yID0gdGV4dHVyZTJEKHNfdGV4dHVyZSwgdl90ZXhDb29y ZCkuYmdyYSAqIGFscGhhOyBcbiIKLSAgICAgICAgIn0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7Ci0KICAgICBjb25zdCBj aGFyKiBmcmFnbWVudFNoYWRlclN0cmluZ01hc2tSR0JBID0KICAgICAgICAgInZhcnlpbmcgbWVk aXVtcCB2ZWMyIHZfdGV4Q29vcmQ7ICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCiAgICAg ICAgICJ1bmlmb3JtIGxvd3Agc2FtcGxlcjJEIHNfdGV4dHVyZTsgICAgICAgICAgICAgICAgICAg ICAgICAgIFxuIgpAQCAtMTE5MCwxOCArMTE3OSw2IEBAIGJvb2wgTGF5ZXJSZW5kZXJlcjo6Y3Jl YXRlUHJvZ3JhbShQcm9ncmFtSW5kZXggcHJvZ3JhbSkKICAgICAgICAgIiAgZ2xfRnJhZ0NvbG9y ID0gdmVjNCh0ZXhDb2xvci54LCB0ZXhDb2xvci55LCB0ZXhDb2xvci56LCB0ZXhDb2xvci53KSAq IGFscGhhICogbWFza0NvbG9yLnc7ICAgICAgICAgICBcbiIKICAgICAgICAgIn0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iOwogCi0g ICAgY29uc3QgY2hhciogZnJhZ21lbnRTaGFkZXJTdHJpbmdNYXNrQkdSQSA9Ci0gICAgICAgICJ2 YXJ5aW5nIG1lZGl1bXAgdmVjMiB2X3RleENvb3JkOyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXG4iCi0gICAgICAgICJ1bmlmb3JtIGxvd3Agc2FtcGxlcjJEIHNfdGV4dHVyZTsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAgICAgICJ1bmlmb3JtIGxvd3Agc2Ft cGxlcjJEIHNfbWFzazsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAg ICAgICJ1bmlmb3JtIGxvd3AgZmxvYXQgYWxwaGE7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXG4iCi0gICAgICAgICJ2b2lkIG1haW4oKSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAgICAgICJ7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4i Ci0gICAgICAgICIgIGxvd3AgdmVjNCB0ZXhDb2xvciA9IHRleHR1cmUyRChzX3RleHR1cmUsIHZf dGV4Q29vcmQpLmJncmE7ICAgICAgICAgICAgIFxuIgotICAgICAgICAiICBsb3dwIHZlYzQgbWFz a0NvbG9yID0gdGV4dHVyZTJEKHNfbWFzaywgdl90ZXhDb29yZCkuYmdyYTsgICAgICAgICAgXG4i Ci0gICAgICAgICIgIGdsX0ZyYWdDb2xvciA9IHZlYzQodGV4Q29sb3IueCwgdGV4Q29sb3IueSwg dGV4Q29sb3IueiwgdGV4Q29sb3IudykgKiBhbHBoYSAqIG1hc2tDb2xvci53OyAgICAgICAgIFxu IgotICAgICAgICAifSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFxuIjsKLQogICAgIC8vIFNoYWRlcnMgZm9yIGRyYXdpbmcgdGhl IGRlYnVnIGJvcmRlcnMgYXJvdW5kIHRoZSBsYXllcnMuCiAgICAgY29uc3QgY2hhciogY29sb3JW ZXJ0ZXhTaGFkZXJTdHJpbmcgPQogICAgICAgICAiYXR0cmlidXRlIHZlYzQgYV9wb3NpdGlvbjsg ICBcbiIKQEAgLTEyMjIsOSArMTE5OSw3IEBAIGJvb2wgTGF5ZXJSZW5kZXJlcjo6Y3JlYXRlUHJv Z3JhbShQcm9ncmFtSW5kZXggcHJvZ3JhbSkKIAogICAgIHN3aXRjaCAocHJvZ3JhbSkgewogICAg IGNhc2UgTGF5ZXJQcm9ncmFtUkdCQToKLSAgICBjYXNlIExheWVyUHJvZ3JhbUJHUkE6CiAgICAg Y2FzZSBMYXllck1hc2tQcm9ncmFtUkdCQToKLSAgICBjYXNlIExheWVyTWFza1Byb2dyYW1CR1JB OgogICAgICAgICB2ZXJ0ZXhTaGFkZXIgPSB2ZXJ0ZXhTaGFkZXJTdHJpbmc7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgQ29sb3JQcm9ncmFtOgpAQCAtMTIzOCwxNSArMTIxMyw5IEBAIGJvb2wg TGF5ZXJSZW5kZXJlcjo6Y3JlYXRlUHJvZ3JhbShQcm9ncmFtSW5kZXggcHJvZ3JhbSkKICAgICBj YXNlIExheWVyUHJvZ3JhbVJHQkE6CiAgICAgICAgIGZyYWdtZW50U2hhZGVyID0gZnJhZ21lbnRT aGFkZXJTdHJpbmdSR0JBOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIExheWVyUHJvZ3JhbUJH UkE6Ci0gICAgICAgIGZyYWdtZW50U2hhZGVyID0gZnJhZ21lbnRTaGFkZXJTdHJpbmdCR1JBOwot ICAgICAgICBicmVhazsKICAgICBjYXNlIExheWVyTWFza1Byb2dyYW1SR0JBOgogICAgICAgICBm cmFnbWVudFNoYWRlciA9IGZyYWdtZW50U2hhZGVyU3RyaW5nTWFza1JHQkE7CiAgICAgICAgIGJy ZWFrOwotICAgIGNhc2UgTGF5ZXJNYXNrUHJvZ3JhbUJHUkE6Ci0gICAgICAgIGZyYWdtZW50U2hh ZGVyID0gZnJhZ21lbnRTaGFkZXJTdHJpbmdNYXNrQkdSQTsKLSAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBDb2xvclByb2dyYW06CiAgICAgICAgIGZyYWdtZW50U2hhZGVyID0gY29sb3JGcmFnbWVu dFNoYWRlclN0cmluZzsKICAgICAgICAgYnJlYWs7CkBAIC0xMjgxLDE1ICsxMjUwLDEzIEBAIGJv b2wgTGF5ZXJSZW5kZXJlcjo6Y3JlYXRlUHJvZ3JhbShQcm9ncmFtSW5kZXggcHJvZ3JhbSkKICAg ICAvLyBHZXQgbG9jYXRpb25zIG9mIHVuaWZvcm1zIGZvciB0aGUgbGF5ZXIgY29udGVudCBzaGFk ZXIgcHJvZ3JhbS4KICAgICBtX3Byb2dyYW1zW3Byb2dyYW1dLm1fbG9jYXRpb25zW0dMRVMyUHJv Z3JhbTo6T3BhY2l0eVVuaWZvcm1dID0gZ2xHZXRVbmlmb3JtTG9jYXRpb24ocHJvZ3JhbU9iamVj dCwgImFscGhhIik7CiAgICAgc3dpdGNoIChwcm9ncmFtKSB7Ci0gICAgY2FzZSBMYXllclByb2dy YW1SR0JBOgotICAgIGNhc2UgTGF5ZXJQcm9ncmFtQkdSQTogeworICAgIGNhc2UgTGF5ZXJQcm9n cmFtUkdCQTogewogICAgICAgICBHTGludCBzYW1wbGVyTG9jYXRpb24gPSBnbEdldFVuaWZvcm1M b2NhdGlvbihwcm9ncmFtT2JqZWN0LCAic190ZXh0dXJlIik7CiAgICAgICAgIGdsVXNlUHJvZ3Jh bShwcm9ncmFtT2JqZWN0KTsKICAgICAgICAgZ2xVbmlmb3JtMWkoc2FtcGxlckxvY2F0aW9uLCAw KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgTGF5ZXJNYXNrUHJvZ3JhbVJHQkE6 Ci0gICAgY2FzZSBMYXllck1hc2tQcm9ncmFtQkdSQTogeworICAgIGNhc2UgTGF5ZXJNYXNrUHJv Z3JhbVJHQkE6IHsKICAgICAgICAgR0xpbnQgbWFza1NhbXBsZXJMb2NhdGlvbiA9IGdsR2V0VW5p Zm9ybUxvY2F0aW9uKHByb2dyYW1PYmplY3QsICJzX3RleHR1cmUiKTsKICAgICAgICAgR0xpbnQg bWFza1NhbXBsZXJMb2NhdGlvbk1hc2sgPSBnbEdldFVuaWZvcm1Mb2NhdGlvbihwcm9ncmFtT2Jq ZWN0LCAic19tYXNrIik7CiAgICAgICAgIGdsVXNlUHJvZ3JhbShwcm9ncmFtT2JqZWN0KTsKQEAg LTEzMjQsMTQgKzEyOTEsNiBAQCBjb25zdCBHTEVTMlByb2dyYW0mIExheWVyUmVuZGVyZXI6OnVz ZVByb2dyYW0oUHJvZ3JhbUluZGV4IGluZGV4KQogICAgIHJldHVybiBwcm9ncmFtOwogfQogCi1j b25zdCBHTEVTMlByb2dyYW0mIExheWVyUmVuZGVyZXI6OnVzZUxheWVyUHJvZ3JhbShMYXllckRh dGE6OkxheWVyUHJvZ3JhbSBsYXllclByb2dyYW0sIGJvb2wgaXNNYXNrIC8qID0gZmFsc2UgKi8p Ci17Ci0gICAgaW50IHByb2dyYW0gPSBsYXllclByb2dyYW07Ci0gICAgaWYgKGlzTWFzaykKLSAg ICAgICAgcHJvZ3JhbSArPSBNYXNrUHJvZ3JhbXM7Ci0gICAgcmV0dXJuIHVzZVByb2dyYW0oc3Rh dGljX2Nhc3Q8UHJvZ3JhbUluZGV4Pihwcm9ncmFtKSk7Ci19Ci0KIHZvaWQgTGF5ZXJSZW5kZXJp bmdSZXN1bHRzOjphZGREaXJ0eVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBJbnRS ZWN0IGRpcnR5VW5pb25bTnVtYmVyT2ZEaXJ0eVJlY3RzXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmgK aW5kZXggZTRlNDg5NmQ3ZmRjMTE4NTlkN2Y0YzM1YTk3MDMyNzkyZDNjOTA4NS4uNjc1OTdhNDNk MjY1YjdjNTY0NmY1MzA0MDMyYTVjODU3YTk1YjQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmgK QEAgLTE2OCwyMiArMTY4LDE0IEBAIHByaXZhdGU6CiAgICAgdm9pZCBlcmFzZUZyb21TdGVuY2ls QnVmZmVyKGludCBzdGVuY2lsVmFsdWUsIGNvbnN0IFZlY3RvcjxGbG9hdFBvaW50LCA0PiYgdmVy dGljZXMpOwogCiAgICAgZW51bSBQcm9ncmFtSW5kZXggewotICAgICAgICBMYXllclByb2dyYW1S R0JBID0gTGF5ZXJEYXRhOjpMYXllclByb2dyYW1SR0JBLAotICAgICAgICBMYXllclByb2dyYW1C R1JBID0gTGF5ZXJEYXRhOjpMYXllclByb2dyYW1CR1JBLAotCi0gICAgICAgIE1hc2tQcm9ncmFt cywKLSAgICAgICAgTGF5ZXJNYXNrUHJvZ3JhbVJHQkEgPSBNYXNrUHJvZ3JhbXMgKyBMYXllckRh dGE6OkxheWVyUHJvZ3JhbVJHQkEsCi0gICAgICAgIExheWVyTWFza1Byb2dyYW1CR1JBID0gTWFz a1Byb2dyYW1zICsgTGF5ZXJEYXRhOjpMYXllclByb2dyYW1CR1JBLAotCi0gICAgICAgIEludGVy bmFsUHJvZ3JhbXMsCi0gICAgICAgIENvbG9yUHJvZ3JhbSA9IEludGVybmFsUHJvZ3JhbXMsCi0K KyAgICAgICAgTGF5ZXJQcm9ncmFtUkdCQSwKKyAgICAgICAgTGF5ZXJNYXNrUHJvZ3JhbVJHQkEs CisgICAgICAgIENvbG9yUHJvZ3JhbSwKICAgICAgICAgTnVtYmVyT2ZQcm9ncmFtcwogICAgIH07 CiAKICAgICBib29sIGNyZWF0ZVByb2dyYW0oUHJvZ3JhbUluZGV4KTsKICAgICBjb25zdCBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyUHJvZ3JhbSYgdXNlUHJvZ3JhbShQcm9n cmFtSW5kZXgpOwotICAgIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6R0xF UzJQcm9ncmFtJiB1c2VMYXllclByb2dyYW0oTGF5ZXJEYXRhOjpMYXllclByb2dyYW0sIGJvb2wg aXNNYXNrID0gZmFsc2UpOwogCiAgICAgTGF5ZXJSZW5kZXJlckNsaWVudCogbV9jbGllbnQ7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJXZWJLaXRUaHJlYWQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Js YWNrYmVycnkvTGF5ZXJXZWJLaXRUaHJlYWQuaAppbmRleCBkMGE0N2I3NDRlMmVmNmY4ZTMwYmQ4 Y2I3MGFjMTQxODMxOWI3ZGZiLi5lOGI4NWM4NTJhZmE3ODU1Y2Y3YWEwMzNjNmJlZDRhYzJjMGJl M2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2Jl cnJ5L0xheWVyV2ViS2l0VGhyZWFkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9MYXllcldlYktpdFRocmVhZC5oCkBAIC0yMjEsNyArMjIxLDYgQEAg cHJvdGVjdGVkOgogICAgIExheWVyV2ViS2l0VGhyZWFkKExheWVyVHlwZSwgR3JhcGhpY3NMYXll ckJsYWNrQmVycnkqIG93bmVyKTsKIAogICAgIHZvaWQgc2V0TmVlZHNUZXh0dXJlKGJvb2wgbmVl ZHNUZXh0dXJlKSB7IG1fbmVlZHNUZXh0dXJlID0gbmVlZHNUZXh0dXJlOyB9Ci0gICAgdm9pZCBz ZXRMYXllclByb2dyYW0oTGF5ZXJEYXRhOjpMYXllclByb2dyYW0gbGF5ZXJQcm9ncmFtKSB7IG1f bGF5ZXJQcm9ncmFtID0gbGF5ZXJQcm9ncmFtOyB9CiAgICAgYm9vbCBpc0RyYXdhYmxlKCkgY29u c3QgeyByZXR1cm4gbV9pc0RyYXdhYmxlOyB9CiAKICAgICB2b2lkIHVwZGF0ZVZpc2liaWxpdHko KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvUGx1Z2luTGF5ZXJXZWJLaXRUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYmxhY2tiZXJyeS9QbHVnaW5MYXllcldlYktpdFRocmVhZC5jcHAKaW5kZXggYWY3 MWMxMGJmNmY5NDBmYzg2ZmUxZjI1MTA3Y2ZiOWQ0OTFlMTZiMi4uMjUxY2MwZmQ0OTQzY2ZhYTIy Yjk4NDI0Y2JiNDI3ZjMxNmU0NjliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbHVnaW5MYXllcldlYktpdFRocmVhZC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbHVnaW5MYXllcldl YktpdFRocmVhZC5jcHAKQEAgLTQxLDcgKzQxLDYgQEAgdm9pZCBQbHVnaW5MYXllcldlYktpdFRo cmVhZDo6c2V0UGx1Z2luVmlldyhQbHVnaW5WaWV3KiBwbHVnaW5WaWV3KQogewogICAgIG1fcGx1 Z2luVmlldyA9IHBsdWdpblZpZXc7CiAgICAgc2V0TmVlZHNUZXh0dXJlKGlzRHJhd2FibGUoKSAm JiBwbHVnaW5WaWV3KTsKLSAgICBzZXRMYXllclByb2dyYW0oTGF5ZXJQcm9ncmFtUkdCQSk7CiAK ICAgICBpZiAobV9wbHVnaW5WaWV3KQogICAgICAgICBzZXROZWVkc0Rpc3BsYXkoKTsK 210326 2013-09-02 23:40:28 -0700 2013-09-03 00:28:18 -0700 Patch bug-120601-20130903084023.patch text/plain 13000 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRjMTI0YWNjOTNiZDI0 MGQ3NjE5ZTk2YzFiNzhhMGYzNTM3ZTBiNS4uZGNjMWRmMmUzN2RmMjM5MTcxNjc5ZWExY2RlNzdm MTM4YTUyN2JhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA5LTAyICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUmVt b3ZlIExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA2MDEKKworICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMg Q2FybHNzb24uCisKKyAgICAgICAgSklSQSA0OTA2NzIKKyAgICAgICAgQWxsIGxheWVyIGNvbnRl bnRzIGFyZSBSR0JBIG5vdywgc28gdGhlcmUncyBubyBuZWVkIHRvIHN1cHBvcnQgQkdSQSBhbnkK KyAgICAgICAgbW9yZSBhbmQgdGhlIExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtIGVudW0gY2FuIGJl IHJlbW92ZWQuIFJlbGF0ZWQgZGVhZAorICAgICAgICBjb2RlIHdhcyByZW1vdmVkLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9FR0xJbWFnZUxheWVyV2ViS2l0VGhyZWFkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVHTEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQ6OkVHTEltYWdlTGF5 ZXJXZWJLaXRUaHJlYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJEYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXllckRhdGE6OkxheWVyRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXI6OmNvbXBvc2l0ZUxheWVyc1JlY3Vyc2l2 ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyOjpjcmVhdGVQcm9ncmFtKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyV2ViS2l0VGhyZWFkLmg6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbHVnaW5MYXllcldlYktp dFRocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5MYXllcldlYktpdFRocmVhZDo6 c2V0UGx1Z2luVmlldyk6CisKIDIwMTMtMDgtMzAgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkBy aW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBJbXByb3ZlZCB1bnByb2plY3QgYWxnb3Jp dGhtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2Jl cnJ5L0VHTEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9FR0xJbWFnZUxheWVyV2ViS2l0VGhyZWFkLmNwcAppbmRl eCBiMjhkNWQ1ODVjM2ZmN2RmOWFmNTg2N2QwMzE2YjUxYmY0MjA2YzFkLi5mMzEwNWRmNTYyNGJm N2FmYjE5NjBkZTRkNDMwYjMzZWMxNWE3NGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0VHTEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvRUdMSW1h Z2VMYXllcldlYktpdFRocmVhZC5jcHAKQEAgLTQ1LDcgKzQ1LDYgQEAgRUdMSW1hZ2VMYXllcldl YktpdFRocmVhZDo6RUdMSW1hZ2VMYXllcldlYktpdFRocmVhZChMYXllclR5cGUgdHlwZSkKICAg ICAsIG1fdGV4dHVyZUFjY2Vzc29yKDApCiB7CiAgICAgbGF5ZXJDb21wb3NpdGluZ1RocmVhZCgp LT5zZXRDbGllbnQobV9jbGllbnQuZ2V0KCkpOwotICAgIHNldExheWVyUHJvZ3JhbShMYXllclBy b2dyYW1SR0JBKTsKIH0KIAogRUdMSW1hZ2VMYXllcldlYktpdFRocmVhZDo6fkVHTEltYWdlTGF5 ZXJXZWJLaXRUaHJlYWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9MYXllckRhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJEYXRhLmgKaW5kZXggMDNhNGEzNDFjYmUzOTQ3NDg4ZmU3 MDk2YjgzZTM4MmE0MWVkNTVlNi4uNjQwMmY2ZTQ2YzE2MDUwODMwZTk5OGI1MjQ2YThlZGE2MGEw Y2QxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2ti ZXJyeS9MYXllckRhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0xheWVyRGF0YS5oCkBAIC01NiwxMSArNTYsNiBAQCBjbGFzcyBMYXllckRhdGEg ewogcHVibGljOgogICAgIGVudW0gTGF5ZXJUeXBlIHsgTGF5ZXIsIFRyYW5zZm9ybUxheWVyLCBX ZWJHTExheWVyLCBDYW52YXNMYXllciwgQ3VzdG9tTGF5ZXIgfTsKICAgICBlbnVtIEZpbHRlclR5 cGUgeyBMaW5lYXIsIE5lYXJlc3QsIFRyaWxpbmVhciwgTGFuY3pvcyB9OwotICAgIGVudW0gTGF5 ZXJQcm9ncmFtIHsKLSAgICAgICAgTGF5ZXJQcm9ncmFtUkdCQSA9IDAsCi0gICAgICAgIExheWVy UHJvZ3JhbUJHUkEsCi0gICAgICAgIE51bWJlck9mTGF5ZXJQcm9ncmFtcwotICAgIH07CiAKICNp ZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiAgICAgZW51bSBDU1NGaWx0ZXJTaGFkZXJzIHsKQEAgLTkx LDcgKzg2LDYgQEAgcHVibGljOgogICAgICAgICAsIG1fb3BhY2l0eSgxLjApCiAgICAgICAgICwg bV9hbmNob3JQb2ludFooMC4wKQogICAgICAgICAsIG1fYm9yZGVyV2lkdGgoMC4wKQotICAgICAg ICAsIG1fbGF5ZXJQcm9ncmFtKExheWVyUHJvZ3JhbUJHUkEpCiAgICAgICAgICwgbV9wbHVnaW5W aWV3KDApCiAjaWYgRU5BQkxFKFZJREVPKQogICAgICAgICAsIG1fbWVkaWFQbGF5ZXIoMCkKQEAg LTE1OSw4ICsxNTMsNiBAQCBwdWJsaWM6CiAKICAgICBib29sIG5lZWRzVGV4dHVyZSgpIGNvbnN0 IHsgcmV0dXJuIG1fbGF5ZXJUeXBlID09IFdlYkdMTGF5ZXIgfHwgbV9sYXllclR5cGUgPT0gQ2Fu dmFzTGF5ZXIgfHwgbV9uZWVkc1RleHR1cmU7IH0KIAotICAgIExheWVyUHJvZ3JhbSBsYXllclBy b2dyYW0oKSBjb25zdCB7IHJldHVybiBtX2xheWVyUHJvZ3JhbTsgfQotCiAgICAgYm9vbCBpc0Zp eGVkUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2lzRml4ZWRQb3NpdGlvbjsgfQogICAgIGJv b2wgaGFzRml4ZWRDb250YWluZXIoKSBjb25zdCB7IHJldHVybiBtX2hhc0ZpeGVkQ29udGFpbmVy OyB9CiAgICAgYm9vbCBoYXNGaXhlZEFuY2VzdG9ySW5ET01UcmVlKCkgY29uc3QgeyByZXR1cm4g bV9oYXNGaXhlZEFuY2VzdG9ySW5ET01UcmVlOyB9CkBAIC0yMTksOCArMjExLDYgQEAgcHJvdGVj dGVkOgogICAgIGZsb2F0IG1fYW5jaG9yUG9pbnRaOwogICAgIGZsb2F0IG1fYm9yZGVyV2lkdGg7 CiAKLSAgICBMYXllclByb2dyYW0gbV9sYXllclByb2dyYW07Ci0KICAgICBQbHVnaW5WaWV3KiBt X3BsdWdpblZpZXc7CiAjaWYgRU5BQkxFKFZJREVPKQogICAgIE1lZGlhUGxheWVyKiBtX21lZGlh UGxheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAKaW5kZXggYTA2YTFjZTkyYjMzYWZjMDFi YTU3OWQ0MGM2MWMzYjQ5OTMxNmIyYS4uNTJmMGM0YjYzZTA4ZjJhNTQxN2E1ZTBhNzE4MWRkYjEx ODI1ZjkyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwCkBAIC05NzUsMTEgKzk3NSw5IEBA IHZvaWQgTGF5ZXJSZW5kZXJlcjo6Y29tcG9zaXRlTGF5ZXJzUmVjdXJzaXZlKExheWVyQ29tcG9z aXRpbmdUaHJlYWQqIGxheWVyLCBpbnQKIAogICAgICAgICAvLyBEcmF3IHRoZSBzdXJmYWNlIG9u dG8gYW5vdGhlciBzdXJmYWNlIG9yIHNjcmVlbi4KICAgICAgICAgYm9vbCBkcmF3U3VyZmFjZSA9 IGxheWVyQWxyZWFkeU9uU3VyZmFjZShsYXllcik7Ci0gICAgICAgIC8vIFRoZSB0ZXh0dXJlIGZv cm1hdCBmb3IgdGhlIHN1cmZhY2UgaXMgUkdCQS4KLSAgICAgICAgTGF5ZXJEYXRhOjpMYXllclBy b2dyYW0gbGF5ZXJQcm9ncmFtID0gZHJhd1N1cmZhY2UgPyBMYXllckRhdGE6OkxheWVyUHJvZ3Jh bVJHQkEgOiBsYXllci0+bGF5ZXJQcm9ncmFtKCk7CiAKICAgICAgICAgaWYgKCFkcmF3U3VyZmFj ZSkgewotICAgICAgICAgICAgY29uc3QgR0xFUzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlTGF5ZXJQ cm9ncmFtKGxheWVyUHJvZ3JhbSk7CisgICAgICAgICAgICBjb25zdCBHTEVTMlByb2dyYW0mIHBy b2dyYW0gPSB1c2VQcm9ncmFtKExheWVyUHJvZ3JhbVJHQkEpOwogICAgICAgICAgICAgbGF5ZXIt PmRyYXdUZXh0dXJlcyhwcm9ncmFtLCBtX3NjYWxlLCBtX3Zpc2libGVSZWN0LCBjbGlwUmVjdCk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBEcmF3IHRoZSByZWZsZWN0aW9uIGlm IGl0IGV4aXN0cy4KQEAgLTk5MSwxMSArOTg5LDExIEBAIHZvaWQgTGF5ZXJSZW5kZXJlcjo6Y29t cG9zaXRlTGF5ZXJzUmVjdXJzaXZlKExheWVyQ29tcG9zaXRpbmdUaHJlYWQqIGxheWVyLCBpbnQK ICAgICAgICAgICAgICAgICBpZiAoIW1hc2sgJiYgbGF5ZXItPnJlcGxpY2FMYXllcigpKQogICAg ICAgICAgICAgICAgICAgICBtYXNrID0gbGF5ZXItPnJlcGxpY2FMYXllcigpLT5tYXNrTGF5ZXIo KTsKIAotICAgICAgICAgICAgICAgIGNvbnN0IEdMRVMyUHJvZ3JhbSYgcHJvZ3JhbSA9IHVzZUxh eWVyUHJvZ3JhbShsYXllclByb2dyYW0sIG1hc2spOworICAgICAgICAgICAgICAgIGNvbnN0IEdM RVMyUHJvZ3JhbSYgcHJvZ3JhbSA9IHVzZVByb2dyYW0obWFzayA/IExheWVyTWFza1Byb2dyYW1S R0JBIDogTGF5ZXJQcm9ncmFtUkdCQSk7CiAgICAgICAgICAgICAgICAgbGF5ZXItPmRyYXdTdXJm YWNlKHByb2dyYW0sIGxheWVyLT5sYXllclJlbmRlcmVyU3VyZmFjZSgpLT5yZXBsaWNhRHJhd1Ry YW5zZm9ybSgpLCBtYXNrKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgY29uc3QgR0xF UzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlTGF5ZXJQcm9ncmFtKGxheWVyUHJvZ3JhbSwgbGF5ZXIt Pm1hc2tMYXllcigpKTsKKyAgICAgICAgICAgIGNvbnN0IEdMRVMyUHJvZ3JhbSYgcHJvZ3JhbSA9 IHVzZVByb2dyYW0obGF5ZXItPm1hc2tMYXllcigpID8gTGF5ZXJNYXNrUHJvZ3JhbVJHQkEgOiBM YXllclByb2dyYW1SR0JBKTsKICAgICAgICAgICAgIGxheWVyLT5kcmF3U3VyZmFjZShwcm9ncmFt LCBsYXllci0+bGF5ZXJSZW5kZXJlclN1cmZhY2UoKS0+ZHJhd1RyYW5zZm9ybSgpLCBsYXllci0+ bWFza0xheWVyKCkpOwogICAgICAgICB9CiAgICAgfQpAQCAtMTE2OSwxNSArMTE2Nyw2IEBAIGJv b2wgTGF5ZXJSZW5kZXJlcjo6Y3JlYXRlUHJvZ3JhbShQcm9ncmFtSW5kZXggcHJvZ3JhbSkKICAg ICAgICAgIiAgZ2xfRnJhZ0NvbG9yID0gdGV4dHVyZTJEKHNfdGV4dHVyZSwgdl90ZXhDb29yZCkg KiBhbHBoYTsgXG4iCiAgICAgICAgICJ9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFxuIjsKIAotICAgIGNvbnN0IGNoYXIqIGZyYWdtZW50 U2hhZGVyU3RyaW5nQkdSQSA9Ci0gICAgICAgICJ2YXJ5aW5nIG1lZGl1bXAgdmVjMiB2X3RleENv b3JkOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAgICAgICJ1bmlmb3Jt IGxvd3Agc2FtcGxlcjJEIHNfdGV4dHVyZTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XG4iCi0gICAgICAgICJ1bmlmb3JtIGxvd3AgZmxvYXQgYWxwaGE7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAgICAgICJ2b2lkIG1haW4oKSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0gICAgICAgICJ7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXG4iCi0gICAgICAgICIgIGdsX0ZyYWdDb2xvciA9IHRleHR1cmUyRChzX3RleHR1cmUs IHZfdGV4Q29vcmQpLmJncmEgKiBhbHBoYTsgXG4iCi0gICAgICAgICJ9ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iOwotCiAg ICAgY29uc3QgY2hhciogZnJhZ21lbnRTaGFkZXJTdHJpbmdNYXNrUkdCQSA9CiAgICAgICAgICJ2 YXJ5aW5nIG1lZGl1bXAgdmVjMiB2X3RleENvb3JkOyAgICAgICAgICAgICAgICAgICAgICAgICAg IFxuIgogICAgICAgICAidW5pZm9ybSBsb3dwIHNhbXBsZXIyRCBzX3RleHR1cmU7ICAgICAgICAg ICAgICAgICAgICAgICAgICBcbiIKQEAgLTExOTAsMTggKzExNzksNiBAQCBib29sIExheWVyUmVu ZGVyZXI6OmNyZWF0ZVByb2dyYW0oUHJvZ3JhbUluZGV4IHByb2dyYW0pCiAgICAgICAgICIgIGds X0ZyYWdDb2xvciA9IHZlYzQodGV4Q29sb3IueCwgdGV4Q29sb3IueSwgdGV4Q29sb3IueiwgdGV4 Q29sb3IudykgKiBhbHBoYSAqIG1hc2tDb2xvci53OyAgICAgICAgICAgXG4iCiAgICAgICAgICJ9 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFxuIjsKIAotICAgIGNvbnN0IGNoYXIqIGZyYWdtZW50U2hhZGVyU3RyaW5nTWFza0JHUkEgPQot ICAgICAgICAidmFyeWluZyBtZWRpdW1wIHZlYzIgdl90ZXhDb29yZDsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFxuIgotICAgICAgICAidW5pZm9ybSBsb3dwIHNhbXBsZXIyRCBzX3Rl eHR1cmU7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotICAgICAgICAidW5pZm9y bSBsb3dwIHNhbXBsZXIyRCBzX21hc2s7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFxuIgotICAgICAgICAidW5pZm9ybSBsb3dwIGZsb2F0IGFscGhhOyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFxuIgotICAgICAgICAidm9pZCBtYWluKCkgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotICAgICAgICAi eyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFxuIgotICAgICAgICAiICBsb3dwIHZlYzQgdGV4Q29sb3IgPSB0ZXh0dXJlMkQoc190 ZXh0dXJlLCB2X3RleENvb3JkKS5iZ3JhOyAgICAgICAgICAgICBcbiIKLSAgICAgICAgIiAgbG93 cCB2ZWM0IG1hc2tDb2xvciA9IHRleHR1cmUyRChzX21hc2ssIHZfdGV4Q29vcmQpLmJncmE7ICAg ICAgICAgIFxuIgotICAgICAgICAiICBnbF9GcmFnQ29sb3IgPSB2ZWM0KHRleENvbG9yLngsIHRl eENvbG9yLnksIHRleENvbG9yLnosIHRleENvbG9yLncpICogYWxwaGEgKiBtYXNrQ29sb3Iudzsg ICAgICAgICBcbiIKLSAgICAgICAgIn0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7Ci0KICAgICAvLyBTaGFkZXJzIGZvciBk cmF3aW5nIHRoZSBkZWJ1ZyBib3JkZXJzIGFyb3VuZCB0aGUgbGF5ZXJzLgogICAgIGNvbnN0IGNo YXIqIGNvbG9yVmVydGV4U2hhZGVyU3RyaW5nID0KICAgICAgICAgImF0dHJpYnV0ZSB2ZWM0IGFf cG9zaXRpb247ICAgXG4iCkBAIC0xMjIyLDkgKzExOTksNyBAQCBib29sIExheWVyUmVuZGVyZXI6 OmNyZWF0ZVByb2dyYW0oUHJvZ3JhbUluZGV4IHByb2dyYW0pCiAKICAgICBzd2l0Y2ggKHByb2dy YW0pIHsKICAgICBjYXNlIExheWVyUHJvZ3JhbVJHQkE6Ci0gICAgY2FzZSBMYXllclByb2dyYW1C R1JBOgogICAgIGNhc2UgTGF5ZXJNYXNrUHJvZ3JhbVJHQkE6Ci0gICAgY2FzZSBMYXllck1hc2tQ cm9ncmFtQkdSQToKICAgICAgICAgdmVydGV4U2hhZGVyID0gdmVydGV4U2hhZGVyU3RyaW5nOwog ICAgICAgICBicmVhazsKICAgICBjYXNlIENvbG9yUHJvZ3JhbToKQEAgLTEyMzgsMTUgKzEyMTMs OSBAQCBib29sIExheWVyUmVuZGVyZXI6OmNyZWF0ZVByb2dyYW0oUHJvZ3JhbUluZGV4IHByb2dy YW0pCiAgICAgY2FzZSBMYXllclByb2dyYW1SR0JBOgogICAgICAgICBmcmFnbWVudFNoYWRlciA9 IGZyYWdtZW50U2hhZGVyU3RyaW5nUkdCQTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBMYXll clByb2dyYW1CR1JBOgotICAgICAgICBmcmFnbWVudFNoYWRlciA9IGZyYWdtZW50U2hhZGVyU3Ry aW5nQkdSQTsKLSAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBMYXllck1hc2tQcm9ncmFtUkdCQToK ICAgICAgICAgZnJhZ21lbnRTaGFkZXIgPSBmcmFnbWVudFNoYWRlclN0cmluZ01hc2tSR0JBOwog ICAgICAgICBicmVhazsKLSAgICBjYXNlIExheWVyTWFza1Byb2dyYW1CR1JBOgotICAgICAgICBm cmFnbWVudFNoYWRlciA9IGZyYWdtZW50U2hhZGVyU3RyaW5nTWFza0JHUkE7Ci0gICAgICAgIGJy ZWFrOwogICAgIGNhc2UgQ29sb3JQcm9ncmFtOgogICAgICAgICBmcmFnbWVudFNoYWRlciA9IGNv bG9yRnJhZ21lbnRTaGFkZXJTdHJpbmc7CiAgICAgICAgIGJyZWFrOwpAQCAtMTI4MSwxNSArMTI1 MCwxMyBAQCBib29sIExheWVyUmVuZGVyZXI6OmNyZWF0ZVByb2dyYW0oUHJvZ3JhbUluZGV4IHBy b2dyYW0pCiAgICAgLy8gR2V0IGxvY2F0aW9ucyBvZiB1bmlmb3JtcyBmb3IgdGhlIGxheWVyIGNv bnRlbnQgc2hhZGVyIHByb2dyYW0uCiAgICAgbV9wcm9ncmFtc1twcm9ncmFtXS5tX2xvY2F0aW9u c1tHTEVTMlByb2dyYW06Ok9wYWNpdHlVbmlmb3JtXSA9IGdsR2V0VW5pZm9ybUxvY2F0aW9uKHBy b2dyYW1PYmplY3QsICJhbHBoYSIpOwogICAgIHN3aXRjaCAocHJvZ3JhbSkgewotICAgIGNhc2Ug TGF5ZXJQcm9ncmFtUkdCQToKLSAgICBjYXNlIExheWVyUHJvZ3JhbUJHUkE6IHsKKyAgICBjYXNl IExheWVyUHJvZ3JhbVJHQkE6IHsKICAgICAgICAgR0xpbnQgc2FtcGxlckxvY2F0aW9uID0gZ2xH ZXRVbmlmb3JtTG9jYXRpb24ocHJvZ3JhbU9iamVjdCwgInNfdGV4dHVyZSIpOwogICAgICAgICBn bFVzZVByb2dyYW0ocHJvZ3JhbU9iamVjdCk7CiAgICAgICAgIGdsVW5pZm9ybTFpKHNhbXBsZXJM b2NhdGlvbiwgMCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICBjYXNlIExheWVyTWFza1By b2dyYW1SR0JBOgotICAgIGNhc2UgTGF5ZXJNYXNrUHJvZ3JhbUJHUkE6IHsKKyAgICBjYXNlIExh eWVyTWFza1Byb2dyYW1SR0JBOiB7CiAgICAgICAgIEdMaW50IG1hc2tTYW1wbGVyTG9jYXRpb24g PSBnbEdldFVuaWZvcm1Mb2NhdGlvbihwcm9ncmFtT2JqZWN0LCAic190ZXh0dXJlIik7CiAgICAg ICAgIEdMaW50IG1hc2tTYW1wbGVyTG9jYXRpb25NYXNrID0gZ2xHZXRVbmlmb3JtTG9jYXRpb24o cHJvZ3JhbU9iamVjdCwgInNfbWFzayIpOwogICAgICAgICBnbFVzZVByb2dyYW0ocHJvZ3JhbU9i amVjdCk7CkBAIC0xMzI0LDE0ICsxMjkxLDYgQEAgY29uc3QgR0xFUzJQcm9ncmFtJiBMYXllclJl bmRlcmVyOjp1c2VQcm9ncmFtKFByb2dyYW1JbmRleCBpbmRleCkKICAgICByZXR1cm4gcHJvZ3Jh bTsKIH0KIAotY29uc3QgR0xFUzJQcm9ncmFtJiBMYXllclJlbmRlcmVyOjp1c2VMYXllclByb2dy YW0oTGF5ZXJEYXRhOjpMYXllclByb2dyYW0gbGF5ZXJQcm9ncmFtLCBib29sIGlzTWFzayAvKiA9 IGZhbHNlICovKQotewotICAgIGludCBwcm9ncmFtID0gbGF5ZXJQcm9ncmFtOwotICAgIGlmIChp c01hc2spCi0gICAgICAgIHByb2dyYW0gKz0gTWFza1Byb2dyYW1zOwotICAgIHJldHVybiB1c2VQ cm9ncmFtKHN0YXRpY19jYXN0PFByb2dyYW1JbmRleD4ocHJvZ3JhbSkpOwotfQotCiB2b2lkIExh eWVyUmVuZGVyaW5nUmVzdWx0czo6YWRkRGlydHlSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7 CiAgICAgSW50UmVjdCBkaXJ0eVVuaW9uW051bWJlck9mRGlydHlSZWN0c107CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVy ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJS ZW5kZXJlci5oCmluZGV4IGU0ZTQ4OTZkN2ZkYzExODU5ZDdmNGMzNWE5NzAzMjc5MmQzYzkwODUu LjY3NTk3YTQzZDI2NWI3YzU2NDZmNTMwNDAzMmE1Yzg1N2E5NWI0MjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJS ZW5kZXJlci5oCkBAIC0xNjgsMjIgKzE2OCwxNCBAQCBwcml2YXRlOgogICAgIHZvaWQgZXJhc2VG cm9tU3RlbmNpbEJ1ZmZlcihpbnQgc3RlbmNpbFZhbHVlLCBjb25zdCBWZWN0b3I8RmxvYXRQb2lu dCwgND4mIHZlcnRpY2VzKTsKIAogICAgIGVudW0gUHJvZ3JhbUluZGV4IHsKLSAgICAgICAgTGF5 ZXJQcm9ncmFtUkdCQSA9IExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtUkdCQSwKLSAgICAgICAgTGF5 ZXJQcm9ncmFtQkdSQSA9IExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtQkdSQSwKLQotICAgICAgICBN YXNrUHJvZ3JhbXMsCi0gICAgICAgIExheWVyTWFza1Byb2dyYW1SR0JBID0gTWFza1Byb2dyYW1z ICsgTGF5ZXJEYXRhOjpMYXllclByb2dyYW1SR0JBLAotICAgICAgICBMYXllck1hc2tQcm9ncmFt QkdSQSA9IE1hc2tQcm9ncmFtcyArIExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtQkdSQSwKLQotICAg ICAgICBJbnRlcm5hbFByb2dyYW1zLAotICAgICAgICBDb2xvclByb2dyYW0gPSBJbnRlcm5hbFBy b2dyYW1zLAotCisgICAgICAgIExheWVyUHJvZ3JhbVJHQkEsCisgICAgICAgIExheWVyTWFza1By b2dyYW1SR0JBLAorICAgICAgICBDb2xvclByb2dyYW0sCiAgICAgICAgIE51bWJlck9mUHJvZ3Jh bXMKICAgICB9OwogCiAgICAgYm9vbCBjcmVhdGVQcm9ncmFtKFByb2dyYW1JbmRleCk7CiAgICAg Y29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMlByb2dyYW0mIHVzZVBy b2dyYW0oUHJvZ3JhbUluZGV4KTsKLSAgICBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3Jh cGhpY3M6OkdMRVMyUHJvZ3JhbSYgdXNlTGF5ZXJQcm9ncmFtKExheWVyRGF0YTo6TGF5ZXJQcm9n cmFtLCBib29sIGlzTWFzayA9IGZhbHNlKTsKIAogICAgIExheWVyUmVuZGVyZXJDbGllbnQqIG1f Y2xpZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0xheWVyV2ViS2l0VGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0xheWVyV2ViS2l0VGhyZWFkLmgKaW5kZXggZDBhNDdiNzQ0ZTJl ZjZmOGUzMGJkOGNiNzBhYzE0MTgzMTliN2RmYi4uZThiODVjODUyYWZhNzg1NWNmN2FhMDMzYzZi ZWQ0YWMyYzBiZTNkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYmxhY2tiZXJyeS9MYXllcldlYktpdFRocmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJXZWJLaXRUaHJlYWQuaApAQCAtMjIxLDcg KzIyMSw2IEBAIHByb3RlY3RlZDoKICAgICBMYXllcldlYktpdFRocmVhZChMYXllclR5cGUsIEdy YXBoaWNzTGF5ZXJCbGFja0JlcnJ5KiBvd25lcik7CiAKICAgICB2b2lkIHNldE5lZWRzVGV4dHVy ZShib29sIG5lZWRzVGV4dHVyZSkgeyBtX25lZWRzVGV4dHVyZSA9IG5lZWRzVGV4dHVyZTsgfQot ICAgIHZvaWQgc2V0TGF5ZXJQcm9ncmFtKExheWVyRGF0YTo6TGF5ZXJQcm9ncmFtIGxheWVyUHJv Z3JhbSkgeyBtX2xheWVyUHJvZ3JhbSA9IGxheWVyUHJvZ3JhbTsgfQogICAgIGJvb2wgaXNEcmF3 YWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNEcmF3YWJsZTsgfQogCiAgICAgdm9pZCB1cGRhdGVW aXNpYmlsaXR5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L1BsdWdpbkxheWVyV2ViS2l0VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGx1Z2luTGF5ZXJXZWJLaXRUaHJlYWQuY3Bw CmluZGV4IGFmNzFjMTBiZjZmOTQwZmM4NmZlMWYyNTEwN2NmYjlkNDkxZTE2YjIuLjI1MWNjMGZk NDk0M2NmYWEyMmI5ODQyNGNiYjQyN2YzMTZlNDY5YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGx1Z2luTGF5ZXJXZWJLaXRUaHJlYWQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGx1 Z2luTGF5ZXJXZWJLaXRUaHJlYWQuY3BwCkBAIC00MSw3ICs0MSw2IEBAIHZvaWQgUGx1Z2luTGF5 ZXJXZWJLaXRUaHJlYWQ6OnNldFBsdWdpblZpZXcoUGx1Z2luVmlldyogcGx1Z2luVmlldykKIHsK ICAgICBtX3BsdWdpblZpZXcgPSBwbHVnaW5WaWV3OwogICAgIHNldE5lZWRzVGV4dHVyZShpc0Ry YXdhYmxlKCkgJiYgcGx1Z2luVmlldyk7Ci0gICAgc2V0TGF5ZXJQcm9ncmFtKExheWVyUHJvZ3Jh bVJHQkEpOwogCiAgICAgaWYgKG1fcGx1Z2luVmlldykKICAgICAgICAgc2V0TmVlZHNEaXNwbGF5 KCk7Cg==