70651 2011-10-21 14:32:33 -0700 [Qt] Remote debugging needs QWebInspector to work 2011-10-21 15:32:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 1 luiz luiz webkit.review.bot oldest_to_newest 488667 0 luiz 2011-10-21 14:32:33 -0700 Remote debugger causes a crash if the page does not have a QWebInspector associated to it. QWebInspector is a QWidget object that should not be needed by the remote inspector. 488676 1 112024 luiz 2011-10-21 14:46:44 -0700 Created attachment 112024 patch 488678 2 112024 kenneth 2011-10-21 14:52:46 -0700 Comment on attachment 112024 patch View in context: https://bugs.webkit.org/attachment.cgi?id=112024&action=review > Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:287 > + WTF::CString qwe = message.utf8(); Can you find a better name than qwe.... I have no idea what that stands for 488679 3 luiz 2011-10-21 14:55:16 -0700 (In reply to comment #2) > (From update of attachment 112024 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=112024&action=review > > > Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:287 > > + WTF::CString qwe = message.utf8(); > > Can you find a better name than qwe.... I have no idea what that stands for absolutely! :) Sorry for that. 488713 4 112031 luiz 2011-10-21 15:17:28 -0700 Created attachment 112031 patch 488723 5 112031 webkit.review.bot 2011-10-21 15:32:42 -0700 Comment on attachment 112031 patch Clearing flags on attachment: 112031 Committed r98162: <http://trac.webkit.org/changeset/98162> 488724 6 webkit.review.bot 2011-10-21 15:32:46 -0700 All reviewed patches have been landed. Closing bug. 112024 2011-10-21 14:46:44 -0700 2011-10-21 15:17:28 -0700 patch 0001-Qt-Remote-debugging-needs-QWebInspector-to-work.patch text/plain 9949 luiz RnJvbSA1Zjc0Nzk0YmMyZjI2M2VlM2NmNDJmODUxYzVkMmJkN2FlZTZlNzZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQHBhbG0uY29t PgpEYXRlOiBGcmksIDIxIE9jdCAyMDExIDE0OjQ0OjU3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g W1F0XSBSZW1vdGUgZGVidWdnaW5nIG5lZWRzIFFXZWJJbnNwZWN0b3IgdG8gd29yawogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNjUxCgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KClJlbW92aW5nIFFXZWJJbnNwZWN0b3IgZGVwZW5kZW5jeSBmcm9tIHJlbW90 ZSBpbnNwZWN0b3IuCgoqIEFwaS9xd2ViaW5zcGVjdG9yLmNwcDoKKiBBcGkvcXdlYmluc3BlY3Rv cl9wLmg6CihRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6UVdlYkluc3BlY3RvclByaXZhdGUpOgoqIFdl YkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6Okluc3BlY3RvckNs aWVudFF0OjpJbnNwZWN0b3JDbGllbnRRdCk6CihXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6 b3Blbkluc3BlY3RvckZyb250ZW5kKToKKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjphdHRh Y2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQpOgooV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6 OmRldGFjaFJlbW90ZUZyb250ZW5kKToKKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpzZW5k TWVzc2FnZVRvRnJvbnRlbmQpOgoqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0Lmg6 CiogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuY3BwOgooV2ViQ29yZTo6SW5zcGVj dG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDo6dGNwUmVhZHlSZWFkKToKKiBXZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JTZXJ2ZXJRdC5oOgotLS0KIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJpbnNw ZWN0b3IuY3BwICAgICAgICAgICAgIHwgICAyNSAtLS0tLS0tLS0tLS0tLS0tLS0tLQogU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYmluc3BlY3Rvcl9wLmggICAgICAgICAgICAgfCAgICA0IC0tLQog U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIz ICsrKysrKysrKysrKysrKysrKwogLi4uL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0 b3JDbGllbnRRdC5jcHAgfCAgIDE4ICsrKysrKy0tLS0tLS0tCiAuLi4vV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmggICB8ICAgIDQgKy0KIC4uLi9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuY3BwIHwgICAxNiArLS0tLS0tLS0tLS0t CiAuLi4vV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmggICB8ICAg MTEgLS0tLS0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgNjcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmluc3BlY3Rvci5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaW5zcGVjdG9yLmNwcAppbmRleCA2NzA2ZjJh Li41MmZlYjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaW5zcGVjdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaW5zcGVjdG9yLmNwcApAQCAtMTk4 LDMxICsxOTgsNiBAQCB2b2lkIFFXZWJJbnNwZWN0b3JQcml2YXRlOjpzZXRGcm9udGVuZChRV2lk Z2V0KiBuZXdGcm9udGVuZCkKICAgICB9CiB9CiAKLS8qISAKLSAqIFxpbnRlcm5hbCAKLSAqLwot dm9pZCBRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6YXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZyb250ZW5k KFFPYmplY3QqIG5ld1JlbW90ZUZyb250ZW5kKQotewotICAgIGlmIChyZW1vdGVGcm9udGVuZCkK LSAgICAgICAgcmVtb3RlRnJvbnRlbmQtPnNldFBhcmVudCgwKTsKLQotICAgIHJlbW90ZUZyb250 ZW5kID0gbmV3UmVtb3RlRnJvbnRlbmQ7Ci0KLSAgICBpZiAocmVtb3RlRnJvbnRlbmQpCi0gICAg ICAgIHJlbW90ZUZyb250ZW5kLT5zZXRQYXJlbnQocSk7Ci19Ci0KLS8qISAKLSAqIFxpbnRlcm5h bCAKLSAqLwotdm9pZCBRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6ZGV0YWNoUmVtb3RlRnJvbnRlbmQo KQotewotICAgIGlmIChyZW1vdGVGcm9udGVuZCkgewotICAgICAgICByZW1vdGVGcm9udGVuZC0+ ZGVsZXRlTGF0ZXIoKTsKLSAgICAgICAgcmVtb3RlRnJvbnRlbmQgPSAwOwotICAgIH0KLX0KLQog dm9pZCBRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6YWRqdXN0RnJvbnRlbmRTaXplKGNvbnN0IFFTaXpl JiBzaXplKQogewogICAgIGlmIChmcm9udGVuZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvQXBpL3F3ZWJpbnNwZWN0b3JfcC5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmluc3Bl Y3Rvcl9wLmgKaW5kZXggMzA5OWViMS4uNGQzMjdjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYmluc3BlY3Rvcl9wLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl Ymluc3BlY3Rvcl9wLmgKQEAgLTMzLDE4ICszMywxNCBAQCBwdWJsaWM6CiAgICAgOiBxKHFxKQog ICAgICwgcGFnZSgwKQogICAgICwgZnJvbnRlbmQoMCkKLSAgICAsIHJlbW90ZUZyb250ZW5kKDAp CiAgICAge30KIAogICAgIHZvaWQgc2V0RnJvbnRlbmQoUVdpZGdldCogbmV3RnJvbnRlbmQpOwot ICAgIHZvaWQgYXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZyb250ZW5kKFFPYmplY3QqIG5ld1JlbW90 ZUZyb250ZW5kKTsKLSAgICB2b2lkIGRldGFjaFJlbW90ZUZyb250ZW5kKCk7CiAgICAgdm9pZCBh ZGp1c3RGcm9udGVuZFNpemUoY29uc3QgUVNpemUmIHNpemUpOwogCiAgICAgUVdlYkluc3BlY3Rv ciogcTsKICAgICBRV2ViUGFnZSogcGFnZTsKICAgICBRV2lkZ2V0KiBmcm9udGVuZDsKLSAgICBR T2JqZWN0KiByZW1vdGVGcm9udGVuZDsKIH07CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA5 MTliNTI4Li4yYmNlMjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDExLTEw LTIxICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBwYWxtLmNvbT4KKworICAgICAgICBb UXRdIFJlbW90ZSBkZWJ1Z2dpbmcgbmVlZHMgUVdlYkluc3BlY3RvciB0byB3b3JrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDY1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92aW5nIFFXZWJJbnNw ZWN0b3IgZGVwZW5kZW5jeSBmcm9tIHJlbW90ZSBpbnNwZWN0b3IuCisKKyAgICAgICAgKiBBcGkv cXdlYmluc3BlY3Rvci5jcHA6CisgICAgICAgICogQXBpL3F3ZWJpbnNwZWN0b3JfcC5oOgorICAg ICAgICAoUVdlYkluc3BlY3RvclByaXZhdGU6OlFXZWJJbnNwZWN0b3JQcml2YXRlKToKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6SW5zcGVjdG9yQ2xpZW50UXQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6Om9wZW5JbnNwZWN0b3JGcm9udGVuZCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6YXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZyb250 ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpkZXRhY2hSZW1vdGVG cm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6c2VuZE1lc3Nh Z2VUb0Zyb250ZW5kKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRR dC5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ6OnRjcFJlYWR5 UmVhZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuaDoKKwog MjAxMS0xMC0yMSAgWmVubyBBbGJpc3NlciAgPHplbm8uYWxiaXNzZXJAbm9raWEuY29tPgogCiAg ICAgICAgIFtRdF0gV2ViS2l0IGJ1aWxkIGRvZXMgbm90IHJlc3BlY3QgUU1BS0VfTUFDX1NESyB2 YXJpYWJsZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5z cGVjdG9yQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNw ZWN0b3JDbGllbnRRdC5jcHAKaW5kZXggMTFmN2JjMS4uNTA4MzZjYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKQEAg LTE3OSw2ICsxNzksNyBAQCBJbnNwZWN0b3JDbGllbnRRdDo6SW5zcGVjdG9yQ2xpZW50UXQoUVdl YlBhZ2UqIHBhZ2UpCiAgICAgOiBtX2luc3BlY3RlZFdlYlBhZ2UocGFnZSkKICAgICAsIG1fZnJv bnRlbmRXZWJQYWdlKDApCiAgICAgLCBtX2Zyb250ZW5kQ2xpZW50KDApCisgICAgLCBtX3JlbW90 ZUZyb250RW5kQ2hhbm5lbCgwKQogewogICAgIEluc3BlY3RvclNlcnZlclF0KiB3ZWJJbnNwZWN0 b3JTZXJ2ZXIgPSBJbnNwZWN0b3JTZXJ2ZXJRdDo6c2VydmVyKCk7CiAgICAgaWYgKHdlYkluc3Bl Y3RvclNlcnZlcikKQEAgLTIxMCw3ICsyMTEsNyBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0Ojpv cGVuSW5zcGVjdG9yRnJvbnRlbmQoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlciogaW5zcAog CiAgICAgUVdlYkluc3BlY3RvciogaW5zcGVjdG9yID0gbV9pbnNwZWN0ZWRXZWJQYWdlLT5kLT5n ZXRPckNyZWF0ZUluc3BlY3RvcigpOwogICAgIC8vIFJlbW90ZSBmcm9udGVuZCB3YXMgYXR0YWNo ZWQuCi0gICAgaWYgKG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9yLT5kLT5yZW1vdGVG cm9udGVuZCkKKyAgICBpZiAobV9yZW1vdGVGcm9udEVuZENoYW5uZWwpCiAgICAgICAgIHJldHVy bjsKIAogICAgIC8vIFRoaXMgaXMgYSBrbm93biBob29rIHRoYXQgYWxsb3dzIGNoYW5naW5nIHRo ZSBkZWZhdWx0IFVSTCBmb3IgdGhlCkBAIC0yNDgsMTEgKzI0OSwxMCBAQCB2b2lkIEluc3BlY3Rv ckNsaWVudFF0OjpyZWxlYXNlRnJvbnRlbmRQYWdlKCkKICAgICBtX2Zyb250ZW5kQ2xpZW50ID0g MDsKIH0KIAotdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6YXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZy b250ZW5kKFJlbW90ZUZyb250ZW5kQ2hhbm5lbCogY2hhbm5lbCkKK3ZvaWQgSW5zcGVjdG9yQ2xp ZW50UXQ6OmF0dGFjaEFuZFJlcGxhY2VSZW1vdGVGcm9udGVuZChJbnNwZWN0b3JTZXJ2ZXJSZXF1 ZXN0SGFuZGxlclF0KiBjaGFubmVsKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgLy8g Q2hhbm5lbCB3YXMgYWxsb2NhdGVkIGJ5IEluc3BlY3RvclNlcnZlclF0LiBIZXJlIHdlIHRyYW5z ZmVyIG93bmVyc2hpcCB0byBpbnNwZWN0b3IuCi0gICAgbV9pbnNwZWN0ZWRXZWJQYWdlLT5kLT5p bnNwZWN0b3ItPmQtPmF0dGFjaEFuZFJlcGxhY2VSZW1vdGVGcm9udGVuZChjaGFubmVsKTsKKyAg ICBtX3JlbW90ZUZyb250RW5kQ2hhbm5lbCA9IGNoYW5uZWw7CiAgICAgbV9pbnNwZWN0ZWRXZWJQ YWdlLT5kLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmNvbm5lY3RGcm9udGVuZCgpOwogI2VuZGlm CiB9CkBAIC0yNjAsNyArMjYwLDcgQEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6YXR0YWNoQW5k UmVwbGFjZVJlbW90ZUZyb250ZW5kKFJlbW90ZUZyb250ZW5kQ2hhbm5lbCogY2gKIHZvaWQgSW5z cGVjdG9yQ2xpZW50UXQ6OmRldGFjaFJlbW90ZUZyb250ZW5kKCkKIHsKICNpZiBFTkFCTEUoSU5T UEVDVE9SKQotICAgIG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9yLT5kLT5kZXRhY2hS ZW1vdGVGcm9udGVuZCgpOworICAgIG1fcmVtb3RlRnJvbnRFbmRDaGFubmVsID0gMDsKICAgICBt X2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZGlzY29ubmVjdEZy b250ZW5kKCk7CiAjZW5kaWYKIH0KQEAgLTI4MywxMSArMjgzLDkgQEAgdm9pZCBJbnNwZWN0b3JD bGllbnRRdDo6aGlkZUhpZ2hsaWdodCgpCiBib29sIEluc3BlY3RvckNsaWVudFF0OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewogI2lmIEVOQUJMRShJTlNQ RUNUT1IpCi0gICAgaWYgKG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9yLT5kLT5yZW1v dGVGcm9udGVuZCkgewotICAgICAgICBSZW1vdGVGcm9udGVuZENoYW5uZWwqIHNlc3Npb24gPSBx b2JqZWN0X2Nhc3Q8UmVtb3RlRnJvbnRlbmRDaGFubmVsKj4obV9pbnNwZWN0ZWRXZWJQYWdlLT5k LT5pbnNwZWN0b3ItPmQtPnJlbW90ZUZyb250ZW5kKTsKLSAgICAgICAgaWYgKHNlc3Npb24pCi0g ICAgICAgICAgICBzZXNzaW9uLT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQobWVzc2FnZSk7Ci0gICAg ICAgIHJldHVybiB0cnVlOworICAgIGlmIChtX3JlbW90ZUZyb250RW5kQ2hhbm5lbCkgeworICAg ICAgICBXVEY6OkNTdHJpbmcgcXdlID0gbWVzc2FnZS51dGY4KCk7CisgICAgICAgIHJldHVybiBt X3JlbW90ZUZyb250RW5kQ2hhbm5lbC0+d2ViU29ja2V0U2VuZChxd2UuZGF0YSgpLCBxd2UubGVu Z3RoKCkpOwogICAgIH0KICAgICBpZiAoIW1fZnJvbnRlbmRXZWJQYWdlKQogICAgICAgICByZXR1 cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0lu c3BlY3RvckNsaWVudFF0LmggYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudFF0LmgKaW5kZXggMGEwM2ZkOS4uZTg1YzlhZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuaApAQCAtNDQsNyAr NDQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZENsaWVu dFF0OwogY2xhc3MgSW5zcGVjdG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDsKIGNsYXNzIFBhZ2U7 Ci1jbGFzcyBSZW1vdGVGcm9udGVuZENoYW5uZWw7CiAKIGNsYXNzIEluc3BlY3RvckNsaWVudFF0 IDogcHVibGljIEluc3BlY3RvckNsaWVudCB7CiBwdWJsaWM6CkBAIC02MSw3ICs2MCw3IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgcmVsZWFzZUZyb250ZW5kUGFnZSgpOwogCi0gICAgdm9pZCBhdHRh Y2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQoUmVtb3RlRnJvbnRlbmRDaGFubmVsICpjaGFubmVs KTsKKyAgICB2b2lkIGF0dGFjaEFuZFJlcGxhY2VSZW1vdGVGcm9udGVuZChJbnNwZWN0b3JTZXJ2 ZXJSZXF1ZXN0SGFuZGxlclF0ICpjaGFubmVsKTsKICAgICB2b2lkIGRldGFjaFJlbW90ZUZyb250 ZW5kKCk7CiAKIHByaXZhdGU6CkBAIC02OSw2ICs2OCw3IEBAIHByaXZhdGU6CiAgICAgUVdlYlBh Z2UqIG1fZnJvbnRlbmRXZWJQYWdlOwogICAgIEluc3BlY3RvckZyb250ZW5kQ2xpZW50UXQqIG1f ZnJvbnRlbmRDbGllbnQ7CiAgICAgYm9vbCBtX3JlbW90ZUluc3BlY3RvcjsKKyAgICBJbnNwZWN0 b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0KiBtX3JlbW90ZUZyb250RW5kQ2hhbm5lbDsKIAogICAg IGZyaWVuZCBjbGFzcyBJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0OwogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQu Y3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5j cHAKaW5kZXggOTJiN2Q1Yy4uOTViNzViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAKQEAgLTI0MCw3ICsyNDAsNyBA QCB2b2lkIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ6OnRjcFJlYWR5UmVhZCgpCiAg ICAgICAgICAgICAgICAgICAgIG1faW5zcGVjdG9yQ2xpZW50ID0gbV9zZXJ2ZXItPmluc3BlY3Rv ckNsaWVudEZvclBhZ2UocGFnZU51bSk7CiAgICAgICAgICAgICAgICAgICAgIC8vIEF0dGFjaCBy ZW1vdGVGcm9udGVuZENoYW5uZWwgdG8gaW5zcGVjdG9yLCBhbHNvIHRyYW5zZmVycmluZyBvd25l cnNoaXAuCiAgICAgICAgICAgICAgICAgICAgIGlmIChtX2luc3BlY3RvckNsaWVudCkKLSAgICAg ICAgICAgICAgICAgICAgICAgIG1faW5zcGVjdG9yQ2xpZW50LT5hdHRhY2hBbmRSZXBsYWNlUmVt b3RlRnJvbnRlbmQobmV3IFJlbW90ZUZyb250ZW5kQ2hhbm5lbCh0aGlzKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBtX2luc3BlY3RvckNsaWVudC0+YXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZy b250ZW5kKHRoaXMpOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgfQpAQCAtMzcx LDE4ICszNzEsNCBAQCB2b2lkIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ6OndlYlNv Y2tldFJlYWR5UmVhZCgpCiAgICAgfQogfQogCi1SZW1vdGVGcm9udGVuZENoYW5uZWw6OlJlbW90 ZUZyb250ZW5kQ2hhbm5lbChJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0KiByZXF1ZXN0 SGFuZGxlcikKLSAgICA6IFFPYmplY3QocmVxdWVzdEhhbmRsZXIpCi0gICAgLCBtX3JlcXVlc3RI YW5kbGVyKHJlcXVlc3RIYW5kbGVyKQotewotfQotCi1ib29sIFJlbW90ZUZyb250ZW5kQ2hhbm5l bDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKLXsKLSAgICBp ZiAoIW1fcmVxdWVzdEhhbmRsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBDU3RyaW5n IGNzdHIgPSBtZXNzYWdlLnV0ZjgoKTsKLSAgICByZXR1cm4gbV9yZXF1ZXN0SGFuZGxlci0+d2Vi U29ja2V0U2VuZChjc3RyLmRhdGEoKSwgY3N0ci5sZW5ndGgoKSk7Ci19Ci0KIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuaCBi L1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuaAppbmRl eCA5MjJiNjNlLi4wNjM4Zjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5oCkBAIC02NiwxNyArNjYsNiBAQCBwcml2YXRlOgog ICAgIGZyaWVuZCBjbGFzcyBJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0OwogfTsKIAot Y2xhc3MgUmVtb3RlRnJvbnRlbmRDaGFubmVsIDogcHVibGljIFFPYmplY3QgewotICAgIFFfT0JK RUNUCi1wdWJsaWM6Ci0KLSAgICBSZW1vdGVGcm9udGVuZENoYW5uZWwoSW5zcGVjdG9yU2VydmVy UmVxdWVzdEhhbmRsZXJRdCogcmVxdWVzdEhhbmRsZXIpOwotICAgIGJvb2wgc2VuZE1lc3NhZ2VU b0Zyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7Ci0KLXByaXZhdGU6Ci0gICAgSW5zcGVj dG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdCogbV9yZXF1ZXN0SGFuZGxlcjsKLX07Ci0KIGNsYXNz IEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAg UV9PQkpFQ1QKIHB1YmxpYzoKLS0gCjEuNy4wLjQKCg== 112031 2011-10-21 15:17:28 -0700 2011-10-21 15:32:42 -0700 patch 0001-Qt-Remote-debugging-needs-QWebInspector-to-work.patch text/plain 9942 luiz RnJvbSA4MzU4NDNmMzA3ZmNhNmNmZTU1YmYwYTU4YTZlYmJkMTc1ZWJhYTEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQHBhbG0uY29t PgpEYXRlOiBGcmksIDIxIE9jdCAyMDExIDE1OjAxOjE4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g W1F0XSBSZW1vdGUgZGVidWdnaW5nIG5lZWRzIFFXZWJJbnNwZWN0b3IgdG8gd29yawogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNjUxCgpSZXZpZXdlZCBieSBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KClJlbW92aW5nIFFXZWJJbnNwZWN0b3IgZGVwZW5kZW5j eSBmcm9tIHJlbW90ZSBpbnNwZWN0b3IuCgoqIEFwaS9xd2ViaW5zcGVjdG9yLmNwcDoKKiBBcGkv cXdlYmluc3BlY3Rvcl9wLmg6CihRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6UVdlYkluc3BlY3RvclBy aXZhdGUpOgoqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6 Okluc3BlY3RvckNsaWVudFF0OjpJbnNwZWN0b3JDbGllbnRRdCk6CihXZWJDb3JlOjpJbnNwZWN0 b3JDbGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKToKKFdlYkNvcmU6Okluc3BlY3RvckNs aWVudFF0OjphdHRhY2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQpOgooV2ViQ29yZTo6SW5zcGVj dG9yQ2xpZW50UXQ6OmRldGFjaFJlbW90ZUZyb250ZW5kKToKKFdlYkNvcmU6Okluc3BlY3RvckNs aWVudFF0OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQpOgoqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3Rv ckNsaWVudFF0Lmg6CiogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuY3BwOgooV2Vi Q29yZTo6SW5zcGVjdG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDo6dGNwUmVhZHlSZWFkKToKKiBX ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5oOgotLS0KIFNvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJpbnNwZWN0b3IuY3BwICAgICAgICAgICAgIHwgICAyNSAtLS0tLS0tLS0tLS0tLS0t LS0tLQogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmluc3BlY3Rvcl9wLmggICAgICAgICAgICAg fCAgICA0IC0tLQogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDIzICsrKysrKysrKysrKysrKysrKwogLi4uL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAgfCAgIDE3ICsrKysrKy0tLS0tLS0KIC4uLi9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuaCAgIHwgICAgNCArLQogLi4u L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAgfCAgIDE2ICst LS0tLS0tLS0tLS0KIC4uLi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVy UXQuaCAgIHwgICAxMSAtLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCsp LCA2NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vi aW5zcGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJpbnNwZWN0b3IuY3BwCmlu ZGV4IDY3MDZmMmEuLjUyZmViODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3 ZWJpbnNwZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJpbnNwZWN0b3Iu Y3BwCkBAIC0xOTgsMzEgKzE5OCw2IEBAIHZvaWQgUVdlYkluc3BlY3RvclByaXZhdGU6OnNldEZy b250ZW5kKFFXaWRnZXQqIG5ld0Zyb250ZW5kKQogICAgIH0KIH0KIAotLyohIAotICogXGludGVy bmFsIAotICovCi12b2lkIFFXZWJJbnNwZWN0b3JQcml2YXRlOjphdHRhY2hBbmRSZXBsYWNlUmVt b3RlRnJvbnRlbmQoUU9iamVjdCogbmV3UmVtb3RlRnJvbnRlbmQpCi17Ci0gICAgaWYgKHJlbW90 ZUZyb250ZW5kKQotICAgICAgICByZW1vdGVGcm9udGVuZC0+c2V0UGFyZW50KDApOwotCi0gICAg cmVtb3RlRnJvbnRlbmQgPSBuZXdSZW1vdGVGcm9udGVuZDsKLQotICAgIGlmIChyZW1vdGVGcm9u dGVuZCkKLSAgICAgICAgcmVtb3RlRnJvbnRlbmQtPnNldFBhcmVudChxKTsKLX0KLQotLyohIAot ICogXGludGVybmFsIAotICovCi12b2lkIFFXZWJJbnNwZWN0b3JQcml2YXRlOjpkZXRhY2hSZW1v dGVGcm9udGVuZCgpCi17Ci0gICAgaWYgKHJlbW90ZUZyb250ZW5kKSB7Ci0gICAgICAgIHJlbW90 ZUZyb250ZW5kLT5kZWxldGVMYXRlcigpOwotICAgICAgICByZW1vdGVGcm9udGVuZCA9IDA7Ci0g ICAgfQotfQotCiB2b2lkIFFXZWJJbnNwZWN0b3JQcml2YXRlOjphZGp1c3RGcm9udGVuZFNpemUo Y29uc3QgUVNpemUmIHNpemUpCiB7CiAgICAgaWYgKGZyb250ZW5kKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYmluc3BlY3Rvcl9wLmggYi9Tb3VyY2UvV2ViS2l0L3F0L0Fw aS9xd2ViaW5zcGVjdG9yX3AuaAppbmRleCAzMDk5ZWIxLi40ZDMyN2NjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaW5zcGVjdG9yX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0FwaS9xd2ViaW5zcGVjdG9yX3AuaApAQCAtMzMsMTggKzMzLDE0IEBAIHB1YmxpYzoKICAg ICA6IHEocXEpCiAgICAgLCBwYWdlKDApCiAgICAgLCBmcm9udGVuZCgwKQotICAgICwgcmVtb3Rl RnJvbnRlbmQoMCkKICAgICB7fQogCiAgICAgdm9pZCBzZXRGcm9udGVuZChRV2lkZ2V0KiBuZXdG cm9udGVuZCk7Ci0gICAgdm9pZCBhdHRhY2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQoUU9iamVj dCogbmV3UmVtb3RlRnJvbnRlbmQpOwotICAgIHZvaWQgZGV0YWNoUmVtb3RlRnJvbnRlbmQoKTsK ICAgICB2b2lkIGFkanVzdEZyb250ZW5kU2l6ZShjb25zdCBRU2l6ZSYgc2l6ZSk7CiAKICAgICBR V2ViSW5zcGVjdG9yKiBxOwogICAgIFFXZWJQYWdlKiBwYWdlOwogICAgIFFXaWRnZXQqIGZyb250 ZW5kOwotICAgIFFPYmplY3QqIHJlbW90ZUZyb250ZW5kOwogfTsKIAogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IDkxOWI1MjguLmZlZDllYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTAtMjEgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQHBhbG0uY29tPgor CisgICAgICAgIFtRdF0gUmVtb3RlIGRlYnVnZ2luZyBuZWVkcyBRV2ViSW5zcGVjdG9yIHRvIHdv cmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNjUx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAg ICAgICAgUmVtb3ZpbmcgUVdlYkluc3BlY3RvciBkZXBlbmRlbmN5IGZyb20gcmVtb3RlIGluc3Bl Y3Rvci4KKworICAgICAgICAqIEFwaS9xd2ViaW5zcGVjdG9yLmNwcDoKKyAgICAgICAgKiBBcGkv cXdlYmluc3BlY3Rvcl9wLmg6CisgICAgICAgIChRV2ViSW5zcGVjdG9yUHJpdmF0ZTo6UVdlYklu c3BlY3RvclByaXZhdGUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpJbnNwZWN0b3JD bGllbnRRdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6b3Blbkluc3Bl Y3RvckZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjphdHRh Y2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y Q2xpZW50UXQ6OmRldGFjaFJlbW90ZUZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckNsaWVudFF0OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQpOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0luc3BlY3RvckNsaWVudFF0Lmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5z cGVjdG9yU2VydmVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU2VydmVyUmVx dWVzdEhhbmRsZXJRdDo6dGNwUmVhZHlSZWFkKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9J bnNwZWN0b3JTZXJ2ZXJRdC5oOgorCiAyMDExLTEwLTIxICBaZW5vIEFsYmlzc2VyICA8emVuby5h bGJpc3NlckBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBXZWJLaXQgYnVpbGQgZG9lcyBub3Qg cmVzcGVjdCBRTUFLRV9NQUNfU0RLIHZhcmlhYmxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAppbmRleCAxMWY3YmMxLi42 ZThjYzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0lu c3BlY3RvckNsaWVudFF0LmNwcApAQCAtMTc5LDYgKzE3OSw3IEBAIEluc3BlY3RvckNsaWVudFF0 OjpJbnNwZWN0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKICAgICA6IG1faW5zcGVjdGVkV2Vi UGFnZShwYWdlKQogICAgICwgbV9mcm9udGVuZFdlYlBhZ2UoMCkKICAgICAsIG1fZnJvbnRlbmRD bGllbnQoMCkKKyAgICAsIG1fcmVtb3RlRnJvbnRFbmRDaGFubmVsKDApCiB7CiAgICAgSW5zcGVj dG9yU2VydmVyUXQqIHdlYkluc3BlY3RvclNlcnZlciA9IEluc3BlY3RvclNlcnZlclF0OjpzZXJ2 ZXIoKTsKICAgICBpZiAod2ViSW5zcGVjdG9yU2VydmVyKQpAQCAtMjEwLDcgKzIxMSw3IEBAIHZv aWQgSW5zcGVjdG9yQ2xpZW50UXQ6Om9wZW5JbnNwZWN0b3JGcm9udGVuZChXZWJDb3JlOjpJbnNw ZWN0b3JDb250cm9sbGVyKiBpbnNwCiAKICAgICBRV2ViSW5zcGVjdG9yKiBpbnNwZWN0b3IgPSBt X2luc3BlY3RlZFdlYlBhZ2UtPmQtPmdldE9yQ3JlYXRlSW5zcGVjdG9yKCk7CiAgICAgLy8gUmVt b3RlIGZyb250ZW5kIHdhcyBhdHRhY2hlZC4KLSAgICBpZiAobV9pbnNwZWN0ZWRXZWJQYWdlLT5k LT5pbnNwZWN0b3ItPmQtPnJlbW90ZUZyb250ZW5kKQorICAgIGlmIChtX3JlbW90ZUZyb250RW5k Q2hhbm5lbCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gVGhpcyBpcyBhIGtub3duIGhvb2sg dGhhdCBhbGxvd3MgY2hhbmdpbmcgdGhlIGRlZmF1bHQgVVJMIGZvciB0aGUKQEAgLTI0OCwxMSAr MjQ5LDEwIEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OnJlbGVhc2VGcm9udGVuZFBhZ2UoKQog ICAgIG1fZnJvbnRlbmRDbGllbnQgPSAwOwogfQogCi12b2lkIEluc3BlY3RvckNsaWVudFF0Ojph dHRhY2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQoUmVtb3RlRnJvbnRlbmRDaGFubmVsKiBjaGFu bmVsKQordm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6YXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZyb250 ZW5kKEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQqIGNoYW5uZWwpCiB7CiAjaWYgRU5B QkxFKElOU1BFQ1RPUikKLSAgICAvLyBDaGFubmVsIHdhcyBhbGxvY2F0ZWQgYnkgSW5zcGVjdG9y U2VydmVyUXQuIEhlcmUgd2UgdHJhbnNmZXIgb3duZXJzaGlwIHRvIGluc3BlY3Rvci4KLSAgICBt X2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3Rvci0+ZC0+YXR0YWNoQW5kUmVwbGFjZVJlbW90 ZUZyb250ZW5kKGNoYW5uZWwpOworICAgIG1fcmVtb3RlRnJvbnRFbmRDaGFubmVsID0gY2hhbm5l bDsKICAgICBtX2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+Y29u bmVjdEZyb250ZW5kKCk7CiAjZW5kaWYKIH0KQEAgLTI2MCw3ICsyNjAsNyBAQCB2b2lkIEluc3Bl Y3RvckNsaWVudFF0OjphdHRhY2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQoUmVtb3RlRnJvbnRl bmRDaGFubmVsKiBjaAogdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6ZGV0YWNoUmVtb3RlRnJvbnRl bmQoKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgbV9pbnNwZWN0ZWRXZWJQYWdlLT5k LT5pbnNwZWN0b3ItPmQtPmRldGFjaFJlbW90ZUZyb250ZW5kKCk7CisgICAgbV9yZW1vdGVGcm9u dEVuZENoYW5uZWwgPSAwOwogICAgIG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9yQ29u dHJvbGxlcigpLT5kaXNjb25uZWN0RnJvbnRlbmQoKTsKICNlbmRpZgogfQpAQCAtMjgzLDEwICsy ODMsOSBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0OjpoaWRlSGlnaGxpZ2h0KCkKIGJvb2wgSW5z cGVjdG9yQ2xpZW50UXQ6OnNlbmRNZXNzYWdlVG9Gcm9udGVuZChjb25zdCBTdHJpbmcmIG1lc3Nh Z2UpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAobV9pbnNwZWN0ZWRXZWJQYWdl LT5kLT5pbnNwZWN0b3ItPmQtPnJlbW90ZUZyb250ZW5kKSB7Ci0gICAgICAgIFJlbW90ZUZyb250 ZW5kQ2hhbm5lbCogc2Vzc2lvbiA9IHFvYmplY3RfY2FzdDxSZW1vdGVGcm9udGVuZENoYW5uZWwq PihtX2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3Rvci0+ZC0+cmVtb3RlRnJvbnRlbmQpOwot ICAgICAgICBpZiAoc2Vzc2lvbikKLSAgICAgICAgICAgIHNlc3Npb24tPnNlbmRNZXNzYWdlVG9G cm9udGVuZChtZXNzYWdlKTsKKyAgICBpZiAobV9yZW1vdGVGcm9udEVuZENoYW5uZWwpIHsKKyAg ICAgICAgV1RGOjpDU3RyaW5nIG1zZyA9IG1lc3NhZ2UudXRmOCgpOworICAgICAgICBtX3JlbW90 ZUZyb250RW5kQ2hhbm5lbC0+d2ViU29ja2V0U2VuZChtc2cuZGF0YSgpLCBtc2cubGVuZ3RoKCkp OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgaWYgKCFtX2Zyb250ZW5kV2ViUGFn ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9y Q2xpZW50UXQuaCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50UXQuaAppbmRleCAwYTAzZmQ5Li5lODVjOWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5oCkBAIC00NCw3ICs0NCw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEluc3BlY3RvckZyb250ZW5kQ2xpZW50UXQ7CiBj bGFzcyBJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0OwogY2xhc3MgUGFnZTsKLWNsYXNz IFJlbW90ZUZyb250ZW5kQ2hhbm5lbDsKIAogY2xhc3MgSW5zcGVjdG9yQ2xpZW50UXQgOiBwdWJs aWMgSW5zcGVjdG9yQ2xpZW50IHsKIHB1YmxpYzoKQEAgLTYxLDcgKzYwLDcgQEAgcHVibGljOgog CiAgICAgdm9pZCByZWxlYXNlRnJvbnRlbmRQYWdlKCk7CiAKLSAgICB2b2lkIGF0dGFjaEFuZFJl cGxhY2VSZW1vdGVGcm9udGVuZChSZW1vdGVGcm9udGVuZENoYW5uZWwgKmNoYW5uZWwpOworICAg IHZvaWQgYXR0YWNoQW5kUmVwbGFjZVJlbW90ZUZyb250ZW5kKEluc3BlY3RvclNlcnZlclJlcXVl c3RIYW5kbGVyUXQgKmNoYW5uZWwpOwogICAgIHZvaWQgZGV0YWNoUmVtb3RlRnJvbnRlbmQoKTsK IAogcHJpdmF0ZToKQEAgLTY5LDYgKzY4LDcgQEAgcHJpdmF0ZToKICAgICBRV2ViUGFnZSogbV9m cm9udGVuZFdlYlBhZ2U7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRRdCogbV9mcm9udGVu ZENsaWVudDsKICAgICBib29sIG1fcmVtb3RlSW5zcGVjdG9yOworICAgIEluc3BlY3RvclNlcnZl clJlcXVlc3RIYW5kbGVyUXQqIG1fcmVtb3RlRnJvbnRFbmRDaGFubmVsOwogCiAgICAgZnJpZW5k IGNsYXNzIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ7CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAgYi9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmNwcAppbmRl eCA5MmI3ZDVjLi45NWI3NWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0luc3BlY3RvclNlcnZlclF0LmNwcApAQCAtMjQwLDcgKzI0MCw3IEBAIHZvaWQg SW5zcGVjdG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDo6dGNwUmVhZHlSZWFkKCkKICAgICAgICAg ICAgICAgICAgICAgbV9pbnNwZWN0b3JDbGllbnQgPSBtX3NlcnZlci0+aW5zcGVjdG9yQ2xpZW50 Rm9yUGFnZShwYWdlTnVtKTsKICAgICAgICAgICAgICAgICAgICAgLy8gQXR0YWNoIHJlbW90ZUZy b250ZW5kQ2hhbm5lbCB0byBpbnNwZWN0b3IsIGFsc28gdHJhbnNmZXJyaW5nIG93bmVyc2hpcC4K ICAgICAgICAgICAgICAgICAgICAgaWYgKG1faW5zcGVjdG9yQ2xpZW50KQotICAgICAgICAgICAg ICAgICAgICAgICAgbV9pbnNwZWN0b3JDbGllbnQtPmF0dGFjaEFuZFJlcGxhY2VSZW1vdGVGcm9u dGVuZChuZXcgUmVtb3RlRnJvbnRlbmRDaGFubmVsKHRoaXMpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIG1faW5zcGVjdG9yQ2xpZW50LT5hdHRhY2hBbmRSZXBsYWNlUmVtb3RlRnJvbnRlbmQo dGhpcyk7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB9CkBAIC0zNzEsMTggKzM3 MSw0IEBAIHZvaWQgSW5zcGVjdG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDo6d2ViU29ja2V0UmVh ZHlSZWFkKCkKICAgICB9CiB9CiAKLVJlbW90ZUZyb250ZW5kQ2hhbm5lbDo6UmVtb3RlRnJvbnRl bmRDaGFubmVsKEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQqIHJlcXVlc3RIYW5kbGVy KQotICAgIDogUU9iamVjdChyZXF1ZXN0SGFuZGxlcikKLSAgICAsIG1fcmVxdWVzdEhhbmRsZXIo cmVxdWVzdEhhbmRsZXIpCi17Ci19Ci0KLWJvb2wgUmVtb3RlRnJvbnRlbmRDaGFubmVsOjpzZW5k TWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQotewotICAgIGlmICghbV9y ZXF1ZXN0SGFuZGxlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIENTdHJpbmcgY3N0ciA9 IG1lc3NhZ2UudXRmOCgpOwotICAgIHJldHVybiBtX3JlcXVlc3RIYW5kbGVyLT53ZWJTb2NrZXRT ZW5kKGNzdHIuZGF0YSgpLCBjc3RyLmxlbmd0aCgpKTsKLX0KLQogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5oIGIvU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5oCmluZGV4IDkyMmI2 M2UuLjA2MzhmODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv SW5zcGVjdG9yU2VydmVyUXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0luc3BlY3RvclNlcnZlclF0LmgKQEAgLTY2LDE3ICs2Niw2IEBAIHByaXZhdGU6CiAgICAgZnJp ZW5kIGNsYXNzIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ7CiB9OwogCi1jbGFzcyBS ZW1vdGVGcm9udGVuZENoYW5uZWwgOiBwdWJsaWMgUU9iamVjdCB7Ci0gICAgUV9PQkpFQ1QKLXB1 YmxpYzoKLQotICAgIFJlbW90ZUZyb250ZW5kQ2hhbm5lbChJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0 SGFuZGxlclF0KiByZXF1ZXN0SGFuZGxlcik7Ci0gICAgYm9vbCBzZW5kTWVzc2FnZVRvRnJvbnRl bmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsKLQotcHJpdmF0ZToKLSAgICBJbnNwZWN0b3JTZXJ2 ZXJSZXF1ZXN0SGFuZGxlclF0KiBtX3JlcXVlc3RIYW5kbGVyOwotfTsKLQogY2xhc3MgSW5zcGVj dG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdCA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVD VAogcHVibGljOgotLSAKMS43LjAuNAoK