94453 2012-08-20 01:26:00 -0700 [V8] Move mainWorldContext() from V8Proxy to ScriptController 2012-08-20 15:42:55 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85330 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 699310 0 haraken 2012-08-20 01:26:00 -0700 We can move mainWorldContext() from V8Proxy to ScriptController. This change also enables us to remove dependency on V8Proxy from WorldContextHandle. 699317 1 159364 haraken 2012-08-20 01:39:08 -0700 Created attachment 159364 Patch 700089 2 159364 webkit.review.bot 2012-08-20 15:42:51 -0700 Comment on attachment 159364 Patch Clearing flags on attachment: 159364 Committed r126083: <http://trac.webkit.org/changeset/126083> 700090 3 webkit.review.bot 2012-08-20 15:42:55 -0700 All reviewed patches have been landed. Closing bug. 159364 2012-08-20 01:39:08 -0700 2012-08-20 15:42:51 -0700 Patch bug-94453-20120820173829.patch text/plain 14603 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg3OTdiMWE5MjJkM2M3 M2ZhN2M0OGI2NGE0Mjg0MDU0OGQ5YzM2MC4uZDM3YTE4ZDJmMzIxZWZhMTEwZGE2ZWViOTdjY2Iz MDg1NjNiOGIwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA4LTIwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1vdmUgbWFp bldvcmxkQ29udGV4dCgpIGZyb20gVjhQcm94eSB0byBTY3JpcHRDb250cm9sbGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQ1MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbW92ZXMg bWFpbldvcmxkQ29udGV4dCgpIGZyb20gVjhQcm94eSB0byBTY3JpcHRDb250cm9sbGVyLgorICAg ICAgICBJbiBhZGRpdGlvbiwgdGhpcyBwYXRjaCByZW1vdmVzIGRlcGVuZGVuY3kgb24gVjhQcm94 eSBmcm9tIFdvcmxkQ29udGV4dEhhbmRsZS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdl IGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGluZ3MvdjgvRE9NVHJhbnNhY3Rpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RE9NVHJhbnNhY3Rpb246OmNhbGxGdW5jdGlvbik6CisgICAg ICAgICogYmluZGluZ3MvdjgvTlBWOE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1Y4 Q29udGV4dCk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjptYWluV29ybGRDb250ZXh0KToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6YmluZFRvV2luZG93 T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpjcmVhdGVTY3JpcHRPYmplY3RGb3JQbHVnaW5F bGVtZW50KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmg6CisgICAg ICAgIChTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjptYWluV29ybGRTY3JpcHRTdGF0ZSk6CisgICAgICAg ICogYmluZGluZ3MvdjgvVjhMYXp5RXZlbnRMaXN0ZW5lci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpWOExhenlFdmVudExpc3RlbmVyOjpwcmVwYXJlTGlzdGVuZXJPYmplY3QpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6Y29u dGV4dCk6CisgICAgICAgIChXZWJDb3JlOjp0b1Y4Q29udGV4dCk6CisgICAgICAgICogYmluZGlu Z3MvdjgvVjhQcm94eS5oOgorICAgICAgICAoVjhQcm94eSk6CisgICAgICAgICogYmluZGluZ3Mv djgvV29ybGRDb250ZXh0SGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmxkQ29udGV4 dEhhbmRsZTo6YWRqdXN0ZWRDb250ZXh0KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9Xb3JsZENv bnRleHRIYW5kbGUuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV29ybGRDb250ZXh0 SGFuZGxlKToKKwogMjAxMi0wOC0xOSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgW1Y4XSBNb3ZlIGNvbnRleHREZWJ1Z0lkKCkgYW5kIHNldENvbnRleHRE ZWJ1Z0lkKCkgZnJvbSBWOFByb3h5IHRvIFNjcmlwdENvbnRyb2xsZXIKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggN2QzNmQ5ODRlMzZmZTljZDk5ZmU5Y2QxZGJkODU3ZDYzN2ZkNTIzYi4u ZTc3ZDkyOWE4MzE0OWIzNTg4NmRjZTIzOTQyMWI3OGFmYWNlODVkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wOC0yMCAgS2VudGFybyBIYXJhICA8 aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1Y4XSBNb3ZlIG1haW5Xb3JsZENvbnRl eHQoKSBmcm9tIFY4UHJveHkgdG8gU2NyaXB0Q29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ0NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIG1haW5Xb3JsZENv bnRleHQoKSBmcm9tIFY4UHJveHkgdG8gU2NyaXB0Q29udHJvbGxlci4KKyAgICAgICAgSW4gYWRk aXRpb24sIHRoaXMgcGF0Y2ggcmVtb3ZlcyBkZXBlbmRlbmN5IG9uIFY4UHJveHkgZnJvbSBXb3Js ZENvbnRleHRIYW5kbGUuCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlv ci4KKworICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJGcmFtZUltcGw6Om1haW5Xb3JsZFNjcmlwdENvbnRleHQpOgorCiAyMDEyLTA4LTE5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIE1vdmUgY29u dGV4dERlYnVnSWQoKSBhbmQgc2V0Q29udGV4dERlYnVnSWQoKSBmcm9tIFY4UHJveHkgdG8gU2Ny aXB0Q29udHJvbGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9N VHJhbnNhY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NVHJhbnNhY3Rp b24uY3BwCmluZGV4IDdiODhkZjlkZDlmY2RkYmNmN2EzZTQ4OGNkNTIwY2ZlODQxMGE3MjMuLjA4 OTE5YzI2N2U1YTZkNDI3OTI4MGUyOWZkODc3ZjhmMTcxMmRiNWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTVRyYW5zYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9ET01UcmFuc2FjdGlvbi5jcHAKQEAgLTEwNSw3ICsxMDUsNyBAQCB2 b2lkIERPTVRyYW5zYWN0aW9uOjpjYWxsRnVuY3Rpb24oY29uc3QgY2hhciogcHJvcGVydHlOYW1l KQogICAgIGlmIChmdW5jdGlvbi5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHY4 OjpMb2NhbDx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gbV93b3JsZENvbnRleHQuYWRqdXN0ZWRD b250ZXh0KGZyYW1lLT5zY3JpcHQoKS0+cHJveHkoKSk7CisgICAgdjg6OkxvY2FsPHY4OjpDb250 ZXh0PiB2OENvbnRleHQgPSBtX3dvcmxkQ29udGV4dC5hZGp1c3RlZENvbnRleHQoZnJhbWUtPnNj cmlwdCgpKTsKICAgICBpZiAodjhDb250ZXh0LklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuY3BwCmluZGV4IGI5Nzk5MWNj ZmI5ZTJlMGMzNGYxOGZiOTcyZTEyMTYyYWRiOWY2N2UuLmFmN2Q5OWU3ZWVhMjgyMDBmY2U5YzEx NjIxOGZjNjBhZWRlYjc2OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L05QVjhPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmpl Y3QuY3BwCkBAIC02Niw3ICs2Niw3IEBAIHN0YXRpYyB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IHRv VjhDb250ZXh0KE5QUCBucHAsIE5QT2JqZWN0KiBucE9iamVjdCkKICAgICBET01XaW5kb3cqIHdp bmRvdyA9IG9iamVjdC0+cm9vdE9iamVjdDsKICAgICBpZiAoIXdpbmRvdyB8fCAhd2luZG93LT5p c0N1cnJlbnRseURpc3BsYXllZEluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2 ODo6Q29udGV4dD4oKTsKLSAgICByZXR1cm4gVjhQcm94eTo6bWFpbldvcmxkQ29udGV4dChvYmpl Y3QtPnJvb3RPYmplY3QtPmZyYW1lKCkpOworICAgIHJldHVybiBTY3JpcHRDb250cm9sbGVyOjpt YWluV29ybGRDb250ZXh0KG9iamVjdC0+cm9vdE9iamVjdC0+ZnJhbWUoKSk7CiB9CiAKIHN0YXRp YyBWOFByb3h5KiB0b1Y4UHJveHkoTlBPYmplY3QqIG5wT2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCA2MDZjZGMzYTk3NDc4 ZTY1MDA4OTdhZWNhZDFjYWExNDkwNTQxYjkwLi42ZTg0NzQ0OWMwYzU0OWYwNzlmMDczYjczZTMx ODNlMTY0NTBkZjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3Jp cHRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRD b250cm9sbGVyLmNwcApAQCAtMjU2LDcgKzI1Niw3IEBAIFNjcmlwdFZhbHVlIFNjcmlwdENvbnRy b2xsZXI6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZUNvZGUpCiAgICAg bV9zb3VyY2VVUkwgPSAmc291cmNlVVJMOwogCiAgICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRsZVNj b3BlOwotICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6Om1h aW5Xb3JsZENvbnRleHQobV9wcm94eS0+ZnJhbWUoKSk7CisgICAgdjg6OkhhbmRsZTx2ODo6Q29u dGV4dD4gdjhDb250ZXh0ID0gU2NyaXB0Q29udHJvbGxlcjo6bWFpbldvcmxkQ29udGV4dChtX3By b3h5LT5mcmFtZSgpKTsKICAgICBpZiAodjhDb250ZXh0LklzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIFNjcmlwdFZhbHVlKCk7CiAKQEAgLTI4NywxMiArMjg3LDI2IEBAIHZvaWQgU2NyaXB0Q29u dHJvbGxlcjo6ZmluaXNoZWRXaXRoRXZlbnQoRXZlbnQqIGV2ZW50KQogICAgIG1fcHJveHktPmZp bmlzaGVkV2l0aEV2ZW50KGV2ZW50KTsKIH0KIAordjg6OkxvY2FsPHY4OjpDb250ZXh0PiBTY3Jp cHRDb250cm9sbGVyOjptYWluV29ybGRDb250ZXh0KCkKK3sKKyAgICB3aW5kb3dTaGVsbCgpLT5p bml0Q29udGV4dElmTmVlZGVkKCk7CisgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6Q29udGV4dD46 Ok5ldyh3aW5kb3dTaGVsbCgpLT5jb250ZXh0KCkpOworfQorCit2ODo6TG9jYWw8djg6OkNvbnRl eHQ+IFNjcmlwdENvbnRyb2xsZXI6Om1haW5Xb3JsZENvbnRleHQoRnJhbWUqIGZyYW1lKQorewor ICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiB2ODo6TG9jYWw8djg6OkNvbnRleHQ+KCk7 CisKKyAgICByZXR1cm4gZnJhbWUtPnNjcmlwdCgpLT5tYWluV29ybGRDb250ZXh0KCk7Cit9CisK IC8vIENyZWF0ZSBhIFY4IG9iamVjdCB3aXRoIGFuIGludGVyY2VwdG9yIG9mIE5QT2JqZWN0UHJv cGVydHlHZXR0ZXIuCiB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmJpbmRUb1dpbmRvd09iamVjdChG cmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYga2V5LCBOUE9iamVjdCogb2JqZWN0KQogewogICAg IHY4OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKIAotICAgIHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQoZnJhbWUpOworICAgIHY4 OjpIYW5kbGU8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IFNjcmlwdENvbnRyb2xsZXI6Om1haW5X b3JsZENvbnRleHQoZnJhbWUpOwogICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKQEAgLTQ0OSw3ICs0NjMsNyBAQCBzdGF0aWMgTlBPYmplY3QqIGNyZWF0ZU5v U2NyaXB0T2JqZWN0KCkKIHN0YXRpYyBOUE9iamVjdCogY3JlYXRlU2NyaXB0T2JqZWN0KEZyYW1l KiBmcmFtZSkKIHsKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7Ci0gICAgdjg6Okhh bmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gVjhQcm94eTo6bWFpbldvcmxkQ29udGV4dChm cmFtZSk7CisgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gU2NyaXB0Q29u dHJvbGxlcjo6bWFpbldvcmxkQ29udGV4dChmcmFtZSk7CiAgICAgaWYgKHY4Q29udGV4dC5Jc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiBjcmVhdGVOb1NjcmlwdE9iamVjdCgpOwogCkBAIC00ODks NyArNTAzLDcgQEAgTlBPYmplY3QqIFNjcmlwdENvbnRyb2xsZXI6OmNyZWF0ZVNjcmlwdE9iamVj dEZvclBsdWdpbkVsZW1lbnQoSFRNTFBsdWdJbkVsZW1lbnQKICAgICAgICAgcmV0dXJuIGNyZWF0 ZU5vU2NyaXB0T2JqZWN0KCk7CiAKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7Ci0g ICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gVjhQcm94eTo6bWFpbldvcmxk Q29udGV4dChtX2ZyYW1lKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB2OENvbnRleHQg PSBTY3JpcHRDb250cm9sbGVyOjptYWluV29ybGRDb250ZXh0KG1fZnJhbWUpOwogICAgIGlmICh2 OENvbnRleHQuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gY3JlYXRlTm9TY3JpcHRPYmplY3Qo KTsKICAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaAppbmRleCBmZTdiNzYzMWVkYTVl NTgyYjZhNDQwM2RmY2Q2ZDdkNmE2ZTMwOWQ3Li40ZDAyMjkwOGVkMzhiZTg2MmNhY2U2YmQwNWUz ZTBjNGUwNDE4Zjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3Jp cHRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29u dHJvbGxlci5oCkBAIC0xNTgsNiArMTU4LDExIEBAIHB1YmxpYzoKICAgICAvLyBWOFByb3h5Ojpy ZXRyaWV2ZUZyYW1lRm9yRW50ZXJlZENvbnRleHQoKSBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KICAg ICBzdGF0aWMgRnJhbWUqIHJldHJpZXZlRnJhbWVGb3JDdXJyZW50Q29udGV4dCgpOwogCisgICAg Ly8gUmV0dXJucyBWOCBDb250ZXh0IG9mIGEgZnJhbWUuIElmIG5vbmUgZXhpc3RzLCBjcmVhdGVz CisgICAgLy8gYSBuZXcgY29udGV4dC4gSXQgaXMgcG90ZW50aWFsbHkgc2xvdyBhbmQgY29uc3Vt ZXMgbWVtb3J5LgorICAgIHN0YXRpYyB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IG1haW5Xb3JsZENv bnRleHQoRnJhbWUqKTsKKyAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IG1haW5Xb3JsZENvbnRl eHQoKTsKKwogICAgIC8vIFBhc3MgY29tbWFuZC1saW5lIGZsYWdzIHRvIHRoZSBKUyBlbmdpbmUu CiAgICAgc3RhdGljIHZvaWQgc2V0RmxhZ3MoY29uc3QgY2hhciogc3RyaW5nLCBpbnQgbGVuZ3Ro KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuY3BwCmluZGV4IGUy MWM2Y2FjZTc1MTdkOTQwNGM5YjliYzRjMDNlZDM4NzFjMzI0MGYuLmE5NzViMTRjNWQxMzAwMzNk NTRhNmQ4M2U2NDJjYjhkNTZkOTg3ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRTdGF0ZS5jcHAKQEAgLTE0NSw4ICsxNDUsNyBAQCB2b2lkIHNldEV2YWxFbmFibGVkKFNj cmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgYm9vbCBlbmFibGVkKQogU2NyaXB0U3RhdGUqIG1haW5X b3JsZFNjcmlwdFN0YXRlKEZyYW1lKiBmcmFtZSkKIHsKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFu ZGxlU2NvcGU7Ci0gICAgVjhQcm94eSogcHJveHkgPSBmcmFtZS0+c2NyaXB0KCktPnByb3h5KCk7 Ci0gICAgcmV0dXJuIFNjcmlwdFN0YXRlOjpmb3JDb250ZXh0KHByb3h5LT5tYWluV29ybGRDb250 ZXh0KCkpOworICAgIHJldHVybiBTY3JpcHRTdGF0ZTo6Zm9yQ29udGV4dChmcmFtZS0+c2NyaXB0 KCktPm1haW5Xb3JsZENvbnRleHQoKSk7CiB9CiAKIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZy b21Ob2RlKERPTVdyYXBwZXJXb3JsZCosIE5vZGUqIG5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9WOExhenlFdmVudExpc3RlbmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4TGF6eUV2ZW50TGlzdGVuZXIuY3BwCmluZGV4IGZkYjljZDU2ODUw ZTQwYjhjM2FjMTEwZTdhOGE4YTljNWZhMTQzODAuLmYxMDcxNDY2OTE4ZGFkZmUxZjc4NmRhZTQ2 YjcwMGYyMGUyNTAwZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 TGF6eUV2ZW50TGlzdGVuZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 TGF6eUV2ZW50TGlzdGVuZXIuY3BwCkBAIC0xMjQsNyArMTI0LDcgQEAgdm9pZCBWOExhenlFdmVu dExpc3RlbmVyOjpwcmVwYXJlTGlzdGVuZXJPYmplY3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCkKICAgICBpZiAoIWZyYW1lLT5zY3JpcHQoKS0+Y2FuRXhlY3V0ZVNjcmlwdHMoTm90 QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQogICAgICAgICByZXR1cm47CiAgICAgLy8gVXNlIHRoZSBv dXRlciBzY29wZSB0byBob2xkIGNvbnRleHQuCi0gICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiB2 OENvbnRleHQgPSB3b3JsZENvbnRleHQoKS5hZGp1c3RlZENvbnRleHQoZnJhbWUtPnNjcmlwdCgp LT5wcm94eSgpKTsKKyAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IHdvcmxk Q29udGV4dCgpLmFkanVzdGVkQ29udGV4dChmcmFtZS0+c2NyaXB0KCkpOwogICAgIC8vIEJhaWwg b3V0IGlmIHdlIGNhbm5vdCBnZXQgdGhlIGNvbnRleHQuCiAgICAgaWYgKHY4Q29udGV4dC5Jc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4UHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5j cHAKaW5kZXggMzhjN2JiNDI2NTY3ZTU3ZDZkZTY1ZTcwODRmZTJlMmM4Mjc0NDJjYi4uNjJhNjUz ZmU2ZTM1ZWFmYTQyN2EyYzkyNjViNjdiZDFlZTkxYWMxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhQcm94eS5jcHAKQEAgLTM3NCw3ICszNzQsNyBAQCB2b2lkIFY4UHJveHk6OmNsZWFy Rm9yTmF2aWdhdGlvbigpCiAKIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gVjhQcm94eTo6Y29udGV4 dChGcmFtZSogZnJhbWUpCiB7Ci0gICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0ID0g VjhQcm94eTo6bWFpbldvcmxkQ29udGV4dChmcmFtZSk7CisgICAgdjg6OkxvY2FsPHY4OjpDb250 ZXh0PiBjb250ZXh0ID0gU2NyaXB0Q29udHJvbGxlcjo6bWFpbldvcmxkQ29udGV4dChmcmFtZSk7 CiAgICAgaWYgKGNvbnRleHQuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4 OjpDb250ZXh0PigpOwogCkBAIC0zOTUsMTMgKzM5NSw3IEBAIHY4OjpMb2NhbDx2ODo6Q29udGV4 dD4gVjhQcm94eTo6Y29udGV4dCgpCiAgICAgICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpD b250ZXh0PigpOwogICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpDb250ZXh0Pjo6TmV3KGNv bnRleHQtPmdldCgpKTsKICAgICB9Ci0gICAgcmV0dXJuIG1haW5Xb3JsZENvbnRleHQoKTsKLX0K LQotdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBWOFByb3h5OjptYWluV29ybGRDb250ZXh0KCkKLXsK LSAgICB3aW5kb3dTaGVsbCgpLT5pbml0Q29udGV4dElmTmVlZGVkKCk7Ci0gICAgcmV0dXJuIHY4 OjpMb2NhbDx2ODo6Q29udGV4dD46Ok5ldyh3aW5kb3dTaGVsbCgpLT5jb250ZXh0KCkpOworICAg IHJldHVybiBmcmFtZSgpLT5zY3JpcHQoKS0+bWFpbldvcmxkQ29udGV4dCgpOwogfQogCiB2ODo6 TG9jYWw8djg6OkNvbnRleHQ+IFY4UHJveHk6Omlzb2xhdGVkV29ybGRDb250ZXh0KGludCB3b3Js ZElkKQpAQCAtNDI2LDE5ICs0MjAsMTEgQEAgYm9vbCBWOFByb3h5OjptYXRjaGVzQ3VycmVudENv bnRleHQoKQogICAgIHJldHVybiBjb250ZXh0ID09IGNvbnRleHQtPkdldEN1cnJlbnQoKTsKIH0K IAotdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBWOFByb3h5OjptYWluV29ybGRDb250ZXh0KEZyYW1l KiBmcmFtZSkKLXsKLSAgICBpZiAoIWZyYW1lKQotICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4 OjpDb250ZXh0PigpOwotCi0gICAgcmV0dXJuIGZyYW1lLT5zY3JpcHQoKS0+cHJveHkoKS0+bWFp bldvcmxkQ29udGV4dCgpOwotfQotCiB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IHRvVjhDb250ZXh0 KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFdvcmxkQ29udGV4dEhhbmRs ZSYgd29ybGRDb250ZXh0KQogewogICAgIGlmIChjb250ZXh0LT5pc0RvY3VtZW50KCkpIHsKICAg ICAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4oY29udGV4dCkt PmZyYW1lKCkpCi0gICAgICAgICAgICByZXR1cm4gd29ybGRDb250ZXh0LmFkanVzdGVkQ29udGV4 dChmcmFtZS0+c2NyaXB0KCktPnByb3h5KCkpOworICAgICAgICAgICAgcmV0dXJuIHdvcmxkQ29u dGV4dC5hZGp1c3RlZENvbnRleHQoZnJhbWUtPnNjcmlwdCgpKTsKICNpZiBFTkFCTEUoV09SS0VS UykKICAgICB9IGVsc2UgaWYgKGNvbnRleHQtPmlzV29ya2VyQ29udGV4dCgpKSB7CiAgICAgICAg IGlmIChXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkqIHByb3h5ID0gc3RhdGljX2Nhc3Q8V29y a2VyQ29udGV4dCo+KGNvbnRleHQpLT5zY3JpcHQoKS0+cHJveHkoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4UHJveHkuaAppbmRleCA0MjU4ODhlZDc0NzAyZTA4M2JmZDAzMWYxNTFhOTdiNTk0 ODEzMjlmLi5mZWZkZDZjOWE5MTNhY2U1NGFjM2NkZDUwZmJkYzk1MjI2N2EyNDExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCkBAIC0xMTgsNyArMTE4LDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICAvLyBSZXR1cm5zIFY4IENvbnRleHQgb2YgYSBmcmFtZS4gSWYg bm9uZSBleGlzdHMsIGNyZWF0ZXMKICAgICAgICAgLy8gYSBuZXcgY29udGV4dC4gSXQgaXMgcG90 ZW50aWFsbHkgc2xvdyBhbmQgY29uc3VtZXMgbWVtb3J5LgogICAgICAgICBzdGF0aWMgdjg6Okxv Y2FsPHY4OjpDb250ZXh0PiBjb250ZXh0KEZyYW1lKik7Ci0gICAgICAgIHN0YXRpYyB2ODo6TG9j YWw8djg6OkNvbnRleHQ+IG1haW5Xb3JsZENvbnRleHQoRnJhbWUqKTsKIAogICAgICAgICAvLyBJ ZiB0aGUgY3VycmVudCBjb250ZXh0IGNhdXNlcyBvdXQgb2YgbWVtb3J5LCBKYXZhU2NyaXB0IHNl dHRpbmcKICAgICAgICAgLy8gaXMgZGlzYWJsZWQgYW5kIGl0IHJldHVybnMgdHJ1ZS4KQEAgLTEy Nyw3ICsxMjYsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpTY3JpcHQ+IGNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2Rl LCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBUZXh0UG9zaXRpb24mIHNjcmlwdFN0YXJ0 UG9zaXRpb24sIHY4OjpTY3JpcHREYXRhKiA9IDApOwogCiAgICAgICAgIHY4OjpMb2NhbDx2ODo6 Q29udGV4dD4gY29udGV4dCgpOwotICAgICAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IG1haW5X b3JsZENvbnRleHQoKTsKICAgICAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBpc29sYXRlZFdv cmxkQ29udGV4dChpbnQgd29ybGRJZCk7CiAgICAgICAgIGJvb2wgbWF0Y2hlc0N1cnJlbnRDb250 ZXh0KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxkQ29u dGV4dEhhbmRsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRI YW5kbGUuY3BwCmluZGV4IDg0NTZhM2U1ZjhmMDcwMDA4NDI0YTA1NDY3MzkwOTAyMGU5MWJiZTku LjQ4OGYzYjUyN2I2ODMxNDI2YjRmOWQ0MGQ0ODcxMTcwOTE1ZWExNDggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcApAQCAtMzEsOCAr MzEsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldvcmxkQ29udGV4dEhhbmRs ZS5oIgogCisjaW5jbHVkZSAiU2NyaXB0Q29udHJvbGxlci5oIgogI2luY2x1ZGUgIlY4SXNvbGF0 ZWRDb250ZXh0LmgiCi0jaW5jbHVkZSAiVjhQcm94eS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKQEAgLTQ2LDEwICs0NiwxMCBAQCBXb3JsZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhh bmRsZShXb3JsZFRvVXNlIHdvcmxkVG9Vc2UpCiAgICAgICAgIG1fY29udGV4dCA9IGNvbnRleHQt PnNoYXJlZENvbnRleHQoKTsKIH0KIAotdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBXb3JsZENvbnRl eHRIYW5kbGU6OmFkanVzdGVkQ29udGV4dChWOFByb3h5KiBwcm94eSkgY29uc3QKK3Y4OjpMb2Nh bDx2ODo6Q29udGV4dD4gV29ybGRDb250ZXh0SGFuZGxlOjphZGp1c3RlZENvbnRleHQoU2NyaXB0 Q29udHJvbGxlciogc2NyaXB0KSBjb25zdAogewogICAgIGlmIChtX3dvcmxkVG9Vc2UgPT0gVXNl TWFpbldvcmxkIHx8ICFtX2NvbnRleHQgfHwgbV9jb250ZXh0LT5nZXQoKS5Jc0VtcHR5KCkpCi0g ICAgICAgIHJldHVybiBwcm94eS0+bWFpbldvcmxkQ29udGV4dCgpOworICAgICAgICByZXR1cm4g c2NyaXB0LT5tYWluV29ybGRDb250ZXh0KCk7CiAKICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpD b250ZXh0Pjo6TmV3KG1fY29udGV4dC0+Z2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9Xb3JsZENvbnRleHRIYW5kbGUuaAppbmRleCBhZDA5ODNlYzQ0N2MwZGJlMDgz ZTcxZGIyNTM0NmYxMDQ5OGRhYjg5Li41NTc0NzQyYWVjMTQ0MDliMTAyMjAyYzBlODVkYmMwMWFj MDBjMjQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRl eHRIYW5kbGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRI YW5kbGUuaApAQCAtMzgsMTQgKzM4LDE0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xh c3MgVjhQcm94eTsKK2NsYXNzIFNjcmlwdENvbnRyb2xsZXI7CiAKIGVudW0gV29ybGRUb1VzZSB7 IFVzZU1haW5Xb3JsZCwgVXNlQ3VycmVudFdvcmxkIH07CiAKIGNsYXNzIFdvcmxkQ29udGV4dEhh bmRsZSB7CiBwdWJsaWM6CiAgICAgV29ybGRDb250ZXh0SGFuZGxlKFdvcmxkVG9Vc2UpOwotICAg IHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gYWRqdXN0ZWRDb250ZXh0KFY4UHJveHkqKSBjb25zdDsK KyAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IGFkanVzdGVkQ29udGV4dChTY3JpcHRDb250cm9s bGVyKikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgV29ybGRUb1VzZSBtX3dvcmxkVG9Vc2U7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBhOThhMzMz YzEzN2ZjYjVlZWYzYWNkNGQ4NmU3OWVkNmYyMjRiN2E3Li44ODIyZTE1NjA1NmQzMzg2ZDliOWQx OTkzYjEyMzFhMTM4YmFjYzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZy YW1lSW1wbC5jcHAKQEAgLTk2MCw3ICs5NjAsNyBAQCB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IFdl YkZyYW1lSW1wbDo6bWFpbldvcmxkU2NyaXB0Q29udGV4dCgpIGNvbnN0CiAgICAgaWYgKCFtX2Zy YW1lKQogICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpDb250ZXh0PigpOwogCi0gICAgcmV0 dXJuIFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQobV9mcmFtZSk7CisgICAgcmV0dXJuIFNjcmlw dENvbnRyb2xsZXI6Om1haW5Xb3JsZENvbnRleHQobV9mcmFtZSk7CiB9CiAKIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBXZWJGcmFtZUltcGw6OmNyZWF0ZUZpbGVTeXN0ZW0oV2ViRmlsZVN5c3RlbTo6 VHlwZSB0eXBlLAo=