13304 2007-04-08 03:56:04 -0700 REGRESSION(14784): WebKit doesn't dynamically reflect changes to the highlight color in System Preferences 2007-05-05 22:39:21 -0700 1 1 1 Unclassified WebKit Forms 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED InRadar, Regression P1 Normal --- 1 mitz ap ap oldest_to_newest 15340 0 mitz 2007-04-08 03:56:04 -0700 Changing the highlight color in System Preferences doesn't affect an existing instance of WebKit (that has already used highlighting). RenderTheme caches the highlight color the first time it's accessed and there's no invalidation mechanism. 11539 1 ap 2007-05-01 03:42:01 -0700 Isn't this a regression? Works for me with shipping Safari/WebKit. 11541 2 mitz 2007-05-01 05:07:23 -0700 Yes, it is a regression. Thanks, Alexey! 11061 3 darin 2007-05-04 22:18:09 -0700 <rdar://problem/5183686> 10864 4 mitz 2007-05-05 00:00:43 -0700 The bug is not limited to selection in form controls. 10883 5 14356 ap 2007-05-05 07:49:26 -0700 Created attachment 14356 proposed fix 10884 6 14356 darin 2007-05-05 08:08:06 -0700 Comment on attachment 14356 proposed fix + /* Have to just leak the cells, since statics are destroyed with no autorelease pool available */ I know you just moved this comment, but it is not true. You can create an autorelease pool of your own and then call HardRelease before draining the autorelease pool. In fact, even removeObserver: needs an autorelease pool. On the other hand, I think we should just change it so that RenderThemeMac is never destroyed. RenderTheme* theme() { static RenderThemeMac* macTheme = new RenderThemeMac; return macTheme; } r=me, because this issue is a minor one as long as you aren't seeing a crash on quit 10889 7 14358 ap 2007-05-05 09:44:58 -0700 Created attachment 14358 proposed fix I didn't get any crashes on quit, but it looks safer to change theme() in this way indeed. 10918 8 14358 darin 2007-05-05 15:15:29 -0700 Comment on attachment 14358 proposed fix + static RenderThemeMac* macTheme; + if (!macTheme) + macTheme = new RenderThemeMac; This could just be written: static RenderThemeMac* macTheme = new RenderThemeMac; The initialization only runs once. r=me 10928 9 ap 2007-05-05 22:39:21 -0700 Committed revision 21274. 14356 2007-05-05 07:49:26 -0700 2007-05-05 09:44:58 -0700 proposed fix 13304r1_patch.txt text/plain 6850 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTI3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDctMDUtMDUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzA0CisgICAgICAgIFJF R1JFU1NJT04oMTQ3ODQpOiBXZWJLaXQgZG9lc24ndCBkeW5hbWljYWxseSByZWZsZWN0IGNoYW5n ZXMgdG8gdGhlIGhpZ2hsaWdodCBjb2xvciBpbiBTeXN0ZW0gUHJlZmVyZW5jZXMKKworICAgICAg ICBJbXBsZW1lbnRlZCBhIG5vdGlmaWNhdGlvbiBvYnNlcnZlciB0aGF0IGludmFsaWRhdGVzIGNh Y2hlZCBzeXN0ZW0gY29sb3JzLgorCisgICAgICAgIE5vIGF1dG9tYXRlZCB0ZXN0IHBvc3NpYmxl LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lOjphY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OmluYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpwbGF0Zm9ybUNvbG9yc0RpZENoYW5n ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tOgorICAgICAgICAoLVtXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlciBp bml0V2l0aFRoZW1lOldlYkNvcmU6Ol0pOgorICAgICAgICAoLVtXZWJDb3JlUmVuZGVyVGhlbWVO b3RpZmljYXRpb25PYnNlcnZlciBzeXN0ZW1Db2xvcnNEaWRDaGFuZ2U6XSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6UmVuZGVyVGhlbWVNYWMpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVNYWM6On5SZW5kZXJUaGVtZU1hYyk6CisKIDIwMDctMDUtMDUgIFJvYiBC dWlzICA8YnVpc0BrZGUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlci4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAJKHJldmlzaW9uIDIxMTk5KQorKysgV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTgsMTggKzIxOCwx NiBAQCBib29sIFJlbmRlclRoZW1lOjpwYWludERlY29yYXRpb25zKFJlbmRlCiAKIENvbG9yIFJl bmRlclRoZW1lOjphY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdAogewotICAg IHN0YXRpYyBDb2xvciBhY3RpdmVTZWxlY3Rpb25Db2xvcjsKLSAgICBpZiAoIWFjdGl2ZVNlbGVj dGlvbkNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgYWN0aXZlU2VsZWN0aW9uQ29sb3IgPSBwbGF0 Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdoaXRlKCk7Ci0g ICAgcmV0dXJuIGFjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIGlmICghbV9hY3RpdmVTZWxlY3Rp b25Db2xvci5pc1ZhbGlkKCkpCisgICAgICAgIG1fYWN0aXZlU2VsZWN0aW9uQ29sb3IgPSBwbGF0 Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdoaXRlKCk7Cisg ICAgcmV0dXJuIG1fYWN0aXZlU2VsZWN0aW9uQ29sb3I7CiB9CiAKIENvbG9yIFJlbmRlclRoZW1l OjppbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0CiB7Ci0gICAgc3RhdGlj IENvbG9yIGluYWN0aXZlU2VsZWN0aW9uQ29sb3I7Ci0gICAgaWYgKCFpbmFjdGl2ZVNlbGVjdGlv bkNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgaW5hY3RpdmVTZWxlY3Rpb25Db2xvciA9IHBsYXRm b3JtSW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKS5ibGVuZFdpdGhXaGl0ZSgpOwot ICAgIHJldHVybiBpbmFjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIGlmICghbV9pbmFjdGl2ZVNl bGVjdGlvbkNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgbV9pbmFjdGl2ZVNlbGVjdGlvbkNvbG9y ID0gcGxhdGZvcm1JbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdo aXRlKCk7CisgICAgcmV0dXJuIG1faW5hY3RpdmVTZWxlY3Rpb25Db2xvcjsKIH0KIAogQ29sb3Ig UmVuZGVyVGhlbWU6OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29u c3QKQEAgLTQ2OSw0ICs0NjcsMTAgQEAgdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U2VhcmNoRmll bGRSZXN1bAogewogfQogCit2b2lkIFJlbmRlclRoZW1lOjpwbGF0Zm9ybUNvbG9yc0RpZENoYW5n ZSgpCit7CisgICAgbV9hY3RpdmVTZWxlY3Rpb25Db2xvciA9IENvbG9yKCk7CisgICAgbV9pbmFj dGl2ZVNlbGVjdGlvbkNvbG9yID0gQ29sb3IoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCShyZXZpc2lvbiAyMTE5OSkKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNSw2ICsxMTUs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDb2xvciBpbmFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25C YWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKICAgICB2aXJ0dWFsIENvbG9yIGluYWN0aXZlTGlzdEJv eFNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0OwogCisgICAgdm9pZCBwbGF0Zm9ybUNv bG9yc0RpZENoYW5nZSgpOworCiAgICAgLy8gU3lzdGVtIGZvbnRzLgogICAgIHZpcnR1YWwgdm9p ZCBzeXN0ZW1Gb250KGludCBwcm9wSWQsIEZvbnREZXNjcmlwdGlvbiYpIGNvbnN0ID0gMDsKIApA QCAtMTc3LDYgKzE3OSwxMCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0 eWxlKiwgRWxlbWVudCopIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxk UmVzdWx0c0J1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKSB7IHJldHVybiB0cnVlOyB9CisKK3ByaXZhdGU6CisgICAgbXV0 YWJsZSBDb2xvciBtX2FjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIG11dGFibGUgQ29sb3IgbV9p bmFjdGl2ZVNlbGVjdGlvbkNvbG9yOwogfTsKIAogLy8gRnVuY3Rpb24gdG8gb2J0YWluIHRoZSB0 aGVtZS4gIFRoaXMgaXMgaW1wbGVtZW50ZWQgaW4geW91ciBwbGF0Zm9ybS1zcGVjaWZpYyB0aGVt ZSBpbXBsZW1lbnRhdGlvbiB0byBoYW5kCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj LmgJKHJldmlzaW9uIDIxMTk5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu aAkod29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsMTMgQEAKICNkZWZpbmUgUmVuZGVyVGhlbWVN YWNfaAogCiAjaW1wb3J0ICJSZW5kZXJUaGVtZS5oIgorI2ltcG9ydCA8d3RmL1JldGFpblB0ci5o PgorCisjaWZkZWYgX19PQkpDX18KK0BjbGFzcyBXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRp b25PYnNlcnZlcjsKKyNlbHNlCitjbGFzcyBXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25P YnNlcnZlcjsKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTMyLDcgKzM5LDcg QEAgY2xhc3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBSZW5kZXJUaGVtZU1hYyA6IHB1YmxpYyBSZW5k ZXJUaGVtZSB7CiBwdWJsaWM6CiAgICAgUmVuZGVyVGhlbWVNYWMoKTsKLSAgICB2aXJ0dWFsIH5S ZW5kZXJUaGVtZU1hYygpIHsgLyogSGF2ZSB0byBqdXN0IGxlYWsgdGhlIGNlbGxzLCBzaW5jZSBz dGF0aWNzIGFyZSBkZXN0cm95ZWQgd2l0aCBubyBhdXRvcmVsZWFzZSBwb29sIGF2YWlsYWJsZSAq LyB9CisgICAgdmlydHVhbCB+UmVuZGVyVGhlbWVNYWMoKTsKIAogICAgIC8vIEEgbWV0aG9kIHRv IG9idGFpbiB0aGUgYmFzZWxpbmUgcG9zaXRpb24gZm9yIGEgImxlYWYiIGNvbnRyb2wuICBUaGlz IHdpbGwgb25seSBiZSB1c2VkIGlmIGEgYmFzZWxpbmUKICAgICAvLyBwb3NpdGlvbiBjYW5ub3Qg YmUgZGV0ZXJtaW5lZCBieSBleGFtaW5pbmcgY2hpbGQgY29udGVudC4gQ2hlY2tib3hlcyBhbmQg cmFkaW8gYnV0dG9ucyBhcmUgZXhhbXBsZXMgb2YKQEAgLTE3MSw2ICsxNzgsOCBAQCBwcml2YXRl OgogCiAgICAgYm9vbCBtX2lzU2xpZGVyVGh1bWJIb3Jpem9udGFsUHJlc3NlZDsKICAgICBib29s IG1faXNTbGlkZXJUaHVtYlZlcnRpY2FsUHJlc3NlZDsKKworICAgIFJldGFpblB0cjxXZWJDb3Jl UmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlcj4gbV9ub3RpZmljYXRpb25PYnNlcnZlcjsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLm1tCShyZXZpc2lvbiAyMTE5OSkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSwzNCBAQAogCiAvLyBUaGUgbWV0 aG9kcyBpbiB0aGlzIGZpbGUgYXJlIHNwZWNpZmljIHRvIHRoZSBNYWMgT1MgWCBwbGF0Zm9ybS4K IAorQGludGVyZmFjZSBXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlciA6IE5T T2JqZWN0Cit7CisgICAgV2ViQ29yZTo6UmVuZGVyVGhlbWUgKl90aGVtZTsKK30KKworLSAoaWQp aW5pdFdpdGhUaGVtZTooV2ViQ29yZTo6UmVuZGVyVGhlbWUgKil0aGVtZTsKKy0gKHZvaWQpc3lz dGVtQ29sb3JzRGlkQ2hhbmdlOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbjsKKworQGVu ZAorCitAaW1wbGVtZW50YXRpb24gV2ViQ29yZVJlbmRlclRoZW1lTm90aWZpY2F0aW9uT2JzZXJ2 ZXIKKworLSAoaWQpaW5pdFdpdGhUaGVtZTooV2ViQ29yZTo6UmVuZGVyVGhlbWUgKil0aGVtZQor eworICAgIFtzdXBlciBpbml0XTsKKyAgICBfdGhlbWUgPSB0aGVtZTsKKyAgICAKKyAgICByZXR1 cm4gc2VsZjsKK30KKworLSAodm9pZClzeXN0ZW1Db2xvcnNEaWRDaGFuZ2U6KE5TTm90aWZpY2F0 aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgQVNTRVJUKFtbbm90aWZpY2F0aW9uIG5hbWVdIGlz RXF1YWxUb1N0cmluZzpOU1N5c3RlbUNvbG9yc0RpZENoYW5nZU5vdGlmaWNhdGlvbl0pOworICAg IF90aGVtZS0+cGxhdGZvcm1Db2xvcnNEaWRDaGFuZ2UoKTsKK30KKworQGVuZAorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGVudW0gewpAQCAtNzQsNyArMTAyLDE5IEBAIFJlbmRlclRoZW1lTWFj OjpSZW5kZXJUaGVtZU1hYygpCiAgICAgLCBtX3Jlc2l6ZUNvcm5lckltYWdlKDApCiAgICAgLCBt X2lzU2xpZGVyVGh1bWJIb3Jpem9udGFsUHJlc3NlZChmYWxzZSkKICAgICAsIG1faXNTbGlkZXJU aHVtYlZlcnRpY2FsUHJlc3NlZChmYWxzZSkKKyAgICAsIG1fbm90aWZpY2F0aW9uT2JzZXJ2ZXIo QWRvcHROUywgW1tXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlciBhbGxvY10g aW5pdFdpdGhUaGVtZTp0aGlzXSkKIHsKKyAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1 bHRDZW50ZXJdIGFkZE9ic2VydmVyOm1fbm90aWZpY2F0aW9uT2JzZXJ2ZXIuZ2V0KCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0 b3I6QHNlbGVjdG9yKHN5c3RlbUNvbG9yc0RpZENoYW5nZTopCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lOk5TU3lzdGVtQ29s b3JzRGlkQ2hhbmdlTm90aWZpY2F0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om5pbF07Cit9CisKK1JlbmRlclRoZW1l TWFjOjp+UmVuZGVyVGhlbWVNYWMoKQoreworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVm YXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6bV9ub3RpZmljYXRpb25PYnNlcnZlci5nZXQoKV07 CisKKyAgICAvKiBIYXZlIHRvIGp1c3QgbGVhayB0aGUgY2VsbHMsIHNpbmNlIHN0YXRpY3MgYXJl IGRlc3Ryb3llZCB3aXRoIG5vIGF1dG9yZWxlYXNlIHBvb2wgYXZhaWxhYmxlICovCiB9CiAKIENv bG9yIFJlbmRlclRoZW1lTWFjOjpwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xv cigpIGNvbnN0Cg== 14358 2007-05-05 09:44:58 -0700 2007-05-05 15:15:29 -0700 proposed fix 13304r2_patch.txt text/plain 12340 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTI3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDctMDUtMDUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzA0CisgICAgICAgIFJF R1JFU1NJT04oMTQ3ODQpOiBXZWJLaXQgZG9lc24ndCBkeW5hbWljYWxseSByZWZsZWN0IGNoYW5n ZXMgdG8gdGhlIGhpZ2hsaWdodCBjb2xvciBpbiBTeXN0ZW0gUHJlZmVyZW5jZXMKKworICAgICAg ICBJbXBsZW1lbnRlZCBhIG5vdGlmaWNhdGlvbiBvYnNlcnZlciB0aGF0IGludmFsaWRhdGVzIGNh Y2hlZCBzeXN0ZW0gY29sb3JzLgorCisgICAgICAgIE5vIGF1dG9tYXRlZCB0ZXN0IHBvc3NpYmxl LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lOjphY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OmluYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpwbGF0Zm9ybUNvbG9yc0RpZENoYW5n ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tOgorICAgICAgICAoLVtXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlciBp bml0V2l0aFRoZW1lOldlYkNvcmU6Ol0pOgorICAgICAgICAoLVtXZWJDb3JlUmVuZGVyVGhlbWVO b3RpZmljYXRpb25PYnNlcnZlciBzeXN0ZW1Db2xvcnNEaWRDaGFuZ2U6XSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6UmVuZGVyVGhlbWVNYWMpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVNYWM6On5SZW5kZXJUaGVtZU1hYyk6CisKIDIwMDctMDUtMDUgIFJvYiBC dWlzICA8YnVpc0BrZGUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlci4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAJKHJldmlzaW9uIDIxMjcyKQorKysgV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTgsMTggKzIxOCwx NiBAQCBib29sIFJlbmRlclRoZW1lOjpwYWludERlY29yYXRpb25zKFJlbmRlCiAKIENvbG9yIFJl bmRlclRoZW1lOjphY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdAogewotICAg IHN0YXRpYyBDb2xvciBhY3RpdmVTZWxlY3Rpb25Db2xvcjsKLSAgICBpZiAoIWFjdGl2ZVNlbGVj dGlvbkNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgYWN0aXZlU2VsZWN0aW9uQ29sb3IgPSBwbGF0 Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdoaXRlKCk7Ci0g ICAgcmV0dXJuIGFjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIGlmICghbV9hY3RpdmVTZWxlY3Rp b25Db2xvci5pc1ZhbGlkKCkpCisgICAgICAgIG1fYWN0aXZlU2VsZWN0aW9uQ29sb3IgPSBwbGF0 Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdoaXRlKCk7Cisg ICAgcmV0dXJuIG1fYWN0aXZlU2VsZWN0aW9uQ29sb3I7CiB9CiAKIENvbG9yIFJlbmRlclRoZW1l OjppbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0CiB7Ci0gICAgc3RhdGlj IENvbG9yIGluYWN0aXZlU2VsZWN0aW9uQ29sb3I7Ci0gICAgaWYgKCFpbmFjdGl2ZVNlbGVjdGlv bkNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgaW5hY3RpdmVTZWxlY3Rpb25Db2xvciA9IHBsYXRm b3JtSW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKS5ibGVuZFdpdGhXaGl0ZSgpOwot ICAgIHJldHVybiBpbmFjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIGlmICghbV9pbmFjdGl2ZVNl bGVjdGlvbkNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgbV9pbmFjdGl2ZVNlbGVjdGlvbkNvbG9y ID0gcGxhdGZvcm1JbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpLmJsZW5kV2l0aFdo aXRlKCk7CisgICAgcmV0dXJuIG1faW5hY3RpdmVTZWxlY3Rpb25Db2xvcjsKIH0KIAogQ29sb3Ig UmVuZGVyVGhlbWU6OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29u c3QKQEAgLTQ2OSw0ICs0NjcsMTAgQEAgdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U2VhcmNoRmll bGRSZXN1bAogewogfQogCit2b2lkIFJlbmRlclRoZW1lOjpwbGF0Zm9ybUNvbG9yc0RpZENoYW5n ZSgpCit7CisgICAgbV9hY3RpdmVTZWxlY3Rpb25Db2xvciA9IENvbG9yKCk7CisgICAgbV9pbmFj dGl2ZVNlbGVjdGlvbkNvbG9yID0gQ29sb3IoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCShyZXZpc2lvbiAyMTI3MikKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNSw2ICsxMTUs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDb2xvciBpbmFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25C YWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKICAgICB2aXJ0dWFsIENvbG9yIGluYWN0aXZlTGlzdEJv eFNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0OwogCisgICAgdm9pZCBwbGF0Zm9ybUNv bG9yc0RpZENoYW5nZSgpOworCiAgICAgLy8gU3lzdGVtIGZvbnRzLgogICAgIHZpcnR1YWwgdm9p ZCBzeXN0ZW1Gb250KGludCBwcm9wSWQsIEZvbnREZXNjcmlwdGlvbiYpIGNvbnN0ID0gMDsKIApA QCAtMTc3LDYgKzE3OSwxMCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0 eWxlKiwgRWxlbWVudCopIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxk UmVzdWx0c0J1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKSB7IHJldHVybiB0cnVlOyB9CisKK3ByaXZhdGU6CisgICAgbXV0 YWJsZSBDb2xvciBtX2FjdGl2ZVNlbGVjdGlvbkNvbG9yOworICAgIG11dGFibGUgQ29sb3IgbV9p bmFjdGl2ZVNlbGVjdGlvbkNvbG9yOwogfTsKIAogLy8gRnVuY3Rpb24gdG8gb2J0YWluIHRoZSB0 aGVtZS4gIFRoaXMgaXMgaW1wbGVtZW50ZWQgaW4geW91ciBwbGF0Zm9ybS1zcGVjaWZpYyB0aGVt ZSBpbXBsZW1lbnRhdGlvbiB0byBoYW5kCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj LmgJKHJldmlzaW9uIDIxMjcyKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu aAkod29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsMTMgQEAKICNkZWZpbmUgUmVuZGVyVGhlbWVN YWNfaAogCiAjaW1wb3J0ICJSZW5kZXJUaGVtZS5oIgorI2ltcG9ydCA8d3RmL1JldGFpblB0ci5o PgorCisjaWZkZWYgX19PQkpDX18KK0BjbGFzcyBXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRp b25PYnNlcnZlcjsKKyNlbHNlCitjbGFzcyBXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmljYXRpb25P YnNlcnZlcjsKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTMyLDcgKzM5LDcg QEAgY2xhc3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBSZW5kZXJUaGVtZU1hYyA6IHB1YmxpYyBSZW5k ZXJUaGVtZSB7CiBwdWJsaWM6CiAgICAgUmVuZGVyVGhlbWVNYWMoKTsKLSAgICB2aXJ0dWFsIH5S ZW5kZXJUaGVtZU1hYygpIHsgLyogSGF2ZSB0byBqdXN0IGxlYWsgdGhlIGNlbGxzLCBzaW5jZSBz dGF0aWNzIGFyZSBkZXN0cm95ZWQgd2l0aCBubyBhdXRvcmVsZWFzZSBwb29sIGF2YWlsYWJsZSAq LyB9CisgICAgdmlydHVhbCB+UmVuZGVyVGhlbWVNYWMoKTsKIAogICAgIC8vIEEgbWV0aG9kIHRv IG9idGFpbiB0aGUgYmFzZWxpbmUgcG9zaXRpb24gZm9yIGEgImxlYWYiIGNvbnRyb2wuICBUaGlz IHdpbGwgb25seSBiZSB1c2VkIGlmIGEgYmFzZWxpbmUKICAgICAvLyBwb3NpdGlvbiBjYW5ub3Qg YmUgZGV0ZXJtaW5lZCBieSBleGFtaW5pbmcgY2hpbGQgY29udGVudC4gQ2hlY2tib3hlcyBhbmQg cmFkaW8gYnV0dG9ucyBhcmUgZXhhbXBsZXMgb2YKQEAgLTE2MCwxNyArMTY3LDE5IEBAIHByaXZh dGU6CiAgICAgSW1hZ2UqIHJlc2l6ZUNvcm5lckltYWdlKCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0g ICAgbXV0YWJsZSBOU0J1dHRvbkNlbGwqIG1fY2hlY2tib3g7Ci0gICAgbXV0YWJsZSBOU0J1dHRv bkNlbGwqIG1fcmFkaW87Ci0gICAgbXV0YWJsZSBOU0J1dHRvbkNlbGwqIG1fYnV0dG9uOwotICAg IG11dGFibGUgTlNQb3BVcEJ1dHRvbkNlbGwqIG1fcG9wdXBCdXR0b247Ci0gICAgbXV0YWJsZSBO U1NlYXJjaEZpZWxkQ2VsbCogbV9zZWFyY2g7Ci0gICAgbXV0YWJsZSBOU1NsaWRlckNlbGwqIG1f c2xpZGVyVGh1bWJIb3Jpem9udGFsOwotICAgIG11dGFibGUgTlNTbGlkZXJDZWxsKiBtX3NsaWRl clRodW1iVmVydGljYWw7CisgICAgbXV0YWJsZSBSZXRhaW5QdHI8TlNCdXR0b25DZWxsPiBtX2No ZWNrYm94OworICAgIG11dGFibGUgUmV0YWluUHRyPE5TQnV0dG9uQ2VsbD4gbV9yYWRpbzsKKyAg ICBtdXRhYmxlIFJldGFpblB0cjxOU0J1dHRvbkNlbGw+IG1fYnV0dG9uOworICAgIG11dGFibGUg UmV0YWluUHRyPE5TUG9wVXBCdXR0b25DZWxsPiBtX3BvcHVwQnV0dG9uOworICAgIG11dGFibGUg UmV0YWluUHRyPE5TU2VhcmNoRmllbGRDZWxsPiBtX3NlYXJjaDsKKyAgICBtdXRhYmxlIFJldGFp blB0cjxOU1NsaWRlckNlbGw+IG1fc2xpZGVyVGh1bWJIb3Jpem9udGFsOworICAgIG11dGFibGUg UmV0YWluUHRyPE5TU2xpZGVyQ2VsbD4gbV9zbGlkZXJUaHVtYlZlcnRpY2FsOwogICAgIG11dGFi bGUgSW1hZ2UqIG1fcmVzaXplQ29ybmVySW1hZ2U7CiAKICAgICBib29sIG1faXNTbGlkZXJUaHVt Ykhvcml6b250YWxQcmVzc2VkOwogICAgIGJvb2wgbV9pc1NsaWRlclRodW1iVmVydGljYWxQcmVz c2VkOworCisgICAgUmV0YWluUHRyPFdlYkNvcmVSZW5kZXJUaGVtZU5vdGlmaWNhdGlvbk9ic2Vy dmVyPiBtX25vdGlmaWNhdGlvbk9ic2VydmVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0JKHJldmlzaW9uIDIxMjcyKQor KysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTQxLDYgKzQxLDM0IEBACiAKIC8vIFRoZSBtZXRob2RzIGluIHRoaXMgZmlsZSBhcmUgc3BlY2lm aWMgdG8gdGhlIE1hYyBPUyBYIHBsYXRmb3JtLgogCitAaW50ZXJmYWNlIFdlYkNvcmVSZW5kZXJU aGVtZU5vdGlmaWNhdGlvbk9ic2VydmVyIDogTlNPYmplY3QKK3sKKyAgICBXZWJDb3JlOjpSZW5k ZXJUaGVtZSAqX3RoZW1lOworfQorCistIChpZClpbml0V2l0aFRoZW1lOihXZWJDb3JlOjpSZW5k ZXJUaGVtZSAqKXRoZW1lOworLSAodm9pZClzeXN0ZW1Db2xvcnNEaWRDaGFuZ2U6KE5TTm90aWZp Y2F0aW9uICopbm90aWZpY2F0aW9uOworCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXZWJDb3Jl UmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlcgorCistIChpZClpbml0V2l0aFRoZW1lOihX ZWJDb3JlOjpSZW5kZXJUaGVtZSAqKXRoZW1lCit7CisgICAgW3N1cGVyIGluaXRdOworICAgIF90 aGVtZSA9IHRoZW1lOworICAgIAorICAgIHJldHVybiBzZWxmOworfQorCistICh2b2lkKXN5c3Rl bUNvbG9yc0RpZENoYW5nZTooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBB U1NFUlQoW1tub3RpZmljYXRpb24gbmFtZV0gaXNFcXVhbFRvU3RyaW5nOk5TU3lzdGVtQ29sb3Jz RGlkQ2hhbmdlTm90aWZpY2F0aW9uXSk7CisgICAgX3RoZW1lLT5wbGF0Zm9ybUNvbG9yc0RpZENo YW5nZSgpOworfQorCitAZW5kCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogZW51bSB7CkBAIC01 OSwyMiArODcsMjggQEAgZW51bSB7CiAKIFJlbmRlclRoZW1lKiB0aGVtZSgpCiB7Ci0gICAgc3Rh dGljIFJlbmRlclRoZW1lTWFjIG1hY1RoZW1lOwotICAgIHJldHVybiAmbWFjVGhlbWU7CisgICAg c3RhdGljIFJlbmRlclRoZW1lTWFjKiBtYWNUaGVtZTsKKyAgICBpZiAoIW1hY1RoZW1lKQorICAg ICAgICBtYWNUaGVtZSA9IG5ldyBSZW5kZXJUaGVtZU1hYzsKKyAgICByZXR1cm4gbWFjVGhlbWU7 CiB9CiAKIFJlbmRlclRoZW1lTWFjOjpSZW5kZXJUaGVtZU1hYygpCi0gICAgOiBtX2NoZWNrYm94 KG5pbCkKLSAgICAsIG1fcmFkaW8obmlsKQotICAgICwgbV9idXR0b24obmlsKQotICAgICwgbV9w b3B1cEJ1dHRvbihuaWwpCi0gICAgLCBtX3NlYXJjaChuaWwpCi0gICAgLCBtX3NsaWRlclRodW1i SG9yaXpvbnRhbChuaWwpCi0gICAgLCBtX3NsaWRlclRodW1iVmVydGljYWwobmlsKQotICAgICwg bV9yZXNpemVDb3JuZXJJbWFnZSgwKQorICAgIDogbV9yZXNpemVDb3JuZXJJbWFnZSgwKQogICAg ICwgbV9pc1NsaWRlclRodW1iSG9yaXpvbnRhbFByZXNzZWQoZmFsc2UpCiAgICAgLCBtX2lzU2xp ZGVyVGh1bWJWZXJ0aWNhbFByZXNzZWQoZmFsc2UpCisgICAgLCBtX25vdGlmaWNhdGlvbk9ic2Vy dmVyKEFkb3B0TlMsIFtbV2ViQ29yZVJlbmRlclRoZW1lTm90aWZpY2F0aW9uT2JzZXJ2ZXIgYWxs b2NdIGluaXRXaXRoVGhlbWU6dGhpc10pCit7CisgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBk ZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjptX25vdGlmaWNhdGlvbk9ic2VydmVyLmdldCgpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNl bGVjdG9yOkBzZWxlY3RvcihzeXN0ZW1Db2xvcnNEaWRDaGFuZ2U6KQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFtZTpOU1N5c3Rl bUNvbG9yc0RpZENoYW5nZU5vdGlmaWNhdGlvbgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdDpuaWxdOworfQorCitSZW5kZXJU aGVtZU1hYzo6flJlbmRlclRoZW1lTWFjKCkKIHsKKyAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVy IGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOm1fbm90aWZpY2F0aW9uT2JzZXJ2ZXIuZ2V0 KCldOworICAgIGRlbGV0ZSBtX3Jlc2l6ZUNvcm5lckltYWdlOwogfQogCiBDb2xvciBSZW5kZXJU aGVtZU1hYzo6cGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdApA QCAtMTIwNyw4NSArMTI0MSw4NSBAQCBib29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNlYXJjaEZp ZWxkUmVzCiBOU0J1dHRvbkNlbGwqIFJlbmRlclRoZW1lTWFjOjpjaGVja2JveCgpIGNvbnN0CiB7 CiAgICAgaWYgKCFtX2NoZWNrYm94KSB7Ci0gICAgICAgIG1fY2hlY2tib3ggPSBIYXJkUmV0YWlu V2l0aE5TUmVsZWFzZShbW05TQnV0dG9uQ2VsbCBhbGxvY10gaW5pdF0pOwotICAgICAgICBbbV9j aGVja2JveCBzZXRCdXR0b25UeXBlOk5TU3dpdGNoQnV0dG9uXTsKLSAgICAgICAgW21fY2hlY2ti b3ggc2V0VGl0bGU6bmlsXTsKLSAgICAgICAgW21fY2hlY2tib3ggc2V0QWxsb3dzTWl4ZWRTdGF0 ZTpZRVNdOworICAgICAgICBtX2NoZWNrYm94LmFkb3B0TlMoW1tOU0J1dHRvbkNlbGwgYWxsb2Nd IGluaXRdKTsKKyAgICAgICAgW21fY2hlY2tib3guZ2V0KCkgc2V0QnV0dG9uVHlwZTpOU1N3aXRj aEJ1dHRvbl07CisgICAgICAgIFttX2NoZWNrYm94LmdldCgpIHNldFRpdGxlOm5pbF07CisgICAg ICAgIFttX2NoZWNrYm94LmdldCgpIHNldEFsbG93c01peGVkU3RhdGU6WUVTXTsKICAgICB9CiAg ICAgCi0gICAgcmV0dXJuIG1fY2hlY2tib3g7CisgICAgcmV0dXJuIG1fY2hlY2tib3guZ2V0KCk7 CiB9CiAKIE5TQnV0dG9uQ2VsbCogUmVuZGVyVGhlbWVNYWM6OnJhZGlvKCkgY29uc3QKIHsKICAg ICBpZiAoIW1fcmFkaW8pIHsKLSAgICAgICAgbV9yYWRpbyA9IEhhcmRSZXRhaW5XaXRoTlNSZWxl YXNlKFtbTlNCdXR0b25DZWxsIGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIFttX3JhZGlvIHNldEJ1 dHRvblR5cGU6TlNSYWRpb0J1dHRvbl07Ci0gICAgICAgIFttX3JhZGlvIHNldFRpdGxlOm5pbF07 CisgICAgICAgIG1fcmFkaW8uYWRvcHROUyhbW05TQnV0dG9uQ2VsbCBhbGxvY10gaW5pdF0pOwor ICAgICAgICBbbV9yYWRpby5nZXQoKSBzZXRCdXR0b25UeXBlOk5TUmFkaW9CdXR0b25dOworICAg ICAgICBbbV9yYWRpby5nZXQoKSBzZXRUaXRsZTpuaWxdOwogICAgIH0KICAgICAKLSAgICByZXR1 cm4gbV9yYWRpbzsKKyAgICByZXR1cm4gbV9yYWRpby5nZXQoKTsKIH0KIAogTlNCdXR0b25DZWxs KiBSZW5kZXJUaGVtZU1hYzo6YnV0dG9uKCkgY29uc3QKIHsKICAgICBpZiAoIW1fYnV0dG9uKSB7 Ci0gICAgICAgIG1fYnV0dG9uID0gSGFyZFJldGFpbldpdGhOU1JlbGVhc2UoW1tOU0J1dHRvbkNl bGwgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgW21fYnV0dG9uIHNldFRpdGxlOm5pbF07Ci0gICAg ICAgIFttX2J1dHRvbiBzZXRCdXR0b25UeXBlOk5TTW9tZW50YXJ5UHVzaEluQnV0dG9uXTsKKyAg ICAgICAgbV9idXR0b24uYWRvcHROUyhbW05TQnV0dG9uQ2VsbCBhbGxvY10gaW5pdF0pOworICAg ICAgICBbbV9idXR0b24uZ2V0KCkgc2V0VGl0bGU6bmlsXTsKKyAgICAgICAgW21fYnV0dG9uLmdl dCgpIHNldEJ1dHRvblR5cGU6TlNNb21lbnRhcnlQdXNoSW5CdXR0b25dOwogICAgIH0KICAgICAK LSAgICByZXR1cm4gbV9idXR0b247CisgICAgcmV0dXJuIG1fYnV0dG9uLmdldCgpOwogfQogCiBO U1BvcFVwQnV0dG9uQ2VsbCogUmVuZGVyVGhlbWVNYWM6OnBvcHVwQnV0dG9uKCkgY29uc3QKIHsK ICAgICBpZiAoIW1fcG9wdXBCdXR0b24pIHsKLSAgICAgICAgbV9wb3B1cEJ1dHRvbiA9IEhhcmRS ZXRhaW5XaXRoTlNSZWxlYXNlKFtbTlNQb3BVcEJ1dHRvbkNlbGwgYWxsb2NdIGluaXRUZXh0Q2Vs bDpAIiIgcHVsbHNEb3duOk5PXSk7Ci0gICAgICAgIFttX3BvcHVwQnV0dG9uIHNldFVzZXNJdGVt RnJvbU1lbnU6Tk9dOworICAgICAgICBtX3BvcHVwQnV0dG9uLmFkb3B0TlMoW1tOU1BvcFVwQnV0 dG9uQ2VsbCBhbGxvY10gaW5pdFRleHRDZWxsOkAiIiBwdWxsc0Rvd246Tk9dKTsKKyAgICAgICAg W21fcG9wdXBCdXR0b24uZ2V0KCkgc2V0VXNlc0l0ZW1Gcm9tTWVudTpOT107CiAgICAgfQogICAg IAotICAgIHJldHVybiBtX3BvcHVwQnV0dG9uOworICAgIHJldHVybiBtX3BvcHVwQnV0dG9uLmdl dCgpOwogfQogCiBOU1NlYXJjaEZpZWxkQ2VsbCogUmVuZGVyVGhlbWVNYWM6OnNlYXJjaCgpIGNv bnN0CiB7CiAgICAgaWYgKCFtX3NlYXJjaCkgewotICAgICAgICBtX3NlYXJjaCA9IEhhcmRSZXRh aW5XaXRoTlNSZWxlYXNlKFtbTlNTZWFyY2hGaWVsZENlbGwgYWxsb2NdIGluaXRUZXh0Q2VsbDpA IiJdKTsKLSAgICAgICAgW21fc2VhcmNoIHNldEJlemVsU3R5bGU6TlNUZXh0RmllbGRSb3VuZGVk QmV6ZWxdOwotICAgICAgICBbbV9zZWFyY2ggc2V0QmV6ZWxlZDpZRVNdOwotICAgICAgICBbbV9z ZWFyY2ggc2V0RWRpdGFibGU6WUVTXTsKKyAgICAgICAgbV9zZWFyY2guYWRvcHROUyhbW05TU2Vh cmNoRmllbGRDZWxsIGFsbG9jXSBpbml0VGV4dENlbGw6QCIiXSk7CisgICAgICAgIFttX3NlYXJj aC5nZXQoKSBzZXRCZXplbFN0eWxlOk5TVGV4dEZpZWxkUm91bmRlZEJlemVsXTsKKyAgICAgICAg W21fc2VhcmNoLmdldCgpIHNldEJlemVsZWQ6WUVTXTsKKyAgICAgICAgW21fc2VhcmNoLmdldCgp IHNldEVkaXRhYmxlOllFU107CiAgICAgICAgIAogICAgICAgICBOU01lbnUqIHNlYXJjaE1lbnVU ZW1wbGF0ZSA9IFtbTlNNZW51IGFsbG9jXSBpbml0V2l0aFRpdGxlOkAiIl07Ci0gICAgICAgIFtt X3NlYXJjaCBzZXRTZWFyY2hNZW51VGVtcGxhdGU6c2VhcmNoTWVudVRlbXBsYXRlXTsKKyAgICAg ICAgW21fc2VhcmNoLmdldCgpIHNldFNlYXJjaE1lbnVUZW1wbGF0ZTpzZWFyY2hNZW51VGVtcGxh dGVdOwogICAgICAgICBbc2VhcmNoTWVudVRlbXBsYXRlIHJlbGVhc2VdOwogICAgIH0KIAotICAg IHJldHVybiBtX3NlYXJjaDsKKyAgICByZXR1cm4gbV9zZWFyY2guZ2V0KCk7CiB9CiAKIE5TU2xp ZGVyQ2VsbCogUmVuZGVyVGhlbWVNYWM6OnNsaWRlclRodW1iSG9yaXpvbnRhbCgpIGNvbnN0CiB7 CiAgICAgaWYgKCFtX3NsaWRlclRodW1iSG9yaXpvbnRhbCkgewotICAgICAgICBtX3NsaWRlclRo dW1iSG9yaXpvbnRhbCA9IEhhcmRSZXRhaW5XaXRoTlNSZWxlYXNlKFtbTlNTbGlkZXJDZWxsIGFs bG9jXSBpbml0XSk7Ci0gICAgICAgIFttX3NsaWRlclRodW1iSG9yaXpvbnRhbCBzZXRUaXRsZTpu aWxdOwotICAgICAgICBbbV9zbGlkZXJUaHVtYkhvcml6b250YWwgc2V0U2xpZGVyVHlwZTpOU0xp bmVhclNsaWRlcl07Ci0gICAgICAgIFttX3NsaWRlclRodW1iSG9yaXpvbnRhbCBzZXRDb250cm9s U2l6ZTpOU1NtYWxsQ29udHJvbFNpemVdOworICAgICAgICBtX3NsaWRlclRodW1iSG9yaXpvbnRh bC5hZG9wdE5TKFtbTlNTbGlkZXJDZWxsIGFsbG9jXSBpbml0XSk7CisgICAgICAgIFttX3NsaWRl clRodW1iSG9yaXpvbnRhbC5nZXQoKSBzZXRUaXRsZTpuaWxdOworICAgICAgICBbbV9zbGlkZXJU aHVtYkhvcml6b250YWwuZ2V0KCkgc2V0U2xpZGVyVHlwZTpOU0xpbmVhclNsaWRlcl07CisgICAg ICAgIFttX3NsaWRlclRodW1iSG9yaXpvbnRhbC5nZXQoKSBzZXRDb250cm9sU2l6ZTpOU1NtYWxs Q29udHJvbFNpemVdOwogICAgIH0KICAgICAKLSAgICByZXR1cm4gbV9zbGlkZXJUaHVtYkhvcml6 b250YWw7CisgICAgcmV0dXJuIG1fc2xpZGVyVGh1bWJIb3Jpem9udGFsLmdldCgpOwogfQogCiBO U1NsaWRlckNlbGwqIFJlbmRlclRoZW1lTWFjOjpzbGlkZXJUaHVtYlZlcnRpY2FsKCkgY29uc3QK IHsKICAgICBpZiAoIW1fc2xpZGVyVGh1bWJWZXJ0aWNhbCkgewotICAgICAgICBtX3NsaWRlclRo dW1iVmVydGljYWwgPSBIYXJkUmV0YWluV2l0aE5TUmVsZWFzZShbW05TU2xpZGVyQ2VsbCBhbGxv Y10gaW5pdF0pOwotICAgICAgICBbbV9zbGlkZXJUaHVtYlZlcnRpY2FsIHNldFRpdGxlOm5pbF07 Ci0gICAgICAgIFttX3NsaWRlclRodW1iVmVydGljYWwgc2V0U2xpZGVyVHlwZTpOU0xpbmVhclNs aWRlcl07Ci0gICAgICAgIFttX3NsaWRlclRodW1iVmVydGljYWwgc2V0Q29udHJvbFNpemU6TlNT bWFsbENvbnRyb2xTaXplXTsKKyAgICAgICAgbV9zbGlkZXJUaHVtYlZlcnRpY2FsLmFkb3B0TlMo W1tOU1NsaWRlckNlbGwgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgW21fc2xpZGVyVGh1bWJWZXJ0 aWNhbC5nZXQoKSBzZXRUaXRsZTpuaWxdOworICAgICAgICBbbV9zbGlkZXJUaHVtYlZlcnRpY2Fs LmdldCgpIHNldFNsaWRlclR5cGU6TlNMaW5lYXJTbGlkZXJdOworICAgICAgICBbbV9zbGlkZXJU aHVtYlZlcnRpY2FsLmdldCgpIHNldENvbnRyb2xTaXplOk5TU21hbGxDb250cm9sU2l6ZV07CiAg ICAgfQogICAgIAotICAgIHJldHVybiBtX3NsaWRlclRodW1iVmVydGljYWw7CisgICAgcmV0dXJu IG1fc2xpZGVyVGh1bWJWZXJ0aWNhbC5nZXQoKTsKIH0KIAogSW1hZ2UqIFJlbmRlclRoZW1lTWFj OjpyZXNpemVDb3JuZXJJbWFnZSgpIGNvbnN0Cg==