139795 2014-12-18 14:23:02 -0800 Need to re-enable action menus 2014-12-18 14:40:00 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin oldest_to_newest 1056894 0 bdakin 2014-12-18 14:23:02 -0800 We disabled action menus for immediate actions, but we should support both. rdar://problem/19299367 1056897 1 243521 bdakin 2014-12-18 14:29:25 -0800 Created attachment 243521 Patch 1056902 2 bdakin 2014-12-18 14:39:52 -0800 http://trac.webkit.org/changeset/177528 Thank you! 243521 2014-12-18 14:29:25 -0800 2014-12-18 14:30:55 -0800 Patch for-review.txt text/plain 12837 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzUyMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE0LTEyLTE4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIHRvIHJlLWVuYWJsZSBhY3Rp b24gbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTc5NQorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzE5Mjk5MzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmUtZW5hYmxlIHRoZSBtZW51cyBieSB1bi1jb21tZW50aW5nIHRoZSBjb2RlIHRvIGNy ZWF0ZSB0aGUgbWVudSBhbmQgY29udHJvbGxlci4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRleHQ6Y29u ZmlndXJhdGlvbjp3ZWJWaWV3Ol0pOgorCisgICAgICAgIHBlcmZvcm1BY3Rpb25NZW51SGl0VGVz dCBhbHJlYWR5IHRha2VzIGEgcGFyYW1ldGVyIGluZGljYXRpbmcgd2hldGhlciB0aGUgaGl0IHRl c3QgCisgICAgICAgIGlzIGZvciBhbiBpbW1lZGlhdGUgYWN0aW9uIG9yIG5vdC4gVGhlIGNhbGxi YWNrIGRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdCBuZWVkcyAKKyAgICAgICAgdGhhdCBpbmZv cm1hdGlvbiB0b28gc28gdGhhdCBpdCBrbm93cyB3aGV0aGVyIHRvIGNhbGwgaW50byB0aGUgCisg ICAgICAgIEFjdGlvbk1lbnVDb250cm9sbGVyIG9yIHRoZSBJbW1lZGlhdGVBY3Rpb25Db250cm9s bGVyLgorICAgICAgICAoLVtXS1ZpZXcgX2RpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdDpmb3JJ bW1lZGlhdGVBY3Rpb246dXNlckRhdGE6XSk6CisgICAgICAgICgtW1dLVmlldyBfZGlkUGVyZm9y bUFjdGlvbk1lbnVIaXRUZXN0OnVzZXJEYXRhOl0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VD bGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVu dEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAg ICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0 KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdEF0TG9jYXRpb24p OgorCiAyMDE0LTEyLTE4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KIAogICAgICAgICBDaGFuZ2UgcGFnZSBwcmV2aWV3IGxvYWRpbmcgb3JkZXIsIGFuZCBhZGQg YSBUZXh0SW5kaWNhdG9yCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJ KHJldmlzaW9uIDE3NzQyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxNyw3ICszMTcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50 TmF2aWdhdGlvblR5cGUpID0gMDsKIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2aXJ0dWFsIHZv aWQgZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVz dWx0JiwgQVBJOjpPYmplY3QqKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZFBlcmZvcm1BY3Rp b25NZW51SGl0VGVzdChjb25zdCBBY3Rpb25NZW51SGl0VGVzdFJlc3VsdCYsIGJvb2wgZm9ySW1t ZWRpYXRlQWN0aW9uLCBBUEk6Ok9iamVjdCopID0gMDsKICNlbmRpZgogfTsKIApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE3NzQyOCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MzU3LDE0ICs1MzU3LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpmb2N1c0FuZFNl bGVjdExhc3RBY3QKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZvY3Vz QW5kU2VsZWN0TGFzdEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0KCksIG1fcGFnZUlEKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdChjb25zdCBBY3Rp b25NZW51SGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVy KQordm9pZCBXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdChjb25zdCBB Y3Rpb25NZW51SGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBib29sIGZvckltbWVkaWF0ZUFjdGlvbiwg SVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+ IHVzZXJEYXRhOwogICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29k ZXIodXNlckRhdGEsIHByb2Nlc3MoKSk7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXNzYWdl RGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcGFnZUNsaWVudC5kaWRQZXJmb3Jt QWN0aW9uTWVudUhpdFRlc3QocmVzdWx0LCB1c2VyRGF0YS5nZXQoKSk7CisgICAgbV9wYWdlQ2xp ZW50LmRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdChyZXN1bHQsIGZvckltbWVkaWF0ZUFjdGlv biwgdXNlckRhdGEuZ2V0KCkpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6aW5zdGFsbFZpZXdT dGF0ZUNoYW5nZUNvbXBsZXRpb25IYW5kbGVyKHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlcikoKSkK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE3 NzQyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTMzMCw3ICsxMzMwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHZpZXdEaWRF bnRlcldpbmRvdygpOwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIHZvaWQgZGlkUGVyZm9ybUFj dGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0JiwgSVBDOjpNZXNz YWdlRGVjb2RlciYpOworICAgIHZvaWQgZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0 IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0JiwgYm9vbCBmb3JJbW1lZGlhdGVBY3Rpb24sIElQQzo6 TWVzc2FnZURlY29kZXImKTsKICNlbmRpZgogCiAgICAgUGFnZUNsaWVudCYgbV9wYWdlQ2xpZW50 OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5p bgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCShyZXZpc2lvbiAxNzc0MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC00MTQsNiArNDE0LDYg QEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBJc1BsYXlpbmdBdWRpb0RpZENoYW5n ZShib29sIG5ld0lzUGxheWluZ0F1ZGlvKQogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIERpZFBl cmZvcm1BY3Rpb25NZW51SGl0VGVzdChXZWJLaXQ6OkFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0IHJl c3VsdCwgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkg VmFyaWFkaWMKKyAgICBEaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QoV2ViS2l0OjpBY3Rpb25N ZW51SGl0VGVzdFJlc3VsdCByZXN1bHQsIGJvb2wgZm9ySW1tZWRpYXRlQWN0aW9uLCBXZWJLaXQ6 OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogI2Vu ZGlmCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t CShyZXZpc2lvbiAxNzc0MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2MTMsMTQgKzM2MTMsMTMgQEAgLSAoaW5zdGFu Y2V0eXBlKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcgogICAgICAgICBbW05TTm90aWZpY2F0aW9u Q2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9y KF9kaWN0aW9uYXJ5TG9va3VwUG9wb3ZlcldpbGxDbG9zZTopIG5hbWU6Z2V0TFVOb3RpZmljYXRp b25Qb3BvdmVyV2lsbENsb3NlKCkgb2JqZWN0Om5pbF07CiAKICNpZiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAotICAgIC8vIEZJWE1FOiBUZW1wb3JhcmlseSBkaXNh YmxlIGFjdGlvbiBtZW51IGluc3RhbGxhdGlvbi4KLSAgICAvKmlmIChbc2VsZiByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHNldEFjdGlvbk1lbnU6KV0pIHsKKyAgICBpZiAoW3NlbGYgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRBY3Rpb25NZW51OildKSB7CiAgICAgICAgIFJl dGFpblB0cjxOU01lbnU+IG1lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9jXSBpbml0XSk7CiAg ICAgICAgIHNlbGYuYWN0aW9uTWVudSA9IG1lbnUuZ2V0KCk7CiAgICAgICAgIF9kYXRhLT5fYWN0 aW9uTWVudUNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tBY3Rpb25NZW51Q29udHJvbGxlciBhbGxv Y10gaW5pdFdpdGhQYWdlOipfZGF0YS0+X3BhZ2UgdmlldzpzZWxmXSk7CiAgICAgICAgIHNlbGYu YWN0aW9uTWVudS5kZWxlZ2F0ZSA9IF9kYXRhLT5fYWN0aW9uTWVudUNvbnRyb2xsZXIuZ2V0KCk7 CiAgICAgICAgIHNlbGYuYWN0aW9uTWVudS5hdXRvZW5hYmxlc0l0ZW1zID0gTk87Ci0gICAgfSov CisgICAgfQogCiAgICAgaWYgKENsYXNzIGdlc3R1cmVDbGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5n KEAiTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciIpKSB7CiAgICAgICAgIFJldGFp blB0cjxOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyPiByZWNvZ25pemVyID0gYWRv cHROUyhbKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilbZ2VzdHVyZUNsYXNz IGFsbG9jXSBpbml0V2l0aFRhcmdldDpuaWwgYWN0aW9uOk5VTExdKTsKQEAgLTM3NTksMTAgKzM3 NTgsMTIgQEAgLSAodm9pZClkaWRDbG9zZU1lbnU6KE5TTWVudSAqKW1lbnUgd2l0aAogICAgIFtf ZGF0YS0+X2FjdGlvbk1lbnVDb250cm9sbGVyIGRpZENsb3NlTWVudTptZW51IHdpdGhFdmVudDpl dmVudF07CiB9CiAKLS0gKHZvaWQpX2RpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdDooY29uc3Qg QWN0aW9uTWVudUhpdFRlc3RSZXN1bHQmKWhpdFRlc3RSZXN1bHQgdXNlckRhdGE6KEFQSTo6T2Jq ZWN0Kil1c2VyRGF0YQorLSAodm9pZClfZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb25z dCBBY3Rpb25NZW51SGl0VGVzdFJlc3VsdCYpaGl0VGVzdFJlc3VsdCBmb3JJbW1lZGlhdGVBY3Rp b246KEJPT0wpZm9ySW1tZWRpYXRlQWN0aW9uIHVzZXJEYXRhOihBUEk6Ok9iamVjdCopdXNlckRh dGEKIHsKLSAgICBbX2RhdGEtPl9hY3Rpb25NZW51Q29udHJvbGxlciBkaWRQZXJmb3JtQWN0aW9u TWVudUhpdFRlc3Q6aGl0VGVzdFJlc3VsdCB1c2VyRGF0YTp1c2VyRGF0YV07Ci0gICAgW19kYXRh LT5faW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBkaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6 aGl0VGVzdFJlc3VsdCB1c2VyRGF0YTp1c2VyRGF0YV07CisgICAgaWYgKGZvckltbWVkaWF0ZUFj dGlvbikKKyAgICAgICAgW19kYXRhLT5faW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBkaWRQZXJm b3JtQWN0aW9uTWVudUhpdFRlc3Q6aGl0VGVzdFJlc3VsdCB1c2VyRGF0YTp1c2VyRGF0YV07Cisg ICAgZWxzZQorICAgICAgICBbX2RhdGEtPl9hY3Rpb25NZW51Q29udHJvbGxlciBkaWRQZXJmb3Jt QWN0aW9uTWVudUhpdFRlc3Q6aGl0VGVzdFJlc3VsdCB1c2VyRGF0YTp1c2VyRGF0YV07CiB9CiAK ICNlbmRpZiAvLyBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMApJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5h bC5oCShyZXZpc2lvbiAxNzc0MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsNyArMTI3LDcgQEAgQGlu dGVyZmFjZSBXS1ZpZXcgKCkKIC0gKHZvaWQpX2Nsb3NlRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXI7CiAKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAotLSAo dm9pZClfZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb25zdCBXZWJLaXQ6OkFjdGlvbk1l bnVIaXRUZXN0UmVzdWx0JiloaXRUZXN0UmVzdWx0IHVzZXJEYXRhOihBUEk6Ok9iamVjdCopdXNl ckRhdGE7CistICh2b2lkKV9kaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbnN0IFdlYktp dDo6QWN0aW9uTWVudUhpdFRlc3RSZXN1bHQmKWhpdFRlc3RSZXN1bHQgZm9ySW1tZWRpYXRlQWN0 aW9uOihCT09MKWZvckltbWVkaWF0ZUFjdGlvbiB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVzZXJE YXRhOwogI2VuZGlmCiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZXRhaW4sIHNldHRlcj1fc2V0 UHJpbWFyeVRyYWNraW5nQXJlYTopIE5TVHJhY2tpbmdBcmVhICpfcHJpbWFyeVRyYWNraW5nQXJl YTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBs LmgJKHJldmlzaW9uIDE3NzQyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFn ZUNsaWVudEltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTkwLDcgKzE5MCw3IEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUo U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBy ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KCkgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFs IHZvaWQgZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0 UmVzdWx0JiwgQVBJOjpPYmplY3QqKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUGVy Zm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0JiwgYm9v bCBmb3JJbW1lZGlhdGVBY3Rpb24sIEFQSTo6T2JqZWN0Kikgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCB2b2lkIHNob3dQbGF0Zm9ybUNvbnRleHRNZW51KE5TTWVudSAqLCBXZWJDb3JlOjpJbnRQb2lu dCkgb3ZlcnJpZGU7CiAKICAgICBXS1ZpZXcgKm1fd2tWaWV3OwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiAxNzc0Mjgp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC03NzgsMTAgKzc3OCwxMCBAQCBDR1JlY3QgUGFnZUNsaWVudEltcGw6OmJv dW5kc09mTGF5ZXJJbkxhCiAgICAgcmV0dXJuIFt3aW5kb3dDb250ZW50TGF5ZXIgY29udmVydFJl Y3Q6bGF5ZXIuYm91bmRzIGZyb21MYXllcjpsYXllcl07CiB9CiAKLXZvaWQgUGFnZUNsaWVudElt cGw6OmRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdChjb25zdCBBY3Rpb25NZW51SGl0VGVzdFJl c3VsdCYgcmVzdWx0LCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCit2b2lkIFBhZ2VDbGllbnRJbXBs OjpkaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QoY29uc3QgQWN0aW9uTWVudUhpdFRlc3RSZXN1 bHQmIHJlc3VsdCwgYm9vbCBmb3JJbW1lZGlhdGVBY3Rpb24sIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSkKIHsKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAotICAg IFttX3drVmlldyBfZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0OnJlc3VsdCB1c2VyRGF0YTp1 c2VyRGF0YV07CisgICAgW21fd2tWaWV3IF9kaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6cmVz dWx0IGZvckltbWVkaWF0ZUFjdGlvbjpmb3JJbW1lZGlhdGVBY3Rpb24gdXNlckRhdGE6dXNlckRh dGFdOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvV2ViUGFnZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDE3NzQyOCkKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtOTkxLDcgKzk5MSw3IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9ybUFjdGlvbk1lbnVI aXRUZXN0QXQKIAogICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lID0gY29yZVBhZ2UoKS0+bWFpbkZy YW1lKCk7CiAgICAgaWYgKCFtYWluRnJhbWUudmlldygpIHx8ICFtYWluRnJhbWUudmlldygpLT5y ZW5kZXJWaWV3KCkpIHsKLSAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQ ZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QoQWN0aW9uTWVudUhpdFRlc3RSZXN1bHQoKSwgSW5qZWN0 ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIobnVsbHB0cikpKTsKKyAgICAgICAgc2VuZChNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QoQWN0aW9uTWVu dUhpdFRlc3RSZXN1bHQoKSwgZm9ySW1tZWRpYXRlQWN0aW9uLCBJbmplY3RlZEJ1bmRsZVVzZXJN ZXNzYWdlRW5jb2RlcihudWxscHRyKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0x MDc1LDcgKzEwNzUsNyBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdEF0 CiAgICAgUmVmUHRyPEluamVjdGVkQnVuZGxlSGl0VGVzdFJlc3VsdD4gaW5qZWN0ZWRCdW5kbGVI aXRUZXN0UmVzdWx0ID0gSW5qZWN0ZWRCdW5kbGVIaXRUZXN0UmVzdWx0OjpjcmVhdGUoaGl0VGVz dFJlc3VsdCk7CiAgICAgaW5qZWN0ZWRCdW5kbGVDb250ZXh0TWVudUNsaWVudCgpLnByZXBhcmVG b3JBY3Rpb25NZW51KHRoaXMsIGluamVjdGVkQnVuZGxlSGl0VGVzdFJlc3VsdC5nZXQoKSwgdXNl ckRhdGEpOwogCi0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQWN0 aW9uTWVudUhpdFRlc3QoYWN0aW9uTWVudVJlc3VsdCwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2Fn ZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7CisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3QoYWN0aW9uTWVudVJlc3VsdCwgZm9ySW1t ZWRpYXRlQWN0aW9uLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5n ZXQoKSkpKTsKIH0KIAogUGFzc1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4gV2ViUGFnZTo6bG9va3Vw VGV4dEF0TG9jYXRpb24oRmxvYXRQb2ludCBsb2NhdGlvbkluVmlld0Nvb29yZGluYXRlcywgTlNE aWN0aW9uYXJ5ICoqb3B0aW9ucykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzUy MykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE0LTEyLTE4ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBOZWVkIHRvIHJlLWVuYWJsZSBhY3Rpb24gbWVudXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTc5NQorICAgICAgICAtYW5kIGNvcnJl c3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5Mjk5MzY3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmUtZW5hYmxlIHRoZSBtZW51cyBi eSB1bi1jb21tZW50aW5nIHRoZSBjb2RlIHRvIGNyZWF0ZSB0aGUgbWVudSBhbmQgY29udHJvbGxl ci4KKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2Nv bW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTpncm91cE5hbWU6XSk6CisKIDIwMTQtMTIt MTggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBh bHdheXNVc2VCYXNlbGluZU9mUHJpbWFyeUZvbnQgc2V0dGluZwpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTc3NDI4KQorKysgU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04ODYsMTMgKzg4NiwxMiBA QCAtICh2b2lkKV9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hCiAgICAgW2ZyYW1lVmll dyByZWxlYXNlXTsKIAogI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDEwMDAKLSAgICAvLyBGSVhNRTogVGVtcG9yYXJpbHkgZGlzYWJsZSBh Y3Rpb24gbWVudSBpbnN0YWxsYXRpb24uCi0gICAgLyppZiAoW3NlbGYgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihzZXRBY3Rpb25NZW51OildKSB7CisgICAgaWYgKFtzZWxmIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0QWN0aW9uTWVudTopXSkgewogICAgICAgICBSZXRhaW5Q dHI8TlNNZW51PiBhY3Rpb25NZW51ID0gYWRvcHROUyhbW05TTWVudSBhbGxvY10gaW5pdF0pOwog ICAgICAgICBzZWxmLmFjdGlvbk1lbnUgPSBhY3Rpb25NZW51LmdldCgpOwogICAgICAgICBfcHJp dmF0ZS0+YWN0aW9uTWVudUNvbnRyb2xsZXIgPSBbW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIGFs bG9jXSBpbml0V2l0aFdlYlZpZXc6c2VsZl07CiAgICAgICAgIHNlbGYuYWN0aW9uTWVudS5hdXRv ZW5hYmxlc0l0ZW1zID0gTk87Ci0gICAgfSovCisgICAgfQogCiAgICAgaWYgKENsYXNzIGdlc3R1 cmVDbGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAiTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVj b2duaXplciIpKSB7CiAgICAgICAgIFJldGFpblB0cjxOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVS ZWNvZ25pemVyPiByZWNvZ25pemVyID0gYWRvcHROUyhbKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVy ZVJlY29nbml6ZXIgKilbZ2VzdHVyZUNsYXNzIGFsbG9jXSBpbml0V2l0aFRhcmdldDpuaWwgYWN0 aW9uOk5VTExdKTsK