139249 2014-12-03 18:30:15 -0800 Add a way to delete local storage origins modified after a given date 2014-12-04 09:58:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue gyuyoung.kim ossy ryuan.choi thorton oldest_to_newest 1052386 0 andersca 2014-12-03 18:30:15 -0800 Add a way to delete local storage origins modified between two given dates 1052387 1 242547 andersca 2014-12-03 18:32:11 -0800 Created attachment 242547 Patch 1052389 2 commit-queue 2014-12-03 18:35:06 -0800 Attachment 242547 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:70: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:441: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1052392 3 242548 andersca 2014-12-03 18:47:25 -0800 Created attachment 242548 Patch 1052393 4 commit-queue 2014-12-03 18:50:02 -0800 Attachment 242548 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:70: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:441: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1052418 5 ossy 2014-12-04 00:36:34 -0800 (In reply to comment #3) > Created attachment 242548 [details] > Patch It will break the EFL build if you land it as is. Of course you are allowed to do it since it is in WebKit2. ../../Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp: In function 'WTF::Optional<long int> WebKit::fileCreationTime(const WTF::String&)': ../../Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp:131:57: error: enumeral and non-enumeral type in conditional expression [-Werror] return getFileCreationTime(filePath, time) ? time : Nullopt; ^ ../../Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp: In function 'WTF::Optional<long int> WebKit::fileModificationTime(const WTF::String&)': ../../Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp:137:61: error: enumeral and non-enumeral type in conditional expression [-Werror] return getFileModificationTime(filePath, time) ? time : Nullopt; ^ 1052419 6 ossy 2014-12-04 00:41:42 -0800 Any idea how to fix this warning properly? 1052445 7 ossy 2014-12-04 02:39:03 -0800 Using Optional<time_t>(Nullopt) instead of Nullopt fixed the build issue for me, and I think it can be a proper fix. 1052479 8 andersca 2014-12-04 08:34:59 -0800 Committed r176794: <http://trac.webkit.org/changeset/176794> 1052487 9 ossy 2014-12-04 09:43:42 -0800 (In reply to comment #8) > Committed r176794: <http://trac.webkit.org/changeset/176794> Thanks for breaking the build intentionally. :-/ 1052488 10 ossy 2014-12-04 09:43:56 -0800 I landed the fix https://trac.webkit.org/changeset/176802 1052492 11 andersca 2014-12-04 09:47:32 -0800 (In reply to comment #9) > (In reply to comment #8) > > Committed r176794: <http://trac.webkit.org/changeset/176794> > > Thanks for breaking the build intentionally. :-/ You're welcome. 1052499 12 ossy 2014-12-04 09:58:34 -0800 (In reply to comment #11) > (In reply to comment #9) > > (In reply to comment #8) > > > Committed r176794: <http://trac.webkit.org/changeset/176794> > > > > Thanks for breaking the build intentionally. :-/ > > You're welcome. I hope you are very proud of this impolite and uncooperative behaviour. :(( I can't understand why would have been a big deal to add my fix before landing ... 242547 2014-12-03 18:32:11 -0800 2014-12-03 18:47:22 -0800 Patch bug-139249-20141203183244.patch text/plain 8835 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjVhZGIyOGRiNTA4Zjg3 NzgyZmEyODViNGQ5MTE2ZDk5ZjA5YjcxYy4uZTA1NjM3NDFlNmU4YjY4ZGMyNWQ1ZjA0NTMyMzdl NWZlYmViMGY1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEyLTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgd2F5IHRv IGRlbGV0ZSBsb2NhbCBzdG9yYWdlIG9yaWdpbnMgbW9kaWZpZWQgYmV0d2VlbiB0d28gZ2l2ZW4g ZGF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz OTI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFs c28gY2hhbmdlIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlciB0byBob2xkIG9uIHRvIFdURjo6 T3B0aW9uYWwgdGltZV90IHZhbHVlcworICAgICAgICBpbnN0ZWFkIG9mIHRyZWF0aW5nIG1pc3Np bmcgdmFsdWVzIGFzIHplcm8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvTG9jYWxTdG9yYWdlRGV0 YWlscy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmZpbGVDcmVhdGlvblRpbWUpOgorICAgICAg ICAoV2ViS2l0OjpmaWxlTW9kaWZpY2F0aW9uVGltZSk6CisgICAgICAgIChXZWJLaXQ6OkxvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRCZXR3ZWVuKToK KyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkZXRhaWxzKToK KyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVPcmlnaW5zTW9kaWZpZWRCZXR3ZWVu KToKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6ZGlkR2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbik6CisKIDIwMTQtMTItMDMgIENvbW1p dCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxNzY0NTIgYW5kIHIxNzY1NTkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTG9jYWxTdG9yYWdlRGV0YWlscy5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0xvY2FsU3RvcmFnZURldGFpbHMuaAppbmRleCBjMTY5MzExM2VlMDIwMjhkNjcyMWMx OGMyOTE1YjU2YWI4YzgwOTJkLi5jYzY0ZDdlNzFhYjI2N2YyZTk5OGI0NDY2NTA0ZDBlNzY4MzAy MzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTG9jYWxTdG9yYWdlRGV0 YWlscy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Mb2NhbFN0b3JhZ2VEZXRhaWxz LmgKQEAgLTI2LDE0ICsyNiwxNSBAQAogI2lmbmRlZiBMb2NhbFN0b3JhZ2VEZXRhaWxzX2gKICNk ZWZpbmUgTG9jYWxTdG9yYWdlRGV0YWlsc19oCiAKKyNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4K ICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK IHN0cnVjdCBMb2NhbFN0b3JhZ2VEZXRhaWxzIHsKICAgICBTdHJpbmcgb3JpZ2luSWRlbnRpZmll cjsKLSAgICBkb3VibGUgY3JlYXRpb25UaW1lOwotICAgIGRvdWJsZSBtb2RpZmljYXRpb25UaW1l OworICAgIE9wdGlvbmFsPHRpbWVfdD4gY3JlYXRpb25UaW1lOworICAgIE9wdGlvbmFsPHRpbWVf dD4gbW9kaWZpY2F0aW9uVGltZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlci5jcHAKaW5kZXggMzM4NDExMDI1NWY5YTE3NmI0NmQ1NTczZmZj MGYyMDA2YjRjNDc4OC4uODkwMDhmNmQ1Y2FiNzc3NjMxYzM4MWU4MzliOTRlYjFkYjBmNzUzYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCkBAIC0xMjUsNiArMTI1LDM5IEBAIHZv aWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkZWxldGVBbGxEYXRhYmFzZXMoKQogICAg IGRlbGV0ZUVtcHR5RGlyZWN0b3J5KG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKIH0KIAorc3Rh dGljIE9wdGlvbmFsPHRpbWVfdD4gZmlsZUNyZWF0aW9uVGltZShjb25zdCBTdHJpbmcmIGZpbGVQ YXRoKQoreworICAgIHRpbWVfdCB0aW1lOworICAgIHJldHVybiBnZXRGaWxlQ3JlYXRpb25UaW1l KGZpbGVQYXRoLCB0aW1lKSA/IHRpbWUgOiBOdWxsb3B0OworfQorCitzdGF0aWMgT3B0aW9uYWw8 dGltZV90PiBmaWxlTW9kaWZpY2F0aW9uVGltZShjb25zdCBTdHJpbmcmIGZpbGVQYXRoKQorewor ICAgIHRpbWVfdCB0aW1lOworICAgIHJldHVybiBnZXRGaWxlTW9kaWZpY2F0aW9uVGltZShmaWxl UGF0aCwgdGltZSkgPyB0aW1lIDogTnVsbG9wdDsKK30KKworVmVjdG9yPFJlZlB0cjxTZWN1cml0 eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9k aWZpZWRCZXR3ZWVuKHRpbWVfdCBzdGFydFRpbWUsIHRpbWVfdCBlbmRUaW1lKQoreworICAgIFZl Y3RvcjxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBkZWxldGVkRGF0YWJhc2VPcmlnaW5zOworCisg ICAgZm9yIChjb25zdCBTdHJpbmcmIG9yaWdpbiA6IG1fb3JpZ2lucykgeworICAgICAgICBTdHJp bmcgZmlsZVBhdGggPSBwYXRoRm9yRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmlnaW4p OworCisgICAgICAgIGF1dG8gbW9kaWZpY2F0aW9uVGltZSA9IGZpbGVNb2RpZmljYXRpb25UaW1l KGZpbGVQYXRoKTsKKyAgICAgICAgaWYgKCFtb2RpZmljYXRpb25UaW1lKQorICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgaWYgKG1vZGlmaWNhdGlvblRpbWUudmFsdWUoKSA+PSBzdGFy dFRpbWUgJiYgbW9kaWZpY2F0aW9uVGltZS52YWx1ZSgpIDw9IGVuZFRpbWUpIHsKKyAgICAgICAg ICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIob3JpZ2luKTsKKworICAgICAg ICAgICAgZGVsZXRlZERhdGFiYXNlT3JpZ2lucy5hcHBlbmQoU2VjdXJpdHlPcmlnaW46OmNyZWF0 ZUZyb21EYXRhYmFzZUlkZW50aWZpZXIob3JpZ2luKSk7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICByZXR1cm4gZGVsZXRlZERhdGFiYXNlT3JpZ2luczsKK30KKwogVmVjdG9yPFJlZlB0cjxXZWJD b3JlOjpTZWN1cml0eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6b3JpZ2lu cygpIGNvbnN0CiB7CiAgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnM7 CkBAIC0xNDMsMTIgKzE3NiwxMSBAQCBWZWN0b3I8TG9jYWxTdG9yYWdlRGV0YWlscz4gTG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkZXRhaWxzKCkKIAogICAgIGZvciAoY29uc3QgU3RyaW5n JiBvcmlnaW4gOiBtX29yaWdpbnMpIHsKICAgICAgICAgU3RyaW5nIGZpbGVQYXRoID0gcGF0aEZv ckRhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIob3JpZ2luKTsKLSAgICAgICAgdGltZV90IHRp bWU7CiAKICAgICAgICAgTG9jYWxTdG9yYWdlRGV0YWlscyBkZXRhaWxzOwogICAgICAgICBkZXRh aWxzLm9yaWdpbklkZW50aWZpZXIgPSBvcmlnaW4uaXNvbGF0ZWRDb3B5KCk7Ci0gICAgICAgIGRl dGFpbHMuY3JlYXRpb25UaW1lID0gZ2V0RmlsZUNyZWF0aW9uVGltZShmaWxlUGF0aCwgdGltZSkg PyB0aW1lIDogMDsKLSAgICAgICAgZGV0YWlscy5tb2RpZmljYXRpb25UaW1lID0gZ2V0RmlsZU1v ZGlmaWNhdGlvblRpbWUoZmlsZVBhdGgsIHRpbWUpID8gdGltZSA6IDA7CisgICAgICAgIGRldGFp bHMuY3JlYXRpb25UaW1lID0gZmlsZUNyZWF0aW9uVGltZShmaWxlUGF0aCk7CisgICAgICAgIGRl dGFpbHMubW9kaWZpY2F0aW9uVGltZSA9IGZpbGVNb2RpZmljYXRpb25UaW1lKGZpbGVQYXRoKTsK ICAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChkZXRhaWxzKTsKICAgICB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyLmgKaW5kZXggNDUyZjNmNWQ0Y2EwNGIwMmM0ZTBiM2Y1MjZjZjQ0 Zjc1NzE4ZTRkMi4uNDQxZWZhNTQyNmRhMTMwMjU5ODQxM2VkNTBlYzUxNDY5MmQzYzA5NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKQEAgLTU1LDYgKzU1LDkgQEAgcHVibGljOgogICAg IHZvaWQgZGVsZXRlRGF0YWJhc2VXaXRoT3JpZ2luKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKik7 CiAgICAgdm9pZCBkZWxldGVBbGxEYXRhYmFzZXMoKTsKIAorICAgIC8vIFJldHVybnMgYSB2ZWN0 b3Igb2YgdGhlIG9yaWdpbnMgd2hvc2UgZGF0YWJhc2VzIGhhdmUgYmVlbiBkZWxldGVkLgorICAg IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiBkZWxldGVEYXRhYmFzZXNN b2RpZmllZEJldHdlZW4odGltZV90IHN0YXJ0VGltZSwgdGltZV90IGVuZFRpbWUpOworCiAgICAg VmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnMoKSBjb25zdDsK ICAgICBWZWN0b3I8TG9jYWxTdG9yYWdlRGV0YWlscz4gZGV0YWlscygpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXgg MDU5YzA3YjM0NWU5NGE3YzczNmMxNWM0YjVkNGJlNDEyMGViNGFmMy4uMDM3OGQ5ZTJhNzYyOTli Njc3OTJhNjQ3NjBhMmFiNWY2OGMxZTE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNDM4LDYgKzQzOCwyMiBAQCB2 b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVBbGxFbnRyaWVzKCkKICAgICBtX3F1ZXVlLT5kaXNw YXRjaChiaW5kKCZTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllc0ludGVybmFsLCB0aGlz KSk7CiB9CiAKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZU9yaWdpbnNNb2RpZmllZEJldHdl ZW4odGltZV90IHN0YXJ0VGltZSwgdGltZV90IGVuZFRpbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAo KT4gY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAgUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyPiBzdG9y YWdlTWFuYWdlcih0aGlzKTsKKworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9yYWdlTWFuYWdl ciwgc3RhcnRUaW1lLCBlbmRUaW1lLCBjb21wbGV0aW9uSGFuZGxlcl0geworICAgICAgICBhdXRv IGRlbGV0ZWRPcmlnaW5zID0gc3RvcmFnZU1hbmFnZXItPm1fbG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyLT5kZWxldGVEYXRhYmFzZXNNb2RpZmllZEJldHdlZW4oc3RhcnRUaW1lLCBlbmRUaW1l KTsKKworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IGRlbGV0ZWRPcmlnaW5zKSB7 CisgICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IHN0b3JhZ2VN YW5hZ2VyLT5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCisgICAgICAgICAgICAg ICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2lu KG9yaWdpbi5nZXQoKSk7CisgICAgICAgIH0KKworICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlz cGF0Y2goY29tcGxldGlvbkhhbmRsZXIpOworICAgIH0pOworfQorCiB2b2lkIFN0b3JhZ2VNYW5h Z2VyOjpjcmVhdGVMb2NhbFN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1 aW50NjRfdCBzdG9yYWdlTWFwSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgY29uc3Qg U2VjdXJpdHlPcmlnaW5EYXRhJiBzZWN1cml0eU9yaWdpbkRhdGEpCiB7CiAgICAgc3RkOjpwYWly PFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VN YXBJRFBhaXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IDU2OWMzYzY1MmI0ZjA1 ZTcyMzFlNGMyY2QxZTNlNDRiOTM1OWRkMTkuLmJiZWI1YmNiMjdmYjhhM2MyMmRhYzA0NzQzNjVk OTkyZjlkMDcyYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZU1hbmFnZXIuaApAQCAtMjcsNiArMjcsNyBAQAogI2RlZmluZSBTdG9yYWdlTWFuYWdl cl9oCiAKICNpbmNsdWRlICJDb25uZWN0aW9uLmgiCisjaW5jbHVkZSA8Y2hyb25vPgogI2luY2x1 ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRl IDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4KQEAgLTY2LDYgKzY3LDggQEAgcHVibGljOgog ICAgIHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbiYpOwogICAgIHZvaWQgZGVsZXRlQWxsRW50cmllcygpOwogCisgICAgdm9pZCBkZWxldGVM b2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRCZXR3ZWVuKHRpbWVfdCBzdGFydFRpbWUsIHRpbWVf dCBlbmRUaW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKTsKKwog cHJpdmF0ZToKICAgICBleHBsaWNpdCBTdG9yYWdlTWFuYWdlcihjb25zdCBTdHJpbmcmIGxvY2Fs U3RvcmFnZURpcmVjdG9yeSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCBkZmYzNmUzZTNiNDA2MTAxZWFl NmE0MjE3NTRlMWMzYTljYjI1ZTAxLi41OGZmYzAxZTNiMDQyNmFmN2FkOTRlZjdiMDI0MjA3MGMy NzkyMWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYktleVZh bHVlU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC0xMTgsOSArMTE4LDkgQEAgc3RhdGljIHZvaWQgZGlk R2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbihjb25zdCBWZWN0b3I8TG9jYWxTdG9yYWdlRGV0YWls cz4mIHN0b3IKIAogICAgICAgICBkZXRhaWxzTWFwLnNldChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyOjpvcmlnaW5LZXkoKSwgb3JpZ2luKTsKICAgICAgICAgaWYgKG9yaWdpbkRldGFpbHMuY3Jl YXRpb25UaW1lKQotICAgICAgICAgICAgZGV0YWlsc01hcC5zZXQoV2ViS2V5VmFsdWVTdG9yYWdl TWFuYWdlcjo6Y3JlYXRpb25UaW1lS2V5KCksIEFQSTo6RG91YmxlOjpjcmVhdGUob3JpZ2luRGV0 YWlscy5jcmVhdGlvblRpbWUpKTsKKyAgICAgICAgICAgIGRldGFpbHNNYXAuc2V0KFdlYktleVZh bHVlU3RvcmFnZU1hbmFnZXI6OmNyZWF0aW9uVGltZUtleSgpLCBBUEk6OkRvdWJsZTo6Y3JlYXRl KG9yaWdpbkRldGFpbHMuY3JlYXRpb25UaW1lLnZhbHVlT3IoMCkpKTsKICAgICAgICAgaWYgKG9y aWdpbkRldGFpbHMubW9kaWZpY2F0aW9uVGltZSkKLSAgICAgICAgICAgIGRldGFpbHNNYXAuc2V0 KFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6Om1vZGlmaWNhdGlvblRpbWVLZXkoKSwgQVBJOjpE b3VibGU6OmNyZWF0ZShvcmlnaW5EZXRhaWxzLm1vZGlmaWNhdGlvblRpbWUpKTsKKyAgICAgICAg ICAgIGRldGFpbHNNYXAuc2V0KFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6Om1vZGlmaWNhdGlv blRpbWVLZXkoKSwgQVBJOjpEb3VibGU6OmNyZWF0ZShvcmlnaW5EZXRhaWxzLm1vZGlmaWNhdGlv blRpbWUudmFsdWVPcigwKSkpOwogCiAgICAgICAgIHJlc3VsdC51bmNoZWNrZWRBcHBlbmQoSW1t dXRhYmxlRGljdGlvbmFyeTo6Y3JlYXRlKFdURjo6bW92ZShkZXRhaWxzTWFwKSkpOwogICAgIH0K 242548 2014-12-03 18:47:25 -0800 2014-12-03 18:48:42 -0800 Patch bug-139249-20141203184758.patch text/plain 8674 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjVhZGIyOGRiNTA4Zjg3 NzgyZmEyODViNGQ5MTE2ZDk5ZjA5YjcxYy4uYTZhZWIyOTAzMGI0NDliMTgwMDJmMjM2NGViYzNj YzM5MTU3MWZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEyLTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgd2F5IHRv IGRlbGV0ZSBsb2NhbCBzdG9yYWdlIG9yaWdpbnMgbW9kaWZpZWQgYWZ0ZXIgYSBnaXZlbiBkYXRl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIGNo YW5nZSBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIgdG8gaG9sZCBvbiB0byBXVEY6Ok9wdGlv bmFsIHRpbWVfdCB2YWx1ZXMKKyAgICAgICAgaW5zdGVhZCBvZiB0cmVhdGluZyBtaXNzaW5nIHZh bHVlcyBhcyB6ZXJvLgorCisgICAgICAgICogVUlQcm9jZXNzL0xvY2FsU3RvcmFnZURldGFpbHMu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpmaWxlQ3JlYXRpb25UaW1lKToKKyAgICAgICAgKFdl YktpdDo6ZmlsZU1vZGlmaWNhdGlvblRpbWUpOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlc01vZGlmaWVkU2luY2UpOgorICAgICAg ICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRldGFpbHMpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNNb2RpZmllZFNp bmNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6ZGlkR2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbik6CisKIDIwMTQtMTItMDMgIENv bW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHIxNzY0NTIgYW5kIHIxNzY1NTkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvTG9jYWxTdG9yYWdlRGV0YWlscy5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0xvY2FsU3RvcmFnZURldGFpbHMuaAppbmRleCBjMTY5MzExM2VlMDIwMjhkNjcy MWMxOGMyOTE1YjU2YWI4YzgwOTJkLi5jYzY0ZDdlNzFhYjI2N2YyZTk5OGI0NDY2NTA0ZDBlNzY4 MzAyMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTG9jYWxTdG9yYWdl RGV0YWlscy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Mb2NhbFN0b3JhZ2VEZXRh aWxzLmgKQEAgLTI2LDE0ICsyNiwxNSBAQAogI2lmbmRlZiBMb2NhbFN0b3JhZ2VEZXRhaWxzX2gK ICNkZWZpbmUgTG9jYWxTdG9yYWdlRGV0YWlsc19oCiAKKyNpbmNsdWRlIDx3dGYvT3B0aW9uYWwu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKIHN0cnVjdCBMb2NhbFN0b3JhZ2VEZXRhaWxzIHsKICAgICBTdHJpbmcgb3JpZ2luSWRlbnRp ZmllcjsKLSAgICBkb3VibGUgY3JlYXRpb25UaW1lOwotICAgIGRvdWJsZSBtb2RpZmljYXRpb25U aW1lOworICAgIE9wdGlvbmFsPHRpbWVfdD4gY3JlYXRpb25UaW1lOworICAgIE9wdGlvbmFsPHRp bWVfdD4gbW9kaWZpY2F0aW9uVGltZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKaW5kZXggMzM4NDExMDI1NWY5YTE3NmI0NmQ1NTcz ZmZjMGYyMDA2YjRjNDc4OC4uOTk2ZDhlZGQwMDNiZDMzZWVhM2ZlMzcxZDMyYWFhODkzYzA3ODE4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCkBAIC0xMjUsNiArMTI1LDM5IEBA IHZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkZWxldGVBbGxEYXRhYmFzZXMoKQog ICAgIGRlbGV0ZUVtcHR5RGlyZWN0b3J5KG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKIH0KIAor c3RhdGljIE9wdGlvbmFsPHRpbWVfdD4gZmlsZUNyZWF0aW9uVGltZShjb25zdCBTdHJpbmcmIGZp bGVQYXRoKQoreworICAgIHRpbWVfdCB0aW1lOworICAgIHJldHVybiBnZXRGaWxlQ3JlYXRpb25U aW1lKGZpbGVQYXRoLCB0aW1lKSA/IHRpbWUgOiBOdWxsb3B0OworfQorCitzdGF0aWMgT3B0aW9u YWw8dGltZV90PiBmaWxlTW9kaWZpY2F0aW9uVGltZShjb25zdCBTdHJpbmcmIGZpbGVQYXRoKQor eworICAgIHRpbWVfdCB0aW1lOworICAgIHJldHVybiBnZXRGaWxlTW9kaWZpY2F0aW9uVGltZShm aWxlUGF0aCwgdGltZSkgPyB0aW1lIDogTnVsbG9wdDsKK30KKworVmVjdG9yPFJlZlB0cjxTZWN1 cml0eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2Vz TW9kaWZpZWRTaW5jZSh0aW1lX3QgdGltZSkKK3sKKyAgICBWZWN0b3I8UmVmUHRyPFNlY3VyaXR5 T3JpZ2luPj4gZGVsZXRlZERhdGFiYXNlT3JpZ2luczsKKworICAgIGZvciAoY29uc3QgU3RyaW5n JiBvcmlnaW4gOiBtX29yaWdpbnMpIHsKKyAgICAgICAgU3RyaW5nIGZpbGVQYXRoID0gcGF0aEZv ckRhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIob3JpZ2luKTsKKworICAgICAgICBhdXRvIG1v ZGlmaWNhdGlvblRpbWUgPSBmaWxlTW9kaWZpY2F0aW9uVGltZShmaWxlUGF0aCk7CisgICAgICAg IGlmICghbW9kaWZpY2F0aW9uVGltZSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg IGlmIChtb2RpZmljYXRpb25UaW1lLnZhbHVlKCkgPj0gdGltZSkgeworICAgICAgICAgICAgcmVt b3ZlRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmlnaW4pOworCisgICAgICAgICAgICBk ZWxldGVkRGF0YWJhc2VPcmlnaW5zLmFwcGVuZChTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURh dGFiYXNlSWRlbnRpZmllcihvcmlnaW4pKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVy biBkZWxldGVkRGF0YWJhc2VPcmlnaW5zOworfQorCiBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luPj4gTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpvcmlnaW5zKCkgY29u c3QKIHsKICAgICBWZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3JpZ2luczsKQEAgLTE0 MywxMiArMTc2LDExIEBAIFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiBMb2NhbFN0b3JhZ2VE YXRhYmFzZVRyYWNrZXI6OmRldGFpbHMoKQogCiAgICAgZm9yIChjb25zdCBTdHJpbmcmIG9yaWdp biA6IG1fb3JpZ2lucykgewogICAgICAgICBTdHJpbmcgZmlsZVBhdGggPSBwYXRoRm9yRGF0YWJh c2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmlnaW4pOwotICAgICAgICB0aW1lX3QgdGltZTsKIAog ICAgICAgICBMb2NhbFN0b3JhZ2VEZXRhaWxzIGRldGFpbHM7CiAgICAgICAgIGRldGFpbHMub3Jp Z2luSWRlbnRpZmllciA9IG9yaWdpbi5pc29sYXRlZENvcHkoKTsKLSAgICAgICAgZGV0YWlscy5j cmVhdGlvblRpbWUgPSBnZXRGaWxlQ3JlYXRpb25UaW1lKGZpbGVQYXRoLCB0aW1lKSA/IHRpbWUg OiAwOwotICAgICAgICBkZXRhaWxzLm1vZGlmaWNhdGlvblRpbWUgPSBnZXRGaWxlTW9kaWZpY2F0 aW9uVGltZShmaWxlUGF0aCwgdGltZSkgPyB0aW1lIDogMDsKKyAgICAgICAgZGV0YWlscy5jcmVh dGlvblRpbWUgPSBmaWxlQ3JlYXRpb25UaW1lKGZpbGVQYXRoKTsKKyAgICAgICAgZGV0YWlscy5t b2RpZmljYXRpb25UaW1lID0gZmlsZU1vZGlmaWNhdGlvblRpbWUoZmlsZVBhdGgpOwogICAgICAg ICByZXN1bHQudW5jaGVja2VkQXBwZW5kKGRldGFpbHMpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFj a2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXIuaAppbmRleCA0NTJmM2Y1ZDRjYTA0YjAyYzRlMGIzZjUyNmNmNDRmNzU3MThl NGQyLi5iMDJlOGEwYWZmYTk5YWFlZGMxMmFiMTRlNDljYmRiODk2NWU1Y2I0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRy YWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXIuaApAQCAtNTUsNiArNTUsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBk ZWxldGVEYXRhYmFzZVdpdGhPcmlnaW4oV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKICAgICB2 b2lkIGRlbGV0ZUFsbERhdGFiYXNlcygpOwogCisgICAgLy8gUmV0dXJucyBhIHZlY3RvciBvZiB0 aGUgb3JpZ2lucyB3aG9zZSBkYXRhYmFzZXMgaGF2ZSBiZWVuIGRlbGV0ZWQuCisgICAgVmVjdG9y PFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IGRlbGV0ZURhdGFiYXNlc01vZGlmaWVk U2luY2UodGltZV90KTsKKwogICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmln aW4+PiBvcmlnaW5zKCkgY29uc3Q7CiAgICAgVmVjdG9yPExvY2FsU3RvcmFnZURldGFpbHM+IGRl dGFpbHMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuY3BwCmluZGV4IDA1OWMwN2IzNDVlOTRhN2M3MzZjMTVjNGI1ZDRiZTQxMjBl YjRhZjMuLjBmYmVmMTY4ZTVmNjQ3N2FhNGU2MDQ5OGQ4Nzk4ZmNhM2FiMzQ1MGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAK QEAgLTQzOCw2ICs0MzgsMjIgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmll cygpCiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFs bEVudHJpZXNJbnRlcm5hbCwgdGhpcykpOwogfQogCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxl dGVMb2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRTaW5jZSh0aW1lX3QgdGltZSwgc3RkOjpmdW5j dGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBSZWZQdHI8U3RvcmFnZU1h bmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRoaXMpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3N0 b3JhZ2VNYW5hZ2VyLCB0aW1lLCBjb21wbGV0aW9uSGFuZGxlcl0geworICAgICAgICBhdXRvIGRl bGV0ZWRPcmlnaW5zID0gc3RvcmFnZU1hbmFnZXItPm1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFj a2VyLT5kZWxldGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKHRpbWUpOworCisgICAgICAgIGZvciAo Y29uc3QgYXV0byYgb3JpZ2luIDogZGVsZXRlZE9yaWdpbnMpIHsKKyAgICAgICAgICAgIGZvciAo YXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogc3RvcmFnZU1hbmFnZXItPm1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3JpZ2luLmdldCgpKTsKKyAg ICAgICAgfQorCisgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChjb21wbGV0aW9uSGFu ZGxlcik7CisgICAgfSk7Cit9CisKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUxvY2FsU3Rv cmFnZU1hcChJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJ RCwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEm IHNlY3VyaXR5T3JpZ2luRGF0YSkKIHsKICAgICBzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVj dGlvbj4sIHVpbnQ2NF90PiBjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcihjb25uZWN0aW9u LCBzdG9yYWdlTWFwSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggNTY5YzNjNjUyYjRmMDVlNzIzMWU0YzJjZDFlM2U0NGI5 MzU5ZGQxOS4uOTM0MzA2ZmRmZjViZDMzNzA0ODY2ZDAzNzBkZDE2YWQ3Y2Q1ZDNmNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCkBA IC0yNyw2ICsyNyw3IEBACiAjZGVmaW5lIFN0b3JhZ2VNYW5hZ2VyX2gKIAogI2luY2x1ZGUgIkNv bm5lY3Rpb24uaCIKKyNpbmNsdWRlIDxjaHJvbm8+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4K ICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRTYWZlUmVm Q291bnRlZC5oPgpAQCAtNjYsNiArNjcsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZWxldGVFbnRy aWVzRm9yT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJik7CiAgICAgdm9pZCBk ZWxldGVBbGxFbnRyaWVzKCk7CiAKKyAgICB2b2lkIGRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNN b2RpZmllZFNpbmNlKHRpbWVfdCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFu ZGxlcik7CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU3RvcmFnZU1hbmFnZXIoY29uc3QgU3Ry aW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggZGZmMzZlM2Uz YjQwNjEwMWVhZTZhNDIxNzU0ZTFjM2E5Y2IyNWUwMS4uNThmZmMwMWUzYjA0MjZhZjdhZDk0ZWY3 YjAyNDIwNzBjMjc5MjFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YktleVZhbHVlU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtMTE4LDkgKzExOCw5IEBAIHN0YXRp YyB2b2lkIGRpZEdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oY29uc3QgVmVjdG9yPExvY2FsU3Rv cmFnZURldGFpbHM+JiBzdG9yCiAKICAgICAgICAgZGV0YWlsc01hcC5zZXQoV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlcjo6b3JpZ2luS2V5KCksIG9yaWdpbik7CiAgICAgICAgIGlmIChvcmlnaW5E ZXRhaWxzLmNyZWF0aW9uVGltZSkKLSAgICAgICAgICAgIGRldGFpbHNNYXAuc2V0KFdlYktleVZh bHVlU3RvcmFnZU1hbmFnZXI6OmNyZWF0aW9uVGltZUtleSgpLCBBUEk6OkRvdWJsZTo6Y3JlYXRl KG9yaWdpbkRldGFpbHMuY3JlYXRpb25UaW1lKSk7CisgICAgICAgICAgICBkZXRhaWxzTWFwLnNl dChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGlvblRpbWVLZXkoKSwgQVBJOjpEb3Vi bGU6OmNyZWF0ZShvcmlnaW5EZXRhaWxzLmNyZWF0aW9uVGltZS52YWx1ZU9yKDApKSk7CiAgICAg ICAgIGlmIChvcmlnaW5EZXRhaWxzLm1vZGlmaWNhdGlvblRpbWUpCi0gICAgICAgICAgICBkZXRh aWxzTWFwLnNldChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjptb2RpZmljYXRpb25UaW1lS2V5 KCksIEFQSTo6RG91YmxlOjpjcmVhdGUob3JpZ2luRGV0YWlscy5tb2RpZmljYXRpb25UaW1lKSk7 CisgICAgICAgICAgICBkZXRhaWxzTWFwLnNldChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpt b2RpZmljYXRpb25UaW1lS2V5KCksIEFQSTo6RG91YmxlOjpjcmVhdGUob3JpZ2luRGV0YWlscy5t b2RpZmljYXRpb25UaW1lLnZhbHVlT3IoMCkpKTsKIAogICAgICAgICByZXN1bHQudW5jaGVja2Vk QXBwZW5kKEltbXV0YWJsZURpY3Rpb25hcnk6OmNyZWF0ZShXVEY6Om1vdmUoZGV0YWlsc01hcCkp KTsKICAgICB9Cg==