136314 2014-08-27 14:55:52 -0700 Subpixel layout: Rename FloatPoint/FloatRect device pixel snapping functions. 2014-08-27 20:33:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136275 1 zalan zalan commit-queue simon.fraser oldest_to_newest 1031794 0 zalan 2014-08-27 14:55:52 -0700 to the new naming style of round/ceil/floor*ToDevicePixels. * = point/rect. 1031800 1 237259 zalan 2014-08-27 15:14:18 -0700 Created attachment 237259 Patch 1031835 2 237259 simon.fraser 2014-08-27 16:18:41 -0700 Comment on attachment 237259 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237259&action=review > Source/WebCore/platform/graphics/FloatRect.cpp:209 > +FloatRect enclosingRectToDevicePixels(const FloatRect& rect, float deviceScaleFactor) encloseRectToDevicePixels 1031883 3 237281 zalan 2014-08-27 19:50:38 -0700 Created attachment 237281 Patch 1031888 4 237281 commit-queue 2014-08-27 20:33:16 -0700 Comment on attachment 237281 Patch Clearing flags on attachment: 237281 Committed r173045: <http://trac.webkit.org/changeset/173045> 1031889 5 commit-queue 2014-08-27 20:33:19 -0700 All reviewed patches have been landed. Closing bug. 237259 2014-08-27 15:14:18 -0700 2014-08-27 19:50:35 -0700 Patch bug-136314-20140827151411.patch text/plain 9676 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFlYWRjMWE3ODY3ODhm OGVkZmFmZDJjM2ZkNDZmMTk1N2JiNzlmMi4uYTZkMWU4ZjA0NWExMDhjZWVkNjhkNTZhYmU5MTkx YWFiOTMwM2ExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA4LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VicGl4ZWwgbGF5b3V0OiBS ZW5hbWUgRmxvYXRQb2ludC9GbG9hdFJlY3QgZGV2aWNlIHBpeGVsIHNuYXBwaW5nIGZ1bmN0aW9u cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMx NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyb20g KmVkVG9EZXZpY2VQaXhlbHMoKSB0byAqUG9pbnRUb0RldmljZVBpeGVscygpICgqID0gZmxvb3Iv cm91bmQvY2VpbCkKKworICAgICAgICBFbmNsb3NlZEludFJlY3QgLT4gZW5jbG9zaW5nSW50UmVj dCgpIGNoYW5nZXMgZnVuY3Rpb25hbGl0eSBmb3IgSW5zcGVjdG9yT3ZlcmxheSBwYWludGluZywK KyAgICAgICAgYnV0IGN1cnJlbnRseSB1bnRlc3RhYmxlLgorCisgICAgICAgICogV2ViQ29yZS5l eHAuaW46CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6c2hvd1BhaW50UmVjdCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oOgorICAgICAgICAoV2ViQ29yZTo6Zmxvb3Jl ZEludFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6Zmxvb3JQb2ludFRvRGV2aWNlUGl4ZWxzKToK KyAgICAgICAgKFdlYkNvcmU6OmNlaWxQb2ludFRvRGV2aWNlUGl4ZWxzKToKKyAgICAgICAgKFdl YkNvcmU6OmZsb29yZWRUb0RldmljZVBpeGVscyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpjZWlsZWRUb0RldmljZVBpeGVscyk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvRmxvYXRSZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmVuY2xvc2luZ1JlY3RUb0Rl dmljZVBpeGVscyk6CisgICAgICAgIChXZWJDb3JlOjplbmNsb3NpbmdSZWN0RXh0ZW5kZWRUb0Rl dmljZVBpeGVscyk6IERlbGV0ZWQuIFJlbmFtZWQuCisgICAgICAgIChXZWJDb3JlOjplbmNsb3Nl ZEludFJlY3QpOiBEZWxldGVkLiBOb3QgbmVlZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0Zsb2F0UmVjdC5oOgorCiAyMDE0LTA4LTI3ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxh aW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0aW5nIGF0dHJpYnV0ZXMgb24gSFRNTCBlbGVt ZW50cyBkbyBub3QgaW52YWxpZGF0ZSB0aGUgc3R5bGUgY29ycmVjdGx5IHVubGVzcyB0aGUgYXR0 cmlidXRlIG5hbWUgaXMgbG93ZXJjYXNlIGluIHRoZSBzdHlsZXNoZWV0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZGM2NmUzN2JhMzRjMGUyNDUyMTE1MzllNjFiZTExYTA1OGIwNjAzYi4uNGU2NGM0NGMzZjM2MzI3 YjQ0YzJiNmNkMDlkZjVkNjNjZDgwZDkxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDE0LTA4LTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3Vi cGl4ZWwgbGF5b3V0OiBSZW5hbWUgRmxvYXRQb2ludC9GbG9hdFJlY3QgZGV2aWNlIHBpeGVsIHNu YXBwaW5nIGZ1bmN0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNjMxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZyb20gKmVkVG9EZXZpY2VQaXhlbHMoKSB0byAqUG9pbnRUb0RldmljZVBpeGVs cygpICgqID0gZmxvb3Ivcm91bmQvY2VpbCkKKworICAgICAgICBFbmNsb3NlZEludFJlY3QgLT4g ZW5jbG9zaW5nSW50UmVjdCgpIGNoYW5nZXMgZnVuY3Rpb25hbGl0eSBmb3IgSW5zcGVjdG9yT3Zl cmxheSBwYWludGluZywKKyAgICAgICAgYnV0IGN1cnJlbnRseSB1bnRlc3RhYmxlLgorCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX3VwZGF0ZVRhcEhpZ2hsaWdodF0pOgorCiAyMDE0LTA4LTI2ICBN YXR0IExpbGVrICA8bXJsQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV2ViS2l0IFNQSSB0byBj b250cm9sIHRoZSBuYXZpZ2F0b3Iuc3RhbmRhbG9uZSBwcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgppbmRleCA5MTZiOWRiZTJiNDZlMjkxNDlmZjEyYTYyY2RkZjg3ZTEwNjg2MWE4Li43ZmNkNGU0 YjYzZWU1YTVmN2Q5NzFlZmE4ZmRlNjNmZmUzOWVkNWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpA QCAtMjY4Niw3ICsyNjg2LDcgQEAgX19aTjdXZWJDb3JlMzFhcHBsaWNhdGlvbklzRGFpamlzZW5E aWN0aW9uYXJ5RXYKIF9fWk43V2ViQ29yZTMxYXBwbGljYXRpb25Jc01pY3Jvc29mdE1lc3Nlbmdl ckV2CiBfX1pON1dlYkNvcmUzMWVuYWJsZVVSTFNjaGVtZUNhbm9uaWNhbGl6YXRpb25FYgogX19a TjdXZWJDb3JlMzNhcHBsaWNhdGlvbklzVGhlRWNvbm9taXN0T25JUGhvbmVFdgotX19aTjdXZWJD b3JlMzVlbmNsb3NpbmdSZWN0RXh0ZW5kZWRUb0RldmljZVBpeGVsc0VSS05TXzlGbG9hdFJlY3RF ZgorX19aTjdXZWJDb3JlMzVlbmNsb3NpbmdSZWN0VG9EZXZpY2VQaXhlbHNFUktOU185RmxvYXRS ZWN0RWYKIF9fWk43V2ViQ29yZTM1aXNFbmRPZkVkaXRhYmxlT3JOb25FZGl0YWJsZUNvbnRlbnRF UktOU18xNVZpc2libGVQb3NpdGlvbkUKIF9fWk43V2ViQ29yZTM1cG9zaXRpb25PZk5leHRCb3Vu ZGFyeU9mR3JhbnVsYXJpdHlFUktOU18xNVZpc2libGVQb3NpdGlvbkVOU18xNVRleHRHcmFudWxh cml0eUVOU18xOFNlbGVjdGlvbkRpcmVjdGlvbkUKIF9fWk43V2ViQ29yZTQxaW5pdGlhbGl6ZUhU VFBDb25uZWN0aW9uU2V0dGluZ3NPblN0YXJ0dXBFdgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IGQ2YmExZDFkZGJhMWI5NjgyOGY0YjM5ZmNj NDExN2Q4OTM1YTExNzAuLmRjZDM4MTk0OGM4MTA1NWNmOTNmNDIxMjlhNmE4ZWEzNzA2MDI5MDIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKQEAg LTQ4OSw3ICs0ODksNyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnNob3dQYWludFJlY3QoY29u c3QgRmxvYXRSZWN0JiByZWN0KQogICAgIGlmICghbV9zaG93aW5nUGFpbnRSZWN0cykKICAgICAg ICAgcmV0dXJuOwogCi0gICAgSW50UmVjdCByb290UmVjdCA9IG1fcGFnZS5tYWluRnJhbWUoKS52 aWV3KCktPmNvbnRlbnRzVG9Sb290VmlldyhlbmNsb3NlZEludFJlY3QocmVjdCkpOworICAgIElu dFJlY3Qgcm9vdFJlY3QgPSBtX3BhZ2UubWFpbkZyYW1lKCkudmlldygpLT5jb250ZW50c1RvUm9v dFZpZXcoZW5jbG9zaW5nSW50UmVjdChyZWN0KSk7CiAKICAgICBjb25zdCBzdGQ6OmNocm9ubzo6 bWlsbGlzZWNvbmRzIHJlbW92ZURlbGF5ID0gc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcygyNTAp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBv aW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgKaW5k ZXggY2U2MmRiMWQ3ZTM3ZmNmYjMzNzZjNmRkMTdjNjE4YTgyMTUwYTNiOC4uMTVjODMxZWNiOGYx ODJiMjMzNWI0NWUwYmQzZTdmNzI2MDc4YTk1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaApAQCAtMjEwLDYgKzIxMCwxMSBAQCBpbmxpbmUgZmxv YXQgb3BlcmF0b3IqKGNvbnN0IEZsb2F0UG9pbnQmIGEsIGNvbnN0IEZsb2F0UG9pbnQmIGIpCiAg ICAgcmV0dXJuIGEuZG90KGIpOwogfQogCitpbmxpbmUgSW50U2l6ZSBmbG9vcmVkSW50U2l6ZShj b25zdCBGbG9hdFBvaW50JiBwKQoreworICAgIHJldHVybiBJbnRTaXplKGNsYW1wVG9JbnRlZ2Vy KGZsb29yZihwLngoKSkpLCBjbGFtcFRvSW50ZWdlcihmbG9vcmYocC55KCkpKSk7Cit9CisKIGlu bGluZSBJbnRQb2ludCByb3VuZGVkSW50UG9pbnQoY29uc3QgRmxvYXRQb2ludCYgcCkKIHsKICAg ICByZXR1cm4gSW50UG9pbnQoY2xhbXBUb0ludGVnZXIocm91bmRmKHAueCgpKSksIGNsYW1wVG9J bnRlZ2VyKHJvdW5kZihwLnkoKSkpKTsKQEAgLTIyMCwyNCArMjI1LDE5IEBAIGlubGluZSBJbnRQ b2ludCBmbG9vcmVkSW50UG9pbnQoY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICByZXR1cm4gSW50 UG9pbnQoY2xhbXBUb0ludGVnZXIoZmxvb3JmKHAueCgpKSksIGNsYW1wVG9JbnRlZ2VyKGZsb29y ZihwLnkoKSkpKTsKIH0KIAotaW5saW5lIEZsb2F0UG9pbnQgZmxvb3JlZFRvRGV2aWNlUGl4ZWxz KGNvbnN0IEZsb2F0UG9pbnQmIHAsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKQotewotICAgIHJl dHVybiBGbG9hdFBvaW50KGZsb29yZihwLngoKSAqIGRldmljZVNjYWxlRmFjdG9yKSAgLyBkZXZp Y2VTY2FsZUZhY3RvciwgZmxvb3JmKHAueSgpICogZGV2aWNlU2NhbGVGYWN0b3IpICAvIGRldmlj ZVNjYWxlRmFjdG9yKTsKLX0KLQogaW5saW5lIEludFBvaW50IGNlaWxlZEludFBvaW50KGNvbnN0 IEZsb2F0UG9pbnQmIHApCiB7CiAgICAgcmV0dXJuIEludFBvaW50KGNsYW1wVG9JbnRlZ2VyKGNl aWxmKHAueCgpKSksIGNsYW1wVG9JbnRlZ2VyKGNlaWxmKHAueSgpKSkpOwogfQogCi1pbmxpbmUg RmxvYXRQb2ludCBjZWlsZWRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFBvaW50JiBwLCBmbG9h dCBkZXZpY2VTY2FsZUZhY3RvcikKK2lubGluZSBGbG9hdFBvaW50IGZsb29yUG9pbnRUb0Rldmlj ZVBpeGVscyhjb25zdCBGbG9hdFBvaW50JiBwLCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcikKIHsK LSAgICByZXR1cm4gRmxvYXRQb2ludChjZWlsZihwLngoKSAqIGRldmljZVNjYWxlRmFjdG9yKSAg LyBkZXZpY2VTY2FsZUZhY3RvciwgY2VpbGYocC55KCkgKiBkZXZpY2VTY2FsZUZhY3RvcikgIC8g ZGV2aWNlU2NhbGVGYWN0b3IpOworICAgIHJldHVybiBGbG9hdFBvaW50KGZsb29yZihwLngoKSAq IGRldmljZVNjYWxlRmFjdG9yKSAgLyBkZXZpY2VTY2FsZUZhY3RvciwgZmxvb3JmKHAueSgpICog ZGV2aWNlU2NhbGVGYWN0b3IpICAvIGRldmljZVNjYWxlRmFjdG9yKTsKIH0KIAotaW5saW5lIElu dFNpemUgZmxvb3JlZEludFNpemUoY29uc3QgRmxvYXRQb2ludCYgcCkKK2lubGluZSBGbG9hdFBv aW50IGNlaWxQb2ludFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UG9pbnQmIHAsIGZsb2F0IGRl dmljZVNjYWxlRmFjdG9yKQogewotICAgIHJldHVybiBJbnRTaXplKGNsYW1wVG9JbnRlZ2VyKGZs b29yZihwLngoKSkpLCBjbGFtcFRvSW50ZWdlcihmbG9vcmYocC55KCkpKSk7CisgICAgcmV0dXJu IEZsb2F0UG9pbnQoY2VpbGYocC54KCkgKiBkZXZpY2VTY2FsZUZhY3RvcikgIC8gZGV2aWNlU2Nh bGVGYWN0b3IsIGNlaWxmKHAueSgpICogZGV2aWNlU2NhbGVGYWN0b3IpICAvIGRldmljZVNjYWxl RmFjdG9yKTsKIH0KIAogaW5saW5lIEZsb2F0U2l6ZSB0b0Zsb2F0U2l6ZShjb25zdCBGbG9hdFBv aW50JiBhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxv YXRSZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5j cHAKaW5kZXggM2EwYzNlNzcwYmNmNjVhMjk3ZjI5YWExOTcyYmZjYWM1ZGYxYzM2Ni4uZDg0MWJh YzBiMjhlMjgyN2Q2OTEwMmY4ZWVhMmVhNmRlNzc4Yzk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuY3BwCkBAIC0yMDYsMTAgKzIwNiwxMCBAQCB2 b2lkIEZsb2F0UmVjdDo6Zml0VG9Qb2ludHMoY29uc3QgRmxvYXRQb2ludCYgcDAsIGNvbnN0IEZs b2F0UG9pbnQmIHAxLCBjb25zdCBGbAogICAgIHNldExvY2F0aW9uQW5kU2l6ZUZyb21FZGdlcyhs ZWZ0LCB0b3AsIHJpZ2h0LCBib3R0b20pOwogfQogCi1GbG9hdFJlY3QgZW5jbG9zaW5nUmVjdEV4 dGVuZGVkVG9EZXZpY2VQaXhlbHMoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBmbG9hdCBkZXZpY2VT Y2FsZUZhY3RvcikKK0Zsb2F0UmVjdCBlbmNsb3NpbmdSZWN0VG9EZXZpY2VQaXhlbHMoY29uc3Qg RmxvYXRSZWN0JiByZWN0LCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcikKIHsKLSAgICBGbG9hdFBv aW50IGxvY2F0aW9uID0gZmxvb3JlZFRvRGV2aWNlUGl4ZWxzKHJlY3QubWluWE1pbllDb3JuZXIo KSwgZGV2aWNlU2NhbGVGYWN0b3IpOwotICAgIEZsb2F0UG9pbnQgbWF4UG9pbnQgPSBjZWlsZWRU b0RldmljZVBpeGVscyhyZWN0Lm1heFhNYXhZQ29ybmVyKCksIGRldmljZVNjYWxlRmFjdG9yKTsK KyAgICBGbG9hdFBvaW50IGxvY2F0aW9uID0gZmxvb3JQb2ludFRvRGV2aWNlUGl4ZWxzKHJlY3Qu bWluWE1pbllDb3JuZXIoKSwgZGV2aWNlU2NhbGVGYWN0b3IpOworICAgIEZsb2F0UG9pbnQgbWF4 UG9pbnQgPSBjZWlsUG9pbnRUb0RldmljZVBpeGVscyhyZWN0Lm1heFhNYXhZQ29ybmVyKCksIGRl dmljZVNjYWxlRmFjdG9yKTsKICAgICByZXR1cm4gRmxvYXRSZWN0KGxvY2F0aW9uLCBtYXhQb2lu dCAtIGxvY2F0aW9uKTsKIH0KIApAQCAtMjIxLDE2ICsyMjEsNiBAQCBJbnRSZWN0IGVuY2xvc2lu Z0ludFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIHJldHVybiBJbnRSZWN0KGxvY2F0 aW9uLCBtYXhQb2ludCAtIGxvY2F0aW9uKTsKIH0KIAotSW50UmVjdCBlbmNsb3NlZEludFJlY3Qo Y29uc3QgRmxvYXRSZWN0JiByZWN0KQotewotICAgIEludFBvaW50IGxvY2F0aW9uID0gY2VpbGVk SW50UG9pbnQocmVjdC5taW5YTWluWUNvcm5lcigpKTsKLSAgICBJbnRQb2ludCBtYXhQb2ludCA9 IGZsb29yZWRJbnRQb2ludChyZWN0Lm1heFhNYXhZQ29ybmVyKCkpOwotICAgIEludFNpemUgc2l6 ZSA9IG1heFBvaW50IC0gbG9jYXRpb247Ci0gICAgc2l6ZS5jbGFtcE5lZ2F0aXZlVG9aZXJvKCk7 Ci0KLSAgICByZXR1cm4gSW50UmVjdChsb2NhdGlvbiwgc2l6ZSk7Ci19Ci0KIEludFJlY3Qgcm91 bmRlZEludFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIHJldHVybiBJbnRSZWN0 KHJvdW5kZWRJbnRQb2ludChyZWN0LmxvY2F0aW9uKCkpLCByb3VuZGVkSW50U2l6ZShyZWN0LnNp emUoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxv YXRSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaApp bmRleCBjYzgxYmRlZWQwYWI1OTgzZTcxNmQzZDQ0YjQzNjc0MDEyMTEyOGI2Li4yNjM3ZTBjMWY3 ZTRhMzI5YjZiZjQ0NTg0Nzc4NDQxNjM4ZDZmZjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaApAQCAtMjQ2LDEyICsyNDYsOCBAQCBpbmxpbmUgYm9v bCBGbG9hdFJlY3Q6OmlzSW5maW5pdGUoKSBjb25zdAogICAgIHJldHVybiAqdGhpcyA9PSBpbmZp bml0ZVJlY3QoKTsKIH0KIAotV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IGVuY2xvc2luZ1JlY3RF eHRlbmRlZFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UmVjdCYsIGZsb2F0IGRldmljZVNjYWxl RmFjdG9yKTsKK1dFQkNPUkVfRVhQT1JUIEZsb2F0UmVjdCBlbmNsb3NpbmdSZWN0VG9EZXZpY2VQ aXhlbHMoY29uc3QgRmxvYXRSZWN0JiwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IpOwogV0VCQ09S RV9FWFBPUlQgSW50UmVjdCBlbmNsb3NpbmdJbnRSZWN0KGNvbnN0IEZsb2F0UmVjdCYpOwotCi0v LyBSZXR1cm5zIGEgdmFsaWQgSW50UmVjdCBjb250YWluZWQgd2l0aGluIHRoZSBnaXZlbiBGbG9h dFJlY3QuCi1JbnRSZWN0IGVuY2xvc2VkSW50UmVjdChjb25zdCBGbG9hdFJlY3QmKTsKLQogV0VC Q09SRV9FWFBPUlQgSW50UmVjdCByb3VuZGVkSW50UmVjdChjb25zdCBGbG9hdFJlY3QmKTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQppbmRleCA5M2EyZjAzNGE1OGIzN2Q5NDY1YzRmMjA3NzE0ZjU1MzQ0 NDQ1NzNhLi43NmVkZDQzZDE3YzlhMzVjZWExZTljYzUxNGEyMGI5MDE1MDdkZDk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtNTc3LDcgKzU3Nyw3IEBAIHN0YXRpYyBOU1ZhbHVlICpuc1NpemVGb3JU YXBIaWdobGlnaHRCb3JkZXJSYWRpdXMoV2ViQ29yZTo6SW50U2l6ZSBib3JkZXJSYWRpdXMpCiAg ICAgICAgICAgICBGbG9hdFJlY3QgYm91bmRpbmdCb3ggPSBxdWFkLmJvdW5kaW5nQm94KCk7CiAg ICAgICAgICAgICBib3VuZGluZ0JveC5zY2FsZShzZWxmU2NhbGUpOwogICAgICAgICAgICAgYm91 bmRpbmdCb3guaW5mbGF0ZShtaW5pbXVtVGFwSGlnaGxpZ2h0UmFkaXVzKTsKLSAgICAgICAgICAg IENHUmVjdCBwaXhlbEFsaWduZWRSZWN0ID0gc3RhdGljX2Nhc3Q8Q0dSZWN0PihlbmNsb3NpbmdS ZWN0RXh0ZW5kZWRUb0RldmljZVBpeGVscyhib3VuZGluZ0JveCwgZGV2aWNlU2NhbGVGYWN0b3Ip KTsKKyAgICAgICAgICAgIENHUmVjdCBwaXhlbEFsaWduZWRSZWN0ID0gc3RhdGljX2Nhc3Q8Q0dS ZWN0PihlbmNsb3NpbmdSZWN0VG9EZXZpY2VQaXhlbHMoYm91bmRpbmdCb3gsIGRldmljZVNjYWxl RmFjdG9yKSk7CiAgICAgICAgICAgICBbcmVjdHMgYWRkT2JqZWN0OltOU1ZhbHVlIHZhbHVlV2l0 aENHUmVjdDpwaXhlbEFsaWduZWRSZWN0XV07CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBhbGxIaWdobGlnaHRSZWN0c0FyZVJlY3RpbGluZWFyID0gZmFsc2U7Cg== 237281 2014-08-27 19:50:38 -0700 2014-08-27 20:33:16 -0700 Patch bug-136314-20140827195030.patch text/plain 9684 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODRlNjYxY2U4MDg4NWM0 ZTFkZDFiMmFjYjU1MGRlYTQyNTNmMzc5NC4uM2RiOTFmNmU0ZmZhMmY4ZTg2YTBhZWZiZjU2YTgz OGI1OTM1OThlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE0LTA4LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU3VicGl4ZWwgbGF5b3V0OiBS ZW5hbWUgRmxvYXRQb2ludC9GbG9hdFJlY3QgZGV2aWNlIHBpeGVsIHNuYXBwaW5nIGZ1bmN0aW9u cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMx NAorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBGcm9tICpl ZFRvRGV2aWNlUGl4ZWxzKCkgdG8gKlBvaW50VG9EZXZpY2VQaXhlbHMoKSAoKiA9IGZsb29yL3Jv dW5kL2NlaWwpCisKKyAgICAgICAgRW5jbG9zZWRJbnRSZWN0IC0+IGVuY2xvc2luZ0ludFJlY3Qo KSBjaGFuZ2VzIGZ1bmN0aW9uYWxpdHkgZm9yIEluc3BlY3Rvck92ZXJsYXkgcGFpbnRpbmcsCisg ICAgICAgIGJ1dCBjdXJyZW50bHkgdW50ZXN0YWJsZS4KKworICAgICAgICAqIFdlYkNvcmUuZXhw LmluOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OnNob3dQYWludFJlY3QpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OmZsb29yZWRJ bnRTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OmZsb29yUG9pbnRUb0RldmljZVBpeGVscyk6Cisg ICAgICAgIChXZWJDb3JlOjpjZWlsUG9pbnRUb0RldmljZVBpeGVscyk6CisgICAgICAgIChXZWJD b3JlOjpmbG9vcmVkVG9EZXZpY2VQaXhlbHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 Y2VpbGVkVG9EZXZpY2VQaXhlbHMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0Zsb2F0UmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjplbmNsb3NpbmdSZWN0VG9EZXZp Y2VQaXhlbHMpOgorICAgICAgICAoV2ViQ29yZTo6ZW5jbG9zaW5nUmVjdEV4dGVuZGVkVG9EZXZp Y2VQaXhlbHMpOiBEZWxldGVkLiBSZW5hbWVkLgorICAgICAgICAoV2ViQ29yZTo6ZW5jbG9zZWRJ bnRSZWN0KTogRGVsZXRlZC4gTm90IG5lZWRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9GbG9hdFJlY3QuaDoKKworMjAxNC0wOC0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgorCiAgICAgICAgIFN1YnBpeGVsIGxheW91dDogUmVuYW1lIExheW91dFBvaW50J3MgZGV2 aWNlIHBpeGVsIHNuYXBwaW5nIGZ1bmN0aW9ucy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMwNgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjVkMTk3M2Q3N2Zj ZGVjYWE3MTE0NmYyMzgwY2M0YmE2NDMwMjZiNS4uODFiNmVlOGRlODAyMTg2ODQzOWM2YTIyYTIw YjE3YTBhZmUwMTg3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTI3ICBa YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VicGl4ZWwgbGF5b3V0 OiBSZW5hbWUgRmxvYXRQb2ludC9GbG9hdFJlY3QgZGV2aWNlIHBpeGVsIHNuYXBwaW5nIGZ1bmN0 aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz NjMxNAorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBGcm9t ICplZFRvRGV2aWNlUGl4ZWxzKCkgdG8gKlBvaW50VG9EZXZpY2VQaXhlbHMoKSAoKiA9IGZsb29y L3JvdW5kL2NlaWwpCisKKyAgICAgICAgRW5jbG9zZWRJbnRSZWN0IC0+IGVuY2xvc2luZ0ludFJl Y3QoKSBjaGFuZ2VzIGZ1bmN0aW9uYWxpdHkgZm9yIEluc3BlY3Rvck92ZXJsYXkgcGFpbnRpbmcs CisgICAgICAgIGJ1dCBjdXJyZW50bHkgdW50ZXN0YWJsZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF91cGRhdGVUYXBIaWdobGlnaHRdKToKKwogMjAxNC0wOC0yNyAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQyIHN3aXBlIGdlc3R1cmUg c2hvdWxkIHJlcG9ydCB0aGUgcG9zaXRpb24gb2YgdGhlIHNuYXBzaG90IHRvIHRoZSBjbGllbnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KaW5kZXggOTE2YjlkYmUyYjQ2ZTI5MTQ5ZmYxMmE2MmNkZGY4N2Ux MDY4NjFhOC4uODYzOTE5NDNiOWFjMjBiMDJkYjA1M2U5NzM5NjI3NDI2YWMwNjFmOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KQEAgLTI2ODYsNyArMjY4Niw3IEBAIF9fWk43V2ViQ29yZTMxYXBwbGlj YXRpb25Jc0RhaWppc2VuRGljdGlvbmFyeUV2CiBfX1pON1dlYkNvcmUzMWFwcGxpY2F0aW9uSXNN aWNyb3NvZnRNZXNzZW5nZXJFdgogX19aTjdXZWJDb3JlMzFlbmFibGVVUkxTY2hlbWVDYW5vbmlj YWxpemF0aW9uRWIKIF9fWk43V2ViQ29yZTMzYXBwbGljYXRpb25Jc1RoZUVjb25vbWlzdE9uSVBo b25lRXYKLV9fWk43V2ViQ29yZTM1ZW5jbG9zaW5nUmVjdEV4dGVuZGVkVG9EZXZpY2VQaXhlbHNF UktOU185RmxvYXRSZWN0RWYKK19fWk43V2ViQ29yZTM1ZW5jbG9zZVJlY3RUb0RldmljZVBpeGVs c0VSS05TXzlGbG9hdFJlY3RFZgogX19aTjdXZWJDb3JlMzVpc0VuZE9mRWRpdGFibGVPck5vbkVk aXRhYmxlQ29udGVudEVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRQogX19aTjdXZWJDb3JlMzVwb3Np dGlvbk9mTmV4dEJvdW5kYXJ5T2ZHcmFudWxhcml0eUVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRU5T XzE1VGV4dEdyYW51bGFyaXR5RU5TXzE4U2VsZWN0aW9uRGlyZWN0aW9uRQogX19aTjdXZWJDb3Jl NDFpbml0aWFsaXplSFRUUENvbm5lY3Rpb25TZXR0aW5nc09uU3RhcnR1cEV2CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKaW5kZXggZDZiYTFkMWRkYmEx Yjk2ODI4ZjRiMzlmY2M0MTE3ZDg5MzVhMTE3MC4uZGNkMzgxOTQ4YzgxMDU1Y2Y5M2Y0MjEyOWE2 YThlYTM3MDYwMjkwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvck92ZXJsYXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JP dmVybGF5LmNwcApAQCAtNDg5LDcgKzQ4OSw3IEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6c2hv d1BhaW50UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAgaWYgKCFtX3Nob3dpbmdQYWlu dFJlY3RzKQogICAgICAgICByZXR1cm47CiAKLSAgICBJbnRSZWN0IHJvb3RSZWN0ID0gbV9wYWdl Lm1haW5GcmFtZSgpLnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3KGVuY2xvc2VkSW50UmVjdChy ZWN0KSk7CisgICAgSW50UmVjdCByb290UmVjdCA9IG1fcGFnZS5tYWluRnJhbWUoKS52aWV3KCkt PmNvbnRlbnRzVG9Sb290VmlldyhlbmNsb3NpbmdJbnRSZWN0KHJlY3QpKTsKIAogICAgIGNvbnN0 IHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMgcmVtb3ZlRGVsYXkgPSBzdGQ6OmNocm9ubzo6bWls bGlzZWNvbmRzKDI1MCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0Zsb2F0UG9pbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zs b2F0UG9pbnQuaAppbmRleCBjZTYyZGIxZDdlMzdmY2ZiMzM3NmM2ZGQxN2M2MThhODIxNTBhM2I4 Li4xNWM4MzFlY2I4ZjE4MmIyMzM1YjQ1ZTBiZDNlN2Y3MjYwNzhhOTU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCkBAIC0yMTAsNiArMjEwLDEx IEBAIGlubGluZSBmbG9hdCBvcGVyYXRvciooY29uc3QgRmxvYXRQb2ludCYgYSwgY29uc3QgRmxv YXRQb2ludCYgYikKICAgICByZXR1cm4gYS5kb3QoYik7CiB9CiAKK2lubGluZSBJbnRTaXplIGZs b29yZWRJbnRTaXplKGNvbnN0IEZsb2F0UG9pbnQmIHApCit7CisgICAgcmV0dXJuIEludFNpemUo Y2xhbXBUb0ludGVnZXIoZmxvb3JmKHAueCgpKSksIGNsYW1wVG9JbnRlZ2VyKGZsb29yZihwLnko KSkpKTsKK30KKwogaW5saW5lIEludFBvaW50IHJvdW5kZWRJbnRQb2ludChjb25zdCBGbG9hdFBv aW50JiBwKQogewogICAgIHJldHVybiBJbnRQb2ludChjbGFtcFRvSW50ZWdlcihyb3VuZGYocC54 KCkpKSwgY2xhbXBUb0ludGVnZXIocm91bmRmKHAueSgpKSkpOwpAQCAtMjIwLDI0ICsyMjUsMTkg QEAgaW5saW5lIEludFBvaW50IGZsb29yZWRJbnRQb2ludChjb25zdCBGbG9hdFBvaW50JiBwKQog ICAgIHJldHVybiBJbnRQb2ludChjbGFtcFRvSW50ZWdlcihmbG9vcmYocC54KCkpKSwgY2xhbXBU b0ludGVnZXIoZmxvb3JmKHAueSgpKSkpOwogfQogCi1pbmxpbmUgRmxvYXRQb2ludCBmbG9vcmVk VG9EZXZpY2VQaXhlbHMoY29uc3QgRmxvYXRQb2ludCYgcCwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0 b3IpCi17Ci0gICAgcmV0dXJuIEZsb2F0UG9pbnQoZmxvb3JmKHAueCgpICogZGV2aWNlU2NhbGVG YWN0b3IpICAvIGRldmljZVNjYWxlRmFjdG9yLCBmbG9vcmYocC55KCkgKiBkZXZpY2VTY2FsZUZh Y3RvcikgIC8gZGV2aWNlU2NhbGVGYWN0b3IpOwotfQotCiBpbmxpbmUgSW50UG9pbnQgY2VpbGVk SW50UG9pbnQoY29uc3QgRmxvYXRQb2ludCYgcCkKIHsKICAgICByZXR1cm4gSW50UG9pbnQoY2xh bXBUb0ludGVnZXIoY2VpbGYocC54KCkpKSwgY2xhbXBUb0ludGVnZXIoY2VpbGYocC55KCkpKSk7 CiB9CiAKLWlubGluZSBGbG9hdFBvaW50IGNlaWxlZFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0 UG9pbnQmIHAsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKQoraW5saW5lIEZsb2F0UG9pbnQgZmxv b3JQb2ludFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UG9pbnQmIHAsIGZsb2F0IGRldmljZVNj YWxlRmFjdG9yKQogewotICAgIHJldHVybiBGbG9hdFBvaW50KGNlaWxmKHAueCgpICogZGV2aWNl U2NhbGVGYWN0b3IpICAvIGRldmljZVNjYWxlRmFjdG9yLCBjZWlsZihwLnkoKSAqIGRldmljZVNj YWxlRmFjdG9yKSAgLyBkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgcmV0dXJuIEZsb2F0UG9pbnQo Zmxvb3JmKHAueCgpICogZGV2aWNlU2NhbGVGYWN0b3IpICAvIGRldmljZVNjYWxlRmFjdG9yLCBm bG9vcmYocC55KCkgKiBkZXZpY2VTY2FsZUZhY3RvcikgIC8gZGV2aWNlU2NhbGVGYWN0b3IpOwog fQogCi1pbmxpbmUgSW50U2l6ZSBmbG9vcmVkSW50U2l6ZShjb25zdCBGbG9hdFBvaW50JiBwKQor aW5saW5lIEZsb2F0UG9pbnQgY2VpbFBvaW50VG9EZXZpY2VQaXhlbHMoY29uc3QgRmxvYXRQb2lu dCYgcCwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IpCiB7Ci0gICAgcmV0dXJuIEludFNpemUoY2xh bXBUb0ludGVnZXIoZmxvb3JmKHAueCgpKSksIGNsYW1wVG9JbnRlZ2VyKGZsb29yZihwLnkoKSkp KTsKKyAgICByZXR1cm4gRmxvYXRQb2ludChjZWlsZihwLngoKSAqIGRldmljZVNjYWxlRmFjdG9y KSAgLyBkZXZpY2VTY2FsZUZhY3RvciwgY2VpbGYocC55KCkgKiBkZXZpY2VTY2FsZUZhY3Rvcikg IC8gZGV2aWNlU2NhbGVGYWN0b3IpOwogfQogCiBpbmxpbmUgRmxvYXRTaXplIHRvRmxvYXRTaXpl KGNvbnN0IEZsb2F0UG9pbnQmIGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9GbG9hdFJlY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRmxvYXRSZWN0LmNwcAppbmRleCAzYTBjM2U3NzBiY2Y2NWEyOTdmMjlhYTE5NzJiZmNhYzVk ZjFjMzY2Li40MmZlZWUyMzZlMGIwYjkwYzJiYmFjNTYxYTY4YWFhZjQ3ZDAyYzA2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5jcHAKQEAgLTIwNiwx MCArMjA2LDEwIEBAIHZvaWQgRmxvYXRSZWN0OjpmaXRUb1BvaW50cyhjb25zdCBGbG9hdFBvaW50 JiBwMCwgY29uc3QgRmxvYXRQb2ludCYgcDEsIGNvbnN0IEZsCiAgICAgc2V0TG9jYXRpb25BbmRT aXplRnJvbUVkZ2VzKGxlZnQsIHRvcCwgcmlnaHQsIGJvdHRvbSk7CiB9CiAKLUZsb2F0UmVjdCBl bmNsb3NpbmdSZWN0RXh0ZW5kZWRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmIHJlY3Qs IGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKQorRmxvYXRSZWN0IGVuY2xvc2VSZWN0VG9EZXZpY2VQ aXhlbHMoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcikKIHsK LSAgICBGbG9hdFBvaW50IGxvY2F0aW9uID0gZmxvb3JlZFRvRGV2aWNlUGl4ZWxzKHJlY3QubWlu WE1pbllDb3JuZXIoKSwgZGV2aWNlU2NhbGVGYWN0b3IpOwotICAgIEZsb2F0UG9pbnQgbWF4UG9p bnQgPSBjZWlsZWRUb0RldmljZVBpeGVscyhyZWN0Lm1heFhNYXhZQ29ybmVyKCksIGRldmljZVNj YWxlRmFjdG9yKTsKKyAgICBGbG9hdFBvaW50IGxvY2F0aW9uID0gZmxvb3JQb2ludFRvRGV2aWNl UGl4ZWxzKHJlY3QubWluWE1pbllDb3JuZXIoKSwgZGV2aWNlU2NhbGVGYWN0b3IpOworICAgIEZs b2F0UG9pbnQgbWF4UG9pbnQgPSBjZWlsUG9pbnRUb0RldmljZVBpeGVscyhyZWN0Lm1heFhNYXhZ Q29ybmVyKCksIGRldmljZVNjYWxlRmFjdG9yKTsKICAgICByZXR1cm4gRmxvYXRSZWN0KGxvY2F0 aW9uLCBtYXhQb2ludCAtIGxvY2F0aW9uKTsKIH0KIApAQCAtMjIxLDE2ICsyMjEsNiBAQCBJbnRS ZWN0IGVuY2xvc2luZ0ludFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIHJldHVybiBJ bnRSZWN0KGxvY2F0aW9uLCBtYXhQb2ludCAtIGxvY2F0aW9uKTsKIH0KIAotSW50UmVjdCBlbmNs b3NlZEludFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQotewotICAgIEludFBvaW50IGxvY2F0 aW9uID0gY2VpbGVkSW50UG9pbnQocmVjdC5taW5YTWluWUNvcm5lcigpKTsKLSAgICBJbnRQb2lu dCBtYXhQb2ludCA9IGZsb29yZWRJbnRQb2ludChyZWN0Lm1heFhNYXhZQ29ybmVyKCkpOwotICAg IEludFNpemUgc2l6ZSA9IG1heFBvaW50IC0gbG9jYXRpb247Ci0gICAgc2l6ZS5jbGFtcE5lZ2F0 aXZlVG9aZXJvKCk7Ci0KLSAgICByZXR1cm4gSW50UmVjdChsb2NhdGlvbiwgc2l6ZSk7Ci19Ci0K IEludFJlY3Qgcm91bmRlZEludFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIHJl dHVybiBJbnRSZWN0KHJvdW5kZWRJbnRQb2ludChyZWN0LmxvY2F0aW9uKCkpLCByb3VuZGVkSW50 U2l6ZShyZWN0LnNpemUoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRmxvYXRSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G bG9hdFJlY3QuaAppbmRleCBjYzgxYmRlZWQwYWI1OTgzZTcxNmQzZDQ0YjQzNjc0MDEyMTEyOGI2 Li4yOGEzNTk4NTU1MTVlOWIzODYyMmFkNzliOWIzYTdkOWViNjcyYmQ5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaApAQCAtMjQ2LDEyICsyNDYsOCBA QCBpbmxpbmUgYm9vbCBGbG9hdFJlY3Q6OmlzSW5maW5pdGUoKSBjb25zdAogICAgIHJldHVybiAq dGhpcyA9PSBpbmZpbml0ZVJlY3QoKTsKIH0KIAotV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IGVu Y2xvc2luZ1JlY3RFeHRlbmRlZFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UmVjdCYsIGZsb2F0 IGRldmljZVNjYWxlRmFjdG9yKTsKK1dFQkNPUkVfRVhQT1JUIEZsb2F0UmVjdCBlbmNsb3NlUmVj dFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UmVjdCYsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9y KTsKIFdFQkNPUkVfRVhQT1JUIEludFJlY3QgZW5jbG9zaW5nSW50UmVjdChjb25zdCBGbG9hdFJl Y3QmKTsKLQotLy8gUmV0dXJucyBhIHZhbGlkIEludFJlY3QgY29udGFpbmVkIHdpdGhpbiB0aGUg Z2l2ZW4gRmxvYXRSZWN0LgotSW50UmVjdCBlbmNsb3NlZEludFJlY3QoY29uc3QgRmxvYXRSZWN0 Jik7Ci0KIFdFQkNPUkVfRVhQT1JUIEludFJlY3Qgcm91bmRlZEludFJlY3QoY29uc3QgRmxvYXRS ZWN0Jik7CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggOTNhMmYwMzRhNThiMzdkOTQ2NWM0ZjIw NzcxNGY1NTM0NDQ0NTczYS4uZTU2OTUxMDAzODlkNDJjZjI1MmRmYTE3NzM0Zjg3YzBhNGRkNGIz NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTU3Nyw3ICs1NzcsNyBAQCBzdGF0aWMgTlNWYWx1ZSAq bnNTaXplRm9yVGFwSGlnaGxpZ2h0Qm9yZGVyUmFkaXVzKFdlYkNvcmU6OkludFNpemUgYm9yZGVy UmFkaXVzKQogICAgICAgICAgICAgRmxvYXRSZWN0IGJvdW5kaW5nQm94ID0gcXVhZC5ib3VuZGlu Z0JveCgpOwogICAgICAgICAgICAgYm91bmRpbmdCb3guc2NhbGUoc2VsZlNjYWxlKTsKICAgICAg ICAgICAgIGJvdW5kaW5nQm94LmluZmxhdGUobWluaW11bVRhcEhpZ2hsaWdodFJhZGl1cyk7Ci0g ICAgICAgICAgICBDR1JlY3QgcGl4ZWxBbGlnbmVkUmVjdCA9IHN0YXRpY19jYXN0PENHUmVjdD4o ZW5jbG9zaW5nUmVjdEV4dGVuZGVkVG9EZXZpY2VQaXhlbHMoYm91bmRpbmdCb3gsIGRldmljZVNj YWxlRmFjdG9yKSk7CisgICAgICAgICAgICBDR1JlY3QgcGl4ZWxBbGlnbmVkUmVjdCA9IHN0YXRp Y19jYXN0PENHUmVjdD4oZW5jbG9zZVJlY3RUb0RldmljZVBpeGVscyhib3VuZGluZ0JveCwgZGV2 aWNlU2NhbGVGYWN0b3IpKTsKICAgICAgICAgICAgIFtyZWN0cyBhZGRPYmplY3Q6W05TVmFsdWUg dmFsdWVXaXRoQ0dSZWN0OnBpeGVsQWxpZ25lZFJlY3RdXTsKICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIGFsbEhpZ2hsaWdodFJlY3RzQXJlUmVjdGlsaW5lYXIgPSBmYWxzZTsK