117015 2013-05-29 22:36:05 -0700 Expose incrementalRenderingSuppressionTimeoutInSeconds via WK2 2013-05-29 23:24:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton aestes andersca commit-queue esprehn+autocc japhet simon.fraser oldest_to_newest 895353 0 thorton 2013-05-29 22:36:05 -0700 And also make the timeout work with WK2. And make it work with incremental rendering suppression tokens. Basically, this is "make the incremental rendering timeout work with all the WK2 bits". <rdar://problem/13992853> 895365 1 203311 thorton 2013-05-29 23:02:11 -0700 Created attachment 203311 patch 895368 2 203311 darin 2013-05-29 23:11:37 -0700 Comment on attachment 203311 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203311&action=review > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:286 > +// Defaults to 5 seconds We put periods on these kinds of fragments, usually. > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:288 > +WK_EXPORT void WKPreferencesSetIncrementalRenderingSuppressionTimeoutInSeconds(WKPreferencesRef preferencesRef, double timeout); > +WK_EXPORT double WKPreferencesGetIncrementalRenderingSuppressionTimeoutInSeconds(WKPreferencesRef preferencesRef); Does “in seconds” really need to be in the function name? We use seconds for all our WebKit time units, don’t we? And it’s also the standard in Cocoa. Maybe the argument name would be sufficient? 895370 3 thorton 2013-05-29 23:17:42 -0700 (In reply to comment #2) > (From update of attachment 203311 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203311&action=review > > > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:286 > > +// Defaults to 5 seconds > > We put periods on these kinds of fragments, usually. Indeed! That file is amazingly inconsistent on this point. I'll add periods to mine. > > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:288 > > +WK_EXPORT void WKPreferencesSetIncrementalRenderingSuppressionTimeoutInSeconds(WKPreferencesRef preferencesRef, double timeout); > > +WK_EXPORT double WKPreferencesGetIncrementalRenderingSuppressionTimeoutInSeconds(WKPreferencesRef preferencesRef); > > Does “in seconds” really need to be in the function name? We use seconds for all our WebKit time units, don’t we? And it’s also the standard in Cocoa. Maybe the argument name would be sufficient? Probably not, I was just matching the WebCore setting name. I'll drop the InSeconds from the WK2 SPI. Thanks! 895373 4 thorton 2013-05-29 23:24:54 -0700 http://trac.webkit.org/changeset/150950 203311 2013-05-29 23:02:11 -0700 2013-05-29 23:11:37 -0700 patch incrender.diff text/plain 11190 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5YmUyMzljLi5jNGYzOWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTMtMDUtMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgRXhwb3NlIGluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5T ZWNvbmRzIHZpYSBXSzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNzAxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM5OTI4NTM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldFZpc3VhbFVwZGF0ZXNBbGxvd2Vk KToKKyAgICAgICAgSW5mb3JtIHRoZSBGcmFtZUxvYWRlciB0aGF0IHdlJ3JlIHJlYWR5IHRvIHRy YW5zaXRpb24gdGhlIHBhZ2UsIGlmCisgICAgICAgIG5vdGhpbmcgZWxzZSBhbHJlYWR5IGhhcy4g VGhpcyB3aWxsIGJlIGZvcndhcmRlZCB0byB0aGUgRnJhbWVMb2FkZXJDbGllbnQsCisgICAgICAg IGFuZCBXZWJLaXQyJ3MgaW1wbGVtZW50YXRpb24gd2lsbCBnbyBhaGVhZCBhbmQgdW4tZnJlZXpl IHRoZSBsYXllciB0cmVlLAorICAgICAgICBzbyB0aGF0IHRoZSBpbmNyZW1lbnRhbCByZW5kZXJp bmcgc3VwcHJlc3Npb24gd2F0Y2hkb2cgdGltZXIgYWN0dWFsbHkgd29ya3MuCisKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZEJ5Q2xpZW50KToKKyAg ICAgICAgTWFrZSBpbmNyZW1lbnRhbCByZW5kZXJpbmcgc3VwcHJlc3Npb24gZXh0ZW5zaW9uIHRv a2VucyBwbGF5IG5pY2Ugd2l0aCB0aGUKKyAgICAgICAgd2F0Y2hkb2cgdGltZXI7IGFsbG93IHNl dFZpc3VhbFVwZGF0ZXNBbGxvd2VkQnlDbGllbnQ9dHJ1ZSB0byByZS1lbmFibGUgdXBkYXRlcwor ICAgICAgICBpZiBlaXRoZXIgdGhlIHBhZ2UgaXMgaW4gdGhlICJjb21wbGV0ZWQiIHN0YXRlIG9y IHRoZSB3YXRjaGRvZyBoYXMgYWxyZWFkeSBmaXJlZC4KKworICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlci5jcHA6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6Zm9yY2VQYWdlVHJhbnNpdGlvbklmTmVlZGVkKTogQWRkZWQu CisgICAgICAgIEZvcndhcmQgdG8gdGhlIGNsaWVudC4KKworICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlckNsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQ6OmZv cmNlUGFnZVRyYW5zaXRpb25JZk5lZWRlZCk6IEFkZGVkLgorCiAyMDEzLTA1LTI4ICBPbGl2ZXIg SHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIG1vcmUgYWNjdXJhdGUgYWN0 aXZpdHkgc3RhdGUgdHJhY2tpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGU4NmU1Mzku LjYxNzJiMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMTMxMiw2ICsxMzEyLDkgQEAg dm9pZCBEb2N1bWVudDo6c2V0VmlzdWFsVXBkYXRlc0FsbG93ZWQoYm9vbCB2aXN1YWxVcGRhdGVz QWxsb3dlZCkKIAogICAgIGlmIChSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVy VmlldygpKQogICAgICAgICByZW5kZXJWaWV3LT5yZXBhaW50Vmlld0FuZENvbXBvc2l0ZWRMYXll cnMoKTsKKworICAgIGlmIChGcmFtZSogZnJhbWUgPSB0aGlzLT5mcmFtZSgpKQorICAgICAgICBm cmFtZS0+bG9hZGVyKCktPmZvcmNlUGFnZVRyYW5zaXRpb25JZk5lZWRlZCgpOwogfQogCiB2b2lk IERvY3VtZW50Ojp2aXN1YWxVcGRhdGVzU3VwcHJlc3Npb25UaW1lckZpcmVkKFRpbWVyPERvY3Vt ZW50PiopCkBAIC0xMzI4LDcgKzEzMzEsMTAgQEAgdm9pZCBEb2N1bWVudDo6dmlzdWFsVXBkYXRl c1N1cHByZXNzaW9uVGltZXJGaXJlZChUaW1lcjxEb2N1bWVudD4qKQogCiB2b2lkIERvY3VtZW50 OjpzZXRWaXN1YWxVcGRhdGVzQWxsb3dlZEJ5Q2xpZW50KGJvb2wgdmlzdWFsVXBkYXRlc0FsbG93 ZWRCeUNsaWVudCkKIHsKLSAgICBpZiAodmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudCAmJiBt X3JlYWR5U3RhdGUgPT0gQ29tcGxldGUgJiYgIXZpc3VhbFVwZGF0ZXNBbGxvd2VkKCkpCisgICAg Ly8gV2Ugc2hvdWxkIG9ubHkgcmUtZW5hYmxlIHZpc3VhbCB1cGRhdGVzIGlmIFJlYWR5U3RhdGUg aXMgQ29tcGxldGVkIG9yIHRoZSB3YXRjaGRvZyB0aW1lciBoYXMgZmlyZWQsCisgICAgLy8gYm90 aCBvZiB3aGljaCB3ZSBjYW4gZGV0ZXJtaW5lIGJ5IGxvb2tpbmcgYXQgdGhlIHRpbWVyLgorCisg ICAgaWYgKHZpc3VhbFVwZGF0ZXNBbGxvd2VkQnlDbGllbnQgJiYgIW1fdmlzdWFsVXBkYXRlc1N1 cHByZXNzaW9uVGltZXIuaXNBY3RpdmUoKSAmJiAhdmlzdWFsVXBkYXRlc0FsbG93ZWQoKSkKICAg ICAgICAgc2V0VmlzdWFsVXBkYXRlc0FsbG93ZWQodHJ1ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGU5ODRhMmQuLmI2NWQ1YTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMzMzOSw2ICszMzM5LDExIEBAIHZvaWQgRnJhbWVM b2FkZXI6OmxvYWRQcm9ncmVzc2luZ1N0YXR1c0NoYW5nZWQoKQogICAgIHZpZXctPmFkanVzdFRp bGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CiAKK3ZvaWQgRnJhbWVMb2FkZXI6OmZvcmNlUGFnZVRy YW5zaXRpb25JZk5lZWRlZCgpCit7CisgICAgbV9jbGllbnQtPmZvcmNlUGFnZVRyYW5zaXRpb25J Zk5lZWRlZCgpOworfQorCiBib29sIEZyYW1lTG9hZGVyQ2xpZW50OjpoYXNIVE1MVmlldygpIGNv bnN0CiB7CiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmlu ZGV4IDFjYTA2OTYuLmQ5MGQwM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBA IC0yODYsNiArMjg2LDggQEAgcHVibGljOgogCiAgICAgY29uc3QgS1VSTCYgcHJldmlvdXNVUkwo KSBjb25zdCB7IHJldHVybiBtX3ByZXZpb3VzVVJMOyB9CiAKKyAgICB2b2lkIGZvcmNlUGFnZVRy YW5zaXRpb25JZk5lZWRlZCgpOworCiBwcml2YXRlOgogICAgIGVudW0gRm9ybVN1Ym1pc3Npb25D YWNoZUxvYWRQb2xpY3kgewogICAgICAgICBNYXlBdHRlbXB0Q2FjaGVPbmx5TG9hZEZvckZvcm1T dWJtaXNzaW9uSXRlbSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgK aW5kZXggODU1ZWMyNi4uYWY3NmJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50LmgKQEAgLTM0OSw2ICszNDksOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAg ICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2hhbmdlUmVzb3VyY2VQcmlvcml0eSh1bnNp Z25lZCBsb25nIC8qaWRlbnRpZmllciovLCBSZXNvdXJjZUxvYWRQcmlvcml0eSkgeyB9CiAKKyAg ICAgICAgdmlydHVhbCB2b2lkIGZvcmNlUGFnZVRyYW5zaXRpb25JZk5lZWRlZCgpIHsgfQorCiAg ICAgICAgIC8vIEZJWE1FIChidWcgMTE2MjMzKTogV2UgbmVlZCB0byBnZXQgcmlkIG9mIEVtcHR5 RnJhbWVMb2FkZXJDbGllbnQgY29tcGxldGVseSwgdGhlbiB0aGlzIHdpbGwgbm8gbG9uZ2VyIGJl IG5lZWRlZC4KICAgICAgICAgdmlydHVhbCBib29sIGlzRW1wdHlGcmFtZUxvYWRlckNsaWVudCgp IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA4MGZlZjU4Li5lMmIxNjAx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTMtMDUtMjkgIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgRXhwb3NlIGluY3JlbWVudGFsUmVu ZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzIHZpYSBXSzIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzAxNQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTM5OTI4NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICBBZGQgSW5jcmVt ZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJblNlY29uZHMgcHJlZmVyZW5jZS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdL UHJlZmVyZW5jZXNTZXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vj b25kcyk6IEFkZGVkLgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldEluY3JlbWVudGFsUmVuZGVy aW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKTogQWRkZWQuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojpmb3JjZVBhZ2VUcmFuc2l0aW9uSWZO ZWVkZWQpOiBBZGRlZC4KKyAgICAgICAgQ2FsbCBkaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uLCB3 aGljaCB1bi1mcmVlemVzIHRoZSBsYXllciB0cmVlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRDb21wbGV0 ZVBhZ2VUcmFuc2l0aW9uKToKKyAgICAgICAgRml4IHNvbWUgaW5kZW50YXRpb24uCisKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICBGb3J3YXJk IHRoZSB0aW1lb3V0IHZhbHVlIHRocm91Z2ggdG8gV2ViQ29yZS4KKworMjAxMy0wNS0yOSAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBXS1ZpZXdzIHVz aW5nIHNob3VsZENsaXBUb1Zpc2libGVSZWN0PVlFUyBzaG91bGQgcmVzcGVjdCBwcmVwYXJlQ29u dGVudEluUmVjdDogaWYgY2FsbGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTY5ODkKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE0MDA3NDQwPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKaW5kZXggMzNkNzgz ZS4uYWFmZWI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9y ZS5oCkBAIC0xNjQsNiArMTY0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKICNkZWZpbmUgRk9S X0VBQ0hfV0VCS0lUX0RPVUJMRV9QUkVGRVJFTkNFKG1hY3JvKSBcCiAgICAgbWFjcm8oUERGU2Nh bGVGYWN0b3IsIHBkZlNjYWxlRmFjdG9yLCBEb3VibGUsIGRvdWJsZSwgMCkgXAorICAgIG1hY3Jv KEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzLCBpbmNyZW1l bnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcywgRG91YmxlLCBkb3VibGUs IDUpIFwKICAgICBcCiAKICNkZWZpbmUgRk9SX0VBQ0hfV0VCS0lUX0ZMT0FUX1BSRUZFUkVOQ0Uo bWFjcm8pIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1By ZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzLmNwcAppbmRleCAzZGE5MzdkLi5lMTM2YjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC0xMTQzLDMgKzExNDMsMTMgQEAg Ym9vbCBXS1ByZWZlcmVuY2VzR2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYgcHIKIHsKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2Vz UmVmKS0+aGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFibGVkKCk7CiB9CisKK3Zv aWQgV0tQcmVmZXJlbmNlc1NldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0 SW5TZWNvbmRzKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGRvdWJsZSB0aW1lb3V0 KQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEluY3JlbWVudGFsUmVuZGVyaW5n U3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKHRpbWVvdXQpOworfQorCitkb3VibGUgV0tQcmVm ZXJlbmNlc0dldEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRz KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvQVBJKHRv SW1wbChwcmVmZXJlbmNlc1JlZiktPmluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1l b3V0SW5TZWNvbmRzKCkpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCAyYjVjNzEyLi5mMTFmMTk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1By aXZhdGUuaApAQCAtMjgzLDYgKzI4MywxMCBAQCBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2Vz R2V0QXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZChXS1ByZWZlcgogV0tf RVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlv bkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKTsK IFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRQcmltYXJ5UGx1Z0luU25hcHNob3REZXRl Y3Rpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOwogCisvLyBEZWZh dWx0cyB0byA1IHNlY29uZHMKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRJbmNyZW1l bnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcyhXS1ByZWZlcmVuY2VzUmVm IHByZWZlcmVuY2VzUmVmLCBkb3VibGUgdGltZW91dCk7CitXS19FWFBPUlQgZG91YmxlIFdLUHJl ZmVyZW5jZXNHZXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25k cyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQ cmVmZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZl cmVuY2VzUmVmKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCmluZGV4IDQ0Mjc3ZjEuLmNkOTM5ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCkBAIC01MjQsNiArNTI0LDE5IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCgpCiAgICAgd2ViUGFnZS0+ZGlkRmluaXNoTG9hZCht X2ZyYW1lKTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6Zm9yY2VQYWdlVHJhbnNp dGlvbklmTmVlZGVkKCkKK3sKKyAgICBpZiAobV9kaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uQWxy ZWFkeSkKKyAgICAgICAgcmV0dXJuOworCisgICAgV2ViUGFnZSogd2ViUGFnZSA9IG1fZnJhbWUt PnBhZ2UoKTsKKyAgICBpZiAoIXdlYlBhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIHdlYlBh Z2UtPmRpZENvbXBsZXRlUGFnZVRyYW5zaXRpb24oKTsKKyAgICBtX2RpZENvbXBsZXRlUGFnZVRy YW5zaXRpb25BbHJlYWR5ID0gdHJ1ZTsKK30KKwogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEaWRMYXlvdXQoTGF5b3V0TWlsZXN0b25lcyBtaWxlc3RvbmVzKQogewogICAgIFdl YlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmgKaW5kZXggYjBkY2M0ZS4uMDNkNWUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuaApAQCAtMjI0LDYgKzIyNCw4IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQ dHI8V2ViQ29yZTo6RnJhbWVOZXR3b3JraW5nQ29udGV4dD4gY3JlYXRlTmV0d29ya2luZ0NvbnRl eHQoKSBPVkVSUklERTsKIAorICAgIHZpcnR1YWwgdm9pZCBmb3JjZVBhZ2VUcmFuc2l0aW9uSWZO ZWVkZWQoKSBPVkVSUklERTsKKwogICAgIFdlYkZyYW1lKiBtX2ZyYW1lOwogICAgIFJlZlB0cjxQ bHVnaW5WaWV3PiBtX3BsdWdpblZpZXc7CiAgICAgYm9vbCBtX2hhc1NlbnRSZXNwb25zZVRvUGx1 Z2luVmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAppbmRleCBkYTY1ODFhLi40MTIzN2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0yMTQzLDcgKzIxNDMsOCBAQCB2b2lkIFdlYlBhZ2U6 OmRpZENvbXBsZXRlUGFnZVRyYW5zaXRpb24oKQogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OlBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSgpKTsKICAgICBlbHNlCiAjZW5k aWYKLSAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihmYWxz ZSk7CisgICAgICAgIAorICAgIG1fZHJhd2luZ0FyZWEtPnNldExheWVyVHJlZVN0YXRlSXNGcm96 ZW4oZmFsc2UpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnNob3coKQpAQCAtMjUxMyw2ICsyNTE0LDcg QEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0 b3JlJiBzdG9yZSkKIAogICAgIHNldHRpbmdzLT5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGUoc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphcHBsaWNhdGlvbkNocm9t ZU1vZGVLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRTdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5k ZXJpbmcoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzdXBwcmVz c2VzSW5jcmVtZW50YWxSZW5kZXJpbmdLZXkoKSkpOworICAgIHNldHRpbmdzLT5zZXRJbmNyZW1l bnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcyhzdG9yZS5nZXREb3VibGVW YWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6aW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVz c2lvblRpbWVvdXRJblNlY29uZHNLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRCYWNrc3BhY2VL ZXlOYXZpZ2F0aW9uRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5j ZXNLZXk6OmJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5n cy0+c2V0V2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvcihzdG9yZS5nZXRCb29s VmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OndhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2Fk aW5nQmVoYXZpb3JLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRDYXJldEJyb3dzaW5nRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNhcmV0QnJvd3Np bmdFbmFibGVkS2V5KCkpKTsK