58694 2011-04-15 14:21:23 -0700 Add the ability for PageOverlays to fade in and out 2011-04-15 18:20:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 386930 0 andersca 2011-04-15 14:21:23 -0700 Add the ability for PageOverlays to fade in and out 386936 1 89854 andersca 2011-04-15 14:28:34 -0700 Created attachment 89854 Patch 386937 2 89854 sam 2011-04-15 14:30:06 -0700 Comment on attachment 89854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89854&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:735 > +void WebPage::uninstallPageOverlay(PageOverlay* pageOverlay, bool fadeOut) I think this would read better as an enum. 386942 3 andersca 2011-04-15 14:36:18 -0700 Committed r84034: <http://trac.webkit.org/changeset/84034> 387124 4 webkit.review.bot 2011-04-15 18:20:39 -0700 http://trac.webkit.org/changeset/84034 might have broken GTK Linux 64-bit Debug The following tests are not passing: fast/html/details-add-summary-1-and-click.html fast/html/details-add-summary-1.html fast/html/details-add-summary-10-and-click.html fast/html/details-add-summary-10.html fast/html/details-add-summary-2-and-click.html fast/html/details-add-summary-2.html fast/html/details-add-summary-3-and-click.html fast/html/details-add-summary-3.html fast/html/details-add-summary-4-and-click.html fast/html/details-add-summary-4.html fast/html/details-add-summary-5-and-click.html fast/html/details-add-summary-5.html fast/html/details-add-summary-6-and-click.html fast/html/details-add-summary-6.html fast/html/details-add-summary-7-and-click.html fast/html/details-add-summary-7.html fast/html/details-add-summary-8-and-click.html fast/html/details-add-summary-8.html fast/html/details-add-summary-9-and-click.html fast/html/details-add-summary-9.html fast/html/details-no-summary1.html fast/html/details-no-summary2.html fast/html/details-no-summary3.html fast/html/details-no-summary4.html fast/html/details-open-javascript.html fast/html/details-open1.html fast/html/details-open2.html fast/html/details-open3.html fast/html/details-open4.html fast/html/details-open5.html fast/html/details-open6.html fast/html/details-position.html fast/html/details-remove-summary-1-and-click.html fast/html/details-remove-summary-1.html fast/html/details-remove-summary-2-and-click.html fast/html/details-remove-summary-2.html fast/html/details-remove-summary-3-and-click.html fast/html/details-remove-summary-3.html fast/html/details-remove-summary-4-and-click.html fast/html/details-remove-summary-4.html fast/html/details-remove-summary-5-and-click.html fast/html/details-remove-summary-5.html fast/html/details-remove-summary-6-and-click.html fast/html/details-remove-summary-6.html fast/html/details-writing-mode.html 89854 2011-04-15 14:28:34 -0700 2011-04-15 14:30:06 -0700 Patch bug-58694-20110415142833.patch text/plain 9455 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MDMzKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMDQtMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIGFiaWxpdHkgZm9yIFBhZ2VPdmVybGF5cyB0 byBmYWRlIGluIGFuZCBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU4Njk0CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZS5jcHA6CisgICAgICAgIChXS0J1bmRsZVBhZ2VVbmluc3RhbGxQYWdl T3ZlcmxheSk6CisgICAgICAgIFdlYlBhZ2U6OnVuaW5zdGFsbFBhZ2VPdmVybGF5IG5vdyB0YWtl cyBhIGJvb2xlYW4uIERlZmF1bHQgdG8gZmFsc2UgZm9yIG5vdy4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRD b250cm9sbGVyOjpmaW5kU3RyaW5nKToKKyAgICAgICAgUGFzcyBmYWxzZSB0byB1bmluc3RhbGxQ YWdlT3ZlcmxheS4KKworICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6aGlkZUZpbmRV SSk6CisgICAgICAgIFBhc3MgdHJ1ZSB0byB1bmluc3RhbGxQYWdlT3ZlcmxheS4KKyAgICAgICAg CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5KToKKyAgICAgICAgSW5pdGlhbGl6ZSBu ZXcgbWVtYmVyIHZhcmlhYmxlcy4KKworICAgICAgICAoV2ViS2l0OjpQYWdlT3ZlcmxheTo6Ym91 bmRzKToKKyAgICAgICAgR2V0IHJpZCBvZiBhbiB1bm5lY2Vzc2FyeSB3ZWJQYWdlKCkgZ2V0dGVy LgorCisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5OjpzZXRQYWdlKToKKyAgICAgICAgU3Rv cCB0aGUgYW5pbWF0aW9uIHRpbWVyLgorCisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5Ojpz dGFydEZhZGVJbkFuaW1hdGlvbik6CisgICAgICAgIFVwZGF0ZSBtX2ZyYWN0aW9uRmFkZWRJbiBh bmQgY2FsbCBzdGFydEZhZGVBbmltYXRpb24uCisKKyAgICAgICAgKFdlYktpdDo6UGFnZU92ZXJs YXk6OnN0YXJ0RmFkZU91dEFuaW1hdGlvbik6CisgICAgICAgIERpdHRvLgorICAgICAgICAKKyAg ICAgICAgKFdlYktpdDo6UGFnZU92ZXJsYXk6OnN0YXJ0RmFkZUFuaW1hdGlvbik6CisgICAgICAg IEluaXRpYWxpemUgbV9mYWRlQW5pbWF0aW9uU3RhcnRUaW1lIGFuZCBzdGFydCB0aGUgZmFkZSBh bmltYXRpb24gdGltZXIuCisKKyAgICAgICAgKFdlYktpdDo6UGFnZU92ZXJsYXk6OmZhZGVBbmlt YXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgVXBkYXRlIG1fZnJhY3Rpb25GYWRlZEluIGFuZCBj YWxsIHNldE5lZWRzRGlzcGxheSgpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1Bh Z2VPdmVybGF5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1bmluc3RhbGxQYWdlT3ZlcmxheSk6CisgICAgICAg IElmIGZhZGVPdXQgaXMgdHJ1ZSwgdGVsbCB0aGUgcGFnZSBvdmVybGF5IHRvIHN0YXJ0IHRoZSBm YWRlIG91dCBhbmltYXRpb24uCisgICAgICAgIFdoZW4gdGhlIGZhZGUgYW5pbWF0aW9uIGlzIGNv bXBsZXRlLCB0aGUgcGFnZSBvdmVybGF5IHdpbGwgdW5pbnN0YWxsIGl0c2VsZi4KKwogMjAxMS0w NC0xNSAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5j cHAJKHJldmlzaW9uIDgzOTg1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsNyAr MTc1LDcgQEAgdm9pZCBXS0J1bmRsZVBhZ2VJbnN0YWxsUGFnZU92ZXJsYXkoV0tCdQogCiB2b2lk IFdLQnVuZGxlUGFnZVVuaW5zdGFsbFBhZ2VPdmVybGF5KFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVm LCBXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5UmVmKQogewotICAgIHRvSW1wbChw YWdlUmVmKS0+dW5pbnN0YWxsUGFnZU92ZXJsYXkodG9JbXBsKHBhZ2VPdmVybGF5UmVmKSk7Cisg ICAgdG9JbXBsKHBhZ2VSZWYpLT51bmluc3RhbGxQYWdlT3ZlcmxheSh0b0ltcGwocGFnZU92ZXJs YXlSZWYpLCBmYWxzZSk7CiB9CiAKIGJvb2wgV0tCdW5kbGVQYWdlSGFzTG9jYWxEYXRhRm9yVVJM KFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVmLCBXS1VSTFJlZiB1cmxSZWYpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAJ KHJldmlzaW9uIDgzOTg1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Zp bmRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDcgKzEzMyw3IEBAIHZvaWQg RmluZENvbnRyb2xsZXI6OmZpbmRTdHJpbmcoY29uc3QgU3QKICAgICBpZiAoIXNob3VsZFNob3dP dmVybGF5KSB7CiAgICAgICAgIGlmIChtX2ZpbmRQYWdlT3ZlcmxheSkgewogICAgICAgICAgICAg Ly8gR2V0IHJpZCBvZiB0aGUgb3ZlcmxheS4KLSAgICAgICAgICAgIG1fd2ViUGFnZS0+dW5pbnN0 YWxsUGFnZU92ZXJsYXkobV9maW5kUGFnZU92ZXJsYXkpOworICAgICAgICAgICAgbV93ZWJQYWdl LT51bmluc3RhbGxQYWdlT3ZlcmxheShtX2ZpbmRQYWdlT3ZlcmxheSwgZmFsc2UpOwogICAgICAg ICB9CiAgICAgICAgIAogICAgICAgICBBU1NFUlQoIW1fZmluZFBhZ2VPdmVybGF5KTsKQEAgLTE1 Myw3ICsxNTMsNyBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0CiB2 b2lkIEZpbmRDb250cm9sbGVyOjpoaWRlRmluZFVJKCkKIHsKICAgICBpZiAobV9maW5kUGFnZU92 ZXJsYXkpCi0gICAgICAgIG1fd2ViUGFnZS0+dW5pbnN0YWxsUGFnZU92ZXJsYXkobV9maW5kUGFn ZU92ZXJsYXkpOworICAgICAgICBtX3dlYlBhZ2UtPnVuaW5zdGFsbFBhZ2VPdmVybGF5KG1fZmlu ZFBhZ2VPdmVybGF5LCB0cnVlKTsKIAogICAgIGhpZGVGaW5kSW5kaWNhdG9yKCk7CiB9CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5j cHAJKHJldmlzaW9uIDgzOTg1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1BhZ2VPdmVybGF5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1 ZGUgIlBhZ2VPdmVybGF5LmgiCiAKICNpbmNsdWRlICJXZWJQYWdlLmgiCisjaW5jbHVkZSAiV2Vi UHJvY2Vzcy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3Jl L0ZyYW1lVmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CkBAIC0z Nyw2ICszOCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAorc3RhdGljIGNvbnN0IGRvdWJsZSBmYWRlQW5pbWF0aW9uRHVyYXRpb24gPSAwLjI7Citz dGF0aWMgY29uc3QgZG91YmxlIGZhZGVBbmltYXRpb25GcmFtZVJhdGUgPSAzMDsKKwogUGFzc1Jl ZlB0cjxQYWdlT3ZlcmxheT4gUGFnZU92ZXJsYXk6OmNyZWF0ZShDbGllbnQqIGNsaWVudCkKIHsK ICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBhZ2VPdmVybGF5KGNsaWVudCkpOwpAQCAtNDUsNiAr NDksMTEgQEAgUGFzc1JlZlB0cjxQYWdlT3ZlcmxheT4gUGFnZU92ZXJsYXk6OmNyZQogUGFnZU92 ZXJsYXk6OlBhZ2VPdmVybGF5KENsaWVudCogY2xpZW50KQogICAgIDogbV9jbGllbnQoY2xpZW50 KQogICAgICwgbV93ZWJQYWdlKDApCisgICAgLCBtX2ZhZGVBbmltYXRpb25UaW1lcihXZWJQcm9j ZXNzOjpzaGFyZWQoKS5ydW5Mb29wKCksIHRoaXMsICZQYWdlT3ZlcmxheTo6ZmFkZUFuaW1hdGlv blRpbWVyRmlyZWQpCisgICAgLCBtX2ZhZGVBbmltYXRpb25TdGFydFRpbWUoMC4wKQorICAgICwg bV9mYWRlQW5pbWF0aW9uRHVyYXRpb24oZmFkZUFuaW1hdGlvbkR1cmF0aW9uKQorICAgICwgbV9p c0ZhZGluZ0luKGZhbHNlKQorICAgICwgbV9mcmFjdGlvbkZhZGVkSW4oMS4wKQogewogfQogCkBA IC01NCw3ICs2Myw3IEBAIFBhZ2VPdmVybGF5Ojp+UGFnZU92ZXJsYXkoKQogCiBJbnRSZWN0IFBh Z2VPdmVybGF5Ojpib3VuZHMoKSBjb25zdAogewotICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0g d2ViUGFnZSgpLT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpOworICAgIEZyYW1lVmll dyogZnJhbWVWaWV3ID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygp OwogCiAgICAgaW50IHdpZHRoID0gZnJhbWVWaWV3LT53aWR0aCgpOwogICAgIGludCBoZWlnaHQg PSBmcmFtZVZpZXctPmhlaWdodCgpOwpAQCAtNzMsNiArODIsMTEgQEAgdm9pZCBQYWdlT3Zlcmxh eTo6c2V0UGFnZShXZWJQYWdlKiB3ZWJQYQogICAgIG1fY2xpZW50LT53aWxsTW92ZVRvV2ViUGFn ZSh0aGlzLCB3ZWJQYWdlKTsKICAgICBtX3dlYlBhZ2UgPSB3ZWJQYWdlOwogICAgIG1fY2xpZW50 LT5kaWRNb3ZlVG9XZWJQYWdlKHRoaXMsIHdlYlBhZ2UpOworCisgICAgaWYgKG1fd2ViUGFnZSkK KyAgICAgICAgc2V0TmVlZHNEaXNwbGF5KCk7CisKKyAgICBtX2ZhZGVBbmltYXRpb25UaW1lci5z dG9wKCk7CiB9CiAKIHZvaWQgUGFnZU92ZXJsYXk6OnNldE5lZWRzRGlzcGxheShjb25zdCBJbnRS ZWN0JiBkaXJ0eVJlY3QpCkBAIC0xMTIsNCArMTI2LDUxIEBAIGJvb2wgUGFnZU92ZXJsYXk6Om1v dXNlRXZlbnQoY29uc3QgV2ViTW8KICAgICByZXR1cm4gbV9jbGllbnQtPm1vdXNlRXZlbnQodGhp cywgbW91c2VFdmVudCk7CiB9CiAKK3ZvaWQgUGFnZU92ZXJsYXk6OnN0YXJ0RmFkZUluQW5pbWF0 aW9uKCkKK3sKKyAgICBtX2ZyYWN0aW9uRmFkZWRJbiA9IDAuMDsKKyAgICBtX2lzRmFkaW5nSW4g PSB0cnVlOworCisgICAgc3RhcnRGYWRlQW5pbWF0aW9uKCk7Cit9CisKK3ZvaWQgUGFnZU92ZXJs YXk6OnN0YXJ0RmFkZU91dEFuaW1hdGlvbigpCit7CisgICAgbV9mcmFjdGlvbkZhZGVkSW4gPSAx LjA7CisgICAgbV9pc0ZhZGluZ0luID0gZmFsc2U7CisKKyAgICBzdGFydEZhZGVBbmltYXRpb24o KTsKK30KKwordm9pZCBQYWdlT3ZlcmxheTo6c3RhcnRGYWRlQW5pbWF0aW9uKCkKK3sKKyAgICBt X2ZhZGVBbmltYXRpb25TdGFydFRpbWUgPSBjdXJyZW50VGltZSgpOworICAgIAorICAgIC8vIFN0 YXJ0IHRoZSB0aW1lcgorICAgIG1fZmFkZUFuaW1hdGlvblRpbWVyLnN0YXJ0UmVwZWF0aW5nKDEg LyBmYWRlQW5pbWF0aW9uRnJhbWVSYXRlKTsKK30KKwordm9pZCBQYWdlT3ZlcmxheTo6ZmFkZUFu aW1hdGlvblRpbWVyRmlyZWQoKQoreworICAgIGZsb2F0IGFuaW1hdGlvblByb2dyZXNzID0gKGN1 cnJlbnRUaW1lKCkgLSBtX2ZhZGVBbmltYXRpb25TdGFydFRpbWUpIC8gbV9mYWRlQW5pbWF0aW9u RHVyYXRpb247CisKKyAgICBpZiAoYW5pbWF0aW9uUHJvZ3Jlc3MgPj0gMS4wKQorICAgICAgICBh bmltYXRpb25Qcm9ncmVzcyA9IDEuMDsKKworICAgIGRvdWJsZSBzaW5lID0gc2luKE1fUElfMiAq IGFuaW1hdGlvblByb2dyZXNzKTsKKyAgICBmbG9hdCBmYWRlQW5pbWF0aW9uVmFsdWUgPSBzaW5l ICogc2luZTsKKworICAgIG1fZnJhY3Rpb25GYWRlZEluID0gbV9pc0ZhZGluZ0luID8gZmFkZUFu aW1hdGlvblZhbHVlIDogMSAtIGZhZGVBbmltYXRpb25WYWx1ZTsKKyAgICBzZXROZWVkc0Rpc3Bs YXkoKTsKKworICAgIGlmIChhbmltYXRpb25Qcm9ncmVzcyA9PSAxLjApIHsKKyAgICAgICAgbV9m YWRlQW5pbWF0aW9uVGltZXIuc3RvcCgpOworCisgICAgICAgIGlmICghbV9pc0ZhZGluZ0luKSB7 CisgICAgICAgICAgICAvLyBJZiB0aGlzIHdhcyBhIGZhZGUgb3V0LCBnbyBhaGVhZCBhbmQgdW5p bnN0YWxsIHRoZSBwYWdlIG92ZXJsYXkuCisgICAgICAgICAgICBtX3dlYlBhZ2UtPnVuaW5zdGFs bFBhZ2VPdmVybGF5KHRoaXMsIGZhbHNlKTsKKyAgICAgICAgfQorICAgIH0KK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv UGFnZU92ZXJsYXkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvUGFnZU92ZXJsYXkuaAkocmV2aXNpb24gODM5ODUpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiAr MjcsNyBAQAogI2RlZmluZSBQYWdlT3ZlcmxheV9oCiAKICNpbmNsdWRlICJBUElPYmplY3QuaCIK KyNpbmNsdWRlICJSdW5Mb29wLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtNjUsMjAgKzY2LDMyIEBAIHB1YmxpYzoKICAgICB2b2lkIGRy YXdSZWN0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IGRpcnR5UmVjdCk7CiAgICAgYm9vbCBtb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsK IAorICAgIHZvaWQgc3RhcnRGYWRlSW5BbmltYXRpb24oKTsKKyAgICB2b2lkIHN0YXJ0RmFkZU91 dEFuaW1hdGlvbigpOworCisgICAgZmxvYXQgZnJhY3Rpb25GYWRlZEluKCkgY29uc3QgeyByZXR1 cm4gbV9mcmFjdGlvbkZhZGVkSW47IH0KKwogcHJvdGVjdGVkOgogICAgIGV4cGxpY2l0IFBhZ2VP dmVybGF5KENsaWVudCopOwogCi0gICAgV2ViUGFnZSogd2ViUGFnZSgpIGNvbnN0IHsgcmV0dXJu IG1fd2ViUGFnZTsgfQotCiBwcml2YXRlOgogICAgIC8vIEFQSU9iamVjdAogICAgIHZpcnR1YWwg VHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogCiAgICAgV2ViQ29yZTo6SW50 UmVjdCBib3VuZHMoKSBjb25zdDsKIAotICAgIENsaWVudCogbV9jbGllbnQ7CisgICAgdm9pZCBz dGFydEZhZGVBbmltYXRpb24oKTsKKyAgICB2b2lkIGZhZGVBbmltYXRpb25UaW1lckZpcmVkKCk7 CiAKKyAgICBDbGllbnQqIG1fY2xpZW50OwogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsKKworICAg IFJ1bkxvb3A6OlRpbWVyPFBhZ2VPdmVybGF5PiBtX2ZhZGVBbmltYXRpb25UaW1lcjsKKyAgICBk b3VibGUgbV9mYWRlQW5pbWF0aW9uU3RhcnRUaW1lOworICAgIGRvdWJsZSBtX2ZhZGVBbmltYXRp b25EdXJhdGlvbjsKKworICAgIGJvb2wgbV9pc0ZhZGluZ0luOworICAgIGZsb2F0IG1fZnJhY3Rp b25GYWRlZEluOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA4Mzk4NSkK KysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzI5LDE3ICs3MjksMTkgQEAgdm9pZCBXZWJQYWdlOjppbnN0YWxsUGFnZU92 ZXJsYXkoUGFzc1JlZgogCiAgICAgbV9wYWdlT3ZlcmxheSA9IHBhZ2VPdmVybGF5OwogICAgIG1f cGFnZU92ZXJsYXktPnNldFBhZ2UodGhpcyk7Ci0KICAgICBtX2RyYXdpbmdBcmVhLT5kaWRJbnN0 YWxsUGFnZU92ZXJsYXkoKTsKLQotICAgIG1fcGFnZU92ZXJsYXktPnNldE5lZWRzRGlzcGxheSgp OwogfQogCi12b2lkIFdlYlBhZ2U6OnVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5KiBw YWdlT3ZlcmxheSkKK3ZvaWQgV2ViUGFnZTo6dW5pbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJs YXkqIHBhZ2VPdmVybGF5LCBib29sIGZhZGVPdXQpCiB7CiAgICAgaWYgKHBhZ2VPdmVybGF5ICE9 IG1fcGFnZU92ZXJsYXkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChmYWRlT3V0KSB7Cisg ICAgICAgIG1fcGFnZU92ZXJsYXktPnN0YXJ0RmFkZU91dEFuaW1hdGlvbigpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCiAgICAgbV9wYWdlT3ZlcmxheS0+c2V0UGFnZSgwKTsKICAgICBtX3Bh Z2VPdmVybGF5ID0gbnVsbHB0cjsKIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA4Mzk4NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Miw3ICsyNTIs NyBAQCBwdWJsaWM6CiAKICAgICBib29sIHdpbmRvd0lzRm9jdXNlZCgpIGNvbnN0OwogICAgIHZv aWQgaW5zdGFsbFBhZ2VPdmVybGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJsYXk+KTsKLSAgICB2b2lk IHVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5Kik7CisgICAgdm9pZCB1bmluc3RhbGxQ YWdlT3ZlcmxheShQYWdlT3ZlcmxheSosIGJvb2wgZmFkZU91dCk7CiAgICAgYm9vbCBoYXNQYWdl T3ZlcmxheSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU92ZXJsYXk7IH0KICAgICBXZWJDb3JlOjpJ bnRSZWN0IHdpbmRvd1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKIAo=