197573 2019-05-03 13:26:35 -0700 [iOS] outlook.live.com: Compose email frame not fully visible and not scrollable 2019-05-03 19:25:10 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1532927 0 zalan 2019-05-03 13:26:35 -0700 <rdar://problem/48008441> 1532928 1 webkit-bug-importer 2019-05-03 13:27:12 -0700 <rdar://problem/50454671> 1532929 2 zalan 2019-05-03 13:28:35 -0700 (In reply to Radar WebKit Bug Importer from comment #1) > <rdar://problem/50454671> well thank you very much. 1533012 3 369000 zalan 2019-05-03 15:15:54 -0700 Created attachment 369000 Patch 1533025 4 369000 bfulgham 2019-05-03 15:37:41 -0700 Comment on attachment 369000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369000&action=review > Source/WebCore/page/Quirks.cpp:73 > +#if PLATFORM(IOS_FAMILY) I don't think we need to restrict this to iOS -- you can totally hit this by putting the web view Into the right size. 1533033 5 zalan 2019-05-03 15:49:45 -0700 (In reply to Brent Fulgham from comment #4) > Comment on attachment 369000 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=369000&action=review > > > Source/WebCore/page/Quirks.cpp:73 > > +#if PLATFORM(IOS_FAMILY) > > I don't think we need to restrict this to iOS -- you can totally hit this by > putting the web view Into the right size. yeah, though the viewportconfig concept is iOS only atm. 1533070 6 369017 zalan 2019-05-03 16:27:16 -0700 Created attachment 369017 Patch 1533093 7 369017 wenson_hsieh 2019-05-03 16:53:28 -0700 Comment on attachment 369017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369017&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:2885 > + viewportChanged |= m_viewportConfiguration.setViewLayoutSize(adjustedViewLayoutSize(viewLayoutSize)); Nit - I have a slight preference for a more explicit name that makes it clear that this is only here to support hard-coded site-specific layout width quirks, and shouldn't be used for more general purposes. How about something like viewLayoutSizeAdjustedForQuirks? 1533124 8 369034 zalan 2019-05-03 18:46:33 -0700 Created attachment 369034 Patch 1533129 9 369034 commit-queue 2019-05-03 19:25:08 -0700 Comment on attachment 369034 Patch Clearing flags on attachment: 369034 Committed r244944: <https://trac.webkit.org/changeset/244944> 1533130 10 commit-queue 2019-05-03 19:25:10 -0700 All reviewed patches have been landed. Closing bug. 369000 2019-05-03 15:15:54 -0700 2019-05-03 15:47:49 -0700 Patch bug-197573-20190503151553.patch text/plain 9289 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhmZDMxYjU3ZWEzMWZi YmE3YTkxZDYxNWFjNjNlMmE1OWIwM2E5Yy4uMDhlM2E4ZDY3MTkwOGQ1NmRiMjA3ZTNmYTUwOWMw NGI4MjJiNjE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gb3V0bG9vay5saXZl LmNvbTogQ29tcG9zZSBlbWFpbCBmcmFtZSBub3QgZnVsbHkgdmlzaWJsZSBhbmQgbm90IHNjcm9s bGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NzU3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgwMDg0NDE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG91dGxvb2sgbWFpbCB2aWV3J3Mg ZmxleCBjb2x1bW4gc2V0dXAgcHJvZHVjZXMgYSBzb21ld2hhdCB1bmZvcnR1bmF0ZSBsYXlvdXQg YXQgY2VydGFpbiB2aWV3cG9ydCB3aWR0aHMuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcmVzc2Vz IHRoZSBpc3N1ZSBieSBlbnN1cmluZyB0aGF0IHdlIG5ldmVyIGZhbGwgaW50byB0aGF0IHJhbmdl LgorCisgICAgICAgICogcGFnZS9RdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtz OjpzaG91bGRJZ25vcmVTaHJpbmtUb0ZpdENvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UXVpcmtzOjpvdmVycmlkZGVuVmlld3BvcnRMYXlvdXRXaWR0aCBjb25zdCk6CisgICAgICAg ICogcGFnZS9RdWlya3MuaDoKKwogMjAxOS0wNS0wMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5A YXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgRG9jdW1lbnQ6OmRvbWFpbklzUmVnaXN0ZXJhYmxl IHRvIFNlY3VyaXR5T3JpZ2luOjppc01hdGNoaW5nUmVnaXN0cmFibGVEb21haW5TdWZmaXgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggMWRmN2Y5OWE2ZmNkMjUwYmY3ZTcxZTEyMTQyNzI1MzkxNDMzYjE4MS4uZjc4OTZj N2I2YTQ3NDBjZDNlZTMzNWY4ZjNiOWNkMmM4MDQ5NGRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxOS0wNS0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAg ICAgIFtpT1NdIG91dGxvb2subGl2ZS5jb206IENvbXBvc2UgZW1haWwgZnJhbWUgbm90IGZ1bGx5 IHZpc2libGUgYW5kIG5vdCBzY3JvbGxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc1NzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4MDA4 NDQxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmFkanVzdExh eW91dFNpemVJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFZpZXdwb3J0 Q29uZmlndXJhdGlvblZpZXdMYXlvdXRTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6Omlt bWVkaWF0ZWx5U2hyaW5rVG9GaXRDb250ZW50KToKKwogMjAxOS0wNS0wMSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByb3RlY3QgYWdhaW5z dCBudWxsIGNyYXNoIGluIGZldGNoRGlza0NhY2hlRW50cmllcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3Bw CmluZGV4IDU3YzA1NDZkZmRkNGIyZWRkZWI4MWViOTI0NDA0NjdjOGZhM2FiNzEuLjNiZTkyYjNk YTk5YmQ1OWJmZDEwZDhkM2ZmOGM4NjFiMGE2ZTMyNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAK QEAgLTU1LDYgKzU1LDM1IEBAIGlubGluZSBib29sIFF1aXJrczo6bmVlZHNRdWlya3MoKSBjb25z dAogICAgIHJldHVybiBtX2RvY3VtZW50ICYmIG1fZG9jdW1lbnQtPnNldHRpbmdzKCkubmVlZHNT aXRlU3BlY2lmaWNRdWlya3MoKTsKIH0KIAorYm9vbCBRdWlya3M6OnNob3VsZElnbm9yZVNocmlu a1RvRml0Q29udGVudCgpIGNvbnN0Cit7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBp ZiAoIW5lZWRzUXVpcmtzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8gaG9z dCA9IG1fZG9jdW1lbnQtPnRvcERvY3VtZW50KCkudXJsKCkuaG9zdCgpOworICAgIGlmIChlcXVh bExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAib3V0bG9vay5saXZlLmNvbSIpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsKK30KKworT3B0aW9u YWw8TGF5b3V0VW5pdD4gUXVpcmtzOjpvdmVycmlkZGVuVmlld0xheW91dFdpZHRoKExheW91dFVu aXQgY3VycmVudFZpZXdMYXlvdXRXaWR0aCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1NfRkFN SUxZKQorICAgIGlmICghbmVlZHNRdWlya3MoKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAg IGF1dG8gaG9zdCA9IG1fZG9jdW1lbnQtPnRvcERvY3VtZW50KCkudXJsKCkuaG9zdCgpOworICAg IGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAib3V0bG9vay5saXZlLmNv bSIpKSB7CisgICAgICAgIGlmIChjdXJyZW50Vmlld0xheW91dFdpZHRoIDw9IDk4OSB8fCBjdXJy ZW50Vmlld0xheW91dFdpZHRoID49IDExMzIpCisgICAgICAgICAgICByZXR1cm4geyB9OworICAg ICAgICByZXR1cm4geyA5ODkgfTsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4geyB9OworfQor CiBib29sIFF1aXJrczo6c2hvdWxkSWdub3JlSW52YWxpZFNpZ25hbCgpIGNvbnN0CiB7CiAgICAg aWYgKCFuZWVkc1F1aXJrcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWly a3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKaW5kZXggNmZiNjBhMDNjYWVkZTg0 ZTY4ZDExNWE2OGEzNzI1MzlhOThmNWI4ZS4uYTUzZDU4Nzg1M2NhMjEwYzlkYWM0ZGZjOGRmYWI0 YzY2ZTU5YWIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCkBAIC0zOCw2ICszOCw4IEBAIHB1YmxpYzoK ICAgICB+UXVpcmtzKCk7CiAKICAgICBib29sIHNob3VsZElnbm9yZUludmFsaWRTaWduYWwoKSBj b25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNob3VsZElnbm9yZVNocmlua1RvRml0Q29u dGVudCgpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIE9wdGlvbmFsPExheW91dFVuaXQ+IG92 ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGgoTGF5b3V0VW5pdCBjdXJyZW50Vmlld0xheW91dFdpZHRo KSBjb25zdDsKICAgICBib29sIG5lZWRzRm9ybUNvbnRyb2xUb0JlTW91c2VGb2N1c2FibGUoKSBj b25zdDsKICAgICBib29sIG5lZWRzQXV0b3BsYXlQbGF5UGF1c2VFdmVudHMoKSBjb25zdDsKICAg ICBib29sIG5lZWRzU2Vla2luZ1N1cHBvcnREaXNhYmxlZCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKaW5kZXggOGQ3MWE2NWU4ODY4MjkyODZj MzVkMWUwNDQzMGQzNTRhNDBlNTE4Ny4uY2Q3YzA1ZDY1ZjdlMWViMTc4ZjVmZjZlNTMxOWUxZGJh YWE3NTFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3Vy YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5o CkBAIC0xMTgsNiArMTE4LDcgQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgSW50U2l6 ZSBsYXlvdXRTaXplKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgaW50IGxheW91dFdpZHRo KCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgaW50IGxheW91dEhlaWdodCgpIGNvbnN0Owog ICAgIFdFQkNPUkVfRVhQT1JUIGRvdWJsZSBpbml0aWFsU2NhbGUoKSBjb25zdDsKICAgICBXRUJD T1JFX0VYUE9SVCBkb3VibGUgaW5pdGlhbFNjYWxlSWdub3JpbmdDb250ZW50U2l6ZSgpIGNvbnN0 OwogICAgIFdFQkNPUkVfRVhQT1JUIGRvdWJsZSBtaW5pbXVtU2NhbGUoKSBjb25zdDsKQEAgLTE0 Niw3ICsxNDcsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlQ29uZmlndXJhdGlvbigpOwog ICAgIGRvdWJsZSB2aWV3cG9ydEFyZ3VtZW50c0xlbmd0aChkb3VibGUgbGVuZ3RoKSBjb25zdDsK ICAgICBkb3VibGUgaW5pdGlhbFNjYWxlRnJvbVNpemUoZG91YmxlIHdpZHRoLCBkb3VibGUgaGVp Z2h0LCBib29sIHNob3VsZElnbm9yZVNjYWxpbmdDb25zdHJhaW50cykgY29uc3Q7Ci0gICAgaW50 IGxheW91dEhlaWdodCgpIGNvbnN0OwogCiAgICAgYm9vbCBzaG91bGRPdmVycmlkZURldmljZVdp ZHRoQW5kU2hyaW5rVG9GaXQoKSBjb25zdDsKICAgICBib29sIHNob3VsZElnbm9yZVNjYWxpbmdD b25zdHJhaW50c1JlZ2FyZGxlc3NPZkNvbnRlbnRTaXplKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggOGZiZWU0MThmNmMwMzhjYTExNmQ3 ZjcwNDUwZDhmMDQwZDRlNmQxNi4uNTA1MGNiOTdhYmM0ZTY1NzQwOTE4NWNhZGE0NWIyMGFiNmUx YjczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAt MTIxMSw2ICsxMjExLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJlY2VpdmVTeW5jV2ViUGFn ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRy PElQQzo6RW5jb2Rlcj4mKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgV2ViQ29y ZTo6RmxvYXRTaXplIGFkanVzdGVkVmlld0xheW91dFNpemUoY29uc3QgV2ViQ29yZTo6RmxvYXRT aXplJik7CiAgICAgdm9pZCByZXNldFZpZXdwb3J0RGVmYXVsdENvbmZpZ3VyYXRpb24oV2ViRnJh bWUqIG1haW5GcmFtZSwgYm9vbCBoYXNNb2JpbGVEb2NUeXBlID0gZmFsc2UpOwogICAgIGVudW0g Y2xhc3MgWm9vbVRvSW5pdGlhbFNjYWxlIHsgTm8sIFllcyB9OwogICAgIHZvaWQgdmlld3BvcnRD b25maWd1cmF0aW9uQ2hhbmdlZChab29tVG9Jbml0aWFsU2NhbGUgPSBab29tVG9Jbml0aWFsU2Nh bGU6Ok5vKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dl YlBhZ2VJT1MubW0KaW5kZXggODNmMzEyNmVlNWRmY2Q4MmVhNTBiMjUxMTNiMjU0NWJlOTgxNTEw ZC4uNTRjZDM2MzMxNjUwY2E3YjQ0N2I2MzdiYzZkOTFiYjBiMjZiYjk1NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTI3 ODYsMTMgKzI3ODYsMjAgQEAgc3RhdGljIGlubGluZSBib29sIGFyZUVzc2VudGlhbGx5RXF1YWxB c0Zsb2F0KGZsb2F0IGEsIGZsb2F0IGIpCiAgICAgcmV0dXJuIFdURjo6YXJlRXNzZW50aWFsbHlF cXVhbChhLCBiKTsKIH0KIAorRmxvYXRTaXplIFdlYlBhZ2U6OmFkanVzdGVkVmlld0xheW91dFNp emUoY29uc3QgRmxvYXRTaXplJiBzaXplKQoreworICAgIGlmIChhdXRvKiBkb2N1bWVudCA9IG1f cGFnZS0+bWFpbkZyYW1lKCkuZG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIHsgZG9jdW1lbnQt PnF1aXJrcygpLm92ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGgoc2l6ZS53aWR0aCgpKS52YWx1ZU9y KHNpemUud2lkdGgoKSksIHNpemUuaGVpZ2h0KCkgfTsKKyAgICByZXR1cm4gc2l6ZTsKK30KKwog dm9pZCBXZWJQYWdlOjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6ZShjb25z dCBGbG9hdFNpemUmIHNpemUsIGRvdWJsZSBzY2FsZUZhY3RvciwgZG91YmxlIG1pbmltdW1FZmZl Y3RpdmVEZXZpY2VXaWR0aCkKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBz dHJlYW0gPDwgIldlYlBhZ2UgIiA8PCBtX3BhZ2VJRCA8PCAiIHNldFZpZXdwb3J0Q29uZmlndXJh dGlvblZpZXdMYXlvdXRTaXplICIgPDwgc2l6ZSA8PCAiIHNjYWxlRmFjdG9yICIgPDwgc2NhbGVG YWN0b3IgPDwgIiBtaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggIiA8PCBtaW5pbXVtRWZmZWN0 aXZlRGV2aWNlV2lkdGgpOwogCiAgICAgYXV0byBwcmV2aW91c0xheW91dFNpemVTY2FsZUZhY3Rv ciA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmxheW91dFNpemVTY2FsZUZhY3RvcigpOwogICAg IGF1dG8gY2xhbXBlZE1pbmltdW1FZmZlY3RpdmVEZXZpY2UgPSBtX3ZpZXdwb3J0Q29uZmlndXJh dGlvbi5pc0tub3duVG9MYXlPdXRXaWRlclRoYW5WaWV3cG9ydCgpID8gV1RGOjpudWxsb3B0IDog T3B0aW9uYWw8ZG91YmxlPihtaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgpOwotICAgIGlmICgh bV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Vmlld0xheW91dFNpemUoc2l6ZSwgc2NhbGVGYWN0 b3IsIFdURk1vdmUoY2xhbXBlZE1pbmltdW1FZmZlY3RpdmVEZXZpY2UpKSkKKyAgICBpZiAoIW1f dmlld3BvcnRDb25maWd1cmF0aW9uLnNldFZpZXdMYXlvdXRTaXplKGFkanVzdGVkVmlld0xheW91 dFNpemUoc2l6ZSksIHNjYWxlRmFjdG9yLCBXVEZNb3ZlKGNsYW1wZWRNaW5pbXVtRWZmZWN0aXZl RGV2aWNlKSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gem9vbVRvSW5pdGlhbFNjYWxl ID0gWm9vbVRvSW5pdGlhbFNjYWxlOjpObzsKQEAgLTI4NzUsNyArMjg4Miw3IEBAIHZvaWQgV2Vi UGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIHZpZXdMYXlv dXRTaXplLCBjb25zdCBXCiAKICAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJl YW0gPDwgIldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUgc2V0dGluZyB2aWV3IGxh eW91dCBzaXplIHRvICIgPDwgdmlld0xheW91dFNpemUpOwogICAgIGJvb2wgdmlld3BvcnRDaGFu Z2VkID0gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0SXNLbm93blRvTGF5T3V0V2lkZXJUaGFu Vmlld3BvcnQoZmFsc2UpOwotICAgIHZpZXdwb3J0Q2hhbmdlZCB8PSBtX3ZpZXdwb3J0Q29uZmln dXJhdGlvbi5zZXRWaWV3TGF5b3V0U2l6ZSh2aWV3TGF5b3V0U2l6ZSk7CisgICAgdmlld3BvcnRD aGFuZ2VkIHw9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldFZpZXdMYXlvdXRTaXplKGFkanVz dGVkVmlld0xheW91dFNpemUodmlld0xheW91dFNpemUpKTsKICAgICBpZiAodmlld3BvcnRDaGFu Z2VkKQogICAgICAgICB2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2VkKCk7CiAKQEAgLTMwNDQs NyArMzA1MSw3IEBAIHZvaWQgV2ViUGFnZTo6cmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0 aW9uKFdlYkZyYW1lKiBmcmFtZSwgYm9vbCBoYXNNb2JpbGVECiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZS0+Y29yZUZyYW1lKCktPmRvY3Vt ZW50KCk7CisgICAgYXV0byogZG9jdW1lbnQgPSBmcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50 KCk7CiAgICAgaWYgKGRvY3VtZW50LT5pc0ltYWdlRG9jdW1lbnQoKSkKICAgICAgICAgbV92aWV3 cG9ydENvbmZpZ3VyYXRpb24uc2V0RGVmYXVsdENvbmZpZ3VyYXRpb24oVmlld3BvcnRDb25maWd1 cmF0aW9uOjppbWFnZURvY3VtZW50UGFyYW1ldGVycygpKTsKICAgICBlbHNlIGlmIChkb2N1bWVu dC0+aXNUZXh0RG9jdW1lbnQoKSkKQEAgLTMwNTIsNiArMzA1OSw5IEBAIHZvaWQgV2ViUGFnZTo6 cmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0aW9uKFdlYkZyYW1lKiBmcmFtZSwgYm9vbCBo YXNNb2JpbGVECiAgICAgZWxzZQogICAgICAgICBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRE ZWZhdWx0Q29uZmlndXJhdGlvbihwYXJhbWV0ZXJzRm9yU3RhbmRhcmRGcmFtZSgpKTsKICAgICBt X3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRJc0tub3duVG9MYXlPdXRXaWRlclRoYW5WaWV3cG9y dChmYWxzZSk7CisKKyAgICBpZiAoYXV0byBvdmVycmlkZGVuVmlld0xheW91dFdpZHRoID0gZG9j dW1lbnQtPnF1aXJrcygpLm92ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGgobV92aWV3cG9ydENvbmZp Z3VyYXRpb24ubGF5b3V0V2lkdGgoKSkpCisgICAgICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9u LnNldFZpZXdMYXlvdXRTaXplKEZsb2F0U2l6ZSgqb3ZlcnJpZGRlblZpZXdMYXlvdXRXaWR0aCwg bV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubGF5b3V0SGVpZ2h0KCkpKTsKIH0KIAogI2lmIEVOQUJM RShWSUVXUE9SVF9SRVNJWklORykKQEAgLTMwODcsNiArMzA5Nyw5IEBAIGJvb2wgV2ViUGFnZTo6 aW1tZWRpYXRlbHlTaHJpbmtUb0ZpdENvbnRlbnQoKQogICAgIGlmICghdmlldyB8fCAhbWFpbkRv Y3VtZW50KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAobWFpbkRvY3VtZW50LT5x dWlya3MoKS5zaG91bGRJZ25vcmVTaHJpbmtUb0ZpdENvbnRlbnQoKSkKKyAgICAgICAgcmV0dXJu IGZhbHNlOworCiAgICAgbWFpbkRvY3VtZW50LT51cGRhdGVMYXlvdXQoKTsKIAogICAgIHN0YXRp YyBjb25zdCBpbnQgdG9sZXJhdGVkSG9yaXpvbnRhbFNjcm9sbGluZ0Rpc3RhbmNlID0gMjA7Cg== 369017 2019-05-03 16:27:16 -0700 2019-05-03 18:46:32 -0700 Patch bug-197573-20190503162715.patch text/plain 9339 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhmZDMxYjU3ZWEzMWZi YmE3YTkxZDYxNWFjNjNlMmE1OWIwM2E5Yy4uMDhlM2E4ZDY3MTkwOGQ1NmRiMjA3ZTNmYTUwOWMw NGI4MjJiNjE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gb3V0bG9vay5saXZl LmNvbTogQ29tcG9zZSBlbWFpbCBmcmFtZSBub3QgZnVsbHkgdmlzaWJsZSBhbmQgbm90IHNjcm9s bGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NzU3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgwMDg0NDE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG91dGxvb2sgbWFpbCB2aWV3J3Mg ZmxleCBjb2x1bW4gc2V0dXAgcHJvZHVjZXMgYSBzb21ld2hhdCB1bmZvcnR1bmF0ZSBsYXlvdXQg YXQgY2VydGFpbiB2aWV3cG9ydCB3aWR0aHMuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcmVzc2Vz IHRoZSBpc3N1ZSBieSBlbnN1cmluZyB0aGF0IHdlIG5ldmVyIGZhbGwgaW50byB0aGF0IHJhbmdl LgorCisgICAgICAgICogcGFnZS9RdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtz OjpzaG91bGRJZ25vcmVTaHJpbmtUb0ZpdENvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UXVpcmtzOjpvdmVycmlkZGVuVmlld3BvcnRMYXlvdXRXaWR0aCBjb25zdCk6CisgICAgICAg ICogcGFnZS9RdWlya3MuaDoKKwogMjAxOS0wNS0wMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5A YXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgRG9jdW1lbnQ6OmRvbWFpbklzUmVnaXN0ZXJhYmxl IHRvIFNlY3VyaXR5T3JpZ2luOjppc01hdGNoaW5nUmVnaXN0cmFibGVEb21haW5TdWZmaXgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggMWRmN2Y5OWE2ZmNkMjUwYmY3ZTcxZTEyMTQyNzI1MzkxNDMzYjE4MS4uZjc4OTZj N2I2YTQ3NDBjZDNlZTMzNWY4ZjNiOWNkMmM4MDQ5NGRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxOS0wNS0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAg ICAgIFtpT1NdIG91dGxvb2subGl2ZS5jb206IENvbXBvc2UgZW1haWwgZnJhbWUgbm90IGZ1bGx5 IHZpc2libGUgYW5kIG5vdCBzY3JvbGxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc1NzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4MDA4 NDQxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmFkanVzdExh eW91dFNpemVJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFZpZXdwb3J0 Q29uZmlndXJhdGlvblZpZXdMYXlvdXRTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6Omlt bWVkaWF0ZWx5U2hyaW5rVG9GaXRDb250ZW50KToKKwogMjAxOS0wNS0wMSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByb3RlY3QgYWdhaW5z dCBudWxsIGNyYXNoIGluIGZldGNoRGlza0NhY2hlRW50cmllcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3Bw CmluZGV4IDU3YzA1NDZkZmRkNGIyZWRkZWI4MWViOTI0NDA0NjdjOGZhM2FiNzEuLjMxNmY3M2Jl MDMwZjNhMmQ1MGI0NzM4OTNjNzYzMDhkZDU5NzZlZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAK QEAgLTU1LDYgKzU1LDM3IEBAIGlubGluZSBib29sIFF1aXJrczo6bmVlZHNRdWlya3MoKSBjb25z dAogICAgIHJldHVybiBtX2RvY3VtZW50ICYmIG1fZG9jdW1lbnQtPnNldHRpbmdzKCkubmVlZHNT aXRlU3BlY2lmaWNRdWlya3MoKTsKIH0KIAorYm9vbCBRdWlya3M6OnNob3VsZElnbm9yZVNocmlu a1RvRml0Q29udGVudCgpIGNvbnN0Cit7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBp ZiAoIW5lZWRzUXVpcmtzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8gaG9z dCA9IG1fZG9jdW1lbnQtPnRvcERvY3VtZW50KCkudXJsKCkuaG9zdCgpOworICAgIGlmIChlcXVh bExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAib3V0bG9vay5saXZlLmNvbSIpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsKK30KKworT3B0aW9u YWw8TGF5b3V0VW5pdD4gUXVpcmtzOjpvdmVycmlkZGVuVmlld0xheW91dFdpZHRoKExheW91dFVu aXQgY3VycmVudFZpZXdMYXlvdXRXaWR0aCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1NfRkFN SUxZKQorICAgIGlmICghbmVlZHNRdWlya3MoKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAg IGF1dG8gaG9zdCA9IG1fZG9jdW1lbnQtPnRvcERvY3VtZW50KCkudXJsKCkuaG9zdCgpOworICAg IGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAib3V0bG9vay5saXZlLmNv bSIpKSB7CisgICAgICAgIGlmIChjdXJyZW50Vmlld0xheW91dFdpZHRoIDw9IDk4OSB8fCBjdXJy ZW50Vmlld0xheW91dFdpZHRoID49IDExMzIpCisgICAgICAgICAgICByZXR1cm4geyB9OworICAg ICAgICByZXR1cm4geyA5ODkgfTsKKyAgICB9CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShjdXJy ZW50Vmlld0xheW91dFdpZHRoKTsKKyNlbmRpZgorICAgIHJldHVybiB7IH07Cit9CisKIGJvb2wg UXVpcmtzOjpzaG91bGRJZ25vcmVJbnZhbGlkU2lnbmFsKCkgY29uc3QKIHsKICAgICBpZiAoIW5l ZWRzUXVpcmtzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAppbmRleCA2ZmI2MGEwM2NhZWRlODRlNjhkMTE1 YTY4YTM3MjUzOWE5OGY1YjhlLi5hNTNkNTg3ODUzY2EyMTBjOWRhYzRkZmM4ZGZhYjRjNjZlNTlh YjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKQEAgLTM4LDYgKzM4LDggQEAgcHVibGljOgogICAgIH5R dWlya3MoKTsKIAogICAgIGJvb2wgc2hvdWxkSWdub3JlSW52YWxpZFNpZ25hbCgpIGNvbnN0Owor ICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hvdWxkSWdub3JlU2hyaW5rVG9GaXRDb250ZW50KCkg Y29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgT3B0aW9uYWw8TGF5b3V0VW5pdD4gb3ZlcnJpZGRl blZpZXdMYXlvdXRXaWR0aChMYXlvdXRVbml0IGN1cnJlbnRWaWV3TGF5b3V0V2lkdGgpIGNvbnN0 OwogICAgIGJvb2wgbmVlZHNGb3JtQ29udHJvbFRvQmVNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Owog ICAgIGJvb2wgbmVlZHNBdXRvcGxheVBsYXlQYXVzZUV2ZW50cygpIGNvbnN0OwogICAgIGJvb2wg bmVlZHNTZWVraW5nU3VwcG9ydERpc2FibGVkKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaAppbmRleCA4ZDcxYTY1ZTg4NjgyOTI4NmMzNWQxZTA0 NDMwZDM1NGE0MGU1MTg3Li5jZDdjMDVkNjVmN2UxZWIxNzhmNWZmNmU1MzE5ZTFkYmFhYTc1MWYw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKQEAgLTEx OCw2ICsxMTgsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBJbnRTaXplIGxheW91 dFNpemUoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBpbnQgbGF5b3V0V2lkdGgoKSBjb25z dDsKKyAgICBXRUJDT1JFX0VYUE9SVCBpbnQgbGF5b3V0SGVpZ2h0KCkgY29uc3Q7CiAgICAgV0VC Q09SRV9FWFBPUlQgZG91YmxlIGluaXRpYWxTY2FsZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQ T1JUIGRvdWJsZSBpbml0aWFsU2NhbGVJZ25vcmluZ0NvbnRlbnRTaXplKCkgY29uc3Q7CiAgICAg V0VCQ09SRV9FWFBPUlQgZG91YmxlIG1pbmltdW1TY2FsZSgpIGNvbnN0OwpAQCAtMTQ2LDcgKzE0 Nyw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVDb25maWd1cmF0aW9uKCk7CiAgICAgZG91 YmxlIHZpZXdwb3J0QXJndW1lbnRzTGVuZ3RoKGRvdWJsZSBsZW5ndGgpIGNvbnN0OwogICAgIGRv dWJsZSBpbml0aWFsU2NhbGVGcm9tU2l6ZShkb3VibGUgd2lkdGgsIGRvdWJsZSBoZWlnaHQsIGJv b2wgc2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKSBjb25zdDsKLSAgICBpbnQgbGF5b3V0 SGVpZ2h0KCkgY29uc3Q7CiAKICAgICBib29sIHNob3VsZE92ZXJyaWRlRGV2aWNlV2lkdGhBbmRT aHJpbmtUb0ZpdCgpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFp bnRzUmVnYXJkbGVzc09mQ29udGVudFNpemUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA4ZmJlZTQxOGY2YzAzOGNhMTE2ZDdmNzA0NTBk OGYwNDBkNGU2ZDE2Li41MDUwY2I5N2FiYzRlNjU3NDA5MTg1Y2FkYTQ1YjIwYWI2ZTFiNzMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xMjExLDYg KzEyMTEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNXZWJQYWdlTWVzc2Fn ZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpF bmNvZGVyPiYpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBXZWJDb3JlOjpGbG9h dFNpemUgYWRqdXN0ZWRWaWV3TGF5b3V0U2l6ZShjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmKTsK ICAgICB2b2lkIHJlc2V0Vmlld3BvcnREZWZhdWx0Q29uZmlndXJhdGlvbihXZWJGcmFtZSogbWFp bkZyYW1lLCBib29sIGhhc01vYmlsZURvY1R5cGUgPSBmYWxzZSk7CiAgICAgZW51bSBjbGFzcyBa b29tVG9Jbml0aWFsU2NhbGUgeyBObywgWWVzIH07CiAgICAgdm9pZCB2aWV3cG9ydENvbmZpZ3Vy YXRpb25DaGFuZ2VkKFpvb21Ub0luaXRpYWxTY2FsZSA9IFpvb21Ub0luaXRpYWxTY2FsZTo6Tm8p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbQppbmRleCA4M2YzMTI2ZWU1ZGZjZDgyZWE1MGIyNTExM2IyNTQ1YmU5ODE1MTBkLi41NGNk MzYzMzE2NTBjYTdiNDQ3YjYzN2JjNmQ5MWJiMGIyNmJiOTU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjc4NiwxMyAr Mjc4NiwyMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgYXJlRXNzZW50aWFsbHlFcXVhbEFzRmxvYXQo ZmxvYXQgYSwgZmxvYXQgYikKICAgICByZXR1cm4gV1RGOjphcmVFc3NlbnRpYWxseUVxdWFsKGEs IGIpOwogfQogCitGbG9hdFNpemUgV2ViUGFnZTo6YWRqdXN0ZWRWaWV3TGF5b3V0U2l6ZShjb25z dCBGbG9hdFNpemUmIHNpemUpCit7CisgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0gbV9wYWdlLT5t YWluRnJhbWUoKS5kb2N1bWVudCgpKQorICAgICAgICByZXR1cm4geyBkb2N1bWVudC0+cXVpcmtz KCkub3ZlcnJpZGRlblZpZXdMYXlvdXRXaWR0aChzaXplLndpZHRoKCkpLnZhbHVlT3Ioc2l6ZS53 aWR0aCgpKSwgc2l6ZS5oZWlnaHQoKSB9OworICAgIHJldHVybiBzaXplOworfQorCiB2b2lkIFdl YlBhZ2U6OnNldFZpZXdwb3J0Q29uZmlndXJhdGlvblZpZXdMYXlvdXRTaXplKGNvbnN0IEZsb2F0 U2l6ZSYgc2l6ZSwgZG91YmxlIHNjYWxlRmFjdG9yLCBkb3VibGUgbWluaW11bUVmZmVjdGl2ZURl dmljZVdpZHRoKQogewogICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxlUmVjdHMsIHN0cmVhbSA8 PCAiV2ViUGFnZSAiIDw8IG1fcGFnZUlEIDw8ICIgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uVmll d0xheW91dFNpemUgIiA8PCBzaXplIDw8ICIgc2NhbGVGYWN0b3IgIiA8PCBzY2FsZUZhY3RvciA8 PCAiIG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCAiIDw8IG1pbmltdW1FZmZlY3RpdmVEZXZp Y2VXaWR0aCk7CiAKICAgICBhdXRvIHByZXZpb3VzTGF5b3V0U2l6ZVNjYWxlRmFjdG9yID0gbV92 aWV3cG9ydENvbmZpZ3VyYXRpb24ubGF5b3V0U2l6ZVNjYWxlRmFjdG9yKCk7CiAgICAgYXV0byBj bGFtcGVkTWluaW11bUVmZmVjdGl2ZURldmljZSA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmlz S25vd25Ub0xheU91dFdpZGVyVGhhblZpZXdwb3J0KCkgPyBXVEY6Om51bGxvcHQgOiBPcHRpb25h bDxkb3VibGU+KG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCk7Ci0gICAgaWYgKCFtX3ZpZXdw b3J0Q29uZmlndXJhdGlvbi5zZXRWaWV3TGF5b3V0U2l6ZShzaXplLCBzY2FsZUZhY3RvciwgV1RG TW92ZShjbGFtcGVkTWluaW11bUVmZmVjdGl2ZURldmljZSkpKQorICAgIGlmICghbV92aWV3cG9y dENvbmZpZ3VyYXRpb24uc2V0Vmlld0xheW91dFNpemUoYWRqdXN0ZWRWaWV3TGF5b3V0U2l6ZShz aXplKSwgc2NhbGVGYWN0b3IsIFdURk1vdmUoY2xhbXBlZE1pbmltdW1FZmZlY3RpdmVEZXZpY2Up KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byB6b29tVG9Jbml0aWFsU2NhbGUgPSBab29t VG9Jbml0aWFsU2NhbGU6Ok5vOwpAQCAtMjg3NSw3ICsyODgyLDcgQEAgdm9pZCBXZWJQYWdlOjpk eW5hbWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6ZSYgdmlld0xheW91dFNpemUs IGNvbnN0IFcKIAogICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxlUmVjdHMsIHN0cmVhbSA8PCAi V2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSBzZXR0aW5nIHZpZXcgbGF5b3V0IHNp emUgdG8gIiA8PCB2aWV3TGF5b3V0U2l6ZSk7CiAgICAgYm9vbCB2aWV3cG9ydENoYW5nZWQgPSBt X3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRJc0tub3duVG9MYXlPdXRXaWRlclRoYW5WaWV3cG9y dChmYWxzZSk7Ci0gICAgdmlld3BvcnRDaGFuZ2VkIHw9IG1fdmlld3BvcnRDb25maWd1cmF0aW9u LnNldFZpZXdMYXlvdXRTaXplKHZpZXdMYXlvdXRTaXplKTsKKyAgICB2aWV3cG9ydENoYW5nZWQg fD0gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Vmlld0xheW91dFNpemUoYWRqdXN0ZWRWaWV3 TGF5b3V0U2l6ZSh2aWV3TGF5b3V0U2l6ZSkpOwogICAgIGlmICh2aWV3cG9ydENoYW5nZWQpCiAg ICAgICAgIHZpZXdwb3J0Q29uZmlndXJhdGlvbkNoYW5nZWQoKTsKIApAQCAtMzA0NCw3ICszMDUx LDcgQEAgdm9pZCBXZWJQYWdlOjpyZXNldFZpZXdwb3J0RGVmYXVsdENvbmZpZ3VyYXRpb24oV2Vi RnJhbWUqIGZyYW1lLCBib29sIGhhc01vYmlsZUQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKTsK KyAgICBhdXRvKiBkb2N1bWVudCA9IGZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKTsKICAg ICBpZiAoZG9jdW1lbnQtPmlzSW1hZ2VEb2N1bWVudCgpKQogICAgICAgICBtX3ZpZXdwb3J0Q29u ZmlndXJhdGlvbi5zZXREZWZhdWx0Q29uZmlndXJhdGlvbihWaWV3cG9ydENvbmZpZ3VyYXRpb246 OmltYWdlRG9jdW1lbnRQYXJhbWV0ZXJzKCkpOwogICAgIGVsc2UgaWYgKGRvY3VtZW50LT5pc1Rl eHREb2N1bWVudCgpKQpAQCAtMzA1Miw2ICszMDU5LDkgQEAgdm9pZCBXZWJQYWdlOjpyZXNldFZp ZXdwb3J0RGVmYXVsdENvbmZpZ3VyYXRpb24oV2ViRnJhbWUqIGZyYW1lLCBib29sIGhhc01vYmls ZUQKICAgICBlbHNlCiAgICAgICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldERlZmF1bHRD b25maWd1cmF0aW9uKHBhcmFtZXRlcnNGb3JTdGFuZGFyZEZyYW1lKCkpOwogICAgIG1fdmlld3Bv cnRDb25maWd1cmF0aW9uLnNldElzS25vd25Ub0xheU91dFdpZGVyVGhhblZpZXdwb3J0KGZhbHNl KTsKKworICAgIGlmIChhdXRvIG92ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGggPSBkb2N1bWVudC0+ cXVpcmtzKCkub3ZlcnJpZGRlblZpZXdMYXlvdXRXaWR0aChtX3ZpZXdwb3J0Q29uZmlndXJhdGlv bi5sYXlvdXRXaWR0aCgpKSkKKyAgICAgICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Vmll d0xheW91dFNpemUoRmxvYXRTaXplKCpvdmVycmlkZGVuVmlld0xheW91dFdpZHRoLCBtX3ZpZXdw b3J0Q29uZmlndXJhdGlvbi5sYXlvdXRIZWlnaHQoKSkpOwogfQogCiAjaWYgRU5BQkxFKFZJRVdQ T1JUX1JFU0laSU5HKQpAQCAtMzA4Nyw2ICszMDk3LDkgQEAgYm9vbCBXZWJQYWdlOjppbW1lZGlh dGVseVNocmlua1RvRml0Q29udGVudCgpCiAgICAgaWYgKCF2aWV3IHx8ICFtYWluRG9jdW1lbnQp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChtYWluRG9jdW1lbnQtPnF1aXJrcygp LnNob3VsZElnbm9yZVNocmlua1RvRml0Q29udGVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKICAgICBtYWluRG9jdW1lbnQtPnVwZGF0ZUxheW91dCgpOwogCiAgICAgc3RhdGljIGNvbnN0 IGludCB0b2xlcmF0ZWRIb3Jpem9udGFsU2Nyb2xsaW5nRGlzdGFuY2UgPSAyMDsK 369034 2019-05-03 18:46:33 -0700 2019-05-03 19:25:08 -0700 Patch bug-197573-20190503184632.patch text/plain 9371 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhmZDMxYjU3ZWEzMWZi YmE3YTkxZDYxNWFjNjNlMmE1OWIwM2E5Yy4uNmEyOWZmYmUwNTIxZjc1MjA5YzdiNzZkYTg2MmJi YTc2MTk5NzExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gb3V0bG9vay5saXZl LmNvbTogQ29tcG9zZSBlbWFpbCBmcmFtZSBub3QgZnVsbHkgdmlzaWJsZSBhbmQgbm90IHNjcm9s bGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NzU3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgwMDg0NDE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgIFRoZSBvdXRsb29rIG1haWwgdmlldydzIGZs ZXggY29sdW1uIHNldHVwIHByb2R1Y2VzIGEgc29tZXdoYXQgdW5mb3J0dW5hdGUgbGF5b3V0IGF0 IGNlcnRhaW4gdmlld3BvcnQgd2lkdGhzLgorICAgICAgICBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0 aGUgaXNzdWUgYnkgZW5zdXJpbmcgdGhhdCB3ZSBuZXZlciBmYWxsIGludG8gdGhhdCByYW5nZS4K KworICAgICAgICAqIHBhZ2UvUXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlF1aXJrczo6 c2hvdWxkSWdub3JlU2hyaW5rVG9GaXRDb250ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlF1aXJrczo6b3ZlcnJpZGRlblZpZXdwb3J0TGF5b3V0V2lkdGggY29uc3QpOgorICAgICAgICAq IHBhZ2UvUXVpcmtzLmg6CisKIDIwMTktMDUtMDEgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBNb3ZlIERvY3VtZW50Ojpkb21haW5Jc1JlZ2lzdGVyYWJsZSB0 byBTZWN1cml0eU9yaWdpbjo6aXNNYXRjaGluZ1JlZ2lzdHJhYmxlRG9tYWluU3VmZml4CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDFkZjdmOTlhNmZjZDI1MGJmN2U3MWUxMjE0MjcyNTM5MTQzM2IxODEuLmZlYWEwNmZh ODdlMjczNzVhZjVkMmViMmNiOGVkYWIwYTc1Yjk2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTktMDUtMDMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbaU9TXSBvdXRsb29rLmxpdmUuY29tOiBDb21wb3NlIGVtYWlsIGZyYW1lIG5vdCBmdWxseSB2 aXNpYmxlIGFuZCBub3Qgc2Nyb2xsYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NTczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODAwODQ0 MT4KKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6YWRqdXN0TGF5b3V0 U2l6ZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0Vmlld3BvcnRDb25m aWd1cmF0aW9uVmlld0xheW91dFNpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkeW5h bWljVmlld3BvcnRTaXplVXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aW1tZWRp YXRlbHlTaHJpbmtUb0ZpdENvbnRlbnQpOgorCiAyMDE5LTA1LTAxICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUHJvdGVjdCBhZ2FpbnN0IG51 bGwgY3Jhc2ggaW4gZmV0Y2hEaXNrQ2FjaGVFbnRyaWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1F1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAKaW5k ZXggNTdjMDU0NmRmZGQ0YjJlZGRlYjgxZWI5MjQ0MDQ2N2M4ZmEzYWI3MS4uMzE2ZjczYmUwMzBm M2EyZDUwYjQ3Mzg5M2M3NjMwOGRkNTk3NmVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9RdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcApAQCAt NTUsNiArNTUsMzcgQEAgaW5saW5lIGJvb2wgUXVpcmtzOjpuZWVkc1F1aXJrcygpIGNvbnN0CiAg ICAgcmV0dXJuIG1fZG9jdW1lbnQgJiYgbV9kb2N1bWVudC0+c2V0dGluZ3MoKS5uZWVkc1NpdGVT cGVjaWZpY1F1aXJrcygpOwogfQogCitib29sIFF1aXJrczo6c2hvdWxkSWdub3JlU2hyaW5rVG9G aXRDb250ZW50KCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIGlmICgh bmVlZHNRdWlya3MoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYXV0byBob3N0ID0g bV9kb2N1bWVudC0+dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCk7CisgICAgaWYgKGVxdWFsTGV0 dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGhvc3QsICJvdXRsb29rLmxpdmUuY29tIikpCisgICAgICAg IHJldHVybiB0cnVlOworI2VuZGlmCisgICAgcmV0dXJuIGZhbHNlOworfQorCitPcHRpb25hbDxM YXlvdXRVbml0PiBRdWlya3M6Om92ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGgoTGF5b3V0VW5pdCBj dXJyZW50Vmlld0xheW91dFdpZHRoKSBjb25zdAoreworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CisgICAgaWYgKCFuZWVkc1F1aXJrcygpKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0 byBob3N0ID0gbV9kb2N1bWVudC0+dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCk7CisgICAgaWYg KGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGhvc3QsICJvdXRsb29rLmxpdmUuY29tIikp IHsKKyAgICAgICAgaWYgKGN1cnJlbnRWaWV3TGF5b3V0V2lkdGggPD0gOTg5IHx8IGN1cnJlbnRW aWV3TGF5b3V0V2lkdGggPj0gMTEzMikKKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAg IHJldHVybiB7IDk4OSB9OworICAgIH0KKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGN1cnJlbnRW aWV3TGF5b3V0V2lkdGgpOworI2VuZGlmCisgICAgcmV0dXJuIHsgfTsKK30KKwogYm9vbCBRdWly a3M6OnNob3VsZElnbm9yZUludmFsaWRTaWduYWwoKSBjb25zdAogewogICAgIGlmICghbmVlZHNR dWlya3MoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCmluZGV4IDZmYjYwYTAzY2FlZGU4NGU2OGQxMTVhNjhh MzcyNTM5YTk4ZjViOGUuLmE1M2Q1ODc4NTNjYTIxMGM5ZGFjNGRmYzhkZmFiNGM2NmU1OWFiMGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9RdWlya3MuaApAQCAtMzgsNiArMzgsOCBAQCBwdWJsaWM6CiAgICAgflF1aXJr cygpOwogCiAgICAgYm9vbCBzaG91bGRJZ25vcmVJbnZhbGlkU2lnbmFsKCkgY29uc3Q7CisgICAg V0VCQ09SRV9FWFBPUlQgYm9vbCBzaG91bGRJZ25vcmVTaHJpbmtUb0ZpdENvbnRlbnQoKSBjb25z dDsKKyAgICBXRUJDT1JFX0VYUE9SVCBPcHRpb25hbDxMYXlvdXRVbml0PiBvdmVycmlkZGVuVmll d0xheW91dFdpZHRoKExheW91dFVuaXQgY3VycmVudFZpZXdMYXlvdXRXaWR0aCkgY29uc3Q7CiAg ICAgYm9vbCBuZWVkc0Zvcm1Db250cm9sVG9CZU1vdXNlRm9jdXNhYmxlKCkgY29uc3Q7CiAgICAg Ym9vbCBuZWVkc0F1dG9wbGF5UGxheVBhdXNlRXZlbnRzKCkgY29uc3Q7CiAgICAgYm9vbCBuZWVk c1NlZWtpbmdTdXBwb3J0RGlzYWJsZWQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Zp ZXdwb3J0Q29uZmlndXJhdGlvbi5oCmluZGV4IDhkNzFhNjVlODg2ODI5Mjg2YzM1ZDFlMDQ0MzBk MzU0YTQwZTUxODcuLmNkN2MwNWQ2NWY3ZTFlYjE3OGY1ZmY2ZTUzMTllMWRiYWFhNzUxZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaApAQCAtMTE4LDYg KzExOCw3IEBAIHB1YmxpYzoKIAogICAgIFdFQkNPUkVfRVhQT1JUIEludFNpemUgbGF5b3V0U2l6 ZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGludCBsYXlvdXRXaWR0aCgpIGNvbnN0Owor ICAgIFdFQkNPUkVfRVhQT1JUIGludCBsYXlvdXRIZWlnaHQoKSBjb25zdDsKICAgICBXRUJDT1JF X0VYUE9SVCBkb3VibGUgaW5pdGlhbFNjYWxlKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQg ZG91YmxlIGluaXRpYWxTY2FsZUlnbm9yaW5nQ29udGVudFNpemUoKSBjb25zdDsKICAgICBXRUJD T1JFX0VYUE9SVCBkb3VibGUgbWluaW11bVNjYWxlKCkgY29uc3Q7CkBAIC0xNDYsNyArMTQ3LDYg QEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUNvbmZpZ3VyYXRpb24oKTsKICAgICBkb3VibGUg dmlld3BvcnRBcmd1bWVudHNMZW5ndGgoZG91YmxlIGxlbmd0aCkgY29uc3Q7CiAgICAgZG91Ymxl IGluaXRpYWxTY2FsZUZyb21TaXplKGRvdWJsZSB3aWR0aCwgZG91YmxlIGhlaWdodCwgYm9vbCBz aG91bGRJZ25vcmVTY2FsaW5nQ29uc3RyYWludHMpIGNvbnN0OwotICAgIGludCBsYXlvdXRIZWln aHQoKSBjb25zdDsKIAogICAgIGJvb2wgc2hvdWxkT3ZlcnJpZGVEZXZpY2VXaWR0aEFuZFNocmlu a1RvRml0KCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRJZ25vcmVTY2FsaW5nQ29uc3RyYWludHNS ZWdhcmRsZXNzT2ZDb250ZW50U2l6ZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDhmYmVlNDE4ZjZjMDM4Y2ExMTZkN2Y3MDQ1MGQ4ZjA0 MGQ0ZTZkMTYuLjg2OGRmN2NiOTk5NmQ4NDc2NTIwNmM1M2Y4Yjg5M2Q1Mjc2MmVkNDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTEyMTEsNiArMTIx MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRSZWNlaXZlU3luY1dlYlBhZ2VNZXNzYWdlKElQ Qzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29k ZXI+Jik7CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFdlYkNvcmU6OkZsb2F0U2l6 ZSB2aWV3TGF5b3V0U2l6ZUFkanVzdGVkRm9yUXVpcmtzKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6 ZSYpOwogICAgIHZvaWQgcmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0aW9uKFdlYkZyYW1l KiBtYWluRnJhbWUsIGJvb2wgaGFzTW9iaWxlRG9jVHlwZSA9IGZhbHNlKTsKICAgICBlbnVtIGNs YXNzIFpvb21Ub0luaXRpYWxTY2FsZSB7IE5vLCBZZXMgfTsKICAgICB2b2lkIHZpZXdwb3J0Q29u ZmlndXJhdGlvbkNoYW5nZWQoWm9vbVRvSW5pdGlhbFNjYWxlID0gWm9vbVRvSW5pdGlhbFNjYWxl OjpObyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCmluZGV4IDgzZjMxMjZlZTVkZmNkODJlYTUwYjI1MTEzYjI1NDViZTk4MTUxMGQu Ljg2NmE4YjQwNDY1MzQ3OGNjN2Q2YjRhYmM2MGNjMDhhMmRjMmQ3MjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yNzg2 LDEzICsyNzg2LDIwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBhcmVFc3NlbnRpYWxseUVxdWFsQXNG bG9hdChmbG9hdCBhLCBmbG9hdCBiKQogICAgIHJldHVybiBXVEY6OmFyZUVzc2VudGlhbGx5RXF1 YWwoYSwgYik7CiB9CiAKK0Zsb2F0U2l6ZSBXZWJQYWdlOjp2aWV3TGF5b3V0U2l6ZUFkanVzdGVk Rm9yUXVpcmtzKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkKK3sKKyAgICBpZiAoYXV0byogZG9jdW1l bnQgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiB7IGRv Y3VtZW50LT5xdWlya3MoKS5vdmVycmlkZGVuVmlld0xheW91dFdpZHRoKHNpemUud2lkdGgoKSku dmFsdWVPcihzaXplLndpZHRoKCkpLCBzaXplLmhlaWdodCgpIH07CisgICAgcmV0dXJuIHNpemU7 Cit9CisKIHZvaWQgV2ViUGFnZTo6c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uVmlld0xheW91dFNp emUoY29uc3QgRmxvYXRTaXplJiBzaXplLCBkb3VibGUgc2NhbGVGYWN0b3IsIGRvdWJsZSBtaW5p bXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgpCiB7CiAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVS ZWN0cywgc3RyZWFtIDw8ICJXZWJQYWdlICIgPDwgbV9wYWdlSUQgPDwgIiBzZXRWaWV3cG9ydENv bmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6ZSAiIDw8IHNpemUgPDwgIiBzY2FsZUZhY3RvciAiIDw8 IHNjYWxlRmFjdG9yIDw8ICIgbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoICIgPDwgbWluaW11 bUVmZmVjdGl2ZURldmljZVdpZHRoKTsKIAogICAgIGF1dG8gcHJldmlvdXNMYXlvdXRTaXplU2Nh bGVGYWN0b3IgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5sYXlvdXRTaXplU2NhbGVGYWN0b3Io KTsKICAgICBhdXRvIGNsYW1wZWRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlID0gbV92aWV3cG9ydENv bmZpZ3VyYXRpb24uaXNLbm93blRvTGF5T3V0V2lkZXJUaGFuVmlld3BvcnQoKSA/IFdURjo6bnVs bG9wdCA6IE9wdGlvbmFsPGRvdWJsZT4obWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoKTsKLSAg ICBpZiAoIW1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldFZpZXdMYXlvdXRTaXplKHNpemUsIHNj YWxlRmFjdG9yLCBXVEZNb3ZlKGNsYW1wZWRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlKSkpCisgICAg aWYgKCFtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRWaWV3TGF5b3V0U2l6ZSh2aWV3TGF5b3V0 U2l6ZUFkanVzdGVkRm9yUXVpcmtzKHNpemUpLCBzY2FsZUZhY3RvciwgV1RGTW92ZShjbGFtcGVk TWluaW11bUVmZmVjdGl2ZURldmljZSkpKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIHpv b21Ub0luaXRpYWxTY2FsZSA9IFpvb21Ub0luaXRpYWxTY2FsZTo6Tm87CkBAIC0yODc1LDcgKzI4 ODIsNyBAQCB2b2lkIFdlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoY29uc3QgRmxv YXRTaXplJiB2aWV3TGF5b3V0U2l6ZSwgY29uc3QgVwogCiAgICAgTE9HX1dJVEhfU1RSRUFNKFZp c2libGVSZWN0cywgc3RyZWFtIDw8ICJXZWJQYWdlOjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRl IHNldHRpbmcgdmlldyBsYXlvdXQgc2l6ZSB0byAiIDw8IHZpZXdMYXlvdXRTaXplKTsKICAgICBi b29sIHZpZXdwb3J0Q2hhbmdlZCA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldElzS25vd25U b0xheU91dFdpZGVyVGhhblZpZXdwb3J0KGZhbHNlKTsKLSAgICB2aWV3cG9ydENoYW5nZWQgfD0g bV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Vmlld0xheW91dFNpemUodmlld0xheW91dFNpemUp OworICAgIHZpZXdwb3J0Q2hhbmdlZCB8PSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRWaWV3 TGF5b3V0U2l6ZSh2aWV3TGF5b3V0U2l6ZUFkanVzdGVkRm9yUXVpcmtzKHZpZXdMYXlvdXRTaXpl KSk7CiAgICAgaWYgKHZpZXdwb3J0Q2hhbmdlZCkKICAgICAgICAgdmlld3BvcnRDb25maWd1cmF0 aW9uQ2hhbmdlZCgpOwogCkBAIC0zMDQ0LDcgKzMwNTEsNyBAQCB2b2lkIFdlYlBhZ2U6OnJlc2V0 Vmlld3BvcnREZWZhdWx0Q29uZmlndXJhdGlvbihXZWJGcmFtZSogZnJhbWUsIGJvb2wgaGFzTW9i aWxlRAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0g ZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpOworICAgIGF1dG8qIGRvY3VtZW50ID0gZnJh bWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpOwogICAgIGlmIChkb2N1bWVudC0+aXNJbWFnZURv Y3VtZW50KCkpCiAgICAgICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldERlZmF1bHRDb25m aWd1cmF0aW9uKFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6aW1hZ2VEb2N1bWVudFBhcmFtZXRlcnMo KSk7CiAgICAgZWxzZSBpZiAoZG9jdW1lbnQtPmlzVGV4dERvY3VtZW50KCkpCkBAIC0zMDUyLDYg KzMwNTksOSBAQCB2b2lkIFdlYlBhZ2U6OnJlc2V0Vmlld3BvcnREZWZhdWx0Q29uZmlndXJhdGlv bihXZWJGcmFtZSogZnJhbWUsIGJvb2wgaGFzTW9iaWxlRAogICAgIGVsc2UKICAgICAgICAgbV92 aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0RGVmYXVsdENvbmZpZ3VyYXRpb24ocGFyYW1ldGVyc0Zv clN0YW5kYXJkRnJhbWUoKSk7CiAgICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0SXNLbm93 blRvTGF5T3V0V2lkZXJUaGFuVmlld3BvcnQoZmFsc2UpOworCisgICAgaWYgKGF1dG8gb3ZlcnJp ZGRlblZpZXdMYXlvdXRXaWR0aCA9IGRvY3VtZW50LT5xdWlya3MoKS5vdmVycmlkZGVuVmlld0xh eW91dFdpZHRoKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmxheW91dFdpZHRoKCkpKQorICAgICAg ICBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRWaWV3TGF5b3V0U2l6ZShGbG9hdFNpemUoKm92 ZXJyaWRkZW5WaWV3TGF5b3V0V2lkdGgsIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmxheW91dEhl aWdodCgpKSk7CiB9CiAKICNpZiBFTkFCTEUoVklFV1BPUlRfUkVTSVpJTkcpCkBAIC0zMDg3LDYg KzMwOTcsOSBAQCBib29sIFdlYlBhZ2U6OmltbWVkaWF0ZWx5U2hyaW5rVG9GaXRDb250ZW50KCkK ICAgICBpZiAoIXZpZXcgfHwgIW1haW5Eb2N1bWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CisgICAgaWYgKG1haW5Eb2N1bWVudC0+cXVpcmtzKCkuc2hvdWxkSWdub3JlU2hyaW5rVG9GaXRD b250ZW50KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIG1haW5Eb2N1bWVudC0+dXBk YXRlTGF5b3V0KCk7CiAKICAgICBzdGF0aWMgY29uc3QgaW50IHRvbGVyYXRlZEhvcml6b250YWxT Y3JvbGxpbmdEaXN0YW5jZSA9IDIwOwo=