105992 2013-01-02 20:55:05 -0800 Use toSize() to convert from Int/FloatPoint to Int/FloatSize 2013-01-07 23:48:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 steveblock steveblock eric haraken ojan.autocc simon.fraser steveblock webkit.review.bot oldest_to_newest 799223 0 steveblock 2013-01-02 20:55:05 -0800 Use toSize() to convert from Int/FloatPoint to Int/FloatSize 799224 1 181142 steveblock 2013-01-02 20:58:00 -0800 Created attachment 181142 Patch 799261 2 steveblock 2013-01-02 22:11:48 -0800 Using toSize() seems easier to read than using operator- with a zero Int/FloatPoint. 801155 3 181475 steveblock 2013-01-06 21:23:13 -0800 Created attachment 181475 Patch 802002 4 181475 haraken 2013-01-07 21:48:57 -0800 Comment on attachment 181475 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181475&action=review > Source/WebCore/platform/graphics/FloatPoint.h:266 > +inline FloatSize toSize(const FloatPoint& a) Maybe toFloatSize() is a better name? Other method names around here clarify Int or Float. 802012 5 181475 steveblock 2013-01-07 22:00:03 -0800 Comment on attachment 181475 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181475&action=review >> Source/WebCore/platform/graphics/FloatPoint.h:266 >> +inline FloatSize toSize(const FloatPoint& a) > > Maybe toFloatSize() is a better name? Other method names around here clarify Int or Float. Sure. I'll rename IntSize toSize(const IntPoint&) in a follow-up patch. 802014 6 181475 haraken 2013-01-07 22:01:11 -0800 Comment on attachment 181475 Patch OK, please fix it in a follow-up patch. 802015 7 181639 steveblock 2013-01-07 22:01:21 -0800 Created attachment 181639 Patch 802046 8 181647 steveblock 2013-01-07 22:41:42 -0800 Created attachment 181647 Patch 802047 9 steveblock 2013-01-07 22:41:58 -0800 rebased 802083 10 181647 webkit.review.bot 2013-01-07 23:48:19 -0800 Comment on attachment 181647 Patch Clearing flags on attachment: 181647 Committed r139037: <http://trac.webkit.org/changeset/139037> 802084 11 webkit.review.bot 2013-01-07 23:48:23 -0800 All reviewed patches have been landed. Closing bug. 181142 2013-01-02 20:58:00 -0800 2013-01-06 21:23:08 -0800 Patch bug-105992-20130103155507.patch text/plain 7700 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U4MGJkM2ZkZGJiYTQ2 NzkzYTBiYTFiYjU0MzU2MjA4YWE0OWQxMC4uNTU4ZjMyMWZhODViNDliMjFmNTk5M2E4NGRjMGQ4 ODFlNjZmNGE4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTAyICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUo KSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25s eSwgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50Ojpjb21wdXRlUGF0aCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFBvaW50Lmg6CisgICAgICAgIChXZWJDb3JlOjp0b1NpemUpOgorICAgICAgICBBZGQgJ2lubGlu ZSBGbG9hdFNpemUgdG9TaXplKGNvbnN0IEZsb2F0UG9pbnQmKScgdG8gbWF0Y2ggSW50UG9pbnQu CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSk6 CisKIDIwMTItMTItMjMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbUXRdW01hY10gVW5yZXZpZXdlZCBmaXggdGhlIGJ1aWxkIGFmdGVyIHIxMzg0MTMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2U1YjBjY2Q3NmYzZGQyODdjMDYwMTNhZTg5NjIyZTk5 ODk5ODQwOC4uODllNmRmOWUxOTY0ODExZjBjOTdkODM2YTk5YWU1YTg4ZWI2Nzc4NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0wMS0wMiAgU3RldmUg QmxvY2sgIDxzdGV2ZWJsb2NrQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgdG9TaXplKCkg dG8gY29udmVydCBmcm9tIEludC9GbG9hdFBvaW50IHRvIEludC9GbG9hdFNpemUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTk5MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6bWluaW11bVNjcm9sbE9mZnNl dCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNldCk6 CisKIDIwMTItMTItMjEgIFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4K IAogICAgICAgICBbQ2hyb21pdW0tQW5kcm9pZF0gVXNlIGhhcmZidXp6LW5nIGluc3RlYWQgb2Yg aGFyZmJ1enotb2xkIG9uIEFuZHJvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEFyZWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50 LmNwcAppbmRleCAzMjYxYjk1NDVjNmY1ZGI1MWJhZDk4NjdkNzIwZWZiOWUzOWRkM2Q2Li5hMDI2 YTBiZDczYjAwNGY3NmViMGM0MDdlNTNjOGM3OWQ2ZTdhNTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQXJlYUVsZW1lbnQuY3BwCkBAIC0xMTUsNyArMTE1LDcgQEAgUGF0aCBIVE1MQXJlYUVs ZW1lbnQ6OmNvbXB1dGVQYXRoKFJlbmRlck9iamVjdCogb2JqKSBjb25zdAogICAgICAgICBwLnRy YW5zZm9ybSh6b29tVHJhbnNmb3JtKTsKICAgICB9CiAKLSAgICBwLnRyYW5zbGF0ZShhYnNQb3Mg LSBGbG9hdFBvaW50KCkpOworICAgIHAudHJhbnNsYXRlKHRvU2l6ZShhYnNQb3MpKTsKICAgICBy ZXR1cm4gcDsKIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAppbmRleCAz ZDYzMzg5YjEwMmQzZGY4Y2I4Y2FmNjdiZTRmZDNjOGViZmRlMmRjLi41ZGRiNjhiMTE1NWQzNTRj NWZlMzg5ZGNiNGM5MDA3MGM0MTgzNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmll dy5oCkBAIC0xNzAsNyArMTcwLDcgQEAgcHVibGljOgogCiAgICAgLy8gRnVuY3Rpb25zIGZvciBx dWVyeWluZyB0aGUgY3VycmVudCBzY3JvbGxlZCBwb3NpdGlvbiAoYm90aCBhcyBhIHBvaW50LCBh IHNpemUsIG9yIGFzIGluZGl2aWR1YWwgWCBhbmQgWSB2YWx1ZXMpLgogICAgIHZpcnR1YWwgSW50 UG9pbnQgc2Nyb2xsUG9zaXRpb24oKSBjb25zdCBPVkVSUklERSB7IHJldHVybiB2aXNpYmxlQ29u dGVudFJlY3QoKS5sb2NhdGlvbigpOyB9Ci0gICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQoKSBjb25z dCB7IHJldHVybiB2aXNpYmxlQ29udGVudFJlY3QoKS5sb2NhdGlvbigpIC0gSW50UG9pbnQoKTsg fSAvLyBHZXRzIHRoZSBzY3JvbGxlZCBwb3NpdGlvbiBhcyBhbiBJbnRTaXplLiBDb252ZW5pZW50 IGZvciBhZGRpbmcgdG8gb3RoZXIgc2l6ZXMuCisgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQoKSBj b25zdCB7IHJldHVybiB0b1NpemUodmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKSk7IH0g Ly8gR2V0cyB0aGUgc2Nyb2xsZWQgcG9zaXRpb24gYXMgYW4gSW50U2l6ZS4gQ29udmVuaWVudCBm b3IgYWRkaW5nIHRvIG90aGVyIHNpemVzLgogICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNj cm9sbFBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJREU7IC8vIFRoZSBtYXhpbXVtIHBvc2l0aW9uIHdl IGNhbiBiZSBzY3JvbGxlZCB0by4KICAgICB2aXJ0dWFsIEludFBvaW50IG1pbmltdW1TY3JvbGxQ b3NpdGlvbigpIGNvbnN0IE9WRVJSSURFOyAvLyBUaGUgbWluaW11bSBwb3NpdGlvbiB3ZSBjYW4g YmUgc2Nyb2xsZWQgdG8uCiAgICAgLy8gQWRqdXN0IHRoZSBwYXNzZWQgaW4gc2Nyb2xsIHBvc2l0 aW9uIHRvIGtlZXAgaXQgYmV0d2VlbiB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBwb3NpdGlvbnMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgKaW5kZXgg NzBkNjJiYmNmMjJhMDFlMDY4YTYwMTIxMWNlZDIwZTA3M2NhNTFhNi4uMWVjZWIyMDM4MzI2YTkx ODQ3YWQyZDkyMGY0MWFkNWQxNjBlZTY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0Zsb2F0UG9pbnQuaApAQCAtMjYyLDYgKzI2MiwxMSBAQCBpbmxpbmUgSW50U2l6 ZSBmbG9vcmVkSW50U2l6ZShjb25zdCBGbG9hdFBvaW50JiBwKQogICAgIHJldHVybiBJbnRTaXpl KGNsYW1wVG9JbnRlZ2VyKGZsb29yZihwLngoKSkpLCBjbGFtcFRvSW50ZWdlcihmbG9vcmYocC55 KCkpKSk7CiB9CiAKK2lubGluZSBGbG9hdFNpemUgdG9TaXplKGNvbnN0IEZsb2F0UG9pbnQmIGEp Cit7CisgICAgcmV0dXJuIEZsb2F0U2l6ZShhLngoKSwgYS55KCkpOworfQorCiBmbG9hdCBmaW5k U2xvcGUoY29uc3QgRmxvYXRQb2ludCYgcDEsIGNvbnN0IEZsb2F0UG9pbnQmIHAyLCBmbG9hdCYg Yyk7CiAKIC8vIEZpbmQgcG9pbnQgd2hlcmUgbGluZXMgdGhyb3VnaCB0aGUgdHdvIHBhaXJzIG9m IHBvaW50cyBpbnRlcnNlY3QuIFJldHVybnMgZmFsc2UgaWYgdGhlIGxpbmVzIGRvbid0IGludGVy c2VjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKaW5kZXggYmM5NmMxZjJkZjM1NGNlNmIxYmIwYTdmNTYwMDMyMWViYjg2NmY4MC4uYzZiMWFm YTFmYjk4ZWNlNTM1MjI3NzIxNmQyNTdlNWNmMzg1ZjlkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTYzMSw3ICs2MzEsNyBAQCB2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAg ICB9CiAKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChy ZWxhdGl2ZUNvbXBvc2l0aW5nQm91bmRzLmxvY2F0aW9uKCkgLSBncmFwaGljc0xheWVyUGFyZW50 TG9jYXRpb24pKTsKLSAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihs b2NhbENvbXBvc2l0aW5nQm91bmRzLmxvY2F0aW9uKCkgLSBJbnRQb2ludCgpKTsKKyAgICBtX2dy YXBoaWNzTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b1NpemUobG9jYWxDb21wb3NpdGlu Z0JvdW5kcy5sb2NhdGlvbigpKSk7CiAgICAgCiAgICAgRmxvYXRTaXplIG9sZFNpemUgPSBtX2dy YXBoaWNzTGF5ZXItPnNpemUoKTsKICAgICBGbG9hdFNpemUgbmV3U2l6ZSA9IHJlbGF0aXZlQ29t cG9zaXRpbmdCb3VuZHMuc2l6ZSgpOwpAQCAtNjUwLDcgKzY1MCw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogICAgICAgICBjbGlwcGlu Z0JveCA9IGNsaXBCb3godG9SZW5kZXJCb3gocmVuZGVyZXIoKSkpOwogICAgICAgICBjbGlwTGF5 ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0g bG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpKSk7CiAgICAgICAgIGNsaXBMYXllci0+ c2V0U2l6ZShjbGlwcGluZ0JveC5zaXplKCkpOwotICAgICAgICBjbGlwTGF5ZXItPnNldE9mZnNl dEZyb21SZW5kZXJlcihjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSk7CisgICAg ICAgIGNsaXBMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRvU2l6ZShjbGlwcGluZ0JveC5s b2NhdGlvbigpKSk7CiAgICAgfQogICAgIAogICAgIGlmIChtX21hc2tMYXllcikgewpAQCAtNzA1 LDcgKzcwNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVy R2VvbWV0cnkoKQogICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIGNsaXBwaW5nIGxheWVyICh3 aGljaCBjbGlwcyBkZXNjZW5kYW50cyksIHRoZW4gdGhlIGZvcmVncm91bmQgbGF5ZXIgaXMgYSBj aGlsZCBvZiBpdCwKICAgICAgICAgICAgIC8vIHNvIHRoYXQgaXQgZ2V0cyBjb3JyZWN0bHkgc29y dGVkIHdpdGggY2hpbGRyZW4uIEluIHRoYXQgY2FzZSwgcG9zaXRpb24gcmVsYXRpdmUgdG8gdGhl IGNsaXBwaW5nIGxheWVyLgogICAgICAgICAgICAgZm9yZWdyb3VuZFNpemUgPSBGbG9hdFNpemUo Y2xpcHBpbmdCb3guc2l6ZSgpKTsKLSAgICAgICAgICAgIGZvcmVncm91bmRPZmZzZXQgPSBjbGlw cGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9pbnQoKTsKKyAgICAgICAgICAgIGZvcmVncm91bmRP ZmZzZXQgPSB0b1NpemUoY2xpcHBpbmdCb3gubG9jYXRpb24oKSk7CiAgICAgICAgIH0KIAogICAg ICAgICBtX2ZvcmVncm91bmRMYXllci0+c2V0UG9zaXRpb24oZm9yZWdyb3VuZFBvc2l0aW9uKTsK QEAgLTc0Nyw3ICs3NDcsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhp Y3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgaWYgKHNjcm9sbFNpemUgIT0gbV9zY3JvbGxpbmdD b250ZW50c0xheWVyLT5zaXplKCkgfHwgcGFkZGluZ0JveE9mZnNldENoYW5nZWQpCiAgICAgICAg ICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogCi0gICAg ICAgIEludFNpemUgc2Nyb2xsaW5nQ29udGVudHNPZmZzZXQgPSBwYWRkaW5nQm94LmxvY2F0aW9u KCkgLSBJbnRQb2ludCgpIC0gc2Nyb2xsT2Zmc2V0OworICAgICAgICBJbnRTaXplIHNjcm9sbGlu Z0NvbnRlbnRzT2Zmc2V0ID0gdG9TaXplKHBhZGRpbmdCb3gubG9jYXRpb24oKSAtIHNjcm9sbE9m ZnNldCk7CiAgICAgICAgIGlmIChzY3JvbGxpbmdDb250ZW50c09mZnNldCAhPSBtX3Njcm9sbGlu Z0NvbnRlbnRzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpIHx8IHNjcm9sbFNpemUgIT0gbV9z Y3JvbGxpbmdDb250ZW50c0xheWVyLT5zaXplKCkpCiAgICAgICAgICAgICBjb21wb3NpdG9yKCkt PnNjcm9sbGluZ0xheWVyRGlkQ2hhbmdlKG1fb3duaW5nTGF5ZXIpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBmOTQzZjViOGY0ZDA4MDMzYTBj ZWRiZWRlYmFmZTkyMGRkNzdkOGJlLi5kNjU0NzQwNjA4MzU5MTg1ZmM1OWU4ZmI5MmZlZWZhZDM4 MDM4ZDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAK QEAgLTYwMiw3ICs2MDIsNyBAQCBXZWJTaXplIFdlYkZyYW1lSW1wbDo6bWluaW11bVNjcm9sbE9m ZnNldCgpIGNvbnN0CiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWVWaWV3KCk7CiAgICAgaWYg KCF2aWV3KQogICAgICAgICByZXR1cm4gV2ViU2l6ZSgpOwotICAgIHJldHVybiB2aWV3LT5taW5p bXVtU2Nyb2xsUG9zaXRpb24oKSAtIEludFBvaW50KCk7CisgICAgcmV0dXJuIHRvU2l6ZSh2aWV3 LT5taW5pbXVtU2Nyb2xsUG9zaXRpb24oKSk7CiB9CiAKIFdlYlNpemUgV2ViRnJhbWVJbXBsOjpt YXhpbXVtU2Nyb2xsT2Zmc2V0KCkgY29uc3QKQEAgLTYxMCw3ICs2MTAsNyBAQCBXZWJTaXplIFdl YkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNldCgpIGNvbnN0CiAgICAgRnJhbWVWaWV3KiB2 aWV3ID0gZnJhbWVWaWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gV2ViU2l6 ZSgpOwotICAgIHJldHVybiB2aWV3LT5tYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSAtIEludFBvaW50 KCk7CisgICAgcmV0dXJuIHRvU2l6ZSh2aWV3LT5tYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7CiB9 CiAKIHZvaWQgV2ViRnJhbWVJbXBsOjpzZXRTY3JvbGxPZmZzZXQoY29uc3QgV2ViU2l6ZSYgb2Zm c2V0KQo= 181475 2013-01-06 21:23:13 -0800 2013-01-07 22:01:17 -0800 Patch bug-105992-20130107162017.patch text/plain 9083 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE4ZWI5OTkxMjNhOWQy NzFmYmQ3NTc4YTBlY2ZiMmY1ZjMwZjE2NS4uYTNkMGViN2MyNjEwNjVlNjgzZTNhYTRlOGUxOWYx ZGY3OTY5NDI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTAyICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUo KSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25s eSwgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50Ojpjb21wdXRlUGF0aCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFBvaW50Lmg6CisgICAgICAgIChXZWJDb3JlOjp0b1NpemUpOgorICAgICAgICBBZGQgJ2lubGlu ZSBGbG9hdFNpemUgdG9TaXplKGNvbnN0IEZsb2F0UG9pbnQmKScgdG8gbWF0Y2ggSW50UG9pbnQu CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSk6 CisKIDIwMTMtMDEtMDQgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgQWRkICdmbG9hdCBGbG9hdFBvaW50OjpzbG9wZUFuZ2xlUmFkaWFucygpJwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBiNTc3NTNjZTJkMDhjMTAxMDZlMGE1ZTAzMmJhODk3 MjFhMDM0NGU1Li4zZGI2Y2Q3NmZjZTMzZmE1ZTg1NTFhMGE3MWI3MWVmMTY5OGFjYTMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAxLTAyICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUo KSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvTGlua0hpZ2hs aWdodC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxpbmtIaWdobGlnaHQ6OmNvbXB1dGVIaWdobGln aHRMYXllclBhdGhBbmRQb3NpdGlvbik6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6bWluaW11bVNjcm9sbE9mZnNldCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNldCk6CisKIDIw MTMtMDEtMDQgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFtDaHJvbWl1bV0gVXBkYXRlIHNvbWUgI2luY2x1ZGVzIHRvIHVzZSBoZWFkZXJzIGluIHRoZSBu ZXcgUGxhdGZvcm0gZGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxBcmVhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5j cHAKaW5kZXggMzI2MWI5NTQ1YzZmNWRiNTFiYWQ5ODY3ZDcyMGVmYjllMzlkZDNkNi4uYTAyNmEw YmQ3M2IwMDRmNzZlYjBjNDA3ZTUzYzhjNzlkNmU3YTUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEFyZWFFbGVtZW50LmNwcApAQCAtMTE1LDcgKzExNSw3IEBAIFBhdGggSFRNTEFyZWFFbGVt ZW50Ojpjb21wdXRlUGF0aChSZW5kZXJPYmplY3QqIG9iaikgY29uc3QKICAgICAgICAgcC50cmFu c2Zvcm0oem9vbVRyYW5zZm9ybSk7CiAgICAgfQogCi0gICAgcC50cmFuc2xhdGUoYWJzUG9zIC0g RmxvYXRQb2ludCgpKTsKKyAgICBwLnRyYW5zbGF0ZSh0b1NpemUoYWJzUG9zKSk7CiAgICAgcmV0 dXJuIHA7CiB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggM2Q2 MzM4OWIxMDJkM2RmOGNiOGNhZjY3YmU0ZmQzYzhlYmZkZTJkYy4uNWRkYjY4YjExNTVkMzU0YzVm ZTM4OWRjYjRjOTAwNzBjNDE4MzQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu aApAQCAtMTcwLDcgKzE3MCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEZ1bmN0aW9ucyBmb3IgcXVl cnlpbmcgdGhlIGN1cnJlbnQgc2Nyb2xsZWQgcG9zaXRpb24gKGJvdGggYXMgYSBwb2ludCwgYSBz aXplLCBvciBhcyBpbmRpdmlkdWFsIFggYW5kIFkgdmFsdWVzKS4KICAgICB2aXJ0dWFsIEludFBv aW50IHNjcm9sbFBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdmlzaWJsZUNvbnRl bnRSZWN0KCkubG9jYXRpb24oKTsgfQotICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0KCkgY29uc3Qg eyByZXR1cm4gdmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKSAtIEludFBvaW50KCk7IH0g Ly8gR2V0cyB0aGUgc2Nyb2xsZWQgcG9zaXRpb24gYXMgYW4gSW50U2l6ZS4gQ29udmVuaWVudCBm b3IgYWRkaW5nIHRvIG90aGVyIHNpemVzLgorICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0KCkgY29u c3QgeyByZXR1cm4gdG9TaXplKHZpc2libGVDb250ZW50UmVjdCgpLmxvY2F0aW9uKCkpOyB9IC8v IEdldHMgdGhlIHNjcm9sbGVkIHBvc2l0aW9uIGFzIGFuIEludFNpemUuIENvbnZlbmllbnQgZm9y IGFkZGluZyB0byBvdGhlciBzaXplcy4KICAgICB2aXJ0dWFsIEludFBvaW50IG1heGltdW1TY3Jv bGxQb3NpdGlvbigpIGNvbnN0IE9WRVJSSURFOyAvLyBUaGUgbWF4aW11bSBwb3NpdGlvbiB3ZSBj YW4gYmUgc2Nyb2xsZWQgdG8uCiAgICAgdmlydHVhbCBJbnRQb2ludCBtaW5pbXVtU2Nyb2xsUG9z aXRpb24oKSBjb25zdCBPVkVSUklERTsgLy8gVGhlIG1pbmltdW0gcG9zaXRpb24gd2UgY2FuIGJl IHNjcm9sbGVkIHRvLgogICAgIC8vIEFkanVzdCB0aGUgcGFzc2VkIGluIHNjcm9sbCBwb3NpdGlv biB0byBrZWVwIGl0IGJldHdlZW4gdGhlIG1pbmltdW0gYW5kIG1heGltdW0gcG9zaXRpb25zLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCmluZGV4IDk2 NzM3ODMwZmRmYzI0YWViMGRjOTk5M2UyODUyOGFlNjQ0MjJkNzkuLjMzMTBlMzEwYWYwMjA5YjEx MTFkZDc3YzM4ZDNlNmNkNDc1ODlmYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9GbG9hdFBvaW50LmgKQEAgLTI2Myw2ICsyNjMsMTEgQEAgaW5saW5lIEludFNpemUg Zmxvb3JlZEludFNpemUoY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICByZXR1cm4gSW50U2l6ZShj bGFtcFRvSW50ZWdlcihmbG9vcmYocC54KCkpKSwgY2xhbXBUb0ludGVnZXIoZmxvb3JmKHAueSgp KSkpOwogfQogCitpbmxpbmUgRmxvYXRTaXplIHRvU2l6ZShjb25zdCBGbG9hdFBvaW50JiBhKQor eworICAgIHJldHVybiBGbG9hdFNpemUoYS54KCksIGEueSgpKTsKK30KKwogZmxvYXQgZmluZFNs b3BlKGNvbnN0IEZsb2F0UG9pbnQmIHAxLCBjb25zdCBGbG9hdFBvaW50JiBwMiwgZmxvYXQmIGMp OwogCiAvLyBGaW5kIHBvaW50IHdoZXJlIGxpbmVzIHRocm91Z2ggdGhlIHR3byBwYWlycyBvZiBw b2ludHMgaW50ZXJzZWN0LiBSZXR1cm5zIGZhbHNlIGlmIHRoZSBsaW5lcyBkb24ndCBpbnRlcnNl Y3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CmluZGV4IGIyMWZmYzFkYzA0Y2U4MzI1NzIxZTg5OTYyZjAzY2EwYTY2ZDQ0NGMuLjliYjA1ZWVl OTFjOTg3MWY5OWNjMDc3YWM1MmFhNDcxZWIxOTI1MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC02MzEsNyArNjMxLDcgQEAgdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAg fQogCiAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkgKyAocmVs YXRpdmVDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXllclBhcmVudExv Y2F0aW9uKSk7Ci0gICAgbV9ncmFwaGljc0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIobG9j YWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSk7CisgICAgbV9ncmFw aGljc0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9TaXplKGxvY2FsQ29tcG9zaXRpbmdC b3VuZHMubG9jYXRpb24oKSkpOwogICAgIAogICAgIEZsb2F0U2l6ZSBvbGRTaXplID0gbV9ncmFw aGljc0xheWVyLT5zaXplKCk7CiAgICAgRmxvYXRTaXplIG5ld1NpemUgPSByZWxhdGl2ZUNvbXBv c2l0aW5nQm91bmRzLnNpemUoKTsKQEAgLTY1MCw3ICs2NTAsNyBAQCB2b2lkIFJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgY2xpcHBpbmdC b3ggPSBjbGlwQm94KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpKTsKICAgICAgICAgY2xpcExheWVy LT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkgKyAoY2xpcHBpbmdCb3gubG9jYXRpb24oKSAtIGxv Y2FsQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRpb24oKSkpOwogICAgICAgICBjbGlwTGF5ZXItPnNl dFNpemUoY2xpcHBpbmdCb3guc2l6ZSgpKTsKLSAgICAgICAgY2xpcExheWVyLT5zZXRPZmZzZXRG cm9tUmVuZGVyZXIoY2xpcHBpbmdCb3gubG9jYXRpb24oKSAtIEludFBvaW50KCkpOworICAgICAg ICBjbGlwTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b1NpemUoY2xpcHBpbmdCb3gubG9j YXRpb24oKSkpOwogICAgIH0KICAgICAKICAgICBpZiAobV9tYXNrTGF5ZXIpIHsKQEAgLTcwNSw3 ICs3MDUsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdl b21ldHJ5KCkKICAgICAgICAgICAgIC8vIElmIHdlIGhhdmUgYSBjbGlwcGluZyBsYXllciAod2hp Y2ggY2xpcHMgZGVzY2VuZGFudHMpLCB0aGVuIHRoZSBmb3JlZ3JvdW5kIGxheWVyIGlzIGEgY2hp bGQgb2YgaXQsCiAgICAgICAgICAgICAvLyBzbyB0aGF0IGl0IGdldHMgY29ycmVjdGx5IHNvcnRl ZCB3aXRoIGNoaWxkcmVuLiBJbiB0aGF0IGNhc2UsIHBvc2l0aW9uIHJlbGF0aXZlIHRvIHRoZSBj bGlwcGluZyBsYXllci4KICAgICAgICAgICAgIGZvcmVncm91bmRTaXplID0gRmxvYXRTaXplKGNs aXBwaW5nQm94LnNpemUoKSk7Ci0gICAgICAgICAgICBmb3JlZ3JvdW5kT2Zmc2V0ID0gY2xpcHBp bmdCb3gubG9jYXRpb24oKSAtIEludFBvaW50KCk7CisgICAgICAgICAgICBmb3JlZ3JvdW5kT2Zm c2V0ID0gdG9TaXplKGNsaXBwaW5nQm94LmxvY2F0aW9uKCkpOwogICAgICAgICB9CiAKICAgICAg ICAgbV9mb3JlZ3JvdW5kTGF5ZXItPnNldFBvc2l0aW9uKGZvcmVncm91bmRQb3NpdGlvbik7CkBA IC03MzksNyArNzM5LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNz TGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0UG9z aXRpb24oRmxvYXRQb2ludCgtc2Nyb2xsT2Zmc2V0LndpZHRoKCksIC1zY3JvbGxPZmZzZXQuaGVp Z2h0KCkpKTsKIAogICAgICAgICBJbnRTaXplIG9sZFNjcm9sbGluZ0xheWVyT2Zmc2V0ID0gbV9z Y3JvbGxpbmdMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCk7Ci0gICAgICAgIG1fc2Nyb2xsaW5n TGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihJbnRQb2ludCgpIC0gcGFkZGluZ0JveC5sb2Nh dGlvbigpKTsKKyAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVy KC10b1NpemUocGFkZGluZ0JveC5sb2NhdGlvbigpKSk7CiAKICAgICAgICAgYm9vbCBwYWRkaW5n Qm94T2Zmc2V0Q2hhbmdlZCA9IG9sZFNjcm9sbGluZ0xheWVyT2Zmc2V0ICE9IG1fc2Nyb2xsaW5n TGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpOwogCkBAIC03NDcsNyArNzQ3LDcgQEAgdm9pZCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAg IGlmIChzY3JvbGxTaXplICE9IG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2l6ZSgpIHx8IHBh ZGRpbmdCb3hPZmZzZXRDaGFuZ2VkKQogICAgICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xh eWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIAotICAgICAgICBJbnRTaXplIHNjcm9sbGluZ0NvbnRl bnRzT2Zmc2V0ID0gcGFkZGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSAtIHNjcm9sbE9m ZnNldDsKKyAgICAgICAgSW50U2l6ZSBzY3JvbGxpbmdDb250ZW50c09mZnNldCA9IHRvU2l6ZShw YWRkaW5nQm94LmxvY2F0aW9uKCkgLSBzY3JvbGxPZmZzZXQpOwogICAgICAgICBpZiAoc2Nyb2xs aW5nQ29udGVudHNPZmZzZXQgIT0gbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5vZmZzZXRGcm9t UmVuZGVyZXIoKSB8fCBzY3JvbGxTaXplICE9IG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2l6 ZSgpKQogICAgICAgICAgICAgY29tcG9zaXRvcigpLT5zY3JvbGxpbmdMYXllckRpZENoYW5nZSht X293bmluZ0xheWVyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv TGlua0hpZ2hsaWdodC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxp Z2h0LmNwcAppbmRleCA1Y2Q5YjZlYzhjNGJjMDdmOWEzMTQ1ZWRhZDQ2NjcxMTk3MjgwODE1Li4x OTNjYjU2MjdiYWMwNWZkOTkyOThkZWVmNTVhY2Q4YjgzYzA2NzVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0LmNwcApAQCAtMjE0LDcgKzIxNCw3IEBAIGJv b2wgTGlua0hpZ2hsaWdodDo6Y29tcHV0ZUhpZ2hsaWdodExheWVyUGF0aEFuZFBvc2l0aW9uKFJl bmRlckxheWVyKiBjb21wb3NpdGluCiAgICAgfQogCiAgICAgRmxvYXRSZWN0IGJvdW5kaW5nUmVj dCA9IG5ld1BhdGguYm91bmRpbmdSZWN0KCk7Ci0gICAgbmV3UGF0aC50cmFuc2xhdGUoRmxvYXRQ b2ludCgpIC0gYm91bmRpbmdSZWN0LmxvY2F0aW9uKCkpOworICAgIG5ld1BhdGgudHJhbnNsYXRl KC10b1NpemUoYm91bmRpbmdSZWN0LmxvY2F0aW9uKCkpKTsKIAogICAgIGJvb2wgcGF0aEhhc0No YW5nZWQgPSAhbV9wYXRoLnBsYXRmb3JtUGF0aCgpIHx8ICEoKm5ld1BhdGgucGxhdGZvcm1QYXRo KCkgPT0gKm1fcGF0aC5wbGF0Zm9ybVBhdGgoKSk7CiAgICAgaWYgKHBhdGhIYXNDaGFuZ2VkKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBmOTQz ZjViOGY0ZDA4MDMzYTBjZWRiZWRlYmFmZTkyMGRkNzdkOGJlLi5kNjU0NzQwNjA4MzU5MTg1ZmM1 OWU4ZmI5MmZlZWZhZDM4MDM4ZDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKQEAgLTYwMiw3ICs2MDIsNyBAQCBXZWJTaXplIFdlYkZyYW1lSW1wbDo6 bWluaW11bVNjcm9sbE9mZnNldCgpIGNvbnN0CiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWVW aWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gV2ViU2l6ZSgpOwotICAgIHJl dHVybiB2aWV3LT5taW5pbXVtU2Nyb2xsUG9zaXRpb24oKSAtIEludFBvaW50KCk7CisgICAgcmV0 dXJuIHRvU2l6ZSh2aWV3LT5taW5pbXVtU2Nyb2xsUG9zaXRpb24oKSk7CiB9CiAKIFdlYlNpemUg V2ViRnJhbWVJbXBsOjptYXhpbXVtU2Nyb2xsT2Zmc2V0KCkgY29uc3QKQEAgLTYxMCw3ICs2MTAs NyBAQCBXZWJTaXplIFdlYkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNldCgpIGNvbnN0CiAg ICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWVWaWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAg ICByZXR1cm4gV2ViU2l6ZSgpOwotICAgIHJldHVybiB2aWV3LT5tYXhpbXVtU2Nyb2xsUG9zaXRp b24oKSAtIEludFBvaW50KCk7CisgICAgcmV0dXJuIHRvU2l6ZSh2aWV3LT5tYXhpbXVtU2Nyb2xs UG9zaXRpb24oKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVJbXBsOjpzZXRTY3JvbGxPZmZzZXQoY29u c3QgV2ViU2l6ZSYgb2Zmc2V0KQo= 181639 2013-01-07 22:01:21 -0800 2013-01-07 22:41:37 -0800 Patch bug-105992-20130108165825.patch text/plain 9108 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE4ZWI5OTkxMjNhOWQy NzFmYmQ3NTc4YTBlY2ZiMmY1ZjMwZjE2NS4uOTI4ODFmMGEzNTE0NTllOWQwNTZjMDkxMWFmOWQy MTBjNjQ1Yzk4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTAyICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUo KSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25s eSwgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50Ojpjb21wdXRlUGF0aCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFBvaW50Lmg6CisgICAgICAgIChXZWJDb3JlOjp0b0Zsb2F0U2l6ZSk6CisgICAgICAgIEFkZCAn aW5saW5lIEZsb2F0U2l6ZSB0b0Zsb2F0U2l6ZShjb25zdCBGbG9hdFBvaW50JiknIHRvIG1hdGNo IEludFBvaW50LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVy R2VvbWV0cnkpOgorCiAyMDEzLTAxLTA0ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEFkZCAnZmxvYXQgRmxvYXRQb2ludDo6c2xvcGVBbmdsZVJhZGlh bnMoKScKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYjU3NzUzY2UyZDA4YzEwMTA2ZTBh NWUwMzJiYTg5NzIxYTAzNDRlNS4uM2RiNmNkNzZmY2UzM2ZhNWU4NTUxYTBhNzFiNzFlZjE2OThh Y2EzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0w MS0wMiAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGNocm9taXVtLm9yZz4KKworICAgICAgICBV c2UgdG9TaXplKCkgdG8gY29udmVydCBmcm9tIEludC9GbG9hdFBvaW50IHRvIEludC9GbG9hdFNp emUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTk5 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3Jj L0xpbmtIaWdobGlnaHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpMaW5rSGlnaGxpZ2h0Ojpjb21w dXRlSGlnaGxpZ2h0TGF5ZXJQYXRoQW5kUG9zaXRpb24pOgorICAgICAgICAqIHNyYy9XZWJGcmFt ZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6Om1pbmltdW1TY3JvbGxP ZmZzZXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6Om1heGltdW1TY3JvbGxPZmZz ZXQpOgorCiAyMDEzLTAxLTA0ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbQ2hyb21pdW1dIFVwZGF0ZSBzb21lICNpbmNsdWRlcyB0byB1c2UgaGVhZGVy cyBpbiB0aGUgbmV3IFBsYXRmb3JtIGRpcmVjdG9yeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJl YUVsZW1lbnQuY3BwCmluZGV4IDMyNjFiOTU0NWM2ZjVkYjUxYmFkOTg2N2Q3MjBlZmI5ZTM5ZGQz ZDYuLmJhNDA5MWY5ZTE5OWZmNjNkYTE0MDA2Mjk5Mzk4NTAzODYwZTdiMjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAKQEAgLTExNSw3ICsxMTUsNyBAQCBQYXRoIEhU TUxBcmVhRWxlbWVudDo6Y29tcHV0ZVBhdGgoUmVuZGVyT2JqZWN0KiBvYmopIGNvbnN0CiAgICAg ICAgIHAudHJhbnNmb3JtKHpvb21UcmFuc2Zvcm0pOwogICAgIH0KIAotICAgIHAudHJhbnNsYXRl KGFic1BvcyAtIEZsb2F0UG9pbnQoKSk7CisgICAgcC50cmFuc2xhdGUodG9GbG9hdFNpemUoYWJz UG9zKSk7CiAgICAgcmV0dXJuIHA7CiB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmgKaW5kZXggM2Q2MzM4OWIxMDJkM2RmOGNiOGNhZjY3YmU0ZmQzYzhlYmZkZTJkYy4uNWRk YjY4YjExNTVkMzU0YzVmZTM4OWRjYjRjOTAwNzBjNDE4MzQ2MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFZpZXcuaApAQCAtMTcwLDcgKzE3MCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEZ1 bmN0aW9ucyBmb3IgcXVlcnlpbmcgdGhlIGN1cnJlbnQgc2Nyb2xsZWQgcG9zaXRpb24gKGJvdGgg YXMgYSBwb2ludCwgYSBzaXplLCBvciBhcyBpbmRpdmlkdWFsIFggYW5kIFkgdmFsdWVzKS4KICAg ICB2aXJ0dWFsIEludFBvaW50IHNjcm9sbFBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1 cm4gdmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKTsgfQotICAgIEludFNpemUgc2Nyb2xs T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gdmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKSAt IEludFBvaW50KCk7IH0gLy8gR2V0cyB0aGUgc2Nyb2xsZWQgcG9zaXRpb24gYXMgYW4gSW50U2l6 ZS4gQ29udmVuaWVudCBmb3IgYWRkaW5nIHRvIG90aGVyIHNpemVzLgorICAgIEludFNpemUgc2Ny b2xsT2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gdG9TaXplKHZpc2libGVDb250ZW50UmVjdCgpLmxv Y2F0aW9uKCkpOyB9IC8vIEdldHMgdGhlIHNjcm9sbGVkIHBvc2l0aW9uIGFzIGFuIEludFNpemUu IENvbnZlbmllbnQgZm9yIGFkZGluZyB0byBvdGhlciBzaXplcy4KICAgICB2aXJ0dWFsIEludFBv aW50IG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0IE9WRVJSSURFOyAvLyBUaGUgbWF4aW11 bSBwb3NpdGlvbiB3ZSBjYW4gYmUgc2Nyb2xsZWQgdG8uCiAgICAgdmlydHVhbCBJbnRQb2ludCBt aW5pbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdCBPVkVSUklERTsgLy8gVGhlIG1pbmltdW0gcG9z aXRpb24gd2UgY2FuIGJlIHNjcm9sbGVkIHRvLgogICAgIC8vIEFkanVzdCB0aGUgcGFzc2VkIGlu IHNjcm9sbCBwb3NpdGlvbiB0byBrZWVwIGl0IGJldHdlZW4gdGhlIG1pbmltdW0gYW5kIG1heGlt dW0gcG9zaXRpb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRmxvYXRQb2ludC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQ b2ludC5oCmluZGV4IDk2NzM3ODMwZmRmYzI0YWViMGRjOTk5M2UyODUyOGFlNjQ0MjJkNzkuLjEx MWUyMzE4MjYzZGE4MmE1OWQzNWY3M2I5MmVkN2M3NGIwM2IyMTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgKQEAgLTI2Myw2ICsyNjMsMTEgQEAg aW5saW5lIEludFNpemUgZmxvb3JlZEludFNpemUoY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICBy ZXR1cm4gSW50U2l6ZShjbGFtcFRvSW50ZWdlcihmbG9vcmYocC54KCkpKSwgY2xhbXBUb0ludGVn ZXIoZmxvb3JmKHAueSgpKSkpOwogfQogCitpbmxpbmUgRmxvYXRTaXplIHRvRmxvYXRTaXplKGNv bnN0IEZsb2F0UG9pbnQmIGEpCit7CisgICAgcmV0dXJuIEZsb2F0U2l6ZShhLngoKSwgYS55KCkp OworfQorCiBmbG9hdCBmaW5kU2xvcGUoY29uc3QgRmxvYXRQb2ludCYgcDEsIGNvbnN0IEZsb2F0 UG9pbnQmIHAyLCBmbG9hdCYgYyk7CiAKIC8vIEZpbmQgcG9pbnQgd2hlcmUgbGluZXMgdGhyb3Vn aCB0aGUgdHdvIHBhaXJzIG9mIHBvaW50cyBpbnRlcnNlY3QuIFJldHVybnMgZmFsc2UgaWYgdGhl IGxpbmVzIGRvbid0IGludGVyc2VjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggYjIxZmZjMWRjMDRjZTgzMjU3MjFlODk5NjJmMDNj YTBhNjZkNDQ0Yy4uOWJiMDVlZWU5MWM5ODcxZjk5Y2MwNzdhYzUyYWE0NzFlYjE5MjUxYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAg LTYzMSw3ICs2MzEsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NM YXllckdlb21ldHJ5KCkKICAgICB9CiAKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBvc2l0aW9u KEZsb2F0UG9pbnQoKSArIChyZWxhdGl2ZUNvbXBvc2l0aW5nQm91bmRzLmxvY2F0aW9uKCkgLSBn cmFwaGljc0xheWVyUGFyZW50TG9jYXRpb24pKTsKLSAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE9m ZnNldEZyb21SZW5kZXJlcihsb2NhbENvbXBvc2l0aW5nQm91bmRzLmxvY2F0aW9uKCkgLSBJbnRQ b2ludCgpKTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b1Np emUobG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpKSk7CiAgICAgCiAgICAgRmxvYXRT aXplIG9sZFNpemUgPSBtX2dyYXBoaWNzTGF5ZXItPnNpemUoKTsKICAgICBGbG9hdFNpemUgbmV3 U2l6ZSA9IHJlbGF0aXZlQ29tcG9zaXRpbmdCb3VuZHMuc2l6ZSgpOwpAQCAtNjUwLDcgKzY1MCw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnko KQogICAgICAgICBjbGlwcGluZ0JveCA9IGNsaXBCb3godG9SZW5kZXJCb3gocmVuZGVyZXIoKSkp OwogICAgICAgICBjbGlwTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChjbGlwcGlu Z0JveC5sb2NhdGlvbigpIC0gbG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpKSk7CiAg ICAgICAgIGNsaXBMYXllci0+c2V0U2l6ZShjbGlwcGluZ0JveC5zaXplKCkpOwotICAgICAgICBj bGlwTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0g SW50UG9pbnQoKSk7CisgICAgICAgIGNsaXBMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRv U2l6ZShjbGlwcGluZ0JveC5sb2NhdGlvbigpKSk7CiAgICAgfQogICAgIAogICAgIGlmIChtX21h c2tMYXllcikgewpAQCAtNzA1LDcgKzcwNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1 cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSBh IGNsaXBwaW5nIGxheWVyICh3aGljaCBjbGlwcyBkZXNjZW5kYW50cyksIHRoZW4gdGhlIGZvcmVn cm91bmQgbGF5ZXIgaXMgYSBjaGlsZCBvZiBpdCwKICAgICAgICAgICAgIC8vIHNvIHRoYXQgaXQg Z2V0cyBjb3JyZWN0bHkgc29ydGVkIHdpdGggY2hpbGRyZW4uIEluIHRoYXQgY2FzZSwgcG9zaXRp b24gcmVsYXRpdmUgdG8gdGhlIGNsaXBwaW5nIGxheWVyLgogICAgICAgICAgICAgZm9yZWdyb3Vu ZFNpemUgPSBGbG9hdFNpemUoY2xpcHBpbmdCb3guc2l6ZSgpKTsKLSAgICAgICAgICAgIGZvcmVn cm91bmRPZmZzZXQgPSBjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9pbnQoKTsKKyAgICAg ICAgICAgIGZvcmVncm91bmRPZmZzZXQgPSB0b1NpemUoY2xpcHBpbmdCb3gubG9jYXRpb24oKSk7 CiAgICAgICAgIH0KIAogICAgICAgICBtX2ZvcmVncm91bmRMYXllci0+c2V0UG9zaXRpb24oZm9y ZWdyb3VuZFBvc2l0aW9uKTsKQEAgLTczOSw3ICs3MzksNyBAQCB2b2lkIFJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgbV9zY3JvbGxpbmdD b250ZW50c0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KC1zY3JvbGxPZmZzZXQud2lkdGgo KSwgLXNjcm9sbE9mZnNldC5oZWlnaHQoKSkpOwogCiAgICAgICAgIEludFNpemUgb2xkU2Nyb2xs aW5nTGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsK LSAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKEludFBvaW50 KCkgLSBwYWRkaW5nQm94LmxvY2F0aW9uKCkpOworICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5z ZXRPZmZzZXRGcm9tUmVuZGVyZXIoLXRvU2l6ZShwYWRkaW5nQm94LmxvY2F0aW9uKCkpKTsKIAog ICAgICAgICBib29sIHBhZGRpbmdCb3hPZmZzZXRDaGFuZ2VkID0gb2xkU2Nyb2xsaW5nTGF5ZXJP ZmZzZXQgIT0gbV9zY3JvbGxpbmdMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCk7CiAKQEAgLTc0 Nyw3ICs3NDcsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXll ckdlb21ldHJ5KCkKICAgICAgICAgaWYgKHNjcm9sbFNpemUgIT0gbV9zY3JvbGxpbmdDb250ZW50 c0xheWVyLT5zaXplKCkgfHwgcGFkZGluZ0JveE9mZnNldENoYW5nZWQpCiAgICAgICAgICAgICBt X3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogCi0gICAgICAgIElu dFNpemUgc2Nyb2xsaW5nQ29udGVudHNPZmZzZXQgPSBwYWRkaW5nQm94LmxvY2F0aW9uKCkgLSBJ bnRQb2ludCgpIC0gc2Nyb2xsT2Zmc2V0OworICAgICAgICBJbnRTaXplIHNjcm9sbGluZ0NvbnRl bnRzT2Zmc2V0ID0gdG9TaXplKHBhZGRpbmdCb3gubG9jYXRpb24oKSAtIHNjcm9sbE9mZnNldCk7 CiAgICAgICAgIGlmIChzY3JvbGxpbmdDb250ZW50c09mZnNldCAhPSBtX3Njcm9sbGluZ0NvbnRl bnRzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpIHx8IHNjcm9sbFNpemUgIT0gbV9zY3JvbGxp bmdDb250ZW50c0xheWVyLT5zaXplKCkpCiAgICAgICAgICAgICBjb21wb3NpdG9yKCktPnNjcm9s bGluZ0xheWVyRGlkQ2hhbmdlKG1fb3duaW5nTGF5ZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCmluZGV4IDVjZDliNmVjOGM0YmMwN2Y5YTMxNDVl ZGFkNDY2NzExOTcyODA4MTUuLjlhODZhZTRlYzRmMWEyYTY3ZGIwMTFkMjM3YTM1OWY0ZjllYjU2 NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCkBA IC0yMTQsNyArMjE0LDcgQEAgYm9vbCBMaW5rSGlnaGxpZ2h0Ojpjb21wdXRlSGlnaGxpZ2h0TGF5 ZXJQYXRoQW5kUG9zaXRpb24oUmVuZGVyTGF5ZXIqIGNvbXBvc2l0aW4KICAgICB9CiAKICAgICBG bG9hdFJlY3QgYm91bmRpbmdSZWN0ID0gbmV3UGF0aC5ib3VuZGluZ1JlY3QoKTsKLSAgICBuZXdQ YXRoLnRyYW5zbGF0ZShGbG9hdFBvaW50KCkgLSBib3VuZGluZ1JlY3QubG9jYXRpb24oKSk7Cisg ICAgbmV3UGF0aC50cmFuc2xhdGUoLXRvRmxvYXRTaXplKGJvdW5kaW5nUmVjdC5sb2NhdGlvbigp KSk7CiAKICAgICBib29sIHBhdGhIYXNDaGFuZ2VkID0gIW1fcGF0aC5wbGF0Zm9ybVBhdGgoKSB8 fCAhKCpuZXdQYXRoLnBsYXRmb3JtUGF0aCgpID09ICptX3BhdGgucGxhdGZvcm1QYXRoKCkpOwog ICAgIGlmIChwYXRoSGFzQ2hhbmdlZCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKaW5kZXggZjk0M2Y1YjhmNGQwODAzM2EwY2VkYmVkZWJhZmU5MjBkZDc3 ZDhiZS4uZDY1NDc0MDYwODM1OTE4NWZjNTllOGZiOTJmZWVmYWQzODAzOGQ5MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC02MDIsNyArNjAyLDcg QEAgV2ViU2l6ZSBXZWJGcmFtZUltcGw6Om1pbmltdW1TY3JvbGxPZmZzZXQoKSBjb25zdAogICAg IEZyYW1lVmlldyogdmlldyA9IGZyYW1lVmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAg cmV0dXJuIFdlYlNpemUoKTsKLSAgICByZXR1cm4gdmlldy0+bWluaW11bVNjcm9sbFBvc2l0aW9u KCkgLSBJbnRQb2ludCgpOworICAgIHJldHVybiB0b1NpemUodmlldy0+bWluaW11bVNjcm9sbFBv c2l0aW9uKCkpOwogfQogCiBXZWJTaXplIFdlYkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNl dCgpIGNvbnN0CkBAIC02MTAsNyArNjEwLDcgQEAgV2ViU2l6ZSBXZWJGcmFtZUltcGw6Om1heGlt dW1TY3JvbGxPZmZzZXQoKSBjb25zdAogICAgIEZyYW1lVmlldyogdmlldyA9IGZyYW1lVmlldygp OwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIFdlYlNpemUoKTsKLSAgICByZXR1cm4g dmlldy0+bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgLSBJbnRQb2ludCgpOworICAgIHJldHVybiB0 b1NpemUodmlldy0+bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkpOwogfQogCiB2b2lkIFdlYkZyYW1l SW1wbDo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYlNpemUmIG9mZnNldCkK 181647 2013-01-07 22:41:42 -0800 2013-01-07 23:48:19 -0800 Patch bug-105992-20130108173846.patch text/plain 9129 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk2MmM1NGQzY2JhNTMy MzdjNmM5OWQxZjI5YTBiZjhmNjllZjhlNy4uZTdlZDhlYzdiNzk1ZjJlZWZiOTZmODE0OTBmNjBi MjU2MGI1ZjEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTAyICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUo KSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25s eSwgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50Ojpjb21wdXRlUGF0aCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFBvaW50Lmg6CisgICAgICAgIChXZWJDb3JlOjp0b0Zsb2F0U2l6ZSk6CisgICAgICAgIEFkZCAn aW5saW5lIEZsb2F0U2l6ZSB0b0Zsb2F0U2l6ZShjb25zdCBGbG9hdFBvaW50JiknIHRvIG1hdGNo IEludFBvaW50LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVy R2VvbWV0cnkpOgorCiAyMDEzLTAxLTA3ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFVzZSBleHBsaWNpdCBjb25zdHJ1Y3RvciB0byBjb252ZXJ0IGZy b20gSW50L0Zsb2F0U2l6ZSB0byBJbnQvRmxvYXRQb2ludApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwppbmRleCBlMDcyNTZjODZjMjk0ZTA2YjJkNmZiYzg4ZWEyYzY1NGQ3Y2I4YzcwLi4xOGVkMDdk ZTZmZTVjYmQwZGNlZjFmMGUyZmI2MzlkNDMyOTVjOThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAxLTAyICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxv Y2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSB0b1NpemUoKSB0byBjb252ZXJ0IGZyb20g SW50L0Zsb2F0UG9pbnQgdG8gSW50L0Zsb2F0U2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvTGlua0hpZ2hsaWdodC5jcHA6CisgICAgICAg IChXZWJLaXQ6OkxpbmtIaWdobGlnaHQ6OmNvbXB1dGVIaWdobGlnaHRMYXllclBhdGhBbmRQb3Np dGlvbik6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lSW1wbDo6bWluaW11bVNjcm9sbE9mZnNldCk6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lSW1wbDo6bWF4aW11bVNjcm9sbE9mZnNldCk6CisKIDIwMTMtMDEtMDcgIFhpYW56aHUg V2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIEV4 cG9zZSBjb21wb3NpdGVkU2Nyb2xsaW5nRm9yRnJhbWVzRW5hYmxlZCBzZXR0aW5nIGluIFdlYktp dCBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmNwcAppbmRleCAzMjYxYjk1 NDVjNmY1ZGI1MWJhZDk4NjdkNzIwZWZiOWUzOWRkM2Q2Li5iYTQwOTFmOWUxOTlmZjYzZGExNDAw NjI5OTM5ODUwMzg2MGU3YjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxB cmVhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQu Y3BwCkBAIC0xMTUsNyArMTE1LDcgQEAgUGF0aCBIVE1MQXJlYUVsZW1lbnQ6OmNvbXB1dGVQYXRo KFJlbmRlck9iamVjdCogb2JqKSBjb25zdAogICAgICAgICBwLnRyYW5zZm9ybSh6b29tVHJhbnNm b3JtKTsKICAgICB9CiAKLSAgICBwLnRyYW5zbGF0ZShhYnNQb3MgLSBGbG9hdFBvaW50KCkpOwor ICAgIHAudHJhbnNsYXRlKHRvRmxvYXRTaXplKGFic1BvcykpOwogICAgIHJldHVybiBwOwogfQog ICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IDNkNjMzODliMTAyZDNk ZjhjYjhjYWY2N2JlNGZkM2M4ZWJmZGUyZGMuLjVkZGI2OGIxMTU1ZDM1NGM1ZmUzODlkY2I0Yzkw MDcwYzQxODM0NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTE3MCw3 ICsxNzAsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBGdW5jdGlvbnMgZm9yIHF1ZXJ5aW5nIHRoZSBj dXJyZW50IHNjcm9sbGVkIHBvc2l0aW9uIChib3RoIGFzIGEgcG9pbnQsIGEgc2l6ZSwgb3IgYXMg aW5kaXZpZHVhbCBYIGFuZCBZIHZhbHVlcykuCiAgICAgdmlydHVhbCBJbnRQb2ludCBzY3JvbGxQ b3NpdGlvbigpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHZpc2libGVDb250ZW50UmVjdCgpLmxv Y2F0aW9uKCk7IH0KLSAgICBJbnRTaXplIHNjcm9sbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIHZp c2libGVDb250ZW50UmVjdCgpLmxvY2F0aW9uKCkgLSBJbnRQb2ludCgpOyB9IC8vIEdldHMgdGhl IHNjcm9sbGVkIHBvc2l0aW9uIGFzIGFuIEludFNpemUuIENvbnZlbmllbnQgZm9yIGFkZGluZyB0 byBvdGhlciBzaXplcy4KKyAgICBJbnRTaXplIHNjcm9sbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJu IHRvU2l6ZSh2aXNpYmxlQ29udGVudFJlY3QoKS5sb2NhdGlvbigpKTsgfSAvLyBHZXRzIHRoZSBz Y3JvbGxlZCBwb3NpdGlvbiBhcyBhbiBJbnRTaXplLiBDb252ZW5pZW50IGZvciBhZGRpbmcgdG8g b3RoZXIgc2l6ZXMuCiAgICAgdmlydHVhbCBJbnRQb2ludCBtYXhpbXVtU2Nyb2xsUG9zaXRpb24o KSBjb25zdCBPVkVSUklERTsgLy8gVGhlIG1heGltdW0gcG9zaXRpb24gd2UgY2FuIGJlIHNjcm9s bGVkIHRvLgogICAgIHZpcnR1YWwgSW50UG9pbnQgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29u c3QgT1ZFUlJJREU7IC8vIFRoZSBtaW5pbXVtIHBvc2l0aW9uIHdlIGNhbiBiZSBzY3JvbGxlZCB0 by4KICAgICAvLyBBZGp1c3QgdGhlIHBhc3NlZCBpbiBzY3JvbGwgcG9zaXRpb24gdG8ga2VlcCBp dCBiZXR3ZWVuIHRoZSBtaW5pbXVtIGFuZCBtYXhpbXVtIHBvc2l0aW9ucy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQuaAppbmRleCA5NjczNzgzMGZkZmMy NGFlYjBkYzk5OTNlMjg1MjhhZTY0NDIyZDc5Li4xMTFlMjMxODI2M2RhODJhNTlkMzVmNzNiOTJl ZDdjNzRiMDNiMjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9GbG9hdFBvaW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxv YXRQb2ludC5oCkBAIC0yNjMsNiArMjYzLDExIEBAIGlubGluZSBJbnRTaXplIGZsb29yZWRJbnRT aXplKGNvbnN0IEZsb2F0UG9pbnQmIHApCiAgICAgcmV0dXJuIEludFNpemUoY2xhbXBUb0ludGVn ZXIoZmxvb3JmKHAueCgpKSksIGNsYW1wVG9JbnRlZ2VyKGZsb29yZihwLnkoKSkpKTsKIH0KIAor aW5saW5lIEZsb2F0U2l6ZSB0b0Zsb2F0U2l6ZShjb25zdCBGbG9hdFBvaW50JiBhKQoreworICAg IHJldHVybiBGbG9hdFNpemUoYS54KCksIGEueSgpKTsKK30KKwogZmxvYXQgZmluZFNsb3BlKGNv bnN0IEZsb2F0UG9pbnQmIHAxLCBjb25zdCBGbG9hdFBvaW50JiBwMiwgZmxvYXQmIGMpOwogCiAv LyBGaW5kIHBvaW50IHdoZXJlIGxpbmVzIHRocm91Z2ggdGhlIHR3byBwYWlycyBvZiBwb2ludHMg aW50ZXJzZWN0LiBSZXR1cm5zIGZhbHNlIGlmIHRoZSBsaW5lcyBkb24ndCBpbnRlcnNlY3QuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4 IGQxNGVkMTEyM2ZlNGY1OWY0NmI1ZjMyNmQ4ODE0MjEwZDI0YzM1NWQuLmMyN2MyMWMzNmRkYmQ0 NmFhYjQxYTViNTIyYjg0YWFjZjdlNmQyNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC02MzUsNyArNjM1LDcgQEAgdm9pZCBSZW5k ZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgfQogCiAg ICAgbV9ncmFwaGljc0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KHJlbGF0aXZlQ29tcG9z aXRpbmdCb3VuZHMubG9jYXRpb24oKSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikpOwot ICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKGxvY2FsQ29tcG9zaXRp bmdCb3VuZHMubG9jYXRpb24oKSAtIEludFBvaW50KCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+ c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRvU2l6ZShsb2NhbENvbXBvc2l0aW5nQm91bmRzLmxvY2F0 aW9uKCkpKTsKICAgICAKICAgICBGbG9hdFNpemUgb2xkU2l6ZSA9IG1fZ3JhcGhpY3NMYXllci0+ c2l6ZSgpOwogICAgIEZsb2F0U2l6ZSBuZXdTaXplID0gcmVsYXRpdmVDb21wb3NpdGluZ0JvdW5k cy5zaXplKCk7CkBAIC02NTQsNyArNjU0LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIGNsaXBwaW5nQm94ID0gY2xpcEJv eCh0b1JlbmRlckJveChyZW5kZXJlcigpKSk7CiAgICAgICAgIGNsaXBMYXllci0+c2V0UG9zaXRp b24oRmxvYXRQb2ludChjbGlwcGluZ0JveC5sb2NhdGlvbigpIC0gbG9jYWxDb21wb3NpdGluZ0Jv dW5kcy5sb2NhdGlvbigpKSk7CiAgICAgICAgIGNsaXBMYXllci0+c2V0U2l6ZShjbGlwcGluZ0Jv eC5zaXplKCkpOwotICAgICAgICBjbGlwTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihjbGlw cGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSk7CisgICAgICAgIGNsaXBMYXllci0+c2V0 T2Zmc2V0RnJvbVJlbmRlcmVyKHRvU2l6ZShjbGlwcGluZ0JveC5sb2NhdGlvbigpKSk7CiAgICAg fQogICAgIAogICAgIGlmIChtX21hc2tMYXllcikgewpAQCAtNzA5LDcgKzcwOSw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogICAgICAg ICAgICAgLy8gSWYgd2UgaGF2ZSBhIGNsaXBwaW5nIGxheWVyICh3aGljaCBjbGlwcyBkZXNjZW5k YW50cyksIHRoZW4gdGhlIGZvcmVncm91bmQgbGF5ZXIgaXMgYSBjaGlsZCBvZiBpdCwKICAgICAg ICAgICAgIC8vIHNvIHRoYXQgaXQgZ2V0cyBjb3JyZWN0bHkgc29ydGVkIHdpdGggY2hpbGRyZW4u IEluIHRoYXQgY2FzZSwgcG9zaXRpb24gcmVsYXRpdmUgdG8gdGhlIGNsaXBwaW5nIGxheWVyLgog ICAgICAgICAgICAgZm9yZWdyb3VuZFNpemUgPSBGbG9hdFNpemUoY2xpcHBpbmdCb3guc2l6ZSgp KTsKLSAgICAgICAgICAgIGZvcmVncm91bmRPZmZzZXQgPSBjbGlwcGluZ0JveC5sb2NhdGlvbigp IC0gSW50UG9pbnQoKTsKKyAgICAgICAgICAgIGZvcmVncm91bmRPZmZzZXQgPSB0b1NpemUoY2xp cHBpbmdCb3gubG9jYXRpb24oKSk7CiAgICAgICAgIH0KIAogICAgICAgICBtX2ZvcmVncm91bmRM YXllci0+c2V0UG9zaXRpb24oZm9yZWdyb3VuZFBvc2l0aW9uKTsKQEAgLTc0Myw3ICs3NDMsNyBA QCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkK ICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50 KC1zY3JvbGxPZmZzZXQud2lkdGgoKSwgLXNjcm9sbE9mZnNldC5oZWlnaHQoKSkpOwogCiAgICAg ICAgIEludFNpemUgb2xkU2Nyb2xsaW5nTGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5v ZmZzZXRGcm9tUmVuZGVyZXIoKTsKLSAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0 RnJvbVJlbmRlcmVyKEludFBvaW50KCkgLSBwYWRkaW5nQm94LmxvY2F0aW9uKCkpOworICAgICAg ICBtX3Njcm9sbGluZ0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIoLXRvU2l6ZShwYWRkaW5n Qm94LmxvY2F0aW9uKCkpKTsKIAogICAgICAgICBib29sIHBhZGRpbmdCb3hPZmZzZXRDaGFuZ2Vk ID0gb2xkU2Nyb2xsaW5nTGF5ZXJPZmZzZXQgIT0gbV9zY3JvbGxpbmdMYXllci0+b2Zmc2V0RnJv bVJlbmRlcmVyKCk7CiAKQEAgLTc1MSw3ICs3NTEsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgaWYgKHNjcm9sbFNpemUg IT0gbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zaXplKCkgfHwgcGFkZGluZ0JveE9mZnNldENo YW5nZWQpCiAgICAgICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldE5lZWRzRGlz cGxheSgpOwogCi0gICAgICAgIEludFNpemUgc2Nyb2xsaW5nQ29udGVudHNPZmZzZXQgPSBwYWRk aW5nQm94LmxvY2F0aW9uKCkgLSBJbnRQb2ludCgpIC0gc2Nyb2xsT2Zmc2V0OworICAgICAgICBJ bnRTaXplIHNjcm9sbGluZ0NvbnRlbnRzT2Zmc2V0ID0gdG9TaXplKHBhZGRpbmdCb3gubG9jYXRp b24oKSAtIHNjcm9sbE9mZnNldCk7CiAgICAgICAgIGlmIChzY3JvbGxpbmdDb250ZW50c09mZnNl dCAhPSBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpIHx8IHNj cm9sbFNpemUgIT0gbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zaXplKCkpCiAgICAgICAgICAg ICBjb21wb3NpdG9yKCktPnNjcm9sbGluZ0xheWVyRGlkQ2hhbmdlKG1fb3duaW5nTGF5ZXIpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCmluZGV4IDVj ZDliNmVjOGM0YmMwN2Y5YTMxNDVlZGFkNDY2NzExOTcyODA4MTUuLjlhODZhZTRlYzRmMWEyYTY3 ZGIwMTFkMjM3YTM1OWY0ZjllYjU2NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0xpbmtIaWdobGlnaHQuY3BwCkBAIC0yMTQsNyArMjE0LDcgQEAgYm9vbCBMaW5rSGlnaGxpZ2h0 Ojpjb21wdXRlSGlnaGxpZ2h0TGF5ZXJQYXRoQW5kUG9zaXRpb24oUmVuZGVyTGF5ZXIqIGNvbXBv c2l0aW4KICAgICB9CiAKICAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0ID0gbmV3UGF0aC5ib3Vu ZGluZ1JlY3QoKTsKLSAgICBuZXdQYXRoLnRyYW5zbGF0ZShGbG9hdFBvaW50KCkgLSBib3VuZGlu Z1JlY3QubG9jYXRpb24oKSk7CisgICAgbmV3UGF0aC50cmFuc2xhdGUoLXRvRmxvYXRTaXplKGJv dW5kaW5nUmVjdC5sb2NhdGlvbigpKSk7CiAKICAgICBib29sIHBhdGhIYXNDaGFuZ2VkID0gIW1f cGF0aC5wbGF0Zm9ybVBhdGgoKSB8fCAhKCpuZXdQYXRoLnBsYXRmb3JtUGF0aCgpID09ICptX3Bh dGgucGxhdGZvcm1QYXRoKCkpOwogICAgIGlmIChwYXRoSGFzQ2hhbmdlZCkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKaW5kZXggNzkxNGYxZWViNjQxZDlm M2E0MWU3NWVmNDNmZWJkMGI1ZGIzNmI2Ny4uMDMzZTZlODZlZTFjYzEzZDZkNzkyM2YxN2NiZDk1 MjYwZGJhMTcyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJh bWVJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCkBAIC02MDIsNyArNjAyLDcgQEAgV2ViU2l6ZSBXZWJGcmFtZUltcGw6Om1pbmltdW1TY3Jv bGxPZmZzZXQoKSBjb25zdAogICAgIEZyYW1lVmlldyogdmlldyA9IGZyYW1lVmlldygpOwogICAg IGlmICghdmlldykKICAgICAgICAgcmV0dXJuIFdlYlNpemUoKTsKLSAgICByZXR1cm4gdmlldy0+ bWluaW11bVNjcm9sbFBvc2l0aW9uKCkgLSBJbnRQb2ludCgpOworICAgIHJldHVybiB0b1NpemUo dmlldy0+bWluaW11bVNjcm9sbFBvc2l0aW9uKCkpOwogfQogCiBXZWJTaXplIFdlYkZyYW1lSW1w bDo6bWF4aW11bVNjcm9sbE9mZnNldCgpIGNvbnN0CkBAIC02MTAsNyArNjEwLDcgQEAgV2ViU2l6 ZSBXZWJGcmFtZUltcGw6Om1heGltdW1TY3JvbGxPZmZzZXQoKSBjb25zdAogICAgIEZyYW1lVmll dyogdmlldyA9IGZyYW1lVmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIFdl YlNpemUoKTsKLSAgICByZXR1cm4gdmlldy0+bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgLSBJbnRQ b2ludCgpOworICAgIHJldHVybiB0b1NpemUodmlldy0+bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkp OwogfQogCiB2b2lkIFdlYkZyYW1lSW1wbDo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYlNpemUm IG9mZnNldCkK