131769 2014-04-16 15:32:30 -0700 Don't build LayerTreeHost on Mac (and clean it up) 2014-04-16 15:40:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bunhere cmarcelo commit-queue luiz noam sergio simon.fraser zeno oldest_to_newest 1001362 0 thorton 2014-04-16 15:32:30 -0700 Clean up. 1001364 1 229489 thorton 2014-04-16 15:34:25 -0700 Created attachment 229489 patch 1001366 2 thorton 2014-04-16 15:40:24 -0700 http://trac.webkit.org/changeset/167393 229489 2014-04-16 15:34:25 -0700 2014-04-16 15:35:34 -0700 patch layertreehost.diff text/plain 12844 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZTlkYTQwLi5mZDEzZTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMDQtMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgRG9uJ3QgYnVpbGQgTGF5ZXJUcmVlSG9zdCBvbiBNYWMgKGFuZCBjbGVhbiBpdCB1 cCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTc2 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBEb24ndCBpbmNsdWRlIGl0 IGluIHRoZSBwcm9qZWN0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjpvdmVy cmlkZUJvb2xQcmVmZXJlbmNlRm9yVGVzdFJ1bm5lcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkRHJhd2luZ0FyZWE6OnVwZGF0ZVByZWZlcmVuY2Vz KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKFdlYktp dDo6TGF5ZXJUcmVlSG9zdDo6c2V0TGF5ZXJIb3N0aW5nTW9kZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJLaXQ6OkxheWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyk6 IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICBHZXQgcmlkIG9mIExh eWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZywgd2hpY2ggYWx3YXlz IHJldHVybnMgdHJ1ZSBldmVyeXdoZXJlLgorICAgICAgICBSZW1vdmUgc29tZSBMYXllclRyZWVI b3N0LmggaW5jbHVkZXMuCisgICAgICAgIFJlbW92ZSBMYXllclRyZWVIb3N0OjpzZXRMYXllckhv c3RpbmdNb2RlLCB3aGljaCBpcyBQTEFURk9STShDT0NPQSkgYW5kIG5vdCBuZWVkZWQuCisKIDIw MTQtMDQtMTUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29j b2FdIEFkZCBhIGZvcm0gZGVsZWdhdGUgbWV0aG9kIGNvcnJlc3BvbmRpbmcgdG8gd2lsbFN1Ym1p dEZvcm0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagppbmRleCA5MjBiNjAyLi5iMmZkYmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMjksOCArMTI5LDYgQEAKIAkJMUEx NTg0MUExODkwNDRGNTAwMTc2MTZDIC8qIFdLUHJvY2Vzc1Bvb2wuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMTU4NDE4MTg5MDQ0RjUwMDE3NjE2QyAv KiBXS1Byb2Nlc3NQb29sLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCAp OyB9OyB9OwogCQkxQTE3OTc3RjEzN0VFODJDMDBGOTdENDUgLyogUGx1Z2luQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBMTc5NzdEMTM3RUU4MkMwMEY5N0Q0NSAvKiBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3Bw ICovOyB9OwogCQkxQTE3OTc4MDEzN0VFODJDMDBGOTdENDUgLyogUGx1Z2luQ3JlYXRpb25QYXJh bWV0ZXJzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QTE3OTc3RTEzN0VFODJDMDBGOTdENDUgLyogUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmggKi87 IH07Ci0JCTFBMTg2RUVBMTJFRjc2MTgwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0LmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTE4NkVFODEyRUY3NjE4 MDA4RTVGMzcgLyogTGF5ZXJUcmVlSG9zdC5oICovOyB9OwotCQkxQTE4NkVFQjEyRUY3NjE4MDA4 RTVGMzcgLyogTGF5ZXJUcmVlSG9zdC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQTE4NkVFOTEyRUY3NjE4MDA4RTVGMzcgLyogTGF5ZXJUcmVlSG9z dC5jcHAgKi87IH07CiAJCTFBMUIwRUI1MThBNDI0OTUwMDM4NDgxQSAvKiBXS05hdmlnYXRpb25S ZXNwb25zZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBMUIwRUIzMThBNDI0OTUwMDM4NDgxQSAvKiBXS05hdmlnYXRpb25SZXNwb25zZS5tbSAqLzsg fTsKIAkJMUExQjBFQjYxOEE0MjQ5NTAwMzg0ODFBIC8qIFdLTmF2aWdhdGlvblJlc3BvbnNlLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTFCMEVCNDE4 QTQyNDk1MDAzODQ4MUEgLyogV0tOYXZpZ2F0aW9uUmVzcG9uc2UuaCAqLzsgc2V0dGluZ3MgPSB7 QVRUUklCVVRFUyA9IChQdWJsaWMsICk7IH07IH07CiAJCTFBMUIwRUI4MThBNDI0Q0QwMDM4NDgx QSAvKiBXS05hdmlnYXRpb25SZXNwb25zZUludGVybmFsLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTFCMEVCNzE4QTQyNENEMDAzODQ4MUEgLyogV0tO YXZpZ2F0aW9uUmVzcG9uc2VJbnRlcm5hbC5oICovOyB9OwpAQCAtMTg5OCw4ICsxODk2LDYgQEAK IAkJMUExNzYzNTUxNkIxRDVEMDAwRDg4RkQ2IC8qIFN0b3JhZ2VOYW1lc3BhY2VJbXBsLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFN0b3JhZ2VOYW1lc3BhY2VJbXBsLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMTc5NzdEMTM3RUU4MkMwMEY5N0Q0NSAvKiBQ bHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJMUExNzk3N0UxMzdFRTgyQzAwRjk3RDQ1IC8qIFBsdWdpbkNyZWF0aW9uUGFy YW1ldGVycy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5DcmVhdGlv blBhcmFtZXRlcnMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJMUExODZFRTgxMkVG NzYxODAwOEU1RjM3IC8qIExheWVyVHJlZUhvc3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gTGF5ZXJUcmVlSG9zdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkx QTE4NkVFOTEyRUY3NjE4MDA4RTVGMzcgLyogTGF5ZXJUcmVlSG9zdC5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMYXllclRyZWVIb3N0LmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUExQjBFQjMxOEE0MjQ5NTAwMzg0ODFBIC8qIFdLTmF2aWdhdGlv blJlc3BvbnNlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tO YXZpZ2F0aW9uUmVzcG9uc2UubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMUIw RUI0MThBNDI0OTUwMDM4NDgxQSAvKiBXS05hdmlnYXRpb25SZXNwb25zZS5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBXS05hdmlnYXRpb25SZXNwb25zZS5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxQTFCMEVCNzE4QTQyNENEMDAzODQ4MUEgLyogV0tOYXZpZ2F0 aW9uUmVzcG9uc2VJbnRlcm5hbC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBX S05hdmlnYXRpb25SZXNwb25zZUludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CkBAIC01MzQ3LDggKzUzNDMsNiBAQAogCQkJCTFBQTU3NUZEMTQ5NkI2RjMwMEE0RUUwNiAvKiBF dmVudERpc3BhdGNoZXIubWVzc2FnZXMuaW4gKi8sCiAJCQkJMUE5MEMxRjMxMjY0RkQ3MTAwM0U0 NEQ0IC8qIEZpbmRDb250cm9sbGVyLmNwcCAqLywKIAkJCQkxQTkwQzFGMjEyNjRGRDcxMDAzRTQ0 RDQgLyogRmluZENvbnRyb2xsZXIuaCAqLywKLQkJCQkxQTE4NkVFOTEyRUY3NjE4MDA4RTVGMzcg LyogTGF5ZXJUcmVlSG9zdC5jcHAgKi8sCi0JCQkJMUExODZFRTgxMkVGNzYxODAwOEU1RjM3IC8q IExheWVyVHJlZUhvc3QuaCAqLywKIAkJCQk3QzM4NzQzMzE3MkY1NjE1MDAxQkQ4OEEgLyogUGFn ZUJhbm5lci5jcHAgKi8sCiAJCQkJN0NGNDdGRjkxNzI3NUM1NzAwOEFDQjkxIC8qIFBhZ2VCYW5u ZXIuaCAqLywKIAkJCQkxQTkwQzIzNjEyNjUwNzE3MDAzRTQ0RDQgLyogUGFnZU92ZXJsYXkuY3Bw ICovLApAQCAtNjgwMyw3ICs2Nzk3LDYgQEAKIAkJCQlCQ0UwOTM3ODE0RkIxMjhDMDAxMTM4RDkg LyogTGF5ZXJIb3N0aW5nQ29udGV4dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE5MkRDMTExMkY4 QkE0NjAwMTdBRjY1IC8qIExheWVyVHJlZUNvbnRleHQuaCBpbiBIZWFkZXJzICovLAogCQkJCUM1 OUM0QTU5MThCODExNzQwMDdCRENCNiAvKiBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oIGluIEhl YWRlcnMgKi8sCi0JCQkJMUExODZFRUExMkVGNzYxODAwOEU1RjM3IC8qIExheWVyVHJlZUhvc3Qu aCBpbiBIZWFkZXJzICovLAogCQkJCTFBMUQ4QkEyMTczMUEzNjMwMDE0MURBNCAvKiBMb2NhbFN0 b3JhZ2VEYXRhYmFzZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE4QzcyOEQxNzM4NDc3QzAwMEE2 NTU0IC8qIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ NTFBN0YyRjMxMjVCRjgyMDAwOEFFQjFEIC8qIExvZ2dpbmcuaCBpbiBIZWFkZXJzICovLApAQCAt ODI0Myw3ICs4MjM2LDYgQEAKIAkJCQkxQUU0OTg3OTExRkY3RkFBMDA0OEI0NjQgLyogSlNOUE9i amVjdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCQ0UwOTM3NzE0RkIxMjhDMDAxMTM4RDkgLyog TGF5ZXJIb3N0aW5nQ29udGV4dC5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFBOTJEQzEzMTJGOEJB QjkwMDE3QUY2NSAvKiBMYXllclRyZWVDb250ZXh0TWFjLm1tIGluIFNvdXJjZXMgKi8sCi0JCQkJ MUExODZFRUIxMkVGNzYxODAwOEU1RjM3IC8qIExheWVyVHJlZUhvc3QuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJMUExRDhCQTExNzMxQTM2MzAwMTQxREE0IC8qIExvY2FsU3RvcmFnZURhdGFiYXNl LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBOEM3MjhDMTczODQ3N0MwMDBBNjU1NCAvKiBMb2Nh bFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTFBN0YyRjUx MjVCRjhENDAwOEFFQjFEIC8qIExvZ2dpbmcuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRC dW5kbGUuY3BwCmluZGV4IDM0YjNjYTAuLjRiNTg3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3Bw CkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSAiQXJndW1lbnRzLmgiCiAjaW5jbHVkZSAiSW5q ZWN0ZWRCdW5kbGVTY3JpcHRXb3JsZC5oIgogI2luY2x1ZGUgIkluamVjdGVkQnVuZGxlVXNlck1l c3NhZ2VDb2RlcnMuaCIKLSNpbmNsdWRlICJMYXllclRyZWVIb3N0LmgiCiAjaW5jbHVkZSAiTm90 aWZpY2F0aW9uUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiU2Vzc2lvblRy YWNrZXIuaCIKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKQEAgLTIxOSw5ICsyMTgsNiBAQCB2b2lk IEluamVjdGVkQnVuZGxlOjpvdmVycmlkZUJvb2xQcmVmZXJlbmNlRm9yVGVzdFJ1bm5lcihXZWJQ YWdlR3JvdXBQcm94eSogcGFnZQogICAgIG1hY3JvKFdlYktpdERpc3BsYXlJbWFnZXNLZXksIExv YWRzSW1hZ2VzQXV0b21hdGljYWxseSwgbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KSBcCiAgICAg bWFjcm8oV2ViS2l0TWVkaWFTdHJlYW1FbmFibGVkLCBNZWRpYVN0cmVhbUVuYWJsZWQsIG1lZGlh U3RyZWFtRW5hYmxlZCkKIAotICAgIGlmIChwcmVmZXJlbmNlID09ICJXZWJLaXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nRW5hYmxlZCIpCi0gICAgICAgIGVuYWJsZWQgPSBlbmFibGVkICYmIExheWVy VHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOwotCiAjZGVmaW5lIE9W RVJSSURFX1BSRUZFUkVOQ0VfQU5EX1NFVF9JTl9FWElTVElOR19QQUdFUyhUZXN0UnVubmVyTmFt ZSwgU2V0dGluZ3NOYW1lLCBXZWJQcmVmZXJlbmNlc05hbWUpIFwKICAgICBpZiAocHJlZmVyZW5j ZSA9PSAjVGVzdFJ1bm5lck5hbWUpIHsgXAogICAgICAgICBXZWJQcmVmZXJlbmNlc1N0b3JlOjpv dmVycmlkZUJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6V2ViUHJlZmVyZW5jZXNO YW1lIyNLZXkoKSwgZW5hYmxlZCk7IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWEu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYS5jcHAKaW5kZXggZjE2MjM4OC4uMjQyZDYzOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJl YS5jcHAKQEAgLTIyMSw3ICsyMjEsNyBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWE6OnNl dFBhaW50aW5nRW5hYmxlZChib29sIHBhaW50aW5nRW5hYmxlZCkKIAogdm9pZCBDb29yZGluYXRl ZERyYXdpbmdBcmVhOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3Jl JiBzdG9yZSkKIHsKLSAgICBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkuc2V0Rm9y Y2VDb21wb3NpdGluZ01vZGUoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2Vz S2V5Ojpmb3JjZUNvbXBvc2l0aW5nTW9kZUtleSgpKSAmJiBMYXllclRyZWVIb3N0OjpzdXBwb3J0 c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7CisgICAgbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5z ZXR0aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktl eShXZWJQcmVmZXJlbmNlc0tleTo6Zm9yY2VDb21wb3NpdGluZ01vZGVLZXkoKSkpOwogfQogCiB2 b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWE6Om1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZChj b25zdCBXZWJDb3JlOjpJbnRTaXplJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKaW5kZXggMmY5MDVkYS4uMGEyNjM2ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdB cmVhSW1wbC5jcHAKQEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2V0 UGFpbnRpbmdFbmFibGVkKGJvb2wgcGFpbnRpbmdFbmFibGVkKQogCiB2b2lkIERyYXdpbmdBcmVh SW1wbDo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUp CiB7Ci0gICAgbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLnNldEZvcmNlQ29tcG9z aXRpbmdNb2RlKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6Zm9y Y2VDb21wb3NpdGluZ01vZGVLZXkoKSkgJiYgTGF5ZXJUcmVlSG9zdDo6c3VwcG9ydHNBY2NlbGVy YXRlZENvbXBvc2l0aW5nKCkpOworICAgIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3Mo KS5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZShzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OmZvcmNlQ29tcG9zaXRpbmdNb2RlS2V5KCkpKTsKIH0KIAogdm9pZCBEcmF3 aW5nQXJlYUltcGw6OmxheWVySG9zdERpZEZsdXNoTGF5ZXJzKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDlhYWRmNjkuLjM0 ZWZkOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXll clRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVy VHJlZUhvc3QuaApAQCAtNTYsOCArNTYsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8TGF5ZXJUcmVlSG9zdD4gY3JlYXRlKFdlYlBhZ2UqKTsKICAgICB2aXJ0dWFsIH5MYXllclRy ZWVIb3N0KCk7CiAKLSAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRp bmcoKTsKLQogICAgIHZpcnR1YWwgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29u dGV4dCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVMYXllckZsdXNoKCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRMYXllckZsdXNoU2NoZWR1bGluZ0VuYWJsZWQoYm9vbCkgPSAw OwpAQCAtODksMTAgKzg3LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZl Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJUEM6Ok1l c3NhZ2VEZWNvZGVyJikgPSAwOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICB2 aXJ0dWFsIHZvaWQgc2V0TGF5ZXJIb3N0aW5nTW9kZShMYXllckhvc3RpbmdNb2RlKSB7IH0KLSNl bmRpZgotCiAjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKSAmJiBFTkFCTEUoUkVRVUVTVF9B TklNQVRJT05fRlJBTUUpCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQW5pbWF0aW9uKCkgPSAw OwogI2VuZGlmCkBAIC0xMDMsMTEgKzk3LDYgQEAgcHJvdGVjdGVkOgogICAgIFdlYlBhZ2UqIG1f d2ViUGFnZTsKIH07CiAKLWlubGluZSBib29sIExheWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxl cmF0ZWRDb21wb3NpdGluZygpCi17Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIH0gLy8gbmFtZXNw YWNlIFdlYktpdAogCiAjZW5kaWYgLy8gTGF5ZXJUcmVlSG9zdF9oCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzcyZmZkNC4uMGZlMmFlYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt MjUwMSw5ICsyNTAxLDkgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBX ZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy5zZXRTaG93c1Rvb2xUaXBP dmVyVHJ1bmNhdGVkVGV4dChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNob3dzVG9vbFRpcE92ZXJUcnVuY2F0ZWRUZXh0S2V5KCkpKTsKIAogICAgIHNldHRpbmdz LnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JPdmVyZmxvd1Njcm9sbEVuYWJsZWQoc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphY2NlbGVyYXRlZENvbXBvc2l0 aW5nRm9yT3ZlcmZsb3dTY3JvbGxFbmFibGVkS2V5KCkpKTsKLSAgICBzZXR0aW5ncy5zZXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkS2V5KCkpICYmIExheWVy VHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpKTsKLSAgICBzZXR0aW5n cy5zZXRBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShX ZWJQcmVmZXJlbmNlc0tleTo6YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZEtleSgpKSAmJiBMYXll clRyZWVIb3N0OjpzdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7Ci0gICAgc2V0dGlu Z3Muc2V0Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmdLZXkoKSkg JiYgTGF5ZXJUcmVlSG9zdDo6c3VwcG9ydHNBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpOworICAg IHNldHRpbmdzLnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKHN0b3JlLmdldEJvb2xW YWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWRLZXkoKSkpOworICAgIHNldHRpbmdzLnNldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphY2NlbGVyYXRlZERyYXdp bmdFbmFibGVkS2V5KCkpKTsKKyAgICBzZXR0aW5ncy5zZXRDYW52YXNVc2VzQWNjZWxlcmF0ZWRE cmF3aW5nKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6Y2FudmFz VXNlc0FjY2VsZXJhdGVkRHJhd2luZ0tleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0U2hvd0RlYnVn Qm9yZGVycyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNvbXBv c2l0aW5nQm9yZGVyc1Zpc2libGVLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldFNob3dSZXBhaW50 Q291bnRlcihzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNvbXBv c2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJsZUtleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0U2hv d1RpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVm ZXJlbmNlc0tleTo6dGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JWaXNpYmxlS2V5KCkpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpp bmRleCAzMTc3MzZlLi4xOTkyMTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0zNSw3ICszNSw2IEBACiAjaW1wb3J0 ICJHZXN0dXJlVHlwZXMuaCIKICNpbXBvcnQgIkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VDb2Rl cnMuaCIKICNpbXBvcnQgIkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmgiCi0jaW1w b3J0ICJMYXllclRyZWVIb3N0LmgiCiAjaW1wb3J0ICJQbHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmgiCiAjaW1wb3J0ICJXS0FjY2Vzc2liaWxpdHlX ZWJQYWdlT2JqZWN0SU9TLmgiCg==