147906 2015-08-11 15:25:55 -0700 Disconnect LayoutStateDisabler logic and RenderView pointer. 2015-08-11 20:42:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue simon.fraser oldest_to_newest 1116746 0 zalan 2015-08-11 15:25:55 -0700 SSIA 1116768 1 258775 zalan 2015-08-11 16:14:49 -0700 Created attachment 258775 Patch 1116835 2 258797 zalan 2015-08-11 19:44:08 -0700 Created attachment 258797 Patch 1116845 3 258797 commit-queue 2015-08-11 20:42:01 -0700 Comment on attachment 258797 Patch Clearing flags on attachment: 258797 Committed r188322: <http://trac.webkit.org/changeset/188322> 1116846 4 commit-queue 2015-08-11 20:42:04 -0700 All reviewed patches have been landed. Closing bug. 258775 2015-08-11 16:14:49 -0700 2015-08-11 19:44:06 -0700 Patch bug-147906-20150811161433.patch text/plain 13962 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBlMDFmOGJjYzdhNDk5 MTI1YTk3YzNjMjhhZDI2NWZlZTYzODk4NC4uZWU4MGFmMDFiZjliZjNhY2EyNjMzZTE0MWI1OWUw OThlN2I5YjI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE1LTA4LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzY29ubmVjdCBMYXlvdXRT dGF0ZURpc2FibGVyIGxvZ2ljIGFuZCBSZW5kZXJWaWV3IHBvaW50ZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXRTdGF0ZURpc2FibGVyIHNo b3VsZCBkaXNhYmxlIGxheW91dCBzdGF0ZSB1bmNvbmRpdGlvbmFsbHkuCisgICAgICAgIFRoZSBv bmx5IHBsYWNlIHdoZXJlIGl0IHdhcyBhY3R1YWxseSBjb25kaXRpb25hbCB3YXMgdGhlIHN1YnRy ZWUgbGF5b3V0IGJyYW5jaC4KKyAgICAgICAgQ3JlYXRlIGEgZGVkaWNhdGVkIFN1YnRyZWVMYXlv dXRTdGF0ZU1haW50YWluZXIgdG8gbWFuYWdlIHRoZSBzdWJ0cmVlIGxheW91dCBjYXNlLgorCisg ICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmll dy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOjpT dWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN1YnRyZWVM YXlvdXRTdGF0ZU1haW50YWluZXI6On5TdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZUZp cnN0TGV0dGVyU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZUZp cnN0TGV0dGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6cmVwYWludE92ZXJoYW5naW5nRmxvYXRz KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpyZXBhaW50UmVjdGFuZ2xlSW5SZWdpb25zKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMaXN0Qm94OjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0SXRl bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6aW5zZXJ0T3JNb3ZlTWFy a2VyUmVuZGVyZXJJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lZGlhVm9sdW1lU2xp ZGVyQ29udGFpbmVyOjpsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVkaWFDb250 cm9sVGltZWxpbmVDb250YWluZXI6OmxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU ZXh0VHJhY2tDb250YWluZXJFbGVtZW50OjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TXVsdGlDb2x1bW5GbG93VGhyZWFkOjpwb3B1bGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmV2YWN1YXRlQW5kRGVzdHJveSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlRGlz YWJsZXI6OkxheW91dFN0YXRlRGlzYWJsZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3Rh dGVEaXNhYmxlcjo6fkxheW91dFN0YXRlRGlzYWJsZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSb290Ojps YXlvdXQpOgorCiAyMDE1LTA4LTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgogCiAgICAgICAgIFtXaW5dIFN3aXRjaCBXaW5kb3dzIGJ1aWxkIHRvIFZpc3VhbCBTdHVkaW8g MjAxNQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGFjZjEzODA5YTU5OTYzNjczYjUz ZjI2MDA4MDZlZTQwMzdjMzk1NjAuLjc1NjEwZGE5MTc3NDBjOWJkNWFmYzJkNjIyYTlhYWJiNjI4 MTIyM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTE2MCw2ICsxNjAsMzYgQEAg UGFnaW5hdGlvbjo6TW9kZSBwYWdpbmF0aW9uTW9kZUZvclJlbmRlclN0eWxlKGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSkKICAgICByZXR1cm4gUGFnaW5hdGlvbjo6Qm90dG9tVG9Ub3BQYWdpbmF0 ZWQ7CiB9CiAKK2NsYXNzIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXIgeworcHVibGljOgor ICAgIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXIoUmVuZGVyRWxlbWVudCogc3VidHJlZUxh eW91dFJvb3QpCisgICAgICAgIDogbV9sYXlvdXRSb290KHN1YnRyZWVMYXlvdXRSb290KQorICAg IHsKKyAgICAgICAgaWYgKG1fbGF5b3V0Um9vdCkgeworICAgICAgICAgICAgUmVuZGVyVmlldyYg dmlldyA9IG1fbGF5b3V0Um9vdC0+dmlldygpOworICAgICAgICAgICAgdmlldy5wdXNoTGF5b3V0 U3RhdGUoKm1fbGF5b3V0Um9vdCk7CisgICAgICAgICAgICBtX2Rpc2FibGVMYXlvdXRTdGF0ZSA9 IHZpZXcuc2hvdWxkRGlzYWJsZUxheW91dFN0YXRlRm9yU3VidHJlZShtX2xheW91dFJvb3QpOwor ICAgICAgICAgICAgaWYgKG1fZGlzYWJsZUxheW91dFN0YXRlKQorICAgICAgICAgICAgICAgIHZp ZXcuZGlzYWJsZUxheW91dFN0YXRlKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICB+U3VidHJl ZUxheW91dFN0YXRlTWFpbnRhaW5lcigpCisgICAgeworICAgICAgICBpZiAobV9sYXlvdXRSb290 KSB7CisgICAgICAgICAgICBSZW5kZXJWaWV3JiB2aWV3ID0gbV9sYXlvdXRSb290LT52aWV3KCk7 CisgICAgICAgICAgICB2aWV3LnBvcExheW91dFN0YXRlKCptX2xheW91dFJvb3QpOworICAgICAg ICAgICAgaWYgKG1fZGlzYWJsZUxheW91dFN0YXRlKQorICAgICAgICAgICAgICAgIHZpZXcuZW5h YmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgfQorICAgIH0KKworcHJpdmF0ZToKKyAgICBSZW5k ZXJFbGVtZW50KiBtX2xheW91dFJvb3QgeyBudWxscHRyIH07CisgICAgYm9vbCBtX2Rpc2FibGVM YXlvdXRTdGF0ZSB7IGZhbHNlIH07CisKK307CisKIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1l JiBmcmFtZSkKICAgICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBtX2NhbkhhdmVTY3JvbGxiYXJz KHRydWUpCkBAIC0xMzQ2LDEzICsxMzc2LDggQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29s IGFsbG93U3VidHJlZSkKICAgICAgICAgfQogCiAgICAgICAgIGxheWVyID0gcm9vdC0+ZW5jbG9z aW5nTGF5ZXIoKTsKKyAgICAgICAgU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lciBzdWJ0cmVl TGF5b3V0U3RhdGVNYWludGFpbmVyKG1fbGF5b3V0Um9vdCk7CiAKLSAgICAgICAgYm9vbCBkaXNh YmxlTGF5b3V0U3RhdGUgPSBmYWxzZTsKLSAgICAgICAgaWYgKHN1YnRyZWUpIHsKLSAgICAgICAg ICAgIGRpc2FibGVMYXlvdXRTdGF0ZSA9IHJvb3QtPnZpZXcoKS5zaG91bGREaXNhYmxlTGF5b3V0 U3RhdGVGb3JTdWJ0cmVlKHJvb3QpOwotICAgICAgICAgICAgcm9vdC0+dmlldygpLnB1c2hMYXlv dXRTdGF0ZSgqcm9vdCk7Ci0gICAgICAgIH0KLSAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBs YXlvdXRTdGF0ZURpc2FibGVyKGRpc2FibGVMYXlvdXRTdGF0ZSA/ICZyb290LT52aWV3KCkgOiBu dWxscHRyKTsKICAgICAgICAgUmVuZGVyVmlldzo6UmVwYWludFJlZ2lvbkFjY3VtdWxhdG9yIHJl cGFpbnRSZWdpb25BY2N1bXVsYXRvcigmcm9vdC0+dmlldygpKTsKIAogICAgICAgICBBU1NFUlQo bV9sYXlvdXRQaGFzZSA9PSBJblByZUxheW91dCk7CkBAIC0xMzgwLDEzICsxNDA1LDggQEAgdm9p ZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICNlbmRpZgogCiAgICAgICAg IEFTU0VSVChtX2xheW91dFBoYXNlID09IEluTGF5b3V0KTsKLQotICAgICAgICBpZiAoc3VidHJl ZSkKLSAgICAgICAgICAgIHJvb3QtPnZpZXcoKS5wb3BMYXlvdXRTdGF0ZSgqcm9vdCk7Ci0KICAg ICAgICAgbV9sYXlvdXRSb290ID0gbnVsbHB0cjsKLQotICAgICAgICAvLyBDbG9zZSBibG9jayBo ZXJlIHRvIGVuZCB0aGUgc2NvcGUgb2YgY2hhbmdlU2NoZWR1bGluZ0VuYWJsZWQgYW5kIGxheW91 dFN0YXRlRGlzYWJsZXIuCisgICAgICAgIC8vIENsb3NlIGJsb2NrIGhlcmUgdG8gZW5kIHRoZSBz Y29wZSBvZiBjaGFuZ2VTY2hlZHVsaW5nRW5hYmxlZCBhbmQgU3VidHJlZUxheW91dFN0YXRlTWFp bnRhaW5lci4KICAgICB9CiAKICAgICBtX2xheW91dFBoYXNlID0gSW5WaWV3U2l6ZUFkanVzdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGQ1OWJjYjFkYmNj Y2EyZTY1YjBmMjE1N2I4MDc2MDY2ODcxNWVhMzcuLmJlN2IyODAwMzExNDZjMTI3MWFkNWU3ZDMy YTkxODc4YmI5NzI5ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cApAQCAtMzA2MSw3ICszMDYxLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0 ZXJTdHlsZShSZW5kZXJFbGVtZW50KiBmaXJzdExldHRlckJsb2NrLCBSZW5kZXIKICAgICAgICAg bmV3Rmlyc3RMZXR0ZXItPmluaXRpYWxpemVTdHlsZSgpOwogCiAgICAgICAgIC8vIE1vdmUgdGhl IGZpcnN0IGxldHRlciBpbnRvIHRoZSBuZXcgcmVuZGVyZXIuCi0gICAgICAgIExheW91dFN0YXRl RGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcigmdmlldygpKTsKKyAgICAgICAgTGF5b3V0U3Rh dGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgICAgIHdoaWxlIChS ZW5kZXJPYmplY3QqIGNoaWxkID0gZmlyc3RMZXR0ZXItPmZpcnN0Q2hpbGQoKSkgewogICAgICAg ICAgICAgaWYgKGlzPFJlbmRlclRleHQ+KCpjaGlsZCkpCiAgICAgICAgICAgICAgICAgZG93bmNh c3Q8UmVuZGVyVGV4dD4oKmNoaWxkKS5yZW1vdmVBbmREZXN0cm95VGV4dEJveGVzKCk7CkBAIC0z MjM3LDcgKzMyMzcsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVGaXJzdExldHRlcigpCiAK ICAgICAvLyBPdXIgbGF5b3V0IHN0YXRlIGlzIG5vdCB2YWxpZCBmb3IgdGhlIHJlcGFpbnRzIHdl IGFyZSBnb2luZyB0byB0cmlnZ2VyIGJ5CiAgICAgLy8gYWRkaW5nIGFuZCByZW1vdmluZyBjaGls ZHJlbiBvZiBmaXJzdExldHRlckNvbnRhaW5lci4KLSAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxh eW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlv dXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAKICAgICBjcmVhdGVGaXJzdExldHRlclJlbmRlcmVy KGZpcnN0TGV0dGVyQ29udGFpbmVyLCBkb3duY2FzdDxSZW5kZXJUZXh0PihmaXJzdExldHRlck9i aikpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApp bmRleCBhZjRjYTcxMzg1ZWJiZTY4NmI2NmVlMzc0NWU3ZGNkYzU5ZGQ4MDliLi5mNjAzNjU3ODhk MzFkZjFiZGFlZjE2NjdjYTUwYjE3YTA3ZDdkMzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMjEyMyw3ICsyMTIzLDcgQEAgdm9pZCBSZW5k ZXJCbG9ja0Zsb3c6OnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyhib29sIHBhaW50QWxsRGVzY2Vu ZGFudHMpCiAKICAgICAvLyBGSVhNRTogQXZvaWQgZGlzYWJsaW5nIExheW91dFN0YXRlLiBBdCB0 aGUgdmVyeSBsZWFzdCwgZG9uJ3QgZGlzYWJsZSBpdCBmb3IgZmxvYXRzIG9yaWdpbmF0aW5nCiAg ICAgLy8gaW4gdGhpcyBibG9jay4gQmV0dGVyIHlldCB3b3VsZCBiZSB0byBwdXNoIGV4dHJhIHN0 YXRlIGZvciB0aGUgY29udGFpbmVycyBvZiBvdGhlciBmbG9hdHMuCi0gICAgTGF5b3V0U3RhdGVE aXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgIExheW91dFN0YXRlRGlz YWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgIGNvbnN0IEZsb2F0aW5nT2Jq ZWN0U2V0JiBmbG9hdGluZ09iamVjdFNldCA9IG1fZmxvYXRpbmdPYmplY3RzLT5zZXQoKTsKICAg ICBhdXRvIGVuZCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwogICAgIGZvciAoYXV0byBpdCA9 IGZsb2F0aW5nT2JqZWN0U2V0LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCmluZGV4IGRkYmYzYWM1NDFk NTJjNGUzNjEwZWUxMDc4YmE5OGVlMjQ3MDExZTUuLjIxZWYzZDkzYWViOWMzYzA1ZWM4MmI5OWYw NDdjMmUzM2U0MmFlYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGbG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxv d1RocmVhZC5jcHAKQEAgLTM4Myw3ICszODMsNyBAQCB2b2lkIFJlbmRlckZsb3dUaHJlYWQ6OnJl cGFpbnRSZWN0YW5nbGVJblJlZ2lvbnMoY29uc3QgTGF5b3V0UmVjdCYgcmVwYWludFJlY3QpCiAg ICAgaWYgKCFzaG91bGRSZXBhaW50KHJlcGFpbnRSZWN0KSB8fCAhaGFzVmFsaWRSZWdpb25JbmZv KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3Rh dGVEaXNhYmxlcigmdmlldygpKTsgLy8gV2UgY2FuJ3QgdXNlIGxheW91dCBzdGF0ZSB0byByZXBh aW50LCBzaW5jZSB0aGUgcmVnaW9ucyBhcmUgc29tZXdoZXJlIGVsc2UuCisgICAgTGF5b3V0U3Rh dGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7IC8vIFdlIGNhbid0IHVzZSBs YXlvdXQgc3RhdGUgdG8gcmVwYWludCwgc2luY2UgdGhlIHJlZ2lvbnMgYXJlIHNvbWV3aGVyZSBl bHNlLgogCiAgICAgZm9yIChhdXRvJiByZWdpb24gOiBtX3JlZ2lvbkxpc3QpCiAgICAgICAgIHJl Z2lvbi0+cmVwYWludEZsb3dUaHJlYWRDb250ZW50KHJlcGFpbnRSZWN0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAppbmRleCA5MTZjMmRlN2ViNTdjZjVhNzFj ZmY4NTQ0NDg4ZGIzNWMxMTkzNzYzLi41OTJkZmY0YjIzYzJlZmFkZGRiODIzYjIyN2Y5MDljYTVj MTU1ZWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCkBA IC0xNzQsNyArMTc0LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpsYXlvdXQoKQogICAgIH0KIAog ICAgIGlmIChtX3Njcm9sbFRvUmV2ZWFsU2VsZWN0aW9uQWZ0ZXJMYXlvdXQpIHsKLSAgICAgICAg TGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgICAg ICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICAg ICAgc2Nyb2xsVG9SZXZlYWxTZWxlY3Rpb24oKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcAppbmRleCBkM2FhOWU3MTg4NTJiMGY3ZTkxNzVl M2E3OWVlMWVhOGIzNzExYWVmLi4xZDM4ZTIyNTViNTQ3OWJkYjVjN2E0ZDhkZGNiMGI1YTczYmFh YTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKQEAg LTI5MSw3ICsyOTEsNyBAQCB2b2lkIFJlbmRlckxpc3RJdGVtOjppbnNlcnRPck1vdmVNYXJrZXJS ZW5kZXJlcklmTmVlZGVkKCkKICAgICBpZiAobmV3UGFyZW50ICE9IGN1cnJlbnRQYXJlbnQpIHsK ICAgICAgICAgLy8gUmVtb3ZpbmcgYW5kIGFkZGluZyB0aGUgbWFya2VyIGNhbiB0cmlnZ2VyIHJl cGFpbnRpbmcgaW4KICAgICAgICAgLy8gY29udGFpbmVycyBvdGhlciB0aGFuIG91cnNlbHZlcywg c28gd2UgbmVlZCB0byBkaXNhYmxlIExheW91dFN0YXRlLgotICAgICAgICBMYXlvdXRTdGF0ZURp c2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgICAgIExheW91dFN0YXRl RGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgICAgICBtX21hcmtlci0+ cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICBuZXdQYXJlbnQtPmFkZENoaWxkKG1fbWFya2Vy LCBmaXJzdE5vbk1hcmtlckNoaWxkKCpuZXdQYXJlbnQpKTsKICAgICAgICAgbV9tYXJrZXItPnVw ZGF0ZU1hcmdpbnNBbmRDb250ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAppbmRleCBjODIzYTU0NjU2OGU4 ZThlNmUyMDQxNDVlMmU2NGQ2MzJjMzg5NDkwLi5mOTJhMmQ2NjlhOGVjNDBlYTVlNTk4Y2VhZjVi NTJkY2E4MTUzYzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKQEAgLTUwLDcgKzUwLDcgQEAgdm9pZCBSZW5k ZXJNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcjo6bGF5b3V0KCkKICAgICBSZW5kZXJCb3gmIGJ1 dHRvbkJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oKm5leHRTaWJsaW5nKCkpOwogICAgIGludCBh YnNvbHV0ZU9mZnNldFRvcCA9IGJ1dHRvbkJveC5sb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludCgw LCAtc2l6ZSgpLmhlaWdodCgpKSkueSgpOwogCi0gICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlv dXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0 U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogCiAgICAgLy8gSWYgdGhlIHNsaWRlciB3b3VsZCBiZSBy ZW5kZXJlZCBvdXRzaWRlIHRoZSBwYWdlLCBpdCBzaG91bGQgYmUgbW92ZWQgYmVsb3cgdGhlIGNv bnRyb2xzLgogICAgIGlmIChVTkxJS0VMWShhYnNvbHV0ZU9mZnNldFRvcCA8IDApKQpAQCAtNzIs NyArNzIsNyBAQCB2b2lkIFJlbmRlck1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyOjpsYXlv dXQoKQogewogICAgIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXQoKTsKIAotICAgIExheW91dFN0 YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcigmdmlldygpKTsKKyAgICBMYXlvdXRTdGF0 ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICBNZWRpYUNvbnRyb2xU aW1lbGluZUNvbnRhaW5lckVsZW1lbnQqIGNvbnRhaW5lciA9IHN0YXRpY19jYXN0PE1lZGlhQ29u dHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudCo+KGVsZW1lbnQoKSk7CiAgICAgY29udGFpbmVy LT5zZXRUaW1lRGlzcGxheXNIaWRkZW4od2lkdGgoKS50b0ludCgpIDwgbWluV2lkdGhUb0Rpc3Bs YXlUaW1lRGlzcGxheXMpOwogfQpAQCAtOTQsNyArOTQsNyBAQCB2b2lkIFJlbmRlclRleHRUcmFj a0NvbnRhaW5lckVsZW1lbnQ6OmxheW91dCgpCiAKICAgICBBU1NFUlQobWVkaWFDb250cm9sRWxl bWVudFR5cGUoZWxlbWVudCgpKSA9PSBNZWRpYVRleHRUcmFja0Rpc3BsYXlDb250YWluZXIpOwog Ci0gICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOwor ICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAg IHN0YXRpY19jYXN0PE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQqPihlbGVt ZW50KCkpLT51cGRhdGVTaXplcygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwCmluZGV4IDZiNGNmNGFh MTYyODVkMTA5NmVlZTE4MGEwOTg3NWYzM2UxNWU1YzEuLjJkNjQxMWFmNDcyNjViZGExMzdkOTBk NjdjNDMyNmYzZjg3ZDhjYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwCkBAIC0xNDksNyArMTQ5LDcgQEAg dm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OnBvcHVsYXRlKCkKICAgICAvLyBSZXBh cmVudCBjaGlsZHJlbiBwcmVjZWRpbmcgdGhlIGZsb3cgdGhyZWFkIGludG8gdGhlIGZsb3cgdGhy ZWFkLiBJdCdzIG11bHRpY29sIGNvbnRlbnQKICAgICAvLyBub3cuIEF0IHRoaXMgcG9pbnQgdGhl cmUncyBvYnZpb3VzbHkgbm90aGluZyBhZnRlciB0aGUgZmxvdyB0aHJlYWQsIGJ1dCByZW5kZXJl cnMgKGNvbHVtbgogICAgIC8vIHNldHMgYW5kIHNwYW5uZXJzKSB3aWxsIGJlIGluc2VydGVkIHRo ZXJlIGFzIHdlIGluc2VydCBlbGVtZW50cyBpbnRvIHRoZSBmbG93IHRocmVhZC4KLSAgICBMYXlv dXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0 U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgbXVsdGljb2xD b250YWluZXItPm1vdmVDaGlsZHJlblRvKHRoaXMsIG11bHRpY29sQ29udGFpbmVyLT5maXJzdENo aWxkKCksIHRoaXMsIHRydWUpOwogfQogCkBAIC0xNjEsNyArMTYxLDcgQEAgdm9pZCBSZW5kZXJN dWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmV2YWN1YXRlQW5kRGVzdHJveSgpCiAgICAgLy8gRGVsZXRl IHRoZSBsaW5lIGJveCB0cmVlLgogICAgIGRlbGV0ZUxpbmVzKCk7CiAgICAgCi0gICAgTGF5b3V0 U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgIExheW91dFN0 YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogCiAgICAgLy8gRmlyc3Qg cHJvbW90ZSBhbGwgY2hpbGRyZW4gb2YgdGhlIGZsb3cgdGhyZWFkLiBCZWZvcmUgd2UgbW92ZSB0 aGVtIHRvIHRoZSBmbG93IHRocmVhZCdzCiAgICAgLy8gY29udGFpbmVyLCB3ZSBuZWVkIHRvIHVu cmVnaXN0ZXIgdGhlIGZsb3cgdGhyZWFkLCBzbyB0aGF0IHRoZXkgYXJlbid0IGp1c3QgcmUtYWRk ZWQgYWdhaW4gdG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IGM4MDBl ZmI0ZTI0OTQ4ODc5N2QzYzQzOGY3M2RlNzViNDRjOWQ0OTUuLjk0ODEwOWRlOWQ5ZDk4NDM3OTUy YzRmZjQzM2UxZmM3NWY1Yzc5YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcu aApAQCAtMzA0LDYgKzMwNCw3IEBAIHByaXZhdGU6CiAKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0 U3RhdGVNYWludGFpbmVyOwogICAgIGZyaWVuZCBjbGFzcyBMYXlvdXRTdGF0ZURpc2FibGVyOwor ICAgIGZyaWVuZCBjbGFzcyBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOwogCiAgICAgdmly dHVhbCBib29sIGlzU2Nyb2xsYWJsZU9yUnViYmVyYmFuZGFibGVCb3goKSBjb25zdCBvdmVycmlk ZTsKIApAQCAtNDQ1LDIwICs0NDYsMTkgQEAgcHJpdmF0ZToKIGNsYXNzIExheW91dFN0YXRlRGlz YWJsZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKExheW91dFN0YXRlRGlzYWJsZXIpOwog cHVibGljOgotICAgIExheW91dFN0YXRlRGlzYWJsZXIoUmVuZGVyVmlldyogdmlldykKKyAgICBM YXlvdXRTdGF0ZURpc2FibGVyKFJlbmRlclZpZXcmIHZpZXcpCiAgICAgICAgIDogbV92aWV3KHZp ZXcpCiAgICAgewotICAgICAgICBpZiAobV92aWV3KQotICAgICAgICAgICAgbV92aWV3LT5kaXNh YmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgbV92aWV3LmRpc2FibGVMYXlvdXRTdGF0ZSgpOwog ICAgIH0KIAogICAgIH5MYXlvdXRTdGF0ZURpc2FibGVyKCkKICAgICB7Ci0gICAgICAgIGlmICht X3ZpZXcpCi0gICAgICAgICAgICBtX3ZpZXctPmVuYWJsZUxheW91dFN0YXRlKCk7CisgICAgICAg IG1fdmlldy5lbmFibGVMYXlvdXRTdGF0ZSgpOwogICAgIH0KKwogcHJpdmF0ZToKLSAgICBSZW5k ZXJWaWV3KiBtX3ZpZXc7CisgICAgUmVuZGVyVmlldyYgbV92aWV3OwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSb290LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Um9vdC5jcHAKaW5kZXggMmMyM2UxZjExNmQzNDg4ZWZlNTBkODExNTk2ZDNiMTE5MjRjZDAxMS4u NjRiZWEwNDczMDA2MjFlZGNmMGVkYTMzZjc0ZmIwZmJjNGNjM2U1MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCkBAIC0xNjUsNyArMTY1LDcg QEAgdm9pZCBSZW5kZXJTVkdSb290OjpsYXlvdXQoKQogICAgIG1fcmVzb3VyY2VzTmVlZGluZ1Rv SW52YWxpZGF0ZUNsaWVudHMuY2xlYXIoKTsKIAogICAgIC8vIEFyYml0cmFyeSBhZmZpbmUgdHJh bnNmb3JtcyBhcmUgaW5jb21wYXRpYmxlIHdpdGggTGF5b3V0U3RhdGUuCi0gICAgTGF5b3V0U3Rh dGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgIExheW91dFN0YXRl RGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogCiAgICAgYm9vbCBuZWVkc0xh eW91dCA9IHNlbGZOZWVkc0xheW91dCgpOwogICAgIExheW91dFJlcGFpbnRlciByZXBhaW50ZXIo KnRoaXMsIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpICYmIG5lZWRzTGF5b3V0KTsK 258797 2015-08-11 19:44:08 -0700 2015-08-11 20:42:01 -0700 Patch bug-147906-20150811194352.patch text/plain 13958 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBlMDFmOGJjYzdhNDk5 MTI1YTk3YzNjMjhhZDI2NWZlZTYzODk4NC4uYzg5MTc2NTVkMTlkZDI4OGJkODc1MWFkYzIwY2Nj Mzg4NzMzZDFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE1LTA4LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzY29ubmVjdCBMYXlvdXRT dGF0ZURpc2FibGVyIGxvZ2ljIGFuZCBSZW5kZXJWaWV3IHBvaW50ZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MDYKKworICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBzaG91 bGQgZGlzYWJsZSBsYXlvdXQgc3RhdGUgdW5jb25kaXRpb25hbGx5LgorICAgICAgICBUaGUgb25s eSBwbGFjZSB3aGVyZSBpdCB3YXMgYWN0dWFsbHkgY29uZGl0aW9uYWwgd2FzIHRoZSBzdWJ0cmVl IGxheW91dCBicmFuY2guCisgICAgICAgIENyZWF0ZSBhIGRlZGljYXRlZCBTdWJ0cmVlTGF5b3V0 U3RhdGVNYWludGFpbmVyIHRvIG1hbmFnZSB0aGUgc3VidHJlZSBsYXlvdXQgY2FzZS4KKworICAg ICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6U3Vi dHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpTdWJ0cmVlTGF5 b3V0U3RhdGVNYWludGFpbmVyOjp+U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcik6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjp1cGRhdGVGaXJz dExldHRlclN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjp1cGRhdGVGaXJz dExldHRlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRmxvd1RocmVhZDo6cmVwYWludFJlY3RhbmdsZUluUmVnaW9ucyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGlzdEJveDo6bGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEl0ZW06Omluc2VydE9yTW92ZU1hcmtl clJlbmRlcmVySWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRy b2xFbGVtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZWRpYVZvbHVtZVNsaWRl ckNvbnRhaW5lcjo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lZGlhQ29udHJv bFRpbWVsaW5lQ29udGFpbmVyOjpsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4 dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6bGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11 bHRpQ29sdW1uRmxvd1RocmVhZDo6cG9wdWxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TXVsdGlDb2x1bW5GbG93VGhyZWFkOjpldmFjdWF0ZUFuZERlc3Ryb3kpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJWaWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZURpc2Fi bGVyOjpMYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRl RGlzYWJsZXI6On5MYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUm9vdDo6bGF5 b3V0KToKKwogMjAxNS0wOC0xMSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4K IAogICAgICAgICBbV2luXSBTd2l0Y2ggV2luZG93cyBidWlsZCB0byBWaXN1YWwgU3R1ZGlvIDIw MTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhY2YxMzgwOWE1OTk2MzY3M2I1M2Yy NjAwODA2ZWU0MDM3YzM5NTYwLi4xYzc3ZTc5NWQxM2FjZDkzNDRhYjYxNmYxZGY1MWEzNDYyMTE4 YjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0xNjAsNiArMTYwLDM1IEBAIFBh Z2luYXRpb246Ok1vZGUgcGFnaW5hdGlvbk1vZGVGb3JSZW5kZXJTdHlsZShjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUpCiAgICAgcmV0dXJuIFBhZ2luYXRpb246OkJvdHRvbVRvVG9wUGFnaW5hdGVk OwogfQogCitjbGFzcyBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyIHsKK3B1YmxpYzoKKyAg ICBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKFJlbmRlckVsZW1lbnQqIHN1YnRyZWVMYXlv dXRSb290KQorICAgICAgICA6IG1fbGF5b3V0Um9vdChzdWJ0cmVlTGF5b3V0Um9vdCkKKyAgICB7 CisgICAgICAgIGlmIChtX2xheW91dFJvb3QpIHsKKyAgICAgICAgICAgIFJlbmRlclZpZXcmIHZp ZXcgPSBtX2xheW91dFJvb3QtPnZpZXcoKTsKKyAgICAgICAgICAgIHZpZXcucHVzaExheW91dFN0 YXRlKCptX2xheW91dFJvb3QpOworICAgICAgICAgICAgbV9kaXNhYmxlTGF5b3V0U3RhdGUgPSB2 aWV3LnNob3VsZERpc2FibGVMYXlvdXRTdGF0ZUZvclN1YnRyZWUobV9sYXlvdXRSb290KTsKKyAg ICAgICAgICAgIGlmIChtX2Rpc2FibGVMYXlvdXRTdGF0ZSkKKyAgICAgICAgICAgICAgICB2aWV3 LmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgICAgICB9CisgICAgfQorCisgICAgflN1YnRyZWVM YXlvdXRTdGF0ZU1haW50YWluZXIoKQorICAgIHsKKyAgICAgICAgaWYgKG1fbGF5b3V0Um9vdCkg eworICAgICAgICAgICAgUmVuZGVyVmlldyYgdmlldyA9IG1fbGF5b3V0Um9vdC0+dmlldygpOwor ICAgICAgICAgICAgdmlldy5wb3BMYXlvdXRTdGF0ZSgqbV9sYXlvdXRSb290KTsKKyAgICAgICAg ICAgIGlmIChtX2Rpc2FibGVMYXlvdXRTdGF0ZSkKKyAgICAgICAgICAgICAgICB2aWV3LmVuYWJs ZUxheW91dFN0YXRlKCk7CisgICAgICAgIH0KKyAgICB9CisKK3ByaXZhdGU6CisgICAgUmVuZGVy RWxlbWVudCogbV9sYXlvdXRSb290IHsgbnVsbHB0ciB9OworICAgIGJvb2wgbV9kaXNhYmxlTGF5 b3V0U3RhdGUgeyBmYWxzZSB9OworfTsKKwogRnJhbWVWaWV3OjpGcmFtZVZpZXcoRnJhbWUmIGZy YW1lKQogICAgIDogbV9mcmFtZShmcmFtZSkKICAgICAsIG1fY2FuSGF2ZVNjcm9sbGJhcnModHJ1 ZSkKQEAgLTEzNDYsMTMgKzEzNzUsOCBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxs b3dTdWJ0cmVlKQogICAgICAgICB9CiAKICAgICAgICAgbGF5ZXIgPSByb290LT5lbmNsb3NpbmdM YXllcigpOworICAgICAgICBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyIHN1YnRyZWVMYXlv dXRTdGF0ZU1haW50YWluZXIobV9sYXlvdXRSb290KTsKIAotICAgICAgICBib29sIGRpc2FibGVM YXlvdXRTdGF0ZSA9IGZhbHNlOwotICAgICAgICBpZiAoc3VidHJlZSkgewotICAgICAgICAgICAg ZGlzYWJsZUxheW91dFN0YXRlID0gcm9vdC0+dmlldygpLnNob3VsZERpc2FibGVMYXlvdXRTdGF0 ZUZvclN1YnRyZWUocm9vdCk7Ci0gICAgICAgICAgICByb290LT52aWV3KCkucHVzaExheW91dFN0 YXRlKCpyb290KTsKLSAgICAgICAgfQotICAgICAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91 dFN0YXRlRGlzYWJsZXIoZGlzYWJsZUxheW91dFN0YXRlID8gJnJvb3QtPnZpZXcoKSA6IG51bGxw dHIpOwogICAgICAgICBSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3IgcmVwYWlu dFJlZ2lvbkFjY3VtdWxhdG9yKCZyb290LT52aWV3KCkpOwogCiAgICAgICAgIEFTU0VSVChtX2xh eW91dFBoYXNlID09IEluUHJlTGF5b3V0KTsKQEAgLTEzODAsMTMgKzE0MDQsOCBAQCB2b2lkIEZy YW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogI2VuZGlmCiAKICAgICAgICAgQVNT RVJUKG1fbGF5b3V0UGhhc2UgPT0gSW5MYXlvdXQpOwotCi0gICAgICAgIGlmIChzdWJ0cmVlKQot ICAgICAgICAgICAgcm9vdC0+dmlldygpLnBvcExheW91dFN0YXRlKCpyb290KTsKLQogICAgICAg ICBtX2xheW91dFJvb3QgPSBudWxscHRyOwotCi0gICAgICAgIC8vIENsb3NlIGJsb2NrIGhlcmUg dG8gZW5kIHRoZSBzY29wZSBvZiBjaGFuZ2VTY2hlZHVsaW5nRW5hYmxlZCBhbmQgbGF5b3V0U3Rh dGVEaXNhYmxlci4KKyAgICAgICAgLy8gQ2xvc2UgYmxvY2sgaGVyZSB0byBlbmQgdGhlIHNjb3Bl IG9mIGNoYW5nZVNjaGVkdWxpbmdFbmFibGVkIGFuZCBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFp bmVyLgogICAgIH0KIAogICAgIG1fbGF5b3V0UGhhc2UgPSBJblZpZXdTaXplQWRqdXN0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggZDU5YmNiMWRiY2NjYTJl NjViMGYyMTU3YjgwNzYwNjY4NzE1ZWEzNy4uYmU3YjI4MDAzMTE0NmMxMjcxYWQ1ZTdkMzJhOTE4 NzhiYjk3MjlmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBA IC0zMDYxLDcgKzMwNjEsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVGaXJzdExldHRlclN0 eWxlKFJlbmRlckVsZW1lbnQqIGZpcnN0TGV0dGVyQmxvY2ssIFJlbmRlcgogICAgICAgICBuZXdG aXJzdExldHRlci0+aW5pdGlhbGl6ZVN0eWxlKCk7CiAKICAgICAgICAgLy8gTW92ZSB0aGUgZmly c3QgbGV0dGVyIGludG8gdGhlIG5ldyByZW5kZXJlci4KLSAgICAgICAgTGF5b3V0U3RhdGVEaXNh YmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgICAgICBMYXlvdXRTdGF0ZURp c2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICAgICAgd2hpbGUgKFJlbmRl ck9iamVjdCogY2hpbGQgPSBmaXJzdExldHRlci0+Zmlyc3RDaGlsZCgpKSB7CiAgICAgICAgICAg ICBpZiAoaXM8UmVuZGVyVGV4dD4oKmNoaWxkKSkKICAgICAgICAgICAgICAgICBkb3duY2FzdDxS ZW5kZXJUZXh0PigqY2hpbGQpLnJlbW92ZUFuZERlc3Ryb3lUZXh0Qm94ZXMoKTsKQEAgLTMyMzcs NyArMzIzNyw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUZpcnN0TGV0dGVyKCkKIAogICAg IC8vIE91ciBsYXlvdXQgc3RhdGUgaXMgbm90IHZhbGlkIGZvciB0aGUgcmVwYWludHMgd2UgYXJl IGdvaW5nIHRvIHRyaWdnZXIgYnkKICAgICAvLyBhZGRpbmcgYW5kIHJlbW92aW5nIGNoaWxkcmVu IG9mIGZpcnN0TGV0dGVyQ29udGFpbmVyLgotICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0 U3RhdGVEaXNhYmxlcigmdmlldygpKTsKKyAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0 YXRlRGlzYWJsZXIodmlldygpKTsKIAogICAgIGNyZWF0ZUZpcnN0TGV0dGVyUmVuZGVyZXIoZmly c3RMZXR0ZXJDb250YWluZXIsIGRvd25jYXN0PFJlbmRlclRleHQ+KGZpcnN0TGV0dGVyT2JqKSk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4 IGFmNGNhNzEzODVlYmJlNjg2YjY2ZWUzNzQ1ZTdkY2RjNTlkZDgwOWIuLmY2MDM2NTc4OGQzMWRm MWJkYWVmMTY2N2NhNTBiMTdhMDdkN2QzMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0yMTIzLDcgKzIxMjMsNyBAQCB2b2lkIFJlbmRlckJs b2NrRmxvdzo6cmVwYWludE92ZXJoYW5naW5nRmxvYXRzKGJvb2wgcGFpbnRBbGxEZXNjZW5kYW50 cykKIAogICAgIC8vIEZJWE1FOiBBdm9pZCBkaXNhYmxpbmcgTGF5b3V0U3RhdGUuIEF0IHRoZSB2 ZXJ5IGxlYXN0LCBkb24ndCBkaXNhYmxlIGl0IGZvciBmbG9hdHMgb3JpZ2luYXRpbmcKICAgICAv LyBpbiB0aGlzIGJsb2NrLiBCZXR0ZXIgeWV0IHdvdWxkIGJlIHRvIHB1c2ggZXh0cmEgc3RhdGUg Zm9yIHRoZSBjb250YWluZXJzIG9mIG90aGVyIGZsb2F0cy4KLSAgICBMYXlvdXRTdGF0ZURpc2Fi bGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0U3RhdGVEaXNhYmxl ciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgY29uc3QgRmxvYXRpbmdPYmplY3RT ZXQmIGZsb2F0aW5nT2JqZWN0U2V0ID0gbV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwogICAgIGF1 dG8gZW5kID0gZmxvYXRpbmdPYmplY3RTZXQuZW5kKCk7CiAgICAgZm9yIChhdXRvIGl0ID0gZmxv YXRpbmdPYmplY3RTZXQuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKaW5kZXggZGRiZjNhYzU0MWQ1MmM0 ZTM2MTBlZTEwNzhiYTk4ZWUyNDcwMTFlNS4uMjFlZjNkOTNhZWI5YzNjMDVlYzgyYjk5ZjA0N2My ZTMzZTQyYWVhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs b3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhy ZWFkLmNwcApAQCAtMzgzLDcgKzM4Myw3IEBAIHZvaWQgUmVuZGVyRmxvd1RocmVhZDo6cmVwYWlu dFJlY3RhbmdsZUluUmVnaW9ucyhjb25zdCBMYXlvdXRSZWN0JiByZXBhaW50UmVjdCkKICAgICBp ZiAoIXNob3VsZFJlcGFpbnQocmVwYWludFJlY3QpIHx8ICFoYXNWYWxpZFJlZ2lvbkluZm8oKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURp c2FibGVyKCZ2aWV3KCkpOyAvLyBXZSBjYW4ndCB1c2UgbGF5b3V0IHN0YXRlIHRvIHJlcGFpbnQs IHNpbmNlIHRoZSByZWdpb25zIGFyZSBzb21ld2hlcmUgZWxzZS4KKyAgICBMYXlvdXRTdGF0ZURp c2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsgLy8gV2UgY2FuJ3QgdXNlIGxheW91 dCBzdGF0ZSB0byByZXBhaW50LCBzaW5jZSB0aGUgcmVnaW9ucyBhcmUgc29tZXdoZXJlIGVsc2Uu CiAKICAgICBmb3IgKGF1dG8mIHJlZ2lvbiA6IG1fcmVnaW9uTGlzdCkKICAgICAgICAgcmVnaW9u LT5yZXBhaW50Rmxvd1RocmVhZENvbnRlbnQocmVwYWludFJlY3QpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IDkxNmMyZGU3ZWI1N2NmNWE3MWNmZjg1 NDQ0ODhkYjM1YzExOTM3NjMuLjU5MmRmZjRiMjNjMmVmYWRkZGI4MjNiMjI3ZjkwOWNhNWMxNTVl ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTE3 NCw3ICsxNzQsNyBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OmxheW91dCgpCiAgICAgfQogCiAgICAg aWYgKG1fc2Nyb2xsVG9SZXZlYWxTZWxlY3Rpb25BZnRlckxheW91dCkgewotICAgICAgICBMYXlv dXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgICAgIExh eW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgICAgICBz Y3JvbGxUb1JldmVhbFNlbGVjdGlvbigpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwCmluZGV4IGQzYWE5ZTcxODg1MmIwZjdlOTE3NWUzYTc5 ZWUxZWE4YjM3MTFhZWYuLjFkMzhlMjI1NWI1NDc5YmRiNWM3YTRkOGRkY2IwYjVhNzNiYWFhNWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcApAQCAtMjkx LDcgKzI5MSw3IEBAIHZvaWQgUmVuZGVyTGlzdEl0ZW06Omluc2VydE9yTW92ZU1hcmtlclJlbmRl cmVySWZOZWVkZWQoKQogICAgIGlmIChuZXdQYXJlbnQgIT0gY3VycmVudFBhcmVudCkgewogICAg ICAgICAvLyBSZW1vdmluZyBhbmQgYWRkaW5nIHRoZSBtYXJrZXIgY2FuIHRyaWdnZXIgcmVwYWlu dGluZyBpbgogICAgICAgICAvLyBjb250YWluZXJzIG90aGVyIHRoYW4gb3Vyc2VsdmVzLCBzbyB3 ZSBuZWVkIHRvIGRpc2FibGUgTGF5b3V0U3RhdGUuCi0gICAgICAgIExheW91dFN0YXRlRGlzYWJs ZXIgbGF5b3V0U3RhdGVEaXNhYmxlcigmdmlldygpKTsKKyAgICAgICAgTGF5b3V0U3RhdGVEaXNh YmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgICAgIG1fbWFya2VyLT5yZW1v dmVGcm9tUGFyZW50KCk7CiAgICAgICAgIG5ld1BhcmVudC0+YWRkQ2hpbGQobV9tYXJrZXIsIGZp cnN0Tm9uTWFya2VyQ2hpbGQoKm5ld1BhcmVudCkpOwogICAgICAgICBtX21hcmtlci0+dXBkYXRl TWFyZ2luc0FuZENvbnRlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCmluZGV4IGM4MjNhNTQ2NTY4ZThlOGU2 ZTIwNDE0NWUyZTY0ZDYzMmMzODk0OTAuLmY5MmEyZDY2OWE4ZWM0MGVhNWU1OThjZWFmNWI1MmRj YTgxNTNjNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRp YUNvbnRyb2xFbGVtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck1lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAtNTAsNyArNTAsNyBAQCB2b2lkIFJlbmRlck1l ZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyOjpsYXlvdXQoKQogICAgIFJlbmRlckJveCYgYnV0dG9u Qm94ID0gZG93bmNhc3Q8UmVuZGVyQm94PigqbmV4dFNpYmxpbmcoKSk7CiAgICAgaW50IGFic29s dXRlT2Zmc2V0VG9wID0gYnV0dG9uQm94LmxvY2FsVG9BYnNvbHV0ZShGbG9hdFBvaW50KDAsIC1z aXplKCkuaGVpZ2h0KCkpKS55KCk7CiAKLSAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0 YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0 ZURpc2FibGVyKHZpZXcoKSk7CiAKICAgICAvLyBJZiB0aGUgc2xpZGVyIHdvdWxkIGJlIHJlbmRl cmVkIG91dHNpZGUgdGhlIHBhZ2UsIGl0IHNob3VsZCBiZSBtb3ZlZCBiZWxvdyB0aGUgY29udHJv bHMuCiAgICAgaWYgKFVOTElLRUxZKGFic29sdXRlT2Zmc2V0VG9wIDwgMCkpCkBAIC03Miw3ICs3 Miw3IEBAIHZvaWQgUmVuZGVyTWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXI6OmxheW91dCgp CiB7CiAgICAgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dCgpOwogCi0gICAgTGF5b3V0U3RhdGVE aXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKCZ2aWV3KCkpOworICAgIExheW91dFN0YXRlRGlz YWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgIE1lZGlhQ29udHJvbFRpbWVs aW5lQ29udGFpbmVyRWxlbWVudCogY29udGFpbmVyID0gc3RhdGljX2Nhc3Q8TWVkaWFDb250cm9s VGltZWxpbmVDb250YWluZXJFbGVtZW50Kj4oZWxlbWVudCgpKTsKICAgICBjb250YWluZXItPnNl dFRpbWVEaXNwbGF5c0hpZGRlbih3aWR0aCgpLnRvSW50KCkgPCBtaW5XaWR0aFRvRGlzcGxheVRp bWVEaXNwbGF5cyk7CiB9CkBAIC05NCw3ICs5NCw3IEBAIHZvaWQgUmVuZGVyVGV4dFRyYWNrQ29u dGFpbmVyRWxlbWVudDo6bGF5b3V0KCkKIAogICAgIEFTU0VSVChtZWRpYUNvbnRyb2xFbGVtZW50 VHlwZShlbGVtZW50KCkpID09IE1lZGlhVGV4dFRyYWNrRGlzcGxheUNvbnRhaW5lcik7CiAKLSAg ICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAg TGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgc3Rh dGljX2Nhc3Q8TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudCo+KGVsZW1lbnQo KSktPnVwZGF0ZVNpemVzKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKaW5kZXggNmI0Y2Y0YWExNjI4 NWQxMDk2ZWVlMTgwYTA5ODc1ZjMzZTE1ZTVjMS4uMmQ2NDExYWY0NzI2NWJkYTEzN2Q5MGQ2N2M0 MzI2ZjNmODdkOGNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKQEAgLTE0OSw3ICsxNDksNyBAQCB2b2lk IFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6cG9wdWxhdGUoKQogICAgIC8vIFJlcGFyZW50 IGNoaWxkcmVuIHByZWNlZGluZyB0aGUgZmxvdyB0aHJlYWQgaW50byB0aGUgZmxvdyB0aHJlYWQu IEl0J3MgbXVsdGljb2wgY29udGVudAogICAgIC8vIG5vdy4gQXQgdGhpcyBwb2ludCB0aGVyZSdz IG9idmlvdXNseSBub3RoaW5nIGFmdGVyIHRoZSBmbG93IHRocmVhZCwgYnV0IHJlbmRlcmVycyAo Y29sdW1uCiAgICAgLy8gc2V0cyBhbmQgc3Bhbm5lcnMpIHdpbGwgYmUgaW5zZXJ0ZWQgdGhlcmUg YXMgd2UgaW5zZXJ0IGVsZW1lbnRzIGludG8gdGhlIGZsb3cgdGhyZWFkLgotICAgIExheW91dFN0 YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcigmdmlldygpKTsKKyAgICBMYXlvdXRTdGF0 ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICBtdWx0aWNvbENvbnRh aW5lci0+bW92ZUNoaWxkcmVuVG8odGhpcywgbXVsdGljb2xDb250YWluZXItPmZpcnN0Q2hpbGQo KSwgdGhpcywgdHJ1ZSk7CiB9CiAKQEAgLTE2MSw3ICsxNjEsNyBAQCB2b2lkIFJlbmRlck11bHRp Q29sdW1uRmxvd1RocmVhZDo6ZXZhY3VhdGVBbmREZXN0cm95KCkKICAgICAvLyBEZWxldGUgdGhl IGxpbmUgYm94IHRyZWUuCiAgICAgZGVsZXRlTGluZXMoKTsKICAgICAKLSAgICBMYXlvdXRTdGF0 ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0U3RhdGVE aXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAKICAgICAvLyBGaXJzdCBwcm9t b3RlIGFsbCBjaGlsZHJlbiBvZiB0aGUgZmxvdyB0aHJlYWQuIEJlZm9yZSB3ZSBtb3ZlIHRoZW0g dG8gdGhlIGZsb3cgdGhyZWFkJ3MKICAgICAvLyBjb250YWluZXIsIHdlIG5lZWQgdG8gdW5yZWdp c3RlciB0aGUgZmxvdyB0aHJlYWQsIHNvIHRoYXQgdGhleSBhcmVuJ3QganVzdCByZS1hZGRlZCBh Z2FpbiB0bwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggYzgwMGVmYjRl MjQ5NDg4Nzk3ZDNjNDM4ZjczZGU3NWI0NGM5ZDQ5NS4uOTQ4MTA5ZGU5ZDlkOTg0Mzc5NTJjNGZm NDMzZTFmYzc1ZjVjNzlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBA IC0zMDQsNiArMzA0LDcgQEAgcHJpdmF0ZToKIAogICAgIGZyaWVuZCBjbGFzcyBMYXlvdXRTdGF0 ZU1haW50YWluZXI7CiAgICAgZnJpZW5kIGNsYXNzIExheW91dFN0YXRlRGlzYWJsZXI7CisgICAg ZnJpZW5kIGNsYXNzIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXI7CiAKICAgICB2aXJ0dWFs IGJvb2wgaXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUJveCgpIGNvbnN0IG92ZXJyaWRlOwog CkBAIC00NDUsMjAgKzQ0NiwxOSBAQCBwcml2YXRlOgogY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxl ciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTGF5b3V0U3RhdGVEaXNhYmxlcik7CiBwdWJs aWM6Ci0gICAgTGF5b3V0U3RhdGVEaXNhYmxlcihSZW5kZXJWaWV3KiB2aWV3KQorICAgIExheW91 dFN0YXRlRGlzYWJsZXIoUmVuZGVyVmlldyYgdmlldykKICAgICAgICAgOiBtX3ZpZXcodmlldykK ICAgICB7Ci0gICAgICAgIGlmIChtX3ZpZXcpCi0gICAgICAgICAgICBtX3ZpZXctPmRpc2FibGVM YXlvdXRTdGF0ZSgpOworICAgICAgICBtX3ZpZXcuZGlzYWJsZUxheW91dFN0YXRlKCk7CiAgICAg fQogCiAgICAgfkxheW91dFN0YXRlRGlzYWJsZXIoKQogICAgIHsKLSAgICAgICAgaWYgKG1fdmll dykKLSAgICAgICAgICAgIG1fdmlldy0+ZW5hYmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgbV92 aWV3LmVuYWJsZUxheW91dFN0YXRlKCk7CiAgICAgfQorCiBwcml2YXRlOgotICAgIFJlbmRlclZp ZXcqIG1fdmlldzsKKyAgICBSZW5kZXJWaWV3JiBtX3ZpZXc7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jvb3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290 LmNwcAppbmRleCAyYzIzZTFmMTE2ZDM0ODhlZmU1MGQ4MTE1OTZkM2IxMTkyNGNkMDExLi42NGJl YTA0NzMwMDYyMWVkY2YwZWRhMzNmNzRmYjBmYmM0Y2MzZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAKQEAgLTE2NSw3ICsxNjUsNyBAQCB2 b2lkIFJlbmRlclNWR1Jvb3Q6OmxheW91dCgpCiAgICAgbV9yZXNvdXJjZXNOZWVkaW5nVG9JbnZh bGlkYXRlQ2xpZW50cy5jbGVhcigpOwogCiAgICAgLy8gQXJiaXRyYXJ5IGFmZmluZSB0cmFuc2Zv cm1zIGFyZSBpbmNvbXBhdGlibGUgd2l0aCBMYXlvdXRTdGF0ZS4KLSAgICBMYXlvdXRTdGF0ZURp c2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CisgICAgTGF5b3V0U3RhdGVEaXNh YmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAKICAgICBib29sIG5lZWRzTGF5b3V0 ID0gc2VsZk5lZWRzTGF5b3V0KCk7CiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigqdGhp cywgY2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkgJiYgbmVlZHNMYXlvdXQpOwo=