192001 2018-11-27 02:11:16 -0800 Factor mask layer applying in RemoteLayerTreePropertyApplier into a shared function 2018-11-27 05:36:42 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1481860 0 koivisto 2018-11-27 02:11:16 -0800 No need for separate Mac and iOS paths. 1481861 1 355717 koivisto 2018-11-27 02:14:13 -0800 Created attachment 355717 patch 1481880 2 355722 koivisto 2018-11-27 04:54:52 -0800 Created attachment 355722 for landing 1481881 3 355722 commit-queue 2018-11-27 04:57:14 -0800 Comment on attachment 355722 for landing Rejecting attachment 355722 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 355722, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=355722&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=192001&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 355722 from bug 192001. Fetching: https://bugs.webkit.org/attachment.cgi?id=355722 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 3 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h Hunk #1 FAILED at 41. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h.rej patching file Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm Hunk #1 FAILED at 258. Hunk #2 FAILED at 317. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/10165654 1481885 4 koivisto 2018-11-27 05:35:04 -0800 https://trac.webkit.org/changeset/238550/webkit 1481886 5 webkit-bug-importer 2018-11-27 05:36:42 -0800 <rdar://problem/46274039> 355717 2018-11-27 02:14:13 -0800 2018-11-27 04:54:52 -0800 patch mask-layer-cleanup.patch text/plain 5680 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzg1NDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTExLTI3ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBGYWN0b3IgbWFzayBsYXllciBhcHBs eWluZyBpbiBSZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIgaW50byBhIHNoYXJlZCBmdW5j dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTky MDAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT aGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5oOgor ICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlB cHBsaWVyLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxp ZXI6OmFwcGx5UHJvcGVydGllcyk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVBy b3BlcnR5QXBwbGllcjo6dXBkYXRlTWFzayk6CisKKyAgICAgICAgU2hhcmVkIGZ1bmN0aW9uLCB3 aXRoIHNvbWUgc3BlY2lhbCB0cmlja3MgZm9yIGlPUyBiYWNrZHJvcCBsYXllcnMuCisKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyOjphcHBseVByb3BlcnRp ZXNUb1VJVmlldyk6CisKIDIwMTgtMTEtMjcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW90ZSB0aWxlIGxheWVycyBzaG91bGRuJ3QgYmUgVUlWaWV3cwpJ bmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJl ZVByb3BlcnR5QXBwbGllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1Jl bW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIuaAkocmV2aXNpb24g MjM4NTQ3KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxh eWVyVHJlZVByb3BlcnR5QXBwbGllci5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBA IHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCB1cGRhdGVDaGlsZHJlbihSZW1v dGVMYXllclRyZWVOb2RlJiwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVy UHJvcGVydGllcyYsIGNvbnN0IFJlbGF0ZWRMYXllck1hcCYpOworICAgIHN0YXRpYyB2b2lkIHVw ZGF0ZU1hc2soUmVtb3RlTGF5ZXJUcmVlTm9kZSYsIGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5z YWN0aW9uOjpMYXllclByb3BlcnRpZXMmLCBjb25zdCBSZWxhdGVkTGF5ZXJNYXAmKTsKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQogICAgIHN0YXRpYyB2b2lkIGFwcGx5UHJvcGVydGllc1RvVUlW aWV3KFVJVmlldyAqLCBjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9w ZXJ0aWVzJiwgY29uc3QgUmVsYXRlZExheWVyTWFwJik7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxp ZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5tbQkocmV2aXNpb24gMjM4NTQ3KQorKysg U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3Bl cnR5QXBwbGllci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYyLDIxICsyNjIsMTEgQEAgdm9pZCBS ZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXI6OmFwcAogCiAgICAgYXBwbHlQcm9wZXJ0aWVz VG9MYXllcihsYXllciwgbGF5ZXJUcmVlSG9zdCwgcHJvcGVydGllcywgbGF5ZXJDb250ZW50c1R5 cGUpOwogICAgIHVwZGF0ZUNoaWxkcmVuKG5vZGUsIHByb3BlcnRpZXMsIHJlbGF0ZWRMYXllcnMp OwotCisgICAgdXBkYXRlTWFzayhub2RlLCBwcm9wZXJ0aWVzLCByZWxhdGVkTGF5ZXJzKTsKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGFwcGx5UHJvcGVydGllc1RvVUlWaWV3KG5vZGUu dWlWaWV3KCksIHByb3BlcnRpZXMsIHJlbGF0ZWRMYXllcnMpOwotI2Vsc2UKLSAgICBpZiAocHJv cGVydGllcy5jaGFuZ2VkUHJvcGVydGllcyAmIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpN YXNrTGF5ZXJDaGFuZ2VkKSB7Ci0gICAgICAgIGlmICghcHJvcGVydGllcy5tYXNrTGF5ZXJJRCkK LSAgICAgICAgICAgIGxheWVyLm1hc2sgPSBudWxscHRyOwotICAgICAgICBlbHNlIHsKLSAgICAg ICAgICAgIENBTGF5ZXIgKm1hc2tMYXllciA9IHJlbGF0ZWRMYXllcnMuZ2V0KHByb3BlcnRpZXMu bWFza0xheWVySUQpLT5sYXllcigpOwotICAgICAgICAgICAgQVNTRVJUKCFtYXNrTGF5ZXIuc3Vw ZXJsYXllcik7Ci0gICAgICAgICAgICBpZiAoIW1hc2tMYXllci5zdXBlcmxheWVyKQotICAgICAg ICAgICAgICAgIGxheWVyLm1hc2sgPSBtYXNrTGF5ZXI7Ci0gICAgICAgIH0KLSAgICB9CiAjZW5k aWYKKwogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiB9CiAKQEAgLTMyOCwzMCArMzE4 LDM5IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyOjp1cGQKICAgICBub2Rl LmxheWVyKCkuc3VibGF5ZXJzID0gc3VibGF5ZXJzLmdldCgpOwogfQogCi0jaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKLXZvaWQgUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyOjphcHBseVBy b3BlcnRpZXNUb1VJVmlldyhVSVZpZXcgKnZpZXcsIGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5z YWN0aW9uOjpMYXllclByb3BlcnRpZXMmIHByb3BlcnRpZXMsIGNvbnN0IFJlbGF0ZWRMYXllck1h cCYgcmVsYXRlZExheWVycykKK3ZvaWQgUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyOjp1 cGRhdGVNYXNrKFJlbW90ZUxheWVyVHJlZU5vZGUmIG5vZGUsIGNvbnN0IFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXMmIHByb3BlcnRpZXMsIGNvbnN0IFJlbGF0ZWRM YXllck1hcCYgcmVsYXRlZExheWVycykKIHsKLSAgICBpZiAocHJvcGVydGllcy5jaGFuZ2VkUHJv cGVydGllcy5jb250YWlucyhSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TWFza0xheWVyQ2hh bmdlZCkpIHsKLSAgICAgICAgQ0FMYXllciAqbWFza093bmVyTGF5ZXIgPSB2aWV3LmxheWVyOwor ICAgIGlmICghcHJvcGVydGllcy5jaGFuZ2VkUHJvcGVydGllcy5jb250YWlucyhSZW1vdGVMYXll clRyZWVUcmFuc2FjdGlvbjo6TWFza0xheWVyQ2hhbmdlZCkpCisgICAgICAgIHJldHVybjsKIAor ICAgIGF1dG8gbWFza093bmVyTGF5ZXIgPSBbJl0geworICAgICAgICBDQUxheWVyICpsYXllciA9 IG5vZGUubGF5ZXIoKTsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICBpZiAocHJv cGVydGllcy5jdXN0b21BcHBlYXJhbmNlID09IEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFu Y2U6OkxpZ2h0QmFja2Ryb3AgfHwgcHJvcGVydGllcy5jdXN0b21BcHBlYXJhbmNlID09IEdyYXBo aWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OkRhcmtCYWNrZHJvcCkgewogICAgICAgICAgICAg Ly8gVGhpcyBpcyBhIFVJQmFja2Ryb3BWaWV3LCB3aGljaCBtZWFucyBhbnkgbWFzayBtdXN0IGJl IGFwcGxpZWQgdG8gdGhlIENBQmFja2Ryb3BMYXllciByYXRoZXIKICAgICAgICAgICAgIC8vIHRo YXQgdGhlIHZpZXcncyBsYXllci4gVGhlIGJhY2tkcm9wIGlzIHRoZSBmaXJzdCBsYXllciBjaGls ZC4KLSAgICAgICAgICAgIGlmICh2aWV3LmxheWVyLnN1YmxheWVycy5jb3VudCAmJiBbdmlldy5s YXllci5zdWJsYXllcnNbMF0gaXNLaW5kT2ZDbGFzczpbQ0FCYWNrZHJvcExheWVyIGNsYXNzXV0p Ci0gICAgICAgICAgICAgICAgbWFza093bmVyTGF5ZXIgPSB2aWV3LmxheWVyLnN1YmxheWVyc1sw XTsKKyAgICAgICAgICAgIGlmIChsYXllci5zdWJsYXllcnMuY291bnQgJiYgW2xheWVyLnN1Ymxh eWVyc1swXSBpc0tpbmRPZkNsYXNzOltDQUJhY2tkcm9wTGF5ZXIgY2xhc3NdXSkKKyAgICAgICAg ICAgICAgICBsYXllciA9IGxheWVyLnN1YmxheWVyc1swXTsKICAgICAgICAgfQorI2VuZGlmCisg ICAgICAgIHJldHVybiBsYXllcjsKKyAgICB9OwogCi0gICAgICAgIGlmICghcHJvcGVydGllcy5t YXNrTGF5ZXJJRCkKLSAgICAgICAgICAgIG1hc2tPd25lckxheWVyLm1hc2sgPSBudWxscHRyOwot ICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIFVJVmlldyAqbWFza1ZpZXcgPSByZWxhdGVkTGF5 ZXJzLmdldChwcm9wZXJ0aWVzLm1hc2tMYXllcklEKS0+dWlWaWV3KCk7Ci0gICAgICAgICAgICAv LyBGSVhNRTogbmVlZCB0byBjaGVjayB0aGF0IHRoZSBtYXNrIHZpZXcgaXMga2VwdCBhbGl2ZS4K LSAgICAgICAgICAgIEFTU0VSVCghbWFza1ZpZXcubGF5ZXIuc3VwZXJsYXllcik7Ci0gICAgICAg ICAgICBpZiAoIW1hc2tWaWV3LmxheWVyLnN1cGVybGF5ZXIpCi0gICAgICAgICAgICAgICAgbWFz a093bmVyTGF5ZXIubWFzayA9IG1hc2tWaWV3LmxheWVyOwotICAgICAgICB9CisgICAgaWYgKCFw cm9wZXJ0aWVzLm1hc2tMYXllcklEKSB7CisgICAgICAgIG1hc2tPd25lckxheWVyKCkubWFzayA9 IG51bGxwdHI7CisgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBDQUxheWVyICptYXNrTGF5 ZXIgPSByZWxhdGVkTGF5ZXJzLmdldChwcm9wZXJ0aWVzLm1hc2tMYXllcklEKS0+bGF5ZXIoKTsK KyAgICBBU1NFUlQoIW1hc2tMYXllci5zdXBlcmxheWVyKTsKKyAgICBpZiAobWFza0xheWVyLnN1 cGVybGF5ZXIpCisgICAgICAgIHJldHVybjsKKyAgICBtYXNrT3duZXJMYXllcigpLm1hc2sgPSBt YXNrTGF5ZXI7Cit9CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQordm9pZCBSZW1vdGVMYXll clRyZWVQcm9wZXJ0eUFwcGxpZXI6OmFwcGx5UHJvcGVydGllc1RvVUlWaWV3KFVJVmlldyAqdmll dywgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllcyYgcHJv cGVydGllcywgY29uc3QgUmVsYXRlZExheWVyTWFwJiByZWxhdGVkTGF5ZXJzKQorewogICAgIGlm IChwcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzLmNvbnRhaW5zQW55KHsgUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OkNvbnRlbnRzSGlkZGVuQ2hhbmdlZCwgUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb246OlVzZXJJbnRlcmFjdGlvbkVuYWJsZWRDaGFuZ2VkIH0pKQogICAgICAgICB2aWV3 LnVzZXJJbnRlcmFjdGlvbkVuYWJsZWQgPSAhcHJvcGVydGllcy5jb250ZW50c0hpZGRlbiAmJiBw cm9wZXJ0aWVzLnVzZXJJbnRlcmFjdGlvbkVuYWJsZWQ7CiB9Cg== 355722 2018-11-27 04:54:52 -0800 2018-11-27 05:35:24 -0800 for landing mask-layer-cleanup-3.patch text/plain 5840 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzg1NDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTExLTI3ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBGYWN0b3IgbWFzayBsYXllciBhcHBs eWluZyBpbiBSZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIgaW50byBhIHNoYXJlZCBmdW5j dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTky MDAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNoYXJl ZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLmg6CisgICAg ICAgICogU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxp ZXIubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllcjo6 YXBwbHlQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlUHJvcGVy dHlBcHBsaWVyOjp1cGRhdGVNYXNrKToKKworICAgICAgICBTaGFyZWQgZnVuY3Rpb24sIHdpdGgg c29tZSBzcGVjaWFsIHRyaWNrcyBmb3IgaU9TIGJhY2tkcm9wIGxheWVycy4KKworICAgICAgICAo V2ViS2l0OjpSZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXI6OmFwcGx5UHJvcGVydGllc1Rv VUlWaWV3KToKKwogMjAxOC0xMS0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3RlIHRpbGUgbGF5ZXJzIHNob3VsZG4ndCBiZSBVSVZpZXdzCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJv cGVydHlBcHBsaWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3Rl TGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5oCShyZXZpc2lvbiAyMzg1 NDcpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlUHJvcGVydHlBcHBsaWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgcHVi bGljOgogCiBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHVwZGF0ZUNoaWxkcmVuKFJlbW90ZUxh eWVyVHJlZU5vZGUmLCBjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9w ZXJ0aWVzJiwgY29uc3QgUmVsYXRlZExheWVyTWFwJik7CisgICAgc3RhdGljIHZvaWQgdXBkYXRl TWFzayhSZW1vdGVMYXllclRyZWVOb2RlJiwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b246OkxheWVyUHJvcGVydGllcyYsIGNvbnN0IFJlbGF0ZWRMYXllck1hcCYpOwogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCiAgICAgc3RhdGljIHZvaWQgYXBwbHlQcm9wZXJ0aWVzVG9VSVZpZXco VUlWaWV3ICosIGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRp ZXMmLCBjb25zdCBSZWxhdGVkTGF5ZXJNYXAmKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktp dC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVt b3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tCShyZXZpc2lvbiAyMzg1NDcpCisrKyBTb3Vy Y2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlB cHBsaWVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNTgsMjUgKzI1OCwxNCBAQCB2b2lkIFJlbW90 ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllcjo6YXBwCiB7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19F WENFUFRJT05TOwogCi0gICAgQ0FMYXllciAqbGF5ZXIgPSBub2RlLmxheWVyKCk7Ci0KLSAgICBh cHBseVByb3BlcnRpZXNUb0xheWVyKGxheWVyLCBsYXllclRyZWVIb3N0LCBwcm9wZXJ0aWVzLCBs YXllckNvbnRlbnRzVHlwZSk7CisgICAgYXBwbHlQcm9wZXJ0aWVzVG9MYXllcihub2RlLmxheWVy KCksIGxheWVyVHJlZUhvc3QsIHByb3BlcnRpZXMsIGxheWVyQ29udGVudHNUeXBlKTsKICAgICB1 cGRhdGVDaGlsZHJlbihub2RlLCBwcm9wZXJ0aWVzLCByZWxhdGVkTGF5ZXJzKTsKKyAgICB1cGRh dGVNYXNrKG5vZGUsIHByb3BlcnRpZXMsIHJlbGF0ZWRMYXllcnMpOwogCiAjaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKICAgICBhcHBseVByb3BlcnRpZXNUb1VJVmlldyhub2RlLnVpVmlldygpLCBw cm9wZXJ0aWVzLCByZWxhdGVkTGF5ZXJzKTsKLSNlbHNlCi0gICAgaWYgKHByb3BlcnRpZXMuY2hh bmdlZFByb3BlcnRpZXMgJiBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TWFza0xheWVyQ2hh bmdlZCkgewotICAgICAgICBpZiAoIXByb3BlcnRpZXMubWFza0xheWVySUQpCi0gICAgICAgICAg ICBsYXllci5tYXNrID0gbnVsbHB0cjsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBDQUxh eWVyICptYXNrTGF5ZXIgPSByZWxhdGVkTGF5ZXJzLmdldChwcm9wZXJ0aWVzLm1hc2tMYXllcklE KS0+bGF5ZXIoKTsKLSAgICAgICAgICAgIEFTU0VSVCghbWFza0xheWVyLnN1cGVybGF5ZXIpOwot ICAgICAgICAgICAgaWYgKCFtYXNrTGF5ZXIuc3VwZXJsYXllcikKLSAgICAgICAgICAgICAgICBs YXllci5tYXNrID0gbWFza0xheWVyOwotICAgICAgICB9Ci0gICAgfQogI2VuZGlmCisKICAgICBF TkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogfQogCkBAIC0zMjgsMzAgKzMxNywzOSBAQCB2b2lk IFJlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllcjo6dXBkCiAgICAgbm9kZS5sYXllcigpLnN1 YmxheWVycyA9IHN1YmxheWVycy5nZXQoKTsKIH0KIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp Ci12b2lkIFJlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllcjo6YXBwbHlQcm9wZXJ0aWVzVG9V SVZpZXcoVUlWaWV3ICp2aWV3LCBjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5 ZXJQcm9wZXJ0aWVzJiBwcm9wZXJ0aWVzLCBjb25zdCBSZWxhdGVkTGF5ZXJNYXAmIHJlbGF0ZWRM YXllcnMpCit2b2lkIFJlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllcjo6dXBkYXRlTWFzayhS ZW1vdGVMYXllclRyZWVOb2RlJiBub2RlLCBjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjo6TGF5ZXJQcm9wZXJ0aWVzJiBwcm9wZXJ0aWVzLCBjb25zdCBSZWxhdGVkTGF5ZXJNYXAmIHJl bGF0ZWRMYXllcnMpCiB7Ci0gICAgaWYgKHByb3BlcnRpZXMuY2hhbmdlZFByb3BlcnRpZXMuY29u dGFpbnMoUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246Ok1hc2tMYXllckNoYW5nZWQpKSB7Ci0g ICAgICAgIENBTGF5ZXIgKm1hc2tPd25lckxheWVyID0gdmlldy5sYXllcjsKKyAgICBpZiAoIXBy b3BlcnRpZXMuY2hhbmdlZFByb3BlcnRpZXMuY29udGFpbnMoUmVtb3RlTGF5ZXJUcmVlVHJhbnNh Y3Rpb246Ok1hc2tMYXllckNoYW5nZWQpKQorICAgICAgICByZXR1cm47CiAKKyAgICBhdXRvIG1h c2tPd25lckxheWVyID0gWyZdIHsKKyAgICAgICAgQ0FMYXllciAqbGF5ZXIgPSBub2RlLmxheWVy KCk7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgaWYgKHByb3BlcnRpZXMuY3Vz dG9tQXBwZWFyYW5jZSA9PSBHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpMaWdodEJh Y2tkcm9wIHx8IHByb3BlcnRpZXMuY3VzdG9tQXBwZWFyYW5jZSA9PSBHcmFwaGljc0xheWVyOjpD dXN0b21BcHBlYXJhbmNlOjpEYXJrQmFja2Ryb3ApIHsKICAgICAgICAgICAgIC8vIFRoaXMgaXMg YSBVSUJhY2tkcm9wVmlldywgd2hpY2ggbWVhbnMgYW55IG1hc2sgbXVzdCBiZSBhcHBsaWVkIHRv IHRoZSBDQUJhY2tkcm9wTGF5ZXIgcmF0aGVyCiAgICAgICAgICAgICAvLyB0aGF0IHRoZSB2aWV3 J3MgbGF5ZXIuIFRoZSBiYWNrZHJvcCBpcyB0aGUgZmlyc3QgbGF5ZXIgY2hpbGQuCi0gICAgICAg ICAgICBpZiAodmlldy5sYXllci5zdWJsYXllcnMuY291bnQgJiYgW3ZpZXcubGF5ZXIuc3VibGF5 ZXJzWzBdIGlzS2luZE9mQ2xhc3M6W0NBQmFja2Ryb3BMYXllciBjbGFzc11dKQotICAgICAgICAg ICAgICAgIG1hc2tPd25lckxheWVyID0gdmlldy5sYXllci5zdWJsYXllcnNbMF07CisgICAgICAg ICAgICBpZiAobGF5ZXIuc3VibGF5ZXJzLmNvdW50ICYmIFtsYXllci5zdWJsYXllcnNbMF0gaXNL aW5kT2ZDbGFzczpbQ0FCYWNrZHJvcExheWVyIGNsYXNzXV0pCisgICAgICAgICAgICAgICAgbGF5 ZXIgPSBsYXllci5zdWJsYXllcnNbMF07CiAgICAgICAgIH0KKyNlbmRpZgorICAgICAgICByZXR1 cm4gbGF5ZXI7CisgICAgfTsKIAotICAgICAgICBpZiAoIXByb3BlcnRpZXMubWFza0xheWVySUQp Ci0gICAgICAgICAgICBtYXNrT3duZXJMYXllci5tYXNrID0gbnVsbHB0cjsKLSAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICBVSVZpZXcgKm1hc2tWaWV3ID0gcmVsYXRlZExheWVycy5nZXQocHJv cGVydGllcy5tYXNrTGF5ZXJJRCktPnVpVmlldygpOwotICAgICAgICAgICAgLy8gRklYTUU6IG5l ZWQgdG8gY2hlY2sgdGhhdCB0aGUgbWFzayB2aWV3IGlzIGtlcHQgYWxpdmUuCi0gICAgICAgICAg ICBBU1NFUlQoIW1hc2tWaWV3LmxheWVyLnN1cGVybGF5ZXIpOwotICAgICAgICAgICAgaWYgKCFt YXNrVmlldy5sYXllci5zdXBlcmxheWVyKQotICAgICAgICAgICAgICAgIG1hc2tPd25lckxheWVy Lm1hc2sgPSBtYXNrVmlldy5sYXllcjsKLSAgICAgICAgfQorICAgIGlmICghcHJvcGVydGllcy5t YXNrTGF5ZXJJRCkgeworICAgICAgICBtYXNrT3duZXJMYXllcigpLm1hc2sgPSBudWxscHRyOwor ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgQ0FMYXllciAqbWFza0xheWVyID0gcmVsYXRl ZExheWVycy5nZXQocHJvcGVydGllcy5tYXNrTGF5ZXJJRCktPmxheWVyKCk7CisgICAgQVNTRVJU KCFtYXNrTGF5ZXIuc3VwZXJsYXllcik7CisgICAgaWYgKG1hc2tMYXllci5zdXBlcmxheWVyKQor ICAgICAgICByZXR1cm47CisgICAgbWFza093bmVyTGF5ZXIoKS5tYXNrID0gbWFza0xheWVyOwor fQorCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKK3ZvaWQgUmVtb3RlTGF5ZXJUcmVlUHJvcGVy dHlBcHBsaWVyOjphcHBseVByb3BlcnRpZXNUb1VJVmlldyhVSVZpZXcgKnZpZXcsIGNvbnN0IFJl bW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXMmIHByb3BlcnRpZXMsIGNv bnN0IFJlbGF0ZWRMYXllck1hcCYgcmVsYXRlZExheWVycykKK3sKICAgICBpZiAocHJvcGVydGll cy5jaGFuZ2VkUHJvcGVydGllcy5jb250YWluc0FueSh7IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0 aW9uOjpDb250ZW50c0hpZGRlbkNoYW5nZWQsIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpV c2VySW50ZXJhY3Rpb25FbmFibGVkQ2hhbmdlZCB9KSkKICAgICAgICAgdmlldy51c2VySW50ZXJh Y3Rpb25FbmFibGVkID0gIXByb3BlcnRpZXMuY29udGVudHNIaWRkZW4gJiYgcHJvcGVydGllcy51 c2VySW50ZXJhY3Rpb25FbmFibGVkOwogfQo=