123395 2013-10-26 18:19:37 -0700 [mac] Remove WebTiledLayer 2013-10-26 19:35:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue simon.fraser oldest_to_newest 943943 0 thorton 2013-10-26 18:19:37 -0700 We don't use CATiledLayer at all on Mac anymore. We have to keep LayerTypeTiledLayer around for Windows, for now, but we can get rid of WebTiledLayer and some related Mac-specific code. 943945 1 215265 thorton 2013-10-26 18:23:52 -0700 Created attachment 215265 patch 943946 2 215265 commit-queue 2013-10-26 19:35:06 -0700 Comment on attachment 215265 patch Clearing flags on attachment: 215265 Committed r158096: <http://trac.webkit.org/changeset/158096> 943947 3 commit-queue 2013-10-26 19:35:07 -0700 All reviewed patches have been landed. Closing bug. 215265 2013-10-26 18:23:52 -0700 2013-10-26 19:35:05 -0700 patch nomorecatiledlayer.diff text/plain 11387 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYTQ4NGEzLi4yZWUzMzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTMtMTAtMjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW21hY10gUmVtb3ZlIFdlYlRpbGVkTGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzM5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hYyBkb2Vzbid0IHVzZSBDQVRpbGVkTGF5ZXIg YXQgYWxsIGFueW1vcmUuIFdlIGhhdmUgdG8ga2VlcAorICAgICAgICBMYXllclR5cGVUaWxlZExh eWVyIGFyb3VuZCBmb3IgV2luZG93cywgZm9yIG5vdywgYnV0IHdlIGNhbgorICAgICAgICBnZXQg cmlkIG9mIFdlYlRpbGVkTGF5ZXIgYW5kIHNvbWUgcmVsYXRlZCBNYWMtc3BlY2lmaWMgY29kZS4K KworICAgICAgICBObyBuZXcgdGVzdHMsIGp1c3QgcmVtb3ZpbmcgZGVhZCBjb2RlLgorCisgICAg ICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBSZW1vdmUg V2ViVGlsZWRMYXllci4qCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9y bUNBTGF5ZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1D QUxheWVyTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3Jt Q0FMYXllck1hYy5tbToKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllck1hYzo6UGxhdGZvcm1DQUxh eWVyTWFjKToKKyAgICAgICAgUmVtb3ZlIHN5bmNocm9ub3VzbHlEaXNwbGF5VGlsZXNJblJlY3Qs IHdoaWNoIHdhcyBvbmx5IHVzZWQgZm9yIFdlYlRpbGVkTGF5ZXIgb24gTWFjLgorICAgICAgICBS ZW1vdmUgV2ViVGlsZWRMYXllciBpbnN0YW50aWF0aW9uIGFuZCBzZXR1cCBjb2RlLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYlRpbGVkTGF5ZXIuaDogUmVtb3ZlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvV2ViVGlsZWRMYXllci5tbTogUmVtb3ZlZC4K KwogMjAxMy0xMC0yNiAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAg ICAgQ1RURTogUmVuZGVySW1hZ2VSZXNvdXJjZVN0eWxlSW1hZ2UgYWx3YXlzIGhhcyBhIFN0eWxl SW1hZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKaW5kZXggZTUzMWVhMy4uNjM0Y2NlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNDU4LDggKzQ1OCw2IEBACiAJCTBG Qjg4OTBFMTY3RDMwMTYwMDEwQ0RBNSAvKiBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZCODg5MEMxNjdE MzAxNjAwMTBDREE1IC8qIFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHAgKi87IH07CiAJCTBG Qjg4OTBGMTY3RDMwMTYwMDEwQ0RBNSAvKiBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGQjg4OTBEMTY3RDMw MTYwMDEwQ0RBNSAvKiBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuaCAqLzsgfTsKIAkJMEZDRjMz MjQwRjJCOTcxNTAwNEI2Nzk1IC8qIENvbG9yQ0cuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZDRjMzMjMwRjJCOTcxNTAwNEI2Nzk1IC8qIENvbG9y Q0cuY3BwICovOyB9OwotCQkwRkNGMzMyQzBGMkI5QTI1MDA0QjY3OTUgLyogV2ViVGlsZWRMYXll ci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGQ0Yz MzI4MEYyQjlBMjUwMDRCNjc5NSAvKiBXZWJUaWxlZExheWVyLm1tICovOyB9OwotCQkwRkNGMzMy RDBGMkI5QTI1MDA0QjY3OTUgLyogV2ViVGlsZWRMYXllci5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZDRjMzMjkwRjJCOUEyNTAwNEI2Nzk1IC8qIFdl YlRpbGVkTGF5ZXIuaCAqLzsgfTsKIAkJMEZDRjMzMkUwRjJCOUEyNTAwNEI2Nzk1IC8qIFdlYkxh eWVyLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZD RjMzMkEwRjJCOUEyNTAwNEI2Nzk1IC8qIFdlYkxheWVyLm1tICovOyB9OwogCQkwRkNGMzMyRjBG MkI5QTI1MDA0QjY3OTUgLyogV2ViTGF5ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDBGQ0YzMzJCMEYyQjlBMjUwMDRCNjc5NSAvKiBXZWJMYXllci5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTBGRDMw ODBFMTE3Q0Y3RTcwMEE3OTFGNyAvKiBSZW5kZXJGcmFtZUJhc2UuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZEMzA4MEMxMTdDRjdFNzAwQTc5MUY3 IC8qIFJlbmRlckZyYW1lQmFzZS5jcHAgKi87IH07CkBAIC02OTExLDggKzY5MDksNiBAQAogCQkw RkI4ODkwQzE2N0QzMDE2MDAxMENEQTUgLyogU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcm9sbGluZ1N0YXRlU3RpY2t5 Tm9kZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQjg4OTBEMTY3RDMwMTYw MDEwQ0RBNSAvKiBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTBGQ0YzMzIzMEYyQjk3MTUwMDRCNjc5NSAvKiBDb2xvckNHLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvbG9yQ0cuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwotCQkwRkNGMzMyODBGMkI5QTI1MDA0QjY3OTUgLyogV2ViVGls ZWRMYXllci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdlYlRp bGVkTGF5ZXIubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTBGQ0YzMzI5MEYyQjlB MjUwMDRCNjc5NSAvKiBXZWJUaWxlZExheWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFdlYlRpbGVkTGF5ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEZD RjMzMkEwRjJCOUEyNTAwNEI2Nzk1IC8qIFdlYkxheWVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAub2JqY3BwOyBwYXRoID0gV2ViTGF5ZXIubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTBGQ0YzMzJCMEYyQjlBMjUwMDRCNjc5NSAvKiBXZWJMYXllci5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJMYXllci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkwRkQzMDgwQzExN0NGN0U3MDBBNzkxRjcgLyogUmVuZGVyRnJhbWVCYXNlLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlckZyYW1lQmFzZS5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xODg3Niw4ICsxODg3Miw2IEBACiAJCQkJ NDlGRkJGM0UxMUM5M0VFMzAwNkE3MTE4IC8qIFdlYkdMTGF5ZXIubW0gKi8sCiAJCQkJMEZDRjMz MkIwRjJCOUEyNTAwNEI2Nzk1IC8qIFdlYkxheWVyLmggKi8sCiAJCQkJMEZDRjMzMkEwRjJCOUEy NTAwNEI2Nzk1IC8qIFdlYkxheWVyLm1tICovLAotCQkJCTBGQ0YzMzI5MEYyQjlBMjUwMDRCNjc5 NSAvKiBXZWJUaWxlZExheWVyLmggKi8sCi0JCQkJMEZDRjMzMjgwRjJCOUEyNTAwNEI2Nzk1IC8q IFdlYlRpbGVkTGF5ZXIubW0gKi8sCiAJCQkpOwogCQkJcGF0aCA9IG1hYzsKIAkJCXNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7CkBAIC0yNDY0MSw3ICsyNDYzNSw2IEBACiAJCQkJOTdBQUJEMjUxNEZB MDlENTAwNzQ1N0FFIC8qIFdlYlNvY2tldEZyYW1lLmggaW4gSGVhZGVycyAqLywKIAkJCQk5N0FB QkQyNzE0RkEwOUQ1MDA3NDU3QUUgLyogV2ViU29ja2V0SGFuZHNoYWtlLmggaW4gSGVhZGVycyAq LywKIAkJCQkwRjU4MEZBMzE0OTY5MzkxMDBGQjVCRDggLyogV2ViVGlsZWRCYWNraW5nTGF5ZXIu aCBpbiBIZWFkZXJzICovLAotCQkJCTBGQ0YzMzJEMEYyQjlBMjUwMDRCNjc5NSAvKiBXZWJUaWxl ZExheWVyLmggaW4gSGVhZGVycyAqLywKIAkJCQlDRDgyMDMwQTEzOTVBQjZBMDBGOTU2QzYgLyog V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQ0Q4MjAz MEMxMzk1QUI2QTAwRjk1NkM2IC8qIFdlYlZpZGVvRnVsbHNjcmVlbkhVRFdpbmRvd0NvbnRyb2xs ZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUYxMjE3MUY2MTZBOENGMEIwMDAwNTNDQSAvKiBXZWJW VFRFbGVtZW50LmggaW4gSGVhZGVycyAqLywKQEAgLTI3NzAxLDcgKzI3Njk0LDYgQEAKIAkJCQlB QUY1QjdCNzE1MjRCNkM1MDAwNENCNDkgLyogV2ViU29ja2V0RnJhbWUuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJOTdBQUJEMjYxNEZBMDlENTAwNzQ1N0FFIC8qIFdlYlNvY2tldEhhbmRzaGFrZS5j cHAgaW4gU291cmNlcyAqLywKIAkJCQkwRjU4MEZBNDE0OTY5MzkxMDBGQjVCRDggLyogV2ViVGls ZWRCYWNraW5nTGF5ZXIubW0gaW4gU291cmNlcyAqLywKLQkJCQkwRkNGMzMyQzBGMkI5QTI1MDA0 QjY3OTUgLyogV2ViVGlsZWRMYXllci5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFBQTcxNjFFMTQ5 QkYyRkEwMDE2RUMxOSAvKiBXZWJUaWxlTGF5ZXIubW0gaW4gU291cmNlcyAqLywKIAkJCQlDRDgy MDMwQjEzOTVBQjZBMDBGOTU2QzYgLyogV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbSBp biBTb3VyY2VzICovLAogCQkJCUNENjFGRTY5MTc5NEFBREIwMDQxMDFFQiAvKiBXZWJLaXRTb3Vy Y2VCdWZmZXIuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oCmluZGV4IDI4YWZkMGIuLmQ1ZmY2 NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRm b3JtQ0FMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1Bs YXRmb3JtQ0FMYXllci5oCkBAIC0xOTQsMTAgKzE5NCw2IEBAIHB1YmxpYzoKICNlbmRpZiAvLyBO REVCVUcKICNlbmRpZiAvLyBQTEFURk9STShXSU4pCiAKLSNpZiBQTEFURk9STShNQUMpCi0gICAg dmlydHVhbCB2b2lkIHN5bmNocm9ub3VzbHlEaXNwbGF5VGlsZXNJblJlY3QoY29uc3QgRmxvYXRS ZWN0JikgPSAwOwotI2VuZGlmCi0KIHByb3RlY3RlZDoKICAgICBQbGF0Zm9ybUNBTGF5ZXIoTGF5 ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikKICAgICAgICAg OiBtX2xheWVyVHlwZShsYXllclR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmgKaW5kZXggNjA0 MjY3MC4uMzA5NDFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMuaApAQCAtMTM1LDggKzEzNSw2 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcoKSBP VkVSUklERTsKIAotICAgIHZpcnR1YWwgdm9pZCBzeW5jaHJvbm91c2x5RGlzcGxheVRpbGVzSW5S ZWN0KGNvbnN0IEZsb2F0UmVjdCYpIE9WRVJSSURFOwotCiAgICAgdmlydHVhbCBQYXNzUmVmUHRy PFBsYXRmb3JtQ0FMYXllcj4gY2xvbmUoUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikgY29u c3QgT1ZFUlJJREU7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQppbmRleCBi NzM0NzQ2Li4wNDQwNjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KQEAgLTM4LDcgKzM4 LDYgQEAKICNpbXBvcnQgIlNvZnRMaW5raW5nLmgiCiAjaW1wb3J0ICJUaWxlZEJhY2tpbmcuaCIK ICNpbXBvcnQgIldlYkxheWVyLmgiCi0jaW1wb3J0ICJXZWJUaWxlZExheWVyLmgiCiAjaW1wb3J0 ICJXZWJUaWxlZEJhY2tpbmdMYXllci5oIgogI2ltcG9ydCA8b2JqYy9vYmpjLWF1dG8uaD4KICNp bXBvcnQgPG9iamMvcnVudGltZS5oPgpAQCAtMTkzLDcgKzE5Miw3IEBAIFBsYXRmb3JtQ0FMYXll ck1hYzo6UGxhdGZvcm1DQUxheWVyTWFjKExheWVyVHlwZSBsYXllclR5cGUsIFBsYXRmb3JtTGF5 ZXIqIGxheWVyCiAgICAgICAgICAgICBsYXllckNsYXNzID0gW0NBVHJhbnNmb3JtTGF5ZXIgY2xh c3NdOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgTGF5ZXJUeXBlV2ViVGlsZWRM YXllcjoKLSAgICAgICAgICAgIGxheWVyQ2xhc3MgPSBbV2ViVGlsZWRMYXllciBjbGFzc107Cisg ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIExheWVyVHlwZVRpbGVkQmFja2luZ0xheWVyOgogICAgICAgICBjYXNlIExheWVy VHlwZVBhZ2VUaWxlZEJhY2tpbmdMYXllcjoKQEAgLTIxNiwxNSArMjE1LDYgQEAgUGxhdGZvcm1D QUxheWVyTWFjOjpQbGF0Zm9ybUNBTGF5ZXJNYWMoTGF5ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZv cm1MYXllciogbGF5ZXIKICAgICAvLyBDbGVhciBhbGwgdGhlIGltcGxpY2l0IGFuaW1hdGlvbnMg b24gdGhlIENBTGF5ZXIKICAgICBbbV9sYXllci5nZXQoKSBzZXRTdHlsZTpbTlNEaWN0aW9uYXJ5 IGRpY3Rpb25hcnlXaXRoT2JqZWN0Om51bGxBY3Rpb25zRGljdGlvbmFyeSgpIGZvcktleTpAImFj dGlvbnMiXV07CiAgICAgCi0gICAgLy8gSWYgdGhpcyBpcyBhIFRpbGVkTGF5ZXIsIHNldCBzb21l IGluaXRpYWwgdmFsdWVzCi0gICAgaWYgKG1fbGF5ZXJUeXBlID09IExheWVyVHlwZVdlYlRpbGVk TGF5ZXIpIHsKLSAgICAgICAgV2ViVGlsZWRMYXllciogdGlsZWRMYXllciA9IHN0YXRpY19jYXN0 PFdlYlRpbGVkTGF5ZXIqPihtX2xheWVyLmdldCgpKTsKLSAgICAgICAgW3RpbGVkTGF5ZXIgc2V0 VGlsZVNpemU6Q0dTaXplTWFrZShHcmFwaGljc0xheWVyQ0E6OmtUaWxlZExheWVyVGlsZVNpemUs IEdyYXBoaWNzTGF5ZXJDQTo6a1RpbGVkTGF5ZXJUaWxlU2l6ZSldOwotICAgICAgICBbdGlsZWRM YXllciBzZXRMZXZlbHNPZkRldGFpbDoxXTsKLSAgICAgICAgW3RpbGVkTGF5ZXIgc2V0TGV2ZWxz T2ZEZXRhaWxCaWFzOjBdOwotICAgICAgICBbdGlsZWRMYXllciBzZXRDb250ZW50c0dyYXZpdHk6 QCJib3R0b21MZWZ0Il07Ci0gICAgfQotICAgIAogICAgIGlmICh1c2VzVGlsZWRCYWNraW5nTGF5 ZXIoKSkgewogICAgICAgICBtX2N1c3RvbVN1YmxheWVycyA9IGFkb3B0UHRyKG5ldyBQbGF0Zm9y bUNBTGF5ZXJMaXN0KDEpKTsKICAgICAgICAgQ0FMYXllciogdGlsZUNhY2hlVGlsZUNvbnRhaW5l ckxheWVyID0gW3N0YXRpY19jYXN0PFdlYlRpbGVkQmFja2luZ0xheWVyICo+KG1fbGF5ZXIuZ2V0 KCkpIHRpbGVDb250YWluZXJMYXllcl07CkBAIC03MTQsMjEgKzcwNCw2IEBAIFRpbGVkQmFja2lu ZyogUGxhdGZvcm1DQUxheWVyTWFjOjp0aWxlZEJhY2tpbmcoKQogICAgIHJldHVybiBbdGlsZWRC YWNraW5nTGF5ZXIgdGlsZWRCYWNraW5nXTsKIH0KIAotdm9pZCBQbGF0Zm9ybUNBTGF5ZXJNYWM6 OnN5bmNocm9ub3VzbHlEaXNwbGF5VGlsZXNJblJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQot ewotICAgIGlmIChtX2xheWVyVHlwZSAhPSBMYXllclR5cGVXZWJUaWxlZExheWVyKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBXZWJUaWxlZExheWVyICp0aWxlZExheWVyID0gc3RhdGljX2Nhc3Q8 V2ViVGlsZWRMYXllciAqPihtX2xheWVyLmdldCgpKTsKLQotICAgIEJFR0lOX0JMT0NLX09CSkNf RVhDRVBUSU9OUwotICAgIEJPT0wgb2xkQ2FuRHJhd0NvbmN1cnJlbnRseSA9IFt0aWxlZExheWVy IGNhbkRyYXdDb25jdXJyZW50bHldOwotICAgIFt0aWxlZExheWVyIHNldENhbkRyYXdDb25jdXJy ZW50bHk6Tk9dOwotICAgIFt0aWxlZExheWVyIGRpc3BsYXlJblJlY3Q6cmVjdCBsZXZlbE9mRGV0 YWlsOjAgb3B0aW9uczpuaWxdOwotICAgIFt0aWxlZExheWVyIHNldENhbkRyYXdDb25jdXJyZW50 bHk6b2xkQ2FuRHJhd0NvbmN1cnJlbnRseV07Ci0gICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9O UwotfQotCiBBVlBsYXllckxheWVyICpQbGF0Zm9ybUNBTGF5ZXJNYWM6OnBsYXllckxheWVyKCkg Y29uc3QKIHsKICAgICBBU1NFUlQoW21fbGF5ZXIuZ2V0KCkgaXNLaW5kT2ZDbGFzczpnZXRBVlBs YXllckxheWVyQ2xhc3MoKV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDE3YWIwM2UuLmVmOWZiYzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0xMC0yNiAgVGltIEhvcnRvbiAgPHRpbW90aHlf aG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjXSBSZW1vdmUgV2ViVGlsZWRMYXllcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzMzk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHA6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaDoKKyAgICAgICAgUmVt b3ZlIHN5bmNocm9ub3VzbHlEaXNwbGF5VGlsZXNJblJlY3QuCisKIDIwMTMtMTAtMjYgIERhbiBC ZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIC1bV0tCYWNrRm9y d2FyZExpc3QgZm9yd2FyZEl0ZW1dIHJldHVybnMgdGhlIGJhY2sgaXRlbQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1v dGUuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNB TGF5ZXJSZW1vdGUuY3BwCmluZGV4IDAwODcxZmEuLmZhNGE3YjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FM YXllclJlbW90ZS5jcHAKQEAgLTQ2NywxMCArNDY3LDYgQEAgVGlsZWRCYWNraW5nKiBQbGF0Zm9y bUNBTGF5ZXJSZW1vdGU6OnRpbGVkQmFja2luZygpCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAK LXZvaWQgUGxhdGZvcm1DQUxheWVyUmVtb3RlOjpzeW5jaHJvbm91c2x5RGlzcGxheVRpbGVzSW5S ZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKLXsKLX0KLQogQVZQbGF5ZXJMYXllciogUGxhdGZv cm1DQUxheWVyUmVtb3RlOjpwbGF5ZXJMYXllcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG51bGxw dHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Bs YXRmb3JtQ0FMYXllclJlbW90ZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaAppbmRleCBlZjE4YWU4Li4zNzk0YWMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FM YXllclJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv UGxhdGZvcm1DQUxheWVyUmVtb3RlLmgKQEAgLTEzOSw4ICsxMzksNiBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIFdlYkNvcmU6OlRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nKCkgT1ZFUlJJREU7 CiAKLSAgICB2aXJ0dWFsIHZvaWQgc3luY2hyb25vdXNseURpc3BsYXlUaWxlc0luUmVjdChjb25z dCBXZWJDb3JlOjpGbG9hdFJlY3QmKSBPVkVSUklERTsKLQogICAgIHZpcnR1YWwgUGFzc1JlZlB0 cjxXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI+IGNsb25lKFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXll ckNsaWVudCogb3duZXIpIGNvbnN0IE9WRVJSSURFOwogCiBwcml2YXRlOgo=