83620 2012-04-10 14:37:35 -0700 Media engine should not be told to prepare for playback if media loading is not allowed 2012-11-26 16:43:52 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ap feature-media-reviews qinmin vrk webkit-bug-importer webkit.review.bot oldest_to_newest 599654 0 eric.carlson 2012-04-10 14:37:35 -0700 r93437 add a call to prepareToPlay to HTMLMediaElement::load. prepareToPlay tells the media engine to begin buffering data, so it should not be called if media loading requires a user gesture and load() was not called from one. 601226 1 136912 eric.carlson 2012-04-12 07:54:01 -0700 Created attachment 136912 Proposed patch 601448 2 webkit-bug-importer 2012-04-12 12:54:40 -0700 <rdar://problem/11238726> 601533 3 eric.carlson 2012-04-12 14:19:43 -0700 http://trac.webkit.org/changeset/114021 775930 4 qinmin 2012-11-26 14:56:19 -0800 Hi, Eric, this change breaks all the youtube embeds on android. For example: http://apiblog.youtube.com/2010/07/new-way-to-embed-youtube-videos.html. And the actual submitted patch is not identical to the proposed patch. I am wondering whether we can either: 1. remove the exception throwing behavior? If an exception is thrown, no video control and no poster will be shown in chrome. And user will see a black square in the middle of a page. Or 2. Use the proposed patch, so that we have the RequireUserGestureForLoadRestriction flag. 775950 5 eric.carlson 2012-11-26 15:12:53 -0800 (In reply to comment #4) > Hi, Eric, this change breaks all the youtube embeds on android. For example: http://apiblog.youtube.com/2010/07/new-way-to-embed-youtube-videos.html. > > And the actual submitted patch is not identical to the proposed patch. > > I am wondering whether we can either: > 1. remove the exception throwing behavior? If an exception is thrown, no video control and no poster will be shown in chrome. And user will see a black square in the middle of a page. Or > > 2. Use the proposed patch, so that we have the RequireUserGestureForLoadRestriction flag. We should remove the exception because load() is no longer spec'd to throw. 776065 6 qinmin 2012-11-26 16:43:52 -0800 (In reply to comment #5) > (In reply to comment #4) > > Hi, Eric, this change breaks all the youtube embeds on android. For example: http://apiblog.youtube.com/2010/07/new-way-to-embed-youtube-videos.html. > > > > And the actual submitted patch is not identical to the proposed patch. > > > > I am wondering whether we can either: > > 1. remove the exception throwing behavior? If an exception is thrown, no video control and no poster will be shown in chrome. And user will see a black square in the middle of a page. Or > > > > 2. Use the proposed patch, so that we have the RequireUserGestureForLoadRestriction flag. > > We should remove the exception because load() is no longer spec'd to throw. Thanks, Eric. I created a patch for this: https://bugs.webkit.org/show_bug.cgi?id=103318 136912 2012-04-12 07:54:01 -0700 2012-04-12 09:34:10 -0700 Proposed patch patch_6.txt text/plain 13421 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA0LTEyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lZGlhIGVuZ2luZSBz aG91bGQgbm90IGJlIHRvbGQgdG8gcHJlcGFyZSBmb3IgcGxheWJhY2sgaWYgbWVkaWEgbG9hZGlu ZyBpcyBub3QgYWxsb3dlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODM2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1sb2FkLXJlcXVpcmUtdXNlci1nZXN0dXJlLmh0bWwK KworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50Ojpsb2FkKTogRWFybHkgcmV0dXJuIGlmIHVzZXIgZ2VzdHVyZSBy ZXF1aXJlbWVudCBpcyBub3QgbWV0LgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAg ICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNldE1lZGlhTG9hZGluZ1JlcXVpcmVzVXNlckdlc3R1 cmUpOiBBZGQgbmV3IHByZWZlcmVuY2Ugc2V0dGVyLgorICAgICAgICAoV2ViQ29yZTo6U2V0dGlu Z3M6Om1lZGlhTG9hZGluZ1JlcXVpcmVzVXNlckdlc3R1cmUpOiBBZGQgbmV3IHByZWZlcmVuY2Ug Z2V0dGVyLgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlKTogTW92ZWQgdGhlIG1ldGhvZCBoZXJlIGZyb20KKyAgICAgICAgICAgIEludGVy bmFscyB0byBiZSB3aXRoIHRoZSByZXN0IG9mIHRoZSBJbnRlcm5hbHMgbWV0aG9kcyB0aGF0IGV4 cG9zZSBwcmVmZXJlbmNlcy4KKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNl dE1lZGlhTG9hZGluZ1JlcXVpcmVzVXNlckdlc3R1cmUpOiBFeHBvc2Ugc2V0dGluZyB0byBhbGxv dyAKKyAgICAgICAgICAgIHRlc3Rpbmcgb2YgcmVzdHJpY3Rpb24gdGhhdCByZXF1aXJlcyBhIHVz ZXIgZ2VzdHVyZSB0byBpbml0aWF0ZSBkYXRhIGxvYWRpbmcuCisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbFNldHRpbmdzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmlk bDoKKworICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDogTW92ZWQgc2V0TWVkaWFQbGF5 YmFja1JlcXVpcmVzVXNlckdlc3R1cmUgdG8gSW50ZXJuYWxTZXR0aW5ncy4KKyAgICAgICAgKiB0 ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwog MjAxMi0wNC0xMiAgU2FtIEQgIDxkc2FtMjkxMkBnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogTm9kZSBWYWx1ZSBzaG91bGQgbm90IGdldCBjb3JydXB0IHdoaWxlIGp1bXAgb3Zl ciBkaWZmZXJlbnQgbWF0Y2hlcyBpbiBzZWFyY2guCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDExMzk3MCkKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2OSw2ICsyNjks OCBAQCBIVE1MTWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KGNvbnN0CiAgICAgCiAgICAg aWYgKGRvY3VtZW50LT5zZXR0aW5ncygpICYmIGRvY3VtZW50LT5zZXR0aW5ncygpLT5tZWRpYVBs YXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSgpKQogICAgICAgICBhZGRCZWhhdmlvclJlc3RyaWN0 aW9uKFJlcXVpcmVVc2VyR2VzdHVyZUZvclJhdGVDaGFuZ2VSZXN0cmljdGlvbik7CisgICAgaWYg KGRvY3VtZW50LT5zZXR0aW5ncygpICYmIGRvY3VtZW50LT5zZXR0aW5ncygpLT5tZWRpYUxvYWRp bmdSZXF1aXJlc1VzZXJHZXN0dXJlKCkpCisgICAgICAgIGFkZEJlaGF2aW9yUmVzdHJpY3Rpb24o UmVxdWlyZVVzZXJHZXN0dXJlRm9yTG9hZFJlc3RyaWN0aW9uKTsKIAogI2lmIEVOQUJMRShNRURJ QV9TT1VSQ0UpCiAgICAgbV9tZWRpYVNvdXJjZVVSTC5zZXRQcm90b2NvbChtZWRpYVNvdXJjZVVS TFByb3RvY29sKTsKQEAgLTYzNCwxNiArNjM2LDE3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 bG9hZChFeGNlcHRpb25Db2QKICAgICBSZWZQdHI8SFRNTE1lZGlhRWxlbWVudD4gcHJvdGVjdCh0 aGlzKTsgLy8gbG9hZEludGVybmFsIG1heSByZXN1bHQgaW4gYSAnYmVmb3JlbG9hZCcgZXZlbnQs IHdoaWNoIGNhbiBtYWtlIGFyYml0cmFyeSBET00gbXV0YXRpb25zLgogICAgIAogICAgIExPRyhN ZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWQoKSIpOwotCi0gICAgaWYgKHVzZXJHZXN0dXJl UmVxdWlyZWRGb3JMb2FkKCkgJiYgIVNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2Vz dHVyZSgpKQorICAgIAorICAgIGlmICh1c2VyR2VzdHVyZVJlcXVpcmVkRm9yTG9hZCgpICYmICFT Y3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkgewogICAgICAgICBlYyA9 IElOVkFMSURfU1RBVEVfRVJSOwotICAgIGVsc2UgewotICAgICAgICBtX2xvYWRJbml0aWF0ZWRC eVVzZXJHZXN0dXJlID0gU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCk7 Ci0gICAgICAgIGlmIChtX2xvYWRJbml0aWF0ZWRCeVVzZXJHZXN0dXJlKQotICAgICAgICAgICAg cmVtb3ZlQmVoYXZpb3JzUmVzdHJpY3Rpb25zQWZ0ZXJGaXJzdFVzZXJHZXN0dXJlKCk7Ci0gICAg ICAgIHByZXBhcmVGb3JMb2FkKCk7Ci0gICAgICAgIGxvYWRJbnRlcm5hbCgpOworICAgICAgICBy ZXR1cm47CiAgICAgfQorICAgIAorICAgIG1fbG9hZEluaXRpYXRlZEJ5VXNlckdlc3R1cmUgPSBT Y3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKTsKKyAgICBpZiAobV9sb2Fk SW5pdGlhdGVkQnlVc2VyR2VzdHVyZSkKKyAgICAgICAgcmVtb3ZlQmVoYXZpb3JzUmVzdHJpY3Rp b25zQWZ0ZXJGaXJzdFVzZXJHZXN0dXJlKCk7CisgICAgcHJlcGFyZUZvckxvYWQoKTsKKyAgICBs b2FkSW50ZXJuYWwoKTsKICAgICBwcmVwYXJlVG9QbGF5KCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmgJKHJldmlzaW9uIDExMzk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNDkwLDYgKzQ5MCw5IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgdm9pZCBzZXRNZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKGJvb2wgZmxh ZykgeyBtX21lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUgPSBmbGFnOyB9OwogICAgICAgICBib29s IG1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoKSBjb25zdCB7IHJldHVybiBtX21lZGlhUGxheWJh Y2tBbGxvd3NJbmxpbmU7IH0KIAorICAgICAgICB2b2lkIHNldE1lZGlhTG9hZGluZ1JlcXVpcmVz VXNlckdlc3R1cmUoYm9vbCBmbGFnKSB7IG1fbWVkaWFMb2FkaW5nUmVxdWlyZXNVc2VyR2VzdHVy ZSA9IGZsYWc7IH07CisgICAgICAgIGJvb2wgbWVkaWFMb2FkaW5nUmVxdWlyZXNVc2VyR2VzdHVy ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFMb2FkaW5nUmVxdWlyZXNVc2VyR2VzdHVyZTsgfQor CiAgICAgICAgIHZvaWQgc2V0UGFzc3dvcmRFY2hvRW5hYmxlZChib29sIGZsYWcpIHsgbV9wYXNz d29yZEVjaG9FbmFibGVkID0gZmxhZzsgfQogICAgICAgICBib29sIHBhc3N3b3JkRWNob0VuYWJs ZWQoKSBjb25zdCB7IHJldHVybiBtX3Bhc3N3b3JkRWNob0VuYWJsZWQ7IH0KIApAQCAtNjg2LDYg KzY4OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRpZgogICAgICAgICBib29sIG1fbWVk aWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUgOiAxOwogICAgICAgICBib29sIG1fbWVkaWFQ bGF5YmFja0FsbG93c0lubGluZSA6IDE7CisgICAgICAgIGJvb2wgbV9tZWRpYUxvYWRpbmdSZXF1 aXJlc1VzZXJHZXN0dXJlIDogMTsKICAgICAgICAgYm9vbCBtX3Bhc3N3b3JkRWNob0VuYWJsZWQg OiAxOwogICAgICAgICBib29sIG1fc3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nIDogMTsK ICAgICAgICAgYm9vbCBtX2JhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkIDogMTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAkocmV2aXNpb24g MTEzOTcwKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzE3LDQgKzMxNywxNiBAQCBib29sIEludGVybmFsU2V0dGluZ3M6 OnNjcm9sbEFuaW1hdG9yRW5hCiAjZW5kaWYKIH0KIAordm9pZCBJbnRlcm5hbFNldHRpbmdzOjpz ZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShib29sIGVuYWJsZWQsIEV4Y2VwdGlv bkNvZGUmIGVjKQoreworICAgIEludGVybmFsU2V0dGluZ3NHdWFyZEZvclNldHRpbmdzKCk7Cisg ICAgc2V0dGluZ3MoKS0+c2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUoZW5hYmxl ZCk7Cit9CisKK3ZvaWQgSW50ZXJuYWxTZXR0aW5nczo6c2V0TWVkaWFMb2FkaW5nUmVxdWlyZXNV c2VyR2VzdHVyZShib29sIGVuYWJsZWQsIEV4Y2VwdGlvbkNvZGUmIGVjKQoreworICAgIEludGVy bmFsU2V0dGluZ3NHdWFyZEZvclNldHRpbmdzKCk7CisgICAgc2V0dGluZ3MoKS0+c2V0TWVkaWFM b2FkaW5nUmVxdWlyZXNVc2VyR2VzdHVyZShlbmFibGVkKTsKK30KKwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmgJKHJldmlzaW9uIDExMzk3MCkKKysr IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkp CkBAIC03Miw2ICs3Miw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFBpY3RvZ3JhcGhGb250RmFt aWx5KGNvbnN0IFN0cmluZyYgZmFtaWx5LCBjb25zdCBTdHJpbmcmIHNjcmlwdCwgRXhjZXB0aW9u Q29kZSYpOwogICAgIHZvaWQgc2V0RW5hYmxlU2Nyb2xsQW5pbWF0b3IoYm9vbCBlbmFibGVkLCBF eGNlcHRpb25Db2RlJik7CiAgICAgYm9vbCBzY3JvbGxBbmltYXRvckVuYWJsZWQoRXhjZXB0aW9u Q29kZSYpOworICAgIHZvaWQgc2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUoYm9v bCwgRXhjZXB0aW9uQ29kZSYpOworICAgIHZvaWQgc2V0TWVkaWFMb2FkaW5nUmVxdWlyZXNVc2Vy R2VzdHVyZShib29sLCBFeGNlcHRpb25Db2RlJik7CiAKICAgICB2b2lkIHJlc3RvcmVUbyhTZXR0 aW5ncyopOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3Mu aWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5n cy5pZGwJKHJldmlzaW9uIDExMzk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxTZXR0aW5ncy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDggQEAgbW9kdWxlIHdp bmRvdyB7CiAgICAgICAgIHZvaWQgc2V0UGljdG9ncmFwaEZvbnRGYW1pbHkoaW4gRE9NU3RyaW5n IGZhbWlseSwgaW4gRE9NU3RyaW5nIHNjcmlwdCkgcmFpc2VzKERPTUV4Y2VwdGlvbik7CiAgICAg ICAgIHZvaWQgc2V0RW5hYmxlU2Nyb2xsQW5pbWF0b3IoaW4gYm9vbGVhbiBlbmFibGVkKSByYWlz ZXMoRE9NRXhjZXB0aW9uKTsKICAgICAgICAgYm9vbGVhbiBzY3JvbGxBbmltYXRvckVuYWJsZWQo KSByYWlzZXMoRE9NRXhjZXB0aW9uKTsKKyAgICAgICAgdm9pZCBzZXRNZWRpYVBsYXliYWNrUmVx dWlyZXNVc2VyR2VzdHVyZShpbiBib29sZWFuIGVuYWJsZWQpIHJhaXNlcyhET01FeGNlcHRpb24p OworICAgICAgICB2b2lkIHNldE1lZGlhTG9hZGluZ1JlcXVpcmVzVXNlckdlc3R1cmUoaW4gYm9v bGVhbiBlbmFibGVkKSByYWlzZXMoRE9NRXhjZXB0aW9uKTsKICAgICB9OwogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCShyZXZpc2lvbiAxMTM5NzApCisrKyBTb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczOSwx NiArNzM5LDYgQEAgaW50IEludGVybmFsczo6bGFzdFNwZWxsQ2hlY2tQcm9jZXNzZWRTZQogICAg IHJldHVybiBjaGVja2VyLT5sYXN0UHJvY2Vzc2VkU2VxdWVuY2UoKTsKIH0KIAotdm9pZCBJbnRl cm5hbHM6OnNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKERvY3VtZW50KiBkb2N1 bWVudCwgYm9vbCBlbmFibGVkLCBFeGNlcHRpb25Db2RlJiBlYykKLXsKLSAgICBpZiAoIWRvY3Vt ZW50IHx8ICFkb2N1bWVudC0+c2V0dGluZ3MoKSkgewotICAgICAgICBlYyA9IElOVkFMSURfQUND RVNTX0VSUjsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGRvY3VtZW50LT5zZXR0aW5n cygpLT5zZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShlbmFibGVkKTsKLX0KLQog VmVjdG9yPFN0cmluZz4gSW50ZXJuYWxzOjp1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzKCkgY29uc3QK IHsKICAgICByZXR1cm4gV2ViQ29yZTo6dXNlclByZWZlcnJlZExhbmd1YWdlcygpOwpJbmRleDog U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCShyZXZpc2lvbiAxMTM5NzApCisrKyBTb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsOCArMTMw LDYgQEAgcHVibGljOgogICAgIGludCBsYXN0U3BlbGxDaGVja1JlcXVlc3RTZXF1ZW5jZShEb2N1 bWVudCosIEV4Y2VwdGlvbkNvZGUmKTsKICAgICBpbnQgbGFzdFNwZWxsQ2hlY2tQcm9jZXNzZWRT ZXF1ZW5jZShEb2N1bWVudCosIEV4Y2VwdGlvbkNvZGUmKTsKICAgICAKLSAgICB2b2lkIHNldE1l ZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKERvY3VtZW50KiwgYm9vbCBlbmFibGVkLCBF eGNlcHRpb25Db2RlJik7Ci0KICAgICBWZWN0b3I8U3RyaW5nPiB1c2VyUHJlZmVycmVkTGFuZ3Vh Z2VzKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzKGNvbnN0IFZl Y3RvcjxTdHJpbmc+Jik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwJ KHJldmlzaW9uIDExMzk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlk bAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDggKzEwMyw2IEBAIG1vZHVsZSB3aW5kb3cgewogICAg ICAgICBsb25nIGxhc3RTcGVsbENoZWNrUmVxdWVzdFNlcXVlbmNlKGluIERvY3VtZW50IGRvY3Vt ZW50KSByYWlzZXMgKERPTUV4Y2VwdGlvbik7CiAgICAgICAgIGxvbmcgbGFzdFNwZWxsQ2hlY2tQ cm9jZXNzZWRTZXF1ZW5jZShpbiBEb2N1bWVudCBkb2N1bWVudCkgcmFpc2VzIChET01FeGNlcHRp b24pOwogCi0gICAgICAgIHZvaWQgc2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUo aW4gRG9jdW1lbnQgZG9jdW1lbnQsIGluIGJvb2xlYW4gZW5hYmxlZCkgcmFpc2VzKERPTUV4Y2Vw dGlvbik7Ci0KICNpZiBkZWZpbmVkKEVOQUJMRV9WSURFT19UUkFDSykgJiYgRU5BQkxFX1ZJREVP X1RSQUNLCiAgICAgICAgIHZvaWQgc2V0U2hvdWxkRGlzcGxheVRyYWNrS2luZChpbiBEb2N1bWVu dCBkb2N1bWVudCwgaW4gRE9NU3RyaW5nIGtpbmQsIGluIGJvb2xlYW4gZW5hYmxlZCkgcmFpc2Vz IChET01FeGNlcHRpb24pOwogICAgICAgICBib29sZWFuIHNob3VsZERpc3BsYXlUcmFja0tpbmQo aW4gRG9jdW1lbnQgZG9jdW1lbnQsIGluIERPTVN0cmluZyB0cmFja0tpbmQpIHJhaXNlcyAoRE9N RXhjZXB0aW9uKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzk3MCkKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTEyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lZGlhIGVuZ2lu ZSBzaG91bGQgbm90IGJlIHRvbGQgdG8gcHJlcGFyZSBmb3IgcGxheWJhY2sgaWYgbWVkaWEgbG9h ZGluZyBpcyBub3QgYWxsb3dlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODM2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIG1lZGlhL3ZpZGVvLWxvYWQtcmVxdWlyZS11c2VyLWdlc3R1cmUtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1sb2FkLXJlcXVpcmUtdXNlci1n ZXN0dXJlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3ZpZGVvLXBsYXktcmVxdWlyZS11 c2VyLWdlc3R1cmUuaHRtbDogVXBkYXRlIGZvciBtb3ZlIG9mIHNldE1lZGlhUGxheWJhY2tSZXF1 aXJlc1VzZXJHZXN0dXJlCisgICAgICAgICAgICBmcm9tIHdpbmRvdy5pbnRlcm5hbHMgdG8gd2lu ZG93LmludGVybmFscy5zZXR0aW5ncy4KKwogMjAxMi0wNC0xMiAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRyYWN0aW5n IE5ldHdvcmtSZXF1ZXN0IGZyb20gUmVzb3VyY2UgKHN0ZXAgMikKSW5kZXg6IExheW91dFRlc3Rz L21lZGlhL3ZpZGVvLWxvYWQtcmVxdWlyZS11c2VyLWdlc3R1cmUtZXhwZWN0ZWQudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWxvYWQtcmVxdWlyZS11c2VyLWdlc3R1 cmUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8t bG9hZC1yZXF1aXJlLXVzZXItZ2VzdHVyZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsOSBAQAorVGVzdCB0aGF0IHZpZGVvLmxvYWQoKSBzaG91bGQgbm90IGNhdXNlIG1lZGlh IGxvYWRpbmcgd2hlbiB1c2VyIGdlc3R1cmUgaXMgcmVxdWlyZWQuCisKKyogU2V0dGluZyB2aWRl by5zcmMsIG5vIGRhdGEgc2hvdWxkIGxvYWQuCisKKyogQ2FsbGluZyB2aWRlby5sb2FkKCkuIEl0 IHNob3VsZCB0aHJvdyBhbiBleGNlcHRpb24sIGFuZCBubyBkYXRhIHNob3VsZCBsb2FkLgorVEVT VCh2aWRlby5sb2FkKCkpIFRIUk9XUyhET01FeGNlcHRpb24uSU5WQUxJRF9TVEFURV9FUlIpIE9L CisKK0VORCBPRiBURVNUCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWxvYWQtcmVx dWlyZS11c2VyLWdlc3R1cmUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92 aWRlby1sb2FkLXJlcXVpcmUtdXNlci1nZXN0dXJlLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9tZWRpYS92aWRlby1sb2FkLXJlcXVpcmUtdXNlci1nZXN0dXJlLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNTYgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHN0 YXRlID0gMDsKKyAgICAgICAgICAgIHZhciB1c2VyR2VzdHVyZUluaXRpYXRlZCA9IDA7CisKKyAg ICAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSAKKyAgICAgICAgICAgICAgICB3aW5kb3cu aW50ZXJuYWxzLnNldHRpbmdzLnNldE1lZGlhTG9hZGluZ1JlcXVpcmVzVXNlckdlc3R1cmUoZG9j dW1lbnQsIHRydWUpOworCisgICAgICAgICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KHN1Y2Nlc3Mp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIAor ICAgICAgICAgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldE1lZGlhTG9h ZGluZ1JlcXVpcmVzVXNlckdlc3R1cmUoZG9jdW1lbnQsIGZhbHNlKTsKKworICAgICAgICAgICAg ICAgIGlmIChzdWNjZXNzKQorICAgICAgICAgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgiPGI+RGF0YSBsb2Fk ZWQgZGVzcGl0ZSByZXN0cmljdGlvbi48L2I+Iik7CisgICAgICAgICAgICB9CisKKyAgICAgICAg ICAgIGZ1bmN0aW9uIGNoZWNrTG9hZCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCIiKTsKKworICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PSAibG9hZCIp CisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBmaW5pc2hUZXN0KHRydWUp OworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIAorICAgICAgICAgICAgICAgIHN0YXRlID0gImxvYWQiOworICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiKiBDYWxsaW5nIHZpZGVvLmxvYWQoKS4gSXQgc2hvdWxkIHRocm93 IGFuIGV4Y2VwdGlvbiwgYW5kIG5vIGRhdGEgc2hvdWxkIGxvYWQuIik7CisgICAgICAgICAgICAg ICAgdGVzdEV4Y2VwdGlvbigidmlkZW8ubG9hZCgpIiwgIkRPTUV4Y2VwdGlvbi5JTlZBTElEX1NU QVRFX0VSUiIpOworICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoY2hlY2tMb2FkLCAyNTApOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBzdGFydCgpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAgICAgICAgICAgICAg IHdhaXRGb3JFdmVudCgnbG9hZGVkbWV0YWRhdGEnLCBmdW5jdGlvbigpIHsgZmluaXNoVGVzdChm YWxzZSkgfSApOworCisgICAgICAgICAgICAgICAgc3RhdGUgPSAic3JjIjsKKyAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIiogU2V0dGluZyB2aWRlby5zcmMsIG5vIGRhdGEgc2hvdWxkIGxv YWQuIik7CisgICAgICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8i LCAiY29udGVudC90ZXN0Iik7CisgICAgICAgICAgICAgICAgc2V0VGltZW91dChjaGVja0xvYWQs IDI1MCk7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKwor ICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyBwcmVs b2FkPW5vbmU+PC92aWRlbz4KKyAgICAgICAgPHA+VGVzdCB0aGF0IHZpZGVvLmxvYWQoKSBzaG91 bGQgbm90IGNhdXNlIG1lZGlhIGxvYWRpbmcgd2hlbiB1c2VyIGdlc3R1cmUgaXMgcmVxdWlyZWQu PC9wPgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVv LXBsYXktcmVxdWlyZS11c2VyLWdlc3R1cmUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9tZWRpYS92aWRlby1wbGF5LXJlcXVpcmUtdXNlci1nZXN0dXJlLmh0bWwJKHJldmlzaW9uIDEx Mzk3MCkKKysrIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBsYXktcmVxdWlyZS11c2VyLWdlc3R1 cmUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNywxMSArNywxMSBAQAogICAgICAgICA8c2NyaXB0 PgogICAgICAgICAgICAgdmFyIHVzZXJHZXN0dXJlSW5pdGlhdGVkID0gMDsKICAgICAgICAgICAg IGlmICh3aW5kb3cuaW50ZXJuYWxzKSAKLSAgICAgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxz LnNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKGRvY3VtZW50LCB0cnVlKTsKKyAg ICAgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldE1lZGlhUGxheWJhY2tS ZXF1aXJlc1VzZXJHZXN0dXJlKGRvY3VtZW50LCB0cnVlKTsKIAogICAgICAgICAgICAgZnVuY3Rp b24gY2xlYW5HZXN0dXJlUmVxdWlyZW1lbnQoKSB7CiAgICAgICAgICAgICAgICAgaWYgKHdpbmRv dy5pbnRlcm5hbHMpIAotICAgICAgICAgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldE1l ZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKGRvY3VtZW50LCBmYWxzZSk7CisgICAgICAg ICAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0TWVkaWFQbGF5YmFja1Jl cXVpcmVzVXNlckdlc3R1cmUoZG9jdW1lbnQsIGZhbHNlKTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgZnVuY3Rpb24gY2xpY2soKQo=