116368 2013-05-17 17:35:41 -0700 Only allow 1 WebProcess to hold a PageCache 2013-05-17 18:13:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough ggaren oldest_to_newest 890748 0 barraclough 2013-05-17 17:35:41 -0700 Currently if we have 20 web processes, each with 3 entries in the page cache, the cache can effectively grow to 60 entries (instead of 3). Stop this. 890749 1 202175 barraclough 2013-05-17 17:43:10 -0700 Created attachment 202175 Fix 890756 2 202175 ggaren 2013-05-17 17:53:12 -0700 Comment on attachment 202175 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=202175&action=review r=me > Source/WebKit2/UIProcess/WebContext.cpp:465 > +void WebContext::processDidSaveToPageCache(WebProcessProxy* process) How about "processDidCachePage"? -- My first reading thought that the process had been saved to some sort of cache. 890758 3 ggaren 2013-05-17 17:53:29 -0700 (and Anders) 890765 4 barraclough 2013-05-17 18:13:24 -0700 Fixed in r150314. 202175 2013-05-17 17:43:10 -0700 2013-05-17 17:53:12 -0700 Fix 116368.patch text/plain 10400 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDMxMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDEzLTA1LTE3ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBPbmx5IGFsbG93 IDEgV2ViUHJvY2VzcyB0byBob2xkIGEgUGFnZUNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzNjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzEzMzkyNjAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250 ZXh0OjpXZWJDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cHJvY2Vzc0Rp ZFNhdmVUb1BhZ2VDYWNoZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjpkaXNjb25uZWN0UHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHQuaDoKKyAgICAgICAgICAgIC0gQWRkZWQgbV9wcm9jZXNzV2l0aFBhZ2VDYWNoZSwgb25s eSBhbGxvdyBvbmUgcHJvY2VzcyB0byBrZWVwIGEgUGFnZUNhY2hlLgorICAgICAgICAoV2ViQ29u dGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkU2F2ZVRvUGFnZUNhY2hlKToKKyAgICAgICAgKFdlYktp dCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViUGFn ZVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgor ICAgICAgICAgICAgLSBGb3J3YXJkIGRpZFNhdmVUb1BhZ2VDYWNoZSB0byB0aGUgV2ViUHJvY2Vz c1Byb3h5LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmFkZEJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkU2F2ZVRvUGFnZUNhY2hlKToKKyAgICAgICAg KFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cmVsZWFzZVBhZ2VD YWNoZSk6CisgICAgICAgICAgICAtIEZvcndhcmQgcmVsZWFzZVBhZ2VDYWNoZSB0byB0aGUgV2Vi UHJvY2Vzcy4KKyAgICAgICAgICAgIC0gRm9yd2FyZCBkaWRTYXZlVG9QYWdlQ2FjaGUgdG8gdGhl IFdlYkNvbnRleHQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAg ICAgICAoV2ViUHJvY2Vzc1Byb3h5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVM b2FkZXJDbGllbnQ6OmRpZFNhdmVUb1BhZ2VDYWNoZSk6CisgICAgICAgICAgICAtIEZvcndhcmQg ZGlkU2F2ZVRvUGFnZUNhY2hlIHRvIHRoZSBXZWJQYWdlUHJveHkuCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cmVsZWFz ZVBhZ2VDYWNoZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5oOgorICAgICAgICAoV2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorICAgICAgICAgICAgLSBBZGRlZCAnUmVsZWFzZVBhZ2VD YWNoZScgdG8gaW5zdHJ1Y3QgYSB3ZWIgcHJvY2VzcyB0byBkcm9wIGFueSBjYWNoZWQgcGFnZXMu CisKIDIwMTMtMDUtMTcgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzODE5ODc4PiBEaXNhYmxlIFNoYXJlZFdvcmtlciB3aGVu IGluIG11bHRpcGxlIHdlYiBwcm9jZXNzIG1vZGVsCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwCShyZXZpc2lvbiAxNTAxNTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw2ICsxMjUsNyBA QCBXZWJDb250ZXh0OjpXZWJDb250ZXh0KFByb2Nlc3NNb2RlbCBwcm9jCiAgICAgOiBtX3Byb2Nl c3NNb2RlbChwcm9jZXNzTW9kZWwpCiAgICAgLCBtX3dlYlByb2Nlc3NDb3VudExpbWl0KFVJTlRf TUFYKQogICAgICwgbV9oYXZlSW5pdGlhbEVtcHR5UHJvY2VzcyhmYWxzZSkKKyAgICAsIG1fcHJv Y2Vzc1dpdGhQYWdlQ2FjaGUoMCkKICAgICAsIG1fZGVmYXVsdFBhZ2VHcm91cChXZWJQYWdlR3Jv dXA6OmNyZWF0ZSgpKQogICAgICwgbV9pbmplY3RlZEJ1bmRsZVBhdGgoaW5qZWN0ZWRCdW5kbGVQ YXRoKQogICAgICwgbV92aXNpdGVkTGlua1Byb3ZpZGVyKHRoaXMpCkBAIC00NjEsNiArNDYyLDEz IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWcKICAgICBzX2ludmFs aWRNZXNzYWdlQ2FsbGJhY2sodG9BUEkoV2ViU3RyaW5nOjpjcmVhdGUobWVzc2FnZU5hbWVTdHJp bmdCdWlsZGVyLnRvU3RyaW5nKCkpLmdldCgpKSk7CiB9CiAKK3ZvaWQgV2ViQ29udGV4dDo6cHJv Y2Vzc0RpZFNhdmVUb1BhZ2VDYWNoZShXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MpCit7CisgICAg aWYgKG1fcHJvY2Vzc1dpdGhQYWdlQ2FjaGUgJiYgbV9wcm9jZXNzV2l0aFBhZ2VDYWNoZSAhPSBw cm9jZXNzKQorICAgICAgICBtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlLT5yZWxlYXNlUGFnZUNhY2hl KCk7CisgICAgbV9wcm9jZXNzV2l0aFBhZ2VDYWNoZSA9IHByb2Nlc3M7Cit9CisKIFdlYlByb2Nl c3NQcm94eSogV2ViQ29udGV4dDo6ZW5zdXJlU2hhcmVkV2ViUHJvY2VzcygpCiB7CiAgICAgQVNT RVJUKG1fcHJvY2Vzc01vZGVsID09IFByb2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVByb2Nlc3Mp OwpAQCAtNjU3LDYgKzY2NSw4IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3Mo V2ViUHIKICAgICAvLyBDbGVhcmluZyBldmVyeXRoaW5nIGNhdXNlcyBhc3NlcnRpb24gZmFpbHVy ZXMsIHNvIGl0J3MgbGVzcyB0cm91YmxlIHRvIHNraXAgdGhhdCBmb3Igbm93LgogICAgIGlmICht X3Byb2Nlc3NNb2RlbCAhPSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzKSB7CiAg ICAgICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb3RlY3QocHJvY2Vzcyk7CisgICAgICAg IGlmIChtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlID09IHByb2Nlc3MpCisgICAgICAgICAgICBtX3By b2Nlc3NXaXRoUGFnZUNhY2hlID0gMDsKICAgICAgICAgbV9wcm9jZXNzZXMucmVtb3ZlKG1fcHJv Y2Vzc2VzLmZpbmQocHJvY2VzcykpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNjc3LDYg KzY4Nyw4IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MoV2ViUHIKICAgICAv LyBpZiBpdCB3ZXJlIGludm9rZWQgZnJvbSBWZWN0b3I6OnJlbW92ZSgpLiBSZWZQdHIgZGVsYXlz IGRlc3RydWN0aW9uIHVudGlsIGl0J3Mgc2FmZS4KICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5 PiBwcm90ZWN0KHByb2Nlc3MpOwogICAgIG1fcHJvY2Vzc2VzLnJlbW92ZShtX3Byb2Nlc3Nlcy5m aW5kKHByb2Nlc3MpKTsKKyAgICBpZiAobV9wcm9jZXNzV2l0aFBhZ2VDYWNoZSA9PSBwcm9jZXNz KQorICAgICAgICBtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlID0gMDsKIH0KIAogV2ViUHJvY2Vzc1By b3h5KiBXZWJDb250ZXh0OjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3Vu dExpbWl0KCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNp b24gMTUwMTUyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkod29y a2luZyBjb3B5KQpAQCAtMjk1LDYgKzI5NSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBz ZXRJbnZhbGlkTWVzc2FnZUNhbGxiYWNrKHZvaWQgKCopKFdLU3RyaW5nUmVmKSk7CiAgICAgc3Rh dGljIHZvaWQgZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKGNvbnN0IENvcmVJUEM6OlN0cmluZ1Jl ZmVyZW5jZSYgbWVzc2FnZVJlY2VpdmVyTmFtZSwgY29uc3QgQ29yZUlQQzo6U3RyaW5nUmVmZXJl bmNlJiBtZXNzYWdlTmFtZSk7CiAKKyAgICB2b2lkIHByb2Nlc3NEaWRTYXZlVG9QYWdlQ2FjaGUo V2ViUHJvY2Vzc1Byb3h5Kik7CisKIHByaXZhdGU6CiAgICAgV2ViQ29udGV4dChQcm9jZXNzTW9k ZWwsIGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKTsKICAgICB2b2lkIHBsYXRmb3Jt SW5pdGlhbGl6ZSgpOwpAQCAtMzg0LDYgKzM4Niw4IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFJl ZlB0cjxXZWJQcm9jZXNzUHJveHk+PiBtX3Byb2Nlc3NlczsKICAgICBib29sIG1faGF2ZUluaXRp YWxFbXB0eVByb2Nlc3M7CiAKKyAgICBXZWJQcm9jZXNzUHJveHkqIG1fcHJvY2Vzc1dpdGhQYWdl Q2FjaGU7CisKICAgICBSZWZQdHI8V2ViUGFnZUdyb3VwPiBtX2RlZmF1bHRQYWdlR3JvdXA7CiAK ICAgICBSZWZQdHI8QVBJT2JqZWN0PiBtX2luamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2Vy RGF0YTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShy ZXZpc2lvbiAxNTAxNTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQzMyw0ICs0NDMzLDkgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OnNldE92ZXJyaWRlUHJpdmF0ZUJybwogICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlNldE92ZXJyaWRlUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChvdmVycmlkZVBy aXZhdGVCcm93c2luZ0VuYWJsZWQpLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTYXZlVG9QYWdlQ2FjaGUoKQoreworICAgIG1fcHJvY2Vzcy0+ZGlkU2F2ZVRvUGFnZUNh Y2hlKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTUwMTUyKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC03NzAsNiArNzcw LDggQEAgcHVibGljOgogICAgIHZvaWQgY29ubmVjdGlvbldpbGxPcGVuKENvcmVJUEM6OkNvbm5l Y3Rpb24qKTsKICAgICB2b2lkIGNvbm5lY3Rpb25XaWxsQ2xvc2UoQ29yZUlQQzo6Q29ubmVjdGlv biopOwogCisgICAgdm9pZCBkaWRTYXZlVG9QYWdlQ2FjaGUoKTsKKwogcHJpdmF0ZToKICAgICBX ZWJQYWdlUHJveHkoUGFnZUNsaWVudCosIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiwgV2Vi UGFnZUdyb3VwKiwgdWludDY0X3QgcGFnZUlEKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNTAxNTIp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3 b3JraW5nIGNvcHkpCkBAIC0zMTksNCArMzE5LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5 IHsKICNlbmRpZgogCiAgICAgRGlkVXBkYXRlSW5XaW5kb3dTdGF0ZSgpCisgICAgCisgICAgRGlk U2F2ZVRvUGFnZUNhY2hlKCkKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxNTAxNTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkzLDYgKzI5 Myw4IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5Ym9hcmRBY2Nlc3MKIAogdm9pZCBX ZWJQcm9jZXNzUHJveHk6OmFkZEJhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBpdGVtSUQsIGNvbnN0 IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRp dGxlLCBjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJiBiYWNrRm9yd2FyZERhdGEpCiB7Cisg ICAgbV9jb250ZXh0LT5wcm9jZXNzRGlkU2F2ZVRvUGFnZUNhY2hlKHRoaXMpOworCiAgICAgTUVT U0FHRV9DSEVDS19VUkwob3JpZ2luYWxVUkwpOwogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHVybCk7 CiAKQEAgLTY0NCw2ICs2NDYsMTggQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnBhZ2VQcmVmZXJl bmNlc0NoYQogI2VuZGlmCiB9CiAKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRTYXZlVG9QYWdl Q2FjaGUoKQoreworICAgIG1fY29udGV4dC0+cHJvY2Vzc0RpZFNhdmVUb1BhZ2VDYWNoZSh0aGlz KTsKK30KKwordm9pZCBXZWJQcm9jZXNzUHJveHk6OnJlbGVhc2VQYWdlQ2FjaGUoKQoreworICAg IGlmIChjYW5TZW5kTWVzc2FnZSgpKQorICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNz OjpSZWxlYXNlUGFnZUNhY2hlKCksIDApOworfQorCisKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpy ZXF1ZXN0VGVybWluYXRpb24oKQogewogICAgIENoaWxkUHJvY2Vzc1Byb3h5Ojp0ZXJtaW5hdGUo KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgJKHJl dmlzaW9uIDE1MDE1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSw5IEBAIHB1YmxpYzoKICAgICB2b2lk IHBhZ2VWaXNpYmlsaXR5Q2hhbmdlZChXZWJQYWdlUHJveHkqKTsKICAgICB2b2lkIHBhZ2VQcmVm ZXJlbmNlc0NoYW5nZWQoV2ViUGFnZVByb3h5Kik7CiAKKyAgICB2b2lkIGRpZFNhdmVUb1BhZ2VD YWNoZSgpOworICAgIHZvaWQgcmVsZWFzZVBhZ2VDYWNoZSgpOworCiAjaWYgUExBVEZPUk0oTUFD KQogICAgIGJvb2wgYWxsUGFnZXNBcmVQcm9jZXNzU3VwcHJlc3NpYmxlKCkgY29uc3Q7CiAgICAg c3RhdGljIGJvb2wgcGFnZUlzUHJvY2Vzc1N1cHByZXNzaWJsZShXZWJQYWdlUHJveHkqKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkocmV2aXNpb24gMTUw MTU2KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTEzOCw2ICsxMTM4LDEzIEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0VGV4dENo ZWNrZXJTdGF0ZShjb24KICAgICB9CiB9CiAKK3ZvaWQgV2ViUHJvY2Vzczo6cmVsZWFzZVBhZ2VD YWNoZSgpCit7CisgICAgaW50IHNhdmVkUGFnZUNhY2hlQ2FwYWNpdHkgPSBwYWdlQ2FjaGUoKS0+ Y2FwYWNpdHkoKTsKKyAgICBwYWdlQ2FjaGUoKS0+c2V0Q2FwYWNpdHkoMCk7CisgICAgcGFnZUNh Y2hlKCktPnNldENhcGFjaXR5KHNhdmVkUGFnZUNhY2hlQ2FwYWNpdHkpOworfQorCiAjaWYgIVBM QVRGT1JNKE1BQykKIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKGNvbnN0 IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYpCiB7CkBAIC0xMTU2LDcgKzEx NjMsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZUFjdGl2ZVBhZ2VzKCkKIH0KIAogI2VuZGlm Ci0gICAgCisKIHZvaWQgV2ViUHJvY2Vzczo6cGFnZURpZEVudGVyV2luZG93KFdlYlBhZ2UqKQog ewogICAgIG1faW5XaW5kb3dQYWdlQ291bnQrKzsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5oCShyZXZpc2lvbiAxNTAxNTYpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMjMwLDYgKzIzMCw4IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBnYXJiYWdlQ29sbGVjdEphdmFTY3JpcHRPYmplY3RzKCk7CiAgICAg dm9pZCBzZXRKYXZhU2NyaXB0R2FyYmFnZUNvbGxlY3RvclRpbWVyRW5hYmxlZChib29sIGZsYWcp OwogCisgICAgdm9pZCByZWxlYXNlUGFnZUNhY2hlKCk7CisKICNpZiBVU0UoU09VUCkKICAgICB2 b2lkIHNldElnbm9yZVRMU0Vycm9ycyhib29sKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTUw MTUyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmlu CSh3b3JraW5nIGNvcHkpCkBAIC04NCw2ICs4NCw4IEBAIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3Mg TGVnYWN5UmVjZWl2ZXIgewogCiAgICAgUG9zdEluamVjdGVkQnVuZGxlTWVzc2FnZShDb3JlSVBD OjpEYXRhUmVmZXJlbmNlIG1lc3NhZ2VEYXRhKTsKIAorICAgIFJlbGVhc2VQYWdlQ2FjaGUoKQor CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFNldFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoYm9v bCBmbGFnKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJ KHJldmlzaW9uIDE1MDE1MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjM1LDYg KzEyMzUsMTEgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQwogCiB2 b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRTYXZlVG9QYWdlQ2FjaGUoKQogeworICAgIFdl YlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CisgICAgaWYgKCF3ZWJQYWdlKQorICAg ICAgICByZXR1cm47CisKKyAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZFNhdmVUb1BhZ2VDYWNoZSgpKTsKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlkUmVzdG9yZUZyb21QYWdlQ2FjaGUoKQo=