84583 2012-04-23 03:16:06 -0700 Incremental rendering should be unsuppressed after the load event or a configurable timeout, whichever occurs first. 2012-04-24 00:43:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes ap koivisto oldest_to_newest 607580 0 aestes 2012-04-23 03:16:06 -0700 Incremental rendering should be unsuppressed after the load event or a configurable timeout, whichever occurs first. 607582 1 aestes 2012-04-23 03:17:28 -0700 <rdar://problem/11292192> 607587 2 138320 aestes 2012-04-23 03:33:02 -0700 Created attachment 138320 Patch 607913 3 138320 aestes 2012-04-23 12:16:26 -0700 Comment on attachment 138320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138320&action=review > Source/WebCore/dom/Document.cpp:1203 > +#if USE(ACCELENRATED_COMPOSITING) Oops. > Source/WebKit/mac/WebView/WebView.mm:1519 > + settings->setIncrementalRenderingSuppressionTimeoutInSeconds([preferences incrementalRenderingSuppressionTimeoutInSeconds]); This has the effect of disabling incremental rendering suppression unless the preference is actually set. What I actually want in this case is the default timeout. 607922 4 138398 aestes 2012-04-23 12:31:57 -0700 Created attachment 138398 Patch 608418 5 aestes 2012-04-24 00:43:51 -0700 Committed r115005: <http://trac.webkit.org/changeset/115005> 138320 2012-04-23 03:33:02 -0700 2012-04-23 12:31:53 -0700 Patch bug-84583-20120423033301.patch text/plain 13658 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBlNzE4MDFmN2EwNjA2 ZGM2OWNlMGFjZDYzZDE1MzIwN2RkMmRiNi4uM2FlOTZkYzY5ZjYwYzY0MWQ4ZmYzMDIxODVkODc1 ODk5M2JkMGY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTIzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNyZW1lbnRhbCByZW5kZXJp bmcgc2hvdWxkIGJlIHVuc3VwcHJlc3NlZCBhZnRlciB0aGUgbG9hZCBldmVudCBvciBhIGNvbmZp Z3VyYWJsZSB0aW1lb3V0LCB3aGljaGV2ZXIgb2NjdXJzIGZpcnN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBoaWdoLWxhdGVuY3kgc2l0dWF0aW9u cywgaGF2aW5nIGluY3JlbWVudGFsIHJlbmRlcmluZyBzdXBwcmVzc2lvbgorICAgICAgICBlbmFi bGVkIG1ha2VzIGZvciBhIHdvcnNlIGV4cGVyaWVuY2UgZHVlIHRvIHRoZSBleGNlc3NpdmVseSBs b25nIHRpbWUKKyAgICAgICAgaXQgdGFrZXMgZm9yIHRoZSBsb2FkIGV2ZW50IHRvIGZpcmUuIFNv IHRoYXQgY2xpZW50cyB0aGF0IG9wdCBpbiB0bworICAgICAgICBpbmNyZW1lbnRhbCByZW5kZXJp bmcgc3VwcHJlc3Npb24gY2FuIG1pdGlnYXRlIHRoaXMsIGFkZCBhIGNvbmZpZ3VyYWJsZQorICAg ICAgICB0aW1lb3V0IGluIHdoaWNoIHJlbmRlcmluZyBpcyByZS1lbmFibGVkIGlmIHRoZSBsb2Fk IGV2ZW50IGhhcyB5ZXQgdG8KKyAgICAgICAgZmlyZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6RG9jdW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnNldFJlYWR5U3RhdGUpOiBXaGVuIHRoZSBkb2N1bWVudCB0cmFu c2l0aW9ucyB0bworICAgICAgICB0aGUgbG9hZGluZyBzdGF0ZSwgc3RhcnQgYSB0aW1lcjsgd2hl biBpdCB0cmFuc2l0aW9ucyB0byB0aGUgY29tcGxldGVkCisgICAgICAgIHN0YXRlLCBhbGxvdyB2 aXN1YWwgdXBkYXRlcy4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRWaXN1YWxVcGRh dGVzQWxsb3dlZCk6IElmIHZpc3VhbCB1cGRhdGVzIGFyZQorICAgICAgICBhbGxvd2VkLCBmb3Jj ZSBhIHJlcGFpbnQuIE90aGVyd2lzZSwgc2V0IGEgZmxhZyB0aGF0IHN1cHByZXNzZXMKKyAgICAg ICAgcmVuZGVyaW5nLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNT dXBwcmVzc2lvblRpbWVyRmlyZWQpOiBXaGVuIHRoZSB0aW1lcgorICAgICAgICBmaXJlcywgYWxs b3cgdmlzdWFsIHVwZGF0ZXMuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aW1wbGljaXRD bG9zZSk6IFJlbW92ZSBjb2RlIHRoYXQgaXMgbm93IGNhbGxlZCBpbgorICAgICAgICBzZXRWaXN1 YWxVcGRhdGVzQWxsb3dlZCgpLgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNBbGxvd2VkKToKKyAgICAgICAgKiBwYWdl L1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6Cisg ICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNl dEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKToKKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzOjppbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGlt ZW91dEluU2Vjb25kcyk6CisKIDIwMTItMDQtMjIgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW92ZSBub3RpZmljYXRpb25zIHN1cHBvcnQgb24gTWFjIExpb24uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKaW5kZXggNmEwMDljMjZkNDY2YmYxMDhlYjNmYTg5N2Q5NzQzYmZkM2QwNDQ0 Yi4uOTExNjY4OTMwMjAyOTM5ZDJiMTkxM2ZhN2QzMmQyMjBmMjUxMTExYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTIzICBBbmR5IEVzdGVzICA8YWVzdGVzQGFw cGxlLmNvbT4KKworICAgICAgICBJbmNyZW1lbnRhbCByZW5kZXJpbmcgc2hvdWxkIGJlIHVuc3Vw cHJlc3NlZCBhZnRlciB0aGUgbG9hZCBldmVudCBvciBhIGNvbmZpZ3VyYWJsZSB0aW1lb3V0LCB3 aGljaGV2ZXIgb2NjdXJzIGZpcnN0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODQ1ODMKKworICAgICAgICBBZGQgYSBwcml2YXRlIFdlYlByZWZlcmVu Y2UgZm9yIHNldHRpbmcgdGhlIGluY3JlbWVudGFsIHJlbmRlcmluZyBzdXBwcmVzc2lvbiB0aW1l b3V0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog V2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dl YlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBzZXRJbmNyZW1lbnRh bFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kczpdKToKKyAgICAgICAgKC1bV2Vi UHJlZmVyZW5jZXMgaW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29u ZHNdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXND aGFuZ2VkOl0pOgorCiAyMDEyLTA0LTIyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgbm90aWZpY2F0aW9ucyBzdXBwb3J0IG9uIE1hYyBMaW9uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKaW5kZXggM2ViZTFmNTU2ODI2MWY2YjA4NTIzYWE4ZDFhNmQ1MzlmMDZl YWM3MS4uYTJkNDdjODA4NTBiZTllZTRlNGY4MzMwMjI2YmRlN2ZmZDljZWYxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCkBAIC00NzksNiArNDc5LDggQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZy YW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJsLCBib29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MKQog ICAgICwgbV90b3VjaEV2ZW50SGFuZGxlckNvdW50KDApCiAgICAgLCBtX3BlbmRpbmdUYXNrc1Rp bWVyKHRoaXMsICZEb2N1bWVudDo6cGVuZGluZ1Rhc2tzVGltZXJGaXJlZCkKICAgICAsIG1fc2No ZWR1bGVkVGFza3NBcmVTdXNwZW5kZWQoZmFsc2UpCisgICAgLCBtX3Zpc3VhbFVwZGF0ZXNBbGxv d2VkKHRydWUpCisgICAgLCBtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVyKHRoaXMsICZE b2N1bWVudDo6dmlzdWFsVXBkYXRlc1N1cHByZXNzaW9uVGltZXJGaXJlZCkKIHsKICAgICBtX2Rv Y3VtZW50ID0gdGhpczsKIApAQCAtMTE2MSw2ICsxMTYzLDU2IEBAIHZvaWQgRG9jdW1lbnQ6OnNl dFJlYWR5U3RhdGUoUmVhZHlTdGF0ZSByZWFkeVN0YXRlKQogCiAgICAgbV9yZWFkeVN0YXRlID0g cmVhZHlTdGF0ZTsKICAgICBkaXNwYXRjaEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygp LnJlYWR5c3RhdGVjaGFuZ2VFdmVudCwgZmFsc2UsIGZhbHNlKSk7CisgICAgCisgICAgaWYgKHNl dHRpbmdzKCkgJiYgc2V0dGluZ3MoKS0+c3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nKCkp CisgICAgICAgIHNldFZpc3VhbFVwZGF0ZXNBbGxvd2VkKHJlYWR5U3RhdGUpOworfQorCit2b2lk IERvY3VtZW50OjpzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZChSZWFkeVN0YXRlIHJlYWR5U3RhdGUp Cit7CisgICAgQVNTRVJUKHNldHRpbmdzKCkgJiYgc2V0dGluZ3MoKS0+c3VwcHJlc3Nlc0luY3Jl bWVudGFsUmVuZGVyaW5nKCkpOworICAgIHN3aXRjaCAocmVhZHlTdGF0ZSkgeworICAgIGNhc2Ug TG9hZGluZzoKKyAgICAgICAgQVNTRVJUKCFtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVy LmlzQWN0aXZlKCkpOworICAgICAgICBBU1NFUlQobV92aXN1YWxVcGRhdGVzQWxsb3dlZCk7Cisg ICAgICAgIG1fdmlzdWFsVXBkYXRlc1N1cHByZXNzaW9uVGltZXIuc3RhcnRPbmVTaG90KHNldHRp bmdzKCktPmluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKCkp OworICAgICAgICBzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZChmYWxzZSk7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgSW50ZXJhY3RpdmU6CisgICAgICAgIEFTU0VSVCghbV92aXN1YWxVcGRhdGVz QWxsb3dlZCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29tcGxldGU6CisgICAgICAgIEFT U0VSVChtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVyLmlzQWN0aXZlKCkgfHwgbV92aXN1 YWxVcGRhdGVzQWxsb3dlZCk7CisgICAgICAgIGlmIChtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lv blRpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgICAgICBtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lv blRpbWVyLnN0b3AoKTsKKyAgICAgICAgc2V0VmlzdWFsVXBkYXRlc0FsbG93ZWQodHJ1ZSk7Cisg ICAgICAgIGJyZWFrOworICAgIH0KK30KKyAgICAKK3ZvaWQgRG9jdW1lbnQ6OnNldFZpc3VhbFVw ZGF0ZXNBbGxvd2VkKGJvb2wgdmlzdWFsVXBkYXRlc0FsbG93ZWQpCit7CisgICAgaWYgKG1fdmlz dWFsVXBkYXRlc0FsbG93ZWQgPT0gdmlzdWFsVXBkYXRlc0FsbG93ZWQpCisgICAgICAgIHJldHVy bjsKKworICAgIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWQgPSB2aXN1YWxVcGRhdGVzQWxsb3dlZDsK KworICAgIGlmICghdmlzdWFsVXBkYXRlc0FsbG93ZWQpCisgICAgICAgIHJldHVybjsKKworI2lm IFVTRShBQ0NFTEVOUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKHZpZXcoKSkKKyAgICAgICAg dmlldygpLT51cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyTGF5b3V0KCk7CisjZW5kaWYKKwor ICAgIGlmIChyZW5kZXJlcigpKQorICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50KCk7Cit9CisK K3ZvaWQgRG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVyRmlyZWQoVGltZXI8 RG9jdW1lbnQ+KikKK3sKKyAgICBBU1NFUlQoIW1fdmlzdWFsVXBkYXRlc0FsbG93ZWQpOworICAg IHNldFZpc3VhbFVwZGF0ZXNBbGxvd2VkKHRydWUpOwogfQogCiBTdHJpbmcgRG9jdW1lbnQ6OmVu Y29kaW5nKCkgY29uc3QKQEAgLTIzOTksMTQgKzI0NTEsNiBAQCB2b2lkIERvY3VtZW50OjppbXBs aWNpdENsb3NlKCkKIAogICAgIG1fcHJvY2Vzc2luZ0xvYWRFdmVudCA9IGZhbHNlOwogCi0gICAg Ly8gSWYgcGFpbnRpbmcgYW5kIGNvbXBvc2l0aW5nIGxheWVyIHVwZGF0ZXMgd2VyZSBzdXBwcmVz c2VkIHBlbmRpbmcgdGhlIGxvYWQgZXZlbnQsIGRvIHRoZXNlIGFjdGlvbnMgbm93LgotICAgIGlm IChyZW5kZXJlcigpICYmIHNldHRpbmdzKCkgJiYgc2V0dGluZ3MoKS0+c3VwcHJlc3Nlc0luY3Jl bWVudGFsUmVuZGVyaW5nKCkpIHsKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0g ICAgICAgIHZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlckxheW91dCgpOwotI2Vu ZGlmCi0gICAgICAgIHJlbmRlcmVyKCktPnJlcGFpbnQoKTsKLSAgICB9Ci0KICNpZiBQTEFURk9S TShNQUMpIHx8IFBMQVRGT1JNKENIUk9NSVVNKQogICAgIGlmIChmICYmIHJlbmRlck9iamVjdCAm JiBBWE9iamVjdENhY2hlOjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpKSB7CiAgICAgICAgIC8vIFRo ZSBBWCBjYWNoZSBtYXkgaGF2ZSBiZWVuIGNsZWFyZWQgYXQgdGhpcyBwb2ludCwgYnV0IHdlIG5l ZWQgdG8gbWFrZSBzdXJlIGl0IGNvbnRhaW5zIGFuCkBAIC01Nzg4LDEzICs1ODMyLDYgQEAgdm9p ZCBEb2N1bWVudDo6ZGlkUmVtb3ZlVG91Y2hFdmVudEhhbmRsZXIoKQogICAgICAgICBtYWluRnJh bWUtPm5vdGlmeUNocm9tZUNsaWVudFRvdWNoRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKCk7CiB9 CiAKLWJvb2wgRG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNBbGxvd2VkKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gIXNldHRpbmdzKCkKLSAgICAgICAgfHwgIXNldHRpbmdzKCktPnN1cHByZXNzZXNJbmNy ZW1lbnRhbFJlbmRlcmluZygpCi0gICAgICAgIHx8IGxvYWRFdmVudEZpbmlzaGVkKCk7Ci19Ci0K IERvY3VtZW50TG9hZGVyKiBEb2N1bWVudDo6bG9hZGVyKCkgY29uc3QKIHsKICAgICBpZiAoIW1f ZnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDVkY2FjZjU2OWVlZjdiYjNmM2VlZmYzNDM3 ODUyNGJjYTY5YWYwNzguLjY0NDFmYmY2NmY0NWFiYzRiYTA5MDEyNDgxZWM3YjBiZGFmZDNjMTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0xMTMyLDcgKzExMzIsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBkaWRBZGRUb3VjaEV2ZW50SGFuZGxlcigpOwogICAgIHZvaWQgZGlkUmVtb3ZlVG91Y2hF dmVudEhhbmRsZXIoKTsKIAotICAgIGJvb2wgdmlzdWFsVXBkYXRlc0FsbG93ZWQoKSBjb25zdDsK KyAgICBib29sIHZpc3VhbFVwZGF0ZXNBbGxvd2VkKCkgY29uc3QgeyByZXR1cm4gbV92aXN1YWxV cGRhdGVzQWxsb3dlZDsgfQogCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKICAgICBQYXNzUmVmUHRy PE5vZGVMaXN0PiBnZXRJdGVtcyhjb25zdCBTdHJpbmcmIHR5cGVOYW1lcyk7CkBAIC0xMjE4LDYg KzEyMTgsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFkZERvY3VtZW50VG9GdWxsU2NyZWVuQ2hh bmdlRXZlbnRRdWV1ZShEb2N1bWVudCopOwogI2VuZGlmCiAKKyAgICB2b2lkIHNldFZpc3VhbFVw ZGF0ZXNBbGxvd2VkKFJlYWR5U3RhdGUpOworICAgIHZvaWQgc2V0VmlzdWFsVXBkYXRlc0FsbG93 ZWQoYm9vbCk7CisgICAgdm9pZCB2aXN1YWxVcGRhdGVzU3VwcHJlc3Npb25UaW1lckZpcmVkKFRp bWVyPERvY3VtZW50PiopOworCiAgICAgaW50IG1fZ3VhcmRSZWZDb3VudDsKIAogICAgIE93blB0 cjxDU1NTdHlsZVNlbGVjdG9yPiBtX3N0eWxlU2VsZWN0b3I7CkBAIC0xNDg0LDYgKzE0ODgsOSBA QCBwcml2YXRlOgogICAgIFRpbWVyPERvY3VtZW50PiBtX3BlbmRpbmdUYXNrc1RpbWVyOwogICAg IFZlY3RvcjxPd25QdHI8VGFzaz4gPiBtX3BlbmRpbmdUYXNrczsKICAgICBib29sIG1fc2NoZWR1 bGVkVGFza3NBcmVTdXNwZW5kZWQ7CisgICAgCisgICAgYm9vbCBtX3Zpc3VhbFVwZGF0ZXNBbGxv d2VkOworICAgIFRpbWVyPERvY3VtZW50PiBtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVy OwogfTsKIAogLy8gUHV0IHRoZXNlIG1ldGhvZHMgaGVyZSwgYmVjYXVzZSB0aGV5IHJlcXVpcmUg dGhlIERvY3VtZW50IGRlZmluaXRpb24sIGJ1dCB3ZSByZWFsbHkgd2FudCB0byBpbmxpbmUgdGhl bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5kZXggMWM3MWM3YTBjNjhhY2YzZmQ3OGFhODIx NDRhNjY3MmFkYmIxNmE4MC4uN2E5Y2NlZmI3ODE5YzEwY2QyNDU2MmNjMTM0NTM5ZjlhNTJkNTc3 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKQEAgLTExOCw2ICsxMTgsOCBAQCBzdGF0aWMg RWRpdGluZ0JlaGF2aW9yVHlwZSBlZGl0aW5nQmVoYXZpb3JUeXBlRm9yUGxhdGZvcm0oKQogICAg IDsKIH0KIAorc3RhdGljIGNvbnN0IGRvdWJsZSBkZWZhdWx0SW5jcmVtZW50YWxSZW5kZXJpbmdT dXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMgPSA1OworCiBTZXR0aW5nczo6U2V0dGluZ3MoUGFn ZSogcGFnZSkKICAgICA6IG1fcGFnZSgwKQogICAgICwgbV9lZGl0YWJsZUxpbmtCZWhhdmlvcihF ZGl0YWJsZUxpbmtEZWZhdWx0QmVoYXZpb3IpCkBAIC0yNjIsOCArMjY0LDkgQEAgU2V0dGluZ3M6 OlNldHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX3RocmVhZGVkQW5pbWF0aW9uRW5hYmxlZChm YWxzZSkKICAgICAsIG1fc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24oZmFsc2UpCiAgICAg LCBtX2xvYWRzSW1hZ2VzQXV0b21hdGljYWxseVRpbWVyKHRoaXMsICZTZXR0aW5nczo6bG9hZHNJ bWFnZXNBdXRvbWF0aWNhbGx5VGltZXJGaXJlZCkKKyAgICAsIG1faW5jcmVtZW50YWxSZW5kZXJp bmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMoZGVmYXVsdEluY3JlbWVudGFsUmVuZGVyaW5n U3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKQogewotICAgIC8vIEEgRnJhbWUgbWF5IG5vdCBo YXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGluaXRpYWxpemUgdGhlIEF0b21pY1N0cmluZyAK KyAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0 aWFsaXplIHRoZSBBdG9taWNTdHJpbmcKICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8gdXNl IGl0LgogICAgIEF0b21pY1N0cmluZzo6aW5pdCgpOwogICAgIGluaXRpYWxpemVEZWZhdWx0Rm9u dEZhbWlsaWVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKaW5kZXggZTEzZjI4MmNiOGYwYThkMzYy MDQyZjczOTdjMDRiZDlkM2NlNTJkNy4uN2VhOTllMmQ4MGQ2Y2U2ZDFkM2Y5NGM3YmIyZWE0YTQx MGE3NzBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtNTUyLDYgKzU1Miw5IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRh dGlvbihib29sIGVuYWJsZWQpIHsgbV9zaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiA9IGVu YWJsZWQ7IH0KICAgICAgICAgYm9vbCBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbigpIGNv bnN0IHsgcmV0dXJuIG1fc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb247IH0KICAgICAgICAg CisgICAgICAgIHZvaWQgc2V0SW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJ blNlY29uZHMoZG91YmxlIHRpbWVvdXQpIHsgbV9pbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNz aW9uVGltZW91dEluU2Vjb25kcyA9IHRpbWVvdXQ7IH0KKyAgICAgICAgZG91YmxlIGluY3JlbWVu dGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKCkgY29uc3QgeyByZXR1cm4g bV9pbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kczsgfQorICAg ICAgICAKICNpZiBVU0UoSlNDKQogICAgICAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRSZXNwZWN0 UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNldHRlcnMoYm9vbCk7CiAgICAgICAgIHN0YXRpYyBib29s IHNob3VsZFJlc3BlY3RQcmlvcml0eUluQ1NTQXR0cmlidXRlU2V0dGVycygpOwpAQCAtNzE3LDYg KzcyMCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBUaW1lcjxTZXR0aW5ncz4g bV9sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lcjsKICAgICAgICAgdm9pZCBsb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHlUaW1lckZpcmVkKFRpbWVyPFNldHRpbmdzPiopOworICAgICAgICAKKyAg ICAgICAgZG91YmxlIG1faW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNl Y29uZHM7CiAKICNpZiBVU0UoQVZGT1VOREFUSU9OKQogICAgICAgICBzdGF0aWMgYm9vbCBnQVZG b3VuZGF0aW9uRW5hYmxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCmluZGV4IGM1ODVmODQ3MjU1MmM1ZmFmMmFlYmU4NjFi ODQ0MTBiMWY2ZmI3OGQuLjMzMzkzYjA0ODdjZGNkMWJkMjg0MjE2MjJkZDM4ZjE1YmYwODA3YmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQ cml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5 c1ByaXZhdGUuaApAQCAtMTM2LDYgKzEzNiw3IEBACiAjZGVmaW5lIFdlYktpdEVkaXRpbmdCZWhh dmlvclByZWZlcmVuY2VLZXkgQCJXZWJLaXRFZGl0aW5nQmVoYXZpb3IiCiAjZGVmaW5lIFdlYktp dFVzZVByZUhUTUw1UGFyc2VyUXVpcmtzS2V5IEAiV2ViS2l0VXNlUHJlSFRNTDVQYXJzZXJRdWly a3MiCiAjZGVmaW5lIFdlYktpdEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5IEAiV2Vi S2l0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQiCisjZGVmaW5lIFdlYktpdEluY3JlbWVu dGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzS2V5IEAiV2ViS2l0SW5jcmVt ZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMiCiAKIC8vIENvcmVHcmFw aGljcyBkZWZlcnJlZCB1cGRhdGVzIGFyZSBkaXNhYmxlZCBpZiBXZWJLaXRFbmFibGVDb2FsZXNj ZWRVcGRhdGVzUHJlZmVyZW5jZUtleSBpcyBzZXQKIC8vIHRvIE5PLCBvciBoYXMgbm8gdmFsdWUu ICBGb3IgY29tcGF0aWJpbGl0eSB3aXRoIE1hYyBPUyBYIDEwLjQuNiwgZGVmZXJyZWQgdXBkYXRl cyBhcmUgT0ZGIGJ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQppbmRleCA2YzIyODViOTIwOTUyYTk4YTkzNDliN2JiMjg5ZTQ1MmUwMzdiYjc3Li5jMjYxOTUw MTUzNTA4MDk4ZTYxYWU0MDU2Y2IyYmQzZDE5ZGJlNmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KQEAgLTE2NzYsNiArMTY3NiwxNiBAQCBzdGF0aWMg TlNTdHJpbmcgKmNsYXNzSUJDcmVhdG9ySUQgPSBuaWw7CiAgICAgcmV0dXJuIFtzZWxmIF9ib29s VmFsdWVGb3JLZXk6V2ViS2l0U2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb25LZXldOwogfQog CistICh2b2lkKXNldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNv bmRzOihOU1RpbWVJbnRlcnZhbCl0aW1lb3V0Cit7CisgICAgW3NlbGYgX3NldEZsb2F0VmFsdWU6 dGltZW91dCBmb3JLZXk6V2ViS2l0SW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVv dXRJblNlY29uZHNLZXldOworfQorCistIChOU1RpbWVJbnRlcnZhbClpbmNyZW1lbnRhbFJlbmRl cmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcworeworICAgIHJldHVybiBbc2VsZiBfZmxv YXRWYWx1ZUZvcktleTpXZWJLaXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91 dEluU2Vjb25kc0tleV07Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdlYlByZWZlcmVu Y2VzIChXZWJJbnRlcm5hbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4IGNjZmYwNGQ4ZjQ5NDY4OGQ0YTg2MzhmZmMyNjYyOGE4 MTY5YjBkNzIuLjE2M2MzMWIyZGY2MjQ4ZjI5MDhmM2NlNWY3OGZlN2NhNzkzMTRiODMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaApA QCAtMjk1LDQgKzI5NSw3IEBAIGV4dGVybiBOU1N0cmluZyAqV2ViUHJlZmVyZW5jZXNDaGFuZ2Vk SW50ZXJuYWxOb3RpZmljYXRpb247CiAtICh2b2lkKXNldFNob3VsZFJlc3BlY3RJbWFnZU9yaWVu dGF0aW9uOihCT09MKWZsYWc7CiAtIChCT09MKXNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u OwogCistICh2b2lkKXNldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5T ZWNvbmRzOihOU1RpbWVJbnRlcnZhbCl0aW5lb3V0OworLSAoTlNUaW1lSW50ZXJ2YWwpaW5jcmVt ZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHM7CisKIEBlbmQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCA0ZmI1ZGY5NWRlZGQzYjViZTJmYjFlNDA2 OWZiODE0OWFjMTk5NDQyLi5lMjBmM2Q4MDFiZWIxYmE5MjgyODVlNjRkM2UzOGE4YmI3YjBlZjY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0xNTE2LDYgKzE1MTYsNyBA QCBzdGF0aWMgYm9vbCBuZWVkc1NlbGZSZXRhaW5XaGlsZUxvYWRpbmdRdWlyaygpCiAgICAgc2V0 dGluZ3MtPnNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKFtwcmVmZXJlbmNlcyBt ZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZV0pOwogICAgIHNldHRpbmdzLT5zZXRNZWRp YVBsYXliYWNrQWxsb3dzSW5saW5lKFtwcmVmZXJlbmNlcyBtZWRpYVBsYXliYWNrQWxsb3dzSW5s aW5lXSk7CiAgICAgc2V0dGluZ3MtPnNldFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZyhb cHJlZmVyZW5jZXMgc3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nXSk7CisgICAgc2V0dGlu Z3MtPnNldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKFtw cmVmZXJlbmNlcyBpbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25k c10pOwogICAgIHNldHRpbmdzLT5zZXRSZWdpb25CYXNlZENvbHVtbnNFbmFibGVkKFtwcmVmZXJl bmNlcyByZWdpb25CYXNlZENvbHVtbnNFbmFibGVkXSk7CiAgICAgc2V0dGluZ3MtPnNldEJhY2tz cGFjZUtleU5hdmlnYXRpb25FbmFibGVkKFtwcmVmZXJlbmNlcyBiYWNrc3BhY2VLZXlOYXZpZ2F0 aW9uRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLT5zZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQoW3By ZWZlcmVuY2VzIG1vY2tTY3JvbGxiYXJzRW5hYmxlZF0pOwo= 138398 2012-04-23 12:31:57 -0700 2012-04-23 18:07:51 -0700 Patch bug-84583-20120423123156.patch text/plain 13648 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBlNzE4MDFmN2EwNjA2 ZGM2OWNlMGFjZDYzZDE1MzIwN2RkMmRiNi4uM2FlOTZkYzY5ZjYwYzY0MWQ4ZmYzMDIxODVkODc1 ODk5M2JkMGY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTIzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNyZW1lbnRhbCByZW5kZXJp bmcgc2hvdWxkIGJlIHVuc3VwcHJlc3NlZCBhZnRlciB0aGUgbG9hZCBldmVudCBvciBhIGNvbmZp Z3VyYWJsZSB0aW1lb3V0LCB3aGljaGV2ZXIgb2NjdXJzIGZpcnN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBoaWdoLWxhdGVuY3kgc2l0dWF0aW9u cywgaGF2aW5nIGluY3JlbWVudGFsIHJlbmRlcmluZyBzdXBwcmVzc2lvbgorICAgICAgICBlbmFi bGVkIG1ha2VzIGZvciBhIHdvcnNlIGV4cGVyaWVuY2UgZHVlIHRvIHRoZSBleGNlc3NpdmVseSBs b25nIHRpbWUKKyAgICAgICAgaXQgdGFrZXMgZm9yIHRoZSBsb2FkIGV2ZW50IHRvIGZpcmUuIFNv IHRoYXQgY2xpZW50cyB0aGF0IG9wdCBpbiB0bworICAgICAgICBpbmNyZW1lbnRhbCByZW5kZXJp bmcgc3VwcHJlc3Npb24gY2FuIG1pdGlnYXRlIHRoaXMsIGFkZCBhIGNvbmZpZ3VyYWJsZQorICAg ICAgICB0aW1lb3V0IGluIHdoaWNoIHJlbmRlcmluZyBpcyByZS1lbmFibGVkIGlmIHRoZSBsb2Fk IGV2ZW50IGhhcyB5ZXQgdG8KKyAgICAgICAgZmlyZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6RG9jdW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnNldFJlYWR5U3RhdGUpOiBXaGVuIHRoZSBkb2N1bWVudCB0cmFu c2l0aW9ucyB0bworICAgICAgICB0aGUgbG9hZGluZyBzdGF0ZSwgc3RhcnQgYSB0aW1lcjsgd2hl biBpdCB0cmFuc2l0aW9ucyB0byB0aGUgY29tcGxldGVkCisgICAgICAgIHN0YXRlLCBhbGxvdyB2 aXN1YWwgdXBkYXRlcy4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRWaXN1YWxVcGRh dGVzQWxsb3dlZCk6IElmIHZpc3VhbCB1cGRhdGVzIGFyZQorICAgICAgICBhbGxvd2VkLCBmb3Jj ZSBhIHJlcGFpbnQuIE90aGVyd2lzZSwgc2V0IGEgZmxhZyB0aGF0IHN1cHByZXNzZXMKKyAgICAg ICAgcmVuZGVyaW5nLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNT dXBwcmVzc2lvblRpbWVyRmlyZWQpOiBXaGVuIHRoZSB0aW1lcgorICAgICAgICBmaXJlcywgYWxs b3cgdmlzdWFsIHVwZGF0ZXMuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aW1wbGljaXRD bG9zZSk6IFJlbW92ZSBjb2RlIHRoYXQgaXMgbm93IGNhbGxlZCBpbgorICAgICAgICBzZXRWaXN1 YWxVcGRhdGVzQWxsb3dlZCgpLgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnZpc3VhbFVwZGF0ZXNBbGxvd2VkKToKKyAgICAgICAgKiBwYWdl L1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6Cisg ICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNl dEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKToKKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzOjppbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGlt ZW91dEluU2Vjb25kcyk6CisKIDIwMTItMDQtMjIgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW92ZSBub3RpZmljYXRpb25zIHN1cHBvcnQgb24gTWFjIExpb24uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKaW5kZXggNmEwMDljMjZkNDY2YmYxMDhlYjNmYTg5N2Q5NzQzYmZkM2QwNDQ0 Yi4uOTExNjY4OTMwMjAyOTM5ZDJiMTkxM2ZhN2QzMmQyMjBmMjUxMTExYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTIzICBBbmR5IEVzdGVzICA8YWVzdGVzQGFw cGxlLmNvbT4KKworICAgICAgICBJbmNyZW1lbnRhbCByZW5kZXJpbmcgc2hvdWxkIGJlIHVuc3Vw cHJlc3NlZCBhZnRlciB0aGUgbG9hZCBldmVudCBvciBhIGNvbmZpZ3VyYWJsZSB0aW1lb3V0LCB3 aGljaGV2ZXIgb2NjdXJzIGZpcnN0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODQ1ODMKKworICAgICAgICBBZGQgYSBwcml2YXRlIFdlYlByZWZlcmVu Y2UgZm9yIHNldHRpbmcgdGhlIGluY3JlbWVudGFsIHJlbmRlcmluZyBzdXBwcmVzc2lvbiB0aW1l b3V0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog V2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dl YlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBzZXRJbmNyZW1lbnRh bFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kczpdKToKKyAgICAgICAgKC1bV2Vi UHJlZmVyZW5jZXMgaW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29u ZHNdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXND aGFuZ2VkOl0pOgorCiAyMDEyLTA0LTIyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgbm90aWZpY2F0aW9ucyBzdXBwb3J0IG9uIE1hYyBMaW9uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKaW5kZXggM2ViZTFmNTU2ODI2MWY2YjA4NTIzYWE4ZDFhNmQ1MzlmMDZl YWM3MS4uYzVjMTExOGRkMTJjZTI3OWE2NWViOTNlNjc0MmNkOTM5MTdhZjJhMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCkBAIC00NzksNiArNDc5LDggQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZy YW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJsLCBib29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MKQog ICAgICwgbV90b3VjaEV2ZW50SGFuZGxlckNvdW50KDApCiAgICAgLCBtX3BlbmRpbmdUYXNrc1Rp bWVyKHRoaXMsICZEb2N1bWVudDo6cGVuZGluZ1Rhc2tzVGltZXJGaXJlZCkKICAgICAsIG1fc2No ZWR1bGVkVGFza3NBcmVTdXNwZW5kZWQoZmFsc2UpCisgICAgLCBtX3Zpc3VhbFVwZGF0ZXNBbGxv d2VkKHRydWUpCisgICAgLCBtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVyKHRoaXMsICZE b2N1bWVudDo6dmlzdWFsVXBkYXRlc1N1cHByZXNzaW9uVGltZXJGaXJlZCkKIHsKICAgICBtX2Rv Y3VtZW50ID0gdGhpczsKIApAQCAtMTE2MSw2ICsxMTYzLDU4IEBAIHZvaWQgRG9jdW1lbnQ6OnNl dFJlYWR5U3RhdGUoUmVhZHlTdGF0ZSByZWFkeVN0YXRlKQogCiAgICAgbV9yZWFkeVN0YXRlID0g cmVhZHlTdGF0ZTsKICAgICBkaXNwYXRjaEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygp LnJlYWR5c3RhdGVjaGFuZ2VFdmVudCwgZmFsc2UsIGZhbHNlKSk7CisgICAgCisgICAgaWYgKHNl dHRpbmdzKCkgJiYgc2V0dGluZ3MoKS0+c3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nKCkp CisgICAgICAgIHNldFZpc3VhbFVwZGF0ZXNBbGxvd2VkKHJlYWR5U3RhdGUpOworfQorCit2b2lk IERvY3VtZW50OjpzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZChSZWFkeVN0YXRlIHJlYWR5U3RhdGUp Cit7CisgICAgQVNTRVJUKHNldHRpbmdzKCkgJiYgc2V0dGluZ3MoKS0+c3VwcHJlc3Nlc0luY3Jl bWVudGFsUmVuZGVyaW5nKCkpOworICAgIHN3aXRjaCAocmVhZHlTdGF0ZSkgeworICAgIGNhc2Ug TG9hZGluZzoKKyAgICAgICAgQVNTRVJUKCFtX3Zpc3VhbFVwZGF0ZXNTdXBwcmVzc2lvblRpbWVy LmlzQWN0aXZlKCkpOworICAgICAgICBBU1NFUlQobV92aXN1YWxVcGRhdGVzQWxsb3dlZCk7Cisg ICAgICAgIG1fdmlzdWFsVXBkYXRlc1N1cHByZXNzaW9uVGltZXIuc3RhcnRPbmVTaG90KHNldHRp bmdzKCktPmluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKCkp OworICAgICAgICBzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZChmYWxzZSk7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgSW50ZXJhY3RpdmU6CisgICAgICAgIEFTU0VSVChtX3Zpc3VhbFVwZGF0ZXNT dXBwcmVzc2lvblRpbWVyLmlzQWN0aXZlKCkgfHwgbV92aXN1YWxVcGRhdGVzQWxsb3dlZCk7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29tcGxldGU6CisgICAgICAgIGlmIChtX3Zpc3VhbFVw ZGF0ZXNTdXBwcmVzc2lvblRpbWVyLmlzQWN0aXZlKCkpIHsKKyAgICAgICAgICAgIEFTU0VSVCgh bV92aXN1YWxVcGRhdGVzQWxsb3dlZCk7CisgICAgICAgICAgICBtX3Zpc3VhbFVwZGF0ZXNTdXBw cmVzc2lvblRpbWVyLnN0b3AoKTsKKyAgICAgICAgICAgIHNldFZpc3VhbFVwZGF0ZXNBbGxvd2Vk KHRydWUpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIEFTU0VSVChtX3Zpc3VhbFVwZGF0 ZXNBbGxvd2VkKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorfQorICAgIAordm9pZCBEb2N1bWVu dDo6c2V0VmlzdWFsVXBkYXRlc0FsbG93ZWQoYm9vbCB2aXN1YWxVcGRhdGVzQWxsb3dlZCkKK3sK KyAgICBpZiAobV92aXN1YWxVcGRhdGVzQWxsb3dlZCA9PSB2aXN1YWxVcGRhdGVzQWxsb3dlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgbV92aXN1YWxVcGRhdGVzQWxsb3dlZCA9IHZpc3VhbFVw ZGF0ZXNBbGxvd2VkOworCisgICAgaWYgKCF2aXN1YWxVcGRhdGVzQWxsb3dlZCkKKyAgICAgICAg cmV0dXJuOworCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmICh2aWV3 KCkpCisgICAgICAgIHZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlckxheW91dCgp OworI2VuZGlmCisKKyAgICBpZiAocmVuZGVyZXIoKSkKKyAgICAgICAgcmVuZGVyZXIoKS0+cmVw YWludCgpOworfQorCit2b2lkIERvY3VtZW50Ojp2aXN1YWxVcGRhdGVzU3VwcHJlc3Npb25UaW1l ckZpcmVkKFRpbWVyPERvY3VtZW50PiopCit7CisgICAgQVNTRVJUKCFtX3Zpc3VhbFVwZGF0ZXNB bGxvd2VkKTsKKyAgICBzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZCh0cnVlKTsKIH0KIAogU3RyaW5n IERvY3VtZW50OjplbmNvZGluZygpIGNvbnN0CkBAIC0yMzk5LDE0ICsyNDUzLDYgQEAgdm9pZCBE b2N1bWVudDo6aW1wbGljaXRDbG9zZSgpCiAKICAgICBtX3Byb2Nlc3NpbmdMb2FkRXZlbnQgPSBm YWxzZTsKIAotICAgIC8vIElmIHBhaW50aW5nIGFuZCBjb21wb3NpdGluZyBsYXllciB1cGRhdGVz IHdlcmUgc3VwcHJlc3NlZCBwZW5kaW5nIHRoZSBsb2FkIGV2ZW50LCBkbyB0aGVzZSBhY3Rpb25z IG5vdy4KLSAgICBpZiAocmVuZGVyZXIoKSAmJiBzZXR0aW5ncygpICYmIHNldHRpbmdzKCktPnN1 cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZygpKSB7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKQotICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJM YXlvdXQoKTsKLSNlbmRpZgotICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50KCk7Ci0gICAgfQot CiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShDSFJPTUlVTSkKICAgICBpZiAoZiAmJiBy ZW5kZXJPYmplY3QgJiYgQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkgewog ICAgICAgICAvLyBUaGUgQVggY2FjaGUgbWF5IGhhdmUgYmVlbiBjbGVhcmVkIGF0IHRoaXMgcG9p bnQsIGJ1dCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSBpdCBjb250YWlucyBhbgpAQCAtNTc4OCwxMyAr NTgzNCw2IEBAIHZvaWQgRG9jdW1lbnQ6OmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCkKICAg ICAgICAgbWFpbkZyYW1lLT5ub3RpZnlDaHJvbWVDbGllbnRUb3VjaEV2ZW50SGFuZGxlckNvdW50 Q2hhbmdlZCgpOwogfQogCi1ib29sIERvY3VtZW50Ojp2aXN1YWxVcGRhdGVzQWxsb3dlZCgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuICFzZXR0aW5ncygpCi0gICAgICAgIHx8ICFzZXR0aW5ncygpLT5z dXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmcoKQotICAgICAgICB8fCBsb2FkRXZlbnRGaW5p c2hlZCgpOwotfQotCiBEb2N1bWVudExvYWRlciogRG9jdW1lbnQ6OmxvYWRlcigpIGNvbnN0CiB7 CiAgICAgaWYgKCFtX2ZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCA1ZGNhY2Y1NjllZWY3 YmIzZjNlZWZmMzQzNzg1MjRiY2E2OWFmMDc4Li42NDQxZmJmNjZmNDVhYmM0YmEwOTAxMjQ4MWVj N2IwYmRhZmQzYzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMTEzMiw3ICsxMTMyLDcgQEAg cHVibGljOgogICAgIHZvaWQgZGlkQWRkVG91Y2hFdmVudEhhbmRsZXIoKTsKICAgICB2b2lkIGRp ZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7CiAKLSAgICBib29sIHZpc3VhbFVwZGF0ZXNBbGxv d2VkKCkgY29uc3Q7CisgICAgYm9vbCB2aXN1YWxVcGRhdGVzQWxsb3dlZCgpIGNvbnN0IHsgcmV0 dXJuIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWQ7IH0KIAogI2lmIEVOQUJMRShNSUNST0RBVEEpCiAg ICAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gZ2V0SXRlbXMoY29uc3QgU3RyaW5nJiB0eXBlTmFtZXMp OwpAQCAtMTIxOCw2ICsxMjE4LDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGREb2N1bWVudFRv RnVsbFNjcmVlbkNoYW5nZUV2ZW50UXVldWUoRG9jdW1lbnQqKTsKICNlbmRpZgogCisgICAgdm9p ZCBzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZChSZWFkeVN0YXRlKTsKKyAgICB2b2lkIHNldFZpc3Vh bFVwZGF0ZXNBbGxvd2VkKGJvb2wpOworICAgIHZvaWQgdmlzdWFsVXBkYXRlc1N1cHByZXNzaW9u VGltZXJGaXJlZChUaW1lcjxEb2N1bWVudD4qKTsKKwogICAgIGludCBtX2d1YXJkUmVmQ291bnQ7 CiAKICAgICBPd25QdHI8Q1NTU3R5bGVTZWxlY3Rvcj4gbV9zdHlsZVNlbGVjdG9yOwpAQCAtMTQ4 NCw2ICsxNDg4LDkgQEAgcHJpdmF0ZToKICAgICBUaW1lcjxEb2N1bWVudD4gbV9wZW5kaW5nVGFz a3NUaW1lcjsKICAgICBWZWN0b3I8T3duUHRyPFRhc2s+ID4gbV9wZW5kaW5nVGFza3M7CiAgICAg Ym9vbCBtX3NjaGVkdWxlZFRhc2tzQXJlU3VzcGVuZGVkOworICAgIAorICAgIGJvb2wgbV92aXN1 YWxVcGRhdGVzQWxsb3dlZDsKKyAgICBUaW1lcjxEb2N1bWVudD4gbV92aXN1YWxVcGRhdGVzU3Vw cHJlc3Npb25UaW1lcjsKIH07CiAKIC8vIFB1dCB0aGVzZSBtZXRob2RzIGhlcmUsIGJlY2F1c2Ug dGhleSByZXF1aXJlIHRoZSBEb2N1bWVudCBkZWZpbml0aW9uLCBidXQgd2UgcmVhbGx5IHdhbnQg dG8gaW5saW5lIHRoZW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCmluZGV4IDFjNzFjN2EwYzY4 YWNmM2ZkNzhhYTgyMTQ0YTY2NzJhZGJiMTZhODAuLjdhOWNjZWZiNzgxOWMxMGNkMjQ1NjJjYzEz NDUzOWY5YTUyZDU3N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCkBAIC0xMTgsNiArMTE4 LDggQEAgc3RhdGljIEVkaXRpbmdCZWhhdmlvclR5cGUgZWRpdGluZ0JlaGF2aW9yVHlwZUZvclBs YXRmb3JtKCkKICAgICA7CiB9CiAKK3N0YXRpYyBjb25zdCBkb3VibGUgZGVmYXVsdEluY3JlbWVu dGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzID0gNTsKKwogU2V0dGluZ3M6 OlNldHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgOiBtX3BhZ2UoMCkKICAgICAsIG1fZWRpdGFibGVM aW5rQmVoYXZpb3IoRWRpdGFibGVMaW5rRGVmYXVsdEJlaGF2aW9yKQpAQCAtMjYyLDggKzI2NCw5 IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAgICwgbV90aHJlYWRlZEFuaW1h dGlvbkVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3Nob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u KGZhbHNlKQogICAgICwgbV9sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lcih0aGlzLCAmU2V0 dGluZ3M6OmxvYWRzSW1hZ2VzQXV0b21hdGljYWxseVRpbWVyRmlyZWQpCisgICAgLCBtX2luY3Jl bWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKGRlZmF1bHRJbmNyZW1l bnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcykKIHsKLSAgICAvLyBBIEZy YW1lIG1heSBub3QgaGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBB dG9taWNTdHJpbmcgCisgICAgLy8gQSBGcmFtZSBtYXkgbm90IGhhdmUgYmVlbiBjcmVhdGVkIHll dCwgc28gd2UgaW5pdGlhbGl6ZSB0aGUgQXRvbWljU3RyaW5nCiAgICAgLy8gaGFzaCBiZWZvcmUg dHJ5aW5nIHRvIHVzZSBpdC4KICAgICBBdG9taWNTdHJpbmc6OmluaXQoKTsKICAgICBpbml0aWFs aXplRGVmYXVsdEZvbnRGYW1pbGllcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IGUxM2Yy ODJjYjhmMGE4ZDM2MjA0MmY3Mzk3YzA0YmQ5ZDNjZTUyZDcuLjdlYTk5ZTJkODBkNmNlNmQxZDNm OTRjN2JiMmVhNGE0MTBhNzcwZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTU1Miw2ICs1 NTIsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0U2hvdWxkUmVzcGVj dEltYWdlT3JpZW50YXRpb24oYm9vbCBlbmFibGVkKSB7IG1fc2hvdWxkUmVzcGVjdEltYWdlT3Jp ZW50YXRpb24gPSBlbmFibGVkOyB9CiAgICAgICAgIGJvb2wgc2hvdWxkUmVzcGVjdEltYWdlT3Jp ZW50YXRpb24oKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u OyB9CiAgICAgICAgIAorICAgICAgICB2b2lkIHNldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJl c3Npb25UaW1lb3V0SW5TZWNvbmRzKGRvdWJsZSB0aW1lb3V0KSB7IG1faW5jcmVtZW50YWxSZW5k ZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMgPSB0aW1lb3V0OyB9CisgICAgICAgIGRv dWJsZSBpbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcygpIGNv bnN0IHsgcmV0dXJuIG1faW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNl Y29uZHM7IH0KKyAgICAgICAgCiAjaWYgVVNFKEpTQykKICAgICAgICAgc3RhdGljIHZvaWQgc2V0 U2hvdWxkUmVzcGVjdFByaW9yaXR5SW5DU1NBdHRyaWJ1dGVTZXR0ZXJzKGJvb2wpOwogICAgICAg ICBzdGF0aWMgYm9vbCBzaG91bGRSZXNwZWN0UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNldHRlcnMo KTsKQEAgLTcxNyw2ICs3MjAsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgVGlt ZXI8U2V0dGluZ3M+IG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXI7CiAgICAgICAgIHZv aWQgbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXJGaXJlZChUaW1lcjxTZXR0aW5ncz4qKTsK KyAgICAgICAgCisgICAgICAgIGRvdWJsZSBtX2luY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Np b25UaW1lb3V0SW5TZWNvbmRzOwogCiAjaWYgVVNFKEFWRk9VTkRBVElPTikKICAgICAgICAgc3Rh dGljIGJvb2wgZ0FWRm91bmRhdGlvbkVuYWJsZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAppbmRleCBjNTg1Zjg0NzI1NTJj NWZhZjJhZWJlODYxYjg0NDEwYjFmNmZiNzhkLi4zMzM5M2IwNDg3Y2RjZDFiZDI4NDIxNjIyZGQz OGYxNWJmMDgwN2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZUtleXNQcml2YXRlLmgKQEAgLTEzNiw2ICsxMzYsNyBAQAogI2RlZmluZSBXZWJL aXRFZGl0aW5nQmVoYXZpb3JQcmVmZXJlbmNlS2V5IEAiV2ViS2l0RWRpdGluZ0JlaGF2aW9yIgog I2RlZmluZSBXZWJLaXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrc0tleSBAIldlYktpdFVzZVByZUhU TUw1UGFyc2VyUXVpcmtzIgogI2RlZmluZSBXZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5h YmxlZEtleSBAIldlYktpdEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkIgorI2RlZmluZSBX ZWJLaXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kc0tleSBA IldlYktpdEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzIgog CiAvLyBDb3JlR3JhcGhpY3MgZGVmZXJyZWQgdXBkYXRlcyBhcmUgZGlzYWJsZWQgaWYgV2ViS2l0 RW5hYmxlQ29hbGVzY2VkVXBkYXRlc1ByZWZlcmVuY2VLZXkgaXMgc2V0CiAvLyB0byBOTywgb3Ig aGFzIG5vIHZhbHVlLiAgRm9yIGNvbXBhdGliaWxpdHkgd2l0aCBNYWMgT1MgWCAxMC40LjYsIGRl ZmVycmVkIHVwZGF0ZXMgYXJlIE9GRiBieQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZXMubW0KaW5kZXggNmMyMjg1YjkyMDk1MmE5OGE5MzQ5YjdiYjI4OWU0NTJlMDM3 YmI3Ny4uYzI2MTk1MDE1MzUwODA5OGU2MWFlNDA1NmNiMmJkM2QxOWRiZTZhNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCkBAIC0xNjc2LDYgKzE2NzYs MTYgQEAgc3RhdGljIE5TU3RyaW5nICpjbGFzc0lCQ3JlYXRvcklEID0gbmlsOwogICAgIHJldHVy biBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdFNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0 aW9uS2V5XTsKIH0KIAorLSAodm9pZClzZXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9u VGltZW91dEluU2Vjb25kczooTlNUaW1lSW50ZXJ2YWwpdGltZW91dAoreworICAgIFtzZWxmIF9z ZXRGbG9hdFZhbHVlOnRpbWVvdXQgZm9yS2V5OldlYktpdEluY3JlbWVudGFsUmVuZGVyaW5nU3Vw cHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzS2V5XTsKK30KKworLSAoTlNUaW1lSW50ZXJ2YWwpaW5j cmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMKK3sKKyAgICByZXR1 cm4gW3NlbGYgX2Zsb2F0VmFsdWVGb3JLZXk6V2ViS2l0SW5jcmVtZW50YWxSZW5kZXJpbmdTdXBw cmVzc2lvblRpbWVvdXRJblNlY29uZHNLZXldOworfQorCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlv biBXZWJQcmVmZXJlbmNlcyAoV2ViSW50ZXJuYWwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCBjY2ZmMDRkOGY0OTQ2ODhkNGE4 NjM4ZmZjMjY2MjhhODE2OWIwZDcyLi4xNjNjMzFiMmRmNjI0OGYyOTA4ZjNjZTVmNzhmZTdjYTc5 MzE0YjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXNQcml2YXRlLmgKQEAgLTI5NSw0ICsyOTUsNyBAQCBleHRlcm4gTlNTdHJpbmcgKldlYlByZWZl cmVuY2VzQ2hhbmdlZEludGVybmFsTm90aWZpY2F0aW9uOwogLSAodm9pZClzZXRTaG91bGRSZXNw ZWN0SW1hZ2VPcmllbnRhdGlvbjooQk9PTClmbGFnOwogLSAoQk9PTClzaG91bGRSZXNwZWN0SW1h Z2VPcmllbnRhdGlvbjsKIAorLSAodm9pZClzZXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNz aW9uVGltZW91dEluU2Vjb25kczooTlNUaW1lSW50ZXJ2YWwpdGluZW91dDsKKy0gKE5TVGltZUlu dGVydmFsKWluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzOwor CiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggNGZiNWRmOTVkZWRk M2I1YmUyZmIxZTQwNjlmYjgxNDlhYzE5OTQ0Mi4uYTJmZmZlN2RkNWNjNzAyZWQwMGU5NTBmYTk4 OGNmODE5NzdhN2QwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMTUy OCw2ICsxNTI4LDEwIEBAIHN0YXRpYyBib29sIG5lZWRzU2VsZlJldGFpbldoaWxlTG9hZGluZ1F1 aXJrKCkKIAogICAgIHNldHRpbmdzLT5zZXRTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbihb cHJlZmVyZW5jZXMgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb25dKTsKICAgICBzZXR0aW5n cy0+c2V0TmVlZHNJc0xvYWRpbmdJbkFQSVNlbnNlUXVpcmsoW3NlbGYgX25lZWRzSXNMb2FkaW5n SW5BUElTZW5zZVF1aXJrXSk7CisgICAgCisgICAgTlNUaW1lSW50ZXJ2YWwgdGltZW91dCA9IFtw cmVmZXJlbmNlcyBpbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25k c107CisgICAgaWYgKHRpbWVvdXQgPiAwKQorICAgICAgICBzZXR0aW5ncy0+c2V0SW5jcmVtZW50 YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHModGltZW91dCk7CiAKICAgICAv LyBBcHBsaWNhdGlvbiBDYWNoZSBQcmVmZXJlbmNlcyBhcmUgc3RvcmVkIG9uIHRoZSBnbG9iYWwg Y2FjaGUgc3RvcmFnZSBtYW5hZ2VyLCBub3QgaW4gU2V0dGluZ3MuCiAgICAgW1dlYkFwcGxpY2F0 aW9uQ2FjaGUgc2V0RGVmYXVsdE9yaWdpblF1b3RhOltwcmVmZXJlbmNlcyBhcHBsaWNhdGlvbkNh Y2hlRGVmYXVsdE9yaWdpblF1b3RhXV07Cg==