56808 2011-03-22 01:19:21 -0700 [chromium] Remove Gears from Chrome WebKit 2011-03-22 15:55:52 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 noel.gordon noel.gordon aa commit-queue ojan tony oldest_to_newest 371276 0 noel.gordon 2011-03-22 01:19:21 -0700 chrome bug http://code.google.com/p/chromium/issues/detail?id=51934 371282 1 86441 noel.gordon 2011-03-22 01:52:57 -0700 Created attachment 86441 Patch 371433 2 86441 tony 2011-03-22 10:00:25 -0700 Comment on attachment 86441 Patch I assume we will get rid of identity in a follow up patch? We'll need to have both function signatures and do a 3 sided patch. 371458 3 86441 commit-queue 2011-03-22 10:27:56 -0700 Comment on attachment 86441 Patch Clearing flags on attachment: 86441 Committed r81676: <http://trac.webkit.org/changeset/81676> 371459 4 commit-queue 2011-03-22 10:28:01 -0700 All reviewed patches have been landed. Closing bug. 371689 5 noel.gordon 2011-03-22 15:04:49 -0700 chromium win trys were ok for the record: http://build.chromium.org/p/tryserver.chromium/builders/win/builds/22412 http://build.chromium.org/p/tryserver.chromium/builders/win_layout/builds/581 http://build.chromium.org/p/tryserver.chromium/builders/win_layout_rel/builds/145 371753 6 noel.gordon 2011-03-22 15:55:52 -0700 > I assume we will get rid of identity in a follow up patch? We'll need to have both function signatures and do a 3 sided patch. Yes in a follow up patch, filed bug 56875 about that. 86441 2011-03-22 01:52:57 -0700 2011-03-22 10:27:56 -0700 Patch remove-gears.diff text/plain 15057 noel.gordon ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYWQ2NDZjZS4uYzcyODU4YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMS0wMy0yMiAgTm9lbCBHb3Jk b24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgR2VhcnMgZnJvbSBDaHJvbWl1 bSBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU2ODA4CisKKyAgICAgICAgR2VhcnMgaGFzIGJlZW4gcmVtb3ZlZCBmcm9tIENocm9taXVtIDEy LiBSZW1vdmUgR2VhcnMgZHJhZyBkcm9wIHN1cHBvcnQKKyAgICAgICAgZnJvbSBXZWJLaXQuIFRo YXQgd29yayBsZWFkIHRvIGh0dHA6Ly93ZWJraXQub3JnL2IvMjU5MTYsIGEgcHJvcG9zYWwgdG8K KyAgICAgICAgYWRkIG5hdGl2ZSBmaWxlIGRyYWcgZHJvcCwgYW5kIGl0cyBzdWJzZXF1ZW50IHN0 YW5kYXJkaXphdGlvbiBpbiBIVE1MNS4KKworICAgICAgICAqIHB1YmxpYy9XZWJCaW5kaW5ncy5o OgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgICogc3JjL1dlYkJpbmRpbmdz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0UmFuZ2VJbXBsKTogRklYTUUgbm90ZSBhZGRlZC4K KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6V2ViVmlld0ltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1Rh cmdldERyYWdFbnRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0 RHJhZ0xlYXZlKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcm9w KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXJPck92 ZXIpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDExLTAzLTIwICBCaWxsIEJ1 ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJh cnRoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQmluZGlu Z3MuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkJpbmRpbmdzLmgKaW5kZXgg Y2IzMzc4MS4uMzgyNTIyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQmluZGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJC aW5kaW5ncy5oCkBAIC0xMjcsMTcgKzEyNyw2IEBAIHB1YmxpYzoKICAgICAvLyB1bmRlZmluZWQu ICBJZiBpU3RyaW5nIGlzIGZhbHNlLCB0aGUgb3Bwb3NpdGUgaXMgdHJ1ZS4KICAgICBXRUJLSVRf QVBJIHN0YXRpYyB2b2lkIGV4dHJhY3RJZGVudGlmaWVyRGF0YShjb25zdCBOUElkZW50aWZpZXIm LCBjb25zdCBOUFVURjgqJiBzdHJpbmcsIGludDMyX3QmIG51bWJlciwgYm9vbCYgaXNTdHJpbmcp OwogCi0gICAgLy8gUmV0dXJuIHRydWUgKHN1Y2Nlc3MpIGlmIHRoZSBnaXZlbiBucG9iaiBpcyB0 aGUgY3VycmVudCBkcmFnIGV2ZW50IGluIGJyb3dzZXIgZGlzcGF0Y2gsCi0gICAgLy8gYW5kIGlz IGFjY2Vzc2libGUgYmFzZWQgb24gY29udGV4dCBleGVjdXRpb24gZnJhbWVzIGFuZCB0aGVpciBz ZWN1cml0eSBvcmlnaW5zIGFuZAotICAgIC8vIFdlYktpdCBjbGlwYm9hcmQgYWNjZXNzIHBvbGlj eS4gSWYgc28sIHJldHVybiB0aGUgZXZlbnQgaWQgYW5kIHRoZSBjbGlwYm9hcmQgZGF0YSAoV2Vi RHJhZ0RhdGEpLgotICAgIC8vIFRoaXMgb25seSB3b3JrcyB3aXRoIFY4LiAgSWYgY29tcGlsZWQg d2l0aG91dCBWOCwgaXQnbGwgYWx3YXlzIHJldHVybiBmYWxzZS4KLSAgICBXRUJLSVRfQVBJIHN0 YXRpYyBib29sIGdldERyYWdEYXRhKE5QT2JqZWN0KiBldmVudCwgaW50KiBldmVudElkLCBXZWJE cmFnRGF0YSopOwotCi0gICAgLy8gSW52b2tlIHRoZSBldmVudCBhY2Nlc3MgcG9saWN5IGNoZWNr cyBsaXN0ZWQgYWJvdmUgd2l0aCBHZXREcmFnRGF0YSgpLiAgTm8gbmVlZCBmb3IgY2xpcGJvYXJk Ci0gICAgLy8gZGF0YSBvciBldmVudF9pZCBvdXRwdXRzLCBqdXN0IGNvbmZpcm0gdGhlIGdpdmVu IG5wb2JqIGlzIHRoZSBjdXJyZW50ICYgYWNjZXNzaWJsZSBkcmFnIGV2ZW50LgotICAgIC8vIFRo aXMgb25seSB3b3JrcyB3aXRoIFY4LiAgSWYgY29tcGlsZWQgd2l0aG91dCBWOCwgaXQnbGwgYWx3 YXlzIHJldHVybiBmYWxzZS4KLSAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29sIGlzRHJhZ0V2ZW50 KE5QT2JqZWN0KiBldmVudCk7Ci0KICAgICAvLyBSZXR1cm4gdHJ1ZSAoc3VjY2VzcykgaWYgdGhl IGdpdmVuIG5wb2JqIGlzIGEgcmFuZ2Ugb2JqZWN0LgogICAgIC8vIElmIHNvLCByZXR1cm4gdGhh dCByYW5nZSBhcyBhIFdlYlJhbmdlIG9iamVjdC4KICAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29s IGdldFJhbmdlKE5QT2JqZWN0KiByYW5nZSwgV2ViUmFuZ2UqKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXcuaAppbmRleCAwODFmZGRiLi42MzgxOGFlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCkBAIC0yMjksNyArMjI5LDcgQEAgcHVibGljOgog ICAgIC8vIENhbGxiYWNrIG1ldGhvZHMgd2hlbiBhIGRyYWctYW5kLWRyb3Agb3BlcmF0aW9uIGlz IHRyeWluZyB0byBkcm9wCiAgICAgLy8gc29tZXRoaW5nIG9uIHRoZSBXZWJWaWV3LgogICAgIHZp cnR1YWwgV2ViRHJhZ09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJhZ0VudGVyKAotICAgICAgICBjb25z dCBXZWJEcmFnRGF0YSYsIGludCBpZGVudGl0eSwKKyAgICAgICAgY29uc3QgV2ViRHJhZ0RhdGEm LCBpbnQgaWRlbnRpdHksIC8vIEZJWE1FOiByZW1vdmUgaWRlbnRpdHkgZnJvbSB0aGlzIGZ1bmN0 aW9uIHNpZ25hdHVyZS4KICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25z dCBXZWJQb2ludCYgc2NyZWVuUG9pbnQsCiAgICAgICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBv cGVyYXRpb25zQWxsb3dlZCkgPSAwOwogICAgIHZpcnR1YWwgV2ViRHJhZ09wZXJhdGlvbiBkcmFn VGFyZ2V0RHJhZ092ZXIoCkBAIC0yMzksMTMgKzIzOSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgZHJhZ1RhcmdldERyb3AoCiAgICAgICAgIGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2lu dCwgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50KSA9IDA7CiAKLSAgICB2aXJ0dWFsIGludCBk cmFnSWRlbnRpdHkoKSA9IDA7Ci0KLSAgICAvLyBIZWxwZXIgbWV0aG9kIGZvciBkcmFnIGFuZCBk cm9wIHRhcmdldCBvcGVyYXRpb25zOiBvdmVycmlkZSB0aGUKLSAgICAvLyBkZWZhdWx0IGRyb3Ag ZWZmZWN0IHdpdGggZWl0aGVyIGEgImNvcHkiIChhY2NlcHQgdHJ1ZSkgb3IgIm5vbmUiCi0gICAg Ly8gKGFjY2VwdCBmYWxzZSkgZWZmZWN0LiAgUmV0dXJuIHRydWUgb24gc3VjY2Vzcy4KLSAgICB2 aXJ0dWFsIGJvb2wgc2V0RHJvcEVmZmVjdChib29sIGFjY2VwdCkgPSAwOwotCiAKICAgICAvLyBT dXBwb3J0IGZvciByZXNvdXJjZSBsb2FkaW5nIGluaXRpYXRlZCBieSBwbHVnaW5zIC0tLS0tLS0t LS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi QmluZGluZ3MuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3Bw CmluZGV4IDA4ODJlMzguLjY3ZWU5ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkJpbmRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJCaW5kaW5ncy5jcHAKQEAgLTM1LDI1ICszNSwxNyBAQAogI2luY2x1ZGUgIm5wcnVudGltZV9w cml2LmgiCiAKICNpZiBVU0UoVjgpCi0jaW5jbHVkZSAiQ2hyb21pdW1EYXRhT2JqZWN0LmgiCi0j aW5jbHVkZSAiQ2xpcGJvYXJkQ2hyb21pdW0uaCIKLSNpbmNsdWRlICJFdmVudE5hbWVzLmgiCi0j aW5jbHVkZSAiTW91c2VFdmVudC5oIgogI2luY2x1ZGUgIk5QVjhPYmplY3QuaCIgIC8vIGZvciBQ cml2YXRlSWRlbnRpZmllcgogI2luY2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5n U3RhdGUuaCIKICNpbmNsdWRlICJWOERPTVdyYXBwZXIuaCIKICNpbmNsdWRlICJWOEVsZW1lbnQu aCIKLSNpbmNsdWRlICJWOEV2ZW50LmgiCi0jaW5jbHVkZSAiVjhIZWxwZXJzLmgiCi0jaW5jbHVk ZSAiVjhIaWRkZW5Qcm9wZXJ0eU5hbWUuaCIKICNpbmNsdWRlICJWOE5QVXRpbHMuaCIKICNpbmNs dWRlICJWOFByb3h5LmgiCiAjaW5jbHVkZSAiVjhSYW5nZS5oIgogI2VsaWYgVVNFKEpTQykKICNp bmNsdWRlICJicmlkZ2UvYy9jX3V0aWxpdHkuaCIKICNlbmRpZgotI2luY2x1ZGUgIldlYkRyYWdE YXRhLmgiCiAjaW5jbHVkZSAiV2ViRWxlbWVudC5oIgogI2luY2x1ZGUgIldlYlJhbmdlLmgiCiAK QEAgLTIwOSw4MSArMjAxLDEwIEBAIHZvaWQgV2ViQmluZGluZ3M6OmV4dHJhY3RJZGVudGlmaWVy RGF0YShjb25zdCBOUElkZW50aWZpZXImIGlkZW50aWZpZXIsIGNvbnN0IE5QCiAKICNpZiBVU0Uo VjgpCiAKLXN0YXRpYyB2ODo6TG9jYWw8djg6OlZhbHVlPiBnZXRFdmVudChjb25zdCB2ODo6SGFu ZGxlPHY4OjpDb250ZXh0PiYgY29udGV4dCkKLXsKLSAgICByZXR1cm4gY29udGV4dC0+R2xvYmFs KCktPkdldEhpZGRlblZhbHVlKFY4SGlkZGVuUHJvcGVydHlOYW1lOjpldmVudCgpKTsKLX0KLQot c3RhdGljIGJvb2wgZ2V0RHJhZ0RhdGFJbXBsKE5QT2JqZWN0KiBucG9iaiwgaW50KiBldmVudElk LCBXZWJEcmFnRGF0YSogZGF0YSkKLXsKLSAgICBpZiAoIW5wb2JqKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgaWYgKG5wb2JqLT5fY2xhc3MgIT0gbnBTY3JpcHRPYmplY3RDbGFzcykKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRsZVNjb3BlOwot ICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0RW50 ZXJlZCgpOwotICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgLy8gR2V0IHRoZSBjdXJyZW50IFdlYkNvcmUgZXZlbnQuCi0gICAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IGN1cnJlbnRFdmVudChnZXRFdmVudChjb250ZXh0KSk7Ci0gICAgRXZlbnQq IGV2ZW50ID0gVjhFdmVudDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChj dXJyZW50RXZlbnQpKTsKLSAgICBpZiAoIWV2ZW50KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICAvLyBDaGVjayB0aGF0IHRoZSBnaXZlbiBucG9iaiBpcyB0aGF0IGV2ZW50LgotICAgIFY4 TlBPYmplY3QqIG9iamVjdCA9IHJlaW50ZXJwcmV0X2Nhc3Q8VjhOUE9iamVjdCo+KG5wb2JqKTsK LSAgICBFdmVudCogZ2l2ZW4gPSBWOEV2ZW50Ojp0b05hdGl2ZShvYmplY3QtPnY4T2JqZWN0KTsK LSAgICBpZiAoZ2l2ZW4gIT0gZXZlbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8v IENoZWNrIHRoZSBleGVjdXRpb24gZnJhbWVzIGFyZSBzYW1lIG9yaWdpbi4KLSAgICBWOFByb3h5 KiBjdXJyZW50ID0gVjhQcm94eTo6cmV0cmlldmUoVjhQcm94eTo6cmV0cmlldmVGcmFtZUZvckN1 cnJlbnRDb250ZXh0KCkpOwotICAgIEZyYW1lKiBmcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJh bWUoY29udGV4dCk7Ci0gICAgaWYgKCFjdXJyZW50IHx8ICFWOEJpbmRpbmdTZWN1cml0eTo6Y2Fu QWNjZXNzRnJhbWUoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwgZnJhbWUsIGZhbHNlKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCi0gICAgY29uc3QgRXZlbnROYW1lcyYgbmFtZXMoZXZlbnROYW1l cygpKTsKLSAgICBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZShldmVudC0+dHlwZSgpKTsK LQotICAgIGVudW0gRHJhZ1RhcmdldE1vdXNlRXZlbnRJZCB7Ci0gICAgICAgIERyYWdFbnRlcklk ID0gMSwgRHJhZ092ZXJJZCA9IDIsIERyYWdMZWF2ZUlkID0gMywgRHJvcElkID0gNAotICAgIH07 Ci0KLSAgICAvLyBUaGUgZXZlbnQgdHlwZSBzaG91bGQgYmUgYSBkcmFnIGV2ZW50LgotICAgIGlm IChldmVudFR5cGUgPT0gbmFtZXMuZHJhZ2VudGVyRXZlbnQpCi0gICAgICAgICpldmVudElkID0g RHJhZ0VudGVySWQ7Ci0gICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IG5hbWVzLmRyYWdvdmVyRXZl bnQpCi0gICAgICAgICpldmVudElkID0gRHJhZ092ZXJJZDsKLSAgICBlbHNlIGlmIChldmVudFR5 cGUgPT0gbmFtZXMuZHJhZ2xlYXZlRXZlbnQpCi0gICAgICAgICpldmVudElkID0gRHJhZ0xlYXZl SWQ7Ci0gICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IG5hbWVzLmRyb3BFdmVudCkKLSAgICAgICAg KmV2ZW50SWQgPSBEcm9wSWQ7Ci0gICAgZWxzZQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICAvLyBEcmFnIGV2ZW50cyBhcmUgbW91c2UgZXZlbnRzIGFuZCBzaG91bGQgaGF2ZSBhIGNsaXBi b2FyZC4KLSAgICBNb3VzZUV2ZW50KiBtZSA9IHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVu dCk7Ci0gICAgQ2xpcGJvYXJkKiBjbGlwYm9hcmQgPSBtZS0+Y2xpcGJvYXJkKCk7Ci0gICAgaWYg KCFjbGlwYm9hcmQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIEFuZCB0aGF0IGNs aXBib2FyZCBzaG91bGQgYmUgYWNjZXNzaWJsZSBieSBXZWJLaXQgcG9saWN5LgotICAgIENsaXBi b2FyZENocm9taXVtKiBjaHJvbWUgPSBzdGF0aWNfY2FzdDxDbGlwYm9hcmRDaHJvbWl1bSo+KGNs aXBib2FyZCk7Ci0gICAgSGFzaFNldDxTdHJpbmc+IGFjY2Vzc2libGUoY2hyb21lLT50eXBlcygp KTsKLSAgICBpZiAoYWNjZXNzaWJsZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIFJlZlB0cjxDaHJvbWl1bURhdGFPYmplY3Q+IGRhdGFPYmplY3QoY2hyb21lLT5kYXRh T2JqZWN0KCkpOwotICAgIGlmIChkYXRhT2JqZWN0ICYmIGRhdGEpCi0gICAgICAgICpkYXRhID0g V2ViRHJhZ0RhdGEoZGF0YU9iamVjdCk7Ci0KLSAgICByZXR1cm4gZGF0YU9iamVjdDsKLX0KLQog c3RhdGljIGJvb2wgZ2V0UmFuZ2VJbXBsKE5QT2JqZWN0KiBucG9iaiwgV2ViUmFuZ2UqIHJhbmdl KQogeworICAgIC8vIEZJWE1FOiB3aHkgaXMgdGhpcyBucG9iaiBub3QgbnVsbCBjaGVja2VkIGhl cmU/CisKICAgICBWOE5QT2JqZWN0KiB2OG5wb2JqZWN0ID0gcmVpbnRlcnByZXRfY2FzdDxWOE5Q T2JqZWN0Kj4obnBvYmopOwogICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gdjhvYmplY3Qodjhu cG9iamVjdC0+djhPYmplY3QpOwogICAgIGlmICghVjhSYW5nZTo6aW5mby5lcXVhbHMoVjhET01X cmFwcGVyOjpkb21XcmFwcGVyVHlwZSh2OG9iamVjdCkpKQpAQCAtMzM2LDIyICsyNTcsNiBAQCBz dGF0aWMgTlBPYmplY3QqIG1ha2VTdHJpbmdBcnJheUltcGwoY29uc3QgV2ViVmVjdG9yPFdlYlN0 cmluZz4mIGRhdGEpCiAKICNlbmRpZgogCi1ib29sIFdlYkJpbmRpbmdzOjpnZXREcmFnRGF0YShO UE9iamVjdCogZXZlbnQsIGludCogZXZlbnRJZCwgV2ViRHJhZ0RhdGEqIGRhdGEpCi17Ci0jaWYg VVNFKFY4KQotICAgIHJldHVybiBnZXREcmFnRGF0YUltcGwoZXZlbnQsIGV2ZW50SWQsIGRhdGEp OwotI2Vsc2UKLSAgICAvLyBOb3Qgc3VwcG9ydGVkIG9uIG90aGVyIHBvcnRzIChKU0MsIGV0Yyku Ci0gICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCi19Ci0KLWJvb2wgV2ViQmluZGluZ3M6OmlzRHJh Z0V2ZW50KE5QT2JqZWN0KiBldmVudCkKLXsKLSAgICBpbnQgZXZlbnRJZDsKLSAgICByZXR1cm4g Z2V0RHJhZ0RhdGEoZXZlbnQsICZldmVudElkLCAwKTsKLX0KLQogYm9vbCBXZWJCaW5kaW5nczo6 Z2V0UmFuZ2UoTlBPYmplY3QqIHJhbmdlLCBXZWJSYW5nZSogd2VicmFuZ2UpCiB7CiAjaWYgVVNF KFY4KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDEw MjU5NmIuLjBiMjc4YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKQEAgLTI5MCw5ICsyOTAsNiBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmll d0NsaWVudCogY2xpZW50LCBXZWJEZXZUb29sc0FnZW50Q2xpZW50KiBkZXZUb29scwogICAgICwg bV9zdXBwcmVzc05leHRLZXlwcmVzc0V2ZW50KGZhbHNlKQogICAgICwgbV9pbml0aWFsTmF2aWdh dGlvblBvbGljeShXZWJOYXZpZ2F0aW9uUG9saWN5SWdub3JlKQogICAgICwgbV9pbWVBY2NlcHRF dmVudHModHJ1ZSkKLSAgICAsIG1fZHJhZ1RhcmdldERpc3BhdGNoKGZhbHNlKQotICAgICwgbV9k cmFnSWRlbnRpdHkoMCkKLSAgICAsIG1fZHJvcEVmZmVjdChEcm9wRWZmZWN0RGVmYXVsdCkKICAg ICAsIG1fb3BlcmF0aW9uc0FsbG93ZWQoV2ViRHJhZ09wZXJhdGlvbk5vbmUpCiAgICAgLCBtX2Ry YWdPcGVyYXRpb24oV2ViRHJhZ09wZXJhdGlvbk5vbmUpCiAgICAgLCBtX2F1dG9GaWxsUG9wdXBT aG93aW5nKGZhbHNlKQpAQCAtMTc3OCw3ICsxNzc1LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZHJh Z1NvdXJjZVN5c3RlbURyYWdFbmRlZCgpCiB9CiAKIFdlYkRyYWdPcGVyYXRpb24gV2ViVmlld0lt cGw6OmRyYWdUYXJnZXREcmFnRW50ZXIoCi0gICAgY29uc3QgV2ViRHJhZ0RhdGEmIHdlYkRyYWdE YXRhLCBpbnQgaWRlbnRpdHksCisgICAgY29uc3QgV2ViRHJhZ0RhdGEmIHdlYkRyYWdEYXRhLCBp bnQgaWRlbnRpdHksIC8vIEZJWE1FOiByZW1vdmUgaWRlbnRpdHkgZnJvbSB0aGlzIGZ1bmN0aW9u IHNpZ25hdHVyZS4KICAgICBjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsCiAgICAgY29uc3Qg V2ViUG9pbnQmIHNjcmVlblBvaW50LAogICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRp b25zQWxsb3dlZCkKQEAgLTE3ODYsNyArMTc4Myw3IEBAIFdlYkRyYWdPcGVyYXRpb24gV2ViVmll d0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXIoCiAgICAgQVNTRVJUKCFtX2N1cnJlbnREcmFnRGF0 YS5nZXQoKSk7CiAKICAgICBtX2N1cnJlbnREcmFnRGF0YSA9IHdlYkRyYWdEYXRhOwotICAgIG1f ZHJhZ0lkZW50aXR5ID0gaWRlbnRpdHk7CisgICAgVU5VU0VEX1BBUkFNKGlkZW50aXR5KTsKICAg ICBtX29wZXJhdGlvbnNBbGxvd2VkID0gb3BlcmF0aW9uc0FsbG93ZWQ7CiAKICAgICByZXR1cm4g ZHJhZ1RhcmdldERyYWdFbnRlck9yT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIERyYWdF bnRlcik7CkBAIC0xODEyLDE0ICsxODA5LDEyIEBAIHZvaWQgV2ViVmlld0ltcGw6OmRyYWdUYXJn ZXREcmFnTGVhdmUoKQogICAgICAgICBJbnRQb2ludCgpLAogICAgICAgICBzdGF0aWNfY2FzdDxE cmFnT3BlcmF0aW9uPihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CiAKLSAgICBtX2RyYWdUYXJnZXRE aXNwYXRjaCA9IHRydWU7CiAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRXhpdGVk KCZkcmFnRGF0YSk7Ci0gICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKIAotICAgIG1f Y3VycmVudERyYWdEYXRhID0gMDsKLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVs dDsKKyAgICAvLyBGSVhNRTogd2h5IGlzIHRoZSBkcmFnIHNjcm9sbCB0aW1lciBub3Qgc3RvcHBl ZCBoZXJlPworCiAgICAgbV9kcmFnT3BlcmF0aW9uID0gV2ViRHJhZ09wZXJhdGlvbk5vbmU7Ci0g ICAgbV9kcmFnSWRlbnRpdHkgPSAwOworICAgIG1fY3VycmVudERyYWdEYXRhID0gMDsKIH0KIAog dm9pZCBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyb3AoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBv aW50LApAQCAtMTg0NSwyMiArMTg0MCwxMiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0 RHJvcChjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsCiAgICAgICAgIHNjcmVlblBvaW50LAog ICAgICAgICBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPihtX29wZXJhdGlvbnNBbGxvd2VkKSk7 CiAKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7CiAgICAgbV9wYWdlLT5kcmFnQ29u dHJvbGxlcigpLT5wZXJmb3JtRHJhZygmZHJhZ0RhdGEpOwotICAgIG1fZHJhZ1RhcmdldERpc3Bh dGNoID0gZmFsc2U7CiAKLSAgICBtX2N1cnJlbnREcmFnRGF0YSA9IDA7Ci0gICAgbV9kcm9wRWZm ZWN0ID0gRHJvcEVmZmVjdERlZmF1bHQ7CiAgICAgbV9kcmFnT3BlcmF0aW9uID0gV2ViRHJhZ09w ZXJhdGlvbk5vbmU7Ci0gICAgbV9kcmFnSWRlbnRpdHkgPSAwOwotICAgIG1fZHJhZ1Njcm9sbFRp bWVyLT5zdG9wKCk7Ci19CisgICAgbV9jdXJyZW50RHJhZ0RhdGEgPSAwOwogCi1pbnQgV2ViVmll d0ltcGw6OmRyYWdJZGVudGl0eSgpCi17Ci0gICAgaWYgKG1fZHJhZ1RhcmdldERpc3BhdGNoKQot ICAgICAgICByZXR1cm4gbV9kcmFnSWRlbnRpdHk7Ci0gICAgcmV0dXJuIDA7CisgICAgbV9kcmFn U2Nyb2xsVGltZXItPnN0b3AoKTsKIH0KIAogV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3SW1wbDo6 ZHJhZ1RhcmdldERyYWdFbnRlck9yT3Zlcihjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsIGNv bnN0IFdlYlBvaW50JiBzY3JlZW5Qb2ludCwgRHJhZ0FjdGlvbiBkcmFnQWN0aW9uKQpAQCAtMTg3 MywyNyArMTg1OCwyMyBAQCBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0 RHJhZ0VudGVyT3JPdmVyKGNvbnN0IFdlYlBvaW50JiBjbGllbnRQbwogICAgICAgICBzY3JlZW5Q b2ludCwKICAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4obV9vcGVyYXRpb25zQWxs b3dlZCkpOwogCi0gICAgbV9kcm9wRWZmZWN0ID0gRHJvcEVmZmVjdERlZmF1bHQ7Ci0gICAgbV9k cmFnVGFyZ2V0RGlzcGF0Y2ggPSB0cnVlOwotICAgIERyYWdPcGVyYXRpb24gZWZmZWN0ID0gZHJh Z0FjdGlvbiA9PSBEcmFnRW50ZXIgPyBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRl cmVkKCZkcmFnRGF0YSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDogbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnVXBkYXRlZCgmZHJhZ0Rh dGEpOwotICAgIC8vIE1hc2sgdGhlIG9wZXJhdGlvbiBhZ2FpbnN0IHRoZSBkcmFnIHNvdXJjZSdz IGFsbG93ZWQgb3BlcmF0aW9ucy4KLSAgICBpZiAoIShlZmZlY3QgJiBkcmFnRGF0YS5kcmFnZ2lu Z1NvdXJjZU9wZXJhdGlvbk1hc2soKSkpCi0gICAgICAgIGVmZmVjdCA9IERyYWdPcGVyYXRpb25O b25lOwotICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gZmFsc2U7Ci0KLSAgICBpZiAobV9kcm9w RWZmZWN0ICE9IERyb3BFZmZlY3REZWZhdWx0KSB7Ci0gICAgICAgIG1fZHJhZ09wZXJhdGlvbiA9 IChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdE5vbmUpID8gV2ViRHJhZ09wZXJhdGlvbkNvcHkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgOiBXZWJEcmFnT3BlcmF0aW9uTm9uZTsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9kcmFnT3Bl cmF0aW9uID0gc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJhdGlvbj4oZWZmZWN0KTsKKyAgICBEcmFn T3BlcmF0aW9uIGRyb3BFZmZlY3Q7CisgICAgaWYgKGRyYWdBY3Rpb24gPT0gRHJhZ0VudGVyKQor ICAgICAgICBkcm9wRWZmZWN0ID0gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50ZXJl ZCgmZHJhZ0RhdGEpOworICAgIGVsc2UKKyAgICAgICAgZHJvcEVmZmVjdCA9IG1fcGFnZS0+ZHJh Z0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKTsKKworICAgIC8vIE1hc2sgdGhl IGRyb3AgZWZmZWN0IG9wZXJhdGlvbiBhZ2FpbnN0IHRoZSBkcmFnIHNvdXJjZSdzIGFsbG93ZWQg b3BlcmF0aW9ucy4KKyAgICBpZiAoIShkcm9wRWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3Vy Y2VPcGVyYXRpb25NYXNrKCkpKQorICAgICAgICBkcm9wRWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5v bmU7CisKKyAgICAgbV9kcmFnT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJhdGlv bj4oZHJvcEVmZmVjdCk7CiAKICAgICBpZiAoZHJhZ0FjdGlvbiA9PSBEcmFnT3ZlcikKICAgICAg ICAgbV9kcmFnU2Nyb2xsVGltZXItPnRyaWdnZXJTY3JvbGwobWFpbkZyYW1lSW1wbCgpLT5mcmFt ZVZpZXcoKSwgY2xpZW50UG9pbnQpOwogICAgIGVsc2UKICAgICAgICAgbV9kcmFnU2Nyb2xsVGlt ZXItPnN0b3AoKTsKIAotCiAgICAgcmV0dXJuIG1fZHJhZ09wZXJhdGlvbjsKIH0KIApAQCAtMjAz MywxNSArMjAxNCw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OnBlcmZvcm1DdXN0b21Db250ZXh0TWVu dUFjdGlvbih1bnNpZ25lZCBhY3Rpb24pCiAKIC8vIFdlYlZpZXcgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotYm9v bCBXZWJWaWV3SW1wbDo6c2V0RHJvcEVmZmVjdChib29sIGFjY2VwdCkKLXsKLSAgICBpZiAobV9k cmFnVGFyZ2V0RGlzcGF0Y2gpIHsKLSAgICAgICAgbV9kcm9wRWZmZWN0ID0gYWNjZXB0ID8gRHJv cEVmZmVjdENvcHkgOiBEcm9wRWZmZWN0Tm9uZTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg fQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNUcmFuc3Bh cmVudChib29sIGlzVHJhbnNwYXJlbnQpCiB7CiAgICAgLy8gU2V0IGFueSBleGlzdGluZyBmcmFt ZXMgdG8gYmUgdHJhbnNwYXJlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAppbmRleCAwOGYwM2M0Li44NmRjNzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmgKQEAgLTE1NCw3ICsxNTQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFdlYkRy YWdPcGVyYXRpb24gb3BlcmF0aW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgZHJhZ1NvdXJjZVN5c3Rl bURyYWdFbmRlZCgpOwogICAgIHZpcnR1YWwgV2ViRHJhZ09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJh Z0VudGVyKAotICAgICAgICBjb25zdCBXZWJEcmFnRGF0YSYgZHJhZ0RhdGEsIGludCBpZGVudGl0 eSwKKyAgICAgICAgY29uc3QgV2ViRHJhZ0RhdGEmLCBpbnQgaWRlbnRpdHksIC8vIEZJWE1FOiBy ZW1vdmUgaWRlbnRpdHkgZnJvbSB0aGlzIGZ1bmN0aW9uIHNpZ25hdHVyZS4KICAgICAgICAgY29u c3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAogICAgICAgICBjb25zdCBXZWJQb2ludCYgc2NyZWVu UG9pbnQsCiAgICAgICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCk7 CkBAIC0xNjYsOCArMTY2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkcmFnVGFyZ2V0 RHJvcCgKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAogICAgICAgICBjb25z dCBXZWJQb2ludCYgc2NyZWVuUG9pbnQpOwotICAgIHZpcnR1YWwgaW50IGRyYWdJZGVudGl0eSgp OwotICAgIHZpcnR1YWwgYm9vbCBzZXREcm9wRWZmZWN0KGJvb2wgYWNjZXB0KTsKICAgICB2aXJ0 dWFsIHVuc2lnbmVkIGxvbmcgY3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QoKTsKICAg ICB2aXJ0dWFsIHZvaWQgaW5zcGVjdEVsZW1lbnRBdChjb25zdCBXZWJQb2ludCYgcG9pbnQpOwog ICAgIHZpcnR1YWwgV2ViU3RyaW5nIGluc3BlY3RvclNldHRpbmdzKCkgY29uc3Q7CkBAIC00Njks MjIgKzQ2Nyw2IEBAIHByaXZhdGU6CiAgICAgLy8gUmVwcmVzZW50cyB3aGV0aGVyIG9yIG5vdCB0 aGlzIG9iamVjdCBzaG91bGQgcHJvY2VzcyBpbmNvbWluZyBJTUUgZXZlbnRzLgogICAgIGJvb2wg bV9pbWVBY2NlcHRFdmVudHM7CiAKLSAgICAvLyBUcnVlIHdoaWxlIGRpc3BhdGNoaW5nIHN5c3Rl bSBkcmFnIGFuZCBkcm9wIGV2ZW50cyB0byBkcmFnL2Ryb3AgdGFyZ2V0cwotICAgIC8vIHdpdGhp biB0aGlzIFdlYlZpZXcuCi0gICAgYm9vbCBtX2RyYWdUYXJnZXREaXNwYXRjaDsKLQotICAgIC8v IFZhbGlkIHdoZW4gbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggaXMgdHJ1ZTsgdGhlIGlkZW50aXR5IG9m IHRoZSBkcmFnIGRhdGEKLSAgICAvLyBjb3BpZWQgZnJvbSB0aGUgV2ViRHJvcERhdGEgb2JqZWN0 IHNlbnQgZnJvbSB0aGUgYnJvd3NlciBwcm9jZXNzLgotICAgIGludCBtX2RyYWdJZGVudGl0eTsK LQotICAgIC8vIFZhbGlkIHdoZW4gbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggaXMgdHJ1ZS4gVXNlZCB0 byBvdmVycmlkZSB0aGUgZGVmYXVsdAotICAgIC8vIGJyb3dzZXIgZHJvcCBlZmZlY3Qgd2l0aCB0 aGUgZWZmZWN0cyAibm9uZSIgb3IgImNvcHkiLgotICAgIGVudW0gRHJhZ1RhcmdldERyb3BFZmZl Y3QgewotICAgICAgICBEcm9wRWZmZWN0RGVmYXVsdCA9IC0xLAotICAgICAgICBEcm9wRWZmZWN0 Tm9uZSwKLSAgICAgICAgRHJvcEVmZmVjdENvcHkKLSAgICB9IG1fZHJvcEVmZmVjdDsKLQogICAg IC8vIFRoZSBhdmFpbGFibGUgZHJhZyBvcGVyYXRpb25zIChjb3B5LCBtb3ZlIGxpbmsuLi4pIGFs bG93ZWQgYnkgdGhlIHNvdXJjZS4KICAgICBXZWJEcmFnT3BlcmF0aW9uIG1fb3BlcmF0aW9uc0Fs bG93ZWQ7CiAK