137895 2014-10-20 14:30:38 -0700 REGRESSION: Google Search (mobile) video thumbnails are too large. 2014-11-12 21:30:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser stavila zalan oldest_to_newest 1042972 0 zalan 2014-10-20 14:30:38 -0700 1. Open google.com with iOS user agent string. 1. Search for something with videos. 3. Tap the "videos". Notice that the video thumbnail overlay the title/text. 1042974 1 zalan 2014-10-20 14:31:57 -0700 rdar://problem/18559546 1043039 2 240167 zalan 2014-10-20 17:51:31 -0700 Created attachment 240167 Patch 1043040 3 240167 simon.fraser 2014-10-20 17:54:09 -0700 Comment on attachment 240167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240167&action=review > Source/WebCore/rendering/RenderLayer.h:101 > + bool effectedByRadius() const { return m_effectedByRadius; } > + void setEffectedByRadius(bool effectedByRadius) { m_effectedByRadius = effectedByRadius; } effected -> affected everywhere. 1043190 4 240207 zalan 2014-10-21 08:57:23 -0700 Created attachment 240207 Patch 1043217 5 240207 commit-queue 2014-10-21 10:32:12 -0700 Comment on attachment 240207 Patch Clearing flags on attachment: 240207 Committed r174986: <http://trac.webkit.org/changeset/174986> 1043218 6 commit-queue 2014-10-21 10:32:16 -0700 All reviewed patches have been landed. Closing bug. 1048340 7 simon.fraser 2014-11-12 21:30:30 -0800 This broke css "clip". 240167 2014-10-20 17:51:31 -0700 2014-10-21 08:57:18 -0700 Patch bug-137895-20141020175137.patch text/plain 11463 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0MzE2MWEzNGQ4Nzcy MjM1NjNiMjBmYzc1YjdjNDE1YzYxZDk3MC4uYzIwNzhiMTg5NzVhNjQ2NDliZDBkNzNlOTlmOTgy YzcyMzdjM2Q0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEwLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogR29vZ2xl IFNlYXJjaCAobW9iaWxlKSB2aWRlbyB0aHVtYm5haWxzIGFyZSB0b28gbGFyZ2UuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc4OTUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVz IGxheWVyIGNsaXBwaW5nIHdoZW4gYW4gYW5jZXN0b3IgbGF5ZXIgaGFzIGJvcmRlci1yYWRpdXMg Y2xpcHBpbmcuCisKKyAgICAgICAgSW4gY2FzZXMsIHdoZXJlIHRoZSBjdXJyZW50IGxheWVyIGhh cyBub24tcmFkaXVzIGNsaXByZWN0LCB3aGlsZSBhbiBhbmNlc3RvciBsYXllcgorICAgICAgICBo YXMgYm9yZGVyLXJhZGl1cyBjbGlwcGluZywgd2Ugb25seSB1c2UgdGhlIGJvcmRlci1yYWRpdXMg cmVjdCB0byBjbGlwLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4t d2l0aC1ib3JkZXItcmFkaXVzLW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC5odG1sCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OmNsaXBUb1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlc3Rv cmVDbGlwKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjb2xsZWN0RnJhZ21lbnRz KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6Q2xp cFJlY3Q6OkNsaXBSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjplZmZlY3RlZEJ5 UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjpzZXRFZmZlY3RlZEJ5UmFkaXVz KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjpvcGVyYXRvcj09KToKKyAgICAgICAgKFdl YkNvcmU6OkNsaXBSZWN0OjpvcGVyYXRvciE9KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0 OjppbnRlcnNlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFJlY3Q6Omhhc1JhZGl1cyk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6c2V0SGFzUmFkaXVzKTogRGVsZXRl ZC4KKwogMjAxNC0xMC0yMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29t PgogCiAgICAgICAgIFVzZSBzdGQ6OnVuaXF1ZV9wdHI8PnxtYWtlX3VuaXF1ZTw+IGluIFBsdWdp blZpZXc6OnNjaGVkdWxlUmVxdWVzdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCAyYTA2YTUxZWY1Y2YyOTViMmVmODhhMjIxNzBhNGVmYWFiZmExNGFjLi45 ODRkYzdlNjMxYTAzMDk5MTdlYjAzYjc1ZGIwMWMzZmViODRjZTAyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM2NjQsMTAgKzM2NjQsMTkgQEAgc3RhdGlj IGJvb2wgaW5Db250YWluaW5nQmxvY2tDaGFpbihSZW5kZXJMYXllciogc3RhcnRMYXllciwgUmVu ZGVyTGF5ZXIqIGVuZExheWUKIAogdm9pZCBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdChjb25zdCBM YXllclBhaW50aW5nSW5mbyYgcGFpbnRpbmdJbmZvLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQs IGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdSdWxlIHJ1bGUp CiB7Ci0gICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSByZW5kZXJlcigpLmRvY3VtZW50KCku ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBpZiAoY2xpcFJlY3QuaGFzUmFkaXVzKCkpIHsKKyAg ICBib29sIG5lZWRzQ2xpcHBpbmcgPSBjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnRpbmdJbmZvLnBh aW50RGlydHlSZWN0OworICAgIGlmIChuZWVkc0NsaXBwaW5nIHx8IGNsaXBSZWN0LmVmZmVjdGVk QnlSYWRpdXMoKSkKICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwotICAgICAgICAKKworICAgIGZs b2F0IGRldmljZVNjYWxlRmFjdG9yID0gcmVuZGVyZXIoKS5kb2N1bWVudCgpLmRldmljZVNjYWxl RmFjdG9yKCk7CisgICAgYm9vbCBsYXllckhhc0JvcmRlclJhZGl1cyA9IHJlbmRlcmVyKCkuc3R5 bGUoKS5oYXNCb3JkZXJSYWRpdXMoKTsKKyAgICBpZiAobmVlZHNDbGlwcGluZyAmJiAhbGF5ZXJI YXNCb3JkZXJSYWRpdXMpIHsKKyAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENsaXBSZWN0ID0g Y2xpcFJlY3QucmVjdCgpOworICAgICAgICBhZGp1c3RlZENsaXBSZWN0Lm1vdmUocGFpbnRpbmdJ bmZvLnN1YnBpeGVsQWNjdW11bGF0aW9uKTsKKyAgICAgICAgY29udGV4dC0+Y2xpcChzbmFwUmVj dFRvRGV2aWNlUGl4ZWxzKGFkanVzdGVkQ2xpcFJlY3QsIGRldmljZVNjYWxlRmFjdG9yKSk7Cisg ICAgfQorCisgICAgaWYgKGNsaXBSZWN0LmVmZmVjdGVkQnlSYWRpdXMoKSkgewogICAgICAgICAv LyBJZiB0aGUgY2xpcCByZWN0IGhhcyBiZWVuIHRhaW50ZWQgYnkgYSBib3JkZXIgcmFkaXVzLCB0 aGVuIHdlIGhhdmUgdG8gd2FsayB1cCBvdXIgbGF5ZXIgY2hhaW4gYXBwbHlpbmcgdGhlIGNsaXBz IGZyb20KICAgICAgICAgLy8gYW55IGxheWVycyB3aXRoIG92ZXJmbG93LiBUaGUgY29uZGl0aW9u IGZvciBiZWluZyBhYmxlIHRvIGFwcGx5IHRoZXNlIGNsaXBzIGlzIHRoYXQgdGhlIG92ZXJmbG93 IG9iamVjdCBiZSBpbiBvdXIKICAgICAgICAgLy8gY29udGFpbmluZyBibG9jayBjaGFpbiBzbyB3 ZSBjaGVjayB0aGF0IGFsc28uCkBAIC0zNjgxLDE3ICszNjkwLDEyIEBAIHZvaWQgUmVuZGVyTGF5 ZXI6OmNsaXBUb1JlY3QoY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50aW5nSW5mbywgR3Jh cGhpY3NDb250CiAgICAgICAgICAgICBpZiAobGF5ZXIgPT0gcGFpbnRpbmdJbmZvLnJvb3RMYXll cikKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoY2xp cFJlY3QucmVjdCgpICE9IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCkgewotICAgICAgICBj b250ZXh0LT5zYXZlKCk7Ci0gICAgICAgIExheW91dFJlY3QgYWRqdXN0ZWRDbGlwUmVjdCA9IGNs aXBSZWN0LnJlY3QoKTsKLSAgICAgICAgYWRqdXN0ZWRDbGlwUmVjdC5tb3ZlKHBhaW50aW5nSW5m by5zdWJwaXhlbEFjY3VtdWxhdGlvbik7Ci0gICAgICAgIGNvbnRleHQtPmNsaXAoc25hcFJlY3RU b0RldmljZVBpeGVscyhhZGp1c3RlZENsaXBSZWN0LCBkZXZpY2VTY2FsZUZhY3RvcikpOwogICAg IH0KIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6cmVzdG9yZUNsaXAoR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiBwYWludERpcnR5UmVjdCwgY29uc3QgQ2xpcFJlY3Qm IGNsaXBSZWN0KQogewotICAgIGlmIChjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnREaXJ0eVJlY3Qg fHwgY2xpcFJlY3QuaGFzUmFkaXVzKCkpCisgICAgaWYgKGNsaXBSZWN0LnJlY3QoKSAhPSBwYWlu dERpcnR5UmVjdCB8fCBjbGlwUmVjdC5lZmZlY3RlZEJ5UmFkaXVzKCkpCiAgICAgICAgIGNvbnRl eHQtPnJlc3RvcmUoKTsKIH0KIApAQCAtNDM5NywxMCArNDQwMSwxMCBAQCB2b2lkIFJlbmRlckxh eWVyOjpjb2xsZWN0RnJhZ21lbnRzKExheWVyRnJhZ21lbnRzJiBmcmFnbWVudHMsIGNvbnN0IFJl bmRlckxheWVyKgogICAgICAgICBmcmFnbWVudC5pbnRlcnNlY3QoYW5jZXN0b3JDbGlwUmVjdC5y ZWN0KCkpOwogICAgICAgICAKICAgICAgICAgLy8gSWYgdGhlIGFuY2VzdG9yIGNsaXAgcmVjdCBo YXMgYm9yZGVyLXJhZGl1cywgbWFrZSBzdXJlIHRvIGFwcGx5IGl0IHRvIHRoZSBmcmFnbWVudHMu Ci0gICAgICAgIGlmIChhbmNlc3RvckNsaXBSZWN0Lmhhc1JhZGl1cygpKSB7Ci0gICAgICAgICAg ICBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7Ci0gICAgICAgICAg ICBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7Ci0gICAgICAgICAg ICBmcmFnbWVudC5vdXRsaW5lUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7CisgICAgICAgIGlmIChh bmNlc3RvckNsaXBSZWN0LmVmZmVjdGVkQnlSYWRpdXMoKSkgeworICAgICAgICAgICAgZnJhZ21l bnQuZm9yZWdyb3VuZFJlY3Quc2V0RWZmZWN0ZWRCeVJhZGl1cyh0cnVlKTsKKyAgICAgICAgICAg IGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnNldEVmZmVjdGVkQnlSYWRpdXModHJ1ZSk7CisgICAg ICAgICAgICBmcmFnbWVudC5vdXRsaW5lUmVjdC5zZXRFZmZlY3RlZEJ5UmFkaXVzKHRydWUpOwog ICAgICAgICB9CiAKICAgICAgICAgLy8gTm93IGludGVyc2VjdCB3aXRoIG91ciBwYWdpbmF0aW9u IGNsaXAuIFRoaXMgd2lsbCB0eXBpY2FsbHkgbWVhbiB3ZSdyZSBqdXN0IGludGVyc2VjdGluZyB0 aGUgZGlydHkgcmVjdCB3aXRoIHRoZSBjb2x1bW4KQEAgLTUzMDQsNyArNTMwOCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBj bGlwUmVjdHNDb250ZXh0LCBDCiAgICAgICAgIAogICAgICAgICBpZiAocmVuZGVyZXIoKS5oYXNP dmVyZmxvd0NsaXAoKSkgewogICAgICAgICAgICAgQ2xpcFJlY3QgbmV3T3ZlcmZsb3dDbGlwID0g ZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5vdmVyZmxvd0NsaXBSZWN0Rm9yQ2hpbGRM YXllcnMob2Zmc2V0LCBjdXJyZW50UmVuZGVyTmFtZWRGbG93RnJhZ21lbnQoKSwgY2xpcFJlY3Rz Q29udGV4dC5vdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSk7Ci0gICAgICAgICAgICBuZXdP dmVyZmxvd0NsaXAuc2V0SGFzUmFkaXVzKHJlbmRlcmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRp dXMoKSk7CisgICAgICAgICAgICBuZXdPdmVyZmxvd0NsaXAuc2V0RWZmZWN0ZWRCeVJhZGl1cyhy ZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpOwogICAgICAgICAgICAgY2xpcFJl Y3RzLnNldE92ZXJmbG93Q2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld092ZXJmbG93Q2xpcCwgY2xp cFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKSkpOwogICAgICAgICAgICAgaWYgKHJlbmRlcmVyKCku aXNQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgY2xpcFJlY3RzLnNldFBvc0NsaXBSZWN0 KGludGVyc2VjdGlvbihuZXdPdmVyZmxvd0NsaXAsIGNsaXBSZWN0cy5wb3NDbGlwUmVjdCgpKSk7 CkBAIC01NDI5LDcgKzU0MzMsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVSZWN0cyhj b25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBjb25zdAogICAgICAgICBp ZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSAmJiAodGhpcyAhPSBjbGlwUmVjdHNDb250 ZXh0LnJvb3RMYXllciB8fCBjbGlwUmVjdHNDb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXAgPT0g UmVzcGVjdE92ZXJmbG93Q2xpcCkpIHsKICAgICAgICAgICAgIGZvcmVncm91bmRSZWN0LmludGVy c2VjdChkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpLm92ZXJmbG93Q2xpcFJlY3QodG9M YXlvdXRQb2ludChvZmZzZXRGcm9tUm9vdExvY2FsKSwgbmFtZWRGbG93RnJhZ21lbnQsIGNsaXBS ZWN0c0NvbnRleHQub3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kpKTsKICAgICAgICAgICAg IGlmIChyZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpCi0gICAgICAgICAgICAg ICAgZm9yZWdyb3VuZFJlY3Quc2V0SGFzUmFkaXVzKHRydWUpOworICAgICAgICAgICAgICAgIGZv cmVncm91bmRSZWN0LnNldEVmZmVjdGVkQnlSYWRpdXModHJ1ZSk7CiAgICAgICAgIH0KIAogICAg ICAgICBpZiAocmVuZGVyZXIoKS5oYXNDbGlwKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKaW5kZXggOTY0MmQ4NDcwZDVhN2Y3MDRmOGI4OTNkMGI3MDg1Y2I2N2Y2ODE4 OC4uYTJmOWJkMDMwNWM0NmYyMTkyMTQ5NGRlNjc0YTYxOWI5ZDZlMTQ1MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTg0LDMwICs4NCwzMiBAQCBlbnVtIFJlcGFp bnRTdGF0dXMgewogY2xhc3MgQ2xpcFJlY3QgewogcHVibGljOgogICAgIENsaXBSZWN0KCkKLSAg ICA6IG1faGFzUmFkaXVzKGZhbHNlKQotICAgIHsgfQorICAgICAgICA6IG1fZWZmZWN0ZWRCeVJh ZGl1cyhmYWxzZSkKKyAgICB7CisgICAgfQogICAgIAogICAgIENsaXBSZWN0KGNvbnN0IExheW91 dFJlY3QmIHJlY3QpCi0gICAgOiBtX3JlY3QocmVjdCkKLSAgICAsIG1faGFzUmFkaXVzKGZhbHNl KQotICAgIHsgfQorICAgICAgICA6IG1fcmVjdChyZWN0KQorICAgICAgICAsIG1fZWZmZWN0ZWRC eVJhZGl1cyhmYWxzZSkKKyAgICB7CisgICAgfQogICAgIAogICAgIGNvbnN0IExheW91dFJlY3Qm IHJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KICAgICB2b2lkIHNldFJlY3QoY29uc3Qg TGF5b3V0UmVjdCYgcmVjdCkgeyBtX3JlY3QgPSByZWN0OyB9CiAKLSAgICBib29sIGhhc1JhZGl1 cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzUmFkaXVzOyB9Ci0gICAgdm9pZCBzZXRIYXNSYWRpdXMo Ym9vbCBoYXNSYWRpdXMpIHsgbV9oYXNSYWRpdXMgPSBoYXNSYWRpdXM7IH0KKyAgICBib29sIGVm ZmVjdGVkQnlSYWRpdXMoKSBjb25zdCB7IHJldHVybiBtX2VmZmVjdGVkQnlSYWRpdXM7IH0KKyAg ICB2b2lkIHNldEVmZmVjdGVkQnlSYWRpdXMoYm9vbCBlZmZlY3RlZEJ5UmFkaXVzKSB7IG1fZWZm ZWN0ZWRCeVJhZGl1cyA9IGVmZmVjdGVkQnlSYWRpdXM7IH0KIAotICAgIGJvb2wgb3BlcmF0b3I9 PShjb25zdCBDbGlwUmVjdCYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIHJlY3QoKSA9PSBvdGhlci5y ZWN0KCkgJiYgaGFzUmFkaXVzKCkgPT0gb3RoZXIuaGFzUmFkaXVzKCk7IH0KLSAgICBib29sIG9w ZXJhdG9yIT0oY29uc3QgQ2xpcFJlY3QmIG90aGVyKSBjb25zdCB7IHJldHVybiByZWN0KCkgIT0g b3RoZXIucmVjdCgpIHx8IGhhc1JhZGl1cygpICE9IG90aGVyLmhhc1JhZGl1cygpOyB9CisgICAg Ym9vbCBvcGVyYXRvcj09KGNvbnN0IENsaXBSZWN0JiBvdGhlcikgY29uc3QgeyByZXR1cm4gcmVj dCgpID09IG90aGVyLnJlY3QoKSAmJiBlZmZlY3RlZEJ5UmFkaXVzKCkgPT0gb3RoZXIuZWZmZWN0 ZWRCeVJhZGl1cygpOyB9CisgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IENsaXBSZWN0JiBvdGhl cikgY29uc3QgeyByZXR1cm4gcmVjdCgpICE9IG90aGVyLnJlY3QoKSB8fCBlZmZlY3RlZEJ5UmFk aXVzKCkgIT0gb3RoZXIuZWZmZWN0ZWRCeVJhZGl1cygpOyB9CiAgICAgYm9vbCBvcGVyYXRvciE9 KGNvbnN0IExheW91dFJlY3QmIG90aGVyUmVjdCkgY29uc3QgeyByZXR1cm4gcmVjdCgpICE9IG90 aGVyUmVjdDsgfQogCiAgICAgdm9pZCBpbnRlcnNlY3QoY29uc3QgTGF5b3V0UmVjdCYgb3RoZXIp IHsgbV9yZWN0LmludGVyc2VjdChvdGhlcik7IH0KICAgICB2b2lkIGludGVyc2VjdChjb25zdCBD bGlwUmVjdCYgb3RoZXIpCiAgICAgewogICAgICAgICBtX3JlY3QuaW50ZXJzZWN0KG90aGVyLnJl Y3QoKSk7Ci0gICAgICAgIGlmIChvdGhlci5oYXNSYWRpdXMoKSkKLSAgICAgICAgICAgIG1faGFz UmFkaXVzID0gdHJ1ZTsKKyAgICAgICAgaWYgKG90aGVyLmVmZmVjdGVkQnlSYWRpdXMoKSkKKyAg ICAgICAgICAgIG1fZWZmZWN0ZWRCeVJhZGl1cyA9IHRydWU7CiAgICAgfQogICAgIHZvaWQgbW92 ZShMYXlvdXRVbml0IHgsIExheW91dFVuaXQgeSkgeyBtX3JlY3QubW92ZSh4LCB5KTsgfQogICAg IHZvaWQgbW92ZShjb25zdCBMYXlvdXRTaXplJiBzaXplKSB7IG1fcmVjdC5tb3ZlKHNpemUpOyB9 CkBAIC0xMjMsNyArMTI1LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIExheW91dFJlY3Qg bV9yZWN0OwotICAgIGJvb2wgbV9oYXNSYWRpdXM7CisgICAgYm9vbCBtX2VmZmVjdGVkQnlSYWRp dXM7CiB9OwogCiBpbmxpbmUgQ2xpcFJlY3QgaW50ZXJzZWN0aW9uKGNvbnN0IENsaXBSZWN0JiBh LCBjb25zdCBDbGlwUmVjdCYgYikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2Y2M1MzlkODQ2NTQ3NjFiYTYzNjU2ZDVkY2Uz ODFkMGE1ODE3MmM3Li5kOWZmMjhjMTQ4MzZmYmE1YzAxY2I2YzlhZmNjNTJhYTRiOWYzNDM0IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTQtMTAtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBHb29nbGUgU2VhcmNoIChtb2JpbGUpIHZp ZGVvIHRodW1ibmFpbHMgYXJlIHRvbyBsYXJnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzg5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgbGF5ZXIgY2xpcHBpbmcgd2hl biBhbiBhbmNlc3RvciBsYXllciBoYXMgYm9yZGVyLXJhZGl1cyBjbGlwcGluZy4KKworICAgICAg ICBJbiBjYXNlcywgd2hlcmUgdGhlIGN1cnJlbnQgbGF5ZXIgaGFzIG5vbi1yYWRpdXMgY2xpcHJl Y3QsIHdoaWxlIGFuIGFuY2VzdG9yIGxheWVyCisgICAgICAgIGhhcyBib3JkZXItcmFkaXVzIGNs aXBwaW5nLCB3ZSBvbmx5IHVzZSB0aGUgYm9yZGVyLXJhZGl1cyByZWN0IHRvIGNsaXAuCisKKyAg ICAgICAgKiBmYXN0L2NsaXAvb3ZlcmZsb3ctaGlkZGVuLXdpdGgtYm9yZGVyLXJhZGl1cy1vdmVy Zmxvdy1jbGlwcGluZy1wYXJlbnQtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFz dC9jbGlwL292ZXJmbG93LWhpZGRlbi13aXRoLWJvcmRlci1yYWRpdXMtb3ZlcmZsb3ctY2xpcHBp bmctcGFyZW50Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTEwLTIwICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIE1hcmsgYSBmZXcgdGVzdHMgYXMgbm8t bG9uZ2VyIGZhaWxpbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NsaXAvb3ZlcmZs b3ctaGlkZGVuLXdpdGgtYm9yZGVyLXJhZGl1cy1vdmVyZmxvdy1jbGlwcGluZy1wYXJlbnQtZXhw ZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4td2l0aC1i b3JkZXItcmFkaXVzLW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC1leHBlY3RlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjgzOTYzY2U2OWYxNTkyYmQ3YWQ4ZmY5NTc5YjAwNzVhYmQ0YzllMTgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NsaXAvb3ZlcmZsb3ctaGlkZGVuLXdpdGgtYm9y ZGVyLXJhZGl1cy1vdmVyZmxvdy1jbGlwcGluZy1wYXJlbnQtZXhwZWN0ZWQuaHRtbApAQCAtMCww ICsxLDI1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0 ZXN0cyB0aGF0IHBhcmVudCBjbGlwcGluZyBpcyBhcHBsaWVkIHByb3Blcmx5IHdoZW4gYW5jZXN0 b3IgYm9yZGVyLXJhZGl1cyBpcyBwcmVzZW50LjwvdGl0bGU+Cis8c3R5bGU+CisgIC5jb250YWlu ZXIgeworICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgYm9yZGVyLXJhZGl1czogMjBweCAwcHgg MHB4IDBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgd2lkdGg6IDEwcHg7CisgIH0KKworICAu Y29udGVudCB7CisJd2lkdGg6IDEwMHB4OworCWhlaWdodDogMTAwcHg7CisJYmFja2dyb3VuZC1j b2xvcjogcmVkOworICB9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGNsYXNzPWNv bnRhaW5lcj4KKyAgPGRpdiBjbGFzcz1jb250ZW50PjwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NsaXAvb3ZlcmZsb3ctaGlkZGVu LXdpdGgtYm9yZGVyLXJhZGl1cy1vdmVyZmxvdy1jbGlwcGluZy1wYXJlbnQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4td2l0aC1ib3JkZXItcmFkaXVzLW92ZXJm bG93LWNsaXBwaW5nLXBhcmVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjEyOTE2MzFlZjZkODUxYzhiZTFi YzA4MDZjNWNlMmVmN2I1NTAzYzIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2NsaXAvb3ZlcmZsb3ctaGlkZGVuLXdpdGgtYm9yZGVyLXJhZGl1cy1vdmVyZmxvdy1jbGlwcGlu Zy1wYXJlbnQuaHRtbApAQCAtMCwwICsxLDMyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IHBhcmVudCBjbGlwcGluZyBpcyBhcHBsaWVk IHByb3Blcmx5IHdoZW4gYW5jZXN0b3IgYm9yZGVyLXJhZGl1cyBpcyBwcmVzZW50LjwvdGl0bGU+ Cis8c3R5bGU+CisgIC5vdXRlciB7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICBib3JkZXIt cmFkaXVzOiAyMHB4IDBweCAwcHggMHB4OworICB9CisKKyAgLmlubmVyIHsKKyAgICBvdmVyZmxv dzogaGlkZGVuOworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBoZWlnaHQ6IDEwcHg7Cisg ICAgd2lkdGg6IDEwcHg7CisgIH0KKworICAuY29udGVudCB7CisJd2lkdGg6IDEwMHB4OworCWhl aWdodDogMTAwcHg7CisJYmFja2dyb3VuZC1jb2xvcjogcmVkOworICB9Cis8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHk+Cis8ZGl2IGNsYXNzPW91dGVyPgorICA8ZGl2IGNsYXNzPWlubmVyPgorICAg IDxkaXYgY2xhc3M9Y29udGVudD48L2Rpdj4KKyAgPC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4K 240207 2014-10-21 08:57:23 -0700 2014-10-21 10:32:12 -0700 Patch bug-137895-20141021085729.patch text/plain 11510 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc2YTU0YjUxODA1Y2Q4 NDQ0ZDUxMTVlZDQyOTJiOTYzMWI3NTJkMi4uNjY2NDhjZTcyNmM2MzcxY2YwMzU2NjI1NWFiNDJi NGMwMmIyODEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEwLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogR29vZ2xl IFNlYXJjaCAobW9iaWxlKSB2aWRlbyB0aHVtYm5haWxzIGFyZSB0b28gbGFyZ2UuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc4OTUKKworICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBs YXllciBjbGlwcGluZyB3aGVuIGFuIGFuY2VzdG9yIGxheWVyIGhhcyBib3JkZXItcmFkaXVzIGNs aXBwaW5nLgorCisgICAgICAgIEluIGNhc2VzLCB3aGVyZSB0aGUgY3VycmVudCBsYXllciBoYXMg bm9uLXJhZGl1cyBjbGlwcmVjdCwgd2hpbGUgYW4gYW5jZXN0b3IgbGF5ZXIKKyAgICAgICAgaGFz IGJvcmRlci1yYWRpdXMgY2xpcHBpbmcsIHdlIG9ubHkgdXNlIHRoZSBib3JkZXItcmFkaXVzIHJl Y3QgdG8gY2xpcC4KKworICAgICAgICBUZXN0OiBmYXN0L2NsaXAvb3ZlcmZsb3ctaGlkZGVuLXdp dGgtYm9yZGVyLXJhZGl1cy1vdmVyZmxvdy1jbGlwcGluZy1wYXJlbnQuaHRtbAorCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpjbGlwVG9SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZXN0b3Jl Q2xpcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29sbGVjdEZyYWdtZW50cyk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBS ZWN0OjpDbGlwUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6ZWZmZWN0ZWRCeVJh ZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6c2V0RWZmZWN0ZWRCeVJhZGl1cyk6 CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJD b3JlOjpDbGlwUmVjdDo6b3BlcmF0b3IhPSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdDo6 aW50ZXJzZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0OjpoYXNSYWRpdXMpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFJlY3Q6OnNldEhhc1JhZGl1cyk6IERlbGV0ZWQu CisKIDIwMTQtMTAtMjEgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+ CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogIWdyaWRXYXNQb3B1bGF0ZWQoKSBpbiBXZWJD b3JlOjpSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCAyYTA2YTUxZWY1Y2YyOTViMmVmODhhMjIxNzBhNGVmYWFi ZmExNGFjLi5hNTY5MzkyM2ViMjA4YTYwMTE5NDFhYjYzYzNhNjA5NmRlZjk3MWQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM2NjQsMTAgKzM2NjQsMTkg QEAgc3RhdGljIGJvb2wgaW5Db250YWluaW5nQmxvY2tDaGFpbihSZW5kZXJMYXllciogc3RhcnRM YXllciwgUmVuZGVyTGF5ZXIqIGVuZExheWUKIAogdm9pZCBSZW5kZXJMYXllcjo6Y2xpcFRvUmVj dChjb25zdCBMYXllclBhaW50aW5nSW5mbyYgcGFpbnRpbmdJbmZvLCBHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdS dWxlIHJ1bGUpCiB7Ci0gICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSByZW5kZXJlcigpLmRv Y3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBpZiAoY2xpcFJlY3QuaGFzUmFkaXVz KCkpIHsKKyAgICBib29sIG5lZWRzQ2xpcHBpbmcgPSBjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnRp bmdJbmZvLnBhaW50RGlydHlSZWN0OworICAgIGlmIChuZWVkc0NsaXBwaW5nIHx8IGNsaXBSZWN0 LmFmZmVjdGVkQnlSYWRpdXMoKSkKICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwotICAgICAgICAK KworICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gcmVuZGVyZXIoKS5kb2N1bWVudCgpLmRl dmljZVNjYWxlRmFjdG9yKCk7CisgICAgYm9vbCBsYXllckhhc0JvcmRlclJhZGl1cyA9IHJlbmRl cmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKTsKKyAgICBpZiAobmVlZHNDbGlwcGluZyAm JiAhbGF5ZXJIYXNCb3JkZXJSYWRpdXMpIHsKKyAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENs aXBSZWN0ID0gY2xpcFJlY3QucmVjdCgpOworICAgICAgICBhZGp1c3RlZENsaXBSZWN0Lm1vdmUo cGFpbnRpbmdJbmZvLnN1YnBpeGVsQWNjdW11bGF0aW9uKTsKKyAgICAgICAgY29udGV4dC0+Y2xp cChzbmFwUmVjdFRvRGV2aWNlUGl4ZWxzKGFkanVzdGVkQ2xpcFJlY3QsIGRldmljZVNjYWxlRmFj dG9yKSk7CisgICAgfQorCisgICAgaWYgKGNsaXBSZWN0LmFmZmVjdGVkQnlSYWRpdXMoKSkgewog ICAgICAgICAvLyBJZiB0aGUgY2xpcCByZWN0IGhhcyBiZWVuIHRhaW50ZWQgYnkgYSBib3JkZXIg cmFkaXVzLCB0aGVuIHdlIGhhdmUgdG8gd2FsayB1cCBvdXIgbGF5ZXIgY2hhaW4gYXBwbHlpbmcg dGhlIGNsaXBzIGZyb20KICAgICAgICAgLy8gYW55IGxheWVycyB3aXRoIG92ZXJmbG93LiBUaGUg Y29uZGl0aW9uIGZvciBiZWluZyBhYmxlIHRvIGFwcGx5IHRoZXNlIGNsaXBzIGlzIHRoYXQgdGhl IG92ZXJmbG93IG9iamVjdCBiZSBpbiBvdXIKICAgICAgICAgLy8gY29udGFpbmluZyBibG9jayBj aGFpbiBzbyB3ZSBjaGVjayB0aGF0IGFsc28uCkBAIC0zNjgxLDE3ICszNjkwLDEyIEBAIHZvaWQg UmVuZGVyTGF5ZXI6OmNsaXBUb1JlY3QoY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50aW5n SW5mbywgR3JhcGhpY3NDb250CiAgICAgICAgICAgICBpZiAobGF5ZXIgPT0gcGFpbnRpbmdJbmZv LnJvb3RMYXllcikKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgIH0gZWxz ZSBpZiAoY2xpcFJlY3QucmVjdCgpICE9IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCkgewot ICAgICAgICBjb250ZXh0LT5zYXZlKCk7Ci0gICAgICAgIExheW91dFJlY3QgYWRqdXN0ZWRDbGlw UmVjdCA9IGNsaXBSZWN0LnJlY3QoKTsKLSAgICAgICAgYWRqdXN0ZWRDbGlwUmVjdC5tb3ZlKHBh aW50aW5nSW5mby5zdWJwaXhlbEFjY3VtdWxhdGlvbik7Ci0gICAgICAgIGNvbnRleHQtPmNsaXAo c25hcFJlY3RUb0RldmljZVBpeGVscyhhZGp1c3RlZENsaXBSZWN0LCBkZXZpY2VTY2FsZUZhY3Rv cikpOwogICAgIH0KIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6cmVzdG9yZUNsaXAoR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiBwYWludERpcnR5UmVjdCwgY29uc3Qg Q2xpcFJlY3QmIGNsaXBSZWN0KQogewotICAgIGlmIChjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnRE aXJ0eVJlY3QgfHwgY2xpcFJlY3QuaGFzUmFkaXVzKCkpCisgICAgaWYgKGNsaXBSZWN0LnJlY3Qo KSAhPSBwYWludERpcnR5UmVjdCB8fCBjbGlwUmVjdC5hZmZlY3RlZEJ5UmFkaXVzKCkpCiAgICAg ICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKIH0KIApAQCAtNDM5NywxMCArNDQwMSwxMCBAQCB2b2lk IFJlbmRlckxheWVyOjpjb2xsZWN0RnJhZ21lbnRzKExheWVyRnJhZ21lbnRzJiBmcmFnbWVudHMs IGNvbnN0IFJlbmRlckxheWVyKgogICAgICAgICBmcmFnbWVudC5pbnRlcnNlY3QoYW5jZXN0b3JD bGlwUmVjdC5yZWN0KCkpOwogICAgICAgICAKICAgICAgICAgLy8gSWYgdGhlIGFuY2VzdG9yIGNs aXAgcmVjdCBoYXMgYm9yZGVyLXJhZGl1cywgbWFrZSBzdXJlIHRvIGFwcGx5IGl0IHRvIHRoZSBm cmFnbWVudHMuCi0gICAgICAgIGlmIChhbmNlc3RvckNsaXBSZWN0Lmhhc1JhZGl1cygpKSB7Ci0g ICAgICAgICAgICBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7Ci0g ICAgICAgICAgICBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7Ci0g ICAgICAgICAgICBmcmFnbWVudC5vdXRsaW5lUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7CisgICAg ICAgIGlmIChhbmNlc3RvckNsaXBSZWN0LmFmZmVjdGVkQnlSYWRpdXMoKSkgeworICAgICAgICAg ICAgZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3Quc2V0QWZmZWN0ZWRCeVJhZGl1cyh0cnVlKTsKKyAg ICAgICAgICAgIGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnNldEFmZmVjdGVkQnlSYWRpdXModHJ1 ZSk7CisgICAgICAgICAgICBmcmFnbWVudC5vdXRsaW5lUmVjdC5zZXRBZmZlY3RlZEJ5UmFkaXVz KHRydWUpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gTm93IGludGVyc2VjdCB3aXRoIG91ciBw YWdpbmF0aW9uIGNsaXAuIFRoaXMgd2lsbCB0eXBpY2FsbHkgbWVhbiB3ZSdyZSBqdXN0IGludGVy c2VjdGluZyB0aGUgZGlydHkgcmVjdCB3aXRoIHRoZSBjb2x1bW4KQEAgLTUzMDQsNyArNTMwOCw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHND b250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBDCiAgICAgICAgIAogICAgICAgICBpZiAocmVuZGVy ZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSkgewogICAgICAgICAgICAgQ2xpcFJlY3QgbmV3T3ZlcmZs b3dDbGlwID0gZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5vdmVyZmxvd0NsaXBSZWN0 Rm9yQ2hpbGRMYXllcnMob2Zmc2V0LCBjdXJyZW50UmVuZGVyTmFtZWRGbG93RnJhZ21lbnQoKSwg Y2xpcFJlY3RzQ29udGV4dC5vdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSk7Ci0gICAgICAg ICAgICBuZXdPdmVyZmxvd0NsaXAuc2V0SGFzUmFkaXVzKHJlbmRlcmVyKCkuc3R5bGUoKS5oYXNC b3JkZXJSYWRpdXMoKSk7CisgICAgICAgICAgICBuZXdPdmVyZmxvd0NsaXAuc2V0QWZmZWN0ZWRC eVJhZGl1cyhyZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpOwogICAgICAgICAg ICAgY2xpcFJlY3RzLnNldE92ZXJmbG93Q2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld092ZXJmbG93 Q2xpcCwgY2xpcFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKSkpOwogICAgICAgICAgICAgaWYgKHJl bmRlcmVyKCkuaXNQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgY2xpcFJlY3RzLnNldFBv c0NsaXBSZWN0KGludGVyc2VjdGlvbihuZXdPdmVyZmxvd0NsaXAsIGNsaXBSZWN0cy5wb3NDbGlw UmVjdCgpKSk7CkBAIC01NDI5LDcgKzU0MzMsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxh dGVSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBjb25zdAog ICAgICAgICBpZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSAmJiAodGhpcyAhPSBjbGlw UmVjdHNDb250ZXh0LnJvb3RMYXllciB8fCBjbGlwUmVjdHNDb250ZXh0LnJlc3BlY3RPdmVyZmxv d0NsaXAgPT0gUmVzcGVjdE92ZXJmbG93Q2xpcCkpIHsKICAgICAgICAgICAgIGZvcmVncm91bmRS ZWN0LmludGVyc2VjdChkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpLm92ZXJmbG93Q2xp cFJlY3QodG9MYXlvdXRQb2ludChvZmZzZXRGcm9tUm9vdExvY2FsKSwgbmFtZWRGbG93RnJhZ21l bnQsIGNsaXBSZWN0c0NvbnRleHQub3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kpKTsKICAg ICAgICAgICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpCi0gICAg ICAgICAgICAgICAgZm9yZWdyb3VuZFJlY3Quc2V0SGFzUmFkaXVzKHRydWUpOworICAgICAgICAg ICAgICAgIGZvcmVncm91bmRSZWN0LnNldEFmZmVjdGVkQnlSYWRpdXModHJ1ZSk7CiAgICAgICAg IH0KIAogICAgICAgICBpZiAocmVuZGVyZXIoKS5oYXNDbGlwKCkpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggOTY0MmQ4NDcwZDVhN2Y3MDRmOGI4OTNkMGI3MDg1 Y2I2N2Y2ODE4OC4uOWU3MWQyZDFkYWMyNzVjNjVhMGNiNDI4NzhjZGViMjQ4OTY3MGU4MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTg0LDMwICs4NCwzMiBAQCBl bnVtIFJlcGFpbnRTdGF0dXMgewogY2xhc3MgQ2xpcFJlY3QgewogcHVibGljOgogICAgIENsaXBS ZWN0KCkKLSAgICA6IG1faGFzUmFkaXVzKGZhbHNlKQotICAgIHsgfQorICAgICAgICA6IG1fYWZm ZWN0ZWRCeVJhZGl1cyhmYWxzZSkKKyAgICB7CisgICAgfQogICAgIAogICAgIENsaXBSZWN0KGNv bnN0IExheW91dFJlY3QmIHJlY3QpCi0gICAgOiBtX3JlY3QocmVjdCkKLSAgICAsIG1faGFzUmFk aXVzKGZhbHNlKQotICAgIHsgfQorICAgICAgICA6IG1fcmVjdChyZWN0KQorICAgICAgICAsIG1f YWZmZWN0ZWRCeVJhZGl1cyhmYWxzZSkKKyAgICB7CisgICAgfQogICAgIAogICAgIGNvbnN0IExh eW91dFJlY3QmIHJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KICAgICB2b2lkIHNldFJl Y3QoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgeyBtX3JlY3QgPSByZWN0OyB9CiAKLSAgICBib29s IGhhc1JhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzUmFkaXVzOyB9Ci0gICAgdm9pZCBzZXRI YXNSYWRpdXMoYm9vbCBoYXNSYWRpdXMpIHsgbV9oYXNSYWRpdXMgPSBoYXNSYWRpdXM7IH0KKyAg ICBib29sIGFmZmVjdGVkQnlSYWRpdXMoKSBjb25zdCB7IHJldHVybiBtX2FmZmVjdGVkQnlSYWRp dXM7IH0KKyAgICB2b2lkIHNldEFmZmVjdGVkQnlSYWRpdXMoYm9vbCBhZmZlY3RlZEJ5UmFkaXVz KSB7IG1fYWZmZWN0ZWRCeVJhZGl1cyA9IGFmZmVjdGVkQnlSYWRpdXM7IH0KIAotICAgIGJvb2wg b3BlcmF0b3I9PShjb25zdCBDbGlwUmVjdCYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIHJlY3QoKSA9 PSBvdGhlci5yZWN0KCkgJiYgaGFzUmFkaXVzKCkgPT0gb3RoZXIuaGFzUmFkaXVzKCk7IH0KLSAg ICBib29sIG9wZXJhdG9yIT0oY29uc3QgQ2xpcFJlY3QmIG90aGVyKSBjb25zdCB7IHJldHVybiBy ZWN0KCkgIT0gb3RoZXIucmVjdCgpIHx8IGhhc1JhZGl1cygpICE9IG90aGVyLmhhc1JhZGl1cygp OyB9CisgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IENsaXBSZWN0JiBvdGhlcikgY29uc3QgeyBy ZXR1cm4gcmVjdCgpID09IG90aGVyLnJlY3QoKSAmJiBhZmZlY3RlZEJ5UmFkaXVzKCkgPT0gb3Ro ZXIuYWZmZWN0ZWRCeVJhZGl1cygpOyB9CisgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IENsaXBS ZWN0JiBvdGhlcikgY29uc3QgeyByZXR1cm4gcmVjdCgpICE9IG90aGVyLnJlY3QoKSB8fCBhZmZl Y3RlZEJ5UmFkaXVzKCkgIT0gb3RoZXIuYWZmZWN0ZWRCeVJhZGl1cygpOyB9CiAgICAgYm9vbCBv cGVyYXRvciE9KGNvbnN0IExheW91dFJlY3QmIG90aGVyUmVjdCkgY29uc3QgeyByZXR1cm4gcmVj dCgpICE9IG90aGVyUmVjdDsgfQogCiAgICAgdm9pZCBpbnRlcnNlY3QoY29uc3QgTGF5b3V0UmVj dCYgb3RoZXIpIHsgbV9yZWN0LmludGVyc2VjdChvdGhlcik7IH0KICAgICB2b2lkIGludGVyc2Vj dChjb25zdCBDbGlwUmVjdCYgb3RoZXIpCiAgICAgewogICAgICAgICBtX3JlY3QuaW50ZXJzZWN0 KG90aGVyLnJlY3QoKSk7Ci0gICAgICAgIGlmIChvdGhlci5oYXNSYWRpdXMoKSkKLSAgICAgICAg ICAgIG1faGFzUmFkaXVzID0gdHJ1ZTsKKyAgICAgICAgaWYgKG90aGVyLmFmZmVjdGVkQnlSYWRp dXMoKSkKKyAgICAgICAgICAgIG1fYWZmZWN0ZWRCeVJhZGl1cyA9IHRydWU7CiAgICAgfQogICAg IHZvaWQgbW92ZShMYXlvdXRVbml0IHgsIExheW91dFVuaXQgeSkgeyBtX3JlY3QubW92ZSh4LCB5 KTsgfQogICAgIHZvaWQgbW92ZShjb25zdCBMYXlvdXRTaXplJiBzaXplKSB7IG1fcmVjdC5tb3Zl KHNpemUpOyB9CkBAIC0xMjMsNyArMTI1LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIExh eW91dFJlY3QgbV9yZWN0OwotICAgIGJvb2wgbV9oYXNSYWRpdXM7CisgICAgYm9vbCBtX2FmZmVj dGVkQnlSYWRpdXM7CiB9OwogCiBpbmxpbmUgQ2xpcFJlY3QgaW50ZXJzZWN0aW9uKGNvbnN0IENs aXBSZWN0JiBhLCBjb25zdCBDbGlwUmVjdCYgYikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NDAwMDhiYmUwN2UwNDA0ODU3 YTk0M2Y2YWI1MTUzNzlmODRjN2FkLi40OGU3YjVlYmM1MGMwNTIxM2I3NzZhY2NiZmRjZTNjYmNl YThjYWU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTQtMTAtMjEgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBHb29nbGUgU2VhcmNoICht b2JpbGUpIHZpZGVvIHRodW1ibmFpbHMgYXJlIHRvbyBsYXJnZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzg5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIGxheWVyIGNsaXBw aW5nIHdoZW4gYW4gYW5jZXN0b3IgbGF5ZXIgaGFzIGJvcmRlci1yYWRpdXMgY2xpcHBpbmcuCisK KyAgICAgICAgSW4gY2FzZXMsIHdoZXJlIHRoZSBjdXJyZW50IGxheWVyIGhhcyBub24tcmFkaXVz IGNsaXByZWN0LCB3aGlsZSBhbiBhbmNlc3RvciBsYXllcgorICAgICAgICBoYXMgYm9yZGVyLXJh ZGl1cyBjbGlwcGluZywgd2Ugb25seSB1c2UgdGhlIGJvcmRlci1yYWRpdXMgcmVjdCB0byBjbGlw LgorCisgICAgICAgICogZmFzdC9jbGlwL292ZXJmbG93LWhpZGRlbi13aXRoLWJvcmRlci1yYWRp dXMtb3ZlcmZsb3ctY2xpcHBpbmctcGFyZW50LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4td2l0aC1ib3JkZXItcmFkaXVzLW92ZXJmbG93 LWNsaXBwaW5nLXBhcmVudC5odG1sOiBBZGRlZC4KKwogMjAxNC0xMC0yMSAgTWFudWVsIFJlZ28g Q2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAogICAgICAgICBBU1NFUlRJT04gRkFJTEVE OiAhZ3JpZFdhc1BvcHVsYXRlZCgpIGluIFdlYkNvcmU6OlJlbmRlckdyaWQ6OnBsYWNlSXRlbXNP bkdyaWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4t d2l0aC1ib3JkZXItcmFkaXVzLW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC1leHBlY3RlZC5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jbGlwL292ZXJmbG93LWhpZGRlbi13aXRoLWJvcmRlci1yYWRp dXMtb3ZlcmZsb3ctY2xpcHBpbmctcGFyZW50LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODM5 NjNjZTY5ZjE1OTJiZDdhZDhmZjk1NzliMDA3NWFiZDRjOWUxOAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4td2l0aC1ib3JkZXItcmFkaXVz LW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjUgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5UaGlzIHRlc3RzIHRoYXQg cGFyZW50IGNsaXBwaW5nIGlzIGFwcGxpZWQgcHJvcGVybHkgd2hlbiBhbmNlc3RvciBib3JkZXIt cmFkaXVzIGlzIHByZXNlbnQuPC90aXRsZT4KKzxzdHlsZT4KKyAgLmNvbnRhaW5lciB7CisgICAg b3ZlcmZsb3c6IGhpZGRlbjsKKyAgICBib3JkZXItcmFkaXVzOiAyMHB4IDBweCAwcHggMHB4Owor ICAgIGhlaWdodDogMTBweDsKKyAgICB3aWR0aDogMTBweDsKKyAgfQorCisgIC5jb250ZW50IHsK Kwl3aWR0aDogMTAwcHg7CisJaGVpZ2h0OiAxMDBweDsKKwliYWNrZ3JvdW5kLWNvbG9yOiByZWQ7 CisgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPgor ICA8ZGl2IGNsYXNzPWNvbnRlbnQ+PC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2xpcC9vdmVyZmxvdy1oaWRkZW4td2l0aC1ib3Jk ZXItcmFkaXVzLW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9jbGlwL292ZXJmbG93LWhpZGRlbi13aXRoLWJvcmRlci1yYWRpdXMtb3ZlcmZsb3ctY2xpcHBp bmctcGFyZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTI5MTYzMWVmNmQ4NTFjOGJlMWJjMDgwNmM1Y2Uy ZWY3YjU1MDNjMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2xpcC9vdmVy Zmxvdy1oaWRkZW4td2l0aC1ib3JkZXItcmFkaXVzLW92ZXJmbG93LWNsaXBwaW5nLXBhcmVudC5o dG1sCkBAIC0wLDAgKzEsMzIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0 aXRsZT5UaGlzIHRlc3RzIHRoYXQgcGFyZW50IGNsaXBwaW5nIGlzIGFwcGxpZWQgcHJvcGVybHkg d2hlbiBhbmNlc3RvciBib3JkZXItcmFkaXVzIGlzIHByZXNlbnQuPC90aXRsZT4KKzxzdHlsZT4K KyAgLm91dGVyIHsKKyAgICBvdmVyZmxvdzogaGlkZGVuOworICAgIGJvcmRlci1yYWRpdXM6IDIw cHggMHB4IDBweCAwcHg7CisgIH0KKworICAuaW5uZXIgeworICAgIG92ZXJmbG93OiBoaWRkZW47 CisgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgIGhlaWdodDogMTBweDsKKyAgICB3aWR0aDog MTBweDsKKyAgfQorCisgIC5jb250ZW50IHsKKwl3aWR0aDogMTAwcHg7CisJaGVpZ2h0OiAxMDBw eDsKKwliYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CisgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9k eT4KKzxkaXYgY2xhc3M9b3V0ZXI+CisgIDxkaXYgY2xhc3M9aW5uZXI+CisgICAgPGRpdiBjbGFz cz1jb250ZW50PjwvZGl2PgorICA8L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=