148145 2015-08-18 15:28:30 -0700 More work on simplifying the WebSQL code 2015-08-19 13:19:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1118658 0 andersca 2015-08-18 15:28:30 -0700 More work on simplifying the WebSQL code 1118670 1 259305 andersca 2015-08-18 15:55:08 -0700 Created attachment 259305 Patch 1118672 2 commit-queue 2015-08-18 15:57:43 -0700 Attachment 259305 did not pass style-queue: ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:98: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:100: One space before end of line comments [whitespace/comments] [5] ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:101: One space before end of line comments [whitespace/comments] [5] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1118976 3 andersca 2015-08-19 13:19:34 -0700 Committed r188646: <http://trac.webkit.org/changeset/188646> 259305 2015-08-18 15:55:08 -0700 2015-08-18 16:24:05 -0700 Patch bug-148145-20150818155506.patch text/plain 12250 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE5MzE1Mzg2ZmQxMTE1 ODZiNWFkMmVmOWE3NzY1Zjk2M2Q3NWNlNS4uZDk4ZWI2Y2Y3ZjJkODQ4ODg3MWI2ODkxNjliYzQx NGEwOThlZDM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU2IEBACisyMDE1LTA4LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9yZSB3b3JrIG9u IHNpbXBsaWZ5aW5nIHRoZSBXZWJTUUwgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MTQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRWxpbWluYXRlIFNRTFRyYW5zYWN0aW9uOjpzZW5kVG9CYWNr ZW5kU3RhdGUuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uOjpzdGF0ZUZ1bmN0aW9uRm9y KToKKyAgICAgICAgQ2hhbmdlIHNlbmRUb0JhY2tlbmRTdGF0ZSB0byB1bnJlYWNoYWJsZVN0YXRl LAorCisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclRyYW5zYWN0aW9u Q2FsbGJhY2spOgorICAgICAgICBDYWxsIGRlbGl2ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2sg ZGlyZWN0bHkgYW5kIHNjaGVkdWxlIFJ1blN0YXRlbWVudHMgb24gdGhlIGJhY2tlbmQuCisKKyAg ICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNh bGxiYWNrKToKKyAgICAgICAgU2NoZWR1bGUgQ2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNh bGxiYWNrIG9uIHRoZSBiYWNrZW5kLgorCisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlv bjo6ZGVsaXZlclN0YXRlbWVudENhbGxiYWNrKToKKyAgICAgICAgRm9sZCBuZXh0U3RhdGVGb3JU cmFuc2FjdGlvbkVycm9yIGludG8gaGVyZS4gU2NoZWR1bGUgYmFja2VuZCBzdGF0ZXMgZXhwbGlj aXRseS4KKworICAgICAgICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJRdW90YUlu Y3JlYXNlQ2FsbGJhY2spOgorICAgICAgICBTY2hlZHVsZSBSdW5TdGF0ZW1lbnRzIG9uIHRoZSBi YWNrZW5kLgorCisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN1Y2Nl c3NDYWxsYmFjayk6CisgICAgICAgIFNjaGVkdWxlIENsZWFudXBBbmRUZXJtaW5hdGUgb24gdGhl IGJhY2tlbmQuCisKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uOjpjb21wdXRlTmV4 dFN0YXRlQW5kQ2xlYW51cElmTmVlZGVkKToKKyAgICAgICAgVGhlIHJldHVybiB2YWx1ZSBvZiB0 aGlzIGZ1bmN0aW9uIGlzbid0IHVzZWQgdG8gbWFrZSBpdCByZXR1cm4gdm9pZC4KKworICAgICAg ICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246Om5leHRTdGF0ZUZvclRyYW5zYWN0aW9uRXJyb3Ip OiBEZWxldGVkLgorICAgICAgICBSZW1vdmUgdGhpcywgaXQncyBiZWVuIGZvbGRlZCBpbnRvIGRl bGl2ZXJTdGF0ZW1lbnRDYWxsYmFjay4KKworICAgICAgICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rp b246OnNlbmRUb0JhY2tlbmRTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgIEdldCByaWQgb2YgdGhp cy4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uaDoKKyAg ICAgICAgVXBkYXRlIG1lbWJlciBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRh dGFiYXNlL1NRTFRyYW5zYWN0aW9uQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxU cmFuc2FjdGlvbkJhY2tlbmQ6Om9wZW5UcmFuc2FjdGlvbkFuZFByZWZsaWdodCk6CisgICAgICAg IEp1c3QgY2FsbCBydW5TdGF0ZW1lbnRzKCkgZGlyZWN0bHkuCisKKyAgICAgICAgKFdlYkNvcmU6 OlNRTFRyYW5zYWN0aW9uQmFja2VuZDo6Y2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxi YWNrKToKKyAgICAgICAgSnVzdCBjYWxsIGNsZWFudXBBbmRUZXJtaW5hdGUoKSBkaXJlY3RseS4K KyAgICAgICAgCisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbkJhY2tlbmQ6OnNob3Vs ZFBlcmZvcm1XaGlsZVBhdXNlZCk6IERlbGV0ZWQuCisgICAgICAgIEdldCByaWQgb2YgYW4gaU9T IG1lbWJlciBmdW5jdGlvbiB0aGF0J3Mgbm8gbG9uZ2VyIHVzZWQuCisKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uQmFja2VuZC5oOgorICAgICAgICBSZW1vdmUg bWVtYmVyIGZ1bmN0aW9uLgorCiAyMDE1LTA4LTE4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IHRoZSBjYWlybyBidWlsZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5j cHAKaW5kZXggZjk1ZTg1MDY1MzY4MGE1OGRmZmEyN2RiODAwYmM2MDAwOTc5OGQ2Yy4uYTZhOWE2 ZDQ0OWRjZjFhYjFlM2Q2YzdiZDNhNjViM2IyZmMwYTQxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5jcHAKQEAgLTk1LDEw ICs5NSwxMCBAQCBTUUxUcmFuc2FjdGlvbjo6U3RhdGVGdW5jdGlvbiBTUUxUcmFuc2FjdGlvbjo6 c3RhdGVGdW5jdGlvbkZvcihTUUxUcmFuc2FjdGlvblN0YQogICAgICAgICAmU1FMVHJhbnNhY3Rp b246OnVucmVhY2hhYmxlU3RhdGUsICAgICAgICAgICAgICAgIC8vIDEuIGlkbGUKICAgICAgICAg JlNRTFRyYW5zYWN0aW9uOjp1bnJlYWNoYWJsZVN0YXRlLCAgICAgICAgICAgICAgICAvLyAyLiBh Y3F1aXJlTG9jawogICAgICAgICAmU1FMVHJhbnNhY3Rpb246OnVucmVhY2hhYmxlU3RhdGUsICAg ICAgICAgICAgICAgIC8vIDMuIG9wZW5UcmFuc2FjdGlvbkFuZFByZWZsaWdodAotICAgICAgICAm U1FMVHJhbnNhY3Rpb246OnNlbmRUb0JhY2tlbmRTdGF0ZSwgICAgICAgICAgICAgIC8vIDQuIHJ1 blN0YXRlbWVudHMKKyAgICAgICAgJlNRTFRyYW5zYWN0aW9uOjp1bnJlYWNoYWJsZVN0YXRlLCAg ICAgICAgICAgICAgICAvLyA0LiBydW5TdGF0ZW1lbnRzCiAgICAgICAgICZTUUxUcmFuc2FjdGlv bjo6dW5yZWFjaGFibGVTdGF0ZSwgICAgICAgICAgICAgICAgLy8gNS4gcG9zdGZsaWdodEFuZENv bW1pdAotICAgICAgICAmU1FMVHJhbnNhY3Rpb246OnNlbmRUb0JhY2tlbmRTdGF0ZSwgICAgICAg ICAgICAgIC8vIDYuIGNsZWFudXBBbmRUZXJtaW5hdGUKLSAgICAgICAgJlNRTFRyYW5zYWN0aW9u OjpzZW5kVG9CYWNrZW5kU3RhdGUsICAgICAgICAgICAgICAvLyA3LiBjbGVhbnVwQWZ0ZXJUcmFu c2FjdGlvbkVycm9yQ2FsbGJhY2sKKyAgICAgICAgJlNRTFRyYW5zYWN0aW9uOjp1bnJlYWNoYWJs ZVN0YXRlLCAgICAgICAgICAgICAgICAvLyA2LiBjbGVhbnVwQW5kVGVybWluYXRlCisgICAgICAg ICZTUUxUcmFuc2FjdGlvbjo6dW5yZWFjaGFibGVTdGF0ZSwgICAgICAgICAgICAgICAgLy8gNy4g Y2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrCiAgICAgICAgICZTUUxUcmFuc2Fj dGlvbjo6ZGVsaXZlclRyYW5zYWN0aW9uQ2FsbGJhY2ssICAgICAgLy8gOC4KICAgICAgICAgJlNR TFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLCAvLyA5LgogICAg ICAgICAmU1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJTdGF0ZW1lbnRDYWxsYmFjaywgICAgICAgIC8v IDEwLgpAQCAtMTIyLDE3ICsxMjIsNiBAQCB2b2lkIFNRTFRyYW5zYWN0aW9uOjpyZXF1ZXN0VHJh bnNpdFRvU3RhdGUoU1FMVHJhbnNhY3Rpb25TdGF0ZSBuZXh0U3RhdGUpCiAgICAgbV9kYXRhYmFz ZS0+c2NoZWR1bGVUcmFuc2FjdGlvbkNhbGxiYWNrKHRoaXMpOwogfQogCi1TUUxUcmFuc2FjdGlv blN0YXRlIFNRTFRyYW5zYWN0aW9uOjpuZXh0U3RhdGVGb3JUcmFuc2FjdGlvbkVycm9yKCkKLXsK LSAgICBBU1NFUlQobV90cmFuc2FjdGlvbkVycm9yKTsKLSAgICBpZiAobV9lcnJvckNhbGxiYWNr V3JhcHBlci5oYXNDYWxsYmFjaygpKQotICAgICAgICByZXR1cm4gU1FMVHJhbnNhY3Rpb25TdGF0 ZTo6RGVsaXZlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjazsKLQotICAgIC8vIE5vIGVycm9yIGNh bGxiYWNrLCBzbyBmYXN0LWZvcndhcmQgdG86Ci0gICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMSAt IFJvbGxiYWNrIHRoZSB0cmFuc2FjdGlvbi4KLSAgICByZXR1cm4gU1FMVHJhbnNhY3Rpb25TdGF0 ZTo6Q2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrOwotfQotCiBTUUxUcmFuc2Fj dGlvblN0YXRlIFNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25DYWxsYmFjaygpCiB7 CiAgICAgYm9vbCBzaG91bGREZWxpdmVyRXJyb3JDYWxsYmFjayA9IGZhbHNlOwpAQCAtMTQ2LDEy ICsxMzUsMTMgQEAgU1FMVHJhbnNhY3Rpb25TdGF0ZSBTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclRy YW5zYWN0aW9uQ2FsbGJhY2soKQogICAgIH0KIAogICAgIC8vIFNwZWMgNC4zLjIgNTogSWYgdGhl IHRyYW5zYWN0aW9uIGNhbGxiYWNrIHdhcyBudWxsIG9yIHJhaXNlZCBhbiBleGNlcHRpb24sIGp1 bXAgdG8gdGhlIGVycm9yIGNhbGxiYWNrCi0gICAgU1FMVHJhbnNhY3Rpb25TdGF0ZSBuZXh0U3Rh dGUgPSBTUUxUcmFuc2FjdGlvblN0YXRlOjpSdW5TdGF0ZW1lbnRzOwogICAgIGlmIChzaG91bGRE ZWxpdmVyRXJyb3JDYWxsYmFjaykgewogICAgICAgICBtX3RyYW5zYWN0aW9uRXJyb3IgPSBTUUxF cnJvcjo6Y3JlYXRlKFNRTEVycm9yOjpVTktOT1dOX0VSUiwgInRoZSBTUUxUcmFuc2FjdGlvbkNh bGxiYWNrIHdhcyBudWxsIG9yIHRocmV3IGFuIGV4Y2VwdGlvbiIpOwotICAgICAgICBuZXh0U3Rh dGUgPSBTUUxUcmFuc2FjdGlvblN0YXRlOjpEZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNr OworICAgICAgICByZXR1cm4gZGVsaXZlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaygpOwogICAg IH0KLSAgICByZXR1cm4gbmV4dFN0YXRlOworCisgICAgbV9iYWNrZW5kLT5yZXF1ZXN0VHJhbnNp dFRvU3RhdGUoU1FMVHJhbnNhY3Rpb25TdGF0ZTo6UnVuU3RhdGVtZW50cyk7CisgICAgcmV0dXJu IFNRTFRyYW5zYWN0aW9uU3RhdGU6OklkbGU7CiB9CiAKIFNRTFRyYW5zYWN0aW9uU3RhdGUgU1FM VHJhbnNhY3Rpb246OmRlbGl2ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2soKQpAQCAtMTc2LDcg KzE2Niw4IEBAIFNRTFRyYW5zYWN0aW9uU3RhdGUgU1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJUcmFu c2FjdGlvbkVycm9yQ2FsbGJhY2soKQogICAgIGNsZWFyQ2FsbGJhY2tXcmFwcGVycygpOwogCiAg ICAgLy8gU3BlYyA0LjMuMi4xMDogUm9sbGJhY2sgdGhlIHRyYW5zYWN0aW9uLgotICAgIHJldHVy biBTUUxUcmFuc2FjdGlvblN0YXRlOjpDbGVhbnVwQWZ0ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJh Y2s7CisgICAgbV9iYWNrZW5kLT5yZXF1ZXN0VHJhbnNpdFRvU3RhdGUoU1FMVHJhbnNhY3Rpb25T dGF0ZTo6Q2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrKTsKKyAgICByZXR1cm4g U1FMVHJhbnNhY3Rpb25TdGF0ZTo6SWRsZTsKIH0KIAogU1FMVHJhbnNhY3Rpb25TdGF0ZSBTUUxU cmFuc2FjdGlvbjo6ZGVsaXZlclN0YXRlbWVudENhbGxiYWNrKCkKQEAgLTE5NCw5ICsxODUsMTgg QEAgU1FMVHJhbnNhY3Rpb25TdGF0ZSBTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN0YXRlbWVudENh bGxiYWNrKCkKIAogICAgIGlmIChyZXN1bHQpIHsKICAgICAgICAgbV90cmFuc2FjdGlvbkVycm9y ID0gU1FMRXJyb3I6OmNyZWF0ZShTUUxFcnJvcjo6VU5LTk9XTl9FUlIsICJ0aGUgc3RhdGVtZW50 IGNhbGxiYWNrIHJhaXNlZCBhbiBleGNlcHRpb24gb3Igc3RhdGVtZW50IGVycm9yIGNhbGxiYWNr IGRpZCBub3QgcmV0dXJuIGZhbHNlIik7Ci0gICAgICAgIHJldHVybiBuZXh0U3RhdGVGb3JUcmFu c2FjdGlvbkVycm9yKCk7CisKKyAgICAgICAgaWYgKG1fZXJyb3JDYWxsYmFja1dyYXBwZXIuaGFz Q2FsbGJhY2soKSkKKyAgICAgICAgICAgIHJldHVybiBkZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNh bGxiYWNrKCk7CisKKyAgICAgICAgLy8gTm8gZXJyb3IgY2FsbGJhY2ssIHNvIGZhc3QtZm9yd2Fy ZCB0bzoKKyAgICAgICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMSAtIFJvbGxiYWNrIHRoZSB0cmFu c2FjdGlvbi4KKyAgICAgICAgbV9iYWNrZW5kLT5yZXF1ZXN0VHJhbnNpdFRvU3RhdGUoU1FMVHJh bnNhY3Rpb25TdGF0ZTo6Q2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrKTsKKyAg ICAgICAgcmV0dXJuIFNRTFRyYW5zYWN0aW9uU3RhdGU6OklkbGU7CiAgICAgfQotICAgIHJldHVy biBTUUxUcmFuc2FjdGlvblN0YXRlOjpSdW5TdGF0ZW1lbnRzOworCisgICAgbV9iYWNrZW5kLT5y ZXF1ZXN0VHJhbnNpdFRvU3RhdGUoU1FMVHJhbnNhY3Rpb25TdGF0ZTo6UnVuU3RhdGVtZW50cyk7 CisgICAgcmV0dXJuIFNRTFRyYW5zYWN0aW9uU3RhdGU6OklkbGU7CiB9CiAKIFNRTFRyYW5zYWN0 aW9uU3RhdGUgU1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJRdW90YUluY3JlYXNlQ2FsbGJhY2soKQpA QCAtMjA2LDcgKzIwNiw4IEBAIFNRTFRyYW5zYWN0aW9uU3RhdGUgU1FMVHJhbnNhY3Rpb246OmRl bGl2ZXJRdW90YUluY3JlYXNlQ2FsbGJhY2soKQogICAgIGJvb2wgc2hvdWxkUmV0cnlDdXJyZW50 U3RhdGVtZW50ID0gbV9kYXRhYmFzZS0+dHJhbnNhY3Rpb25DbGllbnQoKS0+ZGlkRXhjZWVkUXVv dGEoJmRhdGFiYXNlKCkpOwogICAgIG1fYmFja2VuZC0+c2V0U2hvdWxkUmV0cnlDdXJyZW50U3Rh dGVtZW50KHNob3VsZFJldHJ5Q3VycmVudFN0YXRlbWVudCk7CiAKLSAgICByZXR1cm4gU1FMVHJh bnNhY3Rpb25TdGF0ZTo6UnVuU3RhdGVtZW50czsKKyAgICBtX2JhY2tlbmQtPnJlcXVlc3RUcmFu c2l0VG9TdGF0ZShTUUxUcmFuc2FjdGlvblN0YXRlOjpSdW5TdGF0ZW1lbnRzKTsKKyAgICByZXR1 cm4gU1FMVHJhbnNhY3Rpb25TdGF0ZTo6SWRsZTsKIH0KIAogU1FMVHJhbnNhY3Rpb25TdGF0ZSBT UUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN1Y2Nlc3NDYWxsYmFjaygpCkBAIC0yMjAsNyArMjIxLDgg QEAgU1FMVHJhbnNhY3Rpb25TdGF0ZSBTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN1Y2Nlc3NDYWxs YmFjaygpCiAKICAgICAvLyBTY2hlZHVsZSBhICJwb3N0LXN1Y2Nlc3MgY2FsbGJhY2siIHN0ZXAg dG8gcmV0dXJuIGNvbnRyb2wgdG8gdGhlIGRhdGFiYXNlIHRocmVhZCBpbiBjYXNlIHRoZXJlCiAg ICAgLy8gYXJlIGZ1cnRoZXIgdHJhbnNhY3Rpb25zIHF1ZXVlZCB1cCBmb3IgdGhpcyBEYXRhYmFz ZQotICAgIHJldHVybiBTUUxUcmFuc2FjdGlvblN0YXRlOjpDbGVhbnVwQW5kVGVybWluYXRlOwor ICAgIG1fYmFja2VuZC0+cmVxdWVzdFRyYW5zaXRUb1N0YXRlKFNRTFRyYW5zYWN0aW9uU3RhdGU6 OkNsZWFudXBBbmRUZXJtaW5hdGUpOworICAgIHJldHVybiBTUUxUcmFuc2FjdGlvblN0YXRlOjpJ ZGxlOwogfQogCiAvLyBUaGlzIHN0YXRlIGZ1bmN0aW9uIGlzIHVzZWQgYXMgYSBzdHViIGZ1bmN0 aW9uIHRvIHBsdWcgdW5pbXBsZW1lbnRlZCBzdGF0ZXMKQEAgLTIzMiwxMyArMjM0LDYgQEAgU1FM VHJhbnNhY3Rpb25TdGF0ZSBTUUxUcmFuc2FjdGlvbjo6dW5yZWFjaGFibGVTdGF0ZSgpCiAgICAg cmV0dXJuIFNRTFRyYW5zYWN0aW9uU3RhdGU6OkVuZDsKIH0KIAotU1FMVHJhbnNhY3Rpb25TdGF0 ZSBTUUxUcmFuc2FjdGlvbjo6c2VuZFRvQmFja2VuZFN0YXRlKCkKLXsKLSAgICBBU1NFUlQobV9u ZXh0U3RhdGUgIT0gU1FMVHJhbnNhY3Rpb25TdGF0ZTo6SWRsZSk7Ci0gICAgbV9iYWNrZW5kLT5y ZXF1ZXN0VHJhbnNpdFRvU3RhdGUobV9uZXh0U3RhdGUpOwotICAgIHJldHVybiBTUUxUcmFuc2Fj dGlvblN0YXRlOjpJZGxlOwotfQotCiB2b2lkIFNRTFRyYW5zYWN0aW9uOjpwZXJmb3JtUGVuZGlu Z0NhbGxiYWNrKCkKIHsKICAgICBjb21wdXRlTmV4dFN0YXRlQW5kQ2xlYW51cElmTmVlZGVkKCk7 CkBAIC0yNjIsNyArMjU3LDcgQEAgdm9pZCBTUUxUcmFuc2FjdGlvbjo6ZXhlY3V0ZVNRTChjb25z dCBTdHJpbmcmIHNxbFN0YXRlbWVudCwgY29uc3QgVmVjdG9yPFNRTFZhbHUKICAgICBtX2JhY2tl bmQtPmV4ZWN1dGVTUUwoV1RGOjptb3ZlKHN0YXRlbWVudCkpOwogfQogCi1ib29sIFNRTFRyYW5z YWN0aW9uOjpjb21wdXRlTmV4dFN0YXRlQW5kQ2xlYW51cElmTmVlZGVkKCkKK3ZvaWQgU1FMVHJh bnNhY3Rpb246OmNvbXB1dGVOZXh0U3RhdGVBbmRDbGVhbnVwSWZOZWVkZWQoKQogewogICAgIC8v IE9ubHkgaG9ub3IgdGhlIHJlcXVlc3RlZCBzdGF0ZSB0cmFuc2l0aW9uIGlmIHdlJ3JlIG5vdCBz dXBwb3NlZCB0byBiZQogICAgIC8vIGNsZWFuaW5nIHVwIGFuZCBzaHV0dGluZyBkb3duOgpAQCAt Mjc2LDEzICsyNzEsMTEgQEAgYm9vbCBTUUxUcmFuc2FjdGlvbjo6Y29tcHV0ZU5leHRTdGF0ZUFu ZENsZWFudXBJZk5lZWRlZCgpCiAgICAgICAgICAgICB8fCBtX25leHRTdGF0ZSA9PSBTUUxUcmFu c2FjdGlvblN0YXRlOjpEZWxpdmVyU3VjY2Vzc0NhbGxiYWNrKTsKIAogICAgICAgICBMT0coU3Rv cmFnZUFQSSwgIkNhbGxiYWNrICVzXG4iLCBuYW1lRm9yU1FMVHJhbnNhY3Rpb25TdGF0ZShtX25l eHRTdGF0ZSkpOwotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybjsKICAgICB9 CiAKICAgICBjbGVhckNhbGxiYWNrV3JhcHBlcnMoKTsKICAgICBtX25leHRTdGF0ZSA9IFNRTFRy YW5zYWN0aW9uU3RhdGU6OkNsZWFudXBBbmRUZXJtaW5hdGU7Ci0KLSAgICByZXR1cm4gdHJ1ZTsK IH0KIAogdm9pZCBTUUxUcmFuc2FjdGlvbjo6Y2xlYXJDYWxsYmFja1dyYXBwZXJzKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24u aCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uaApp bmRleCAzNDVjYWVjNjkzMzgwZmExN2E1OTk2Yjg2M2U5NDBhMTgyODJhNjkyLi4zMDc4NzM4NmEz M2M1NDdjOGE2YTEyZDJhMDMyNzBiNGQ1ZjRmZTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5oCkBAIC03Myw3ICs3Myw3IEBA IHByaXZhdGU6CiAKICAgICAvLyBTdGF0ZSBNYWNoaW5lIGZ1bmN0aW9uczoKICAgICB2aXJ0dWFs IFN0YXRlRnVuY3Rpb24gc3RhdGVGdW5jdGlvbkZvcihTUUxUcmFuc2FjdGlvblN0YXRlKSBvdmVy cmlkZTsKLSAgICBib29sIGNvbXB1dGVOZXh0U3RhdGVBbmRDbGVhbnVwSWZOZWVkZWQoKTsKKyAg ICB2b2lkIGNvbXB1dGVOZXh0U3RhdGVBbmRDbGVhbnVwSWZOZWVkZWQoKTsKIAogICAgIC8vIFN0 YXRlIGZ1bmN0aW9uczoKICAgICBTUUxUcmFuc2FjdGlvblN0YXRlIGRlbGl2ZXJUcmFuc2FjdGlv bkNhbGxiYWNrKCk7CkBAIC04Myw5ICs4Myw2IEBAIHByaXZhdGU6CiAgICAgU1FMVHJhbnNhY3Rp b25TdGF0ZSBkZWxpdmVyU3VjY2Vzc0NhbGxiYWNrKCk7CiAKICAgICBTUUxUcmFuc2FjdGlvblN0 YXRlIHVucmVhY2hhYmxlU3RhdGUoKTsKLSAgICBTUUxUcmFuc2FjdGlvblN0YXRlIHNlbmRUb0Jh Y2tlbmRTdGF0ZSgpOwotCi0gICAgU1FMVHJhbnNhY3Rpb25TdGF0ZSBuZXh0U3RhdGVGb3JUcmFu c2FjdGlvbkVycm9yKCk7CiAKICAgICBSZWY8RGF0YWJhc2U+IG1fZGF0YWJhc2U7CiAgICAgUmVm UHRyPFNRTFRyYW5zYWN0aW9uQmFja2VuZD4gbV9iYWNrZW5kOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbkJhY2tlbmQuY3BwIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbkJhY2tlbmQu Y3BwCmluZGV4IDFlZmQ3YzlmODg5Y2NkOTZhNWZmNmI4NmUxNjdhNTc0ZTc3OGZkYTQuLjVmNDNk MTQyM2MxY2JhNjVjZDIzNTJiY2YwMjk2NDI1MDhiNzU3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb25CYWNrZW5kLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uQmFja2Vu ZC5jcHAKQEAgLTUxNSwxNCArNTE1LDYgQEAgdm9pZCBTUUxUcmFuc2FjdGlvbkJhY2tlbmQ6OnBl cmZvcm1OZXh0U3RlcCgpCiAgICAgcnVuU3RhdGVNYWNoaW5lKCk7CiB9CiAKLSNpZiBQTEFURk9S TShJT1MpCi1ib29sIFNRTFRyYW5zYWN0aW9uQmFja2VuZDo6c2hvdWxkUGVyZm9ybVdoaWxlUGF1 c2VkKCkgY29uc3QKLXsKLSAgICAvLyBTUUxUcmFuc2FjdGlvbnMgc2hvdWxkIG9ubHkgcnVuLXdo aWxlLXBhdXNlZCBpZiB0aGV5IGhhdmUgcHJvZ3Jlc3NlZCBwYXNzZWQgdGhlIGZpcnN0IHRyYW5z YWN0aW9uIHN0ZXAuCi0gICAgcmV0dXJuIG1fbmV4dFN0YXRlICE9IFNRTFRyYW5zYWN0aW9uU3Rh dGU6OkFjcXVpcmVMb2NrOwotfQotI2VuZGlmCi0KIHZvaWQgU1FMVHJhbnNhY3Rpb25CYWNrZW5k OjpleGVjdXRlU1FMKHN0ZDo6dW5pcXVlX3B0cjxTUUxTdGF0ZW1lbnQ+IHN0YXRlbWVudEJhY2tl bmQpCiB7CiAgICAgaWYgKG1fZGF0YWJhc2UtPmRlbGV0ZWQoKSkKQEAgLTYzNSw3ICs2MjcsNyBA QCBTUUxUcmFuc2FjdGlvblN0YXRlIFNRTFRyYW5zYWN0aW9uQmFja2VuZDo6b3BlblRyYW5zYWN0 aW9uQW5kUHJlZmxpZ2h0KCkKICAgICB9CiAKICAgICAvLyBJZiB3ZSBoYXZlIG5vIGNhbGxiYWNr IHRvIG1ha2UsIHNraXAgcGFzcyB0byB0aGUgc3RhdGUgYWZ0ZXI6Ci0gICAgcmV0dXJuIFNRTFRy YW5zYWN0aW9uU3RhdGU6OlJ1blN0YXRlbWVudHM7CisgICAgcmV0dXJuIHJ1blN0YXRlbWVudHMo KTsKIH0KIAogU1FMVHJhbnNhY3Rpb25TdGF0ZSBTUUxUcmFuc2FjdGlvbkJhY2tlbmQ6OnJ1blN0 YXRlbWVudHMoKQpAQCAtODMxLDcgKzgyMyw3IEBAIFNRTFRyYW5zYWN0aW9uU3RhdGUgU1FMVHJh bnNhY3Rpb25CYWNrZW5kOjpjbGVhbnVwQWZ0ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2soCiAK ICAgICBBU1NFUlQoIW1fZGF0YWJhc2UtPnNxbGl0ZURhdGFiYXNlKCkudHJhbnNhY3Rpb25JblBy b2dyZXNzKCkpOwogCi0gICAgcmV0dXJuIFNRTFRyYW5zYWN0aW9uU3RhdGU6OkNsZWFudXBBbmRU ZXJtaW5hdGU7CisgICAgcmV0dXJuIGNsZWFudXBBbmRUZXJtaW5hdGUoKTsKIH0KIAogLy8gcmVx dWVzdFRyYW5zaXRUb1N0YXRlKCkgY2FuIGJlIGNhbGxlZCBmcm9tIHRoZSBmcm9udGVuZC4gSGVu Y2UsIGl0IHNob3VsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRh YmFzZS9TUUxUcmFuc2FjdGlvbkJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi ZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb25CYWNrZW5kLmgKaW5kZXggODMwMGFmNmEyNWQ5OGRkYzYx NzQwZGMzMTEzODc1OTI1NTYwMGJiMC4uZDNjMGE3YzRmNTg0NTM2YjQ0M2VmNDQwZDJlN2U2ZDM5 NDlhYzkwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9T UUxUcmFuc2FjdGlvbkJhY2tlbmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRh dGFiYXNlL1NRTFRyYW5zYWN0aW9uQmFja2VuZC5oCkBAIC02NSwxMCArNjUsNiBAQCBwdWJsaWM6 CiAgICAgdm9pZCBsb2NrQWNxdWlyZWQoKTsKICAgICB2b2lkIHBlcmZvcm1OZXh0U3RlcCgpOwog Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIGJvb2wgc2hvdWxkUGVyZm9ybVdoaWxlUGF1c2VkKCkg Y29uc3Q7Ci0jZW5kaWYKLQogICAgIERhdGFiYXNlKiBkYXRhYmFzZSgpIHsgcmV0dXJuIG1fZGF0 YWJhc2UuZ2V0KCk7IH0KICAgICBib29sIGlzUmVhZE9ubHkoKSB7IHJldHVybiBtX3JlYWRPbmx5 OyB9CiAgICAgdm9pZCBub3RpZnlEYXRhYmFzZVRocmVhZElzU2h1dHRpbmdEb3duKCk7Cg==