155450 2016-03-14 11:49:42 -0700 Unable to commit previews in Mobile Safari 2016-03-14 12:34:29 -0700 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin andersca bdakin mitz sam thorton oldest_to_newest 1174585 0 bdakin 2016-03-14 11:49:42 -0700 Unable to commit previews in Mobile Safari rdar://problem/25135529 This is a regression from: http://trac.webkit.org/changeset/198070 1174587 1 273997 bdakin 2016-03-14 11:52:29 -0700 Created attachment 273997 Patch 1174588 2 273997 mitz 2016-03-14 11:53:36 -0700 Comment on attachment 273997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273997&action=review > Source/WebKit2/ChangeLog:14 > + when a customer view controller has been provided. custom 1174597 3 273999 bdakin 2016-03-14 12:06:01 -0700 Created attachment 273999 Patch 1174612 4 bdakin 2016-03-14 12:34:29 -0700 Thanks Tim! http://trac.webkit.org/changeset/198147 273997 2016-03-14 11:52:29 -0700 2016-03-14 12:06:01 -0700 Patch for-review.txt text/plain 4464 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5ODE0NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTAzLTE0ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBVbmFibGUgdG8gY29tbWl0IHByZXZp ZXdzIGluIE1vYmlsZSBTYWZhcmkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NTQ1MAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzI1MTM1NTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgX3VpRGVsZWdhdGVQcm92aWRlZFByZXZpZXdpbmdWaWV3Q29udHJv bGxlciB3YXMgYmVpbmcgY29uc3VsdGVkIGJlZm9yZSAKKyAgICAgICAgaW52b2tpbmcgdGhlIG9s ZCBTUEksIHdoaWNoIHdhcyBhbHdheXMgd3JvbmcuIEl0IHNob3VsZCBoYXZlIGJlZW4gY29uc3Vs dGVkIAorICAgICAgICBiZWZvcmUgY2FsbGluZyB0aGUgbmV3IEFQSSEgQnV0IGFsc28sIGl0IGRv ZXNu4oCZdCBzZWVtIHRvIGJlIG5lY2Vzc2FyeSBhdCBhbGwgCisgICAgICAgIHNpbmNlIFtXS0Nv bnRlbnRWaWV3IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI6Y29tbWl0UHJldmlldzpdIGlzIG9ubHkg aW52b2tlZCAKKyAgICAgICAgd2hlbiBhIGN1c3RvbWVyIHZpZXcgY29udHJvbGxlciBoYXMgYmVl biBwcm92aWRlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3JlZ2lzdGVyUHJldmlld10pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IF91bnJlZ2lzdGVyUHJldmlld10pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9pbnRlcmFjdGlvblNob3VsZEJlZ2luRnJvbVByZXZpZXdJdGVtQ29udHJv bGxlcjpmb3JQb3NpdGlvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcHJlc2VudGVk Vmlld0NvbnRyb2xsZXJGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6XSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX3ByZXZpZXdJdGVtQ29udHJvbGxlcjpjb21taXRQcmV2aWV3Ol0pOgorCiAy MDE2LTAzLTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFBpbmdIYW5kbGUgZGVsZXRlJ3MgaXRzZWxmIGJ1dCBwb2ludGVyIGlzIHN0aWxsIHVzZWQgYnkg aGFuZGxlRGF0YVVSTApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCShyZXZpc2lvbiAxOTgxMzkpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjMsNyArMTIzLDYgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25E YXRhIHsKICAgICBSZXRhaW5QdHI8VUlHZXN0dXJlUmVjb2duaXplcj4gX3ByZXZpZXdTZWNvbmRh cnlHZXN0dXJlUmVjb2duaXplcjsKICNpZiBIQVZFKExJTktfUFJFVklFVykKICAgICBSZXRhaW5Q dHI8VUlQcmV2aWV3SXRlbUNvbnRyb2xsZXI+IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI7Ci0gICAg Qk9PTCBfdWlEZWxlZ2F0ZVByb3ZpZGVkUHJldmlld2luZ1ZpZXdDb250cm9sbGVyOwogI2VuZGlm CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpTbWFydE1hZ25pZmljYXRpb25Db250cm9s bGVyPiBfc21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlcjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CShyZXZpc2lvbiAxOTgxMzkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzc3OSw3ICszNzc5LDYg QEAgLSAodm9pZClfcmVnaXN0ZXJQcmV2aWV3CiAgICAgX3ByZXZpZXdHZXN0dXJlUmVjb2duaXpl ciA9IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXIuZ2V0KCkucHJlc2VudGF0aW9uR2VzdHVyZVJlY29n bml6ZXI7CiAgICAgaWYgKFtfcHJldmlld0l0ZW1Db250cm9sbGVyIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IocHJlc2VudGF0aW9uU2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXIpXSkKICAg ICAgICAgX3ByZXZpZXdTZWNvbmRhcnlHZXN0dXJlUmVjb2duaXplciA9IF9wcmV2aWV3SXRlbUNv bnRyb2xsZXIuZ2V0KCkucHJlc2VudGF0aW9uU2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXI7Ci0g ICAgX3VpRGVsZWdhdGVQcm92aWRlZFByZXZpZXdpbmdWaWV3Q29udHJvbGxlciA9IE5POwogfQog CiAtICh2b2lkKV91bnJlZ2lzdGVyUHJldmlldwpAQCAtMzc4OCw3ICszNzg3LDYgQEAgLSAodm9p ZClfdW5yZWdpc3RlclByZXZpZXcKICAgICBfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyID0gbmls OwogICAgIF9wcmV2aWV3U2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXIgPSBuaWw7CiAgICAgX3By ZXZpZXdJdGVtQ29udHJvbGxlciA9IG5pbDsKLSAgICBfdWlEZWxlZ2F0ZVByb3ZpZGVkUHJldmll d2luZ1ZpZXdDb250cm9sbGVyID0gTk87CiB9CiAKIC0gKEJPT0wpX2ludGVyYWN0aW9uU2hvdWxk QmVnaW5Gcm9tUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZXdJdGVtQ29udHJvbGxlciAq KWNvbnRyb2xsZXIgZm9yUG9zaXRpb246KENHUG9pbnQpcG9zaXRpb24KQEAgLTM5NTQsMTAgKzM5 NTIsOCBAQCAtIChVSVZpZXdDb250cm9sbGVyICopX3ByZXNlbnRlZFZpZXdDb250CiAgICAgICAg ICAgICAgICAgW3ByZXZpZXdBY3Rpb25zIGFkZE9iamVjdDpwcmV2aWV3QWN0aW9uXTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGF1dG8gcHJldmlld0VsZW1lbnRJbmZvID0gYWRvcHROUyhb W1dLUHJldmlld0VsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhMaW5rVVJMOnRhcmdldFVSTF0p OwotICAgICAgICAgICAgaWYgKFVJVmlld0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSBbdWlEZWxl Z2F0ZSB3ZWJWaWV3Ol93ZWJWaWV3IHByZXZpZXdpbmdWaWV3Q29udHJvbGxlckZvckVsZW1lbnQ6 cHJldmlld0VsZW1lbnRJbmZvLmdldCgpIGRlZmF1bHRBY3Rpb25zOnByZXZpZXdBY3Rpb25zLmdl dCgpXSkgewotICAgICAgICAgICAgICAgIF91aURlbGVnYXRlUHJvdmlkZWRQcmV2aWV3aW5nVmll d0NvbnRyb2xsZXIgPSBZRVM7CisgICAgICAgICAgICBpZiAoVUlWaWV3Q29udHJvbGxlciAqY29u dHJvbGxlciA9IFt1aURlbGVnYXRlIHdlYlZpZXc6X3dlYlZpZXcgcHJldmlld2luZ1ZpZXdDb250 cm9sbGVyRm9yRWxlbWVudDpwcmV2aWV3RWxlbWVudEluZm8uZ2V0KCkgZGVmYXVsdEFjdGlvbnM6 cHJldmlld0FjdGlvbnMuZ2V0KCldKQogICAgICAgICAgICAgICAgIHJldHVybiBjb250cm9sbGVy OwotICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKFt1aURlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cHJldmlld1ZpZXdDb250cm9sbGVy Rm9yVVJMOmRlZmF1bHRBY3Rpb25zOmVsZW1lbnRJbmZvOildKQpAQCAtNDAwMiw3ICszOTk4LDcg QEAgLSAodm9pZClfcHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZQogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgaWYgKF91aURlbGVnYXRlUHJvdmlkZWRQcmV2aWV3aW5nVmlld0Nv bnRyb2xsZXIgJiYgW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2Vi Vmlldzpjb21taXRQcmV2aWV3ZWRWaWV3Q29udHJvbGxlcjopXSkgeworICAgIGlmIChbdWlEZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmNvbW1pdFByZXZpZXdl ZFZpZXdDb250cm9sbGVyOildKSB7CiAgICAgICAgIFt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJW aWV3IGNvbW1pdFByZXZpZXdlZFZpZXdDb250cm9sbGVyOnZpZXdDb250cm9sbGVyXTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0K 273999 2016-03-14 12:06:01 -0700 2016-03-14 12:30:20 -0700 Patch for-review-2.txt text/plain 4462 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5ODE0NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTAzLTE0ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBVbmFibGUgdG8gY29tbWl0IHByZXZp ZXdzIGluIE1vYmlsZSBTYWZhcmkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NTQ1MAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzI1MTM1NTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgX3VpRGVsZWdhdGVQcm92aWRlZFByZXZpZXdpbmdWaWV3Q29udHJv bGxlciB3YXMgYmVpbmcgY29uc3VsdGVkIGJlZm9yZSAKKyAgICAgICAgaW52b2tpbmcgdGhlIG9s ZCBTUEksIHdoaWNoIHdhcyBhbHdheXMgd3JvbmcuIEl0IHNob3VsZCBoYXZlIGJlZW4gY29uc3Vs dGVkIAorICAgICAgICBiZWZvcmUgY2FsbGluZyB0aGUgbmV3IEFQSSEgQnV0IGFsc28sIGl0IGRv ZXNu4oCZdCBzZWVtIHRvIGJlIG5lY2Vzc2FyeSBhdCBhbGwgCisgICAgICAgIHNpbmNlIFtXS0Nv bnRlbnRWaWV3IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI6Y29tbWl0UHJldmlldzpdIGlzIG9ubHkg aW52b2tlZCAKKyAgICAgICAgd2hlbiBhIGN1c3RvbSB2aWV3IGNvbnRyb2xsZXIgaGFzIGJlZW4g cHJvdmlkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9yZWdpc3RlclByZXZpZXddKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBfdW5yZWdpc3RlclByZXZpZXddKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfaW50ZXJhY3Rpb25TaG91bGRCZWdpbkZyb21QcmV2aWV3SXRlbUNvbnRyb2xs ZXI6Zm9yUG9zaXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3ByZXNlbnRlZFZp ZXdDb250cm9sbGVyRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOl0pOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI6Y29tbWl0UHJldmlldzpdKToKKwogMjAx Ni0wMy0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQ aW5nSGFuZGxlIGRlbGV0ZSdzIGl0c2VsZiBidXQgcG9pbnRlciBpcyBzdGlsbCB1c2VkIGJ5IGhh bmRsZURhdGFVUkwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAkocmV2aXNpb24gMTk4MTM5KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAkod29y a2luZyBjb3B5KQpAQCAtMTIzLDcgKzEyMyw2IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0 YSB7CiAgICAgUmV0YWluUHRyPFVJR2VzdHVyZVJlY29nbml6ZXI+IF9wcmV2aWV3U2Vjb25kYXJ5 R2VzdHVyZVJlY29nbml6ZXI7CiAjaWYgSEFWRShMSU5LX1BSRVZJRVcpCiAgICAgUmV0YWluUHRy PFVJUHJldmlld0l0ZW1Db250cm9sbGVyPiBfcHJldmlld0l0ZW1Db250cm9sbGVyOwotICAgIEJP T0wgX3VpRGVsZWdhdGVQcm92aWRlZFByZXZpZXdpbmdWaWV3Q29udHJvbGxlcjsKICNlbmRpZgog CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6U21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxl cj4gX3NtYXJ0TWFnbmlmaWNhdGlvbkNvbnRyb2xsZXI7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQko cmV2aXNpb24gMTk4MTM5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTM3NzksNyArMzc3OSw2IEBA IC0gKHZvaWQpX3JlZ2lzdGVyUHJldmlldwogICAgIF9wcmV2aWV3R2VzdHVyZVJlY29nbml6ZXIg PSBfcHJldmlld0l0ZW1Db250cm9sbGVyLmdldCgpLnByZXNlbnRhdGlvbkdlc3R1cmVSZWNvZ25p emVyOwogICAgIGlmIChbX3ByZXZpZXdJdGVtQ29udHJvbGxlciByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKHByZXNlbnRhdGlvblNlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVyKV0pCiAgICAg ICAgIF9wcmV2aWV3U2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXIgPSBfcHJldmlld0l0ZW1Db250 cm9sbGVyLmdldCgpLnByZXNlbnRhdGlvblNlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVyOwotICAg IF91aURlbGVnYXRlUHJvdmlkZWRQcmV2aWV3aW5nVmlld0NvbnRyb2xsZXIgPSBOTzsKIH0KIAog LSAodm9pZClfdW5yZWdpc3RlclByZXZpZXcKQEAgLTM3ODgsNyArMzc4Nyw2IEBAIC0gKHZvaWQp X3VucmVnaXN0ZXJQcmV2aWV3CiAgICAgX3ByZXZpZXdHZXN0dXJlUmVjb2duaXplciA9IG5pbDsK ICAgICBfcHJldmlld1NlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVyID0gbmlsOwogICAgIF9wcmV2 aWV3SXRlbUNvbnRyb2xsZXIgPSBuaWw7Ci0gICAgX3VpRGVsZWdhdGVQcm92aWRlZFByZXZpZXdp bmdWaWV3Q29udHJvbGxlciA9IE5POwogfQogCiAtIChCT09MKV9pbnRlcmFjdGlvblNob3VsZEJl Z2luRnJvbVByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIgKilj b250cm9sbGVyIGZvclBvc2l0aW9uOihDR1BvaW50KXBvc2l0aW9uCkBAIC0zOTU0LDEwICszOTUy LDggQEAgLSAoVUlWaWV3Q29udHJvbGxlciAqKV9wcmVzZW50ZWRWaWV3Q29udAogICAgICAgICAg ICAgICAgIFtwcmV2aWV3QWN0aW9ucyBhZGRPYmplY3Q6cHJldmlld0FjdGlvbl07CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBhdXRvIHByZXZpZXdFbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tX S1ByZXZpZXdFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoTGlua1VSTDp0YXJnZXRVUkxdKTsK LSAgICAgICAgICAgIGlmIChVSVZpZXdDb250cm9sbGVyICpjb250cm9sbGVyID0gW3VpRGVsZWdh dGUgd2ViVmlldzpfd2ViVmlldyBwcmV2aWV3aW5nVmlld0NvbnRyb2xsZXJGb3JFbGVtZW50OnBy ZXZpZXdFbGVtZW50SW5mby5nZXQoKSBkZWZhdWx0QWN0aW9uczpwcmV2aWV3QWN0aW9ucy5nZXQo KV0pIHsKLSAgICAgICAgICAgICAgICBfdWlEZWxlZ2F0ZVByb3ZpZGVkUHJldmlld2luZ1ZpZXdD b250cm9sbGVyID0gWUVTOworICAgICAgICAgICAgaWYgKFVJVmlld0NvbnRyb2xsZXIgKmNvbnRy b2xsZXIgPSBbdWlEZWxlZ2F0ZSB3ZWJWaWV3Ol93ZWJWaWV3IHByZXZpZXdpbmdWaWV3Q29udHJv bGxlckZvckVsZW1lbnQ6cHJldmlld0VsZW1lbnRJbmZvLmdldCgpIGRlZmF1bHRBY3Rpb25zOnBy ZXZpZXdBY3Rpb25zLmdldCgpXSkKICAgICAgICAgICAgICAgICByZXR1cm4gY29udHJvbGxlcjsK LSAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIGlmIChbdWlEZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnByZXZpZXdWaWV3Q29udHJvbGxlckZv clVSTDpkZWZhdWx0QWN0aW9uczplbGVtZW50SW5mbzopXSkKQEAgLTQwMDIsNyArMzk5OCw3IEBA IC0gKHZvaWQpX3ByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWUKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIGlmIChfdWlEZWxlZ2F0ZVByb3ZpZGVkUHJldmlld2luZ1ZpZXdDb250 cm9sbGVyICYmIFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZp ZXc6Y29tbWl0UHJldmlld2VkVmlld0NvbnRyb2xsZXI6KV0pIHsKKyAgICBpZiAoW3VpRGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpjb21taXRQcmV2aWV3ZWRW aWV3Q29udHJvbGxlcjopXSkgewogICAgICAgICBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmll dyBjb21taXRQcmV2aWV3ZWRWaWV3Q29udHJvbGxlcjp2aWV3Q29udHJvbGxlcl07CiAgICAgICAg IHJldHVybjsKICAgICB9Cg==