136892 2014-09-17 10:47:13 -0700 Always have a PageThrottler (sometimes have a UserActivity::Impl) 2014-09-17 11:35:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue mitz oldest_to_newest 1035731 0 barraclough 2014-09-17 10:47:13 -0700 Some instances of Page have a PageThrottler to track activity on the Page, and some do not. (Specifically, those created from WebPage in WK2 do, those related to WK1, SVG & inspector do not). We do this for three reasons: • We do not need to take AppNap assertions on WK1. • Some Pages do not track their visibility correctly, and would always claim to be visible. • Page VisibilityState is not set until after construction, so if we instantiate Creating the entire PageThrottler lazily has the drawback that we have to check for its existence at numerous points throughout the code, and we'll miss activity that occurs between the Page being created & the PageThrottler added to it (really a theoretical problem right now, since they're currently always created pretty much back to back). Instead, Page should always have a PageThrottler, & instead make the UserActivity::Impl on the PageThrottler be added later. 1035737 1 238258 barraclough 2014-09-17 11:14:24 -0700 Created attachment 238258 Fix 1035738 2 commit-queue 2014-09-17 11:16:50 -0700 Attachment 238258 did not pass style-queue: ERROR: Source/WebKit2/ChangeLog:12: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebKit2/ChangeLog:13: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebKit2/ChangeLog:14: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:12: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:13: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:14: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 6 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035740 3 238258 ggaren 2014-09-17 11:19:56 -0700 Comment on attachment 238258 Fix r=me 1035741 4 barraclough 2014-09-17 11:27:56 -0700 Transmitting file data ........... Committed revision 173696. 238258 2014-09-17 11:14:24 -0700 2014-09-17 11:19:56 -0700 Fix 136892.1.patch text/plain 14069 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU3IEBACisyMDE0LTA5LTE3ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIEF3YXlzIGhhdmUg YSBQYWdlVGhyb3R0bGVyIChzb21ldGltZXMgaGF2ZSBhIFVzZXJBY3Rpdml0eTo6SW1wbCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjg5MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWUgaW5zdGFu Y2VzIG9mIFBhZ2UgaGF2ZSBhIFBhZ2VUaHJvdHRsZXIgdG8gdHJhY2sgYWN0aXZpdHkgb24gdGhl IFBhZ2UsIGFuZCBzb21lIGRvIG5vdC4KKyAgICAgICAgKFNwZWNpZmljYWxseSwgdGhvc2UgY3Jl YXRlZCBmcm9tIFdlYlBhZ2UgaW4gV0syIGRvLCB0aG9zZSByZWxhdGVkIHRvIFdLMSwgU1ZHICYg aW5zcGVjdG9yIGRvIG5vdCkuCisKKyAgICAgICAgV2UgZG8gdGhpcyBmb3IgdGhyZWUgcmVhc29u czoKKyAgICAgICAgICAgICogV2UgZG8gbm90IG5lZWQgdG8gdGFrZSBBcHBOYXAgYXNzZXJ0aW9u cyBvbiBXSzEuCisgICAgICAgICAgICAqIFNvbWUgUGFnZXMgZG8gbm90IHRyYWNrIHRoZWlyIHZp c2liaWxpdHkgY29ycmVjdGx5LCBhbmQgd291bGQgYWx3YXlzIGNsYWltIHRvIGJlIHZpc2libGUu CisgICAgICAgICAgICAqIFBhZ2UgVmlzaWJpbGl0eVN0YXRlIGlzIG5vdCBzZXQgdW50aWwgYWZ0 ZXIgY29uc3RydWN0aW9uLCBzbyBpZiB3ZSBpbnN0YW50aWF0ZQorCisgICAgICAgIENyZWF0aW5n IHRoZSBlbnRpcmUgUGFnZVRocm90dGxlciBsYXppbHkgaGFzIHRoZSBkcmF3YmFjayB0aGF0IHdl IGhhdmUgdG8gY2hlY2sgZm9yIGl0cyBleGlzdGVuY2UgYXQKKyAgICAgICAgbnVtZXJvdXMgcG9p bnRzIHRocm91Z2hvdXQgdGhlIGNvZGUsIGFuZCB3ZSdsbCBtaXNzIGFjdGl2aXR5IHRoYXQgb2Nj dXJzIGJldHdlZW4gdGhlIFBhZ2UgYmVpbmcgY3JlYXRlZAorICAgICAgICAmIHRoZSBQYWdlVGhy b3R0bGVyIGFkZGVkIHRvIGl0IChyZWFsbHkgYSB0aGVvcmV0aWNhbCBwcm9ibGVtIHJpZ2h0IG5v dywgc2luY2UgdGhleSdyZSBjdXJyZW50bHkgYWx3YXlzCisgICAgICAgIGNyZWF0ZWQgcHJldHR5 IG11Y2ggYmFjayB0byBiYWNrKS4KKworICAgICAgICBJbnN0ZWFkLCBQYWdlIHNob3VsZCBhbHdh eXMgaGF2ZSBhIFBhZ2VUaHJvdHRsZXIsICYgaW5zdGVhZCBtYWtlIHRoZSBVc2VyQWN0aXZpdHk6 OkltcGwgb24gdGhlCisgICAgICAgIFBhZ2VUaHJvdHRsZXIgYmUgYWRkZWQgbGF0ZXIuCisKKyAg ICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgICAgIC0gY3JlYXRlUGFnZVRocm90dGxl ciAtPiBlbmFibGVQYWdlVGhyb3R0bGVyCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRl KToKKyAgICAgICAgICAgIC0gUGFnZTo6cGFnZVRocm90dGxlciBub3cgcmV0dXJucyBhIHJlZmVy ZW5jZSByYXRoZXIgdGhhbiBhIHBvaW50ZXIKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnN0YXJ0ZWQpOgorICAgICAgICAg ICAgLSBQYWdlOjpwYWdlVGhyb3R0bGVyIG5vdyByZXR1cm5zIGEgcmVmZXJlbmNlIHJhdGhlciB0 aGFuIGEgcG9pbnRlcgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpQYWdlKToKKyAgICAgICAgICAgIC0gaW5zdGFudGlhdGUgUGFnZVRocm90dGxlciBp biBjb25zdHJ1Y3RvcgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZW5hYmxlUGFnZVRocm90dGxl cik6CisgICAgICAgICAgICAtIHJlbmFtZWQgZnJvbSBjcmVhdGVQYWdlVGhyb3R0bGVyLCBpbnN0 ZWFkIG9mIGNyZWF0aW5nIHRoZSBQYWdlVGhyb3R0bGVyIHRoaXMgbWV0aG9kIG5vdworICAgICAg ICAgICAgICBpbnN0cnVjdCBQYWdlVGhyb3R0bGVyIHRvIGNyZWF0ZSBhIFVzZXJBY3Rpdml0eTo6 SW1wbAorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0Vmlld1N0YXRlKToKKyAgICAgICAgICAg IC0gbV9wYWdlVGhyb3R0bGVyIGlzIG5vdCBhIHBvaW50ZXIKKyAgICAgICAgKFdlYkNvcmU6OlBh Z2U6OmNyZWF0ZVBhZ2VUaHJvdHRsZXIpOiBEZWxldGVkLgorICAgICAgICAgICAgLSByZW5hbWVk IHRvIGVuYWJsZVBhZ2VUaHJvdHRsZXIKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2U6OnBhZ2VUaHJvdHRsZXIpOgorICAgICAgICAgICAgLSBub3cgcmV0dXJu cyBhIHJlZmVyZW5jZQorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjpQYWdlVGhyb3R0bGVyKToKKyAgICAgICAgICAgIC0g bm8gbG9uZ2VyIGluc3RhbnRpYXRlIG1fYWN0aXZpdHkKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VU aHJvdHRsZXI6OmNyZWF0ZVVzZXJBY3Rpdml0eSk6CisgICAgICAgICAgICAtIGxhemlseSBpbnN0 YW50aWF0ZSBtX2FjdGl2aXR5LCBjYWxsIHVwZGF0ZVVzZXJBY3Rpdml0eQorICAgICAgICAoV2Vi Q29yZTo6UGFnZVRocm90dGxlcjo6dXBkYXRlVXNlckFjdGl2aXR5KToKKyAgICAgICAgICAgIC0g bV9hY3Rpdml0eSBtYXkgbm90IHlldCBiZSBpbnN0YW50aWF0ZWQ7IGFkZGVkIGVhcmx5IHJldHVy bgorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5oOgorICAgICAgICAgICAgLSBtX2FjdGl2 aXR5IGJlY29tZXMgYSBzdGQ6OnVuaXF1ZV9wdHIsIGFkZGVkIGNyZWF0ZVVzZXJBY3Rpdml0eQor CiAyMDE0LTA5LTE3ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K IAogICAgICAgICBET00gdGltZXIgdGhyb3R0bGluZyBmb3IgaGlkZGVuIHBsdWdpbnMKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiAxNzM2OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMTExNyw3ICsxMTE3LDcgQEAgX19aTjdX ZWJDb3JlNFBhZ2UxOHJlbW92ZVNjaGVkdWxlUGFpckVOMwogX19aTjdXZWJDb3JlNFBhZ2UxOHNl dFBhZ2VTY2FsZUZhY3RvckVmUktOU184SW50UG9pbnRFYgogX19aTjdXZWJDb3JlNFBhZ2UxOHNl dFRvcENvbnRlbnRJbnNldEVmCiBfX1pON1dlYkNvcmU0UGFnZTE5YWRkTGF5b3V0TWlsZXN0b25l c0VqCi1fX1pON1dlYkNvcmU0UGFnZTE5Y3JlYXRlUGFnZVRocm90dGxlckV2CitfX1pON1dlYkNv cmU0UGFnZTE5ZW5hYmxlUGFnZVRocm90dGxlckV2CiBfX1pON1dlYkNvcmU0UGFnZTIwc2Nyb2xs aW5nQ29vcmRpbmF0b3JFdgogX19aTjdXZWJDb3JlNFBhZ2UyMHNldERldmljZVNjYWxlRmFjdG9y RWYKIF9fWk43V2ViQ29yZTRQYWdlMjB1bm1hcmtBbGxUZXh0TWF0Y2hlc0V2CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDE3MzY5MikKKysr IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ1MjcsOCArNDUyNyw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0 YXRlKCkKIAogICAgICAgICBpZiAoaGFzTWVkaWFDb250cm9scygpKQogICAgICAgICAgICAgbWVk aWFDb250cm9scygpLT5wbGF5YmFja1N0YXJ0ZWQoKTsKLSAgICAgICAgaWYgKGRvY3VtZW50KCku cGFnZSgpICYmIGRvY3VtZW50KCkucGFnZSgpLT5wYWdlVGhyb3R0bGVyKCkpCi0gICAgICAgICAg ICBtX2FjdGl2aXR5VG9rZW4gPSBkb2N1bWVudCgpLnBhZ2UoKS0+cGFnZVRocm90dGxlcigpLT5t ZWRpYUFjdGl2aXR5VG9rZW4oKTsKKyAgICAgICAgaWYgKGRvY3VtZW50KCkucGFnZSgpKQorICAg ICAgICAgICAgbV9hY3Rpdml0eVRva2VuID0gZG9jdW1lbnQoKS5wYWdlKCktPnBhZ2VUaHJvdHRs ZXIoKS5tZWRpYUFjdGl2aXR5VG9rZW4oKTsKIAogICAgICAgICBzdGFydFBsYXliYWNrUHJvZ3Jl c3NUaW1lcigpOwogICAgICAgICBtX3BsYXlpbmcgPSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAxNzM2OTIpCisrKyBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTU0LDggKzExNTQs OCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21wbGV0ZWQoKQogCiB2b2lkIEZyYW1lTG9hZGVyOjpz dGFydGVkKCkKIHsKLSAgICBpZiAobV9mcmFtZS5wYWdlKCkgJiYgbV9mcmFtZS5wYWdlKCktPnBh Z2VUaHJvdHRsZXIoKSkKLSAgICAgICAgbV9hY3Rpdml0eUFzc2VydGlvbiA9IG1fZnJhbWUucGFn ZSgpLT5wYWdlVGhyb3R0bGVyKCktPnBhZ2VMb2FkQWN0aXZpdHlUb2tlbigpOworICAgIGlmICht X2ZyYW1lLnBhZ2UoKSkKKyAgICAgICAgbV9hY3Rpdml0eUFzc2VydGlvbiA9IG1fZnJhbWUucGFn ZSgpLT5wYWdlVGhyb3R0bGVyKCkucGFnZUxvYWRBY3Rpdml0eVRva2VuKCk7CiAgICAgZm9yIChG cmFtZSogZnJhbWUgPSAmbV9mcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJl bnQoKSkKICAgICAgICAgZnJhbWUtPmxvYWRlcigpLm1faXNDb21wbGV0ZSA9IGZhbHNlOwogfQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCShyZXZpc2lvbiAxNzM2OTIpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIsNiArMTkyLDcgQEAgUGFnZTo6 UGFnZShQYWdlQ2xpZW50cyYgcGFnZUNsaWVudHMpCiAjZW5kaWYKICAgICAsIG1fYWx0ZXJuYXRp dmVUZXh0Q2xpZW50KHBhZ2VDbGllbnRzLmFsdGVybmF0aXZlVGV4dENsaWVudCkKICAgICAsIG1f c2NyaXB0ZWRBbmltYXRpb25zU3VzcGVuZGVkKGZhbHNlKQorICAgICwgbV9wYWdlVGhyb3R0bGVy KCp0aGlzLCBtX3ZpZXdTdGF0ZSkKICAgICAsIG1fY29uc29sZUNsaWVudChzdGQ6Om1ha2VfdW5p cXVlPFBhZ2VDb25zb2xlQ2xpZW50PigqdGhpcykpCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNU T1IpCiAgICAgLCBtX2luc3BlY3RvckRlYnVnZ2FibGUoc3RkOjptYWtlX3VuaXF1ZTxQYWdlRGVi dWdnYWJsZT4oKnRoaXMpKQpAQCAtMTIwNywxMCArMTIwOCw5IEBAIHZvaWQgUGFnZTo6cmVzdW1l QW5pbWF0aW5nSW1hZ2VzKCkKICAgICAgICAgdmlldy0+cmVzdW1lVmlzaWJsZUltYWdlQW5pbWF0 aW9uc0luY2x1ZGluZ1N1YmZyYW1lcygpOwogfQogCi12b2lkIFBhZ2U6OmNyZWF0ZVBhZ2VUaHJv dHRsZXIoKQordm9pZCBQYWdlOjplbmFibGVQYWdlVGhyb3R0bGVyKCkKIHsKLSAgICBBU1NFUlQo IW1fcGFnZVRocm90dGxlcik7Ci0gICAgbV9wYWdlVGhyb3R0bGVyID0gc3RkOjptYWtlX3VuaXF1 ZTxQYWdlVGhyb3R0bGVyPigqdGhpcywgbV92aWV3U3RhdGUpOworICAgIG1fcGFnZVRocm90dGxl ci5jcmVhdGVVc2VyQWN0aXZpdHkoKTsKIH0KIAogdm9pZCBQYWdlOjpzZXRWaWV3U3RhdGUoVmll d1N0YXRlOjpGbGFncyB2aWV3U3RhdGUpCkBAIC0xMjIzLDggKzEyMjMsNyBAQCB2b2lkIFBhZ2U6 OnNldFZpZXdTdGF0ZShWaWV3U3RhdGU6OkZsYWdzCiAKICAgICBtX3ZpZXdTdGF0ZSA9IHZpZXdT dGF0ZTsKICAgICBtX2ZvY3VzQ29udHJvbGxlci0+c2V0Vmlld1N0YXRlKHZpZXdTdGF0ZSk7Ci0g ICAgaWYgKG1fcGFnZVRocm90dGxlcikKLSAgICAgICAgbV9wYWdlVGhyb3R0bGVyLT5zZXRWaWV3 U3RhdGUodmlld1N0YXRlKTsKKyAgICBtX3BhZ2VUaHJvdHRsZXIuc2V0Vmlld1N0YXRlKHZpZXdT dGF0ZSk7CiAKICAgICBpZiAoY2hhbmdlZCAmIFZpZXdTdGF0ZTo6SXNWaXNpYmxlKQogICAgICAg ICBzZXRJc1Zpc2libGVJbnRlcm5hbCh2aWV3U3RhdGUgJiBWaWV3U3RhdGU6OklzVmlzaWJsZSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTczNjkyKQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwNSw4ICs0MDUsOCBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzYXdNZWRpYUVuZ2luZShjb25zdCBTdHJpbmcmIGVuZ2luZU5hbWUpOwogICAgIHZv aWQgcmVzZXRTZWVuTWVkaWFFbmdpbmVzKCk7CiAKLSAgICBQYWdlVGhyb3R0bGVyKiBwYWdlVGhy b3R0bGVyKCkgeyByZXR1cm4gbV9wYWdlVGhyb3R0bGVyLmdldCgpOyB9Ci0gICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBjcmVhdGVQYWdlVGhyb3R0bGVyKCk7CisgICAgUGFnZVRocm90dGxlciYgcGFn ZVRocm90dGxlcigpIHsgcmV0dXJuIG1fcGFnZVRocm90dGxlcjsgfQorICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgZW5hYmxlUGFnZVRocm90dGxlcigpOwogCiAgICAgUGFnZUNvbnNvbGVDbGllbnQm IGNvbnNvbGUoKSB7IHJldHVybiAqbV9jb25zb2xlQ2xpZW50OyB9CiAKQEAgLTU3MCw3ICs1NzAs NyBAQCBwcml2YXRlOgogICAgIEFsdGVybmF0aXZlVGV4dENsaWVudCogbV9hbHRlcm5hdGl2ZVRl eHRDbGllbnQ7CiAKICAgICBib29sIG1fc2NyaXB0ZWRBbmltYXRpb25zU3VzcGVuZGVkOwotICAg IHN0ZDo6dW5pcXVlX3B0cjxQYWdlVGhyb3R0bGVyPiBtX3BhZ2VUaHJvdHRsZXI7CisgICAgUGFn ZVRocm90dGxlciBtX3BhZ2VUaHJvdHRsZXI7CiAgICAgY29uc3Qgc3RkOjp1bmlxdWVfcHRyPFBh Z2VDb25zb2xlQ2xpZW50PiBtX2NvbnNvbGVDbGllbnQ7CiAKICNpZiBFTkFCTEUoUkVNT1RFX0lO U1BFQ1RPUikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmNwcAkocmV2aXNp b24gMTczNjkzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzUsMTIgKzM1LDE4IEBAIFBhZ2VUaHJvdHRsZXI6OlBhZ2VUaHJvdHRs ZXIoUGFnZSYgcGFnZSwKICAgICAsIG1fdmlld1N0YXRlKHZpZXdTdGF0ZSkKICAgICAsIG1fd2Vh a1B0ckZhY3RvcnkodGhpcykKICAgICAsIG1faHlzdGVyZXNpcygqdGhpcykKLSAgICAsIG1fYWN0 aXZpdHkoIlBhZ2UgaXMgYWN0aXZlLiIpCiAgICAgLCBtX2FjdGl2aXR5Q291bnQoMCkKIHsKICAg ICB1cGRhdGVVc2VyQWN0aXZpdHkoKTsKIH0KIAordm9pZCBQYWdlVGhyb3R0bGVyOjpjcmVhdGVV c2VyQWN0aXZpdHkoKQoreworICAgIEFTU0VSVCghbV9hY3Rpdml0eSk7CisgICAgbV9hY3Rpdml0 eSA9IHN0ZDo6bWFrZV91bmlxdWU8VXNlckFjdGl2aXR5OjpJbXBsPigiUGFnZSBpcyBhY3RpdmUu Iik7CisgICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7Cit9CisKIHN0ZDo6dW5pcXVlX3B0cjxQYWdl QWN0aXZpdHlBc3NlcnRpb25Ub2tlbj4gUGFnZVRocm90dGxlcjo6bWVkaWFBY3Rpdml0eVRva2Vu KCkKIHsKICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxQYWdlQWN0aXZpdHlBc3NlcnRpb25U b2tlbj4oKnRoaXMpOwpAQCAtNzUsMTEgKzgxLDE0IEBAIHZvaWQgUGFnZVRocm90dGxlcjo6ZGVj cmVtZW50QWN0aXZpdHlDb3UKIAogdm9pZCBQYWdlVGhyb3R0bGVyOjp1cGRhdGVVc2VyQWN0aXZp dHkoKQogeworICAgIGlmICghbV9hY3Rpdml0eSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8g QWxsb3cgdGhyb3R0bGluZyBpZiB0aGVyZSBpcyBubyBwYWdlIGFjdGl2aXR5LCBhbmQgdGhlIHBh Z2UgaXMgdmlzdWFsbHkgaWRsZS4KICAgICBpZiAobV9oeXN0ZXJlc2lzLnN0YXRlKCkgPT0gSHlz dGVyZXNpc1N0YXRlOjpTdG9wcGVkICYmIG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3Vh bGx5SWRsZSkKLSAgICAgICAgbV9hY3Rpdml0eS5lbmRBY3Rpdml0eSgpOworICAgICAgICBtX2Fj dGl2aXR5LT5lbmRBY3Rpdml0eSgpOwogICAgIGVsc2UKLSAgICAgICAgbV9hY3Rpdml0eS5iZWdp bkFjdGl2aXR5KCk7CisgICAgICAgIG1fYWN0aXZpdHktPmJlZ2luQWN0aXZpdHkoKTsKIH0KIAog dm9pZCBQYWdlVGhyb3R0bGVyOjpzZXRWaWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyB2aWV3U3Rh dGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAkocmV2aXNpb24gMTczNjkz KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTQyLDYgKzQyLDcgQEAgY2xhc3MgUGFnZVRocm90dGxlciB7CiBwdWJsaWM6CiAgICAgUGFn ZVRocm90dGxlcihQYWdlJiwgVmlld1N0YXRlOjpGbGFncyk7CiAKKyAgICB2b2lkIGNyZWF0ZVVz ZXJBY3Rpdml0eSgpOwogICAgIHZvaWQgc2V0Vmlld1N0YXRlKFZpZXdTdGF0ZTo6RmxhZ3MpOwog CiAgICAgdm9pZCBkaWRSZWNlaXZlVXNlcklucHV0KCkgeyBtX2h5c3RlcmVzaXMuaW1wdWxzZSgp OyB9CkBAIC02NSw3ICs2Niw3IEBAIHByaXZhdGU6CiAgICAgVmlld1N0YXRlOjpGbGFncyBtX3Zp ZXdTdGF0ZTsKICAgICBXZWFrUHRyRmFjdG9yeTxQYWdlVGhyb3R0bGVyPiBtX3dlYWtQdHJGYWN0 b3J5OwogICAgIEh5c3RlcmVzaXNBY3Rpdml0eTxQYWdlVGhyb3R0bGVyPiBtX2h5c3RlcmVzaXM7 Ci0gICAgVXNlckFjdGl2aXR5OjpJbXBsIG1fYWN0aXZpdHk7CisgICAgc3RkOjp1bmlxdWVfcHRy PFVzZXJBY3Rpdml0eTo6SW1wbD4gbV9hY3Rpdml0eTsKICAgICBzaXplX3QgbV9hY3Rpdml0eUNv dW50OwogfTsKIApJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTczNjk0KQorKysgU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTQtMDkt MTcgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFyYWNsb3VnaEBhcHBsZS5jb20+CisKKyAgICAgICAg QXdheXMgaGF2ZSBhIFBhZ2VUaHJvdHRsZXIgKHNvbWV0aW1lcyBoYXZlIGEgVXNlckFjdGl2aXR5 OjpJbXBsKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM2ODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U29tZSBpbnN0YW5jZXMgb2YgUGFnZSBoYXZlIGEgUGFnZVRocm90dGxlciB0byB0cmFjayBhY3Rp dml0eSBvbiB0aGUgUGFnZSwgYW5kIHNvbWUgZG8gbm90LgorICAgICAgICAoU3BlY2lmaWNhbGx5 LCB0aG9zZSBjcmVhdGVkIGZyb20gV2ViUGFnZSBpbiBXSzIgZG8sIHRob3NlIHJlbGF0ZWQgdG8g V0sxLCBTVkcgJiBpbnNwZWN0b3IgZG8gbm90KS4KKworICAgICAgICBXZSBkbyB0aGlzIGZvciB0 aHJlZSByZWFzb25zOgorICAgICAgICAgICAgKiBXZSBkbyBub3QgbmVlZCB0byB0YWtlIEFwcE5h cCBhc3NlcnRpb25zIG9uIFdLMS4KKyAgICAgICAgICAgICogU29tZSBQYWdlcyBkbyBub3QgdHJh Y2sgdGhlaXIgdmlzaWJpbGl0eSBjb3JyZWN0bHksIGFuZCB3b3VsZCBhbHdheXMgY2xhaW0gdG8g YmUgdmlzaWJsZS4KKyAgICAgICAgICAgICogUGFnZSBWaXNpYmlsaXR5U3RhdGUgaXMgbm90IHNl dCB1bnRpbCBhZnRlciBjb25zdHJ1Y3Rpb24sIHNvIGlmIHdlIGluc3RhbnRpYXRlCisKKyAgICAg ICAgQ3JlYXRpbmcgdGhlIGVudGlyZSBQYWdlVGhyb3R0bGVyIGxhemlseSBoYXMgdGhlIGRyYXdi YWNrIHRoYXQgd2UgaGF2ZSB0byBjaGVjayBmb3IgaXRzIGV4aXN0ZW5jZSBhdAorICAgICAgICBu dW1lcm91cyBwb2ludHMgdGhyb3VnaG91dCB0aGUgY29kZSwgYW5kIHdlJ2xsIG1pc3MgYWN0aXZp dHkgdGhhdCBvY2N1cnMgYmV0d2VlbiB0aGUgUGFnZSBiZWluZyBjcmVhdGVkCisgICAgICAgICYg dGhlIFBhZ2VUaHJvdHRsZXIgYWRkZWQgdG8gaXQgKHJlYWxseSBhIHRoZW9yZXRpY2FsIHByb2Js ZW0gcmlnaHQgbm93LCBzaW5jZSB0aGV5J3JlIGN1cnJlbnRseSBhbHdheXMKKyAgICAgICAgY3Jl YXRlZCBwcmV0dHkgbXVjaCBiYWNrIHRvIGJhY2spLgorCisgICAgICAgIEluc3RlYWQsIFBhZ2Ug c2hvdWxkIGFsd2F5cyBoYXZlIGEgUGFnZVRocm90dGxlciwgJiBpbnN0ZWFkIG1ha2UgdGhlIFVz ZXJBY3Rpdml0eTo6SW1wbCBvbiB0aGUKKyAgICAgICAgUGFnZVRocm90dGxlciBiZSBhZGRlZCBs YXRlci4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OUFJ1bnRpbWVP YmplY3RNYXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUFJ1bnRpbWVPYmplY3RNYXA6OmV2YWx1 YXRlKToKKyAgICAgICAgICAgIC0gY3JlYXRlUGFnZVRocm90dGxlciAtPiBlbmFibGVQYWdlVGhy b3R0bGVyCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 bW91c2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OndoZWVsRXZlbnQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjprZXlFdmVudCk6CisgICAgICAgICAgICAtIFBhZ2U6OnBh Z2VUaHJvdHRsZXIgbm93IHJldHVybnMgYSByZWZlcmVuY2UgcmF0aGVyIHRoYW4gYSBwb2ludGVy CisKIDIwMTQtMDktMTcgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29t PgogCiAgICAgICAgIERPTSB0aW1lciB0aHJvdHRsaW5nIGZvciBoaWRkZW4gcGx1Z2lucwpJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05QUnVudGltZU9i amVjdE1hcC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05QUnVudGltZU9iamVjdE1hcC5jcHAJKHJldmlzaW9uIDE3MzY5NCkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OUFJ1bnRpbWVPYmpl Y3RNYXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIsOCArMTkyLDggQEAgYm9vbCBOUFJ1bnRp bWVPYmplY3RNYXA6OmV2YWx1YXRlKE5QT2JqZQogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlm IChtX3BsdWdpblZpZXcgJiYgIW1fcGx1Z2luVmlldy0+aXNCZWluZ0Rlc3Ryb3llZCgpKSB7CiAg ICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9wbHVnaW5WaWV3LT5mcmFtZSgpLT5wYWdlKCkpIHsK LSAgICAgICAgICAgIGlmIChtX3BsdWdpblZpZXctPmF1ZGlvSGFyZHdhcmVBY3Rpdml0eSgpICE9 IFdlYkNvcmU6OkF1ZGlvSGFyZHdhcmVBY3Rpdml0eVR5cGU6OklzSW5hY3RpdmUgJiYgcGFnZS0+ cGFnZVRocm90dGxlcigpKQotICAgICAgICAgICAgICAgIHBhZ2UtPnBhZ2VUaHJvdHRsZXIoKS0+ cGx1Z2luRGlkRXZhbHVhdGVXaGlsZUF1ZGlvSXNQbGF5aW5nKCk7CisgICAgICAgICAgICBpZiAo bV9wbHVnaW5WaWV3LT5hdWRpb0hhcmR3YXJlQWN0aXZpdHkoKSAhPSBXZWJDb3JlOjpBdWRpb0hh cmR3YXJlQWN0aXZpdHlUeXBlOjpJc0luYWN0aXZlKQorICAgICAgICAgICAgICAgIHBhZ2UtPnBh Z2VUaHJvdHRsZXIoKS5wbHVnaW5EaWRFdmFsdWF0ZVdoaWxlQXVkaW9Jc1BsYXlpbmcoKTsKICAg ICAgICAgfQogICAgIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTczNjkyKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjMs NyArNDIzLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IAogICAg IG1fcGFnZS0+c2V0Vmlld1N0YXRlKG1fdmlld1N0YXRlKTsKICAgICBpZiAoIWlzVmlzaWJsZSgp KQogICAgICAgICBtX3BhZ2UtPnNldElzUHJlcmVuZGVyKCk7Ci0gICAgbV9wYWdlLT5jcmVhdGVQ YWdlVGhyb3R0bGVyKCk7CisgICAgbV9wYWdlLT5lbmFibGVQYWdlVGhyb3R0bGVyKCk7CiAKICAg ICB1cGRhdGVJc0luV2luZG93KHRydWUpOwogCkBAIC0xODg2LDggKzE4ODYsNyBAQCBzdGF0aWMg Ym9vbCBoYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vCiAKIHZvaWQgV2ViUGFnZTo6bW91c2VF dmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUV2ZW50KQogewotICAgIEFTU0VSVChtX3Bh Z2UtPnBhZ2VUaHJvdHRsZXIoKSk7Ci0gICAgbV9wYWdlLT5wYWdlVGhyb3R0bGVyKCktPmRpZFJl Y2VpdmVVc2VySW5wdXQoKTsKKyAgICBtX3BhZ2UtPnBhZ2VUaHJvdHRsZXIoKS5kaWRSZWNlaXZl VXNlcklucHV0KCk7CiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICAvLyBEb24ndCB0 cnkgdG8gaGFuZGxlIGFueSBwZW5kaW5nIG1vdXNlIGV2ZW50cyBpZiBhIGNvbnRleHQgbWVudSBp cyBzaG93aW5nLgpAQCAtMTk1NSw4ICsxOTU0LDcgQEAgc3RhdGljIGJvb2wgaGFuZGxlV2hlZWxF dmVudChjb25zdCBXZWJXaAogCiB2b2lkIFdlYlBhZ2U6OndoZWVsRXZlbnQoY29uc3QgV2ViV2hl ZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKLSAgICBBU1NFUlQobV9wYWdlLT5wYWdlVGhyb3R0bGVy KCkpOwotICAgIG1fcGFnZS0+cGFnZVRocm90dGxlcigpLT5kaWRSZWNlaXZlVXNlcklucHV0KCk7 CisgICAgbV9wYWdlLT5wYWdlVGhyb3R0bGVyKCkuZGlkUmVjZWl2ZVVzZXJJbnB1dCgpOwogCiAg ICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7CiAKQEAgLTE5OTAsOCArMTk4OCw3IEBAIHN0YXRpYyBi b29sIGhhbmRsZUtleUV2ZW50KGNvbnN0IFdlYktleWIKIAogdm9pZCBXZWJQYWdlOjprZXlFdmVu dChjb25zdCBXZWJLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2ZW50KQogewotICAgIEFTU0VSVCht X3BhZ2UtPnBhZ2VUaHJvdHRsZXIoKSk7Ci0gICAgbV9wYWdlLT5wYWdlVGhyb3R0bGVyKCktPmRp ZFJlY2VpdmVVc2VySW5wdXQoKTsKKyAgICBtX3BhZ2UtPnBhZ2VUaHJvdHRsZXIoKS5kaWRSZWNl aXZlVXNlcklucHV0KCk7CiAKICAgICBib29sIGhhbmRsZWQgPSBmYWxzZTsKIAo=