66073 2011-08-11 10:15:07 -0700 [GTK] Fix compilation problems with deprecations in gtk+ 2011-08-19 09:57:40 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 alex webkit-unassigned pnormand siraj oldest_to_newest 449861 0 alex 2011-08-11 10:15:07 -0700 I'd rather have this reviewed to check all the changes are correct. JFTR the compilation I'm using is: build-webkit --gtk --debug --with-gtk=3.0 --enable-webkit2 451769 1 104071 alex 2011-08-16 11:31:52 -0700 Created attachment 104071 Proposed patch 453290 2 alex 2011-08-18 13:08:40 -0700 Landed http://trac.webkit.org/changeset/93338 453890 3 mrobinson 2011-08-19 09:57:40 -0700 *** Bug 66546 has been marked as a duplicate of this bug. *** 104071 2011-08-16 11:31:52 -0700 2011-08-16 12:07:03 -0700 Proposed patch fix_compilation.patch text/plain 14600 alex Y29tbWl0IGMwMDFkYzQwOTgyMjgxNWJkNDdiYTlhMjM5ZGQ0ODJjNmM2MzhmZTUKQXV0aG9yOiBB bGVqYW5kcm8gRy4gQ2FzdHJvIDxhbGV4QGlnYWxpYS5jb20+CkRhdGU6ICAgRnJpIEF1ZyAxMiAx MDo0NzoyOCAyMDExICswMjAwCgogICAgMjAxMS0wOC0xMSAgQWxlamFuZHJvIEcuIENhc3RybyAg PGFsZXhAaWdhbGlhLmNvbT4KICAgIAogICAgICAgICAgICBbR1RLXSBGaXggY29tcGlsYXRpb24g cHJvYmxlbXMgd2l0aCBkZXByZWNhdGlvbnMgaW4gZ3RrKwogICAgICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwNzMKICAgIAogICAgICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICAqIHBsYXRmb3JtL2d0ay9H dGtBdXRoZW50aWNhdGlvbkRpYWxvZy5jcHA6CiAgICAgICAgICAgIChXZWJDb3JlOjpHdGtBdXRo ZW50aWNhdGlvbkRpYWxvZzo6R3RrQXV0aGVudGljYXRpb25EaWFsb2cpOiBBZGRlZAogICAgICAg ICAgICBndGtfYm94X25ldyBjb25kaXRpb25hbCBjb21waWxhdGlvbiBmb3IgZ3RrKy0zLgogICAg ICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwOgogICAgICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmFkanVzdFJlcGFpbnRSZWN0KToKICAgICAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpwYWludFNsaWRlclRyYWNrKToKICAgICAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpwYWludFNsaWRlclRodW1iKToKICAgICAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjphZGp1c3RTbGlkZXJUaHVtYlNpemUpOiBOb3cgd2Ug aGF2ZSBoYXZlCiAgICAgICAgICAgIEdUS19UWVBFX1NDQUxFIGluIGd0ayszLgogICAgCiAgICAy MDExLTA4LTExICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgogICAgCiAg ICAgICAgICAgIFtHVEtdIEZpeCBjb21waWxhdGlvbiBwcm9ibGVtcyB3aXRoIGRlcHJlY2F0aW9u cyBpbiBndGsrCiAgICAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NjA3MwogICAgCiAgICAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgog ICAgCiAgICAgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxl ci5jcHA6CiAgICAgICAgICAgIChGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIdWQp OiBBZGRlZCBndGtfYm94X25ldwogICAgICAgICAgICBjb25kaXRpb25hbCBjb21waWxhdGlvbiBm b3IgZ3RrKy0zLgogICAgCiAgICAyMDExLTA4LTExICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxl eEBpZ2FsaWEuY29tPgogICAgCiAgICAgICAgICAgIFtHVEtdIEZpeCBjb21waWxhdGlvbiBwcm9i bGVtcyB3aXRoIGRlcHJlY2F0aW9ucyBpbiBndGsrCiAgICAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjA3MwogICAgCiAgICAgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgogICAgCiAgICAgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3Rr L0R1bXBSZW5kZXJUcmVlLmNwcDoKICAgICAgICAgICAgKG1haW4pOiBHX0NPTlNUX1JFVFVSTiB3 YXMgZGVwcmVjYXRlZAogICAgICAgICAgICAqIEd0a0xhdW5jaGVyL21haW4uYzoKICAgICAgICAg ICAgKGNyZWF0ZVdpbmRvdyk6IEFkZGVkIGd0a19ib3hfbmV3IGNvbmRpdGlvbmFsIGNvbXBpbGF0 aW9uIGZvcgogICAgICAgICAgICBndGsrLTMuCiAgICAgICAgICAgICogTWluaUJyb3dzZXIvZ3Rr L0Jyb3dzZXJXaW5kb3cuYzoKICAgICAgICAgICAgKGJyb3dzZXJfd2luZG93X2luaXQpOiBSZXBs YWNlZCBndGtfdmJveF9uZXcgd2l0aCBndGtfYm94X25ldywgd2UKICAgICAgICAgICAgYXJlIGp1 c3Qgc3VwcG9ydGluZyBndGsrLTMgZm9yIFdlYktpdDIuCiAgICAKICAgIDIwMTEtMDgtMTEgIEFs ZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAgICAKICAgICAgICAgICAgW0dU S10gRml4IGNvbXBpbGF0aW9uIHByb2JsZW1zIHdpdGggZGVwcmVjYXRpb25zIGluIGd0aysKICAg ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MDczCiAg ICAKICAgICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgogICAgICAgICAgICAo bWFpbik6IEdfQ09OU1RfUkVUVVJOIHdhcyBkZXByZWNhdGVkCiAgICAgICAgICAgICogR3RrTGF1 bmNoZXIvbWFpbi5jOgogICAgICAgICAgICAoY3JlYXRlV2luZG93KTogQWRkZWQgZ3RrX2JveF9u ZXcgY29uZGl0aW9uYWwgY29tcGlsYXRpb24gZm9yCiAgICAgICAgICAgIGd0aystMy4KICAgICAg ICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgogICAgICAgICAgICAoYnJv d3Nlcl93aW5kb3dfaW5pdCk6IFJlcGxhY2VkIGd0a192Ym94X25ldyB3aXRoIGd0a19ib3hfbmV3 LCB3ZQogICAgICAgICAgICBhcmUganVzdCBzdXBwb3J0aW5nIGd0aystMyBmb3IgV2ViS2l0Mi4K ICAgIAogICAgMjAxMS0wOC0xMSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNv bT4KICAgIAogICAgICAgICAgICBbR1RLXSBGaXggY29tcGlsYXRpb24gcHJvYmxlbXMgd2l0aCBk ZXByZWNhdGlvbnMgaW4gZ3RrKwogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjYwNzMKICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KICAgIAogICAgICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVy VHJlZS5jcHA6CiAgICAgICAgICAgIChtYWluKTogR19DT05TVF9SRVRVUk4gd2FzIGRlcHJlY2F0 ZWQKICAgICAgICAgICAgKiBHdGtMYXVuY2hlci9tYWluLmM6CiAgICAgICAgICAgIChjcmVhdGVX aW5kb3cpOiBBZGRlZCBndGtfYm94X25ldyBjb25kaXRpb25hbCBjb21waWxhdGlvbiBmb3IKICAg ICAgICAgICAgZ3RrKy0zLgogICAgICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmM6CiAgICAgICAgICAgIChicm93c2VyX3dpbmRvd19pbml0KTogUmVwbGFjZWQgZ3RrX3Zi b3hfbmV3IHdpdGggZ3RrX2JveF9uZXcsIHdlCiAgICAgICAgICAgIGFyZSBqdXN0IHN1cHBvcnRp bmcgZ3RrKy0zIGZvciBXZWJLaXQyLgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjM2VkMzk1Li4xMDkxYTM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDgtMTEgIEFsZWphbmRybyBHLiBDYXN0 cm8gIDxhbGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IGNvbXBpbGF0aW9uIHBy b2JsZW1zIHdpdGggZGVwcmVjYXRpb25zIGluIGd0aysKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrQXV0aGVudGljYXRpb25E aWFsb2cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3RrQXV0aGVudGljYXRpb25EaWFsb2c6Okd0 a0F1dGhlbnRpY2F0aW9uRGlhbG9nKTogQWRkZWQKKyAgICAgICAgZ3RrX2JveF9uZXcgY29uZGl0 aW9uYWwgY29tcGlsYXRpb24gZm9yIGd0aystMy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGszLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjphZGp1 c3RSZXBhaW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRT bGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRTbGlk ZXJUaHVtYik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6YWRqdXN0U2xpZGVy VGh1bWJTaXplKTogTm93IHdlIGhhdmUgaGF2ZQorICAgICAgICBHVEtfVFlQRV9TQ0FMRSBpbiBn dGsrMy4KKwogMjAxMS0wOC0xNSAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4K IAogICAgICAgICBSRUdSRVNTSU9OKHI3MDU5OCk6IFtDaHJvbWl1bV0gU3R5bGUgY2hhbmdlcyBp biB0ZXh0SW5wdXQgZXZlbnQgY2FuIHByZXZlbnQgZnJvbSB1cGRhdGluZyA8dGV4dGFyZWE+IHZh bHVlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0F1dGhlbnRp Y2F0aW9uRGlhbG9nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtBdXRoZW50 aWNhdGlvbkRpYWxvZy5jcHAKaW5kZXggMGY5NmU2Ni4uODFmMGRhOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0F1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrQXV0aGVudGljYXRpb25EaWFsb2cuY3Bw CkBAIC04Nyw3ICs4NywxMSBAQCBHdGtBdXRoZW50aWNhdGlvbkRpYWxvZzo6R3RrQXV0aGVudGlj YXRpb25EaWFsb2coR3RrV2luZG93KiBwYXJlbnRXaW5kb3csIFNvdXBTZQogICAgICAgICBndGtf d2luZG93X3NldF90cmFuc2llbnRfZm9yKHdpbmRvdywgcGFyZW50V2luZG93KTsKIAogICAgIC8v IEJ1aWxkIGNvbnRlbnRzLgorI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiAgICAgR3RrV2lkZ2V0 KiBoQm94ID0gZ3RrX2hib3hfbmV3KEZBTFNFLCAxMik7CisjZWxzZQorICAgIEd0a1dpZGdldCog aEJveCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMLCAxMik7CisjZW5k aWYKICAgICBndGtfY29udGFpbmVyX3NldF9ib3JkZXJfd2lkdGgoR1RLX0NPTlRBSU5FUihoQm94 KSwgNSk7CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1goZ3RrX2RpYWxvZ19nZXRfY29u dGVudF9hcmVhKGRpYWxvZykpLCBoQm94LCBUUlVFLCBUUlVFLCAwKTsKIApAQCAtOTUsNyArOTks MTEgQEAgR3RrQXV0aGVudGljYXRpb25EaWFsb2c6Okd0a0F1dGhlbnRpY2F0aW9uRGlhbG9nKEd0 a1dpbmRvdyogcGFyZW50V2luZG93LCBTb3VwU2UKICAgICBndGtfbWlzY19zZXRfYWxpZ25tZW50 KEdUS19NSVNDKGljb24pLCAwLjUsIDAuMCk7CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19C T1goaEJveCksIGljb24sIEZBTFNFLCBGQUxTRSwgMCk7CiAKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJ T05fMgogICAgIEd0a1dpZGdldCogbWFpblZCb3ggPSBndGtfdmJveF9uZXcoRkFMU0UsIDE4KTsK KyNlbHNlCisgICAgR3RrV2lkZ2V0KiBtYWluVkJveCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRB VElPTl9WRVJUSUNBTCwgMTgpOworI2VuZGlmCiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19C T1goaEJveCksIG1haW5WQm94LCBUUlVFLCBUUlVFLCAwKTsKIAogICAgIFNvdXBVUkkqIHVyaSA9 IHNvdXBfbWVzc2FnZV9nZXRfdXJpKG1fbWVzc2FnZS5nZXQoKSk7CkBAIC0xMDUsNyArMTEzLDEx IEBAIEd0a0F1dGhlbnRpY2F0aW9uRGlhbG9nOjpHdGtBdXRoZW50aWNhdGlvbkRpYWxvZyhHdGtX aW5kb3cqIHBhcmVudFdpbmRvdywgU291cFNlCiAgICAgZ3RrX2xhYmVsX3NldF9saW5lX3dyYXAo R1RLX0xBQkVMKGRlc2NyaXB0aW9uTGFiZWwpLCBUUlVFKTsKICAgICBndGtfYm94X3BhY2tfc3Rh cnQoR1RLX0JPWChtYWluVkJveCksIEdUS19XSURHRVQoZGVzY3JpcHRpb25MYWJlbCksIEZBTFNF LCBGQUxTRSwgMCk7CiAKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgIEd0a1dpZGdldCog dkJveCA9IGd0a192Ym94X25ldyhGQUxTRSwgNik7CisjZWxzZQorICAgIEd0a1dpZGdldCogdkJv eCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9WRVJUSUNBTCwgNik7CisjZW5kaWYKICAg ICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWChtYWluVkJveCksIHZCb3gsIEZBTFNFLCBGQUxT RSwgMCk7CiAKICAgICAvLyBUaGUgdGFibGUgdGhhdCBob2xkcyB0aGUgZW50cmllcy4KQEAgLTEz OSw3ICsxNTEsMTEgQEAgR3RrQXV0aGVudGljYXRpb25EaWFsb2c6Okd0a0F1dGhlbnRpY2F0aW9u RGlhbG9nKEd0a1dpbmRvdyogcGFyZW50V2luZG93LCBTb3VwU2UKICAgICBndGtfZW50cnlfc2V0 X3Zpc2liaWxpdHkoR1RLX0VOVFJZKG1fcGFzc3dvcmRFbnRyeSksIEZBTFNFKTsKIAogICAgIGlm IChzZXNzaW9uQ2FuU2F2ZVBhc3N3b3JkcyhtX3Nlc3Npb24pKSB7CisjaWZkZWYgR1RLX0FQSV9W RVJTSU9OXzIKICAgICAgICAgR3RrV2lkZ2V0KiByZW1lbWJlckJveCA9IGd0a192Ym94X25ldyhG QUxTRSwgNik7CisjZWxzZQorICAgICAgICBHdGtXaWRnZXQqIHJlbWVtYmVyQm94ID0gZ3RrX2Jv eF9uZXcoR1RLX09SSUVOVEFUSU9OX1ZFUlRJQ0FMLCA2KTsKKyNlbmRpZgogICAgICAgICBndGtf Ym94X3BhY2tfc3RhcnQoR1RLX0JPWCh2Qm94KSwgcmVtZW1iZXJCb3gsIEZBTFNFLCBGQUxTRSwg MCk7CiAKICAgICAgICAgbV9yZW1lbWJlckNoZWNrQnV0dG9uID0gZ3RrX2NoZWNrX2J1dHRvbl9u ZXdfd2l0aF9tbmVtb25pYyhfKCJfUmVtZW1iZXIgcGFzc3dvcmQiKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwCmluZGV4IGQ3MDQxZjUuLmY0 MjI4ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVt ZUd0azMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0 azMuY3BwCkBAIC0xNDksNyArMTQ5LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0UmVw YWludFJlY3QoY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIEludFJlY3QKICAgICAg ICAgcmV0dXJuOwogICAgIGNhc2UgU2xpZGVyVmVydGljYWxQYXJ0OgogICAgIGNhc2UgU2xpZGVy SG9yaXpvbnRhbFBhcnQ6Ci0gICAgICAgIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQocGFydCA9 PSBTbGlkZXJUaHVtYkhvcml6b250YWxQYXJ0ID8gIEdUS19UWVBFX0hTQ0FMRSA6IEdUS19UWVBF X1ZTQ0FMRSk7CisgICAgICAgIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQoR1RLX1RZUEVfU0NB TEUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEJ1dHRvblBhcnQ6CiAgICAgY2FzZSBNZW51 bGlzdEJ1dHRvblBhcnQ6CkBAIC01OTgsNyArNTk4LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6 cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFpbnRJ bmYKICAgICBDb250cm9sUGFydCBwYXJ0ID0gcmVuZGVyT2JqZWN0LT5zdHlsZSgpLT5hcHBlYXJh bmNlKCk7CiAgICAgQVNTRVJUKHBhcnQgPT0gU2xpZGVySG9yaXpvbnRhbFBhcnQgfHwgcGFydCA9 PSBTbGlkZXJWZXJ0aWNhbFBhcnQgfHwgcGFydCA9PSBNZWRpYVZvbHVtZVNsaWRlclBhcnQpOwog Ci0gICAgR3RrU3R5bGVDb250ZXh0KiBjb250ZXh0ID0gZ2V0U3R5bGVDb250ZXh0KHBhcnQgPT0g U2xpZGVyVGh1bWJIb3Jpem9udGFsUGFydCA/IEdUS19UWVBFX0hTQ0FMRSA6IEdUS19UWVBFX1ZT Q0FMRSk7CisgICAgR3RrU3R5bGVDb250ZXh0KiBjb250ZXh0ID0gZ2V0U3R5bGVDb250ZXh0KEdU S19UWVBFX1NDQUxFKTsKICAgICBndGtfc3R5bGVfY29udGV4dF9zYXZlKGNvbnRleHQpOwogCiAg ICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0X2RpcmVjdGlvbihjb250ZXh0LCBndGtUZXh0RGlyZWN0 aW9uKHJlbmRlck9iamVjdC0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkpKTsKQEAgLTYzMyw3ICs2MzMs NyBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludFNsaWRlclRodW1iKFJlbmRlck9iamVjdCog cmVuZGVyT2JqZWN0LCBjb25zdCBQYWludEluZgogICAgIENvbnRyb2xQYXJ0IHBhcnQgPSByZW5k ZXJPYmplY3QtPnN0eWxlKCktPmFwcGVhcmFuY2UoKTsKICAgICBBU1NFUlQocGFydCA9PSBTbGlk ZXJUaHVtYkhvcml6b250YWxQYXJ0IHx8IHBhcnQgPT0gU2xpZGVyVGh1bWJWZXJ0aWNhbFBhcnQg fHwgcGFydCA9PSBNZWRpYVZvbHVtZVNsaWRlclRodW1iUGFydCk7CiAKLSAgICBHdGtTdHlsZUNv bnRleHQqIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQocGFydCA9PSBTbGlkZXJUaHVtYkhvcml6 b250YWxQYXJ0ID8gR1RLX1RZUEVfSFNDQUxFIDogR1RLX1RZUEVfVlNDQUxFKTsKKyAgICBHdGtT dHlsZUNvbnRleHQqIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQoR1RLX1RZUEVfU0NBTEUpOwog ICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUoY29udGV4dCk7CiAKICAgICBndGtfc3R5bGVfY29u dGV4dF9zZXRfZGlyZWN0aW9uKGNvbnRleHQsIGd0a1RleHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0 LT5zdHlsZSgpLT5kaXJlY3Rpb24oKSkpOwpAQCAtNjc0LDcgKzY3NCw3IEBAIHZvaWQgUmVuZGVy VGhlbWVHdGs6OmFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0 CiAjZW5kaWYKIAogICAgIGdpbnQgc2xpZGVyV2lkdGgsIHNsaWRlckxlbmd0aDsKLSAgICBndGtf c3R5bGVfY29udGV4dF9nZXRfc3R5bGUoZ2V0U3R5bGVDb250ZXh0KHBhcnQgPT0gU2xpZGVyVGh1 bWJIb3Jpem9udGFsUGFydCA/IEdUS19UWVBFX0hTQ0FMRSA6IEdUS19UWVBFX1ZTQ0FMRSksCisg ICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0eWxlKGdldFN0eWxlQ29udGV4dChHVEtfVFlQRV9T Q0FMRSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzbGlkZXItd2lkdGgiLCAm c2xpZGVyV2lkdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzbGlkZXItbGVu Z3RoIiwgJnNsaWRlckxlbmd0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVM TCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggOGM2NGZkNi4uYjg1MWNiYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA4LTExICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxl eEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEZpeCBjb21waWxhdGlvbiBwcm9ibGVtcyB3 aXRoIGRlcHJlY2F0aW9ucyBpbiBndGsrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NjA3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIdWQpOiBB ZGRlZCBndGtfYm94X25ldworICAgICAgICBjb25kaXRpb25hbCBjb21waWxhdGlvbiBmb3IgZ3Rr Ky0zLgorCiAyMDExLTA4LTE1ICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21Q YWdlIGRvZXMgbm90IGhhdmUgZW5vdWdoIHBhcmFtZXRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Z1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIuY3BwIGIv U291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxl ci5jcHAKaW5kZXggMDRjZmIwNi4uMzMwMGZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5j cHAKQEAgLTUzMSw3ICs1MzEsMTEgQEAgdm9pZCBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpj cmVhdGVIdWQoKQogCiAgICAgZ19zaWduYWxfY29ubmVjdChtX2h1ZFdpbmRvdywgIm1vdGlvbi1u b3RpZnktZXZlbnQiLCBHX0NBTExCQUNLKG9uRnVsbHNjcmVlbkd0a01vdGlvbk5vdGlmeUV2ZW50 KSwgdGhpcyk7CiAKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgIEd0a1dpZGdldCogaGJv eCA9IGd0a19oYm94X25ldyhGQUxTRSwgNCk7CisjZWxzZQorICAgIEd0a1dpZGdldCogaGJveCA9 IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMLCA0KTsKKyNlbmRpZgogICAg IGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIobV9odWRXaW5kb3cpLCBoYm94KTsKIAog ICAgIG1fcGxheVBhdXNlQWN0aW9uID0gZ3RrX2FjdGlvbl9uZXcoInBsYXkiLCBfKCJQbGF5IC8g UGF1c2UiKSwgXygiUGxheSBvciBwYXVzZSB0aGUgbWVkaWEiKSwgUEFVU0VfSUNPTl9OQU1FKTsK QEAgLTU0Niw3ICs1NTAsMTEgQEAgdm9pZCBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVh dGVIdWQoKQogICAgIGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKGhib3gpLCBsYWJlbCwgRkFM U0UsIFRSVUUsIDApOwogCiAgICAgR3RrQWRqdXN0bWVudCogYWRqdXN0bWVudCA9IEdUS19BREpV U1RNRU5UKGd0a19hZGp1c3RtZW50X25ldygwLjAsIDAuMCwgMTAwLjAsIDAuMSwgMS4wLCAxLjAp KTsKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgIG1fdGltZUhTY2FsZSA9IGd0a19oc2Nh bGVfbmV3KGFkanVzdG1lbnQpOworI2Vsc2UKKyAgICBtX3RpbWVIU2NhbGUgPSBndGtfc2NhbGVf bmV3KEdUS19PUklFTlRBVElPTl9IT1JJWk9OVEFMLCBhZGp1c3RtZW50KTsKKyNlbmRpZgogICAg IGd0a19zY2FsZV9zZXRfZHJhd192YWx1ZShHVEtfU0NBTEUobV90aW1lSFNjYWxlKSwgRkFMU0Up OwogICAgIGd0a19yYW5nZV9zZXRfc2hvd19maWxsX2xldmVsKEdUS19SQU5HRShtX3RpbWVIU2Nh bGUpLCBUUlVFKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KG1fdGltZUhTY2FsZSwgImJ1dHRvbi1w cmVzcy1ldmVudCIsIEdfQ0FMTEJBQ0sodGltZVNjYWxlQnV0dG9uUHJlc3NlZCksIHRoaXMpOwpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGJjYTc5 MzQuLjEzOThjZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wOC0xMSAgQWxlamFuZHJvIEcuIENhc3RybyAg PGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXggY29tcGlsYXRpb24gcHJvYmxl bXMgd2l0aCBkZXByZWNhdGlvbnMgaW4gZ3RrKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5j cHA6CisgICAgICAgIChtYWluKTogR19DT05TVF9SRVRVUk4gd2FzIGRlcHJlY2F0ZWQKKyAgICAg ICAgKiBHdGtMYXVuY2hlci9tYWluLmM6CisgICAgICAgIChjcmVhdGVXaW5kb3cpOiBBZGRlZCBn dGtfYm94X25ldyBjb25kaXRpb25hbCBjb21waWxhdGlvbiBmb3IKKyAgICAgICAgZ3RrKy0zLgor ICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChicm93 c2VyX3dpbmRvd19pbml0KTogUmVwbGFjZWQgZ3RrX3Zib3hfbmV3IHdpdGggZ3RrX2JveF9uZXcs IHdlCisgICAgICAgIGFyZSBqdXN0IHN1cHBvcnRpbmcgZ3RrKy0zIGZvciBXZWJLaXQyLgorCiAy MDExLTA4LTE1ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgZ2FyZGVuLW8tbWF0aWMgZnJvbnRlbmQgbmVlZHMgbW9kZWwuY29tbWl0RGF0YUZvclJl dmlzaW9uUmFuZ2UgZnVuY3Rpb24uCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9n dGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5k ZXJUcmVlLmNwcAppbmRleCAyMzA4MWNjLi4zYjAxY2M4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgdXNpbmcgbmFtZXNw YWNlIHN0ZDsKIAogZXh0ZXJuICJDIiB7CiAvLyBUaGlzIEFQSSBpcyBub3QgeWV0IHB1YmxpYy4K LWV4dGVybiBHX0NPTlNUX1JFVFVSTiBnY2hhciogd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fZ2V0 X3RhcmdldChXZWJLaXRXZWJIaXN0b3J5SXRlbSopOworZXh0ZXJuIGNvbnN0IGdjaGFyKiB3ZWJr aXRfd2ViX2hpc3RvcnlfaXRlbV9nZXRfdGFyZ2V0KFdlYktpdFdlYkhpc3RvcnlJdGVtKik7CiBl eHRlcm4gZ2Jvb2xlYW4gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1faXNfdGFyZ2V0X2l0ZW0oV2Vi S2l0V2ViSGlzdG9yeUl0ZW0qKTsKIGV4dGVybiBHTGlzdCogd2Via2l0X3dlYl9oaXN0b3J5X2l0 ZW1fZ2V0X2NoaWxkcmVuKFdlYktpdFdlYkhpc3RvcnlJdGVtKik7CiBleHRlcm4gdm9pZCB3ZWJr aXRfd2ViX3NldHRpbmdzX2FkZF9leHRyYV9wbHVnaW5fZGlyZWN0b3J5KFdlYktpdFdlYlZpZXcq IHZpZXcsIGNvbnN0IGdjaGFyKiBkaXJlY3RvcnkpOwpAQCAtMTE2Nyw3ICsxMTY3LDEyIEBAIGlu dCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgaW5pdGlhbGl6ZUZvbnRzKCk7CiAK ICAgICB3aW5kb3cgPSBndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKTsKKyNpZmRlZiBH VEtfQVBJX1ZFUlNJT05fMgogICAgIGNvbnRhaW5lciA9IGd0a19oYm94X25ldyhUUlVFLCAwKTsK KyNlbHNlCisgICAgY29udGFpbmVyID0gZ3RrX2JveF9uZXcoR1RLX09SSUVOVEFUSU9OX0hPUkla T05UQUwsIDApOworICAgIGd0a19ib3hfc2V0X2hvbW9nZW5lb3VzKEdUS19CT1goY29udGFpbmVy KSwgVFJVRSk7CisjZW5kaWYKICAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKHdp bmRvdyksIGNvbnRhaW5lcik7CiAgICAgZ3RrX3dpZGdldF9zaG93X2FsbCh3aW5kb3cpOwogCmRp ZmYgLS1naXQgYS9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMgYi9Ub29scy9HdGtMYXVuY2hlci9t YWluLmMKaW5kZXggZWRjOGUyZi4uODkxNmNjOSAxMDA2NDQKLS0tIGEvVG9vbHMvR3RrTGF1bmNo ZXIvbWFpbi5jCisrKyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMjEzLDcgKzIxMywx MSBAQCBzdGF0aWMgR3RrV2lkZ2V0KiBjcmVhdGVXaW5kb3coV2ViS2l0V2ViVmlldyoqIG91dFdl YlZpZXcpCiAgICAgd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3 KCkpOwogICAgIHVyaUVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOwogCisjaWZkZWYgR1RLX0FQSV9W RVJTSU9OXzIKICAgICB2Ym94ID0gZ3RrX3Zib3hfbmV3KEZBTFNFLCAwKTsKKyNlbHNlCisgICAg dmJveCA9IGd0a19ib3hfbmV3KEdUS19PUklFTlRBVElPTl9WRVJUSUNBTCwgMCk7CisjZW5kaWYK ICAgICBzdGF0dXNiYXIgPSBjcmVhdGVTdGF0dXNiYXIod2ViVmlldyk7CiAgICAgZ3RrX2JveF9w YWNrX3N0YXJ0KEdUS19CT1godmJveCksIGNyZWF0ZVRvb2xiYXIodXJpRW50cnksIHdlYlZpZXcp LCBGQUxTRSwgRkFMU0UsIDApOwogICAgIGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKHZib3gp LCBjcmVhdGVCcm93c2VyKHdpbmRvdywgdXJpRW50cnksIHN0YXR1c2Jhciwgd2ViVmlldyksIFRS VUUsIFRSVUUsIDApOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJX aW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggMDQx NTY1Zi4uZmM3ZjAzMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJX aW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC0x NTksNyArMTU5LDcgQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5pdChCcm93c2VyV2lu ZG93KiB3aW5kb3cpCiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09MQkFSKHRvb2xiYXIp LCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQoaXRlbSkpOwogCi0g ICAgR3RrV2lkZ2V0ICp2Ym94ID0gZ3RrX3Zib3hfbmV3KEZBTFNFLCAwKTsKKyAgICBHdGtXaWRn ZXQgKnZib3ggPSBndGtfYm94X25ldyhHVEtfT1JJRU5UQVRJT05fVkVSVElDQUwsIDApOwogICAg IHdpbmRvdy0+bWFpbkJveCA9IHZib3g7CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1go dmJveCksIHRvb2xiYXIsIEZBTFNFLCBGQUxTRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KHRv b2xiYXIpOwo=