103290 2012-11-26 13:51:56 -0800 Ensure that WebPageProxy's notion of pageScaleFactor is reset on didCommitLoad 2013-01-10 10:46:36 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca ap mitz sam oldest_to_newest 775851 0 thorton 2012-11-26 13:51:56 -0800 When a standard main frame load is committed, we reset the WebPage's pageScaleFactor, if it's not the default. However, if the previous page had a full-main-frame plugin that was handling page scaling itself, WebPageProxy can have a cached pageScaleFactor != 1, while WebPage now (since the plugin that was overriding (set)pageScaleFactor is gone) has a pageScaleFactor of 1, causing us to skip the call to reset the WebPage's pageScaleFactor. We need to notify WebPageProxy of the change in this case. 775852 1 thorton 2012-11-26 13:53:11 -0800 This causes pinch-to-zooming in PDFPlugin to break initial pinch-to-zooming in the next page loaded. 775853 2 thorton 2012-11-26 13:53:38 -0800 <rdar://problem/12752467> 775923 3 176077 thorton 2012-11-26 14:46:32 -0800 Created attachment 176077 patch 776611 4 176077 thorton 2012-11-27 04:29:48 -0800 Comment on attachment 176077 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176077&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:471 > + float pageScaleFactor = webPage->pageScaleFactor(); Don't need this temporary, and it should be a double anyway. 776896 5 176077 darin 2012-11-27 09:55:22 -0800 Comment on attachment 176077 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176077&action=review Can you make a test case? I’m OK with this change, but it seems to be an indirect way to solve the problem, and I suspect there’s a better way. > Source/WebKit2/ChangeLog:19 > + instead of reaching into WebCore immediately. immediately -> directly > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:479 > + webPage->send(Messages::WebPageProxy::PageScaleFactorDidChange(1)); Is it really appropriate to send this message after every single load? These redundant messages don’t seem to be conveying information. Can’t the other process determine this without having to receive a cross-process message? There must be a better way to solve this. It seems bogus to just send extra scale factor did change messages when the scale factor did not change. 777071 6 thorton 2012-11-27 12:01:15 -0800 Hmm, you're right, there's probably somewhere that the UIProcess can do this itself already. A test case might be tricky, but I'll try (I'd like to get more of this PDFPlugin stuff tested, but that's difficult for obvious reasons). 777703 7 176446 thorton 2012-11-28 03:31:39 -0800 Created attachment 176446 patch How about this instead? 777704 8 thorton 2012-11-28 03:32:48 -0800 I don't think there's any way to test this at the moment (without building a plugin that takes over page scale that can be built on all platforms, etc. etc.). 799983 9 176077 eric 2013-01-04 00:42:13 -0800 Comment on attachment 176077 patch Cleared Darin Adler's review+ from obsolete attachment 176077 so that this bug does not appear in http://webkit.org/pending-commit. 804478 10 176446 darin 2013-01-10 09:53:55 -0800 Comment on attachment 176446 patch Seems a bit inelegant to send the load type across, but I don’t have an immediate better idea and this is internal to the code so it doesn’t affect API or anything like that. 804533 11 thorton 2013-01-10 10:46:36 -0800 http://trac.webkit.org/changeset/139341 176077 2012-11-26 14:46:32 -0800 2013-01-04 00:42:12 -0800 patch 0008-Ensure-that-WebPageProxy-s-notion-of-pageScaleFactor.patch text/plain 3983 thorton RnJvbSA3NGMxMDIxMzdkZDY0YTZhOGQzMmI1M2Y2MjI2ZDU3YTM2ZjQzNGIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gSG9ydG9uIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CkRhdGU6IFN1biwgMjUgTm92IDIwMTIgMDI6NTc6NTIgLTA4MDAKU3ViamVjdDogW1BBVENIIDA4 LzExXSBFbnN1cmUgdGhhdCBXZWJQYWdlUHJveHkncyBub3Rpb24gb2YgcGFnZVNjYWxlRmFjdG9y CiBpcyByZXNldCBvbiBkaWRDb21taXRMb2FkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAzMjkwCiA8cmRhcjovL3Byb2JsZW0vMTI3NTI0Njc+CgpSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KCldoZW4gYSBzdGFuZGFyZCBtYWluIGZyYW1lIGxvYWQgaXMgY29t bWl0dGVkLCB3ZSByZXNldCB0aGUgV2ViUGFnZSdzCnBhZ2VTY2FsZUZhY3RvciwgaWYgaXQncyBu b3QgdGhlIGRlZmF1bHQuIEhvd2V2ZXIsIGlmIHRoZSBwcmV2aW91cwpwYWdlIGhhZCBhIGZ1bGwt bWFpbi1mcmFtZSBwbHVnaW4gdGhhdCB3YXMgaGFuZGxpbmcgcGFnZSBzY2FsaW5nIGl0c2VsZiwK V2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgY2FjaGVkIHBhZ2VTY2FsZUZhY3RvciAhPSAxLCB3aGls ZSBXZWJQYWdlCm5vdyAoc2luY2UgdGhlIHBsdWdpbiB0aGF0IHdhcyBvdmVycmlkaW5nIChzZXQp cGFnZVNjYWxlRmFjdG9yIGlzIGdvbmUpCmhhcyBhIHBhZ2VTY2FsZUZhY3RvciBvZiAxLCBjYXVz aW5nIHVzIHRvIHNraXAgdGhlIGNhbGwgdG8gcmVzZXQgdGhlCldlYlBhZ2UncyBwYWdlU2NhbGVG YWN0b3IuIFdlIG5lZWQgdG8gbm90aWZ5IFdlYlBhZ2VQcm94eSBvZiB0aGUgY2hhbmdlCmluIHRo aXMgY2FzZS4KCkFsc28sIHRoZXJlJ3Mgbm8gcmVhc29uIG5vdCB0byB1c2UgV2ViUGFnZSdzIHBh Z2VTY2FsZUZhY3RvcigpIGdldHRlciBoZXJlCmluc3RlYWQgb2YgcmVhY2hpbmcgaW50byBXZWJD b3JlIGltbWVkaWF0ZWx5LgoKKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcDoKKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlk Q29tbWl0TG9hZCk6Ci0tLQogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDIzICsrKysrKysrKysrKysrKysrKysrCiAuLi4vV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwICAgICAgICB8ICAgMTAgKysrKysrKy0tCiAyIGZp bGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IGIxOGIzZDYuLmRiYmU2NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMi0x MS0yNSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBF bnN1cmUgdGhhdCBXZWJQYWdlUHJveHkncyBub3Rpb24gb2YgcGFnZVNjYWxlRmFjdG9yIGlzIHJl c2V0IG9uIGRpZENvbW1pdExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMzI5MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI3NTI0Njc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhIHN0 YW5kYXJkIG1haW4gZnJhbWUgbG9hZCBpcyBjb21taXR0ZWQsIHdlIHJlc2V0IHRoZSBXZWJQYWdl J3MKKyAgICAgICAgcGFnZVNjYWxlRmFjdG9yLCBpZiBpdCdzIG5vdCB0aGUgZGVmYXVsdC4gSG93 ZXZlciwgaWYgdGhlIHByZXZpb3VzCisgICAgICAgIHBhZ2UgaGFkIGEgZnVsbC1tYWluLWZyYW1l IHBsdWdpbiB0aGF0IHdhcyBoYW5kbGluZyBwYWdlIHNjYWxpbmcgaXRzZWxmLAorICAgICAgICBX ZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBjYWNoZWQgcGFnZVNjYWxlRmFjdG9yICE9IDEsIHdoaWxl IFdlYlBhZ2UKKyAgICAgICAgbm93IChzaW5jZSB0aGUgcGx1Z2luIHRoYXQgd2FzIG92ZXJyaWRp bmcgKHNldClwYWdlU2NhbGVGYWN0b3IgaXMgZ29uZSkKKyAgICAgICAgaGFzIGEgcGFnZVNjYWxl RmFjdG9yIG9mIDEsIGNhdXNpbmcgdXMgdG8gc2tpcCB0aGUgY2FsbCB0byByZXNldCB0aGUKKyAg ICAgICAgV2ViUGFnZSdzIHBhZ2VTY2FsZUZhY3Rvci4gV2UgbmVlZCB0byBub3RpZnkgV2ViUGFn ZVByb3h5IG9mIHRoZSBjaGFuZ2UKKyAgICAgICAgaW4gdGhpcyBjYXNlLgorCisgICAgICAgIEFs c28sIHRoZXJlJ3Mgbm8gcmVhc29uIG5vdCB0byB1c2UgV2ViUGFnZSdzIHBhZ2VTY2FsZUZhY3Rv cigpIGdldHRlciBoZXJlCisgICAgICAgIGluc3RlYWQgb2YgcmVhY2hpbmcgaW50byBXZWJDb3Jl IGltbWVkaWF0ZWx5LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorCiAyMDEyLTExLTIxICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSB0aGF0IHBsdWdpbnMg YXJlIGluaXRpYWxpemVkIGJlZm9yZSB1c2luZyBoYW5kbGVFZGl0aW5nQ29tbWFuZC9pc0VkaXRp bmdDb21tYW5kRW5hYmxlZC9zaG91bGRBbGxvd1NjcmlwdGluZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAppbmRleCBiM2RmM2I1Li43NGQ3NDI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcApAQCAtNDY4LDkgKzQ2OCwxNSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogCiAgICAgLy8gT25seSByZXN0b3JlIHRo ZSBzY2FsZSBmYWN0b3IgZm9yIHN0YW5kYXJkIGZyYW1lIGxvYWRzIChvZiB0aGUgbWFpbiBmcmFt ZSkuCiAgICAgaWYgKG1fZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbV9mcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLT5sb2FkVHlwZSgpID09IEZyYW1lTG9hZFR5cGVTdGFuZGFyZCkgewotICAg ICAgICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+Y29yZUZyYW1lKCktPnBhZ2UoKTsKLSAgICAgICAg aWYgKHBhZ2UgJiYgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkgIT0gMSkKKyAgICAgICAgZmxvYXQg cGFnZVNjYWxlRmFjdG9yID0gd2ViUGFnZS0+cGFnZVNjYWxlRmFjdG9yKCk7CisKKyAgICAgICAg Ly8gRXZlbiBpZiBXZWJQYWdlIGhhcyB0aGUgZGVmYXVsdCBwYWdlU2NhbGVGYWN0b3IsIFdlYlBh Z2VQcm94eSdzIGNhY2hlIG9mIHRoZSB2YWx1ZQorICAgICAgICAvLyBjYW4gZ2V0IG91dCBvZiBz eW5jIGluIHRoZSBjYXNlIHdoZXJlIGEgcGx1Z2luIGlzIGhhbmRsaW5nIHBhZ2Ugc2NhbGluZyBp dHNlbGYsCisgICAgICAgIC8vIHNvIHdlIHNob3VsZCB1cGRhdGUgaXQgdG8gdGhlIGRlZmF1bHQu CisgICAgICAgIGlmIChwYWdlU2NhbGVGYWN0b3IgIT0gMSkKICAgICAgICAgICAgIHdlYlBhZ2Ut PnNjYWxlUGFnZSgxLCBJbnRQb2ludCgpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpQYWdlU2NhbGVGYWN0b3JEaWRDaGFu Z2UoMSkpOwogICAgIH0KIH0KIAotLSAKMS43LjkuNiAoQXBwbGUgR2l0LTMxLjEpCgo= 176446 2012-11-28 03:31:39 -0800 2013-01-10 09:53:55 -0800 patch 12752467.diff text/plain 7145 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2OTQxNzNlLi5hNmUwZDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMTEtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgRW5zdXJlIHRoYXQgV2ViUGFnZVByb3h5J3Mgbm90aW9uIG9mIHBhZ2VTY2FsZUZh Y3RvciBpcyByZXNldCBvbiBkaWRDb21taXRMb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMyOTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEy NzUyNDY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdoZW4gYSBzdGFuZGFyZCBtYWluIGZyYW1lIGxvYWQgaXMgY29tbWl0dGVkLCB3ZSByZXNldCB0 aGUgV2ViUGFnZSdzCisgICAgICAgIHBhZ2VTY2FsZUZhY3RvciwgaWYgaXQncyBub3QgdGhlIGRl ZmF1bHQuIEhvd2V2ZXIsIGlmIHRoZSBwcmV2aW91cworICAgICAgICBwYWdlIGhhZCBhIGZ1bGwt bWFpbi1mcmFtZSBwbHVnaW4gdGhhdCB3YXMgaGFuZGxpbmcgcGFnZSBzY2FsaW5nIGl0c2VsZiwK KyAgICAgICAgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgY2FjaGVkIHBhZ2VTY2FsZUZhY3RvciAh PSAxLCB3aGlsZSBXZWJQYWdlCisgICAgICAgIG5vdyAoc2luY2UgdGhlIHBsdWdpbiB0aGF0IHdh cyBvdmVycmlkaW5nIChzZXQpcGFnZVNjYWxlRmFjdG9yIGlzIGdvbmUpCisgICAgICAgIGhhcyBh IHBhZ2VTY2FsZUZhY3RvciBvZiAxLCBjYXVzaW5nIHVzIHRvIHNraXAgdGhlIGNhbGwgdG8gcmVz ZXQgdGhlCisgICAgICAgIFdlYlBhZ2UncyBwYWdlU2NhbGVGYWN0b3IuCisKKyAgICAgICAgVGhl cmVmb3JlLCB3aGVuIFdlYlBhZ2VQcm94eSBpcyBub3RpZmllZCB0aGF0IGEgc3RhbmRhcmQgbWFp bi1mcmFtZSBsb2FkCisgICAgICAgIGlzIGNvbW1pdHRlZCwgcmVzZXQgaXRzIGNhY2hlZCBub3Rp b24gb2YgdGhlIHBhZ2VTY2FsZUZhY3Rvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRG b3JGcmFtZSk6IEFkZCBhIHBhcmFtZXRlciB3aGljaCBjb3JyZXNwb25kcyB0byBGcmFtZUxvYWRU eXBlLCBzbyB3ZSBjYW4KKyAgICAgICAgZGV0ZXJtaW5lIHdoZXRoZXIgYSBmcmFtZSBsb2FkIGlz IG9mIEZyYW1lTG9hZFR5cGVTdGFuZGFyZCAod2hpY2ggbWF0Y2hlcyB0aGUgY2hlY2sgdG8gcmVz ZXQgcGFnZSBzY2FsZSBpbgorICAgICAgICBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkQ29tbWl0 TG9hZCksIHNvIHdlIGNhbiByZXNldCBtX3BhZ2VTY2FsZUZhY3Rvci4KKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJQYWdlUHJveHkpOiBBZGQgZnJhbWVM b2FkVHlwZSBwYXJhbWV0ZXIgdG8gZGlkQ29tbWl0TG9hZEZvckZyYW1lLgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46IEFkZCBmcmFtZUxvYWRUeXBlIHBhcmFt ZXRlciB0byBkaWRDb21taXRMb2FkRm9yRnJhbWUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOiBQYXNzIGZyYW1lTG9h ZFR5cGUgcGFyYW1ldGVyIHRvIGRpZENvbW1pdExvYWRGb3JGcmFtZS4KKwogMjAxMi0xMS0yNyAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBQREZQbHVn aW46IFBhZ2Ugc2NhbGUgZmFjdG9yIHNob3VsZCBhZmZlY3Qgc3ViZnJhbWUgUERGcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBkZjQxNmMwLi5lZmI0MTBm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjA4Niw3 ICsyMDg2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNr cygpCiAgICAgfQogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXND dXN0b21SZXByZXNlbnRhdGlvbiwgY29uc3QgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8mIGNlcnRp ZmljYXRlSW5mbywgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCit2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbiwgdWludDMy X3Qgb3BhcXVlRnJhbWVMb2FkVHlwZSwgY29uc3QgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8mIGNl cnRpZmljYXRlSW5mbywgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7CiAgICAg UmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7CiAgICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVj b2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgbV9wcm9jZXNzLmdldCgpKTsKQEAgLTIxMjUs NiArMjEyNSwxMyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cAogICAgICAgICBtX3BhZ2VDbGll bnQtPmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlv bik7CiAgICAgfQogCisgICAgLy8gRXZlbiBpZiBXZWJQYWdlIGhhcyB0aGUgZGVmYXVsdCBwYWdl U2NhbGVGYWN0b3IgKGFuZCB0aGVyZWZvcmUgZG9lc24ndCByZXNldCBpdCksCisgICAgLy8gV2Vi UGFnZVByb3h5J3MgY2FjaGUgb2YgdGhlIHZhbHVlIGNhbiBnZXQgb3V0IG9mIHN5bmMgKGUuZy4g aW4gdGhlIGNhc2Ugd2hlcmUgYQorICAgIC8vIHBsdWdpbiBpcyBoYW5kbGluZyBwYWdlIHNjYWxp bmcgaXRzZWxmKSBzbyB3ZSBzaG91bGQgcmVzZXQgaXQgdG8gdGhlIGRlZmF1bHQKKyAgICAvLyBm b3Igc3RhbmRhcmQgbWFpbiBmcmFtZSBsb2Fkcy4KKyAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkgJiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkVHlwZT4ob3BhcXVlRnJhbWVMb2FkVHlwZSkgPT0g RnJhbWVMb2FkVHlwZVN0YW5kYXJkKQorICAgICAgICBtX3BhZ2VTY2FsZUZhY3RvciA9IDE7CisK ICAgICBtX2xvYWRlckNsaWVudC5kaWRDb21taXRMb2FkRm9yRnJhbWUodGhpcywgZnJhbWUsIHVz ZXJEYXRhLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CmluZGV4IDk4ZmE4YTQuLmRiZGE5YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKQEAgLTc4Myw3ICs3ODMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVy bCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXIm KTsKICAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYsIENvcmVJUEM6Ok1lc3NhZ2VE ZWNvZGVyJik7CiAgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIENvcmVJUEM6Ok1lc3Nh Z2VEZWNvZGVyJik7Ci0gICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJh bWVJRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbVJlcHJlc2Vu dGF0aW9uLCBjb25zdCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyYsIENvcmVJUEM6Ok1lc3NhZ2VE ZWNvZGVyJik7CisgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0 aW9uLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5m byYsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVu dExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYp OwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIENvcmVJ UEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBkaWRGYWlsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBDb3JlSVBDOjpNZXNz YWdlRGVjb2RlciYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4KaW5kZXggNzE1OGQ4MS4uYzg1NWI0YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0xMjQsNyArMTI0 LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBEaWRSZXN0b3JlRnJhbWVGcm9t UGFnZUNhY2hlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhcmVudEZyYW1lSUQpOwogCiAg ICAgIyBGcmFtZSBsb2FkIG1lc3NhZ2VzCi0gICAgRGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIFdURjo6U3RyaW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbVJlcHJlc2Vu dGF0aW9uLCBXZWJLaXQ6OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvIGNlcnRpZmljYXRlSW5mbywg V2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFk aWMKKyAgICBEaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJp bmcgbWltZVR5cGUsIGJvb2wgaGFzQ3VzdG9tUmVwcmVzZW50YXRpb24sIHVpbnQzMl90IGxvYWRU eXBlLCBXZWJLaXQ6OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvIGNlcnRpZmljYXRlSW5mbywgV2Vi S2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMK ICAgICBEaWRGYWlsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OlJlc291 cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIg dXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6SW5q ZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlk RmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV2ViS2l0OjpJbmpl Y3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggYjNkZjNiNS4uYTRhYmZmNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTQ2NCw3ICs0NjQsNyBAQCB2b2lkIFdlYkZy YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogCiAgICAgLy8gTm90aWZ5 IHRoZSBVSVByb2Nlc3MuCiAKLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCksIHJlc3BvbnNlLm1p bWVUeXBlKCksIG1fZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbiwgUGxhdGZvcm1DZXJ0aWZp Y2F0ZUluZm8ocmVzcG9uc2UpLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2Vy RGF0YS5nZXQoKSkpKTsKKyAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZENvbW1pdExvYWRGb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCksIHJlc3BvbnNlLm1pbWVU eXBlKCksIG1fZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbiwgbV9mcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLT5sb2FkVHlwZSgpLCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyhyZXNwb25z ZSksIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLmdldCgpKSkpOwog CiAgICAgLy8gT25seSByZXN0b3JlIHRoZSBzY2FsZSBmYWN0b3IgZm9yIHN0YW5kYXJkIGZyYW1l IGxvYWRzIChvZiB0aGUgbWFpbiBmcmFtZSkuCiAgICAgaWYgKG1fZnJhbWUtPmlzTWFpbkZyYW1l KCkgJiYgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5sb2FkVHlwZSgpID09IEZyYW1l TG9hZFR5cGVTdGFuZGFyZCkgewo=