109874 2013-02-14 16:21:22 -0800 Update FeatureObserver on top level navigation 2013-02-19 11:20:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 kassycoan webkit-unassigned abarth japhet mikelawther webkit.review.bot oldest_to_newest 833530 0 kassycoan 2013-02-14 16:21:22 -0800 Update FeatureObserver on top level navigation 833534 1 188448 kassycoan 2013-02-14 16:23:33 -0800 Created attachment 188448 Patch 833540 2 kassycoan 2013-02-14 16:28:52 -0800 abarth@ could you take a look at this? With this update, we are flushing the histogram on top level navigation, in addition to page destruction, in order to get closer to "per page" tracking. The new enum is for tracking number of pages visited (i.e. total number of histogram flushes). It is in a separate enum, because this statistic is also relevant to CSS tracking, which will be added to FeatureObserver in a separate patch. There is a place holder in the new enum due do a restriction in histogramEnumeration, which requires there to be 3 or more buckets. 833548 3 188448 abarth 2013-02-14 16:36:34 -0800 Comment on attachment 188448 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188448&action=review > Source/WebCore/loader/FrameLoader.cpp:3272 > + m_frame->page()->setFeatureObserver(adoptPtr(reinterpret_cast<FeatureObserver*>(0))); You can write: m_frame->page()->setFeatureObserver(nullptr) which is a bit cleaner. > Source/WebCore/page/FeatureObserver.cpp:45 > + HistogramSupport::histogramEnumeration("WebCore.FeatureObserver.TrackingStats", PageVisits, NumberOfStatistics); I'd prefer to use the same histogram for the baseline stats as for the other stats. That makes sure they stay in sync. > Source/WebCore/page/FeatureObserver.cpp:66 > + if (!page->featureObserver()) > + page->setFeatureObserver(adoptPtr(new FeatureObserver())); Rather than calling "new" and "delete" all the time, we can just trigger measurement on navigation and reset the m_featureBits. 835831 4 188961 kassycoan 2013-02-18 16:51:31 -0800 Created attachment 188961 Patch 835836 5 kassycoan 2013-02-18 16:59:15 -0800 @abarth I've uploaded a new patch with all the improvements you suggested: -simplification in FrameLoader.cpp -keeping pagevisit stats in existing enum for consistency -no longer calling 'new' Thank you! 836557 6 188961 abarth 2013-02-19 11:01:12 -0800 Comment on attachment 188961 Patch Looks great. Thanks! 836584 7 188961 webkit.review.bot 2013-02-19 11:20:44 -0800 Comment on attachment 188961 Patch Clearing flags on attachment: 188961 Committed r143363: <http://trac.webkit.org/changeset/143363> 836585 8 webkit.review.bot 2013-02-19 11:20:47 -0800 All reviewed patches have been landed. Closing bug. 188448 2013-02-14 16:23:33 -0800 2013-02-18 16:51:26 -0800 Patch bug-109874-20130215112000.patch text/plain 4314 kassycoan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmZDIzN2VhZDZkNGI5 ZmJkNjI4ODM5ZmExOGVkY2RhZGViNjAwOS4uNThhYTI1MGY1MTlkZjZkMGFkMjI5ZTdhMGFmOWZi YWNlYzdlYmY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAyLTE0ICBLYXNz eSBDb2FuICA8a2Fzc3ljb2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgRmVhdHVy ZU9ic2VydmVyIG9uIHRvcCBsZXZlbCBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk4NzQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE9ubHkgZWZmZWN0IGlzIHRv IGhpc3RvZ3JhbSBtb3JlIGZyZXF1ZW50bHkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlkQ29tbWl0 TG9hZCk6CisgICAgICAgICogcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RmVhdHVyZU9ic2VydmVyOjp+RmVhdHVyZU9ic2VydmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkZlYXR1cmVPYnNlcnZlcjo6b2JzZXJ2ZSk6CisgICAgICAgICogcGFnZS9GZWF0dXJlT2Jz ZXJ2ZXIuaDoKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6 OnNldEZlYXR1cmVPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpmZWF0dXJlT2Jz ZXJ2ZXIpOgorICAgICAgICAoUGFnZSk6CisKIDIwMTMtMDItMDMgIEthc3N5IENvYW4gIDxrYXNz eWNvYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZHMgdXNhZ2UgaW5zdHJ1bWVudGF0aW9u IGZvciBpbmRleGVkREIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDJj NTljZmRlYWUyMzk0NmY2OTAwMzViYzE5NjQxNDRiZTdjZWZiNTYuLjQxMzY1NmYxMWQwODhhYzg5 NGNmMGVkOGMxZGE5MzI3NGVmZGU0MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtMzI2Nyw2ICszMjY3LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlk Q29tbWl0TG9hZCgpCiAgICAgfQogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRD b21taXRMb2FkKG1fZnJhbWUsIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCkpOworCisgICAgaWYgKG1f ZnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCkgPT0gbV9mcmFtZSkKKyAgICAgICAgbV9mcmFtZS0+ cGFnZSgpLT5zZXRGZWF0dXJlT2JzZXJ2ZXIoYWRvcHRQdHIocmVpbnRlcnByZXRfY2FzdDxGZWF0 dXJlT2JzZXJ2ZXIqPigwKSkpOworCiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OnRlbGxDbGllbnRB Ym91dFBhc3RNZW1vcnlDYWNoZUxvYWRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRmVhdHVyZU9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVhdHVyZU9ic2Vy dmVyLmNwcAppbmRleCA3ZTIxNjVhY2M2NGIwNWEyOWFiNjIyZWVmNDZhNjE5MThlOTdiYzZkLi43 MDc2NTUxMjE4MmU4NWZlYjZlNmI2YTM0Zjk0ZDg0YzI5Yzc0YjU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GZWF0dXJlT2JzZXJ2ZXIuY3BwCkBAIC00Miw2ICs0Miw4IEBAIEZlYXR1cmVPYnNlcnZl cjo6fkZlYXR1cmVPYnNlcnZlcigpCiAgICAgLy8gV2UgYWx3YXlzIGxvZyBQYWdlRGVzdHJ1Y3Rp b24gc28gdGhhdCB3ZSBoYXZlIGEgc2NhbGUgZm9yIHRoZSByZXN0IG9mIHRoZSBmZWF0dXJlcy4K ICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbigiV2ViQ29yZS5GZWF0 dXJlT2JzZXJ2ZXIiLCBQYWdlRGVzdHJ1Y3Rpb24sIE51bWJlck9mRmVhdHVyZXMpOwogCisgICAg SGlzdG9ncmFtU3VwcG9ydDo6aGlzdG9ncmFtRW51bWVyYXRpb24oIldlYkNvcmUuRmVhdHVyZU9i c2VydmVyLlRyYWNraW5nU3RhdHMiLCBQYWdlVmlzaXRzLCBOdW1iZXJPZlN0YXRpc3RpY3MpOwor CiAgICAgaWYgKCFtX2ZlYXR1cmVCaXRzKQogICAgICAgICByZXR1cm47CiAKQEAgLTYwLDYgKzYy LDkgQEAgdm9pZCBGZWF0dXJlT2JzZXJ2ZXI6Om9ic2VydmUoRG9jdW1lbnQqIGRvY3VtZW50LCBG ZWF0dXJlIGZlYXR1cmUpCiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm47CiAKKyAgICBp ZiAoIXBhZ2UtPmZlYXR1cmVPYnNlcnZlcigpKQorICAgICAgICBwYWdlLT5zZXRGZWF0dXJlT2Jz ZXJ2ZXIoYWRvcHRQdHIobmV3IEZlYXR1cmVPYnNlcnZlcigpKSk7CisKICAgICBwYWdlLT5mZWF0 dXJlT2JzZXJ2ZXIoKS0+ZGlkT2JzZXJ2ZShmZWF0dXJlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RmVhdHVyZU9ic2VydmVyLmgKaW5kZXggNzhmOTllZDg2OTJkMzdlNmM4NWZjNTZmMTNkOGM1OGUw OTczYTAwYi4uMjg1NmNmMDJiYTY5ZTkzN2E2MzE3NTVmY2I3N2E5YmZlZmNjOWU2ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNlcnZlci5oCkBAIC05OSw2ICs5OSwxMiBAQCBwdWJsaWM6 CiAgICAgICAgIE51bWJlck9mRmVhdHVyZXMsIC8vIFRoaXMgZW51bSB2YWx1ZSBtdXN0IGJlIGxh c3QuCiAgICAgfTsKIAorICAgIGVudW0gVHJhY2tpbmdTdGF0aXN0aWNzIHsKKyAgICAgICAgUGFn ZVZpc2l0cywKKyAgICAgICAgUGxhY2VIb2xkZXJGb3JOZXh0U3RhdGlzdGljLAorICAgICAgICBO dW1iZXJPZlN0YXRpc3RpY3MsCisgICAgfTsKKwogICAgIHN0YXRpYyB2b2lkIG9ic2VydmUoRG9j dW1lbnQqLCBGZWF0dXJlKTsKICAgICBzdGF0aWMgdm9pZCBvYnNlcnZlKERPTVdpbmRvdyosIEZl YXR1cmUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDc3ZGQ1Y2NkODY3NDM1MWYyZTYwYTc1M2EwZDdm YWVjOTU5YzliN2YuLjI2ODBkNTQ3M2EzZTIyMGRkOThhZDdiZDUxZTdkMTYzYjlmM2E0NTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5oCkBAIC0yMDcsNyArMjA3LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICBQcm9ncmVzc1RyYWNrZXIqIHByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9ncmVz cy5nZXQoKTsgfQogICAgICAgICBCYWNrRm9yd2FyZENvbnRyb2xsZXIqIGJhY2tGb3J3YXJkKCkg Y29uc3QgeyByZXR1cm4gbV9iYWNrRm9yd2FyZENvbnRyb2xsZXIuZ2V0KCk7IH0KIAotICAgICAg ICBGZWF0dXJlT2JzZXJ2ZXIqIGZlYXR1cmVPYnNlcnZlcigpIHsgcmV0dXJuICZtX2ZlYXR1cmVP YnNlcnZlcjsgfQorICAgICAgICB2b2lkIHNldEZlYXR1cmVPYnNlcnZlcihQYXNzT3duUHRyPEZl YXR1cmVPYnNlcnZlcj4gb2JzZXJ2ZXIpIHsgbV9mZWF0dXJlT2JzZXJ2ZXIgPSBvYnNlcnZlcjsg fQorICAgICAgICBGZWF0dXJlT2JzZXJ2ZXIqIGZlYXR1cmVPYnNlcnZlcigpIHsgcmV0dXJuIG1f ZmVhdHVyZU9ic2VydmVyLmdldCgpOyB9CiAKICAgICAgICAgZW51bSBWaWV3TW9kZSB7CiAgICAg ICAgICAgICBWaWV3TW9kZUludmFsaWQsCkBAIC00MjIsNyArNDIzLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICBQbHVnSW5DbGllbnQqIG1fcGx1Z0luQ2xpZW50OwogICAgICAgICBW YWxpZGF0aW9uTWVzc2FnZUNsaWVudCogbV92YWxpZGF0aW9uTWVzc2FnZUNsaWVudDsKIAotICAg ICAgICBGZWF0dXJlT2JzZXJ2ZXIgbV9mZWF0dXJlT2JzZXJ2ZXI7CisgICAgICAgIE93blB0cjxG ZWF0dXJlT2JzZXJ2ZXI+IG1fZmVhdHVyZU9ic2VydmVyOwogCiAgICAgICAgIGludCBtX3N1YmZy YW1lQ291bnQ7CiAgICAgICAgIFN0cmluZyBtX2dyb3VwTmFtZTsK 188961 2013-02-18 16:51:31 -0800 2013-02-19 11:20:43 -0800 Patch bug-109874-20130219114753.patch text/plain 3703 kassycoan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmZDIzN2VhZDZkNGI5 ZmJkNjI4ODM5ZmExOGVkY2RhZGViNjAwOS4uMDQ1ZmYyN2U0YzE4ZjIwZmJlN2Q4ZTUxMDJiYzkw NDY1OTM2YWQ1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAyLTE4ICBLYXNz eSBDb2FuICA8a2Fzc3ljb2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgRmVhdHVy ZU9ic2VydmVyIG9uIHRvcCBsZXZlbCBuYXZpZ2F0aW9uIGluIGFkZGl0aW9uIHRvIHBhZ2UgZGVz dHJ1Y3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDk4NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMuIE9ubHkgZWZmZWN0IGlzIHRvIGhpc3RvZ3JhbSBtb3JlIGZyZXF1ZW50 bHkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6CisgICAgICAgICogcGFnZS9G ZWF0dXJlT2JzZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmVhdHVyZU9ic2VydmVyOjp+ RmVhdHVyZU9ic2VydmVyKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 RmVhdHVyZU9ic2VydmVyOjp1cGRhdGVNZWFzdXJlbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6 RmVhdHVyZU9ic2VydmVyOjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBwYWdlL0ZlYXR1cmVP YnNlcnZlci5oOgorICAgICAgICAoRmVhdHVyZU9ic2VydmVyKToKKwogMjAxMy0wMi0wMyAgS2Fz c3kgQ29hbiAgPGthc3N5Y29hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkcyB1c2FnZSBp bnN0cnVtZW50YXRpb24gZm9yIGluZGV4ZWREQgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKaW5kZXggMmM1OWNmZGVhZTIzOTQ2ZjY5MDAzNWJjMTk2NDE0NGJlN2NlZmI1Ni4uNzBh NDBhNGE0ZWFiMmJiNGM3NWJjZjg4YTI4MzQ0YzA5ZGNkZDU4MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zMjY3LDYgKzMyNjcsMTAgQEAgdm9pZCBGcmFtZUxvYWRl cjo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKICAgICB9CiAKICAgICBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OmRpZENvbW1pdExvYWQobV9mcmFtZSwgbV9kb2N1bWVudExvYWRlci5nZXQoKSk7 CisKKyAgICBpZiAobV9mcmFtZS0+cGFnZSgpLT5tYWluRnJhbWUoKSA9PSBtX2ZyYW1lKQorICAg ICAgICBtX2ZyYW1lLT5wYWdlKCktPmZlYXR1cmVPYnNlcnZlcigpLT5kaWRDb21taXRMb2FkKCk7 CisKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6dGVsbENsaWVudEFib3V0UGFzdE1lbW9yeUNhY2hl TG9hZHMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuY3BwCmluZGV4IDdlMjE2 NWFjYzY0YjA1YTI5YWI2MjJlZWY0NmE2MTkxOGU5N2JjNmQuLjQ4M2E3OWI3Y2JmYTQxYzI5MTkz ODhhNjFjYzliNWZmYzMwYjJkYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVh dHVyZU9ic2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNlcnZl ci5jcHAKQEAgLTQyLDYgKzQyLDEyIEBAIEZlYXR1cmVPYnNlcnZlcjo6fkZlYXR1cmVPYnNlcnZl cigpCiAgICAgLy8gV2UgYWx3YXlzIGxvZyBQYWdlRGVzdHJ1Y3Rpb24gc28gdGhhdCB3ZSBoYXZl IGEgc2NhbGUgZm9yIHRoZSByZXN0IG9mIHRoZSBmZWF0dXJlcy4KICAgICBIaXN0b2dyYW1TdXBw b3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbigiV2ViQ29yZS5GZWF0dXJlT2JzZXJ2ZXIiLCBQYWdl RGVzdHJ1Y3Rpb24sIE51bWJlck9mRmVhdHVyZXMpOwogCisgICAgdXBkYXRlTWVhc3VyZW1lbnRz KCk7Cit9CisKK3ZvaWQgRmVhdHVyZU9ic2VydmVyOjp1cGRhdGVNZWFzdXJlbWVudHMoKQorewor ICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUVudW1lcmF0aW9uKCJXZWJDb3JlLkZlYXR1 cmVPYnNlcnZlciIsIFBhZ2VWaXNpdHMsIE51bWJlck9mRmVhdHVyZXMpOwogICAgIGlmICghbV9m ZWF0dXJlQml0cykKICAgICAgICAgcmV0dXJuOwogCkBAIC00OSw2ICs1NSwxMyBAQCBGZWF0dXJl T2JzZXJ2ZXI6On5GZWF0dXJlT2JzZXJ2ZXIoKQogICAgICAgICBpZiAobV9mZWF0dXJlQml0cy0+ cXVpY2tHZXQoaSkpCiAgICAgICAgICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dyYW1FbnVt ZXJhdGlvbigiV2ViQ29yZS5GZWF0dXJlT2JzZXJ2ZXIiLCBpLCBOdW1iZXJPZkZlYXR1cmVzKTsK ICAgICB9CisKKyAgICBtX2ZlYXR1cmVCaXRzLT5jbGVhckFsbCgpOworfQorCit2b2lkIEZlYXR1 cmVPYnNlcnZlcjo6ZGlkQ29tbWl0TG9hZCgpCit7CisgICAgdXBkYXRlTWVhc3VyZW1lbnRzKCk7 CiB9CiAKIHZvaWQgRmVhdHVyZU9ic2VydmVyOjpvYnNlcnZlKERvY3VtZW50KiBkb2N1bWVudCwg RmVhdHVyZSBmZWF0dXJlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJl T2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVhdHVyZU9ic2VydmVyLmgKaW5kZXgg NzhmOTllZDg2OTJkMzdlNmM4NWZjNTZmMTNkOGM1OGUwOTczYTAwYi4uNzFmN2E4YTVkN2MyMmEy M2ZhYTQ1YzM1YjBiNmM4NmNkMTQ4ZDQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GZWF0dXJlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNl cnZlci5oCkBAIC05NSwxMiArOTUsMTQgQEAgcHVibGljOgogICAgICAgICBSZXF1aXJlZEF0dHJp YnV0ZSwKICAgICAgICAgUmVzdWx0c0F0dHJpYnV0ZSwKICAgICAgICAgU3RlcEF0dHJpYnV0ZSwK KyAgICAgICAgUGFnZVZpc2l0cywKICAgICAgICAgLy8gQWRkIG5ldyBmZWF0dXJlcyBhYm92ZSB0 aGlzIGxpbmUuIERvbid0IGNoYW5nZSBhc3NpZ25lZCBudW1iZXJzIG9mIGVhY2ggaXRlbXMuCiAg ICAgICAgIE51bWJlck9mRmVhdHVyZXMsIC8vIFRoaXMgZW51bSB2YWx1ZSBtdXN0IGJlIGxhc3Qu CiAgICAgfTsKIAogICAgIHN0YXRpYyB2b2lkIG9ic2VydmUoRG9jdW1lbnQqLCBGZWF0dXJlKTsK ICAgICBzdGF0aWMgdm9pZCBvYnNlcnZlKERPTVdpbmRvdyosIEZlYXR1cmUpOworICAgIHZvaWQg ZGlkQ29tbWl0TG9hZCgpOwogCiBwcml2YXRlOgogICAgIHZvaWQgZGlkT2JzZXJ2ZShGZWF0dXJl IGZlYXR1cmUpCkBAIC0xMTQsNiArMTE2LDggQEAgcHJpdmF0ZToKICAgICAgICAgbV9mZWF0dXJl Qml0cy0+cXVpY2tTZXQoZmVhdHVyZSk7CiAgICAgfQogCisgICAgdm9pZCB1cGRhdGVNZWFzdXJl bWVudHMoKTsKKwogICAgIE93blB0cjxCaXRWZWN0b3I+IG1fZmVhdHVyZUJpdHM7CiB9OwogCg==