46197 2010-09-21 10:04:23 -0700 [Chromium] Plumb the IDBTransansaction's id 2010-09-22 02:13:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow andreip bulach caseq commit-queue steveblock oldest_to_newest 282383 0 jorlow 2010-09-21 10:04:23 -0700 [Chromium] Plumb the IDBTransansaction's id 282387 1 68254 jorlow 2010-09-21 10:07:26 -0700 Created attachment 68254 Patch 282423 2 andreip 2010-09-21 10:48:11 -0700 LGTM, hope we're not missing any other places that need this. We'll find out. 282547 3 68254 commit-queue 2010-09-21 14:04:15 -0700 Comment on attachment 68254 Patch Clearing flags on attachment: 68254 Committed r67986: <http://trac.webkit.org/changeset/67986> 282548 4 commit-queue 2010-09-21 14:04:20 -0700 All reviewed patches have been landed. Closing bug. 282855 5 caseq 2010-09-22 02:13:25 -0700 This change apparently broke IndexedDBBrowserTest.CursorTest and IndexedDBBrowserTest.KeyPathTest on Linux Perf tests bot: http://build.chromium.org/buildbot/waterfall.fyi/waterfall?builder=Linux+Perf+(webkit.org) http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=IndexedDBBrowserTest.KeyPathTest%2CIndexedDBBrowserTest.CursorTest&useWebKitCanary=true&testType=browser_tests 68254 2010-09-21 10:07:26 -0700 2010-09-21 14:04:15 -0700 Patch bug-46197-20100921180723.patch text/plain 15348 jorlow ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDM2MDJmZjIyOGMyMTQ1NTk5N2M2NDg2MTk2OGJlNWUxZWQzY2Q4YTIu LmFjZGE0NDYxZTA1ZDY2OWFkMGIwNzg1ZWIyNGUwNmUzMDYwYTA4YjggMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDQzIEBACisyMDEwLTA5LTIxICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtDaHJvbWl1bV0gUGx1bWIgdGhlIElEQlRyYW5zYW5zYWN0aW9uJ3MgaWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTk3CisKKyAgICAgICAgTmV4 dCBzdGVwLCBhZGQgdGhlIHBsdW1iaW5nIHRvIENocm9taXVtLiAgVGhlbiB3ZSBhZGQgY29kZSB0 byBXZWJLaXQKKyAgICAgICAgdGhhdCB1c2VzIGl0IChhbmQgdGFrZSBvdXQgdGhlIGRlZmF1bHQg SURCVHJhbnNhY3Rpb24gcGFyYW0pLgorCisgICAgICAgICogcHVibGljL1dlYklEQkN1cnNvci5o OgorICAgICAgICAoV2ViS2l0OjpXZWJJREJDdXJzb3I6OmtleSk6CisgICAgICAgIChXZWJLaXQ6 OldlYklEQkN1cnNvcjo6dmFsdWUpOgorICAgICAgICAqIHB1YmxpYy9XZWJJREJGYWN0b3J5Lmg6 CisgICAgICAgIChXZWJLaXQ6OldlYklEQkZhY3Rvcnk6Om9wZW4pOgorICAgICAgICAqIHB1Ymxp Yy9XZWJJREJJbmRleC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJJbmRleDo6b3Blbk9iamVj dEN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4OjpvcGVuQ3Vyc29yKToKKyAg ICAgICAgKFdlYktpdDo6V2ViSURCSW5kZXg6OmdldE9iamVjdCk6CisgICAgICAgIChXZWJLaXQ6 OldlYklEQkluZGV4OjpnZXQpOgorICAgICAgICAqIHB1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9yZTo6Z2V0KToKKyAgICAgICAgKFdl YktpdDo6V2ViSURCT2JqZWN0U3RvcmU6OnB1dCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQk9i amVjdFN0b3JlOjpyZW1vdmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9yZTo6 Y3JlYXRlSW5kZXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9yZTo6cmVtb3Zl SW5kZXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9yZTo6b3BlbkN1cnNvcik6 CisgICAgICAgICogc3JjL1dlYklEQkluZGV4SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YklEQkluZGV4SW1wbDo6b3BlbkN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4 SW1wbDo6b3Blbk9iamVjdEN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4SW1w bDo6Z2V0T2JqZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCSW5kZXhJbXBsOjpnZXQpOgor ICAgICAgICAqIHNyYy9XZWJJREJJbmRleEltcGwuaDoKKyAgICAgICAgKiBzcmMvV2ViSURCT2Jq ZWN0U3RvcmVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSURCT2JqZWN0U3RvcmVJbXBs OjpnZXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9yZUltcGw6OnB1dCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYklEQk9iamVjdFN0b3JlSW1wbDo6cmVtb3ZlKToKKyAgICAgICAg KFdlYktpdDo6V2ViSURCT2JqZWN0U3RvcmVJbXBsOjpvcGVuQ3Vyc29yKToKKyAgICAgICAgKiBz cmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmg6CisKIDIwMTAtMDktMjAgIElseWEgVGlraG9ub3Zz a3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZl bGRtYW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkN1cnNvci5o IGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJDdXJzb3IuaAppbmRleCBmNDdhNDRjYmM4 ZTRhZWIyNTlhYjQ3YjMxOTA3NGFhYzYxMDU4ZmVhLi4wNWJkNTFhYTczYTY0ZTI5ZTVlOWE0NWVi ZmZjOGUyMjI1NDA4MTQyIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklE QkN1cnNvci5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCQ3Vyc29yLmgKQEAg LTQ5LDIxICs0OSw4IEBAIHB1YmxpYzoKICAgICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgICAgICByZXR1cm4gV2ViSURCS2V5OjpjcmVhdGVJbnZhbGlkKCk7CiAgICAgfQot ICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGxlZ2FjeSB2ZXJzaW9uIG9mIHZhbHVlKCkgKHRoZSBm aXJzdCB2ZXJzaW9uKSBhcyBzb29uIGFzIGEgV2ViS2l0IHJvbGwgaGFwcGVucy4KLSAgICB2aXJ0 dWFsIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSB2YWx1ZSgpIGNvbnN0Ci0gICAgewotICAgICAg ICBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUgc2VyaWFsaXplZFNjcmlwdFZhbHVlOwotICAgICAg ICBXZWJJREJLZXkgaWRiS2V5OwotICAgICAgICB2YWx1ZShzZXJpYWxpemVkU2NyaXB0VmFsdWUs IGlkYktleSk7Ci0gICAgICAgIFdFQktJVF9BU1NFUlQoIXNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5p c051bGwoKSk7Ci0gICAgICAgIFdFQktJVF9BU1NFUlQoaWRiS2V5LnR5cGUoKSA9PSBXZWJJREJL ZXk6OkludmFsaWRUeXBlKTsKLSAgICAgICAgcmV0dXJuIHNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTsK LSAgICB9CiAgICAgLy8gT25lIG9yIHRoZSBvdGhlciB3aWxsIHNldCwgZGVwZW5kaW5nIG9uIHdo YXQgdHlwZSBvZiBjdXJzb3IgdGhpcyBpcy4KLSAgICB2aXJ0dWFsIHZvaWQgdmFsdWUoV2ViU2Vy aWFsaXplZFNjcmlwdFZhbHVlJiBzZXJpYWxpemVkU2NyaXB0VmFsdWUsIFdlYklEQktleSYgaWRi S2V5KSBjb25zdAotICAgIHsKLSAgICAgICAgc2VyaWFsaXplZFNjcmlwdFZhbHVlID0gdmFsdWUo KTsKLSAgICB9CisgICAgdmlydHVhbCB2b2lkIHZhbHVlKFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSYgc2VyaWFsaXplZFNjcmlwdFZhbHVlLCBXZWJJREJLZXkmIGlkYktleSkgY29uc3QgeyBXRUJL SVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoY29u c3QgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlJiwgV2ViSURCQ2FsbGJhY2tzKikgeyBXRUJLSVRf QVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgY29udGludWVGdW5jdGlv bihjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFja3MqKSB7IFdFQktJVF9BU1NFUlRfTk9U X1JFQUNIRUQoKTsgfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJG YWN0b3J5LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkZhY3RvcnkuaAppbmRleCBh YjA1YjA2NGQ2ZTk0ZjI4YzBmODYyOTRlMzk5ZWU1ZDk1OWY1ZjFlLi5jZDQ5ZjljZWZkN2RlYjcw YmI4ZmMwMDBkY2JjMDg2NDllZTI2ZTVkIDEwMDc1NQotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYklEQkZhY3RvcnkuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkZh Y3RvcnkuaApAQCAtNTIsMTUgKzUyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfldlYklEQkZh Y3RvcnkoKSB7IH0KIAogICAgIC8vIFRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gb2Ygb3BlbiBp Z25vcmVzIHRoZSBXZWJGcmFtZSogcGFyYW1ldGVyLgotICAgIHZpcnR1YWwgdm9pZCBvcGVuKGNv bnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkZXNjcmlwdGlvbiwgV2ViSURC Q2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYlNlY3VyaXR5T3JpZ2luJiBvcmlnaW4sIFdl YkZyYW1lKiB3ZWJGcmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkYXRhRGlyKQotICAgIHsKLSAgICAg ICAgb3BlbihuYW1lLCBkZXNjcmlwdGlvbiwgY2FsbGJhY2tzLCBvcmlnaW4sIHdlYkZyYW1lKTsK LSAgICB9Ci0gICAgLy8gRklYTUU6IERlbGV0ZSBzb29uLiAgQ29tcGF0YWJpbGl0eSBoYWNrLgot ICAgIHZpcnR1YWwgdm9pZCBvcGVuKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3Ry aW5nJiBkZXNjcmlwdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYlNl Y3VyaXR5T3JpZ2luJiBvcmlnaW4sIFdlYkZyYW1lKiB3ZWJGcmFtZSkKLSAgICB7Ci0gICAgICAg IG9wZW4obmFtZSwgZGVzY3JpcHRpb24sIGNhbGxiYWNrcywgb3JpZ2luLCB3ZWJGcmFtZSwgIi90 bXAvdGVtcG9yYXJ5LWluZGV4ZWQtZGItZmlsZXMiKTsKLSAgICB9CisgICAgdmlydHVhbCB2b2lk IG9wZW4oY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJTdHJpbmcmIGRlc2NyaXB0aW9u LCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mIG9y aWdpbiwgV2ViRnJhbWUqIHdlYkZyYW1lLCBjb25zdCBXZWJTdHJpbmcmIGRhdGFEaXIpIHsgV0VC S0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgYWJvcnRQZW5k aW5nVHJhbnNhY3Rpb25zKGNvbnN0IFdlYlZlY3RvcjxpbnQ+JiBwZW5kaW5nSURzKSB7IFdFQktJ VF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQogfTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSURCSW5kZXguaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCSW5k ZXguaAppbmRleCBlMDNmYzU4YWI2OTRkYzNiNjQyNGQ5YjkyNjRkNDIxMTFlYjMzYzMyLi45NDNj MjZkMjBkZTg2MjVjZWU0OWQzNmIyOTY5MWRmYjFjMTIzNzMxIDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYklEQkluZGV4LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJJREJJbmRleC5oCkBAIC02MCwxMCArNjAsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogCi0gICAgdmlydHVhbCB2b2lkIG9wZW5PYmplY3RDdXJzb3IoY29u c3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxi YWNrcyopIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9Ci0gICAgdmlydHVhbCB2b2lk IG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rp b24sIFdlYklEQkNhbGxiYWNrcyopIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9Ci0g ICAgdmlydHVhbCB2b2lkIGdldE9iamVjdChjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFj a3MqKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQotICAgIHZpcnR1YWwgdm9pZCBn ZXQoY29uc3QgV2ViSURCS2V5JiwgV2ViSURCQ2FsbGJhY2tzKikgeyBXRUJLSVRfQVNTRVJUX05P VF9SRUFDSEVEKCk7IH0KKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBkZWZhdWx0IHBhcmFtZXRl cnMgZm9yIHRyYW5zYWN0aW9uSWRzLgorICAgIHZpcnR1YWwgdm9pZCBvcGVuT2JqZWN0Q3Vyc29y KGNvbnN0IFdlYklEQktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJD YWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCA9IDApIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVB Q0hFRCgpOyB9CisgICAgdmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFu Z2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFu c2FjdGlvbklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KKyAgICB2aXJ0 dWFsIHZvaWQgZ2V0T2JqZWN0KGNvbnN0IFdlYklEQktleSYsIFdlYklEQkNhbGxiYWNrcyosIGlu dCB0cmFuc2FjdGlvbklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KKyAg ICB2aXJ0dWFsIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYsIFdlYklEQkNhbGxiYWNrcyosIGlu dCB0cmFuc2FjdGlvbklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJP YmplY3RTdG9yZS5oCmluZGV4IDc0NTJiZTk5YjQwYzBiZDIyNjk1MDQyNzEwYzlkYThiZjliMjA5 ZDAuLmZlMWMyNzljNDU3NjAyZjY1OTk3ZGMzZDRlNGI1MWFhM2ZhYzNjZTMgMTAwNzU1Ci0tLSBh L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaAorKysgYi9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYklEQk9iamVjdFN0b3JlLmgKQEAgLTU1LDM2ICs1NSwyMCBAQCBw dWJsaWM6CiAgICAgICAgIFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0 dXJuIFdlYkRPTVN0cmluZ0xpc3QoKTsKICAgICB9Ci0gICAgdmlydHVhbCB2b2lkIGdldChjb25z dCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKikKLSAgICB7Ci0gICAgICAgIFdFQktJ VF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICB9Ci0gICAgdmlydHVhbCB2b2lkIHB1dChjb25z dCBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUmIHZhbHVlLCBjb25zdCBXZWJJREJLZXkmIGtleSwg Ym9vbCBhZGRPbmx5LCBXZWJJREJDYWxsYmFja3MqKQotICAgIHsKLSAgICAgICAgV0VCS0lUX0FT U0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLSAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlKGNvbnN0 IFdlYklEQktleSYga2V5LCBXZWJJREJDYWxsYmFja3MqKQotICAgIHsKLSAgICAgICAgV0VCS0lU X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLSAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlSW5k ZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJTdHJpbmcmIGtleVBhdGgsIGJvb2wg dW5pcXVlLCBXZWJJREJDYWxsYmFja3MqKQotICAgIHsKLSAgICAgICAgV0VCS0lUX0FTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgIH0KKworICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGRlZmF1bHQg cGFyYW1ldGVycyBmb3IgdHJhbnNhY3Rpb25JZHMuCisgICAgdmlydHVhbCB2b2lkIGdldChjb25z dCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiwgaW50IHRyYW5zYWN0aW9uSWQgPSAw KSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorICAgIHZpcnR1YWwgdm9pZCBwdXQo Y29uc3QgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlJiB2YWx1ZSwgY29uc3QgV2ViSURCS2V5JiBr ZXksIGJvb2wgYWRkT25seSwgV2ViSURCQ2FsbGJhY2tzKiwgaW50IHRyYW5zYWN0aW9uSWQgPSAw KSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorICAgIHZpcnR1YWwgdm9pZCByZW1v dmUoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlv bklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KKyAgICB2aXJ0dWFsIHZv aWQgY3JlYXRlSW5kZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJTdHJpbmcmIGtl eVBhdGgsIGJvb2wgdW5pcXVlLCBXZWJJREJDYWxsYmFja3MqKSB7IFdFQktJVF9BU1NFUlRfTk9U X1JFQUNIRUQoKTsgfQogICAgIC8vIFRyYW5zZmVycyBvd25lcnNoaXAgb2YgdGhlIFdlYklEQklu ZGV4IHRvIHRoZSBjYWxsZXIuCiAgICAgdmlydHVhbCBXZWJJREJJbmRleCogaW5kZXgoY29uc3Qg V2ViU3RyaW5nJiBuYW1lKQogICAgIHsKICAgICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9Ci0gICAgdmlydHVhbCB2b2lkIHJlbW92ZUlu ZGV4KGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgV2ViSURCQ2FsbGJhY2tzKikKLSAgICB7Ci0gICAg ICAgIFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICB9Ci0gICAgdmlydHVhbCB2b2lk IG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rp b24sIFdlYklEQkNhbGxiYWNrcyopCi0gICAgewotICAgICAgICBXRUJLSVRfQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgfQorICAgIHZpcnR1YWwgdm9pZCByZW1vdmVJbmRleChjb25zdCBXZWJT dHJpbmcmIG5hbWUsIFdlYklEQkNhbGxiYWNrcyopIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOyB9CisgICAgdmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2Um LCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2Fj dGlvbklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICAvLyBGSVhN RTogZmluaXNoLgogfTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJ bmRleEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuY3BwCmlu ZGV4IGMwNDlhYWM0YjhiZDA2NDk0ZTYwYjY0MzYwZTQ3M2IyZjdmMDkyMGYuLjExMDRmYmFmMDk0 YTc3MWYzZmU1ZTM2ZmQ2MDg3NGY0MTkzYmVkOGMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViSURCSW5kZXhJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklE QkluZGV4SW1wbC5jcHAKQEAgLTY4LDIzICs2OCwyNyBAQCBib29sIFdlYklEQkluZGV4SW1wbDo6 dW5pcXVlKCkgY29uc3QKICAgICByZXR1cm4gbV9iYWNrZW5kLT51bmlxdWUoKTsKIH0KIAotdm9p ZCBXZWJJREJJbmRleEltcGw6Om9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmIGtleVJh bmdlLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tz KQordm9pZCBXZWJJREJJbmRleEltcGw6Om9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2Um IGtleVJhbmdlLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2Fs bGJhY2tzLCBpbnQgdHJhbnNhY3Rpb25JZCkKIHsKKyAgICBBU1NFUlRfVU5VU0VEKHRyYW5zYWN0 aW9uSWQsICF0cmFuc2FjdGlvbklkKTsgLy8gRklYTUU6IFBhc3MgdGhlIHRyYW5zYWN0aW9uIGlu LgogICAgIG1fYmFja2VuZC0+b3BlbkN1cnNvcihrZXlSYW5nZSwgZGlyZWN0aW9uLCBJREJDYWxs YmFja3NQcm94eTo6Y3JlYXRlKGNhbGxiYWNrcykpOwogfQogCi12b2lkIFdlYklEQkluZGV4SW1w bDo6b3Blbk9iamVjdEN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYga2V5UmFuZ2UsIHVuc2ln bmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MpCit2b2lkIFdl YklEQkluZGV4SW1wbDo6b3Blbk9iamVjdEN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYga2V5 UmFuZ2UsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFj a3MsIGludCB0cmFuc2FjdGlvbklkKQogeworICAgIEFTU0VSVF9VTlVTRUQodHJhbnNhY3Rpb25J ZCwgIXRyYW5zYWN0aW9uSWQpOyAvLyBGSVhNRTogUGFzcyB0aGUgdHJhbnNhY3Rpb24gaW4uCiAg ICAgbV9iYWNrZW5kLT5vcGVuT2JqZWN0Q3Vyc29yKGtleVJhbmdlLCBkaXJlY3Rpb24sIElEQkNh bGxiYWNrc1Byb3h5OjpjcmVhdGUoY2FsbGJhY2tzKSk7CiB9CiAKLXZvaWQgV2ViSURCSW5kZXhJ bXBsOjpnZXRPYmplY3QoY29uc3QgV2ViSURCS2V5JiBrZXlSYW5nZSwgV2ViSURCQ2FsbGJhY2tz KiBjYWxsYmFja3MpCit2b2lkIFdlYklEQkluZGV4SW1wbDo6Z2V0T2JqZWN0KGNvbnN0IFdlYklE QktleSYga2V5UmFuZ2UsIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzLCBpbnQgdHJhbnNhY3Rp b25JZCkKIHsKKyAgICBBU1NFUlRfVU5VU0VEKHRyYW5zYWN0aW9uSWQsICF0cmFuc2FjdGlvbklk KTsgLy8gRklYTUU6IFBhc3MgdGhlIHRyYW5zYWN0aW9uIGluLgogICAgIG1fYmFja2VuZC0+Z2V0 T2JqZWN0KGtleVJhbmdlLCBJREJDYWxsYmFja3NQcm94eTo6Y3JlYXRlKGNhbGxiYWNrcykpOwog fQogCi12b2lkIFdlYklEQkluZGV4SW1wbDo6Z2V0KGNvbnN0IFdlYklEQktleSYga2V5UmFuZ2Us IFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQordm9pZCBXZWJJREJJbmRleEltcGw6OmdldChj b25zdCBXZWJJREJLZXkmIGtleVJhbmdlLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgaW50 IHRyYW5zYWN0aW9uSWQpCiB7CisgICAgQVNTRVJUX1VOVVNFRCh0cmFuc2FjdGlvbklkLCAhdHJh bnNhY3Rpb25JZCk7IC8vIEZJWE1FOiBQYXNzIHRoZSB0cmFuc2FjdGlvbiBpbi4KICAgICBtX2Jh Y2tlbmQtPmdldChrZXlSYW5nZSwgSURCQ2FsbGJhY2tzUHJveHk6OmNyZWF0ZShjYWxsYmFja3Mp KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwu aCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmgKaW5kZXggMjEwODAwMWNj ZGMyZjc5OGVmMDhkZWJkNzg5ODc5ZTJiYjMyYTkwOS4uMDI2NTZmZmI3NmE1MzNkNTJiYjRmZDBm ZDg5NTZlYTJlZWE1Y2I3MSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJ bmRleEltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5oCkBA IC00NiwxMCArNDYsMTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgV2ViU3RyaW5nIGtleVBhdGgo KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgdW5pcXVlKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFs IHZvaWQgb3Blbk9iamVjdEN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYsIHVuc2lnbmVkIHNo b3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKik7IAotICAgIHZpcnR1YWwgdm9pZCBvcGVu Q3Vyc29yKGNvbnN0IFdlYklEQktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBX ZWJJREJDYWxsYmFja3MqKTsKLSAgICB2aXJ0dWFsIHZvaWQgZ2V0T2JqZWN0KGNvbnN0IFdlYklE QktleSYsIFdlYklEQkNhbGxiYWNrcyopOwotICAgIHZpcnR1YWwgdm9pZCBnZXQoY29uc3QgV2Vi SURCS2V5JiwgV2ViSURCQ2FsbGJhY2tzKik7CisgICAgdmlydHVhbCB2b2lkIG9wZW5PYmplY3RD dXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdl YklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsgCisgICAgdmlydHVhbCB2b2lkIG9w ZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24s IFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsKKyAgICB2aXJ0dWFsIHZvaWQg Z2V0T2JqZWN0KGNvbnN0IFdlYklEQktleSYsIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2Fj dGlvbklkKTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYsIFdlYklEQkNh bGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsKIAogcHJpdmF0ZToKICAgICBXVEY6OlJlZlB0 cjxXZWJDb3JlOjpJREJJbmRleEJhY2tlbmRJbnRlcmZhY2U+IG1fYmFja2VuZDsKZGlmZiAtLWdp dCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcCBiL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcAppbmRleCAxYWQxZDlmM2U0 NzM4YTc3NGYzYjY2MTRiMjA2ZjYxYTNhYjJlYzAyLi41MDc1NzBmNjRiM2JmNDhkNzg0YTg2NTI5 MTZiZGM1MjM3ZWY1ZmZkIDEwMDc1NQotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQk9i amVjdFN0b3JlSW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RT dG9yZUltcGwuY3BwCkBAIC02NSwxOCArNjUsMjEgQEAgV2ViRE9NU3RyaW5nTGlzdCBXZWJJREJP YmplY3RTdG9yZUltcGw6OmluZGV4TmFtZXMoKSBjb25zdAogICAgIHJldHVybiBtX29iamVjdFN0 b3JlLT5pbmRleE5hbWVzKCk7CiB9CiAKLXZvaWQgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjpnZXQo Y29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQordm9pZCBX ZWJJREJPYmplY3RTdG9yZUltcGw6OmdldChjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2Fs bGJhY2tzKiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlvbklkKQogeworICAgIEFTU0VSVF9VTlVT RUQodHJhbnNhY3Rpb25JZCwgIXRyYW5zYWN0aW9uSWQpOyAvLyBGSVhNRTogUGFzcyB0aGUgdHJh bnNhY3Rpb24gaW4uCiAgICAgbV9vYmplY3RTdG9yZS0+Z2V0KGtleSwgSURCQ2FsbGJhY2tzUHJv eHk6OmNyZWF0ZShjYWxsYmFja3MpKTsKIH0KIAotdm9pZCBXZWJJREJPYmplY3RTdG9yZUltcGw6 OnB1dChjb25zdCBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUmIHZhbHVlLCBjb25zdCBXZWJJREJL ZXkmIGtleSwgYm9vbCBhZGRPbmx5LCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcykKK3ZvaWQg V2ViSURCT2JqZWN0U3RvcmVJbXBsOjpwdXQoY29uc3QgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVl JiB2YWx1ZSwgY29uc3QgV2ViSURCS2V5JiBrZXksIGJvb2wgYWRkT25seSwgV2ViSURCQ2FsbGJh Y2tzKiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlvbklkKQogeworICAgIEFTU0VSVF9VTlVTRUQo dHJhbnNhY3Rpb25JZCwgIXRyYW5zYWN0aW9uSWQpOyAvLyBGSVhNRTogUGFzcyB0aGUgdHJhbnNh Y3Rpb24gaW4uCiAgICAgbV9vYmplY3RTdG9yZS0+cHV0KHZhbHVlLCBrZXksIGFkZE9ubHksIElE QkNhbGxiYWNrc1Byb3h5OjpjcmVhdGUoY2FsbGJhY2tzKSk7CiB9CiAKLXZvaWQgV2ViSURCT2Jq ZWN0U3RvcmVJbXBsOjpyZW1vdmUoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzKQordm9pZCBXZWJJREJPYmplY3RTdG9yZUltcGw6OnJlbW92ZShjb25zdCBX ZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlv bklkKQogeworICAgIEFTU0VSVF9VTlVTRUQodHJhbnNhY3Rpb25JZCwgIXRyYW5zYWN0aW9uSWQp OyAvLyBGSVhNRTogUGFzcyB0aGUgdHJhbnNhY3Rpb24gaW4uCiAgICAgbV9vYmplY3RTdG9yZS0+ cmVtb3ZlKGtleSwgSURCQ2FsbGJhY2tzUHJveHk6OmNyZWF0ZShjYWxsYmFja3MpKTsKIH0KIApA QCAtOTgsOCArMTAxLDkgQEAgdm9pZCBXZWJJREJPYmplY3RTdG9yZUltcGw6OnJlbW92ZUluZGV4 KGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgV2ViSURCQ2FsbGJhY2tzKgogICAgIG1fb2JqZWN0U3Rv cmUtPnJlbW92ZUluZGV4KG5hbWUsIElEQkNhbGxiYWNrc1Byb3h5OjpjcmVhdGUoY2FsbGJhY2tz KSk7CiB9CiAKLXZvaWQgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjpvcGVuQ3Vyc29yKGNvbnN0IFdl YklEQktleVJhbmdlJiBrZXlSYW5nZSwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJD YWxsYmFja3MqIGNhbGxiYWNrcykKK3ZvaWQgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjpvcGVuQ3Vy c29yKGNvbnN0IFdlYklEQktleVJhbmdlJiBrZXlSYW5nZSwgdW5zaWduZWQgc2hvcnQgZGlyZWN0 aW9uLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgaW50IHRyYW5zYWN0aW9uSWQpCiB7Cisg ICAgQVNTRVJUX1VOVVNFRCh0cmFuc2FjdGlvbklkLCAhdHJhbnNhY3Rpb25JZCk7IC8vIEZJWE1F OiBQYXNzIHRoZSB0cmFuc2FjdGlvbiBpbi4KICAgICBtX29iamVjdFN0b3JlLT5vcGVuQ3Vyc29y KElEQktleVJhbmdlOjpjcmVhdGUoa2V5UmFuZ2UubGVmdCgpLCBrZXlSYW5nZS5yaWdodCgpLCBr ZXlSYW5nZS5mbGFncygpKSwgZGlyZWN0aW9uLCBJREJDYWxsYmFja3NQcm94eTo6Y3JlYXRlKGNh bGxiYWNrcykpOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQk9i amVjdFN0b3JlSW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUlt cGwuaAppbmRleCA5ZjMxMzY5YzMwYjE0MTVmMWI5MmM3MDg1Y2FkZWRhMDI3ODk5MjJiLi42ODg4 OGY0OWUzYWZiYTg5MTY2ZTI3YzYyMTgxNTBkYmUyMmVjNjAxIDEwMDc1NQotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmgKQEAgLTQ3LDE1ICs0NywxNSBAQCBwdWJsaWM6 CiAgICAgV2ViU3RyaW5nIGtleVBhdGgoKSBjb25zdDsKICAgICBXZWJET01TdHJpbmdMaXN0IGlu ZGV4TmFtZXMoKSBjb25zdDsKIAotICAgIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYga2V5LCBX ZWJJREJDYWxsYmFja3MqKTsKLSAgICB2b2lkIHB1dChjb25zdCBXZWJTZXJpYWxpemVkU2NyaXB0 VmFsdWUmIHZhbHVlLCBjb25zdCBXZWJJREJLZXkmIGtleSwgYm9vbCBhZGRPbmx5LCBXZWJJREJD YWxsYmFja3MqKTsKLSAgICB2b2lkIHJlbW92ZShjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURC Q2FsbGJhY2tzKik7CisgICAgdm9pZCBnZXQoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNh bGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsKKyAgICB2b2lkIHB1dChjb25zdCBXZWJTZXJp YWxpemVkU2NyaXB0VmFsdWUmIHZhbHVlLCBjb25zdCBXZWJJREJLZXkmIGtleSwgYm9vbCBhZGRP bmx5LCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCk7CisgICAgdm9pZCByZW1v dmUoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlv bklkKTsKIAogICAgIHZvaWQgY3JlYXRlSW5kZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25z dCBXZWJTdHJpbmcmIGtleVBhdGgsIGJvb2wgdW5pcXVlLCBXZWJJREJDYWxsYmFja3MqIGNhbGxi YWNrcyk7CiAgICAgV2ViSURCSW5kZXgqIGluZGV4KGNvbnN0IFdlYlN0cmluZyYgbmFtZSk7CiAg ICAgdm9pZCByZW1vdmVJbmRleChjb25zdCBXZWJTdHJpbmcmIG5hbWUsIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzKTsKIAotICAgIHZvaWQgb3BlbkN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5n ZSYsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKik7CisgICAgdm9p ZCBvcGVuQ3Vyc29yKGNvbnN0IFdlYklEQktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0 aW9uLCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCk7CiAKICBwcml2YXRlOgog ICAgIFdURjo6UmVmUHRyPFdlYkNvcmU6OklEQk9iamVjdFN0b3JlQmFja2VuZEludGVyZmFjZT4g bV9vYmplY3RTdG9yZTsK