128025 2014-01-31 15:13:06 -0800 [wk2] PlatformCALayerRemoteCustom doesn't work on iOS 2014-01-31 16:30:05 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca benjamin cmarcelo commit-queue eric.carlson jer.noble jonlee simon.fraser oldest_to_newest 974503 0 thorton 2014-01-31 15:13:06 -0800 It turns out that CAContext remote hosting is slightly different on iOS. <rdar://problem/15950271> 974514 1 222860 thorton 2014-01-31 15:44:39 -0800 Created attachment 222860 patch 974519 2 222860 andersca 2014-01-31 15:52:25 -0800 Comment on attachment 222860 patch View in context: https://bugs.webkit.org/attachment.cgi?id=222860&action=review > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:556 > case LayerHostingModeInWindowServer: Didn't you remove this enum? 974520 3 222860 thorton 2014-01-31 15:53:24 -0800 Comment on attachment 222860 patch View in context: https://bugs.webkit.org/attachment.cgi?id=222860&action=review >> Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:556 >> case LayerHostingModeInWindowServer: > > Didn't you remove this enum? yuuuup, will fix. thanks! 974530 4 thorton 2014-01-31 16:30:05 -0800 http://trac.webkit.org/changeset/163218 222860 2014-01-31 15:44:39 -0800 2014-01-31 15:53:24 -0800 patch wsh.diff text/plain 18852 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZGRkODliZS4uOWY2MjhiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0wMS0zMSAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbd2syXSBQ bGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0b20gZG9lc24ndCB3b3JrIG9uIGlPUworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MDI1CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNTk1MDI3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorICAgICAgICBSZW5hbWUgSEFWRV9M QVlFUl9IT1NUSU5HX0lOX1dJTkRPV19TRVJWRVIgdG8gSEFWRV9PVVRfT0ZfUFJPQ0VTU19MQVlF Ul9IT1NUSU5HCisgICAgICAgIGFuZCBtYWtlIGl0IHRydWUgb24gaU9TLgorCiAyMDE0LTAxLTMw ICBBbmRyZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0aGUg QUNDRUxFUkFURURfQ09NUE9TSVRJTkcgZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv UGxhdGZvcm0uaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKaW5kZXggZGQxMTJlMy4uYTg5 NjUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC00NzcsNiArNDc3LDEwIEBACiAKICNlbmRpZgogCisjaWYg UExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlO X1JFUVVJUkVEID49IDEwODApCisjZGVmaW5lIEhBVkVfT1VUX09GX1BST0NFU1NfTEFZRVJfSE9T VElORyAxCisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykKIAog I2RlZmluZSBXVEZfVVNFX0FQUEtJVCAxCkBAIC00ODgsMTAgKzQ5Miw2IEBACiAjZGVmaW5lIFdU Rl9VU0VfUExVR0lOX0hPU1RfUFJPQ0VTUyAxCiAjZW5kaWYKIAotI2lmIF9fTUFDX09TX1hfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA4MAotI2RlZmluZSBIQVZFX0xBWUVSX0hPU1RJTkdfSU5f V0lORE9XX1NFUlZFUiAxCi0jZW5kaWYKLQogLyogT1MgWCBkZWZpbmVzIGEgc2VyaWVzIG9mIHBs YXRmb3JtIG1hY3JvcyBmb3IgZGVidWdnaW5nLiAqLwogLyogU29tZSBvZiB0aGVtIGFyZSByZWFs bHkgYW5ub3lpbmcgYmVjYXVzZSB0aGV5IHVzZSBjb21tb24gbmFtZXMgKGUuZy4gY2hlY2soKSku ICovCiAvKiBEaXNhYmxlIHRob3NlIG1hY3JvcyBzbyB0aGF0IHdlIGFyZSBub3QgbGltaXRlZCBp biBob3cgd2UgbmFtZSBtZXRob2RzIGFuZCBmdW5jdGlvbnMuICovCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5k ZXggZjg1MmM0OC4uNTRlNDE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisy MDE0LTAxLTMxICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAg ICAgIFt3azJdIFBsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbSBkb2Vzbid0IHdvcmsgb24gaU9T CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwMjUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1OTUwMjcxPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVkTmV0 c2NhcGVQbHVnaW5WaWV3Lm1tOgorICAgICAgICAoLVtXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZp ZXcgd2luZG93SG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcl0pOgorICAgICAgICBVc2UgdGhlIG5l dyBtYWNybyBuYW1lLgorCiAyMDE0LTAxLTMwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIHNlY3VyaXR5LWNoZWNrZWQgY2FzdCBmb3IgV2ViQ29yZTo6 Q2FjaGVkSW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVk L1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdp bnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbQppbmRleCA1NGEzZDQ4Li5m MjRkZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJI b3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lu cy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCkBAIC02MSw3ICs2MSw3IEBA IGV4dGVybiAiQyIgewogI2luY2x1ZGUgIldlYktpdFBsdWdpbkhvc3QuaCIKIH0KIAotI2lmIEhB VkUoTEFZRVJfSE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQorI2lmIEhBVkUoT1VUX09GX1BST0NF U1NfTEFZRVJfSE9TVElORykKIEBpbnRlcmZhY2UgTlNXaW5kb3cgKERldGFpbHMpCiAtIChCT09M KV9ob3N0c0xheWVyc0luV2luZG93U2VydmVyOwogQGVuZApAQCAtMTE0LDcgKzExNCw3IEBAIGV4 dGVybiAiQyIgewogCiAtIChCT09MKXdpbmRvd0hvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXIKIHsK LSNpZiBIQVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKKyNpZiBIQVZFKE9VVF9P Rl9QUk9DRVNTX0xBWUVSX0hPU1RJTkcpCiAgICAgcmV0dXJuIFtbW3NlbGYgd2ViVmlld10gd2lu ZG93XSBfaG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcl07CiAjZWxzZQogICAgIHJldHVybiBmYWxz ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCA5OGJlMTYwLi4yOWMyMmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDggKzEs NTMgQEAKKzIwMTQtMDEtMzEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CisKKyAgICAgICAgW3drMl0gUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tIGRvZXNuJ3Qgd29y ayBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyODAyNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU5NTAyNzE+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9tYWMvTGF5ZXJI b3N0aW5nQ29udGV4dC5oOgorICAgICAgICAqIFBsYXRmb3JtL21hYy9MYXllckhvc3RpbmdDb250 ZXh0Lm1tOgorICAgICAgICAoV2ViS2l0OjpMYXllckhvc3RpbmdDb250ZXh0OjpjcmVhdGVGb3JQ b3J0KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yRXh0 ZXJuYWxIb3N0aW5nUHJvY2Vzcyk6CisgICAgICAgIFVzZSB0aGUgbmV3IG1hY3JvIG5hbWUgKGlu IGEgbG90IG9mIHBsYWNlcykuCisgICAgICAgIFJlbmFtZSBMYXllckhvc3RpbmdDb250ZXh0Ojpj cmVhdGVGb3JXaW5kb3dTZXJ2ZXIoKSB0byBjcmVhdGVGb3JFeHRlcm5hbEhvc3RpbmdQcm9jZXNz KCkuCisgICAgICAgIERvbid0IHVzZSBXS0NBQ29udGV4dE1ha2VSZW1vdGVGb3JXaW5kb3dTZXJ2 ZXIgb24gaU9TLCBqdXN0IHVzZSB0aGUgQ0FDb250ZXh0CisgICAgICAgIFNQSSBkaXJlY3RseS4g V2UgZG9uJ3Qgd2FudCBvdXIgQ0FDb250ZXh0IHRvIGJlIGhpdCB0ZXN0ZWQgYmVjYXVzZSBpdCdz IHB1cmVseQorICAgICAgICBwcmVzZW50YXRpb25hbC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmg6CisgICAgICAgIGlPUyBhbHdheXMgaG9zdHMgbGF5 ZXJzIGluIGFuIGV4dGVybmFsIHByb2Nlc3MuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL21h Yy9QbHVnaW5Db250cm9sbGVyUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNv bnRyb2xsZXJQcm94eTo6dXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCk6CisgICAgICAgICogU2hh cmVkL0xheWVyVHJlZUNvbnRleHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdl Q2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnZpZXdMYXll ckhvc3RpbmdNb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgorICAgICAg ICAoV2ViS2l0OjpQYWdlQ2xpZW50Ojp2aWV3TGF5ZXJIb3N0aW5nTW9kZSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6V2ViUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3U3Rh dGVEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpOZXRzY2Fw ZVBsdWdpbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRz Y2FwZVBsdWdpbk1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmNvbXBv c2l0aW5nUmVuZGVyU2VydmVyUG9ydCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpzZXRMYXllckhvc3Rp bmdNb2RlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tLm1tOgorICAg ICAgICAoUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tOjpQbGF0Zm9ybUNBTGF5ZXJSZW1vdGVD dXN0b20pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjp1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KToKKyAgICAgICAgVXNlIGVudW0g Y2xhc3MgZm9yIExheWVySG9zdGluZ01vZGUgYW5kIHJlbmFtZSB0aGUgbWVtYmVycyB0byBJblBy b2Nlc3MgYW5kIE91dE9mUHJvY2Vzcy4KKwogMjAxNC0wMS0zMSAgQmV0aCBEYWtpbiAgPGJkYWtp bkBhcHBsZS5jb20+CiAKLSAgICAgICAgU2lkZXdheXMgJ3dvYmJsZScgd2hlbiBzY3JvbGxpbmcg d2l0aCB0cmFja3BhZCBvbiBNYXZlcmlja3MNCi0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc1MjENCi0gICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0N CisgICAgICAgIFNpZGV3YXlzICd3b2JibGUnIHdoZW4gc2Nyb2xsaW5nIHdpdGggdHJhY2twYWQg b24gTWF2ZXJpY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjc1MjEKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQogICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTQxMzczMDY+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL0xheWVySG9zdGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL21hYy9MYXllckhvc3RpbmdDb250ZXh0LmgK aW5kZXggMWJiYWNlZC4uYmI5MTA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZv cm0vbWFjL0xheWVySG9zdGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9tYWMvTGF5ZXJIb3N0aW5nQ29udGV4dC5oCkBAIC00MCw4ICs0MCw4IEBAIGNsYXNzIExheWVy SG9zdGluZ0NvbnRleHQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKExheWVySG9zdGluZ0Nv bnRleHQpOwogcHVibGljOgogICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGF5ZXJIb3N0aW5n Q29udGV4dD4gY3JlYXRlRm9yUG9ydChtYWNoX3BvcnRfdCBzZXJ2ZXJQb3J0KTsKLSNpZiBIQVZF KExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKLSAgICBzdGF0aWMgc3RkOjp1bmlxdWVf cHRyPExheWVySG9zdGluZ0NvbnRleHQ+IGNyZWF0ZUZvcldpbmRvd1NlcnZlcigpOworI2lmIEhB VkUoT1VUX09GX1BST0NFU1NfTEFZRVJfSE9TVElORykKKyAgICBzdGF0aWMgc3RkOjp1bmlxdWVf cHRyPExheWVySG9zdGluZ0NvbnRleHQ+IGNyZWF0ZUZvckV4dGVybmFsSG9zdGluZ1Byb2Nlc3Mo KTsKICNlbmRpZgogCiAgICAgTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL0xheWVySG9zdGluZ0NvbnRleHQubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9tYWMvTGF5ZXJIb3N0aW5nQ29udGV4dC5tbQppbmRleCA0ZjVkNDgx Li5kYWFiMDdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9tYWMvTGF5ZXJI b3N0aW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9tYWMvTGF5ZXJI b3N0aW5nQ29udGV4dC5tbQpAQCAtMjksMjYgKzI5LDQzIEBACiAjaW1wb3J0IDx3dGYvT3duUHRy Lmg+CiAjaW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KIAorI2lmIF9faGFzX2luY2x1 ZGUoPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZVByaXZhdGUuaD4pCisjaW1wb3J0IDxRdWFydHpDb3Jl L1F1YXJ0ekNvcmVQcml2YXRlLmg+CisjZWxzZQorQGludGVyZmFjZSBDQUNvbnRleHQgOiBOU09i amVjdAorQGVuZAorI2VuZGlmCisKK0BpbnRlcmZhY2UgQ0FDb250ZXh0IChEZXRhaWxzKQorKyAo Q0FDb250ZXh0ICopcmVtb3RlQ29udGV4dFdpdGhPcHRpb25zOihOU0RpY3Rpb25hcnkgKilkaWN0 OworQGVuZAorCitleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBrQ0FDb250ZXh0SWdub3Jlc0hpdFRl c3Q7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdGQ6OnVuaXF1ZV9wdHI8TGF5ZXJIb3N0aW5n Q29udGV4dD4gTGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yUG9ydChtYWNoX3BvcnRfdCBz ZXJ2ZXJQb3J0KQogewogICAgIGF1dG8gbGF5ZXJIb3N0aW5nQ29udGV4dCA9IHN0ZDo6bWFrZV91 bmlxdWU8TGF5ZXJIb3N0aW5nQ29udGV4dD4oKTsKIAotICAgIGxheWVySG9zdGluZ0NvbnRleHQt Pm1fbGF5ZXJIb3N0aW5nTW9kZSA9IExheWVySG9zdGluZ01vZGVEZWZhdWx0OworICAgIGxheWVy SG9zdGluZ0NvbnRleHQtPm1fbGF5ZXJIb3N0aW5nTW9kZSA9IExheWVySG9zdGluZ01vZGU6Oklu UHJvY2VzczsKICAgICBsYXllckhvc3RpbmdDb250ZXh0LT5tX2NvbnRleHQgPSBXS0NBQ29udGV4 dE1ha2VSZW1vdGVXaXRoU2VydmVyUG9ydChzZXJ2ZXJQb3J0KTsKIAogICAgIHJldHVybiBsYXll ckhvc3RpbmdDb250ZXh0OwogfQogCi0jaWYgSEFWRShMQVlFUl9IT1NUSU5HX0lOX1dJTkRPV19T RVJWRVIpCi1zdGQ6OnVuaXF1ZV9wdHI8TGF5ZXJIb3N0aW5nQ29udGV4dD4gTGF5ZXJIb3N0aW5n Q29udGV4dDo6Y3JlYXRlRm9yV2luZG93U2VydmVyKCkKKyNpZiBIQVZFKE9VVF9PRl9QUk9DRVNT X0xBWUVSX0hPU1RJTkcpCitzdGQ6OnVuaXF1ZV9wdHI8TGF5ZXJIb3N0aW5nQ29udGV4dD4gTGF5 ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yRXh0ZXJuYWxIb3N0aW5nUHJvY2VzcygpCiB7CiAg ICAgYXV0byBsYXllckhvc3RpbmdDb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxMYXllckhvc3Rp bmdDb250ZXh0PigpOworICAgIGxheWVySG9zdGluZ0NvbnRleHQtPm1fbGF5ZXJIb3N0aW5nTW9k ZSA9IExheWVySG9zdGluZ01vZGU6Ok91dE9mUHJvY2VzczsKIAotICAgIGxheWVySG9zdGluZ0Nv bnRleHQtPm1fbGF5ZXJIb3N0aW5nTW9kZSA9IExheWVySG9zdGluZ01vZGVJbldpbmRvd1NlcnZl cjsKKyNpZiBQTEFURk9STShJT1MpCisgICAgbGF5ZXJIb3N0aW5nQ29udGV4dC0+bV9jb250ZXh0 ID0gKFdLQ0FDb250ZXh0UmVmKVtDQUNvbnRleHQgcmVtb3RlQ29udGV4dFdpdGhPcHRpb25zOkB7 IGtDQUNvbnRleHRJZ25vcmVzSGl0VGVzdCA6IEBZRVMgfV07CisjZWxzZQogICAgIGxheWVySG9z dGluZ0NvbnRleHQtPm1fY29udGV4dCA9IFdLQ0FDb250ZXh0TWFrZVJlbW90ZUZvcldpbmRvd1Nl cnZlcigpOwotCisjZW5kaWYKKyAgICAKICAgICByZXR1cm4gbGF5ZXJIb3N0aW5nQ29udGV4dDsK IH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMv UGx1Z2luQ29udHJvbGxlclByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9tYWMvUGx1Z2luQ29udHJvbGxlclByb3h5TWFjLm1tCmluZGV4IGJiZTExOTUuLjBiYjJlYzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpbkNvbnRy b2xsZXJQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9Q bHVnaW5Db250cm9sbGVyUHJveHlNYWMubW0KQEAgLTEzOSwxMCArMTM5LDEwIEBAIHZvaWQgUGx1 Z2luQ29udHJvbGxlclByb3h5Ojp1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KExheWVySG9zdGlu Z01vZGUgbGF5ZXJIb3N0CiAgICAgfQogCiAgICAgc3dpdGNoIChsYXllckhvc3RpbmdNb2RlKSB7 Ci0gICAgICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQ6CisgICAgICAgIGNhc2UgTGF5 ZXJIb3N0aW5nTW9kZTo6SW5Qcm9jZXNzOgogICAgICAgICAgICAgbV9sYXllckhvc3RpbmdDb250 ZXh0ID0gTGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yUG9ydChQbHVnaW5Qcm9jZXNzOjpz aGFyZWQoKS5jb21wb3NpdGluZ1JlbmRlclNlcnZlclBvcnQoKSk7CiAgICAgICAgICAgICBicmVh azsKLSNpZiBIQVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKKyNpZiBIQVZFKE9V VF9PRl9QUk9DRVNTX0xBWUVSX0hPU1RJTkcpCiAgICAgICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9k ZUluV2luZG93U2VydmVyOgogICAgICAgICAgICAgbV9sYXllckhvc3RpbmdDb250ZXh0ID0gTGF5 ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yV2luZG93U2VydmVyKCk7CiAgICAgICAgICAgICBi cmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0 LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCmluZGV4IDk0Mjk2 ZmIuLjUxYTE1Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVD b250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaApA QCAtMzUsMTAgKzM1LDEwIEBAIG5hbWVzcGFjZSBJUEMgewogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotZW51bSBMYXllckhvc3RpbmdNb2RlIHsKLSAgICBMYXllckhvc3RpbmdNb2RlRGVmYXVsdCwK LSNpZiBIQVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKLSAgICBMYXllckhvc3Rp bmdNb2RlSW5XaW5kb3dTZXJ2ZXIKK2VudW0gY2xhc3MgTGF5ZXJIb3N0aW5nTW9kZSB7CisgICAg SW5Qcm9jZXNzLAorI2lmIEhBVkUoT1VUX09GX1BST0NFU1NfTEFZRVJfSE9TVElORykKKyAgICBP dXRPZlByb2Nlc3MKICNlbmRpZgogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9pb3MvUGFnZUNsaWVudEltcGxJT1MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKaW5kZXggMmU1YjJhNS4uNDNmNzczMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvUGFnZUNsaWVudElt cGxJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9QYWdlQ2xpZW50 SW1wbElPUy5oCkBAIC05NSw2ICs5NSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKSBv dmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RM YXllcihDQUxheWVyICpyb290TGF5ZXIpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgQ0FMYXllciAq YWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZp cnR1YWwgTGF5ZXJIb3N0aW5nTW9kZSB2aWV3TGF5ZXJIb3N0aW5nTW9kZSgpIG92ZXJyaWRlIHsg cmV0dXJuIExheWVySG9zdGluZ01vZGU6Ok91dE9mUHJvY2VzczsgfQogCiAgICAgdmlydHVhbCBS ZXRhaW5QdHI8Q0dJbWFnZVJlZj4gdGFrZVZpZXdTbmFwc2hvdCgpIG92ZXJyaWRlOwogICAgIHZp cnR1YWwgdm9pZCB3aGVlbEV2ZW50V2FzTm90SGFuZGxlZEJ5V2ViQ29yZShjb25zdCBOYXRpdmVX ZWJXaGVlbEV2ZW50Jikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCmluZGV4IDM2MDhjODcuLmQzMjAzZmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1t CkBAIC02NCw3ICs2NCw3IEBACiAtIChOU0N1cnNvciAqKV9jdXJzb3JSZWN0Q3Vyc29yOwogQGVu ZAogCi0jaWYgSEFWRShMQVlFUl9IT1NUSU5HX0lOX1dJTkRPV19TRVJWRVIpCisjaWYgSEFWRShP VVRfT0ZfUFJPQ0VTU19MQVlFUl9IT1NUSU5HKQogQGludGVyZmFjZSBOU1dpbmRvdyAoV2ViTlNX aW5kb3dEZXRhaWxzKQogLSAoQk9PTClfaG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcjsKIEBlbmQK QEAgLTIyNCwxMSArMjI0LDExIEBAIGJvb2wgUGFnZUNsaWVudEltcGw6OmlzVmlzdWFsbHlJZGxl KCkKIAogTGF5ZXJIb3N0aW5nTW9kZSBQYWdlQ2xpZW50SW1wbDo6dmlld0xheWVySG9zdGluZ01v ZGUoKQogewotI2lmIEhBVkUoTEFZRVJfSE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQorI2lmIEhB VkUoT1VUX09GX1BST0NFU1NfTEFZRVJfSE9TVElORykKICAgICBpZiAoW21fd2tWaWV3IHdpbmRv d10gJiYgW1ttX3drVmlldyB3aW5kb3ddIF9ob3N0c0xheWVyc0luV2luZG93U2VydmVyXSkKLSAg ICAgICAgcmV0dXJuIExheWVySG9zdGluZ01vZGVJbldpbmRvd1NlcnZlcjsKKyAgICAgICAgcmV0 dXJuIExheWVySG9zdGluZ01vZGU6Ok91dE9mUHJvY2VzczsKICNlbmRpZgotICAgIHJldHVybiBM YXllckhvc3RpbmdNb2RlRGVmYXVsdDsKKyAgICByZXR1cm4gTGF5ZXJIb3N0aW5nTW9kZTo6SW5Q cm9jZXNzOwogfQogCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjp2aWV3V2lsbE1vdmVUb0Fub3RoZXJX aW5kb3coKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMjkxZWE1OS4u OWYyMGE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC0xMTUsNyAr MTE1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1Zpc3VhbGx5SWRsZSgpIHsgcmV0 dXJuICFpc1ZpZXdWaXNpYmxlKCk7IH0KIAogICAgIC8vIFJldHVybiB0aGUgbGF5ZXIgaG9zdGlu ZyBtb2RlIGZvciB0aGUgdmlldy4KLSAgICB2aXJ0dWFsIExheWVySG9zdGluZ01vZGUgdmlld0xh eWVySG9zdGluZ01vZGUoKSB7IHJldHVybiBMYXllckhvc3RpbmdNb2RlRGVmYXVsdDsgfQorICAg IHZpcnR1YWwgTGF5ZXJIb3N0aW5nTW9kZSB2aWV3TGF5ZXJIb3N0aW5nTW9kZSgpIHsgcmV0dXJu IExheWVySG9zdGluZ01vZGU6OkluUHJvY2VzczsgfQogCiAgICAgdmlydHVhbCB2b2lkIHByb2Nl c3NEaWRFeGl0KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWxhdW5jaFByb2Nlc3MoKSA9 IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDEzNDcx ODkuLjY3MGJiNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC0yNjMsNyArMjYzLDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVu dCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBXZWIKICAgICAsIG1fcGFn ZVNjYWxlRmFjdG9yKDEpCiAgICAgLCBtX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yKDEpCiAg ICAgLCBtX2N1c3RvbURldmljZVNjYWxlRmFjdG9yKDApCi0gICAgLCBtX2xheWVySG9zdGluZ01v ZGUoTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQpCisgICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5 ZXJIb3N0aW5nTW9kZTo6SW5Qcm9jZXNzKQogICAgICwgbV9kcmF3c0JhY2tncm91bmQodHJ1ZSkK ICAgICAsIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoZmFsc2UpCiAgICAgLCBtX2FyZU1l bW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKHRydWUpCkBAIC0zMjgsOCArMzI4LDggQEAgV2Vi UGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vz c1Byb3h5JiBwcm9jZXNzLCBXZWIKIHsKICAgICB1cGRhdGVWaWV3U3RhdGUoKTsKIAotI2lmIEhB VkUoTEFZRVJfSE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQotICAgIG1fbGF5ZXJIb3N0aW5nTW9k ZSA9IG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc0luV2luZG93ID8gbV9wYWdlQ2xpZW50LnZp ZXdMYXllckhvc3RpbmdNb2RlKCkgOiBMYXllckhvc3RpbmdNb2RlSW5XaW5kb3dTZXJ2ZXI7Cisj aWYgSEFWRShPVVRfT0ZfUFJPQ0VTU19MQVlFUl9IT1NUSU5HKQorICAgIG1fbGF5ZXJIb3N0aW5n TW9kZSA9IG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc0luV2luZG93ID8gbV9wYWdlQ2xpZW50 LnZpZXdMYXllckhvc3RpbmdNb2RlKCkgOiBMYXllckhvc3RpbmdNb2RlOjpPdXRPZlByb2Nlc3M7 CiAjZW5kaWYKIAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAtOTgxLDcgKzk4MSw3IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpGbGFncyBt YXlIYXZlQ2hhbmdlZCwgV2FudHNSZXBsCiAgICAgICAgIExheWVySG9zdGluZ01vZGUgbGF5ZXJI b3N0aW5nTW9kZSA9IG1fcGFnZUNsaWVudC52aWV3TGF5ZXJIb3N0aW5nTW9kZSgpOwogICAgICAg ICBpZiAobV9sYXllckhvc3RpbmdNb2RlICE9IGxheWVySG9zdGluZ01vZGUpIHsKICAgICAgICAg ICAgIG1fbGF5ZXJIb3N0aW5nTW9kZSA9IGxheWVySG9zdGluZ01vZGU7Ci0gICAgICAgICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldExheWVySG9zdGluZ01vZGUobGF5 ZXJIb3N0aW5nTW9kZSksIG1fcGFnZUlEKTsKKyAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6U2V0TGF5ZXJIb3N0aW5nTW9kZShzdGF0aWNfY2FzdDx1bnNpZ25l ZD4obGF5ZXJIb3N0aW5nTW9kZSkpLCBtX3BhZ2VJRCk7CiAgICAgICAgIH0KICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDg2OGQ4YzYuLmI2MDBhNTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdp bi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luLmNwcApAQCAtNzYsNyArNzYsNyBAQCBOZXRzY2FwZVBsdWdpbjo6TmV0c2Nh cGVQbHVnaW4oUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlKQog ICAgICwgbV9kcmF3aW5nTW9kZWwoc3RhdGljX2Nhc3Q8TlBEcmF3aW5nTW9kZWw+KC0xKSkKICAg ICAsIG1fZXZlbnRNb2RlbChzdGF0aWNfY2FzdDxOUEV2ZW50TW9kZWw+KC0xKSkKICAgICAsIG1f cGx1Z2luUmV0dXJuc05vbnJldGFpbmVkTGF5ZXIoIW1fcGx1Z2luTW9kdWxlLT5wbHVnaW5RdWly a3MoKS5jb250YWlucyhQbHVnaW5RdWlya3M6OlJldHVybnNSZXRhaW5lZENvcmVBbmltYXRpb25M YXllcikpCi0gICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQp CisgICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5ZXJIb3N0aW5nTW9kZTo6SW5Qcm9jZXNzKQog ICAgICwgbV9jdXJyZW50TW91c2VFdmVudCgwKQogICAgICwgbV9wbHVnaW5IYXNGb2N1cyhmYWxz ZSkKICAgICAsIG1fd2luZG93SGFzRm9jdXMoZmFsc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1t IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2Fw ZVBsdWdpbk1hYy5tbQppbmRleCA1NjFlNThjLi40ODg3MTNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMv TmV0c2NhcGVQbHVnaW5NYWMubW0KQEAgLTE3MSw4ICsxNzEsOCBAQCBOUEVycm9yIE5ldHNjYXBl UGx1Z2luOjpwb3BVcENvbnRleHRNZW51KE5QTWVudSogbnBNZW51KQogCiBtYWNoX3BvcnRfdCBO ZXRzY2FwZVBsdWdpbjo6Y29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0KCkKIHsKLSNpZiBIQVZF KExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKLSAgICBpZiAobV9sYXllckhvc3RpbmdN b2RlID09IExheWVySG9zdGluZ01vZGVJbldpbmRvd1NlcnZlcikKKyNpZiBIQVZFKE9VVF9PRl9Q Uk9DRVNTX0xBWUVSX0hPU1RJTkcpCisgICAgaWYgKG1fbGF5ZXJIb3N0aW5nTW9kZSA9PSBMYXll ckhvc3RpbmdNb2RlOjpPdXRPZlByb2Nlc3MpCiAgICAgICAgIHJldHVybiBNQUNIX1BPUlRfTlVM TDsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luVmlldy5jcHAKaW5kZXggNmNjMmI3OC4uMjFlZGFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtMzY2LDcgKzM2Niw3IEBA IHZvaWQgUGx1Z2luVmlldzo6cmVjcmVhdGVBbmRJbml0aWFsaXplKFBhc3NSZWZQdHI8UGx1Z2lu PiBwbHVnaW4pCiAKIHZvaWQgUGx1Z2luVmlldzo6c2V0TGF5ZXJIb3N0aW5nTW9kZShMYXllckhv c3RpbmdNb2RlIGxheWVySG9zdGluZ01vZGUpCiB7Ci0jaWYgSEFWRShMQVlFUl9IT1NUSU5HX0lO X1dJTkRPV19TRVJWRVIpCisjaWYgSEFWRShPVVRfT0ZfUFJPQ0VTU19MQVlFUl9IT1NUSU5HKQog ICAgIGlmICghbV9wbHVnaW4pCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDQ4NTJmMDUuLjYxZDkzNmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ0 Miw3ICs0NDIsNyBAQCB2b2lkIFdlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UoY29uc3QgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICBpZiAobV92aWV3U3RhdGUg IT0gcGFyYW1ldGVycy52aWV3U3RhdGUpCiAgICAgICAgIHNldFZpZXdTdGF0ZUludGVybmFsKHBh cmFtZXRlcnMudmlld1N0YXRlLCB0cnVlKTsKICAgICBpZiAobV9sYXllckhvc3RpbmdNb2RlICE9 IHBhcmFtZXRlcnMubGF5ZXJIb3N0aW5nTW9kZSkKLSAgICAgICAgc2V0TGF5ZXJIb3N0aW5nTW9k ZShwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUpOworICAgICAgICBzZXRMYXllckhvc3RpbmdN b2RlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUpKTsK IH0KIAogV2ViUGFnZTo6fldlYlBhZ2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0b20ubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1 c3RvbS5tbQppbmRleCBmMmMwNmIwLi45NWExZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXll clJlbW90ZUN1c3RvbS5tbQpAQCAtNDMsMTIgKzQzLDEyIEBAIFBsYXRmb3JtQ0FMYXllclJlbW90 ZUN1c3RvbTo6UGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tKFBsYXRmb3JtTGF5ZXIqIGN1c3Rv bUxhCiAgICAgOiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUoTGF5ZXJUeXBlQ3VzdG9tLCBvd25lciwg Y29udGV4dCkKIHsKICAgICBzd2l0Y2ggKGNvbnRleHQtPmxheWVySG9zdGluZ01vZGUoKSkgewot ICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQ6CisgICAgY2FzZSBMYXllckhvc3RpbmdN b2RlOjpJblByb2Nlc3M6CiAgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4dCA9IExheWVySG9z dGluZ0NvbnRleHQ6OmNyZWF0ZUZvclBvcnQoV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29tcG9zaXRp bmdSZW5kZXJTZXJ2ZXJQb3J0KCkpOwogICAgICAgICBicmVhazsKLSNpZiBIQVZFKExBWUVSX0hP U1RJTkdfSU5fV0lORE9XX1NFUlZFUikKLSAgICBjYXNlIExheWVySG9zdGluZ01vZGVJbldpbmRv d1NlcnZlcjoKLSAgICAgICAgbV9sYXllckhvc3RpbmdDb250ZXh0ID0gTGF5ZXJIb3N0aW5nQ29u dGV4dDo6Y3JlYXRlRm9yV2luZG93U2VydmVyKCk7CisjaWYgSEFWRShPVVRfT0ZfUFJPQ0VTU19M QVlFUl9IT1NUSU5HKQorICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9kZTo6T3V0T2ZQcm9jZXNzOgor ICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQgPSBMYXllckhvc3RpbmdDb250ZXh0OjpjcmVh dGVGb3JFeHRlcm5hbEhvc3RpbmdQcm9jZXNzKCk7CiAgICAgICAgIGJyZWFrOwogI2VuZGlmCiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggZTcz NzczMi4uZmYzOTVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCkBAIC01NDksMTAgKzU0OSwxMCBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhOjp1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCkKIAogICAgIC8vIENyZWF0ZSBhIG5ldyBj b250ZXh0IGFuZCBzZXQgaXQgdXAuCiAgICAgc3dpdGNoIChtX3dlYlBhZ2UtPmxheWVySG9zdGlu Z01vZGUoKSkgewotICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQ6CisgICAgY2FzZSBM YXllckhvc3RpbmdNb2RlOjpJblByb2Nlc3M6CiAgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4 dCA9IExheWVySG9zdGluZ0NvbnRleHQ6OmNyZWF0ZUZvclBvcnQoV2ViUHJvY2Vzczo6c2hhcmVk KCkuY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0KCkpOwogICAgICAgICBicmVhazsKLSNpZiBI QVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NFUlZFUikKKyNpZiBIQVZFKE9VVF9PRl9QUk9D RVNTX0xBWUVSX0hPU1RJTkcpCiAgICAgY2FzZSBMYXllckhvc3RpbmdNb2RlSW5XaW5kb3dTZXJ2 ZXI6CiAgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRleHQ6 OmNyZWF0ZUZvcldpbmRvd1NlcnZlcigpOwogICAgICAgICBicmVhazsK