83646 2012-04-10 17:52:43 -0700 [chromium] Add OVERRIDE annotations for cc scheduler-related client interfaces 2012-04-10 19:55:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83645 1 jamesr jamesr cc-bugs webkit.review.bot oldest_to_newest 599861 0 jamesr 2012-04-10 17:52:43 -0700 [chromium] Add OVERRIDE annotations for cc scheduler-related client interfaces 599863 1 136589 jamesr 2012-04-10 17:55:00 -0700 Created attachment 136589 Patch 599923 2 136589 enne 2012-04-10 18:57:14 -0700 Comment on attachment 136589 Patch R=me, assuming this all passes locally for you on Clang. 599963 3 jamesr 2012-04-10 19:55:58 -0700 Committed r113816: <http://trac.webkit.org/changeset/113816> 136589 2012-04-10 17:55:00 -0700 2012-04-10 18:57:14 -0700 Patch bug-83646-20120410175459.patch text/plain 14200 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIzOGUwOGUwNjRjYWQ0 YjRkYjc0MGY3YTYxNTVlOTZlOGQ5ZmIyZC4uNTFmYmI2OTA3MmI2ZGVmMDIyNjM1YWVkM2Y4NWY4 YzI0ZjlmODhhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTEwICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgT1ZFUlJJREUgYW5ub3RhdGlvbnMgZm9yIGNjIHNjaGVkdWxlci1yZWxhdGVkIGNsaWVudCBp bnRlcmZhY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MzY0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgYWRkcyBPVkVSUklERSBhbm5vdGF0aW9ucyB0byB0aGUgaW1wbGVtZW50YXRpb25zIG9m IHRoZSBmb2xsb3dpbmcgaW50ZXJmYWNlczoKKyAgICAgICAgLSBDQ0ZyYW1lUmF0ZUNvbnRyb2xs ZXJDbGllbnQKKyAgICAgICAgLSBDQ1NjaGVkdWxlckNsaWVudAorICAgICAgICAtIENDVGltZVNv dXJjZQorICAgICAgICAtIENDVGltZVNvdXJjZUNsaWVudAorICAgICAgICAtIENDVGltZXJDbGll bnQKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNl ZFRpbWVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0ZyYW1lUmF0ZUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyLmg6CisgICAgICAgIChDQ1NjaGVkdWxlcik6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5j cHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5oOgorICAgICAgICAoQ0NUaHJlYWRQcm94eSk6CisKIDIwMTItMDQtMDkgIEphbWVzIFJvYmlu c29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIERlZmVyIHRl eHR1cmUgaWQgYWxsb2NhdGlvbiBmb3IgY29waWVzIHVudGlsIHRoZSBhY3R1YWwgY29weSBleGVj dXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBlZGQ3MjhkMzgzYzZjZDI2ZjQzYzNh OTBmODNlMjY1NjFkMDVhNGQxLi4zOWQzOGUwNDhjNjBmM2ViNjlhM2Y1OTY3MDNjMDhiYjEzZWJl OTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0 LTEwICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2No cm9taXVtXSBBZGQgT1ZFUlJJREUgYW5ub3RhdGlvbnMgZm9yIGNjIHNjaGVkdWxlci1yZWxhdGVk IGNsaWVudCBpbnRlcmZhY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MzY0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgYWRkcyBPVkVSUklERSBhbm5vdGF0aW9ucyB0byB0aGUgaW1wbGVtZW50 YXRpb25zIG9mIHRoZSBmb2xsb3dpbmcgaW50ZXJmYWNlczoKKyAgICAgICAgLSBDQ0ZyYW1lUmF0 ZUNvbnRyb2xsZXJDbGllbnQKKyAgICAgICAgLSBDQ1NjaGVkdWxlckNsaWVudAorICAgICAgICAt IENDVGltZVNvdXJjZQorICAgICAgICAtIENDVGltZVNvdXJjZUNsaWVudAorICAgICAgICAtIEND VGltZXJDbGllbnQKKworCisgICAgICAgICogdGVzdHMvQ0NTY2hlZHVsZXJUZXN0LmNwcDoKKyAg ICAgICAgKiB0ZXN0cy9DQ1NjaGVkdWxlclRlc3RDb21tb24uaDoKKwogMjAxMi0wNC0wOSAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g RGVmZXIgdGV4dHVyZSBpZCBhbGxvY2F0aW9uIGZvciBjb3BpZXMgdW50aWwgdGhlIGFjdHVhbCBj b3B5IGV4ZWN1dGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmgKaW5k ZXggNWYxYjJjNGYyZmRhN2JlZDU0ZjVmNDQzNTA2NDVmMzVmNzk2ZTVkZi4uOTk3OTVkYjgxYzk2 Y2NkY2RhZjVjMDJmMDJiYzNlZWJiNmM2NWZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlC YXNlZFRpbWVTb3VyY2UuaApAQCAtNDIsMTMgKzQyLDEzIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgfkNDRGVsYXlCYXNlZFRpbWVTb3VyY2UoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBzZXRD bGllbnQoQ0NUaW1lU291cmNlQ2xpZW50KiBjbGllbnQpIHsgbV9jbGllbnQgPSBjbGllbnQ7IH0K KyAgICB2aXJ0dWFsIHZvaWQgc2V0Q2xpZW50KENDVGltZVNvdXJjZUNsaWVudCogY2xpZW50KSBP VkVSUklERSB7IG1fY2xpZW50ID0gY2xpZW50OyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0QWN0 aXZlKGJvb2wpOwotICAgIHZpcnR1YWwgYm9vbCBhY3RpdmUoKSBjb25zdCB7IHJldHVybiBtX3N0 YXRlICE9IFNUQVRFX0lOQUNUSVZFOyB9CisgICAgdmlydHVhbCB2b2lkIHNldEFjdGl2ZShib29s KSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgYWN0aXZlKCkgY29uc3QgT1ZFUlJJREUgeyBy ZXR1cm4gbV9zdGF0ZSAhPSBTVEFURV9JTkFDVElWRTsgfQogCiAgICAgLy8gQ0NUaW1lckNsaWVu dCBpbXBsZW1lbnRhdGlvbi4KLSAgICB2aXJ0dWFsIHZvaWQgb25UaW1lckZpcmVkKCk7CisgICAg dmlydHVhbCB2b2lkIG9uVGltZXJGaXJlZCgpIE9WRVJSSURFOwogCiAgICAgLy8gVmlydHVhbCBm b3IgdGVzdGluZy4KICAgICB2aXJ0dWFsIGRvdWJsZSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1Rp bWUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDRnJhbWVSYXRlQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0ZyYW1lUmF0ZUNvbnRyb2xsZXIuY3BwCmlu ZGV4IGRiNmQ5NWNjMDBjYzE1NTY4ZTBjZTU2N2Y0NDk3OGE5Mjc5MjRiZTguLjg0YTdjYjMxMGEz YmQ0OTY4MzkyZmFiMjJkOTU3MWM3NWE4YjU3YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRnJhbWVSYXRlQ29udHJvbGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NGcmFt ZVJhdGVDb250cm9sbGVyLmNwcApAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgfQogICAg IHZpcnR1YWwgfkNDRnJhbWVSYXRlQ29udHJvbGxlclRpbWVTb3VyY2VBZGFwdGVyKCkgeyB9CiAK LSAgICB2aXJ0dWFsIHZvaWQgb25UaW1lclRpY2soKSB7IG1fZnJhbWVSYXRlQ29udHJvbGxlci0+ b25UaW1lclRpY2soKTsgfQorICAgIHZpcnR1YWwgdm9pZCBvblRpbWVyVGljaygpIE9WRVJSSURF IHsgbV9mcmFtZVJhdGVDb250cm9sbGVyLT5vblRpbWVyVGljaygpOyB9CiBwcml2YXRlOgogICAg IGV4cGxpY2l0IENDRnJhbWVSYXRlQ29udHJvbGxlclRpbWVTb3VyY2VBZGFwdGVyKENDRnJhbWVS YXRlQ29udHJvbGxlciogZnJhbWVSYXRlQ29udHJvbGxlcikKICAgICAgICAgICAgIDogbV9mcmFt ZVJhdGVDb250cm9sbGVyKGZyYW1lUmF0ZUNvbnRyb2xsZXIpIHsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCAyMDFiYjUxNGRlODMwMzczNzkzZTU0MTk2MmZk ZjMwODUwMzM1NGQ0Li5mMmY0ODA1ODk1NGE5ZGEzODIxMjhlY2JmZDIzNWQ2MjZhMGM1NWJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtNzIsNyArNzIsNyBA QCBwdWJsaWM6CiAgICAgICAgIG1fdGltZVNvdXJjZS0+c2V0QWN0aXZlKGZhbHNlKTsKICAgICB9 CiAKLSAgICB2aXJ0dWFsIHZvaWQgb25UaW1lclRpY2soKQorICAgIHZpcnR1YWwgdm9pZCBvblRp bWVyVGljaygpIE9WRVJSSURFCiAgICAgewogICAgICAgICBtX2xheWVyVHJlZUhvc3RJbXBsLT5h bmltYXRlKG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpLCBjdXJyZW50VGltZSgpKTsKICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ1NjaGVkdWxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NTY2hlZHVsZXIuaAppbmRleCBhNmYyNjFjNGVkZjZkODU0YWEyYjY5MTNhYTZi N2E5MmE3OTM4NjI0Li41ZmIxZmU3ODZkZDg2NTY0MDJiYzBhNGMxNTUzYjFmYTA4MzJkNGMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q1NjaGVkdWxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDU2NoZWR1bGVyLmgKQEAgLTEwMCw3ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCByZWRyYXdQZW5kaW5nKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZU1hY2hpbmUucmVkcmF3UGVu ZGluZygpOyB9CiAKICAgICAvLyBDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJDbGllbnQgaW1wbGVtZW50 YXRpb24KLSAgICB2aXJ0dWFsIHZvaWQgdnN5bmNUaWNrKCk7CisgICAgdmlydHVhbCB2b2lkIHZz eW5jVGljaygpIE9WRVJSSURFOwogCiBwcml2YXRlOgogICAgIENDU2NoZWR1bGVyKENDU2NoZWR1 bGVyQ2xpZW50KiwgUGFzc093blB0cjxDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXI+KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFk UHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKaW5kZXggNWJkZWU0ZTk3MjJmODhhYjY2MmFiYmM0Y2E3MmE0MTY1 ZWI0NWJiNC4uMDdiYjQ5YjE2NTk5YzE3YmExOGEyNDhlYzExZjQ0NTc2ZWZjMTI4YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJl YWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKQEAgLTY1Myw3ICs2NTMsNyBAQCBjbGFzcyBDQ1RocmVh ZFByb3h5Q29udGV4dFJlY3JlYXRpb25UaW1lciA6IHB1YmxpYyBDQ1RpbWVyLCBDQ1RpbWVyQ2xp ZW50IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxDQ1RocmVhZFByb3h5Q29udGV4 dFJlY3JlYXRpb25UaW1lcj4gY3JlYXRlKENDVGhyZWFkUHJveHkqIHByb3h5KSB7IHJldHVybiBh ZG9wdFB0cihuZXcgQ0NUaHJlYWRQcm94eUNvbnRleHRSZWNyZWF0aW9uVGltZXIocHJveHkpKTsg fQogCi0gICAgdmlydHVhbCB2b2lkIG9uVGltZXJGaXJlZCgpCisgICAgdmlydHVhbCB2b2lkIG9u VGltZXJGaXJlZCgpIE9WRVJSSURFCiAgICAgewogICAgICAgICBtX3Byb3h5LT50cnlUb1JlY3Jl YXRlQ29udGV4dCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHkuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHkuaAppbmRleCAzNWZlMWRi YWZmNDBiNGE2ZTJkZjlmY2Q4NGQyMmY5MjU2MGM5YjM3Li5lOGEwMDIzOGRhOTY3ZmNjZmI5Nzky ZmM0MDNhYTc0NTlmNGFiZGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5oCkBAIC03OSwxNCAr NzksMTQgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwb3N0QW5pbWF0aW9uRXZlbnRzVG9N YWluVGhyZWFkT25JbXBsVGhyZWFkKFBhc3NPd25QdHI8Q0NBbmltYXRpb25FdmVudHNWZWN0b3I+ LCBkb3VibGUgd2FsbENsb2NrVGltZSk7CiAKICAgICAvLyBDQ1NjaGVkdWxlckNsaWVudCBpbXBs ZW1lbnRhdGlvbgotICAgIHZpcnR1YWwgYm9vbCBjYW5EcmF3KCk7Ci0gICAgdmlydHVhbCBib29s IGhhc01vcmVSZXNvdXJjZVVwZGF0ZXMoKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1 bGVkQWN0aW9uQmVnaW5GcmFtZSgpOwotICAgIHZpcnR1YWwgQ0NTY2hlZHVsZWRBY3Rpb25EcmF3 QW5kU3dhcFJlc3VsdCBzY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcElmUG9zc2libGUoKTsKLSAg ICB2aXJ0dWFsIENDU2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBSZXN1bHQgc2NoZWR1bGVkQWN0 aW9uRHJhd0FuZFN3YXBGb3JjZWQoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9u VXBkYXRlTW9yZVJlc291cmNlcygpOwotICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25D b21taXQoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5Db250ZXh0UmVj cmVhdGlvbigpOworICAgIHZpcnR1YWwgYm9vbCBjYW5EcmF3KCkgT1ZFUlJJREU7CisgICAgdmly dHVhbCBib29sIGhhc01vcmVSZXNvdXJjZVVwZGF0ZXMoKSBjb25zdCBPVkVSUklERTsKKyAgICB2 aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5GcmFtZSgpIE9WRVJSSURFOworICAgIHZp cnR1YWwgQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBzY2hlZHVsZWRBY3Rpb25E cmF3QW5kU3dhcElmUG9zc2libGUoKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIENDU2NoZWR1bGVk QWN0aW9uRHJhd0FuZFN3YXBSZXN1bHQgc2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBGb3JjZWQo KSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uVXBkYXRlTW9yZVJl c291cmNlcygpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25Db21t aXQoKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5Db250 ZXh0UmVjcmVhdGlvbigpIE9WRVJSSURFOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IENDVGhy ZWFkUHJveHkoQ0NMYXllclRyZWVIb3N0Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL0NDU2NoZWR1bGVyVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDU2NoZWR1bGVyVGVzdC5jcHAKaW5kZXggY2U0Mzc4NDAyYjJhYjU2OGNmZmMzYzY5 MTAyYTZkNTgzODUwNzMyNy4uMTEyODJiNGVlZDkxZThjODY0ZDFmYjMyNzJiOTQ3MjBjODJjYWQz MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1NjaGVkdWxlclRl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NTY2hlZHVsZXJUZXN0 LmNwcApAQCAtNjUsMjUgKzY1LDI1IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAotICAgIHZpcnR1YWwgYm9vbCBjYW5EcmF3KCkgeyByZXR1cm4gbV9jYW5EcmF3OyB9 Ci0gICAgdmlydHVhbCBib29sIGhhc01vcmVSZXNvdXJjZVVwZGF0ZXMoKSBjb25zdCB7IHJldHVy biBtX2hhc01vcmVSZXNvdXJjZVVwZGF0ZXM7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVk QWN0aW9uQmVnaW5GcmFtZSgpIHsgbV9hY3Rpb25zLnB1c2hfYmFjaygic2NoZWR1bGVkQWN0aW9u QmVnaW5GcmFtZSIpOyB9Ci0gICAgdmlydHVhbCBDQ1NjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2Fw UmVzdWx0IHNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwSWZQb3NzaWJsZSgpCisgICAgdmlydHVh bCBib29sIGNhbkRyYXcoKSBPVkVSUklERSB7IHJldHVybiBtX2NhbkRyYXc7IH0KKyAgICB2aXJ0 dWFsIGJvb2wgaGFzTW9yZVJlc291cmNlVXBkYXRlcygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJu IG1faGFzTW9yZVJlc291cmNlVXBkYXRlczsgfQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRB Y3Rpb25CZWdpbkZyYW1lKCkgT1ZFUlJJREUgeyBtX2FjdGlvbnMucHVzaF9iYWNrKCJzY2hlZHVs ZWRBY3Rpb25CZWdpbkZyYW1lIik7IH0KKyAgICB2aXJ0dWFsIENDU2NoZWR1bGVkQWN0aW9uRHJh d0FuZFN3YXBSZXN1bHQgc2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBJZlBvc3NpYmxlKCkgT1ZF UlJJREUKICAgICB7CiAgICAgICAgIG1fYWN0aW9ucy5wdXNoX2JhY2soInNjaGVkdWxlZEFjdGlv bkRyYXdBbmRTd2FwSWZQb3NzaWJsZSIpOwogICAgICAgICBtX251bURyYXdzKys7CiAgICAgICAg IHJldHVybiBDQ1NjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwUmVzdWx0KG1fZHJhd1dpbGxIYXBw ZW4sIG1fZHJhd1dpbGxIYXBwZW4gJiYgbV9zd2FwV2lsbEhhcHBlbklmRHJhd0hhcHBlbnMpOwog ICAgIH0KIAotICAgIHZpcnR1YWwgQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBz Y2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcEZvcmNlZCgpCisgICAgdmlydHVhbCBDQ1NjaGVkdWxl ZEFjdGlvbkRyYXdBbmRTd2FwUmVzdWx0IHNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwRm9yY2Vk KCkgT1ZFUlJJREUKICAgICB7CiAgICAgICAgIG1fYWN0aW9ucy5wdXNoX2JhY2soInNjaGVkdWxl ZEFjdGlvbkRyYXdBbmRTd2FwRm9yY2VkIik7CiAgICAgICAgIHJldHVybiBDQ1NjaGVkdWxlZEFj dGlvbkRyYXdBbmRTd2FwUmVzdWx0KHRydWUsIG1fc3dhcFdpbGxIYXBwZW5JZkRyYXdIYXBwZW5z KTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uVXBkYXRlTW9yZVJl c291cmNlcygpIHsgbV9hY3Rpb25zLnB1c2hfYmFjaygic2NoZWR1bGVkQWN0aW9uVXBkYXRlTW9y ZVJlc291cmNlcyIpOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkNvbW1pdCgp IHsgbV9hY3Rpb25zLnB1c2hfYmFjaygic2NoZWR1bGVkQWN0aW9uQ29tbWl0Iik7IH0KLSAgICB2 aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5Db250ZXh0UmVjcmVhdGlvbigpIHsgbV9h Y3Rpb25zLnB1c2hfYmFjaygic2NoZWR1bGVkQWN0aW9uQmVnaW5Db250ZXh0UmVjcmVhdGlvbiIp OyB9CisgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvblVwZGF0ZU1vcmVSZXNvdXJjZXMo KSBPVkVSUklERSB7IG1fYWN0aW9ucy5wdXNoX2JhY2soInNjaGVkdWxlZEFjdGlvblVwZGF0ZU1v cmVSZXNvdXJjZXMiKTsgfQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25Db21taXQo KSBPVkVSUklERSB7IG1fYWN0aW9ucy5wdXNoX2JhY2soInNjaGVkdWxlZEFjdGlvbkNvbW1pdCIp OyB9CisgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkJlZ2luQ29udGV4dFJlY3JlYXRp b24oKSBPVkVSUklERSB7IG1fYWN0aW9ucy5wdXNoX2JhY2soInNjaGVkdWxlZEFjdGlvbkJlZ2lu Q29udGV4dFJlY3JlYXRpb24iKTsgfQogCiAgICAgdm9pZCBzZXREcmF3V2lsbEhhcHBlbihib29s IGRyYXdXaWxsSGFwcGVuKSB7IG1fZHJhd1dpbGxIYXBwZW4gPSBkcmF3V2lsbEhhcHBlbjsgfQog ICAgIHZvaWQgc2V0U3dhcFdpbGxIYXBwZW5JZkRyYXdIYXBwZW5zKGJvb2wgc3dhcFdpbGxIYXBw ZW5JZkRyYXdIYXBwZW5zKSB7IG1fc3dhcFdpbGxIYXBwZW5JZkRyYXdIYXBwZW5zID0gc3dhcFdp bGxIYXBwZW5JZkRyYXdIYXBwZW5zOyB9CkBAIC0xNzMsOCArMTczLDggQEAgcHVibGljOgogCiAg ICAgdm9pZCBzZXRTY2hlZHVsZXIoQ0NTY2hlZHVsZXIqIHNjaGVkdWxlcikgeyBtX3NjaGVkdWxl ciA9IHNjaGVkdWxlcjsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkJlZ2lu RnJhbWUoKSB7IH0KLSAgICB2aXJ0dWFsIENDU2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBSZXN1 bHQgc2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBJZlBvc3NpYmxlKCkKKyAgICB2aXJ0dWFsIHZv aWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5GcmFtZSgpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwg Q0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBzY2hlZHVsZWRBY3Rpb25EcmF3QW5k U3dhcElmUG9zc2libGUoKSBPVkVSUklERQogICAgIHsKICAgICAgICAgLy8gT25seSBzZXROZWVk c1JlZHJhdyB0aGUgZmlyc3QgdGltZSB0aGlzIGlzIGNhbGxlZAogICAgICAgICBpZiAoIW1fbnVt RHJhd3MpCkBAIC0xODIsMTUgKzE4MiwxNSBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBGYWtl Q0NTY2hlZHVsZXJDbGllbnQ6OnNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwSWZQb3NzaWJsZSgp OwogICAgIH0KIAotICAgIHZpcnR1YWwgQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3Vs dCBzY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcEZvcmNlZCgpCisgICAgdmlydHVhbCBDQ1NjaGVk dWxlZEFjdGlvbkRyYXdBbmRTd2FwUmVzdWx0IHNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwRm9y Y2VkKCkgT1ZFUlJJREUKICAgICB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAg ICAgICByZXR1cm4gQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCh0cnVlLCB0cnVl KTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uVXBkYXRlTW9yZVJl c291cmNlcygpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25Db21taXQoKSB7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5Db250ZXh0UmVjcmVhdGlv bigpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25VcGRhdGVNb3JlUmVzb3Vy Y2VzKCkgT1ZFUlJJREUgeyB9CisgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkNvbW1p dCgpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25CZWdpbkNv bnRleHRSZWNyZWF0aW9uKCkgT1ZFUlJJREUgeyB9CiAKIHByb3RlY3RlZDoKICAgICBDQ1NjaGVk dWxlciogbV9zY2hlZHVsZXI7CkBAIC0yNzEsOCArMjcxLDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBzZXRTY2hlZHVsZXIoQ0NTY2hlZHVsZXIqIHNjaGVkdWxlcikgeyBtX3NjaGVkdWxlciA9IHNj aGVkdWxlcjsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkJlZ2luRnJhbWUo KSB7IH0KLSAgICB2aXJ0dWFsIENDU2NoZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBSZXN1bHQgc2No ZWR1bGVkQWN0aW9uRHJhd0FuZFN3YXBJZlBvc3NpYmxlKCkKKyAgICB2aXJ0dWFsIHZvaWQgc2No ZWR1bGVkQWN0aW9uQmVnaW5GcmFtZSgpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwgQ0NTY2hl ZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBzY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcElm UG9zc2libGUoKSBPVkVSUklERQogICAgIHsKICAgICAgICAgLy8gT25seSBzZXROZWVkc0NvbW1p dCB0aGUgZmlyc3QgdGltZSB0aGlzIGlzIGNhbGxlZAogICAgICAgICBpZiAoIW1fbnVtRHJhd3Mp CkBAIC0yODAsMTUgKzI4MCwxNSBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBGYWtlQ0NTY2hl ZHVsZXJDbGllbnQ6OnNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwSWZQb3NzaWJsZSgpOwogICAg IH0KIAotICAgIHZpcnR1YWwgQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBzY2hl ZHVsZWRBY3Rpb25EcmF3QW5kU3dhcEZvcmNlZCgpCisgICAgdmlydHVhbCBDQ1NjaGVkdWxlZEFj dGlvbkRyYXdBbmRTd2FwUmVzdWx0IHNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwRm9yY2VkKCkg T1ZFUlJJREUKICAgICB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBy ZXR1cm4gQ0NTY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCh0cnVlLCB0cnVlKTsKICAg ICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uVXBkYXRlTW9yZVJlc291cmNl cygpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25Db21taXQoKSB7IH0KLSAg ICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVkQWN0aW9uQmVnaW5Db250ZXh0UmVjcmVhdGlvbigpIHsg fQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25VcGRhdGVNb3JlUmVzb3VyY2VzKCkg T1ZFUlJJREUgeyB9CisgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlZEFjdGlvbkNvbW1pdCgpIE9W RVJSSURFIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZWRBY3Rpb25CZWdpbkNvbnRleHRS ZWNyZWF0aW9uKCkgT1ZFUlJJREUgeyB9CiAKIHByb3RlY3RlZDoKICAgICBDQ1NjaGVkdWxlciog bV9zY2hlZHVsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ND U2NoZWR1bGVyVGVzdENvbW1vbi5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1Nj aGVkdWxlclRlc3RDb21tb24uaAppbmRleCAwYzEwNTU4OGIxNDJmNzYxOTM3MjJlNjI4OGUxOTg5 NjUzYTk0OTg0Li42MjU3ZWM4ODhmNThlYzc1MjY4ODdhNzcxZjcyNDhmM2Q1M2Y2NjVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDU2NoZWR1bGVyVGVzdENvbW1v bi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NTY2hlZHVsZXJUZXN0Q29t bW9uLmgKQEAgLTM5LDcgKzM5LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXQoKSB7IG1fdGlj a0NhbGxlZCA9IGZhbHNlOyB9CiAgICAgYm9vbCB0aWNrQ2FsbGVkKCkgY29uc3QgeyByZXR1cm4g bV90aWNrQ2FsbGVkOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgb25UaW1lclRpY2soKSB7IG1fdGlj a0NhbGxlZCA9IHRydWU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgb25UaW1lclRpY2soKSBPVkVSUklE RSB7IG1fdGlja0NhbGxlZCA9IHRydWU7IH0KIAogcHJvdGVjdGVkOgogICAgIGJvb2wgbV90aWNr Q2FsbGVkOwpAQCAtOTAsOSArOTAsOSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIH5GYWtlQ0NU aW1lU291cmNlKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q2xpZW50KFdlYkNvcmU6OkND VGltZVNvdXJjZUNsaWVudCogY2xpZW50KSB7IG1fY2xpZW50ID0gY2xpZW50OyB9Ci0gICAgdmly dHVhbCB2b2lkIHNldEFjdGl2ZShib29sIGIpIHsgbV9hY3RpdmUgPSBiOyB9Ci0gICAgdmlydHVh bCBib29sIGFjdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZlOyB9CisgICAgdmlydHVhbCB2 b2lkIHNldENsaWVudChXZWJDb3JlOjpDQ1RpbWVTb3VyY2VDbGllbnQqIGNsaWVudCkgT1ZFUlJJ REUgeyBtX2NsaWVudCA9IGNsaWVudDsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRBY3RpdmUoYm9v bCBiKSBPVkVSUklERSB7IG1fYWN0aXZlID0gYjsgfQorICAgIHZpcnR1YWwgYm9vbCBhY3RpdmUo KSBjb25zdCBPVkVSUklERSB7IHJldHVybiBtX2FjdGl2ZTsgfQogCiAgICAgdm9pZCB0aWNrKCkK ICAgICB7Cg==