195087 2019-02-26 19:14:37 -0800 [ContentChangeObserver] Move style recalc handling from global to ContentChangeObserver class 2019-02-27 15:29:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1510330 0 zalan 2019-02-26 19:14:37 -0800 ssia 1510332 1 363059 zalan 2019-02-26 19:19:16 -0800 Created attachment 363059 Patch 1510334 2 webkit-bug-importer 2019-02-26 19:19:42 -0800 <rdar://problem/48425308> 1510386 3 363059 thorton 2019-02-26 23:17:00 -0800 Comment on attachment 363059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363059&action=review red patch > Source/WebCore/page/ios/ContentChangeObserver.mm:185 > + m_observingStyleRecalScheduling = true; "Recal"? > Source/WebCore/page/ios/ContentChangeObserver.mm:190 > + m_observingStyleRecalScheduling = false; "Recal"? > Source/WebCore/page/ios/ContentChangeObserver.mm:195 > + return m_observingStyleRecalScheduling; "Recal"? 1510448 4 zalan 2019-02-27 09:05:46 -0800 (In reply to Tim Horton from comment #3) > Comment on attachment 363059 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=363059&action=review > > red patch Happens when you make patches faster than you land them. > > > Source/WebCore/page/ios/ContentChangeObserver.mm:185 > > + m_observingStyleRecalScheduling = true; > > "Recal"? > > > Source/WebCore/page/ios/ContentChangeObserver.mm:190 > > + m_observingStyleRecalScheduling = false; > > "Recal"? > > > Source/WebCore/page/ios/ContentChangeObserver.mm:195 > > + return m_observingStyleRecalScheduling; > > "Recal"? Yeah, it's actually a thing -> bool inStyleRecalc(); void scheduleStyleRecalc(); void unscheduleStyleRecalc(); bool hasPendingStyleRecalc() const; void startTrackingStyleRecalcs(); (!even plural) unsigned styleRecalcCount() const; ... 1510479 5 thorton 2019-02-27 10:22:23 -0800 (In reply to zalan from comment #4) > (In reply to Tim Horton from comment #3) > > Comment on attachment 363059 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=363059&action=review > > > > red patch > Happens when you make patches faster than you land them. > > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:185 > > > + m_observingStyleRecalScheduling = true; > > > > "Recal"? > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:190 > > > + m_observingStyleRecalScheduling = false; > > > > "Recal"? > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:195 > > > + return m_observingStyleRecalScheduling; > > > > "Recal"? > Yeah, it's actually a thing -> > > bool inStyleRecalc(); > void scheduleStyleRecalc(); > void unscheduleStyleRecalc(); > bool hasPendingStyleRecalc() const; > void startTrackingStyleRecalcs(); (!even plural) > unsigned styleRecalcCount() const; > ... Those are recalc, not recal! 1510481 6 zalan 2019-02-27 10:23:02 -0800 (In reply to Tim Horton from comment #5) > (In reply to zalan from comment #4) > > (In reply to Tim Horton from comment #3) > > > Comment on attachment 363059 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=363059&action=review > > > > > > red patch > > Happens when you make patches faster than you land them. > > > > > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:185 > > > > + m_observingStyleRecalScheduling = true; > > > > > > "Recal"? > > > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:190 > > > > + m_observingStyleRecalScheduling = false; > > > > > > "Recal"? > > > > > > > Source/WebCore/page/ios/ContentChangeObserver.mm:195 > > > > + return m_observingStyleRecalScheduling; > > > > > > "Recal"? > > Yeah, it's actually a thing -> > > > > bool inStyleRecalc(); > > void scheduleStyleRecalc(); > > void unscheduleStyleRecalc(); > > bool hasPendingStyleRecalc() const; > > void startTrackingStyleRecalcs(); (!even plural) > > unsigned styleRecalcCount() const; > > ... > Those are recalc, not recal! lol 1510626 7 363136 zalan 2019-02-27 14:56:28 -0800 Created attachment 363136 Patch 1510634 8 363136 simon.fraser 2019-02-27 15:15:52 -0800 Comment on attachment 363136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363136&action=review > Source/WebCore/ChangeLog:8 > + Add m_observingNextStyleRecalc/m_observingStyleRecalScheduling to ContentChangeObserver and move the related code over from WK functions. m_observingStyleRecalcScheduling 1510645 9 zalan 2019-02-27 15:29:11 -0800 Committed r242167: <https://trac.webkit.org/changeset/242167> 363059 2019-02-26 19:19:16 -0800 2019-02-27 14:56:28 -0800 Patch Patch.txt text/plain 6469 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiOWYyYTM1N2U3MS4uYzQ4MWZiOWJjZTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOS0wMi0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIE1vdmUgc3R5bGUgcmVjYWxjIGhhbmRs aW5nIGZyb20gZ2xvYmFsIHRvIENvbnRlbnRDaGFuZ2VPYnNlcnZlciBjbGFzcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MDg3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1fb2JzZXJ2aW5nTmV4 dFN0eWxlUmVjYWxjL21fb2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxpbmcgdG8gQ29udGVudENo YW5nZU9ic2VydmVyIGFuZCBtb3ZlIHRoZSByZWxhdGVkIGNvZGUgb3ZlciBmcm9tIFdLIGZ1bmN0 aW9ucy4KKworICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAg ICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVk dWxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdG9wT2Jz ZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlTmV4dFN0 eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2hv dWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXI6OnNldE9ic2VydmVkQ29udGVudENoYW5nZSk6CisgICAgICAgICogcGxhdGZv cm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5jcHA6CisgICAgICAgIChXS1NldE9ic2Vy dmVkQ29udGVudENoYW5nZSk6CisgICAgICAgIChXS1N0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNT Y2hlZHVsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdLU3RvcE9ic2VydmluZ1N0eWxlUmVjYWxj U2NoZWR1bGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXS0lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNT Y2hlZHVsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdLU2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHls ZVJlY2FsYyk6IERlbGV0ZWQuCisgICAgICAgIChXS1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNh bGMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2 YXRpb24uaDoKKwogMjAxOS0wMi0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIE1vdmUgRE9NIHRpbWVyIGhhbmRsaW5n IGZyb20gZ2xvYmFsIHRvIENvbnRlbnRDaGFuZ2VPYnNlcnZlciBjbGFzcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRleCAyODBmNWY3YmJj YS4uNzM3Y2M2ZmU2YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRl bnRDaGFuZ2VPYnNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5oCkBAIC05NSw3ICs5NSw4IEBAIHByaXZhdGU6CiAKICAgICBQYWdlJiBt X3BhZ2U7CiAgICAgSGFzaFNldDxjb25zdCBET01UaW1lcio+IG1fRE9NVGltZXJMaXN0OwotCisg ICAgYm9vbCBtX29ic2VydmluZ05leHRTdHlsZVJlY2FsYyB7IGZhbHNlIH07CisgICAgYm9vbCBt X29ic2VydmluZ1N0eWxlUmVjYWxTY2hlZHVsaW5nIHsgZmFsc2UgfTsKIH07CiAKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbSBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbQppbmRleCA5 YzhjNGVlOTc3NC4uODQyMTVlMTFkOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv aW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lv cy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KQEAgLTE4MiwyNyArMTgyLDI3IEBAIGJvb2wgQ29u dGVudENoYW5nZU9ic2VydmVyOjppc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpCiAKIHZv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1 bGluZygpCiB7Ci0gICAgV0tTdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwor ICAgIG1fb2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxpbmcgPSB0cnVlOwogfQogCiB2b2lkIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygp CiB7Ci0gICAgV0tTdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7CisgICAgbV9v YnNlcnZpbmdTdHlsZVJlY2FsU2NoZWR1bGluZyA9IGZhbHNlOwogfQogCiBib29sIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKQogewotICAg IHJldHVybiBXS0lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7CisgICAgcmV0dXJu IG1fb2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxpbmc7CiB9CiAKIHZvaWQgQ29udGVudENoYW5n ZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wgb2JzZXJ2ZSkK IHsKLSAgICBXS1NldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMob2JzZXJ2ZSk7CisgICAg bV9vYnNlcnZpbmdOZXh0U3R5bGVSZWNhbGMgPSBvYnNlcnZlOwogfQogCiBib29sIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6c2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYygpCiB7Ci0gICAgcmV0 dXJuIFdLU2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYygpOworICAgIHJldHVybiBtX29ic2Vy dmluZ05leHRTdHlsZVJlY2FsYzsKIH0KIAogV0tDb250ZW50Q2hhbmdlIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6b2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkKQEAgLTIyNiw2ICsyMjYsNyBAQCB2b2lk IENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVu dENoYW5nZSBjaGFuZ2UpCiAgICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hh bmdlKSB7CiAgICAgICAgIC8vIERvbid0IG5lZWQgdG8gbGlzdGVuIHRvIERPTSB0aW1lcnMgYW55 bW9yZS4KICAgICAgICAgY2xlYXJPYnNlcnZlZERPTVRpbWVycygpOworICAgICAgICBzZXRTaG91 bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGZhbHNlKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5j cHAKaW5kZXggNGRiN2UyYmYzYTkuLjllNDQ1ZDQxOThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmNwcApAQCAt MzcsOCArMzcsNiBAQAogV0tDb250ZW50Q2hhbmdlIF9XS0NvbnRlbnRDaGFuZ2UgICAgICAgICAg ICAgICAgICAgID0gV0tDb250ZW50Tm9DaGFuZ2U7CiBib29sICAgICAgICAgICAgX1dLT2JzZXJ2 aW5nQ29udGVudENoYW5nZXMgICAgICAgICAgPSBmYWxzZTsKIGJvb2wgICAgICAgICAgICBfV0tP YnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcgICAgICA9IGZhbHNlOwotYm9vbCAgICAgICAgICAg IF9XS09ic2VydmluZ1N0eWxlUmVjYWxTY2hlZHVsaW5nICAgID0gZmFsc2U7Ci1ib29sICAgICAg ICAgICAgX1dLT2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjICAgICAgICAgPSBmYWxzZTsKIAogYm9v bCBXS09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKHZvaWQpCiB7CkBAIC03MSwzMSArNjksNiBAQCBi b29sIFdLSXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcodm9pZCkKICAgICByZXR1cm4gX1dL T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nOwogfQogCi12b2lkIFdLU3RhcnRPYnNlcnZpbmdT dHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCkKLXsKLSAgICBfV0tPYnNlcnZpbmdTdHlsZVJlY2Fs U2NoZWR1bGluZyA9IHRydWU7Ci19Ci0KLXZvaWQgV0tTdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNT Y2hlZHVsaW5nKHZvaWQpCi17Ci0gICAgX1dLT2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxpbmcg PSBmYWxzZTsKLX0KLQotYm9vbCBXS0lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKHZv aWQpCi17Ci0gICAgcmV0dXJuIF9XS09ic2VydmluZ1N0eWxlUmVjYWxTY2hlZHVsaW5nOwotfQot Ci12b2lkIFdLU2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sIG9ic2VydmUpCi17 Ci0gICAgX1dLT2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjID0gb2JzZXJ2ZTsKLX0KLQotYm9vbCBX S1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGModm9pZCkKLXsKLSAgICByZXR1cm4gX1dLT2Jz ZXJ2aW5nTmV4dFN0eWxlUmVjYWxjOwotfQotCiBXS0NvbnRlbnRDaGFuZ2UgV0tPYnNlcnZlZENv bnRlbnRDaGFuZ2Uodm9pZCkKIHsKICAgICByZXR1cm4gX1dLQ29udGVudENoYW5nZTsKQEAgLTEw NywxMyArODAsNyBAQCB2b2lkIFdLU2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudENo YW5nZSBjaGFuZ2UpCiAgICAgaWYgKF9XS0NvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJp bGl0eUNoYW5nZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRl bnRWaXNpYmlsaXR5Q2hhbmdlKSB7Ci0gICAgICAgIF9XS0NvbnRlbnRDaGFuZ2UgPSBjaGFuZ2U7 Ci0gICAgICAgIF9XS09ic2VydmluZ05leHRTdHlsZVJlY2FsYyA9IGZhbHNlOwotICAgICAgICBy ZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRl Q2hhbmdlKSB7CisgICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlIHx8 IGNoYW5nZSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hhbmdlKSB7CiAgICAgICAgIF9XS0Nv bnRlbnRDaGFuZ2UgPSBjaGFuZ2U7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmgK aW5kZXggM2NiZjA2NjdjM2YuLjFkODNhOTFjNGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5oCkBAIC00NiwxMyAr NDYsNiBAQCBXRUJDT1JFX0VYUE9SVCB2b2lkIFdLU3RhcnRPYnNlcnZpbmdET01UaW1lclNjaGVk dWxpbmcodm9pZCk7CiBXRUJDT1JFX0VYUE9SVCB2b2lkIFdLU3RvcE9ic2VydmluZ0RPTVRpbWVy U2NoZWR1bGluZyh2b2lkKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgV0tJc09ic2VydmluZ0RPTVRp bWVyU2NoZWR1bGluZyh2b2lkKTsKIAotV0VCQ09SRV9FWFBPUlQgdm9pZCBXS1N0YXJ0T2JzZXJ2 aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKHZvaWQpOwotV0VCQ09SRV9FWFBPUlQgdm9pZCBXS1N0 b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCk7Ci1XRUJDT1JFX0VYUE9SVCBi b29sIFdLSXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCk7Ci0KLVdFQkNPUkVf RVhQT1JUIHZvaWQgV0tTZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wpOwotV0VC Q09SRV9FWFBPUlQgYm9vbCBXS1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGModm9pZCk7Ci0K IFdFQkNPUkVfRVhQT1JUIFdLQ29udGVudENoYW5nZSBXS09ic2VydmVkQ29udGVudENoYW5nZSh2 b2lkKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCg== 363136 2019-02-27 14:56:28 -0800 2019-02-27 15:15:52 -0800 Patch Patch.txt text/plain 6187 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMmRmMTFiM2M4Ny4uMDhiODJjMjBkOWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOS0wMi0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIE1vdmUgc3R5bGUgcmVjYWxjIGhhbmRs aW5nIGZyb20gZ2xvYmFsIHRvIENvbnRlbnRDaGFuZ2VPYnNlcnZlciBjbGFzcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MDg3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1fb2JzZXJ2aW5nTmV4 dFN0eWxlUmVjYWxjL21fb2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxpbmcgdG8gQ29udGVudENo YW5nZU9ic2VydmVyIGFuZCBtb3ZlIHRoZSByZWxhdGVkIGNvZGUgb3ZlciBmcm9tIFdLIGZ1bmN0 aW9ucy4KKworICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAg ICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVk dWxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdG9wT2Jz ZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlTmV4dFN0 eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2hv dWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXI6OnNldE9ic2VydmVkQ29udGVudENoYW5nZSk6CisgICAgICAgICogcGxhdGZv cm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5jcHA6CisgICAgICAgIChXS1NldE9ic2Vy dmVkQ29udGVudENoYW5nZSk6CisgICAgICAgIChXS1N0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNT Y2hlZHVsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdLU3RvcE9ic2VydmluZ1N0eWxlUmVjYWxj U2NoZWR1bGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXS0lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNT Y2hlZHVsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdLU2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHls ZVJlY2FsYyk6IERlbGV0ZWQuCisgICAgICAgIChXS1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNh bGMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2 YXRpb24uaDoKKwogMjAxOS0wMi0yNyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBBZG9wdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiBpbiBXZWJDb3Jl OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGFuZCBXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZl ci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKaW5k ZXggMGU2OTQ3MzFhZDMuLmFiOTczODY1ODRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApAQCAtOTUsNiArOTUsOCBAQCBwcml2YXRlOgog CiAgICAgUGFnZSYgbV9wYWdlOwogICAgIEhhc2hTZXQ8Y29uc3QgRE9NVGltZXIqPiBtX0RPTVRp bWVyTGlzdDsKKyAgICBib29sIG1fb2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjIHsgZmFsc2UgfTsK KyAgICBib29sIG1fb2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nIHsgZmFsc2UgfTsKIH07 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VP YnNlcnZlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZl ci5tbQppbmRleCAyODMwOGUwYzIxOC4uZWNmYzAxYTk1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KQEAgLTE4MiwyNyArMTgyLDI3 IEBAIGJvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjppc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1 bGluZygpCiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxl UmVjYWxjU2NoZWR1bGluZygpCiB7Ci0gICAgV0tTdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2No ZWR1bGluZygpOworICAgIG1fb2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nID0gdHJ1ZTsK IH0KIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdTdHlsZVJlY2Fs Y1NjaGVkdWxpbmcoKQogewotICAgIFdLU3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGlu ZygpOworICAgIG1fb2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nID0gZmFsc2U7CiB9CiAK IGJvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjppc09ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1 bGluZygpCiB7Ci0gICAgcmV0dXJuIFdLSXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmco KTsKKyAgICByZXR1cm4gbV9vYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmc7CiB9CiAKIHZv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxj KGJvb2wgb2JzZXJ2ZSkKIHsKLSAgICBXS1NldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMo b2JzZXJ2ZSk7CisgICAgbV9vYnNlcnZpbmdOZXh0U3R5bGVSZWNhbGMgPSBvYnNlcnZlOwogfQog CiBib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2Fs YygpCiB7Ci0gICAgcmV0dXJuIFdLU2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYygpOworICAg IHJldHVybiBtX29ic2VydmluZ05leHRTdHlsZVJlY2FsYzsKIH0KIAogV0tDb250ZW50Q2hhbmdl IENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6b2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlv bi5jcHAKaW5kZXggNGRiN2UyYmYzYTkuLjllNDQ1ZDQxOThlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmNwcApA QCAtMzcsOCArMzcsNiBAQAogV0tDb250ZW50Q2hhbmdlIF9XS0NvbnRlbnRDaGFuZ2UgICAgICAg ICAgICAgICAgICAgID0gV0tDb250ZW50Tm9DaGFuZ2U7CiBib29sICAgICAgICAgICAgX1dLT2Jz ZXJ2aW5nQ29udGVudENoYW5nZXMgICAgICAgICAgPSBmYWxzZTsKIGJvb2wgICAgICAgICAgICBf V0tPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcgICAgICA9IGZhbHNlOwotYm9vbCAgICAgICAg ICAgIF9XS09ic2VydmluZ1N0eWxlUmVjYWxTY2hlZHVsaW5nICAgID0gZmFsc2U7Ci1ib29sICAg ICAgICAgICAgX1dLT2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjICAgICAgICAgPSBmYWxzZTsKIAog Ym9vbCBXS09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKHZvaWQpCiB7CkBAIC03MSwzMSArNjksNiBA QCBib29sIFdLSXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcodm9pZCkKICAgICByZXR1cm4g X1dLT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nOwogfQogCi12b2lkIFdLU3RhcnRPYnNlcnZp bmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCkKLXsKLSAgICBfV0tPYnNlcnZpbmdTdHlsZVJl Y2FsU2NoZWR1bGluZyA9IHRydWU7Ci19Ci0KLXZvaWQgV0tTdG9wT2JzZXJ2aW5nU3R5bGVSZWNh bGNTY2hlZHVsaW5nKHZvaWQpCi17Ci0gICAgX1dLT2JzZXJ2aW5nU3R5bGVSZWNhbFNjaGVkdWxp bmcgPSBmYWxzZTsKLX0KLQotYm9vbCBXS0lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5n KHZvaWQpCi17Ci0gICAgcmV0dXJuIF9XS09ic2VydmluZ1N0eWxlUmVjYWxTY2hlZHVsaW5nOwot fQotCi12b2lkIFdLU2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sIG9ic2VydmUp Ci17Ci0gICAgX1dLT2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjID0gb2JzZXJ2ZTsKLX0KLQotYm9v bCBXS1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGModm9pZCkKLXsKLSAgICByZXR1cm4gX1dL T2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjOwotfQotCiBXS0NvbnRlbnRDaGFuZ2UgV0tPYnNlcnZl ZENvbnRlbnRDaGFuZ2Uodm9pZCkKIHsKICAgICByZXR1cm4gX1dLQ29udGVudENoYW5nZTsKQEAg LTEwNywxMyArODAsNyBAQCB2b2lkIFdLU2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVu dENoYW5nZSBjaGFuZ2UpCiAgICAgaWYgKF9XS0NvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50Vmlz aWJpbGl0eUNoYW5nZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGNoYW5nZSA9PSBXS0Nv bnRlbnRWaXNpYmlsaXR5Q2hhbmdlKSB7Ci0gICAgICAgIF9XS0NvbnRlbnRDaGFuZ2UgPSBjaGFu Z2U7Ci0gICAgICAgIF9XS09ic2VydmluZ05leHRTdHlsZVJlY2FsYyA9IGZhbHNlOwotICAgICAg ICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRlbnRJbmRldGVybWlu YXRlQ2hhbmdlKSB7CisgICAgaWYgKGNoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdl IHx8IGNoYW5nZSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hhbmdlKSB7CiAgICAgICAgIF9X S0NvbnRlbnRDaGFuZ2UgPSBjaGFuZ2U7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9u LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9u LmgKaW5kZXggM2NiZjA2NjdjM2YuLjFkODNhOTFjNGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5oCkBAIC00Niwx MyArNDYsNiBAQCBXRUJDT1JFX0VYUE9SVCB2b2lkIFdLU3RhcnRPYnNlcnZpbmdET01UaW1lclNj aGVkdWxpbmcodm9pZCk7CiBXRUJDT1JFX0VYUE9SVCB2b2lkIFdLU3RvcE9ic2VydmluZ0RPTVRp bWVyU2NoZWR1bGluZyh2b2lkKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgV0tJc09ic2VydmluZ0RP TVRpbWVyU2NoZWR1bGluZyh2b2lkKTsKIAotV0VCQ09SRV9FWFBPUlQgdm9pZCBXS1N0YXJ0T2Jz ZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKHZvaWQpOwotV0VCQ09SRV9FWFBPUlQgdm9pZCBX S1N0b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCk7Ci1XRUJDT1JFX0VYUE9S VCBib29sIFdLSXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcodm9pZCk7Ci0KLVdFQkNP UkVfRVhQT1JUIHZvaWQgV0tTZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wpOwot V0VCQ09SRV9FWFBPUlQgYm9vbCBXS1Nob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGModm9pZCk7 Ci0KIFdFQkNPUkVfRVhQT1JUIFdLQ29udGVudENoYW5nZSBXS09ic2VydmVkQ29udGVudENoYW5n ZSh2b2lkKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCg==