144983 2015-05-13 19:19:04 -0700 Get the ScriptController from the correct frame for media elements and plug-ins 2015-05-22 19:40:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino eric.carlson jer.noble mark.lam sam simon.fraser oldest_to_newest 1094690 0 simon.fraser 2015-05-13 19:19:04 -0700 Get the ScriptController from the correct frame for media elements and plug-ins 1094691 1 253083 simon.fraser 2015-05-13 19:21:59 -0700 Created attachment 253083 Patch 1094692 2 253084 simon.fraser 2015-05-13 19:23:05 -0700 Created attachment 253084 Patch 1094694 3 simon.fraser 2015-05-13 19:24:16 -0700 rdar://problem/19943135 1094697 4 simon.fraser 2015-05-13 19:28:12 -0700 *** Bug 141983 has been marked as a duplicate of this bug. *** 1094725 5 253084 commit-queue 2015-05-13 22:12:23 -0700 Comment on attachment 253084 Patch Clearing flags on attachment: 253084 Committed r184329: <http://trac.webkit.org/changeset/184329> 1094726 6 commit-queue 2015-05-13 22:12:27 -0700 All reviewed patches have been landed. Closing bug. 1097033 7 mark.lam 2015-05-22 19:40:03 -0700 There's a residual issue with using the wrong frame. The issue is tracked here: https://bugs.webkit.org/show_bug.cgi?id=145328. 253083 2015-05-13 19:21:59 -0700 2015-05-13 19:23:03 -0700 Patch bug-144983-20150513192036.patch text/plain 7651 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmYTk4Y2U4YWE0OTMx NzM0MTkyNjIzMDY3ZThjZDk2NzUxNjMxMS4uZDU3ZGIwNWNhOGJhMTQyNTBmNjI0Y2ZmM2QxMjI4 ODM1Zjk5YTgxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTA1LTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEdldCB0aGUgU2Ny aXB0Q29udHJvbGxlciBmcm9tIHRoZSBjb3JyZWN0IGZyYW1lIGZvciBtZWRpYSBlbGVtZW50cyBh bmQgcGx1Zy1pbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NDk4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEhUTUxNZWRpYUVsZW1lbnQsIFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50IGFuZCBIVE1M UGx1Z0luSW1hZ2VFbGVtZW50IHdlcmUKKyAgICAgICAgZ2V0dGluZyB0aGUgbWFpbiBmcmFtZSdz IFNjcmlwdENvbnRyb2xsZXIgaW5zdGVhZCBvZiB0aGUgb25lIGZvciB0aGVpciBmcmFtZS4KKyAg ICAgICAgVGhpcyBjYXVzZWQgbWVkaWEgY29udHJvbHMgSlMgdG8gYmUgcnVubmluZyBpbiB0aGUg Y29udGV4dCBvZiB0aGUgbWFpbiBmcmFtZSwKKyAgICAgICAgd2hpY2ggYnJva2UgbWVkaWEgY29u dHJvbHMgd2hpY2ggdXNlIGdldENTU0NhbnZhc0NvbnRleHQoKSBhbmQgLXdlYmtpdC1jYW52YXMu CisgICAgICAgIAorICAgICAgICBGaXggYnkgZ2V0dGluZyB0aGUgZnJhbWUgdmlhIHRoZSBlbGVt ZW50J3MgZG9jdW1lbnQuCisgICAgICAgIAorICAgICAgICBBbHNvIHVuZG8gcjE4MDU4NCB3aGlj aCB3YXMgd29ya2luZyBhcm91bmQgdGhpcyBidWcuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qczoKKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJv dG90eXBlLmRyYXdUaW1lbGluZUJhY2tncm91bmQpOgorICAgICAgICAqIE1vZHVsZXMvcGx1Z2lu cy9RdWlja1RpbWVQbHVnaW5SZXBsYWNlbWVudC5tbToKKyAgICAgICAgKFdlYkNvcmU6OlF1aWNr VGltZVBsdWdpblJlcGxhY2VtZW50OjplbnN1cmVSZXBsYWNlbWVudFNjcmlwdEluamVjdGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50OjppbnN0YWxsUmVw bGFjZW1lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVDYXB0aW9uQ29udGFpbmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmpl Y3RlZFNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRV c2VyQWdlbnRTaGFkb3dSb290KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdl RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojpk aWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KToKKwogMjAxNS0wNS0xMSAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTbWFsbCB0aWR5dXAgaW4gYW5pbWF0 aW9ucyBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvbWVkaWFDb250cm9sc2lPUy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250 cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzCmluZGV4IGY4NzZmMGIxODE4OWE4Yjg4ZDEyYjg2NzRi NGE0ZTUzZmUzZDU1YTcuLjk2Yzc3ZDI0YWFmYWUzY2JkOTY3YjUzY2VkZDEyZWUxODhlY2Q1N2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNv bnRyb2xzaU9TLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzaU9TLmpzCkBAIC0yNTYsNyArMjU2LDcgQEAgQ29udHJvbGxlcklPUy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGJ1ZmZlcmVkIC89IHRoaXMudmlkZW8uZHVyYXRpb247CiAgICAg ICAgIGJ1ZmZlcmVkID0gTWF0aC5tYXgoYnVmZmVyZWQsIHBsYXllZCk7CiAKLSAgICAgICAgdmFy IGN0eCA9IHRoaXMudmlkZW8ub3duZXJEb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCcyZCcs IHRoaXMudGltZWxpbmVDb250ZXh0TmFtZSwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgIHZhciBj dHggPSBkb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCcyZCcsIHRoaXMudGltZWxpbmVDb250 ZXh0TmFtZSwgd2lkdGgsIGhlaWdodCk7CiAKICAgICAgICAgY3R4LmNsZWFyUmVjdCgwLCAwLCB3 aWR0aCwgaGVpZ2h0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVn aW5zL1F1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9wbHVnaW5zL1F1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50Lm1tCmluZGV4IGQ0NmI3NzA2YjI3 NjBiZWViYmRmMjU0ZmIyZWJhZDRmODlkZTQwY2YuLmYyYWFlZTYzY2ZiYjljNTU4ZjA1N2U4ZjQ2 M2FiYzU1MmY4ZjFlZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGx1Z2lu cy9RdWlja1RpbWVQbHVnaW5SZXBsYWNlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3BsdWdpbnMvUXVpY2tUaW1lUGx1Z2luUmVwbGFjZW1lbnQubW0KQEAgLTE0OCwxMiArMTQ4 LDExIEBAIERPTVdyYXBwZXJXb3JsZCYgUXVpY2tUaW1lUGx1Z2luUmVwbGFjZW1lbnQ6Omlzb2xh dGVkV29ybGQoKQogCiBib29sIFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50OjplbnN1cmVSZXBs YWNlbWVudFNjcmlwdEluamVjdGVkKCkKIHsKLSAgICBQYWdlKiBwYWdlID0gbV9wYXJlbnRFbGVt ZW50LT5kb2N1bWVudCgpLnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UpCisgICAgaWYgKCFtX3BhcmVu dEVsZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IAogICAgIERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBpc29sYXRlZFdvcmxkKCk7Ci0gICAgU2Ny aXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlw dCgpOworICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBtX3BhcmVudEVs ZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUoKS0+c2NyaXB0KCk7CiAgICAgSlNET01HbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0 Q29udHJvbGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhl YyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxv Y2soZXhlYyk7CkBAIC0xNzQsMTMgKzE3MywxNCBAQCBib29sIFF1aWNrVGltZVBsdWdpblJlcGxh Y2VtZW50OjplbnN1cmVSZXBsYWNlbWVudFNjcmlwdEluamVjdGVkKCkKIAogYm9vbCBRdWlja1Rp bWVQbHVnaW5SZXBsYWNlbWVudDo6aW5zdGFsbFJlcGxhY2VtZW50KFNoYWRvd1Jvb3QqIHJvb3Qp CiB7Ci0gICAgUGFnZSogcGFnZSA9IG1fcGFyZW50RWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCk7 Ci0KICAgICBpZiAoIWVuc3VyZVJlcGxhY2VtZW50U2NyaXB0SW5qZWN0ZWQoKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFtX3BhcmVudEVsZW1lbnQtPmRvY3VtZW50KCkuZnJh bWUoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgRE9NV3JhcHBlcldvcmxkJiB3b3Js ZCA9IGlzb2xhdGVkV29ybGQoKTsKLSAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250cm9s bGVyID0gcGFnZS0+bWFpbkZyYW1lKCkuc2NyaXB0KCk7CisgICAgU2NyaXB0Q29udHJvbGxlciYg c2NyaXB0Q29udHJvbGxlciA9IG1fcGFyZW50RWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpLT5z Y3JpcHQoKTsKICAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nh c3Q8SlNET01HbG9iYWxPYmplY3QqPihzY3JpcHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3Js ZCkpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVj KCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayhleGVjKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDRlNGU2NzY1ZTliYTJlNGVmNGU1YWY1MmZjODBk NTViNjBjMDdiZmUuLjZmNjI3YzZkODA4Yzg0YzFlNTAzOThkYzc4MDU3MTZmYWI4Y2I3MjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzcyNSw3ICszNzI1 LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVDYXB0aW9uQ29udGFpbmVyKCkKICAg ICBpZiAoIW1fbWVkaWFDb250cm9sc0hvc3QpCiAgICAgICAgIG1fbWVkaWFDb250cm9sc0hvc3Qg PSBNZWRpYUNvbnRyb2xzSG9zdDo6Y3JlYXRlKHRoaXMpOwogCi0gICAgU2NyaXB0Q29udHJvbGxl ciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNj cmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPnNj cmlwdCgpOwogICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2Fz dDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdvcmxk KSk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMo KTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOwpAQCAtNTk0Nyw3ICs1OTQ3LDcg QEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3Jp cHQoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBET01XcmFwcGVyV29ybGQmIHdvcmxk ID0gZW5zdXJlSXNvbGF0ZWRXb3JsZCgpOwotICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENv bnRyb2xsZXIgPSBwYWdlLT5tYWluRnJhbWUoKS5zY3JpcHQoKTsKKyAgICBTY3JpcHRDb250cm9s bGVyJiBzY3JpcHRDb250cm9sbGVyID0gZG9jdW1lbnQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAg ICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9i YWxPYmplY3QqPihzY3JpcHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkpOwogICAgIEpT Qzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlND OjpKU0xvY2tIb2xkZXIgbG9jayhleGVjKTsKQEAgLTU5OTAsNyArNTk5MCw3IEBAIHZvaWQgSFRN TE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290 KQogICAgIGlmICghZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBwYWdl LT5tYWluRnJhbWUoKS5zY3JpcHQoKTsKKyAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250 cm9sbGVyID0gZG9jdW1lbnQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAgICBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihzY3Jp cHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBl eGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIg bG9jayhleGVjKTsKQEAgLTYwNzcsNyArNjA3Nyw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgpCiAKICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVt ZW50OjpwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCVwKSA9ICVmIiwgdGhpcywgcGFnZS0+cGFnZVNj YWxlRmFjdG9yKCkpOwogICAgIERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBlbnN1cmVJc29sYXRl ZFdvcmxkKCk7Ci0gICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2Ut Pm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRy b2xsZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPnNjcmlwdCgpOwogICAgIEpTRE9NR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlw dENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdvcmxkKSk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4 ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBs b2NrKGV4ZWMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1h Z2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVu dC5jcHAKaW5kZXggMTE5MDUxM2E5ZmRlNDMxNzZhNWNmYTRhMzZmNDgyMjE5YjEzMGFlNS4uY2Ni ODAwYzQzOGIxMGQ1ZjZkNTFkN2RhOWNhZmJkMjFmZWNlMWNmYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCkBAIC0zNzksNyArMzc5LDcgQEAg dm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNo YWRvd1Jvb3QqIHJvb3QpCiAgICAgRE9NV3JhcHBlcldvcmxkJiBpc29sYXRlZFdvcmxkID0gcGx1 Z0luSW1hZ2VFbGVtZW50SXNvbGF0ZWRXb3JsZCgpOwogICAgIGRvY3VtZW50KCkuZW5zdXJlUGx1 Z0luc0luamVjdGVkU2NyaXB0KGlzb2xhdGVkV29ybGQpOwogCi0gICAgU2NyaXB0Q29udHJvbGxl ciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNj cmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPnNj cmlwdCgpOwogICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2Fz dDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KGlzb2xh dGVkV29ybGQpKTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xv YmFsRXhlYygpOwogCg== 253084 2015-05-13 19:23:05 -0700 2015-05-13 22:12:23 -0700 Patch bug-144983-20150513192142.patch text/plain 7693 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmYTk4Y2U4YWE0OTMx NzM0MTkyNjIzMDY3ZThjZDk2NzUxNjMxMS4uMDQzYmQ5MjVhMWYyY2FmMWRmNmExODkxMDQzZTc5 YTM3MzkzYjE1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA1LTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEdldCB0aGUgU2Ny aXB0Q29udHJvbGxlciBmcm9tIHRoZSBjb3JyZWN0IGZyYW1lIGZvciBtZWRpYSBlbGVtZW50cyBh bmQgcGx1Zy1pbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NDk4MworICAgICAgICByZGFyOi8vcHJvYmxlbS8yMDY5MjY0MiYxOTk0MzEzNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhUTUxNZWRpYUVs ZW1lbnQsIFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50IGFuZCBIVE1MUGx1Z0luSW1hZ2VFbGVt ZW50IHdlcmUKKyAgICAgICAgZ2V0dGluZyB0aGUgbWFpbiBmcmFtZSdzIFNjcmlwdENvbnRyb2xs ZXIgaW5zdGVhZCBvZiB0aGUgb25lIGZvciB0aGVpciBmcmFtZS4KKyAgICAgICAgVGhpcyBjYXVz ZWQgbWVkaWEgY29udHJvbHMgSlMgdG8gYmUgcnVubmluZyBpbiB0aGUgY29udGV4dCBvZiB0aGUg bWFpbiBmcmFtZSwKKyAgICAgICAgd2hpY2ggYnJva2UgbWVkaWEgY29udHJvbHMgd2hpY2ggdXNl IGdldENTU0NhbnZhc0NvbnRleHQoKSBhbmQgLXdlYmtpdC1jYW52YXMuCisgICAgICAgIAorICAg ICAgICBGaXggYnkgZ2V0dGluZyB0aGUgZnJhbWUgdmlhIHRoZSBlbGVtZW50J3MgZG9jdW1lbnQu CisgICAgICAgIAorICAgICAgICBBbHNvIHVuZG8gcjE4MDU4NCB3aGljaCB3YXMgd29ya2luZyBh cm91bmQgdGhpcyBidWcuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc2lPUy5qczoKKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmRyYXdUaW1l bGluZUJhY2tncm91bmQpOgorICAgICAgICAqIE1vZHVsZXMvcGx1Z2lucy9RdWlja1RpbWVQbHVn aW5SZXBsYWNlbWVudC5tbToKKyAgICAgICAgKFdlYkNvcmU6OlF1aWNrVGltZVBsdWdpblJlcGxh Y2VtZW50OjplbnN1cmVSZXBsYWNlbWVudFNjcmlwdEluamVjdGVkKToKKyAgICAgICAgKFdlYkNv cmU6OlF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50OjppbnN0YWxsUmVwbGFjZW1lbnQpOgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVDYXB0aW9uQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dS b290KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3Rv ckNoYW5nZWQpOgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRT aGFkb3dSb290KToKKwogMjAxNS0wNS0xMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBTbWFsbCB0aWR5dXAgaW4gYW5pbWF0aW9ucyBjb2RlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9s c2lPUy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRy b2xzaU9TLmpzCmluZGV4IGY4NzZmMGIxODE4OWE4Yjg4ZDEyYjg2NzRiNGE0ZTUzZmUzZDU1YTcu Ljk2Yzc3ZDI0YWFmYWUzY2JkOTY3YjUzY2VkZDEyZWUxODhlY2Q1N2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9T LmpzCkBAIC0yNTYsNyArMjU2LDcgQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGJ1ZmZlcmVkIC89IHRoaXMudmlkZW8uZHVyYXRpb247CiAgICAgICAgIGJ1ZmZlcmVkID0g TWF0aC5tYXgoYnVmZmVyZWQsIHBsYXllZCk7CiAKLSAgICAgICAgdmFyIGN0eCA9IHRoaXMudmlk ZW8ub3duZXJEb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCcyZCcsIHRoaXMudGltZWxpbmVD b250ZXh0TmFtZSwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgIHZhciBjdHggPSBkb2N1bWVudC5n ZXRDU1NDYW52YXNDb250ZXh0KCcyZCcsIHRoaXMudGltZWxpbmVDb250ZXh0TmFtZSwgd2lkdGgs IGhlaWdodCk7CiAKICAgICAgICAgY3R4LmNsZWFyUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVnaW5zL1F1aWNrVGltZVBs dWdpblJlcGxhY2VtZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wbHVnaW5zL1F1aWNr VGltZVBsdWdpblJlcGxhY2VtZW50Lm1tCmluZGV4IGQ0NmI3NzA2YjI3NjBiZWViYmRmMjU0ZmIy ZWJhZDRmODlkZTQwY2YuLmYyYWFlZTYzY2ZiYjljNTU4ZjA1N2U4ZjQ2M2FiYzU1MmY4ZjFlZjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGx1Z2lucy9RdWlja1RpbWVQbHVn aW5SZXBsYWNlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BsdWdpbnMvUXVp Y2tUaW1lUGx1Z2luUmVwbGFjZW1lbnQubW0KQEAgLTE0OCwxMiArMTQ4LDExIEBAIERPTVdyYXBw ZXJXb3JsZCYgUXVpY2tUaW1lUGx1Z2luUmVwbGFjZW1lbnQ6Omlzb2xhdGVkV29ybGQoKQogCiBi b29sIFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50OjplbnN1cmVSZXBsYWNlbWVudFNjcmlwdElu amVjdGVkKCkKIHsKLSAgICBQYWdlKiBwYWdlID0gbV9wYXJlbnRFbGVtZW50LT5kb2N1bWVudCgp LnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UpCisgICAgaWYgKCFtX3BhcmVudEVsZW1lbnQtPmRvY3Vt ZW50KCkuZnJhbWUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIERPTVdyYXBw ZXJXb3JsZCYgd29ybGQgPSBpc29sYXRlZFdvcmxkKCk7Ci0gICAgU2NyaXB0Q29udHJvbGxlciYg c2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNjcmlw dENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBtX3BhcmVudEVsZW1lbnQtPmRvY3VtZW50 KCkuZnJhbWUoKS0+c2NyaXB0KCk7CiAgICAgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCA9IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0Q29udHJvbGxlci5nbG9i YWxPYmplY3Qod29ybGQpKTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVj dC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soZXhlYyk7CkBAIC0x NzQsMTMgKzE3MywxNCBAQCBib29sIFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50OjplbnN1cmVS ZXBsYWNlbWVudFNjcmlwdEluamVjdGVkKCkKIAogYm9vbCBRdWlja1RpbWVQbHVnaW5SZXBsYWNl bWVudDo6aW5zdGFsbFJlcGxhY2VtZW50KFNoYWRvd1Jvb3QqIHJvb3QpCiB7Ci0gICAgUGFnZSog cGFnZSA9IG1fcGFyZW50RWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCk7Ci0KICAgICBpZiAoIWVu c3VyZVJlcGxhY2VtZW50U2NyaXB0SW5qZWN0ZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CisgICAgaWYgKCFtX3BhcmVudEVsZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCiAgICAgRE9NV3JhcHBlcldvcmxkJiB3b3JsZCA9IGlzb2xhdGVkV29y bGQoKTsKLSAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250cm9sbGVyID0gcGFnZS0+bWFp bkZyYW1lKCkuc2NyaXB0KCk7CisgICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxl ciA9IG1fcGFyZW50RWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAgICBK U0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9iYWxP YmplY3QqPihzY3JpcHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkpOwogICAgIEpTQzo6 RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpK U0xvY2tIb2xkZXIgbG9jayhleGVjKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCmluZGV4IDRlNGU2NzY1ZTliYTJlNGVmNGU1YWY1MmZjODBkNTViNjBjMDdiZmUuLjZm NjI3YzZkODA4Yzg0YzFlNTAzOThkYzc4MDU3MTZmYWI4Y2I3MjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzcyNSw3ICszNzI1LDcgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVDYXB0aW9uQ29udGFpbmVyKCkKICAgICBpZiAoIW1fbWVkaWFD b250cm9sc0hvc3QpCiAgICAgICAgIG1fbWVkaWFDb250cm9sc0hvc3QgPSBNZWRpYUNvbnRyb2xz SG9zdDo6Y3JlYXRlKHRoaXMpOwogCi0gICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJv bGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNjcmlwdENvbnRyb2xsZXIm IHNjcmlwdENvbnRyb2xsZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPnNjcmlwdCgpOwogICAgIEpT RE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9i amVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdvcmxkKSk7CiAgICAgSlNDOjpF eGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpT TG9ja0hvbGRlciBsb2NrKGV4ZWMpOwpAQCAtNTk0Nyw3ICs1OTQ3LDcgQEAgYm9vbCBIVE1MTWVk aWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQoKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBET01XcmFwcGVyV29ybGQmIHdvcmxkID0gZW5zdXJlSXNvbGF0 ZWRXb3JsZCgpOwotICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBwYWdl LT5tYWluRnJhbWUoKS5zY3JpcHQoKTsKKyAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250 cm9sbGVyID0gZG9jdW1lbnQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAgICBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihzY3Jp cHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBl eGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIg bG9jayhleGVjKTsKQEAgLTU5OTAsNyArNTk5MCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290KQogICAgIGlmICghZW5z dXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBwYWdlLT5tYWluRnJhbWUoKS5z Y3JpcHQoKTsKKyAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250cm9sbGVyID0gZG9jdW1l bnQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihzY3JpcHRDb250cm9sbGVyLmds b2JhbE9iamVjdCh3b3JsZCkpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2Jq ZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayhleGVjKTsKQEAg LTYwNzcsNyArNjA3Nyw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGFnZVNjYWxlRmFjdG9y Q2hhbmdlZCgpCiAKICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpwYWdlU2NhbGVG YWN0b3JDaGFuZ2VkKCVwKSA9ICVmIiwgdGhpcywgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOwog ICAgIERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBlbnN1cmVJc29sYXRlZFdvcmxkKCk7Ci0gICAg U2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNj cmlwdCgpOworICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdENvbnRyb2xsZXIgPSBkb2N1bWVu dCgpLmZyYW1lKCktPnNjcmlwdCgpOwogICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmpl Y3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xv YmFsT2JqZWN0KHdvcmxkKSk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmpl Y3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggMTE5 MDUxM2E5ZmRlNDMxNzZhNWNmYTRhMzZmNDgyMjE5YjEzMGFlNS4uY2NiODAwYzQzOGIxMGQ1ZjZk NTFkN2RhOWNhZmJkMjFmZWNlMWNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQ bHVnSW5JbWFnZUVsZW1lbnQuY3BwCkBAIC0zNzksNyArMzc5LDcgQEAgdm9pZCBIVE1MUGx1Z0lu SW1hZ2VFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3Qp CiAgICAgRE9NV3JhcHBlcldvcmxkJiBpc29sYXRlZFdvcmxkID0gcGx1Z0luSW1hZ2VFbGVtZW50 SXNvbGF0ZWRXb3JsZCgpOwogICAgIGRvY3VtZW50KCkuZW5zdXJlUGx1Z0luc0luamVjdGVkU2Ny aXB0KGlzb2xhdGVkV29ybGQpOwogCi0gICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJv bGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIFNjcmlwdENvbnRyb2xsZXIm IHNjcmlwdENvbnRyb2xsZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPnNjcmlwdCgpOwogICAgIEpT RE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9i amVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KGlzb2xhdGVkV29ybGQpKTsKICAg ICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogCg==