137822 2014-10-17 09:36:29 -0700 [GTK] Improve zooming gesture positioning 2014-10-20 03:40:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137812 1 carlosg webkit-unassigned cgarcia commit-queue oldest_to_newest 1042381 0 carlosg 2014-10-17 09:36:29 -0700 I'm attaching a patch, on top of bug #137812 , that fixes the zooming gesture positioning on 2-finger interaction with WebKitGTK+ 1042382 1 240016 carlosg 2014-10-17 09:38:54 -0700 Created attachment 240016 Patch to improve zooming gesture look&feel 1042384 2 240016 cgarcia 2014-10-17 09:47:42 -0700 Comment on attachment 240016 Patch to improve zooming gesture look&feel View in context: https://bugs.webkit.org/attachment.cgi?id=240016&action=review This makes the zoom gesture work as expected, thanks! > Source/WebKit2/UIProcess/WebPageProxy.h:470 > + > + void getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& center); > #endif I would use a separate block since this is for text composition stuff. > Source/WebKit2/UIProcess/gtk/GestureController.cpp:33 > +#include "WebPageMessages.h" You shouldn't need this. > Source/WebKit2/WebProcess/WebPage/WebPage.h:581 > + > + void getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& result); > #endif Same here. > Source/WebKit2/WebProcess/WebPage/WebPage.messages.in:313 > + > + GetCenterForZoomGesture(WebCore::IntPoint centerInViewCoordinates) -> (WebCore::IntPoint center) > #endif Ditto. 1042385 3 240016 cgarcia 2014-10-17 09:52:46 -0700 Comment on attachment 240016 Patch to improve zooming gesture look&feel View in context: https://bugs.webkit.org/attachment.cgi?id=240016&action=review >> Source/WebKit2/UIProcess/WebPageProxy.h:470 >> #endif > > I would use a separate block since this is for text composition stuff. The block should probably also include HAVE(GTK_GESTURES) since this is only used when GTK gestures are supported. 1042386 4 240017 carlosg 2014-10-17 10:02:58 -0700 Created attachment 240017 Updated patch This updated patch applies all suggestions 1042389 5 240019 carlosg 2014-10-17 10:08:50 -0700 Created attachment 240019 Updated patch Another update version, wrap the implementations in #if/#endif too 1042770 6 240019 commit-queue 2014-10-20 03:39:57 -0700 Comment on attachment 240019 Updated patch Clearing flags on attachment: 240019 Committed r174882: <http://trac.webkit.org/changeset/174882> 1042771 7 commit-queue 2014-10-20 03:40:01 -0700 All reviewed patches have been landed. Closing bug. 240016 2014-10-17 09:38:54 -0700 2014-10-17 10:02:58 -0700 Patch to improve zooming gesture look&feel patch text/plain 8599 carlosg ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyODRiMjFkLi42NWE4MGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMTAtMTcgIENhcmxvcyBHYXJuYWNobyAgPGNhcmxvc2dAZ25vbWUub3JnPgorCisg ICAgICAgIFtHVEtdIEltcHJvdmUgem9vbWluZyBnZXN0dXJlIHBvc2l0aW9uaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc4MjIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0dXJlOjpjZW50 ZXIpOgorICAgICAgICAoV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1cmU6OmJl Z2luKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0dXJlOjpo YW5kbGVab29tKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0 dXJlOjpzY2FsZUNoYW5nZWQpOiBDYWxjdWxhdGUKKyAgICAgICAgdGhlIHByb3BlciB2aWV3IGNv b3JkaW5hdGVzIGZvciB0aGUgY3VycmVudCBvZmZzZXQvc2NhbGUsIGJhc2VkCisgICAgICAgIG9u IHRoZSBpbml0aWFsIGdlc3R1cmUgY2VudGVyIHBvaW50IGluIGRvY3VtZW50IGNvb3JkaW5hdGVz LCBhbmQKKyAgICAgICAgdGhlIGN1cnJlbnQgY2VudGVyL3NjYWxlLgorICAgICAgICAqIFVJUHJv Y2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dl YlBhZ2VQcm94eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2V0Q2Vu dGVyRm9yWm9vbUdlc3R1cmUpOiBBZGRlZC4gU3luY2hyb25vdXMKKyAgICAgICAgY2FsbCB0byBy ZXRyaWV2ZSB0aGUgem9vbSBnZXN0dXJlIGFuY2hvciBwb2ludCwgaW4gZG9jdW1lbnQgY29vcmRp bmF0ZXMuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjogQWRkZWQgc3R1Yi4KKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpnZXRDZW50ZXJGb3Jab29tR2VzdHVyZSk6IEFkZGVkLiBHZXR0ZXIg Zm9yIHRoZQorICAgICAgICB0cmFuc2xhdGVkIGNvb3JkaW5hdGVzIHVzZWQgYXMgdGhlIGFuY2hv ciBwb2ludCBvZiB0aGUgem9vbSBnZXN0dXJlLgorCiAyMDE0LTEwLTE3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgaW5pdGlh bCBnZXN0dXJlcyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK aW5kZXggYzBjMGEzNC4uYzE3ZjEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaApAQCAtNDY1LDYgKzQ2NSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENvbXBvc2l0 aW9uKGNvbnN0IFN0cmluZyYgdGV4dCwgVmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJs aW5lPiB1bmRlcmxpbmVzLCB1aW50NjRfdCBzZWxlY3Rpb25TdGFydCwgdWludDY0X3Qgc2VsZWN0 aW9uRW5kLCB1aW50NjRfdCByZXBsYWNlbWVudFJhbmdlU3RhcnQsIHVpbnQ2NF90IHJlcGxhY2Vt ZW50UmFuZ2VFbmQpOwogICAgIHZvaWQgY29uZmlybUNvbXBvc2l0aW9uKGNvbnN0IFN0cmluZyYg Y29tcG9zaXRpb25TdHJpbmcsIGludDY0X3Qgc2VsZWN0aW9uU3RhcnQsIGludDY0X3Qgc2VsZWN0 aW9uTGVuZ3RoKTsKICAgICB2b2lkIGNhbmNlbENvbXBvc2l0aW9uKCk7CisKKyAgICB2b2lkIGdl dENlbnRlckZvclpvb21HZXN0dXJlKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjZW50ZXJJblZp ZXdDb29yZGluYXRlcywgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlcik7CiAjZW5kaWYKIAogI2lm IFBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsv R2VzdHVyZUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0 dXJlQ29udHJvbGxlci5jcHAKaW5kZXggMTI4ODA2OC4uYTdkZDg3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJvbGxlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJvbGxlci5jcHAKQEAgLTMwLDYg KzMwLDcgQEAKIAogI2luY2x1ZGUgIk5hdGl2ZVdlYk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJO YXRpdmVXZWJXaGVlbEV2ZW50LmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW5j bHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFBvaW50Lmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9TY3JvbGxiYXIuaD4KQEAgLTE3MywyNiArMTc0LDQxIEBAIEdlc3R1 cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6RHJhZ0dlc3R1cmUoV2ViUGFnZVByb3h5JiBwYWdl KQogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX2dlc3R1cmUuZ2V0KCksICJlbmQiLCBH X0NBTExCQUNLKGVuZCksIHRoaXMpOwogfQogCitJbnRQb2ludCBHZXN0dXJlQ29udHJvbGxlcjo6 Wm9vbUdlc3R1cmU6OmNlbnRlcigpIGNvbnN0Cit7CisgICAgZG91YmxlIHgsIHk7CisgICAgZ3Rr X2dlc3R1cmVfZ2V0X2JvdW5kaW5nX2JveF9jZW50ZXIobV9nZXN0dXJlLmdldCgpLCAmeCwgJnkp OworICAgIHJldHVybiBJbnRQb2ludCh4LCB5KTsKK30KKwogdm9pZCBHZXN0dXJlQ29udHJvbGxl cjo6Wm9vbUdlc3R1cmU6OmJlZ2luKFpvb21HZXN0dXJlKiB6b29tR2VzdHVyZSwgR2RrRXZlbnRT ZXF1ZW5jZSosIEd0a0dlc3R1cmUqIGdlc3R1cmUpCiB7CiAgICAgZ3RrX2dlc3R1cmVfc2V0X3N0 YXRlKGdlc3R1cmUsIEdUS19FVkVOVF9TRVFVRU5DRV9DTEFJTUVEKTsKIAogICAgIHpvb21HZXN0 dXJlLT5tX2luaXRpYWxTY2FsZSA9IHpvb21HZXN0dXJlLT5tX3BhZ2UucGFnZVNjYWxlRmFjdG9y KCk7Ci0gICAgZG91YmxlIHgsIHk7Ci0gICAgZ3RrX2dlc3R1cmVfZ2V0X2JvdW5kaW5nX2JveF9j ZW50ZXIoZ2VzdHVyZSwgJngsICZ5KTsKLSAgICB6b29tR2VzdHVyZS0+bV9wb2ludCA9IEludFBv aW50KHgsIHkpOworICAgIHpvb21HZXN0dXJlLT5tX3BhZ2UuZ2V0Q2VudGVyRm9yWm9vbUdlc3R1 cmUoem9vbUdlc3R1cmUtPmNlbnRlcigpLCB6b29tR2VzdHVyZS0+bV9pbml0aWFsUG9pbnQpOwor fQorCit2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6aGFuZGxlWm9vbSgpCit7 CisgICAgSW50UG9pbnQgc2NhbGVkT3JpZ2luT2Zmc2V0ID0gbV92aWV3UG9pbnQ7CisgICAgc2Nh bGVkT3JpZ2luT2Zmc2V0LnNjYWxlKDEgLyBtX3NjYWxlLCAxIC8gbV9zY2FsZSk7CisKKyAgICBJ bnRQb2ludCBuZXdPcmlnaW4gPSBtX2luaXRpYWxQb2ludDsKKyAgICBuZXdPcmlnaW4ubW92ZUJ5 KC1zY2FsZWRPcmlnaW5PZmZzZXQpOworICAgIG5ld09yaWdpbi5zY2FsZShtX3NjYWxlLCBtX3Nj YWxlKTsKKworICAgIG1fcGFnZS5zY2FsZVBhZ2UobV9zY2FsZSwgbmV3T3JpZ2luKTsKIH0KIAog dm9pZCBHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1cmU6OnNjYWxlQ2hhbmdlZChab29tR2Vz dHVyZSogem9vbUdlc3R1cmUsIGRvdWJsZSBzY2FsZSwgR3RrR2VzdHVyZSopCiB7CiAgICAgem9v bUdlc3R1cmUtPm1fc2NhbGUgPSB6b29tR2VzdHVyZS0+bV9pbml0aWFsU2NhbGUgKiBzY2FsZTsK KyAgICB6b29tR2VzdHVyZS0+bV92aWV3UG9pbnQgPSB6b29tR2VzdHVyZS0+Y2VudGVyKCk7CiAg ICAgaWYgKHpvb21HZXN0dXJlLT5tX2lkbGUuaXNTY2hlZHVsZWQoKSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgem9vbUdlc3R1cmUtPm1faWRsZS5zY2hlZHVsZSgiW1dlYktpdF0gWm9vbSBHZXN0 dXJlIElkbGUiLCBbem9vbUdlc3R1cmVdKCkgewotICAgICAgICAvLyBGSVhNRTogWm9vbWVkIGFy ZWEgaXMgbm90IGNvcnJlY3RseSBjZW50ZXJlZC4KLSAgICAgICAgem9vbUdlc3R1cmUtPm1fcGFn ZS5zY2FsZVBhZ2Uoem9vbUdlc3R1cmUtPm1fc2NhbGUsIHpvb21HZXN0dXJlLT5tX3BvaW50KTsK LSAgICB9KTsKKyAgICB6b29tR2VzdHVyZS0+bV9pZGxlLnNjaGVkdWxlKCJbV2ViS2l0XSBab29t IEdlc3R1cmUgSWRsZSIsIHN0ZDo6YmluZCgmR2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0dXJl OjpoYW5kbGVab29tLCB6b29tR2VzdHVyZSkpOwogfQogCiBHZXN0dXJlQ29udHJvbGxlcjo6Wm9v bUdlc3R1cmU6Olpvb21HZXN0dXJlKFdlYlBhZ2VQcm94eSYgcGFnZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaAppbmRleCBmMGFmYzAzLi5l NmM1MTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVD b250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29u dHJvbGxlci5oCkBAIC04OCwxMiArODgsMTYgQEAgcHJpdmF0ZToKICAgICAgICAgWm9vbUdlc3R1 cmUoV2ViUGFnZVByb3h5Jik7CiAKICAgICBwcml2YXRlOgorICAgICAgICBXZWJDb3JlOjpJbnRQ b2ludCBjZW50ZXIoKSBjb25zdDsKKyAgICAgICAgdm9pZCBoYW5kbGVab29tKCk7CisKICAgICAg ICAgc3RhdGljIHZvaWQgYmVnaW4oWm9vbUdlc3R1cmUqLCBHZGtFdmVudFNlcXVlbmNlKiwgR3Rr R2VzdHVyZSopOwogICAgICAgICBzdGF0aWMgdm9pZCBzY2FsZUNoYW5nZWQoWm9vbUdlc3R1cmUq LCBkb3VibGUgc2NhbGUsIEd0a0dlc3R1cmUqKTsKIAogICAgICAgICBnZG91YmxlIG1faW5pdGlh bFNjYWxlOwogICAgICAgICBnZG91YmxlIG1fc2NhbGU7Ci0gICAgICAgIFdlYkNvcmU6OkludFBv aW50IG1fcG9pbnQ7CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IG1faW5pdGlhbFBvaW50Owor ICAgICAgICBXZWJDb3JlOjpJbnRQb2ludCBtX3ZpZXdQb2ludDsKICAgICAgICAgR01haW5Mb29w U291cmNlIG1faWRsZTsKICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZ3RrL1dlYlBhZ2VQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYlBhZ2VQcm94eUd0ay5jcHAKaW5kZXggNjM2NDJiNi4uMWE1NTMyYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQYWdlUHJveHlHdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcApAQCAtMTQy LDQgKzE0Miw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5n V2luZG93SWQodWludDY0X3QgbmF0aXZlV2luZG93SWQpCiB9CiAjZW5kaWYKIAordm9pZCBXZWJQ YWdlUHJveHk6OmdldENlbnRlckZvclpvb21HZXN0dXJlKGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JiBjZW50ZXJJblZpZXdDb29yZGluYXRlcywgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlcikKK3sK KyAgICBwcm9jZXNzKCkuc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldENlbnRlckZvclpv b21HZXN0dXJlKGNlbnRlckluVmlld0Nvb3JkaW5hdGVzKSwgTWVzc2FnZXM6OldlYlBhZ2U6Okdl dENlbnRlckZvclpvb21HZXN0dXJlOjpSZXBseShjZW50ZXIpLCBtX3BhZ2VJRCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKaW5kZXggODM4MWI4Yy4uZGQ1ZGY3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC01NzYsNiArNTc2LDggQEAgcHVibGljOgogICAg IHZvaWQgc2V0Q29tcG9zaXRpb24oY29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zdCBWZWN0b3I8V2Vi Q29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVzLCB1aW50NjRfdCBzZWxlY3Rp b25TdGFydCwgdWludDY0X3Qgc2VsZWN0aW9uRW5kLCB1aW50NjRfdCByZXBsYWNlbWVudFJhbmdl U3RhcnQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VMZW5ndGgpOwogICAgIHZvaWQgY29uZmly bUNvbXBvc2l0aW9uKGNvbnN0IFN0cmluZyYgdGV4dCwgaW50NjRfdCBzZWxlY3Rpb25TdGFydCwg aW50NjRfdCBzZWxlY3Rpb25MZW5ndGgpOwogICAgIHZvaWQgY2FuY2VsQ29tcG9zaXRpb24oKTsK KworICAgIHZvaWQgZ2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBXZWJDb3JlOjpJbnRQb2ludCYgcmVzdWx0KTsK ICNlbmRpZgogCiAgICAgdm9pZCBkaWRDaGFuZ2VTZWxlY3Rpb24oKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXgg ZTk5MjU0Yi4uMmNlMTcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTMwOCw2ICszMDgsOCBAQCBtZXNzYWdl cyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRDb21wb3NpdGlvbihTdHJpbmcg dGV4dCwgVmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPiB1bmRlcmxpbmVzLCB1 aW50NjRfdCBzZWxlY3Rpb25TdGFydCwgdWludDY0X3Qgc2VsZWN0aW9uRW5kLCB1aW50NjRfdCBy ZXBsYWNlbWVudFJhbmdlU3RhcnQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VFbmQpCiAgICAg Q29uZmlybUNvbXBvc2l0aW9uKFN0cmluZyB0ZXh0LCBpbnQ2NF90IHNlbGVjdGlvblN0YXJ0LCBp bnQ2NF90IHNlbGVjdGlvbkxlbmd0aCkKICAgICBDYW5jZWxDb21wb3NpdGlvbigpCisKKyAgICBH ZXRDZW50ZXJGb3Jab29tR2VzdHVyZShXZWJDb3JlOjpJbnRQb2ludCBjZW50ZXJJblZpZXdDb29y ZGluYXRlcykgLT4gKFdlYkNvcmU6OkludFBvaW50IGNlbnRlcikKICNlbmRpZgogCiAjaWYgUExB VEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvZ3RrL1dlYlBhZ2VHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2d0ay9XZWJQYWdlR3RrLmNwcAppbmRleCA0NTcyZDExLi5jMmZlOTE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKQEAg LTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0V2ZW50SGFuZGxlci5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvRm9jdXNDb250cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5o PgorI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9LZXli b2FyZEV2ZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9QYXN0ZWJvYXJkSGVscGVyLmg+CkBAIC0xODEsNCArMTgyLDExIEBAIFN0cmluZyBXZWJQYWdl OjpwbGF0Zm9ybVVzZXJBZ2VudChjb25zdCBVUkwmIHVybCkgY29uc3QKICAgICByZXR1cm4gV2Vi Q29yZTo6c3RhbmRhcmRVc2VyQWdlbnRGb3JVUkwodXJsKTsKIH0KIAordm9pZCBXZWJQYWdlOjpn ZXRDZW50ZXJGb3Jab29tR2VzdHVyZShjb25zdCBJbnRQb2ludCYgY2VudGVySW5WaWV3Q29vcmRp bmF0ZXMsIEludFBvaW50JiByZXN1bHQpCit7CisgICAgcmVzdWx0ID0gbWFpbkZyYW1lVmlldygp LT5yb290Vmlld1RvQ29udGVudHMoY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMpOworICAgIGRvdWJs ZSBzY2FsZSA9IG1fcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCk7CisgICAgcmVzdWx0LnNjYWxlKDEg LyBzY2FsZSwgMSAvIHNjYWxlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 240017 2014-10-17 10:02:58 -0700 2014-10-17 10:08:50 -0700 Updated patch patch text/plain 8011 carlosg ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyODRiMjFkLi5iMjUzZDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMTAtMTcgIENhcmxvcyBHYXJuYWNobyAgPGNhcmxvc2dAZ25vbWUub3JnPgorCisg ICAgICAgIFtHVEtdIEltcHJvdmUgem9vbWluZyBnZXN0dXJlIHBvc2l0aW9uaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc4MjIKKworICAgICAg ICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0dXJl OjpjZW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1 cmU6OmJlZ2luKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0 dXJlOjpoYW5kbGVab29tKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpv b21HZXN0dXJlOjpzY2FsZUNoYW5nZWQpOiBDYWxjdWxhdGUKKyAgICAgICAgdGhlIHByb3BlciB2 aWV3IGNvb3JkaW5hdGVzIGZvciB0aGUgY3VycmVudCBvZmZzZXQvc2NhbGUsIGJhc2VkCisgICAg ICAgIG9uIHRoZSBpbml0aWFsIGdlc3R1cmUgY2VudGVyIHBvaW50IGluIGRvY3VtZW50IGNvb3Jk aW5hdGVzLCBhbmQKKyAgICAgICAgdGhlIGN1cnJlbnQgY2VudGVyL3NjYWxlLgorICAgICAgICAq IFVJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYlBhZ2VQcm94eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUpOiBBZGRlZC4gU3luY2hyb25vdXMKKyAgICAgICAgY2Fs bCB0byByZXRyaWV2ZSB0aGUgem9vbSBnZXN0dXJlIGFuY2hvciBwb2ludCwgaW4gZG9jdW1lbnQg Y29vcmRpbmF0ZXMuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjogQWRkZWQgc3R1 Yi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRDZW50ZXJGb3Jab29tR2VzdHVyZSk6IEFkZGVkLiBH ZXR0ZXIgZm9yIHRoZQorICAgICAgICB0cmFuc2xhdGVkIGNvb3JkaW5hdGVzIHVzZWQgYXMgdGhl IGFuY2hvciBwb2ludCBvZiB0aGUgem9vbSBnZXN0dXJlLgorCiAyMDE0LTEwLTE3ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQg aW5pdGlhbCBnZXN0dXJlcyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKaW5kZXggYzBjMGEzNC4uMGY4ZmJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtNDcxLDYgKzQ3MSwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJ bnB1dE1ldGhvZFN0YXRlKGJvb2wgZW5hYmxlZCk7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNIChH VEspICYmIEhBVkUoR1RLX0dFU1RVUkVTKQorICAgIHZvaWQgZ2V0Q2VudGVyRm9yWm9vbUdlc3R1 cmUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBXZWJD b3JlOjpJbnRQb2ludCYgY2VudGVyKTsKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAg ICAgdm9pZCB3aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJl Y3QmIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9p bnQmIGFjY2Vzc2liaWxpdHlWaWV3Q29vcmRpbmF0ZXMpOwogICAgIHZvaWQgc2V0TWFpbkZyYW1l SXNTY3JvbGxhYmxlKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9HZXN0dXJlQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L0dlc3R1cmVDb250cm9sbGVyLmNwcAppbmRleCAxMjg4MDY4Li5lN2ZmZDlmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNwcApAQCAt MTczLDI2ICsxNzMsNDEgQEAgR2VzdHVyZUNvbnRyb2xsZXI6OkRyYWdHZXN0dXJlOjpEcmFnR2Vz dHVyZShXZWJQYWdlUHJveHkmIHBhZ2UpCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1f Z2VzdHVyZS5nZXQoKSwgImVuZCIsIEdfQ0FMTEJBQ0soZW5kKSwgdGhpcyk7CiB9CiAKK0ludFBv aW50IEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6Y2VudGVyKCkgY29uc3QKK3sKKyAg ICBkb3VibGUgeCwgeTsKKyAgICBndGtfZ2VzdHVyZV9nZXRfYm91bmRpbmdfYm94X2NlbnRlciht X2dlc3R1cmUuZ2V0KCksICZ4LCAmeSk7CisgICAgcmV0dXJuIEludFBvaW50KHgsIHkpOworfQor CiB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6YmVnaW4oWm9vbUdlc3R1cmUq IHpvb21HZXN0dXJlLCBHZGtFdmVudFNlcXVlbmNlKiwgR3RrR2VzdHVyZSogZ2VzdHVyZSkKIHsK ICAgICBndGtfZ2VzdHVyZV9zZXRfc3RhdGUoZ2VzdHVyZSwgR1RLX0VWRU5UX1NFUVVFTkNFX0NM QUlNRUQpOwogCiAgICAgem9vbUdlc3R1cmUtPm1faW5pdGlhbFNjYWxlID0gem9vbUdlc3R1cmUt Pm1fcGFnZS5wYWdlU2NhbGVGYWN0b3IoKTsKLSAgICBkb3VibGUgeCwgeTsKLSAgICBndGtfZ2Vz dHVyZV9nZXRfYm91bmRpbmdfYm94X2NlbnRlcihnZXN0dXJlLCAmeCwgJnkpOwotICAgIHpvb21H ZXN0dXJlLT5tX3BvaW50ID0gSW50UG9pbnQoeCwgeSk7CisgICAgem9vbUdlc3R1cmUtPm1fcGFn ZS5nZXRDZW50ZXJGb3Jab29tR2VzdHVyZSh6b29tR2VzdHVyZS0+Y2VudGVyKCksIHpvb21HZXN0 dXJlLT5tX2luaXRpYWxQb2ludCk7Cit9CisKK3ZvaWQgR2VzdHVyZUNvbnRyb2xsZXI6Olpvb21H ZXN0dXJlOjpoYW5kbGVab29tKCkKK3sKKyAgICBJbnRQb2ludCBzY2FsZWRPcmlnaW5PZmZzZXQg PSBtX3ZpZXdQb2ludDsKKyAgICBzY2FsZWRPcmlnaW5PZmZzZXQuc2NhbGUoMSAvIG1fc2NhbGUs IDEgLyBtX3NjYWxlKTsKKworICAgIEludFBvaW50IG5ld09yaWdpbiA9IG1faW5pdGlhbFBvaW50 OworICAgIG5ld09yaWdpbi5tb3ZlQnkoLXNjYWxlZE9yaWdpbk9mZnNldCk7CisgICAgbmV3T3Jp Z2luLnNjYWxlKG1fc2NhbGUsIG1fc2NhbGUpOworCisgICAgbV9wYWdlLnNjYWxlUGFnZShtX3Nj YWxlLCBuZXdPcmlnaW4pOwogfQogCiB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVy ZTo6c2NhbGVDaGFuZ2VkKFpvb21HZXN0dXJlKiB6b29tR2VzdHVyZSwgZG91YmxlIHNjYWxlLCBH dGtHZXN0dXJlKikKIHsKICAgICB6b29tR2VzdHVyZS0+bV9zY2FsZSA9IHpvb21HZXN0dXJlLT5t X2luaXRpYWxTY2FsZSAqIHNjYWxlOworICAgIHpvb21HZXN0dXJlLT5tX3ZpZXdQb2ludCA9IHpv b21HZXN0dXJlLT5jZW50ZXIoKTsKICAgICBpZiAoem9vbUdlc3R1cmUtPm1faWRsZS5pc1NjaGVk dWxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICB6b29tR2VzdHVyZS0+bV9pZGxlLnNjaGVk dWxlKCJbV2ViS2l0XSBab29tIEdlc3R1cmUgSWRsZSIsIFt6b29tR2VzdHVyZV0oKSB7Ci0gICAg ICAgIC8vIEZJWE1FOiBab29tZWQgYXJlYSBpcyBub3QgY29ycmVjdGx5IGNlbnRlcmVkLgotICAg ICAgICB6b29tR2VzdHVyZS0+bV9wYWdlLnNjYWxlUGFnZSh6b29tR2VzdHVyZS0+bV9zY2FsZSwg em9vbUdlc3R1cmUtPm1fcG9pbnQpOwotICAgIH0pOworICAgIHpvb21HZXN0dXJlLT5tX2lkbGUu c2NoZWR1bGUoIltXZWJLaXRdIFpvb20gR2VzdHVyZSBJZGxlIiwgc3RkOjpiaW5kKCZHZXN0dXJl Q29udHJvbGxlcjo6Wm9vbUdlc3R1cmU6OmhhbmRsZVpvb20sIHpvb21HZXN0dXJlKSk7CiB9CiAK IEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6Wm9vbUdlc3R1cmUoV2ViUGFnZVByb3h5 JiBwYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJl Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJv bGxlci5oCmluZGV4IGYwYWZjMDMuLmU2YzUxMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmgKQEAgLTg4LDEyICs4OCwxNiBAQCBwcml2 YXRlOgogICAgICAgICBab29tR2VzdHVyZShXZWJQYWdlUHJveHkmKTsKIAogICAgIHByaXZhdGU6 CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IGNlbnRlcigpIGNvbnN0OworICAgICAgICB2b2lk IGhhbmRsZVpvb20oKTsKKwogICAgICAgICBzdGF0aWMgdm9pZCBiZWdpbihab29tR2VzdHVyZSos IEdka0V2ZW50U2VxdWVuY2UqLCBHdGtHZXN0dXJlKik7CiAgICAgICAgIHN0YXRpYyB2b2lkIHNj YWxlQ2hhbmdlZChab29tR2VzdHVyZSosIGRvdWJsZSBzY2FsZSwgR3RrR2VzdHVyZSopOwogCiAg ICAgICAgIGdkb3VibGUgbV9pbml0aWFsU2NhbGU7CiAgICAgICAgIGdkb3VibGUgbV9zY2FsZTsK LSAgICAgICAgV2ViQ29yZTo6SW50UG9pbnQgbV9wb2ludDsKKyAgICAgICAgV2ViQ29yZTo6SW50 UG9pbnQgbV9pbml0aWFsUG9pbnQ7CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IG1fdmlld1Bv aW50OwogICAgICAgICBHTWFpbkxvb3BTb3VyY2UgbV9pZGxlOwogICAgIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcAppbmRleCA2MzY0 MmI2Li4xYTU1MzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YlBhZ2VQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQ YWdlUHJveHlHdGsuY3BwCkBAIC0xNDIsNCArMTQyLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNl dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdXaW5kb3dJZCh1aW50NjRfdCBuYXRpdmVXaW5kb3dJZCkK IH0KICNlbmRpZgogCit2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBXZWJDb3Jl OjpJbnRQb2ludCYgY2VudGVyKQoreworICAgIHByb2Nlc3MoKS5zZW5kU3luYyhNZXNzYWdlczo6 V2ViUGFnZTo6R2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUoY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMp LCBNZXNzYWdlczo6V2ViUGFnZTo6R2V0Q2VudGVyRm9yWm9vbUdlc3R1cmU6OlJlcGx5KGNlbnRl ciksIG1fcGFnZUlEKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA4MzgxYjhjLi44MmZlNDc1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTU3OCw2 ICs1NzgsMTAgQEAgcHVibGljOgogICAgIHZvaWQgY2FuY2VsQ29tcG9zaXRpb24oKTsKICNlbmRp ZgogCisjaWYgUExBVEZPUk0gKEdUSykgJiYgSEFWRShHVEtfR0VTVFVSRVMpCisgICAgdm9pZCBn ZXRDZW50ZXJGb3Jab29tR2VzdHVyZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2VudGVySW5W aWV3Q29vcmRpbmF0ZXMsIFdlYkNvcmU6OkludFBvaW50JiByZXN1bHQpOworI2VuZGlmCisKICAg ICB2b2lkIGRpZENoYW5nZVNlbGVjdGlvbigpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCmluZGV4IGU5OTI1NGIuLjNmY2IyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0zMTAsNiArMzEwLDEw IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogICAgIENhbmNlbENvbXBv c2l0aW9uKCkKICNlbmRpZgogCisjaWYgUExBVEZPUk0gKEdUSykgJiYgSEFWRShHVEtfR0VTVFVS RVMpCisgICAgR2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUoV2ViQ29yZTo6SW50UG9pbnQgY2VudGVy SW5WaWV3Q29vcmRpbmF0ZXMpIC0+IChXZWJDb3JlOjpJbnRQb2ludCBjZW50ZXIpCisjZW5kaWYK KwogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICMgQ29tcGxleCB0ZXh0IGlucHV0IHN1cHBvcnQg Zm9yIHBsdWctaW5zLgogICAgIFNlbmRDb21wbGV4VGV4dElucHV0VG9QbHVnaW4odWludDY0X3Qg cGx1Z2luQ29tcGxleFRleHRJbnB1dElkZW50aWZpZXIsIFN0cmluZyB0ZXh0SW5wdXQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdlR3RrLmNw cAppbmRleCA0NTcyZDExLi5jMmZlOTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNp bmNsdWRlIDxXZWJDb3JlL0V2ZW50SGFuZGxlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9jdXND b250cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgorI2luY2x1ZGUgPFdlYkNv cmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9LZXlib2FyZEV2ZW50Lmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYXN0ZWJvYXJkSGVscGVy Lmg+CkBAIC0xODEsNCArMTgyLDExIEBAIFN0cmluZyBXZWJQYWdlOjpwbGF0Zm9ybVVzZXJBZ2Vu dChjb25zdCBVUkwmIHVybCkgY29uc3QKICAgICByZXR1cm4gV2ViQ29yZTo6c3RhbmRhcmRVc2Vy QWdlbnRGb3JVUkwodXJsKTsKIH0KIAordm9pZCBXZWJQYWdlOjpnZXRDZW50ZXJGb3Jab29tR2Vz dHVyZShjb25zdCBJbnRQb2ludCYgY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMsIEludFBvaW50JiBy ZXN1bHQpCit7CisgICAgcmVzdWx0ID0gbWFpbkZyYW1lVmlldygpLT5yb290Vmlld1RvQ29udGVu dHMoY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMpOworICAgIGRvdWJsZSBzY2FsZSA9IG1fcGFnZS0+ cGFnZVNjYWxlRmFjdG9yKCk7CisgICAgcmVzdWx0LnNjYWxlKDEgLyBzY2FsZSwgMSAvIHNjYWxl KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 240019 2014-10-17 10:08:50 -0700 2014-10-20 03:39:57 -0700 Updated patch patch text/plain 8077 carlosg ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyODRiMjFkLi5iMjUzZDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMTAtMTcgIENhcmxvcyBHYXJuYWNobyAgPGNhcmxvc2dAZ25vbWUub3JnPgorCisg ICAgICAgIFtHVEtdIEltcHJvdmUgem9vbWluZyBnZXN0dXJlIHBvc2l0aW9uaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc4MjIKKworICAgICAg ICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0dXJl OjpjZW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1 cmU6OmJlZ2luKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpvb21HZXN0 dXJlOjpoYW5kbGVab29tKToKKyAgICAgICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6Olpv b21HZXN0dXJlOjpzY2FsZUNoYW5nZWQpOiBDYWxjdWxhdGUKKyAgICAgICAgdGhlIHByb3BlciB2 aWV3IGNvb3JkaW5hdGVzIGZvciB0aGUgY3VycmVudCBvZmZzZXQvc2NhbGUsIGJhc2VkCisgICAg ICAgIG9uIHRoZSBpbml0aWFsIGdlc3R1cmUgY2VudGVyIHBvaW50IGluIGRvY3VtZW50IGNvb3Jk aW5hdGVzLCBhbmQKKyAgICAgICAgdGhlIGN1cnJlbnQgY2VudGVyL3NjYWxlLgorICAgICAgICAq IFVJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYlBhZ2VQcm94eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUpOiBBZGRlZC4gU3luY2hyb25vdXMKKyAgICAgICAgY2Fs bCB0byByZXRyaWV2ZSB0aGUgem9vbSBnZXN0dXJlIGFuY2hvciBwb2ludCwgaW4gZG9jdW1lbnQg Y29vcmRpbmF0ZXMuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjogQWRkZWQgc3R1 Yi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRDZW50ZXJGb3Jab29tR2VzdHVyZSk6IEFkZGVkLiBH ZXR0ZXIgZm9yIHRoZQorICAgICAgICB0cmFuc2xhdGVkIGNvb3JkaW5hdGVzIHVzZWQgYXMgdGhl IGFuY2hvciBwb2ludCBvZiB0aGUgem9vbSBnZXN0dXJlLgorCiAyMDE0LTEwLTE3ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQg aW5pdGlhbCBnZXN0dXJlcyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKaW5kZXggYzBjMGEzNC4uMGY4ZmJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtNDcxLDYgKzQ3MSwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJ bnB1dE1ldGhvZFN0YXRlKGJvb2wgZW5hYmxlZCk7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNIChH VEspICYmIEhBVkUoR1RLX0dFU1RVUkVTKQorICAgIHZvaWQgZ2V0Q2VudGVyRm9yWm9vbUdlc3R1 cmUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBXZWJD b3JlOjpJbnRQb2ludCYgY2VudGVyKTsKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAg ICAgdm9pZCB3aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJl Y3QmIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9p bnQmIGFjY2Vzc2liaWxpdHlWaWV3Q29vcmRpbmF0ZXMpOwogICAgIHZvaWQgc2V0TWFpbkZyYW1l SXNTY3JvbGxhYmxlKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9HZXN0dXJlQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L0dlc3R1cmVDb250cm9sbGVyLmNwcAppbmRleCAxMjg4MDY4Li5lN2ZmZDlmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNwcApAQCAt MTczLDI2ICsxNzMsNDEgQEAgR2VzdHVyZUNvbnRyb2xsZXI6OkRyYWdHZXN0dXJlOjpEcmFnR2Vz dHVyZShXZWJQYWdlUHJveHkmIHBhZ2UpCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1f Z2VzdHVyZS5nZXQoKSwgImVuZCIsIEdfQ0FMTEJBQ0soZW5kKSwgdGhpcyk7CiB9CiAKK0ludFBv aW50IEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6Y2VudGVyKCkgY29uc3QKK3sKKyAg ICBkb3VibGUgeCwgeTsKKyAgICBndGtfZ2VzdHVyZV9nZXRfYm91bmRpbmdfYm94X2NlbnRlciht X2dlc3R1cmUuZ2V0KCksICZ4LCAmeSk7CisgICAgcmV0dXJuIEludFBvaW50KHgsIHkpOworfQor CiB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6YmVnaW4oWm9vbUdlc3R1cmUq IHpvb21HZXN0dXJlLCBHZGtFdmVudFNlcXVlbmNlKiwgR3RrR2VzdHVyZSogZ2VzdHVyZSkKIHsK ICAgICBndGtfZ2VzdHVyZV9zZXRfc3RhdGUoZ2VzdHVyZSwgR1RLX0VWRU5UX1NFUVVFTkNFX0NM QUlNRUQpOwogCiAgICAgem9vbUdlc3R1cmUtPm1faW5pdGlhbFNjYWxlID0gem9vbUdlc3R1cmUt Pm1fcGFnZS5wYWdlU2NhbGVGYWN0b3IoKTsKLSAgICBkb3VibGUgeCwgeTsKLSAgICBndGtfZ2Vz dHVyZV9nZXRfYm91bmRpbmdfYm94X2NlbnRlcihnZXN0dXJlLCAmeCwgJnkpOwotICAgIHpvb21H ZXN0dXJlLT5tX3BvaW50ID0gSW50UG9pbnQoeCwgeSk7CisgICAgem9vbUdlc3R1cmUtPm1fcGFn ZS5nZXRDZW50ZXJGb3Jab29tR2VzdHVyZSh6b29tR2VzdHVyZS0+Y2VudGVyKCksIHpvb21HZXN0 dXJlLT5tX2luaXRpYWxQb2ludCk7Cit9CisKK3ZvaWQgR2VzdHVyZUNvbnRyb2xsZXI6Olpvb21H ZXN0dXJlOjpoYW5kbGVab29tKCkKK3sKKyAgICBJbnRQb2ludCBzY2FsZWRPcmlnaW5PZmZzZXQg PSBtX3ZpZXdQb2ludDsKKyAgICBzY2FsZWRPcmlnaW5PZmZzZXQuc2NhbGUoMSAvIG1fc2NhbGUs IDEgLyBtX3NjYWxlKTsKKworICAgIEludFBvaW50IG5ld09yaWdpbiA9IG1faW5pdGlhbFBvaW50 OworICAgIG5ld09yaWdpbi5tb3ZlQnkoLXNjYWxlZE9yaWdpbk9mZnNldCk7CisgICAgbmV3T3Jp Z2luLnNjYWxlKG1fc2NhbGUsIG1fc2NhbGUpOworCisgICAgbV9wYWdlLnNjYWxlUGFnZShtX3Nj YWxlLCBuZXdPcmlnaW4pOwogfQogCiB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVy ZTo6c2NhbGVDaGFuZ2VkKFpvb21HZXN0dXJlKiB6b29tR2VzdHVyZSwgZG91YmxlIHNjYWxlLCBH dGtHZXN0dXJlKikKIHsKICAgICB6b29tR2VzdHVyZS0+bV9zY2FsZSA9IHpvb21HZXN0dXJlLT5t X2luaXRpYWxTY2FsZSAqIHNjYWxlOworICAgIHpvb21HZXN0dXJlLT5tX3ZpZXdQb2ludCA9IHpv b21HZXN0dXJlLT5jZW50ZXIoKTsKICAgICBpZiAoem9vbUdlc3R1cmUtPm1faWRsZS5pc1NjaGVk dWxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICB6b29tR2VzdHVyZS0+bV9pZGxlLnNjaGVk dWxlKCJbV2ViS2l0XSBab29tIEdlc3R1cmUgSWRsZSIsIFt6b29tR2VzdHVyZV0oKSB7Ci0gICAg ICAgIC8vIEZJWE1FOiBab29tZWQgYXJlYSBpcyBub3QgY29ycmVjdGx5IGNlbnRlcmVkLgotICAg ICAgICB6b29tR2VzdHVyZS0+bV9wYWdlLnNjYWxlUGFnZSh6b29tR2VzdHVyZS0+bV9zY2FsZSwg em9vbUdlc3R1cmUtPm1fcG9pbnQpOwotICAgIH0pOworICAgIHpvb21HZXN0dXJlLT5tX2lkbGUu c2NoZWR1bGUoIltXZWJLaXRdIFpvb20gR2VzdHVyZSBJZGxlIiwgc3RkOjpiaW5kKCZHZXN0dXJl Q29udHJvbGxlcjo6Wm9vbUdlc3R1cmU6OmhhbmRsZVpvb20sIHpvb21HZXN0dXJlKSk7CiB9CiAK IEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6Wm9vbUdlc3R1cmUoV2ViUGFnZVByb3h5 JiBwYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJl Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJv bGxlci5oCmluZGV4IGYwYWZjMDMuLmU2YzUxMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmgKQEAgLTg4LDEyICs4OCwxNiBAQCBwcml2 YXRlOgogICAgICAgICBab29tR2VzdHVyZShXZWJQYWdlUHJveHkmKTsKIAogICAgIHByaXZhdGU6 CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IGNlbnRlcigpIGNvbnN0OworICAgICAgICB2b2lk IGhhbmRsZVpvb20oKTsKKwogICAgICAgICBzdGF0aWMgdm9pZCBiZWdpbihab29tR2VzdHVyZSos IEdka0V2ZW50U2VxdWVuY2UqLCBHdGtHZXN0dXJlKik7CiAgICAgICAgIHN0YXRpYyB2b2lkIHNj YWxlQ2hhbmdlZChab29tR2VzdHVyZSosIGRvdWJsZSBzY2FsZSwgR3RrR2VzdHVyZSopOwogCiAg ICAgICAgIGdkb3VibGUgbV9pbml0aWFsU2NhbGU7CiAgICAgICAgIGdkb3VibGUgbV9zY2FsZTsK LSAgICAgICAgV2ViQ29yZTo6SW50UG9pbnQgbV9wb2ludDsKKyAgICAgICAgV2ViQ29yZTo6SW50 UG9pbnQgbV9pbml0aWFsUG9pbnQ7CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IG1fdmlld1Bv aW50OwogICAgICAgICBHTWFpbkxvb3BTb3VyY2UgbV9pZGxlOwogICAgIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcAppbmRleCA2MzY0 MmI2Li5mNjI5N2U2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJQYWdlUHJveHlHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2Vi UGFnZVByb3h5R3RrLmNwcApAQCAtMTQyLDQgKzE0MiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1dpbmRvd0lkKHVpbnQ2NF90IG5hdGl2ZVdpbmRvd0lk KQogfQogI2VuZGlmCiAKKyNpZiBIQVZFKEdUS19HRVNUVVJFUykKK3ZvaWQgV2ViUGFnZVByb3h5 OjpnZXRDZW50ZXJGb3Jab29tR2VzdHVyZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2VudGVy SW5WaWV3Q29vcmRpbmF0ZXMsIFdlYkNvcmU6OkludFBvaW50JiBjZW50ZXIpCit7CisgICAgcHJv Y2VzcygpLnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDZW50ZXJGb3Jab29tR2VzdHVy ZShjZW50ZXJJblZpZXdDb29yZGluYXRlcyksIE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDZW50ZXJG b3Jab29tR2VzdHVyZTo6UmVwbHkoY2VudGVyKSwgbV9wYWdlSUQpOworfQorI2VuZGlmCisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKaW5kZXggODM4MWI4Yy4uODJmZTQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC01NzgsNiArNTc4LDEwIEBAIHB1YmxpYzoKICAg ICB2b2lkIGNhbmNlbENvbXBvc2l0aW9uKCk7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNIChHVEsp ICYmIEhBVkUoR1RLX0dFU1RVUkVTKQorICAgIHZvaWQgZ2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBXZWJDb3Jl OjpJbnRQb2ludCYgcmVzdWx0KTsKKyNlbmRpZgorCiAgICAgdm9pZCBkaWRDaGFuZ2VTZWxlY3Rp b24oKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCBlOTkyNTRiLi4zZmNi MjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5tZXNzYWdlcy5pbgpAQCAtMzEwLDYgKzMxMCwxMCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdl IExlZ2FjeVJlY2VpdmVyIHsKICAgICBDYW5jZWxDb21wb3NpdGlvbigpCiAjZW5kaWYKIAorI2lm IFBMQVRGT1JNIChHVEspICYmIEhBVkUoR1RLX0dFU1RVUkVTKQorICAgIEdldENlbnRlckZvclpv b21HZXN0dXJlKFdlYkNvcmU6OkludFBvaW50IGNlbnRlckluVmlld0Nvb3JkaW5hdGVzKSAtPiAo V2ViQ29yZTo6SW50UG9pbnQgY2VudGVyKQorI2VuZGlmCisKICNpZiBQTEFURk9STShDT0NPQSkK ICAgICAjIENvbXBsZXggdGV4dCBpbnB1dCBzdXBwb3J0IGZvciBwbHVnLWlucy4KICAgICBTZW5k Q29tcGxleFRleHRJbnB1dFRvUGx1Z2luKHVpbnQ2NF90IHBsdWdpbkNvbXBsZXhUZXh0SW5wdXRJ ZGVudGlmaWVyLCBTdHJpbmcgdGV4dElucHV0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdlR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKaW5kZXggNDU3MmQxMS4uNGI1MWY1 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQ YWdlR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dl YlBhZ2VHdGsuY3BwCkBAIC0zNyw2ICszNyw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9FdmVudEhh bmRsZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZvY3VzQ29udHJvbGxlci5oPgogI2luY2x1ZGUg PFdlYkNvcmUvRnJhbWUuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvS2V5Ym9hcmRFdmVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgog I2luY2x1ZGUgPFdlYkNvcmUvUGFzdGVib2FyZEhlbHBlci5oPgpAQCAtMTgxLDQgKzE4MiwxMyBA QCBTdHJpbmcgV2ViUGFnZTo6cGxhdGZvcm1Vc2VyQWdlbnQoY29uc3QgVVJMJiB1cmwpIGNvbnN0 CiAgICAgcmV0dXJuIFdlYkNvcmU6OnN0YW5kYXJkVXNlckFnZW50Rm9yVVJMKHVybCk7CiB9CiAK KyNpZiBIQVZFKEdUS19HRVNUVVJFUykKK3ZvaWQgV2ViUGFnZTo6Z2V0Q2VudGVyRm9yWm9vbUdl c3R1cmUoY29uc3QgSW50UG9pbnQmIGNlbnRlckluVmlld0Nvb3JkaW5hdGVzLCBJbnRQb2ludCYg cmVzdWx0KQoreworICAgIHJlc3VsdCA9IG1haW5GcmFtZVZpZXcoKS0+cm9vdFZpZXdUb0NvbnRl bnRzKGNlbnRlckluVmlld0Nvb3JkaW5hdGVzKTsKKyAgICBkb3VibGUgc2NhbGUgPSBtX3BhZ2Ut PnBhZ2VTY2FsZUZhY3RvcigpOworICAgIHJlc3VsdC5zY2FsZSgxIC8gc2NhbGUsIDEgLyBzY2Fs ZSk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==