145547 2015-06-01 21:28:36 -0700 [iOS][WK2] Always mark layers as volatile for background pages 2015-06-02 14:30:59 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough commit-queue kling koivisto simon.fraser thorton oldest_to_newest 1098719 0 cdumez 2015-06-01 21:28:36 -0700 We currently mark layers as volatile when the WebProcess is about to be suspended. Most of the time the WebProcess gets suspended when a page goes into the background. However, it is not always the case (see radar), in which case the layers won't be marked as volatile and waste memory even though they are not visible. We need to mark layers as volatile as soon as the page goes into the background, instead of relying on the WebProcess suspension mechanism. Radar: <rdar://problem/20663184> 1098729 1 254050 cdumez 2015-06-01 21:55:02 -0700 Created attachment 254050 Patch 1098901 2 254050 commit-queue 2015-06-02 14:30:51 -0700 Comment on attachment 254050 Patch Clearing flags on attachment: 254050 Committed r185123: <http://trac.webkit.org/changeset/185123> 1098902 3 commit-queue 2015-06-02 14:30:59 -0700 All reviewed patches have been landed. Closing bug. 254050 2015-06-01 21:55:02 -0700 2015-06-02 14:30:51 -0700 Patch bug-145547-20150601215446.patch text/plain 11123 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjdhOGQzMzk1NmEyM2Zj NTk5NzBkNzM0ZTQyMjA5ZDNmMGE3OWM2Yi4uNWRjOThjZjY5ZDg4M2QzMGM4NGE0YmI3ZDVhMTkz OTEyYmZmMGExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE1LTA2LTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU11bV0syXSBBbHdheXMg bWFyayBsYXllcnMgYXMgdm9sYXRpbGUgZm9yIGJhY2tncm91bmQgcGFnZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTU0NworICAgICAgICA8cmRh cjovL3Byb2JsZW0vMjA2NjMxODQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2UgcHJldmlvdXNseSBtYXJrZWQgbGF5ZXJzIGFzIHZvbGF0aWxlIHdo ZW4gdGhlIFdlYlByb2Nlc3Mgd2FzIGFib3V0CisgICAgICAgIHRvIGJlIHN1c3BlbmRlZC4gTW9z dCBvZiB0aGUgdGltZSB0aGUgV2ViUHJvY2VzcyBnZXRzIHN1c3BlbmRlZCB3aGVuIGEKKyAgICAg ICAgcGFnZSBnb2VzIGludG8gdGhlIGJhY2tncm91bmQuIEhvd2V2ZXIsIGl0IGlzIG5vdCBhbHdh eXMgdHJ1ZSAoc2VlCisgICAgICAgIHJhZGFyKSwgaW4gd2hpY2ggY2FzZSB0aGUgbGF5ZXJzIHdv bid0IGJlIG1hcmtlZCBhcyB2b2xhdGlsZSBhbmQgdXNlCisgICAgICAgIG1lbW9yeSBldmVuIHRo b3VnaCB0aGV5IGFyZSBub3QgdmlzaWJsZS4KKworICAgICAgICBXZSBub3cgbWFyayBsYXllcnMg YXMgdm9sYXRpbGUgYXMgc29vbiBhcyB0aGUgcGFnZSBnb2VzIGludG8gdGhlCisgICAgICAgIGJh Y2tncm91bmQsIGluc3RlYWQgb2YgcmVseWluZyBvbiB0aGUgV2ViUHJvY2VzcyBzdXNwZW5zaW9u IG1lY2hhbmlzbQorICAgICAgICB0byBkbyBzby4KKworICAgICAgICBBIG5ldyBBcHBsaWNhdGlv bkRpZEVudGVyQmFja2dyb3VuZCBJUEMgbWVzc2FnZSBmcm9tIHRoZSBVSVByb2Nlc3MgdG8KKyAg ICAgICAgdGhlIFdlYlByb2Nlc3MgaXMgYWRkZWQgKGluIGFkZGl0aW9uIHRvIHRoZSBwcmUtZXhp c3RpbmcKKyAgICAgICAgQXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kIG9uZSkuIFdoZW4g dGhlIFdlYlByb2Nlc3MgcmVjZWl2ZXMgdGhpcworICAgICAgICBtZXNzYWdlLCBpdCB3aWxsIGZy ZWV6ZSB0aGUgbGF5ZXIgdHJlZSBzdGF0ZSBhbmQgbWFyayB0aGUgbGF5ZXJzIGFzCisgICAgICAg IHZvbGF0aWxlICh3aXRoIGEgdGltZXIgdG8ga2VlcCByZXRyeWluZyBpZiBuZWVkZWQpLCBzaW1p bGFybHkgdG8gd2hhdAorICAgICAgICBpcyBhbHJlYWR5IGRvbmUgaW4gV2ViUHJvY2Vzczo6YWN0 dWFsUHJlcGFyZVRvU3VzcGVuZCgpLgorICAgICAgICBXaGVuIHRoZSBBcHBsaWNhdGlvbldpbGxF bnRlckZvcmVncm91bmQgaXMgcmVjZWl2ZWQsIHdlIHVuZnJlZXplIHRoZQorICAgICAgICBsYXll ciB0cmVlIHN0YXRlLiBUaGUgbGF5ZXJzJyB2b2xhdGlsZSBzdGF0ZSB3aWxsIGJlIGF1dG9tYXRp Y2FsbHkKKyAgICAgICAgdXBkYXRlZCB3aGVuIHRoZXkgYXJlIGRpc3BsYXllZCAoc2VlIHNldEJ1 ZmZlclZvbGF0aWxpdHkoKSBjYWxsIGluCisgICAgICAgIFJlbW90ZUxheWVyQmFja2luZ1N0b3Jl OjpkaXNwbGF5KCkpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBfYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQ6XSk6CisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6YXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6V2ViUGFn ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldExheWVyVHJlZVN0YXRlSXNGcm96ZW4p OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjptYXJrTGF5ZXJzVm9sYXRpbGVJbW1lZGlhdGVs eUlmUG9zc2libGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp2b2xhdGlsaXR5VGltZXJGaXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjptYXJrQWxs TGF5ZXJzVm9sYXRpbGVJZlBvc3NpYmxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6 c2V0QWxsTGF5ZXJUcmVlU3RhdGVzRnJvemVuKToKKwogMjAxNS0wNi0wMSAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtjbWFrZV0gU3VwcHJlc3MgdW51 c2VkIHBhcmFtZXRlciB3YXJuaW5ncyBpbiBXZWJLaXQyIGFuZCBUZXN0TmV0c2NhcGVQbHVnSW4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjOWNkODg3ZGMzNDg0 YTA4ZTBjMTYyMWJmOGY4YTMxMmY0MzlkZjg2Li4xNDFjY2M2MTkwODk4MDJlODA0ZGQ1OTk3ZWRm YTgxZGYyNWY2NGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA IC00OTgsNiArNDk4LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QXNzaXN0ZWROb2RlVmFsdWUo Y29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVWYWx1ZUFzTnVtYmVyKGRv dWJsZSk7CiAgICAgdm9pZCBzZXRBc3Npc3RlZE5vZGVTZWxlY3RlZEluZGV4KHVpbnQzMl90IGlu ZGV4LCBib29sIGFsbG93TXVsdGlwbGVTZWxlY3Rpb24gPSBmYWxzZSk7CisgICAgdm9pZCBhcHBs aWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZCgpOwogICAgIHZvaWQgYXBwbGljYXRpb25XaWxsRW50 ZXJGb3JlZ3JvdW5kKCk7CiAgICAgdm9pZCBhcHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmUoKTsK ICAgICB2b2lkIGFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggNDY3YzNjYjRjZDc2ZGNmNDgy YzM1ZTMwZDk1MTM2YzFlY2IwNmUwZS4uNjM5NTczYzAzMzJiYzdlNmE1NThkNDlkZjU1YjJkNjNi NWVhZTc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5tbQpAQCAtNTQ0LDYgKzU0NCw3IEBAIC0gKHZvaWQpX2FwcGxpY2F0aW9uV2lsbFJlc2lnbkFj dGl2ZTooTlNOb3RpZmljYXRpb24qKW5vdGlmaWNhdGlvbgogLSAodm9pZClfYXBwbGljYXRpb25E aWRFbnRlckJhY2tncm91bmQ6KE5TTm90aWZpY2F0aW9uKilub3RpZmljYXRpb24KIHsKICAgICBf aXNCYWNrZ3JvdW5kID0gWUVTOworICAgIF9wYWdlLT5hcHBsaWNhdGlvbkRpZEVudGVyQmFja2dy b3VuZCgpOwogICAgIF9wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpBbGxGbGFn cyAmIH5WaWV3U3RhdGU6OklzSW5XaW5kb3cpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCmluZGV4IDRiYTBjYjFiZjBiNjk2MjU3Zjg2 Mjc4N2RiYmFjNDk4ZmQyNWFlMzEuLmRiYWZkZDEzNWUxNTdmYmJjZjQzYThjZTkxYzYxNTUyZDU1 OGZkMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5 SU9TLm1tCkBAIC01OTMsNiArNTkzLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRVcGRhdGVC bG9ja1NlbGVjdGlvbldpdGhUb3VjaCh1aW50MzJfdCB0b3VjaCwgdWludDMyX3QgZmxhCiAgICAg bV9wYWdlQ2xpZW50LmRpZFVwZGF0ZUJsb2NrU2VsZWN0aW9uV2l0aFRvdWNoKHRvdWNoLCBmbGFn cywgZ3Jvd1RocmVzaG9sZCwgc2hyaW5rVGhyZXNob2xkKTsKIH0KIAordm9pZCBXZWJQYWdlUHJv eHk6OmFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCkKK3sKKyAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCksIG1f cGFnZUlEKTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9y ZWdyb3VuZCgpCiB7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpBcHBs aWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKSwgbV9wYWdlSUQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQ4MWRiOGViN2JiYjA5ZDhk ZDI2NWVmZWM2NWI4NWI3ZjBkYTI2NmYuLjI0NTE3NGExNDNlOWM3M2EwMmQwODU5YWEzM2ZkNDA1 ZGFhNjZjYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKQEAgLTMyOCw2ICszMjgsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJ RCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICAsIG1f YXZhaWxhYmxlU2NyZWVuU2l6ZShwYXJhbWV0ZXJzLmF2YWlsYWJsZVNjcmVlblNpemUpCiAgICAg LCBtX2RldmljZU9yaWVudGF0aW9uKDApCiAgICAgLCBtX2luRHluYW1pY1NpemVVcGRhdGUoZmFs c2UpCisgICAgLCBtX3ZvbGF0aWxpdHlUaW1lcigqdGhpcywgJldlYlBhZ2U6OnZvbGF0aWxpdHlU aW1lckZpcmVkKQogI2VuZGlmCiAgICAgLCBtX2luc3BlY3RvckNsaWVudCgwKQogICAgICwgbV9i YWNrZ3JvdW5kQ29sb3IoQ29sb3I6OndoaXRlKQpAQCAtMTg1OSw2ICsxODYwLDI0IEBAIGNvbnN0 IFdlYkV2ZW50KiBXZWJQYWdlOjpjdXJyZW50RXZlbnQoKQogICAgIHJldHVybiBnX2N1cnJlbnRF dmVudDsKIH0KIAordm9pZCBXZWJQYWdlOjpzZXRMYXllclRyZWVTdGF0ZUlzRnJvemVuKGJvb2wg ZnJvemVuKQoreworICAgIGF1dG8qIGRyYXdpbmdBcmVhID0gdGhpcy0+ZHJhd2luZ0FyZWEoKTsK KyAgICBpZiAoIWRyYXdpbmdBcmVhKQorICAgICAgICByZXR1cm47CisKKyAgICBkcmF3aW5nQXJl YS0+c2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihmcm96ZW4pOworfQorCitib29sIFdlYlBhZ2U6 Om1hcmtMYXllcnNWb2xhdGlsZUltbWVkaWF0ZWx5SWZQb3NzaWJsZSgpCit7CisgICAgYXV0byog ZHJhd2luZ0FyZWEgPSB0aGlzLT5kcmF3aW5nQXJlYSgpOworICAgIGlmICghZHJhd2luZ0FyZWEp CisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJuIGRyYXdpbmdBcmVhLT5tYXJrTGF5 ZXJzVm9sYXRpbGVJbW1lZGlhdGVseUlmUG9zc2libGUoKTsKK30KKwogY2xhc3MgQ3VycmVudEV2 ZW50IHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBDdXJyZW50RXZlbnQoY29uc3QgV2ViRXZlbnQm IGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5k ZXggOWUxZTc5NGY0MDY4ZjQ5OGI0OWViZGQxZTE1MDMwZjFiY2IwNjQ4Mi4uNmNiNzA5ZTIyNDAz MGU5MTEwOGEwMzE2NDNiOWQzM2YwMWQzMTc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC01NTMsNiArNTUzLDkgQEAgcHVibGljOgogICAgIHZv aWQgZGlzYWJsZUluc3BlY3Rvck5vZGVTZWFyY2goKTsKICNlbmRpZgogCisgICAgdm9pZCBzZXRM YXllclRyZWVTdGF0ZUlzRnJvemVuKGJvb2wpOworICAgIGJvb2wgbWFya0xheWVyc1ZvbGF0aWxl SW1tZWRpYXRlbHlJZlBvc3NpYmxlKCk7CisKICAgICBOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVx dWVzdE1hbmFnZXIqIG5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpOwogCiAg ICAgdm9pZCBwYWdlRGlkU2Nyb2xsKCk7CkBAIC03ODksNiArNzkyLDcgQEAgcHVibGljOgogICAg IGJvb2wgc2NhbGVXYXNTZXRCeVVJUHJvY2VzcygpIGNvbnN0IHsgcmV0dXJuIG1fc2NhbGVXYXNT ZXRCeVVJUHJvY2VzczsgfQogICAgIHZvaWQgd2lsbFN0YXJ0VXNlclRyaWdnZXJlZFpvb21pbmco KTsKICAgICB2b2lkIGFwcGxpY2F0aW9uV2lsbFJlc2lnbkFjdGl2ZSgpOworICAgIHZvaWQgYXBw bGljYXRpb25EaWRFbnRlckJhY2tncm91bmQoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9uV2lsbEVu dGVyRm9yZWdyb3VuZCgpOwogICAgIHZvaWQgYXBwbGljYXRpb25EaWRCZWNvbWVBY3RpdmUoKTsK ICAgICB2b2lkIHpvb21Ub1JlY3QoV2ViQ29yZTo6RmxvYXRSZWN0LCBkb3VibGUgbWluaW11bVNj YWxlLCBkb3VibGUgbWF4aW11bVNjYWxlKTsKQEAgLTkxOCw2ICs5MjIsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgc2VuZFRhcEhpZ2hsaWdodEZvck5vZGVJZk5lY2Vzc2FyeSh1aW50NjRfdCByZXF1 ZXN0SUQsIFdlYkNvcmU6Ok5vZGUqKTsKICAgICB2b2lkIHJlc2V0VGV4dEF1dG9zaXppbmdCZWZv cmVMYXlvdXRJZk5lZWRlZChjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIG9sZFNpemUsIGNvbnN0 IFdlYkNvcmU6OkZsb2F0U2l6ZSYgbmV3U2l6ZSk7CiAgICAgV2ViQ29yZTo6VmlzaWJsZVBvc2l0 aW9uIHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludChXZWJDb3JlOjpGcmFtZSYs IGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CisgICAgdm9pZCB2b2xhdGlsaXR5VGltZXJGaXJl ZCgpOwogI2VuZGlmCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogICAgIHN0YXRpYyBjb25zdCBjaGFy KiBpbnRlcnByZXRLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50Kik7CkBAIC0x MzQwLDYgKzEzNDUsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxXZWJDb3JlOjpOb2RlPiBtX3Bl bmRpbmdTeW50aGV0aWNDbGlja05vZGU7CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX3BlbmRp bmdTeW50aGV0aWNDbGlja0xvY2F0aW9uOwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3ByZXZp b3VzRXhwb3NlZENvbnRlbnRSZWN0OworICAgIFdlYkNvcmU6OlRpbWVyIG1fdm9sYXRpbGl0eVRp bWVyOwogI2VuZGlmCiAKICAgICBXZWJJbnNwZWN0b3JDbGllbnQqIG1faW5zcGVjdG9yQ2xpZW50 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbgppbmRleCBkYjYzOGI4YzBjYjQ5MzMzMmZiMzcyYmQwZTc2MDgyMzExNWMwOWM2 Li5mN2U3NmQyYzAxN2I3MzM2ZGUxMjAwNGM0ZDE1ZjM5ZGFiMDQwMDU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpA QCAtODgsNiArODgsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAg ICBTZXRBc3Npc3RlZE5vZGVWYWx1ZUFzTnVtYmVyKGRvdWJsZSB2YWx1ZSkKICAgICBTZXRBc3Np c3RlZE5vZGVTZWxlY3RlZEluZGV4KHVpbnQzMl90IGluZGV4LCBib29sIGFsbG93TXVsdGlwbGVT ZWxlY3Rpb24pCiAgICAgQXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZlKCkKKyAgICBBcHBsaWNh dGlvbkRpZEVudGVyQmFja2dyb3VuZCgpCiAgICAgQXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3Jv dW5kKCkKICAgICBBcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZSgpCiAgICAgQ29udGVudFNpemVD YXRlZ29yeURpZENoYW5nZShTdHJpbmcgY29udGVudFNpemVDYXRlZ29yeSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA1 ZGFhOGJmZmIyMDAyYmQ1YmIwN2Y4NjI3MTBmMTU0YTY5OGEyMjJhLi41OTU0YmYxMzc0MGI4OTRi Y2I0NTY0ZTE5NWMwZTMyODVhMjZlNWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yNzE4LDggKzI3MTgsMjggQEAg dm9pZCBXZWJQYWdlOjphcHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmUoKQogICAgIFtbTlNOb3Rp ZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6V2ViVUlB cHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiB9CiAK K3ZvaWQgV2ViUGFnZTo6dm9sYXRpbGl0eVRpbWVyRmlyZWQoKQoreworICAgIGlmICghbWFya0xh eWVyc1ZvbGF0aWxlSW1tZWRpYXRlbHlJZlBvc3NpYmxlKCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fdm9sYXRpbGl0eVRpbWVyLnN0b3AoKTsKK30KKwordm9pZCBXZWJQYWdlOjphcHBsaWNh dGlvbkRpZEVudGVyQmFja2dyb3VuZCgpCit7CisgICAgc2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3pl bih0cnVlKTsKKyAgICBpZiAobWFya0xheWVyc1ZvbGF0aWxlSW1tZWRpYXRlbHlJZlBvc3NpYmxl KCkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fdm9sYXRpbGl0eVRpbWVyLnN0YXJ0UmVwZWF0 aW5nKHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMoMjAwKSk7Cit9CisKIHZvaWQgV2ViUGFnZTo6 YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCkKIHsKKyAgICBtX3ZvbGF0aWxpdHlUaW1l ci5zdG9wKCk7CisgICAgc2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihmYWxzZSk7CisKICAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHBvc3ROb3RpZmljYXRpb25OYW1l OldlYlVJQXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kTm90aWZpY2F0aW9uIG9iamVjdDpu aWxdOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nl c3MuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCA0 Zjg1NzAyZWQ4YzljMmZhNjQyNjliMTJjODA3Nzk4ODU0ZGEwZjllLi5hNjEwY2U1N2IwMmMxOTNm MTE4OWRlMzk3MDYyNDUzNmE5YjExMTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAKQEAgLTEyNjYsMjAgKzEyNjYsMTYgQEAgdm9pZCBXZWJQcm9jZXNzOjpjYW5j ZWxQcmVwYXJlVG9TdXNwZW5kKCkKIGJvb2wgV2ViUHJvY2Vzczo6bWFya0FsbExheWVyc1ZvbGF0 aWxlSWZQb3NzaWJsZSgpCiB7CiAgICAgYm9vbCBzdWNjZXNzZnVsbHlNYXJrZWRBbGxMYXllcnNW b2xhdGlsZSA9IHRydWU7Ci0gICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlTWFwLnZhbHVlcygp KSB7Ci0gICAgICAgIGlmIChhdXRvIGRyYXdpbmdBcmVhID0gcGFnZS0+ZHJhd2luZ0FyZWEoKSkK LSAgICAgICAgICAgIHN1Y2Nlc3NmdWxseU1hcmtlZEFsbExheWVyc1ZvbGF0aWxlICY9IGRyYXdp bmdBcmVhLT5tYXJrTGF5ZXJzVm9sYXRpbGVJbW1lZGlhdGVseUlmUG9zc2libGUoKTsKLSAgICB9 CisgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlTWFwLnZhbHVlcygpKQorICAgICAgICBzdWNj ZXNzZnVsbHlNYXJrZWRBbGxMYXllcnNWb2xhdGlsZSAmPSBwYWdlLT5tYXJrTGF5ZXJzVm9sYXRp bGVJbW1lZGlhdGVseUlmUG9zc2libGUoKTsKIAogICAgIHJldHVybiBzdWNjZXNzZnVsbHlNYXJr ZWRBbGxMYXllcnNWb2xhdGlsZTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzOjpzZXRBbGxMYXllclRy ZWVTdGF0ZXNGcm96ZW4oYm9vbCBmcm96ZW4pCiB7Ci0gICAgZm9yIChhdXRvJiBwYWdlIDogbV9w YWdlTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChhdXRvIGRyYXdpbmdBcmVhID0gcGFnZS0+ ZHJhd2luZ0FyZWEoKSkKLSAgICAgICAgICAgIGRyYXdpbmdBcmVhLT5zZXRMYXllclRyZWVTdGF0 ZUlzRnJvemVuKGZyb3plbik7Ci0gICAgfQorICAgIGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZU1h cC52YWx1ZXMoKSkKKyAgICAgICAgcGFnZS0+c2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihmcm96 ZW4pOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnByb2Nlc3NTdXNwZW5zaW9uQ2xlYW51cFRpbWVy RmlyZWQoKQo=