55956 2011-03-08 11:53:05 -0800 WebKit2 Changes to correct WinCairo port build 2011-03-08 15:36:46 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham webkit.review.bot oldest_to_newest 364071 0 bfulgham 2011-03-08 11:53:05 -0800 The recent changes to the WebKit2 rendering logic do not build properly under WinCairo. This issue collects the changes I made to get things building again. 364079 1 85075 bfulgham 2011-03-08 11:57:55 -0800 Created attachment 85075 Build corrections for WinCairo 364084 2 webkit.review.bot 2011-03-08 12:00:40 -0800 Attachment 85075 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Source/WebKit2/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] Source/WebKit2/ChangeLog:20: Line contains tab character. [whitespace/tab] [5] Source/WebKit2/ChangeLog:25: Line contains tab character. [whitespace/tab] [5] Source/WebKit2/ChangeLog:27: Line contains tab character. [whitespace/tab] [5] Source/WebKit2/UIProcess/DrawingAreaProxy.h:34: Alphabetical sorting problem. [build/include_order] [4] Source/WebKit2/UIProcess/win/WebView.cpp:1122: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 7 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 364094 3 85076 bfulgham 2011-03-08 12:13:06 -0800 Created attachment 85076 Get rid of tabs! 364095 4 webkit.review.bot 2011-03-08 12:15:36 -0800 Attachment 85076 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/DrawingAreaProxy.h:34: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 364097 5 85078 bfulgham 2011-03-08 12:19:32 -0800 Created attachment 85078 Correct <stdint.h> include ordering 364193 6 bfulgham 2011-03-08 15:36:46 -0800 Landed in http://trac.webkit.org/changeset/80596. 85075 2011-03-08 11:57:55 -0800 2011-03-08 12:13:06 -0800 Build corrections for WinCairo webkit2_wincairo.patch text/plain 15418 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTc3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTEtMDMtMDggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NTk1NgorICAgICAgICBXZWJLaXQyIENoYW5nZXMgdG8gY29ycmVjdCBXaW5DYWlybyBw b3J0IGJ1aWxkCisKKyAgICAgICAgKiBTaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oOiBEb24ndCBl eGNsdWRlIENvcmVJUEMgZGVjbGFyYXRpb25zIGZvciBub24tYWNjZWxlcmF0ZWQKKwkJICBjb21w b3NpdGluZyBjYXNlLgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lmg6IEFk ZCAic3RkaW50LmgiIGluY2x1ZGUgbmVlZGVkIGZvciBDYWlybyBidWlsZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOiBFeGNsdWRlIGFjY2VsZXJhdGVkIGNv bXBvc2l0aW5nIGNvZGUgZm9yCisJCSAgV2luQ2Fpcm8gYnVpbGQuCisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwpOgorICAgICAgICAo V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUp OgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50ZXJBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBs OjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAoV2ViS2l0OjpEcmF3 aW5nQXJlYVByb3h5SW1wbDo6c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXNwYXRjaERpZFVwZGF0 ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94 eUltcGwuaDogRXhjbHVkZSBkZWNsYXJhdGlvbnMgZm9yIGNvZGUgb25seSB1c2VkIHdoZW4KKwkJ ICBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLgorICAgICAgICAoV2ViS2l0OjpE cmF3aW5nQXJlYVByb3h5SW1wbDo6aXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAg ICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOiBQcm90ZWN0IENHLXNwZWNpZmljIGRy YXdpbmcgY29kZS4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6c2V0RmluZEluZGljYXRvcik6 CisgICAgICAgICogV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaDogQWxsb3cgQ0ZMaXRl IGltcGxlbnRhdGlvbiB0byBzaGFyZSBvdmVyd3JpdGUgZmxhZywKKwkJICBhcyB3ZWxsIGFzIGRl c3RpbmF0aW9uIGFuZCBidW5kbGUgcGF0aHMuCisgICAgICAgICogV2ViUHJvY2Vzcy9Eb3dubG9h ZHMvY3VybC9Eb3dubG9hZEN1cmwuY3BwOiBSZW1vdmUgc3R1YiAodG8gc2hhcmUgQ0ZOZXQgaW1w bGVtZW50YXRpb24KKwkJICBvZiBmaWxlIGhhbmRsaW5nLiAgVGhpcyB3aWxsIGJlIG1vdmVkIHRv IGEgY29tbW9uIGFyZWEgaW4gYSBmdXR1cmUgcGF0Y2guKQorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOiBFeGNsdWRlIGFjY2VsZXJhdGVkLWNvbXBvc2l0 aW5nIHBhdGhzLgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OmxheWVySG9zdERp ZEZsdXNoTGF5ZXJzKToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjpzZW5kRGlk VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUlt cGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOiBQcm90ZWN0IENHLXNwZWNpZmljIGRyYXdpbmcgY29kZS4K KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZHJhd1JlY3RUb1BERik6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmRyYXdQYWdlc1RvUERGKToKKwogMjAxMS0wMy0wOCAgSmVmZiBNaWxsZXIg IDxqZWZmbUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IGxhc3QgY2hhbmdl IHNvIFdLQmFzZVdpbi5oIGlzIGluIGFscGhhYmV0aWNhbCBvcmRlciBpbiB0aGUgcHJvamVjdCBY TUwuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0LmgJKHJldmlz aW9uIDgwNTc1KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaAko d29ya2luZyBjb3B5KQpAQCAtMjYsMTMgKzI2LDEzIEBACiAjaWZuZGVmIExheWVyVHJlZUNvbnRl eHRfaAogI2RlZmluZSBMYXllclRyZWVDb250ZXh0X2gKIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKLQogbmFtZXNwYWNlIENvcmVJUEMgewogICAgIGNsYXNzIEFyZ3VtZW50RGVj b2RlcjsKICAgICBjbGFzcyBBcmd1bWVudEVuY29kZXI7CiB9CiAKKyNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBMYXllclRyZWVD b250ZXh0IHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHkuaAkocmV2aXNpb24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2lu Z0FyZWFQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9JbnRTaXplLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAKKyNpbmNs dWRlICJzdGRpbnQuaCIKKwogI2lmIFBMQVRGT1JNKFFUKQogY2xhc3MgUVBhaW50ZXI7CiAjZWxp ZiBQTEFURk9STShHVEspCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5SW1wbC5jcHAJKHJldmlzaW9uIDgwNTc1KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTgsOSArNTgsMTEgQEAgRHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJbQog CiBEcmF3aW5nQXJlYVByb3h5SW1wbDo6fkRyYXdpbmdBcmVhUHJveHlJbXBsKCkKIHsKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gTWFrZSBzdXJlIHRvIGV4aXQgYWNj ZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZS4KICAgICBpZiAoaXNJbkFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKCkpCiAgICAgICAgIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwor I2VuZGlmCiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnBhaW50KEJhY2tpbmdTdG9y ZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQgY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCwg UmVnaW9uJiB1bnBhaW50ZWRSZWdpb24pCkBAIC0xNjIsNiArMTY0LDcgQEAgdm9pZCBEcmF3aW5n QXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFjawogICAgIGlmIChtX25leHRCYWNraW5nU3RvcmVT dGF0ZUlEICE9IG1fY3VycmVudEJhY2tpbmdTdG9yZVN0YXRlSUQpCiAgICAgICAgIHNlbmRVcGRh dGVCYWNraW5nU3RvcmVTdGF0ZShSZXNwb25kSW1tZWRpYXRlbHkpOwogCisjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlmIChsYXllclRyZWVDb250ZXh0ICE9IG1fbGF5ZXJU cmVlQ29udGV4dCkgewogICAgICAgICBpZiAoIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCkp IHsKICAgICAgICAgICAgIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwpAQCAtMTc4 LDYgKzE4MSw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmRpZFVwZGF0ZUJhY2sKICAg ICAgICAgQVNTRVJUKCFtX2JhY2tpbmdTdG9yZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Cisj ZW5kaWYKIAogICAgIC8vIEZJWE1FOiBXZSBjb3VsZCBqdXN0IHJldXNlIG91ciBleGlzdGluZyBi YWNraW5nIHN0b3JlIGlmIGl0J3MgdGhlIHNhbWUgc2l6ZSBhcwogICAgIC8vIHVwZGF0ZUluZm8u dmlld1NpemUuCkBAIC0xOTEsNyArMTk1LDkgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6 ZW50ZXJBY2NlbGVyYQogICAgIGlmIChiYWNraW5nU3RvcmVTdGF0ZUlEIDwgbV9jdXJyZW50QmFj a2luZ1N0b3JlU3RhdGVJRCkKICAgICAgICAgcmV0dXJuOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQogICAgIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobGF5ZXJU cmVlQ29udGV4dCk7CisjZW5kaWYKIH0KIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZXhp dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2NF90IGJhY2tpbmdTdG9yZVN0YXRlSUQs IGNvbnN0IFVwZGF0ZUluZm8mIHVwZGF0ZUluZm8pCkBAIC0yMDAsNyArMjA2LDkgQEAgdm9pZCBE cmF3aW5nQXJlYVByb3h5SW1wbDo6ZXhpdEFjY2VsZXJhdAogICAgIGlmIChiYWNraW5nU3RvcmVT dGF0ZUlEIDwgbV9jdXJyZW50QmFja2luZ1N0b3JlU3RhdGVJRCkKICAgICAgICAgcmV0dXJuOwog CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGV4aXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nTW9kZSgpOworI2VuZGlmCiAKICAgICBpbmNvcnBvcmF0ZVVwZGF0ZSh1cGRhdGVJ bmZvKTsKIH0KQEAgLTI1MiwxMSArMjYwLDEzIEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6 OnNlbmRVcGRhdGVCYWMKICAgICBtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5zZW5kKE1lc3Nh Z2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUobV9uZXh0QmFja2luZ1N0 b3JlU3RhdGVJRCwgcmVzcG9uZEltbWVkaWF0ZWx5T3JOb3QgPT0gUmVzcG9uZEltbWVkaWF0ZWx5 LCBtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0KSwgbV93ZWJQYWdlUHJveHktPnBhZ2VJRCgpKTsKICAg ICBtX3Njcm9sbE9mZnNldCA9IEludFNpemUoKTsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICAgICBpZiAobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0 ZSAmJiAhbV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBXYWl0IGZv ciB0aGUgRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZS4gTm9ybWFsbHkgd2UgZG9u IHRoaXMgaW4gRHJhd2luZ0FyZWFQcm94eUltcGw6OnBhaW50LCBidXQgdGhhdAogICAgICAgICAv LyBmdW5jdGlvbiBpcyBuZXZlciBjYWxsZWQgd2hlbiBpbiBhY2NlbGVyYXRlZCBjb21wb3NpdGlu ZyBtb2RlLgogICAgICAgICB3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVCYWNraW5nU3RvcmVT dGF0ZSgpOwogICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp3 YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSgpCkBAIC0yNjgsNiAr Mjc4LDcgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6d2FpdEZvckFuZERpcwogICAgIGlm IChtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5pc0xhdW5jaGluZygpKQogICAgICAgICByZXR1 cm47CiAgICAgCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIC8vIEZJWE1F OiB3YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseSB3aWxsIGFsd2F5cyByZXR1cm4gdGhlIG9s ZGVzdCBEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlIHRoYXQKICAgICAvLyBoYXNu J3QgeWV0IGJlZW4gcHJvY2Vzc2VkLiBCdXQgaXQgbWlnaHQgYmUgYmV0dGVyIHRvIHNraXAgYWhl YWQgdG8gc29tZSBvdGhlciBEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZQogICAgIC8vIG1lc3Nh Z2UsIGlmIG11bHRpcGxlIERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2VzIGFyZSB3 YWl0aW5nIHRvIGJlIHByb2Nlc3NlZC4gRm9yIGluc3RhbmNlLCB3ZSBjb3VsZApAQCAtMjc2LDgg KzI4NywxMCBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp3YWl0Rm9yQW5kRGlzCiAgICAg Ly8gVGhlIHRpbWVvdXQsIGluIHNlY29uZHMsIHdlIHVzZSB3aGVuIHdhaXRpbmcgZm9yIGEgRGlk VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZSB3aGVuIHdlJ3JlIGFza2VkIHRvIHBhaW50 LgogICAgIHN0YXRpYyBjb25zdCBkb3VibGUgZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGVUaW1l b3V0ID0gMC41OwogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPmNvbm5lY3Rpb24oKS0+ d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6 OkRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlPihtX3dlYlBhZ2VQcm94eS0+cGFnZUlEKCksIGRp ZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlVGltZW91dCk7CisjZW5kaWYKIH0KIAorI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmVudGVy QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJU cmVlQ29udGV4dCkKIHsKICAgICBBU1NFUlQoIWlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9k ZSgpKTsKQEAgLTI5NCw2ICszMDcsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpleGl0 QWNjZWxlcmF0CiAgICAgbV9sYXllclRyZWVDb250ZXh0ID0gTGF5ZXJUcmVlQ29udGV4dCgpOyAg ICAKICAgICBtX3dlYlBhZ2VQcm94eS0+ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7 CiB9CisjZW5kaWYKIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlzY2FyZEJhY2tpbmdT dG9yZVNvb24oKQogewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHlJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHlJbXBsLmgJKHJldmlzaW9uIDgwNTc1KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDEwICs2 OCwxNCBAQCBwcml2YXRlOgogICAgIHZvaWQgc2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKFJl c3BvbmRJbW1lZGlhdGVseU9yTm90KTsKICAgICB2b2lkIHdhaXRGb3JBbmREaXNwYXRjaERpZFVw ZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCk7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCiAgICAgdm9pZCBlbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVy VHJlZUNvbnRleHQmKTsKICAgICB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgp OwogCiAgICAgYm9vbCBpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBjb25zdCB7IHJl dHVybiAhbV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKTsgfQorI2Vsc2UKKyAgICBib29sIGlz SW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cisj ZW5kaWYKIAogICAgIHZvaWQgZGlzY2FyZEJhY2tpbmdTdG9yZVNvb24oKTsKICAgICB2b2lkIGRp c2NhcmRCYWNraW5nU3RvcmUoKTsKQEAgLTg1LDkgKzg5LDExIEBAIHByaXZhdGU6CiAgICAgLy8g d2hlbmV2ZXIgb3VyIHN0YXRlIGNoYW5nZXMgaW4gYSB3YXkgdGhhdCB3aWxsIHJlcXVpcmUgYSBu ZXcgYmFja2luZyBzdG9yZSB0byBiZSBhbGxvY2F0ZWQuCiAgICAgdWludDY0X3QgbV9uZXh0QmFj a2luZ1N0b3JlU3RhdGVJRDsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAg ICAvLyBUaGUgY3VycmVudCBsYXllciB0cmVlIGNvbnRleHQuCiAgICAgTGF5ZXJUcmVlQ29udGV4 dCBtX2xheWVyVHJlZUNvbnRleHQ7Ci0gICAgCisjZW5kaWYKKwogICAgIC8vIFdoZXRoZXIgd2Un dmUgc2VudCBhIFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2UgYW5kIGFyZSBub3cgd2Fp dGluZyBmb3IgYSBEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlLgogICAgIC8vIFVz ZWQgdG8gdGhyb3R0bGUgVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZXMgc28gd2UgZG9u J3Qgc2VuZCB0aGVtIGZhc3RlciB0aGFuIHRoZSBXZWIgcHJvY2VzcyBjYW4gaGFuZGxlLgogICAg IGJvb2wgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gODA1NzUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00NCw3ICs0NCw5IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9CaXRtYXBJbmZvLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9DdXJzb3IuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgor I2lmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Q0cuaD4K KyNlbmRpZgogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUv U29mdExpbmtpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dlYkNvcmVJbnN0YW5jZUhhbmRsZS5o PgpAQCAtMTExMCwxMSArMTExMiwxNSBAQCB2b2lkIFdlYlZpZXc6OnNldEZpbmRJbmRpY2F0b3Io UGFzc1JlZlB0CiAKICAgICAgICAgICAgIGhibXAgPSBDcmVhdGVESUJTZWN0aW9uKDAsICZiaXRt YXBJbmZvLCBESUJfUkdCX0NPTE9SUywgc3RhdGljX2Nhc3Q8dm9pZCoqPigmYml0cyksIDAsIDAp OwogICAgICAgICAgICAgSEJJVE1BUCBoYm1wT2xkID0gc3RhdGljX2Nhc3Q8SEJJVE1BUD4oU2Vs ZWN0T2JqZWN0KGhkYywgaGJtcCkpOworI2lmIFBMQVRGT1JNKENHKQogICAgICAgICAgICAgUmV0 YWluUHRyPENHQ29udGV4dFJlZj4gY29udGV4dChBZG9wdENGLCBDR0JpdG1hcENvbnRleHRDcmVh dGUoYml0cywgd2lkdGgsIGhlaWdodCwKICAgICAgICAgICAgICAgICA4LCB3aWR0aCAqIHNpemVv ZihSR0JRVUFEKSwgZGV2aWNlUkdCQ29sb3JTcGFjZVJlZigpLCBrQ0dCaXRtYXBCeXRlT3JkZXIz MkxpdHRsZSB8IGtDR0ltYWdlQWxwaGFQcmVtdWx0aXBsaWVkRmlyc3QpKTsKIAogICAgICAgICAg ICAgR3JhcGhpY3NDb250ZXh0IGdyYXBoaWNzQ29udGV4dChjb250ZXh0LmdldCgpKTsKICAgICAg ICAgICAgIGNvbnRlbnRJbWFnZS0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0LCBJbnRQb2ludCgpLCBj b250ZW50SW1hZ2UtPmJvdW5kcygpKTsKKyNlbHNlCisJCQkvLyBGSVhNRTogSW1wbGVtZW50IQor I2VuZGlmCiAKICAgICAgICAgICAgIDo6U2VsZWN0T2JqZWN0KGhkYywgaGJtcE9sZCk7CiAgICAg ICAgICAgICA6OkRlbGV0ZURDKGhkYyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0Rvd25sb2Fkcy9Eb3dubG9hZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgJKHJldmlzaW9uIDgwNTc1KQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaAkod29ya2luZyBjb3B5KQpAQCAt MTA1LDEwICsxMDUsMTAgQEAgcHJpdmF0ZToKICAgICBSZXRhaW5QdHI8TlNVUkxEb3dubG9hZD4g bV9uc1VSTERvd25sb2FkOwogICAgIFJldGFpblB0cjxXS0Rvd25sb2FkQXNEZWxlZ2F0ZT4gbV9k ZWxlZ2F0ZTsKICNlbmRpZgotI2lmIFVTRShDRk5FVFdPUkspCiAgICAgYm9vbCBtX2FsbG93T3Zl cndyaXRlOwogICAgIFN0cmluZyBtX2Rlc3RpbmF0aW9uOwogICAgIFN0cmluZyBtX2J1bmRsZVBh dGg7CisjaWYgVVNFKENGTkVUV09SSykKICAgICBSZXRhaW5QdHI8Q0ZVUkxEb3dubG9hZFJlZj4g bV9kb3dubG9hZDsKICNlbmRpZgogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv RG93bmxvYWRzL2N1cmwvRG93bmxvYWRDdXJsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9jdXJsL0Rvd25sb2FkQ3VybC5jcHAJKHJldmlzaW9u IDgwNTc1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvY3VybC9Eb3du bG9hZEN1cmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw5ICs1OCw0IEBAIHZvaWQgRG93bmxv YWQ6OmRpZERlY2lkZURlc3RpbmF0aW9uKGNvbnMKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQog Ci12b2lkIERvd25sb2FkOjpwbGF0Zm9ybURpZEZpbmlzaCgpCi17Ci0gICAgbm90SW1wbGVtZW50 ZWQoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcAkocmV2aXNp b24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0Fy ZWFJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk3LDcgKzE5Nyw5IEBAIHZvaWQgRHJhd2lu Z0FyZWFJbXBsOjpsYXllckhvc3REaWRGbHVzaEwKICAgICBpZiAoIW1fbGF5ZXJUcmVlSG9zdCkK ICAgICAgICAgcmV0dXJuOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAg IG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RW50ZXJBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZShtX2JhY2tpbmdTdG9yZVN0YXRlSUQsIG1fbGF5ZXJUcmVlSG9z dC0+bGF5ZXJUcmVlQ29udGV4dCgpKSk7CisjZW5kaWYKIH0KIAogdm9pZCBEcmF3aW5nQXJlYUlt cGw6OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIp CkBAIC0yOTEsMTEgKzI5MywxMyBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2VuZERpZFVwZGF0 ZUJhY2tpCiAgICAgbV9zaG91bGRTZW5kRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgPSBmYWxz ZTsKIAogICAgIFVwZGF0ZUluZm8gdXBkYXRlSW5mbzsKLSAgICBMYXllclRyZWVDb250ZXh0IGxh eWVyVHJlZUNvbnRleHQ7CiAKICAgICBpZiAoIW1faXNQYWludGluZ1N1c3BlbmRlZCAmJiAhbV9s YXllclRyZWVIb3N0KQogICAgICAgICBkaXNwbGF5KHVwZGF0ZUluZm8pOwogCisjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIExheWVyVHJlZUNvbnRleHQgbGF5ZXJUcmVlQ29u dGV4dDsKKwogICAgIGlmIChtX2lzUGFpbnRpbmdTdXNwZW5kZWQgfHwgbV9sYXllclRyZWVIb3N0 KSB7CiAgICAgICAgIHVwZGF0ZUluZm8udmlld1NpemUgPSBtX3dlYlBhZ2UtPnNpemUoKTsKIApA QCAtMzExLDYgKzMxNSw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZW5kRGlkVXBkYXRlQmFj a2kKICAgICB9CiAKICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJv eHk6OkRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKG1fYmFja2luZ1N0b3JlU3RhdGVJRCwgdXBk YXRlSW5mbywgbGF5ZXJUcmVlQ29udGV4dCkpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjpkaWRVcGRhdGUoKQpAQCAtMzkxLDkgKzM5NiwxMSBAQCB2b2lkIERyYXdpbmdBcmVh SW1wbDo6ZXhpdEFjY2VsZXJhdGVkQ29tCiAgICAgZWxzZQogICAgICAgICBkaXNwbGF5KHVwZGF0 ZUluZm8pOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIC8vIFNlbmQg YWxvbmcgYSBjb21wbGV0ZSB1cGRhdGUgb2YgdGhlIHBhZ2Ugc28gd2UgY2FuIHBhaW50IHRoZSBj b250ZW50cyByaWdodCBhZnRlciB3ZSBleGl0IHRoZQogICAgIC8vIGFjY2VsZXJhdGVkIGNvbXBv c2l0aW5nIG1vZGUsIGVsaW1pbmlhdGluZyBmbGlja2VyLgogICAgIG1fd2ViUGFnZS0+c2VuZChN ZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2Rl KG1fYmFja2luZ1N0b3JlU3RhdGVJRCwgdXBkYXRlSW5mbykpOworI2VuZGlmCiB9CiAKIHZvaWQg RHJhd2luZ0FyZWFJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGVTb29uKCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJl dmlzaW9uIDgwNTc1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDA1LDYgKzIwMDUsNyBAQCB2b2lkIFdlYlBhZ2U6 OmRyYXdSZWN0VG9QREYodWludDY0X3QgZnJhCiAgICAgaWYgKGNvcmVGcmFtZSkgewogICAgICAg ICBBU1NFUlQoY29yZUZyYW1lLT5kb2N1bWVudCgpLT5wcmludGluZygpKTsKIAorI2lmIFBMQVRG T1JNKENHKQogICAgICAgICAvLyBGSVhNRTogVXNlIENHRGF0YUNvbnN1bWVyQ3JlYXRlIHdpdGgg Y2FsbGJhY2tzIHRvIGF2b2lkIGNvcHlpbmcgdGhlIGRhdGEuCiAgICAgICAgIFJldGFpblB0cjxD R0RhdGFDb25zdW1lclJlZj4gcGRmRGF0YUNvbnN1bWVyKEFkb3B0Q0YsIENHRGF0YUNvbnN1bWVy Q3JlYXRlV2l0aENGRGF0YShwZGZQYWdlRGF0YS5nZXQoKSkpOwogCkBAIC0yMDIwLDYgKzIwMjEs NyBAQCB2b2lkIFdlYlBhZ2U6OmRyYXdSZWN0VG9QREYodWludDY0X3QgZnJhCiAKICAgICAgICAg Q0dQREZDb250ZXh0RW5kUGFnZShjb250ZXh0LmdldCgpKTsKICAgICAgICAgQ0dQREZDb250ZXh0 Q2xvc2UoY29udGV4dC5nZXQoKSk7CisjZW5kaWYKICAgICB9CiAKICAgICBzZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRhdGFDYWxsYmFjayhDb3JlSVBDOjpEYXRhUmVmZXJlbmNlKENGRGF0 YUdldEJ5dGVQdHIocGRmUGFnZURhdGEuZ2V0KCkpLCBDRkRhdGFHZXRMZW5ndGgocGRmUGFnZURh dGEuZ2V0KCkpKSwgY2FsbGJhY2tJRCkpOwpAQCAtMjAzNSw2ICsyMDM3LDcgQEAgdm9pZCBXZWJQ YWdlOjpkcmF3UGFnZXNUb1BERih1aW50NjRfdCBmcgogICAgIGlmIChjb3JlRnJhbWUpIHsKICAg ICAgICAgQVNTRVJUKGNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+cHJpbnRpbmcoKSk7CiAKKyNpZiBQ TEFURk9STShDRykKICAgICAgICAgLy8gRklYTUU6IFVzZSBDR0RhdGFDb25zdW1lckNyZWF0ZSB3 aXRoIGNhbGxiYWNrcyB0byBhdm9pZCBjb3B5aW5nIHRoZSBkYXRhLgogICAgICAgICBSZXRhaW5Q dHI8Q0dEYXRhQ29uc3VtZXJSZWY+IHBkZkRhdGFDb25zdW1lcihBZG9wdENGLCBDR0RhdGFDb25z dW1lckNyZWF0ZVdpdGhDRkRhdGEocGRmUGFnZURhdGEuZ2V0KCkpKTsKIApAQCAtMjA1NSw2ICsy MDU4LDcgQEAgdm9pZCBXZWJQYWdlOjpkcmF3UGFnZXNUb1BERih1aW50NjRfdCBmcgogICAgICAg ICAgICAgQ0dQREZDb250ZXh0RW5kUGFnZShjb250ZXh0LmdldCgpKTsKICAgICAgICAgfQogICAg ICAgICBDR1BERkNvbnRleHRDbG9zZShjb250ZXh0LmdldCgpKTsKKyNlbmRpZgogICAgIH0KIAog ICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGF0YUNhbGxiYWNrKENvcmVJUEM6OkRh dGFSZWZlcmVuY2UoQ0ZEYXRhR2V0Qnl0ZVB0cihwZGZQYWdlRGF0YS5nZXQoKSksIENGRGF0YUdl dExlbmd0aChwZGZQYWdlRGF0YS5nZXQoKSkpLCBjYWxsYmFja0lEKSk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi93aW4vV2ViS2l0Mi52Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv d2luL1dlYktpdDIudmNwcm9qCShyZXZpc2lvbiA4MDU3NikKKysrIFNvdXJjZS9XZWJLaXQyL3dp bi9XZWJLaXQyLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtMTE0NCw2ICsxMTQ0LDIyIEBACiAJ CQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxTaGFyZWRcd2luXExheWVyVHJlZUNvbnRl eHRXaW4uY3BwIgogCQkJCQk+CisJCQkJCTxGaWxlQ29uZmlndXJhdGlvbgorCQkJCQkJTmFtZT0i RGVidWdfQ2Fpcm9fQ0ZMaXRlfFdpbjMyIgorCQkJCQkJRXhjbHVkZWRGcm9tQnVpbGQ9InRydWUi CisJCQkJCQk+CisJCQkJCQk8VG9vbAorCQkJCQkJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wiCisJ CQkJCQkvPgorCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPgorCQkJCQk8RmlsZUNvbmZpZ3VyYXRp b24KKwkJCQkJCU5hbWU9IlJlbGVhc2VfQ2Fpcm9fQ0ZMaXRlfFdpbjMyIgorCQkJCQkJRXhjbHVk ZWRGcm9tQnVpbGQ9InRydWUiCisJCQkJCQk+CisJCQkJCQk8VG9vbAorCQkJCQkJCU5hbWU9IlZD Q0xDb21waWxlclRvb2wiCisJCQkJCQkvPgorCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPgogCQkJ CTwvRmlsZT4KIAkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFx3aW5cTmF0 aXZlV2ViS2V5Ym9hcmRFdmVudFdpbi5jcHAiCg== 85076 2011-03-08 12:13:06 -0800 2011-03-08 12:19:32 -0800 Get rid of tabs! webkit2_wincairo_2.patch text/plain 15534 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTc3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDMtMDggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NTk1NgorICAgICAgICBXZWJLaXQyIENoYW5nZXMgdG8gY29ycmVjdCBXaW5DYWlybyBw b3J0IGJ1aWxkCisKKyAgICAgICAgKiBTaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oOiBEb24ndCBl eGNsdWRlIENvcmVJUEMgZGVjbGFyYXRpb25zIGZvciBub24tYWNjZWxlcmF0ZWQKKyAgICAgICAg ICBjb21wb3NpdGluZyBjYXNlLgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 Lmg6IEFkZCAic3RkaW50LmgiIGluY2x1ZGUgbmVlZGVkIGZvciBDYWlybyBidWlsZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOiBFeGNsdWRlIGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIGNvZGUgZm9yCisgICAgICAgICAgV2luQ2Fpcm8gYnVpbGQuCisgICAg ICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwp OgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50 ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdB cmVhUHJveHlJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAo V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRl KToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXNw YXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eUltcGwuaDogRXhjbHVkZSBkZWNsYXJhdGlvbnMgZm9yIGNvZGUgb25seSB1 c2VkIHdoZW4KKyAgICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6aXNJbkFjY2VsZXJhdGVkQ29t cG9zaXRpbmdNb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOiBQcm90 ZWN0IENHLXNwZWNpZmljIGRyYXdpbmcgY29kZS4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6 c2V0RmluZEluZGljYXRvcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWQuaDogQWxsb3cgQ0ZMaXRlIGltcGxlbnRhdGlvbiB0byBzaGFyZSBvdmVyd3JpdGUgZmxhZywK KyAgICAgICAgICBhcyB3ZWxsIGFzIGRlc3RpbmF0aW9uIGFuZCBidW5kbGUgcGF0aHMuCisgICAg ICAgICogV2ViUHJvY2Vzcy9Eb3dubG9hZHMvY3VybC9Eb3dubG9hZEN1cmwuY3BwOiBSZW1vdmUg c3R1YiAodG8gc2hhcmUgQ0ZOZXQgaW1wbGVtZW50YXRpb24KKyAgICAgICAgICBvZiBmaWxlIGhh bmRsaW5nLiAgVGhpcyB3aWxsIGJlIG1vdmVkIHRvIGEgY29tbW9uIGFyZWEgaW4gYSBmdXR1cmUg cGF0Y2guKQorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3Bw OiBFeGNsdWRlIGFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nIHBhdGhzLgorICAgICAgICAoV2ViS2l0 OjpEcmF3aW5nQXJlYUltcGw6OmxheWVySG9zdERpZEZsdXNoTGF5ZXJzKToKKyAgICAgICAgKFdl YktpdDo6RHJhd2luZ0FyZWFJbXBsOjpzZW5kRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpOgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOiBQcm90 ZWN0IENHLXNwZWNpZmljIGRyYXdpbmcgY29kZS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 ZHJhd1JlY3RUb1BERik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRyYXdQYWdlc1RvUERG KToKKyAgICAgICAgKiB3aW4vV2ViS2l0Mi52Y3Byb2o6IEV4Y2x1ZGUgdW51c2VkIExheWVyVHJl ZUNvbnRleHQgZnJvbSBXaW5DYWlybworCiAyMDExLTAzLTA4ICBKZWZmIE1pbGxlciAgPGplZmZt QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggbGFzdCBjaGFuZ2Ugc28gV0tC YXNlV2luLmggaXMgaW4gYWxwaGFiZXRpY2FsIG9yZGVyIGluIHRoZSBwcm9qZWN0IFhNTC4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaAkocmV2aXNpb24gODA1 NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNiwxMyArMjYsMTMgQEAKICNpZm5kZWYgTGF5ZXJUcmVlQ29udGV4dF9oCiAj ZGVmaW5lIExheWVyVHJlZUNvbnRleHRfaAogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQotCiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAgICAgY2xhc3MgQXJndW1lbnREZWNvZGVyOwog ICAgIGNsYXNzIEFyZ3VtZW50RW5jb2RlcjsKIH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIExheWVyVHJlZUNvbnRleHQg ewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCShy ZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDggQEAKICNpbmNsdWRlIDxXZWJDb3Jl L0ludFNpemUuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAorI2luY2x1ZGUgInN0 ZGludC5oIgorCiAjaWYgUExBVEZPUk0oUVQpCiBjbGFzcyBRUGFpbnRlcjsKICNlbGlmIFBMQVRG T1JNKEdUSykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHlJbXBsLmNwcAkocmV2aXNpb24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw5ICs1 OCwxMSBAQCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6RHJhd2luZ0FyZWFQcm94eUltCiAKIERyYXdp bmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwoKQogeworI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBNYWtlIHN1cmUgdG8gZXhpdCBhY2NlbGVyYXRl ZCBjb21wb3NpdGluZyBtb2RlLgogICAgIGlmIChpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUoKSkKICAgICAgICAgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CisjZW5kaWYK IH0KIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6cGFpbnQoQmFja2luZ1N0b3JlOjpQbGF0 Zm9ybUdyYXBoaWNzQ29udGV4dCBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0LCBSZWdpb24m IHVucGFpbnRlZFJlZ2lvbikKQEAgLTE2Miw2ICsxNjQsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJv eHlJbXBsOjpkaWRVcGRhdGVCYWNrCiAgICAgaWYgKG1fbmV4dEJhY2tpbmdTdG9yZVN0YXRlSUQg IT0gbV9jdXJyZW50QmFja2luZ1N0b3JlU3RhdGVJRCkKICAgICAgICAgc2VuZFVwZGF0ZUJhY2tp bmdTdG9yZVN0YXRlKFJlc3BvbmRJbW1lZGlhdGVseSk7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURf Q09NUE9TSVRJTkcpCiAgICAgaWYgKGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRyZWVDb250 ZXh0KSB7CiAgICAgICAgIGlmICghbV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewogICAg ICAgICAgICAgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CkBAIC0xNzgsNiArMTgx LDcgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFjawogICAgICAgICBB U1NFUlQoIW1fYmFja2luZ1N0b3JlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyNlbmRpZgog CiAgICAgLy8gRklYTUU6IFdlIGNvdWxkIGp1c3QgcmV1c2Ugb3VyIGV4aXN0aW5nIGJhY2tpbmcg c3RvcmUgaWYgaXQncyB0aGUgc2FtZSBzaXplIGFzCiAgICAgLy8gdXBkYXRlSW5mby52aWV3U2l6 ZS4KQEAgLTE5MSw3ICsxOTUsOSBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFj Y2VsZXJhCiAgICAgaWYgKGJhY2tpbmdTdG9yZVN0YXRlSUQgPCBtX2N1cnJlbnRCYWNraW5nU3Rv cmVTdGF0ZUlEKQogICAgICAgICByZXR1cm47CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiAgICAgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShsYXllclRyZWVDb250 ZXh0KTsKKyNlbmRpZgogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpleGl0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUodWludDY0X3QgYmFja2luZ1N0b3JlU3RhdGVJRCwgY29uc3Qg VXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKQEAgLTIwMCw3ICsyMDYsOSBAQCB2b2lkIERyYXdpbmdB cmVhUHJveHlJbXBsOjpleGl0QWNjZWxlcmF0CiAgICAgaWYgKGJhY2tpbmdTdG9yZVN0YXRlSUQg PCBtX2N1cnJlbnRCYWNraW5nU3RvcmVTdGF0ZUlEKQogICAgICAgICByZXR1cm47CiAKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdNb2RlKCk7CisjZW5kaWYKIAogICAgIGluY29ycG9yYXRlVXBkYXRlKHVwZGF0ZUluZm8pOwog fQpAQCAtMjUyLDExICsyNjAsMTMgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2VuZFVw ZGF0ZUJhYwogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OkRy YXdpbmdBcmVhOjpVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZShtX25leHRCYWNraW5nU3RvcmVTdGF0 ZUlELCByZXNwb25kSW1tZWRpYXRlbHlPck5vdCA9PSBSZXNwb25kSW1tZWRpYXRlbHksIG1fc2l6 ZSwgbV9zY3JvbGxPZmZzZXQpLCBtX3dlYlBhZ2VQcm94eS0+cGFnZUlEKCkpOwogICAgIG1fc2Ny b2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgIGlmIChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlICYmICFt X2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIFdhaXQgZm9yIHRoZSBE aWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlLiBOb3JtYWxseSB3ZSBkb24gdGhpcyBp biBEcmF3aW5nQXJlYVByb3h5SW1wbDo6cGFpbnQsIGJ1dCB0aGF0CiAgICAgICAgIC8vIGZ1bmN0 aW9uIGlzIG5ldmVyIGNhbGxlZCB3aGVuIGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUu CiAgICAgICAgIHdhaXRGb3JBbmREaXNwYXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCk7 CiAgICAgfQorI2VuZGlmCiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JB bmREaXNwYXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCkKQEAgLTI2OCw2ICsyNzgsNyBA QCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp3YWl0Rm9yQW5kRGlzCiAgICAgaWYgKG1fd2Vi UGFnZVByb3h5LT5wcm9jZXNzKCktPmlzTGF1bmNoaW5nKCkpCiAgICAgICAgIHJldHVybjsKICAg ICAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gRklYTUU6IHdhaXRG b3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5IHdpbGwgYWx3YXlzIHJldHVybiB0aGUgb2xkZXN0IERp ZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2UgdGhhdAogICAgIC8vIGhhc24ndCB5ZXQg YmVlbiBwcm9jZXNzZWQuIEJ1dCBpdCBtaWdodCBiZSBiZXR0ZXIgdG8gc2tpcCBhaGVhZCB0byBz b21lIG90aGVyIERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlCiAgICAgLy8gbWVzc2FnZSwgaWYg bXVsdGlwbGUgRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZXMgYXJlIHdhaXRpbmcg dG8gYmUgcHJvY2Vzc2VkLiBGb3IgaW5zdGFuY2UsIHdlIGNvdWxkCkBAIC0yNzYsOCArMjg3LDEw IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXMKICAgICAvLyBUaGUg dGltZW91dCwgaW4gc2Vjb25kcywgd2UgdXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRVcGRhdGVC YWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlIHdoZW4gd2UncmUgYXNrZWQgdG8gcGFpbnQuCiAgICAg c3RhdGljIGNvbnN0IGRvdWJsZSBkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZVRpbWVvdXQgPSAw LjU7CiAgICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+Y29ubmVjdGlvbigpLT53YWl0Rm9y QW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBk YXRlQmFja2luZ1N0b3JlU3RhdGU+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSwgZGlkVXBkYXRl QmFja2luZ1N0b3JlU3RhdGVUaW1lb3V0KTsKKyNlbmRpZgogfQogCisjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50ZXJBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRyZWVDb250 ZXh0KQogewogICAgIEFTU0VSVCghaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpOwpA QCAtMjk0LDYgKzMwNyw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVy YXQKICAgICBtX2xheWVyVHJlZUNvbnRleHQgPSBMYXllclRyZWVDb250ZXh0KCk7ICAgIAogICAg IG1fd2ViUGFnZVByb3h5LT5leGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKIH0KKyNl bmRpZgogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpkaXNjYXJkQmFja2luZ1N0b3JlU29v bigpCiB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUlt cGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eUltcGwuaAkocmV2aXNpb24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv RHJhd2luZ0FyZWFQcm94eUltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsMTAgKzY4LDE0IEBA IHByaXZhdGU6CiAgICAgdm9pZCBzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoUmVzcG9uZElt bWVkaWF0ZWx5T3JOb3QpOwogICAgIHZvaWQgd2FpdEZvckFuZERpc3BhdGNoRGlkVXBkYXRlQmFj a2luZ1N0b3JlU3RhdGUoKTsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAg ICB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29u dGV4dCYpOwogICAgIHZvaWQgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CiAKICAg ICBib29sIGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuICFt X2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CisjZWxzZQorICAgIGJvb2wgaXNJbkFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyNlbmRpZgog CiAgICAgdm9pZCBkaXNjYXJkQmFja2luZ1N0b3JlU29vbigpOwogICAgIHZvaWQgZGlzY2FyZEJh Y2tpbmdTdG9yZSgpOwpAQCAtODUsOSArODksMTEgQEAgcHJpdmF0ZToKICAgICAvLyB3aGVuZXZl ciBvdXIgc3RhdGUgY2hhbmdlcyBpbiBhIHdheSB0aGF0IHdpbGwgcmVxdWlyZSBhIG5ldyBiYWNr aW5nIHN0b3JlIHRvIGJlIGFsbG9jYXRlZC4KICAgICB1aW50NjRfdCBtX25leHRCYWNraW5nU3Rv cmVTdGF0ZUlEOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIC8vIFRo ZSBjdXJyZW50IGxheWVyIHRyZWUgY29udGV4dC4KICAgICBMYXllclRyZWVDb250ZXh0IG1fbGF5 ZXJUcmVlQ29udGV4dDsKLSAgICAKKyNlbmRpZgorCiAgICAgLy8gV2hldGhlciB3ZSd2ZSBzZW50 IGEgVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZSBhbmQgYXJlIG5vdyB3YWl0aW5nIGZv ciBhIERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2UuCiAgICAgLy8gVXNlZCB0byB0 aHJvdHRsZSBVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlcyBzbyB3ZSBkb24ndCBzZW5k IHRoZW0gZmFzdGVyIHRoYW4gdGhlIFdlYiBwcm9jZXNzIGNhbiBoYW5kbGUuCiAgICAgYm9vbCBt X2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0 LDcgKzQ0LDkgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0JpdG1hcEluZm8uaD4KICNpbmNsdWRlIDxX ZWJDb3JlL0N1cnNvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRSZWN0Lmg+CisjaWYgUExB VEZPUk0oQ0cpCiAjaW5jbHVkZSA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHRDRy5oPgorI2VuZGlm CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb2Z0TGlu a2luZy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvV2ViQ29yZUluc3RhbmNlSGFuZGxlLmg+CkBAIC0x MTEwLDExICsxMTEyLDE1IEBAIHZvaWQgV2ViVmlldzo6c2V0RmluZEluZGljYXRvcihQYXNzUmVm UHQKIAogICAgICAgICAgICAgaGJtcCA9IENyZWF0ZURJQlNlY3Rpb24oMCwgJmJpdG1hcEluZm8s IERJQl9SR0JfQ09MT1JTLCBzdGF0aWNfY2FzdDx2b2lkKio+KCZiaXRzKSwgMCwgMCk7CiAgICAg ICAgICAgICBIQklUTUFQIGhibXBPbGQgPSBzdGF0aWNfY2FzdDxIQklUTUFQPihTZWxlY3RPYmpl Y3QoaGRjLCBoYm1wKSk7CisjaWYgUExBVEZPUk0oQ0cpCiAgICAgICAgICAgICBSZXRhaW5QdHI8 Q0dDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0Q0YsIENHQml0bWFwQ29udGV4dENyZWF0ZShiaXRz LCB3aWR0aCwgaGVpZ2h0LAogICAgICAgICAgICAgICAgIDgsIHdpZHRoICogc2l6ZW9mKFJHQlFV QUQpLCBkZXZpY2VSR0JDb2xvclNwYWNlUmVmKCksIGtDR0JpdG1hcEJ5dGVPcmRlcjMyTGl0dGxl IHwga0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRGaXJzdCkpOwogCiAgICAgICAgICAgICBHcmFw aGljc0NvbnRleHQgZ3JhcGhpY3NDb250ZXh0KGNvbnRleHQuZ2V0KCkpOwogICAgICAgICAgICAg Y29udGVudEltYWdlLT5wYWludChncmFwaGljc0NvbnRleHQsIEludFBvaW50KCksIGNvbnRlbnRJ bWFnZS0+Ym91bmRzKCkpOworI2Vsc2UKKyAgICAgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQh CisjZW5kaWYKIAogICAgICAgICAgICAgOjpTZWxlY3RPYmplY3QoaGRjLCBoYm1wT2xkKTsKICAg ICAgICAgICAgIDo6RGVsZXRlREMoaGRjKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvRG93bmxvYWRzL0Rvd25sb2FkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaAkocmV2aXNpb24gODA1NzUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDUsMTAgKzEwNSwxMCBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxOU1VSTERvd25sb2Fk PiBtX25zVVJMRG93bmxvYWQ7CiAgICAgUmV0YWluUHRyPFdLRG93bmxvYWRBc0RlbGVnYXRlPiBt X2RlbGVnYXRlOwogI2VuZGlmCi0jaWYgVVNFKENGTkVUV09SSykKICAgICBib29sIG1fYWxsb3dP dmVyd3JpdGU7CiAgICAgU3RyaW5nIG1fZGVzdGluYXRpb247CiAgICAgU3RyaW5nIG1fYnVuZGxl UGF0aDsKKyNpZiBVU0UoQ0ZORVRXT1JLKQogICAgIFJldGFpblB0cjxDRlVSTERvd25sb2FkUmVm PiBtX2Rvd25sb2FkOwogI2VuZGlmCiB9OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9Eb3dubG9hZHMvY3VybC9Eb3dubG9hZEN1cmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvRG93bmxvYWRzL2N1cmwvRG93bmxvYWRDdXJsLmNwcAkocmV2aXNp b24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9jdXJsL0Rv d25sb2FkQ3VybC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDkgKzU4LDQgQEAgdm9pZCBEb3du bG9hZDo6ZGlkRGVjaWRlRGVzdGluYXRpb24oY29ucwogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9 CiAKLXZvaWQgRG93bmxvYWQ6OnBsYXRmb3JtRGlkRmluaXNoKCkKLXsKLSAgICBub3RJbXBsZW1l bnRlZCgpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCShyZXZp c2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5n QXJlYUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsNyArMTk3LDkgQEAgdm9pZCBEcmF3 aW5nQXJlYUltcGw6OmxheWVySG9zdERpZEZsdXNoTAogICAgIGlmICghbV9sYXllclRyZWVIb3N0 KQogICAgICAgICByZXR1cm47CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAg ICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpFbnRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKG1fYmFja2luZ1N0b3JlU3RhdGVJRCwgbV9sYXllclRyZWVI b3N0LT5sYXllclRyZWVDb250ZXh0KCkpKTsKKyNlbmRpZgogfQogCiB2b2lkIERyYXdpbmdBcmVh SW1wbDo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXll cikKQEAgLTI5MSwxMSArMjkzLDEzIEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZW5kRGlkVXBk YXRlQmFja2kKICAgICBtX3Nob3VsZFNlbmREaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSA9IGZh bHNlOwogCiAgICAgVXBkYXRlSW5mbyB1cGRhdGVJbmZvOwotICAgIExheWVyVHJlZUNvbnRleHQg bGF5ZXJUcmVlQ29udGV4dDsKIAogICAgIGlmICghbV9pc1BhaW50aW5nU3VzcGVuZGVkICYmICFt X2xheWVyVHJlZUhvc3QpCiAgICAgICAgIGRpc3BsYXkodXBkYXRlSW5mbyk7CiAKKyNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgTGF5ZXJUcmVlQ29udGV4dCBsYXllclRyZWVD b250ZXh0OworCiAgICAgaWYgKG1faXNQYWludGluZ1N1c3BlbmRlZCB8fCBtX2xheWVyVHJlZUhv c3QpIHsKICAgICAgICAgdXBkYXRlSW5mby52aWV3U2l6ZSA9IG1fd2ViUGFnZS0+c2l6ZSgpOwog CkBAIC0zMTEsNiArMzE1LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OnNlbmREaWRVcGRhdGVC YWNraQogICAgIH0KIAogICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQ cm94eTo6RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUobV9iYWNraW5nU3RvcmVTdGF0ZUlELCB1 cGRhdGVJbmZvLCBsYXllclRyZWVDb250ZXh0KSk7CisjZW5kaWYKIH0KIAogdm9pZCBEcmF3aW5n QXJlYUltcGw6OmRpZFVwZGF0ZSgpCkBAIC0zOTEsOSArMzk2LDExIEBAIHZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb20KICAgICBlbHNlCiAgICAgICAgIGRpc3BsYXkodXBk YXRlSW5mbyk7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gU2Vu ZCBhbG9uZyBhIGNvbXBsZXRlIHVwZGF0ZSBvZiB0aGUgcGFnZSBzbyB3ZSBjYW4gcGFpbnQgdGhl IGNvbnRlbnRzIHJpZ2h0IGFmdGVyIHdlIGV4aXQgdGhlCiAgICAgLy8gYWNjZWxlcmF0ZWQgY29t cG9zaXRpbmcgbW9kZSwgZWxpbWluaWF0aW5nIGZsaWNrZXIuCiAgICAgbV93ZWJQYWdlLT5zZW5k KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUobV9iYWNraW5nU3RvcmVTdGF0ZUlELCB1cGRhdGVJbmZvKSk7CisjZW5kaWYKIH0KIAogdm9p ZCBEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVNvb24oKQpJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAko cmV2aXNpb24gODA1NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMDUsNiArMjAwNSw3IEBAIHZvaWQgV2ViUGFn ZTo6ZHJhd1JlY3RUb1BERih1aW50NjRfdCBmcmEKICAgICBpZiAoY29yZUZyYW1lKSB7CiAgICAg ICAgIEFTU0VSVChjb3JlRnJhbWUtPmRvY3VtZW50KCktPnByaW50aW5nKCkpOwogCisjaWYgUExB VEZPUk0oQ0cpCiAgICAgICAgIC8vIEZJWE1FOiBVc2UgQ0dEYXRhQ29uc3VtZXJDcmVhdGUgd2l0 aCBjYWxsYmFja3MgdG8gYXZvaWQgY29weWluZyB0aGUgZGF0YS4KICAgICAgICAgUmV0YWluUHRy PENHRGF0YUNvbnN1bWVyUmVmPiBwZGZEYXRhQ29uc3VtZXIoQWRvcHRDRiwgQ0dEYXRhQ29uc3Vt ZXJDcmVhdGVXaXRoQ0ZEYXRhKHBkZlBhZ2VEYXRhLmdldCgpKSk7CiAKQEAgLTIwMjAsNiArMjAy MSw3IEBAIHZvaWQgV2ViUGFnZTo6ZHJhd1JlY3RUb1BERih1aW50NjRfdCBmcmEKIAogICAgICAg ICBDR1BERkNvbnRleHRFbmRQYWdlKGNvbnRleHQuZ2V0KCkpOwogICAgICAgICBDR1BERkNvbnRl eHRDbG9zZShjb250ZXh0LmdldCgpKTsKKyNlbmRpZgogICAgIH0KIAogICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGF0YUNhbGxiYWNrKENvcmVJUEM6OkRhdGFSZWZlcmVuY2UoQ0ZE YXRhR2V0Qnl0ZVB0cihwZGZQYWdlRGF0YS5nZXQoKSksIENGRGF0YUdldExlbmd0aChwZGZQYWdl RGF0YS5nZXQoKSkpLCBjYWxsYmFja0lEKSk7CkBAIC0yMDM1LDYgKzIwMzcsNyBAQCB2b2lkIFdl YlBhZ2U6OmRyYXdQYWdlc1RvUERGKHVpbnQ2NF90IGZyCiAgICAgaWYgKGNvcmVGcmFtZSkgewog ICAgICAgICBBU1NFUlQoY29yZUZyYW1lLT5kb2N1bWVudCgpLT5wcmludGluZygpKTsKIAorI2lm IFBMQVRGT1JNKENHKQogICAgICAgICAvLyBGSVhNRTogVXNlIENHRGF0YUNvbnN1bWVyQ3JlYXRl IHdpdGggY2FsbGJhY2tzIHRvIGF2b2lkIGNvcHlpbmcgdGhlIGRhdGEuCiAgICAgICAgIFJldGFp blB0cjxDR0RhdGFDb25zdW1lclJlZj4gcGRmRGF0YUNvbnN1bWVyKEFkb3B0Q0YsIENHRGF0YUNv bnN1bWVyQ3JlYXRlV2l0aENGRGF0YShwZGZQYWdlRGF0YS5nZXQoKSkpOwogCkBAIC0yMDU1LDYg KzIwNTgsNyBAQCB2b2lkIFdlYlBhZ2U6OmRyYXdQYWdlc1RvUERGKHVpbnQ2NF90IGZyCiAgICAg ICAgICAgICBDR1BERkNvbnRleHRFbmRQYWdlKGNvbnRleHQuZ2V0KCkpOwogICAgICAgICB9CiAg ICAgICAgIENHUERGQ29udGV4dENsb3NlKGNvbnRleHQuZ2V0KCkpOworI2VuZGlmCiAgICAgfQog CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEYXRhQ2FsbGJhY2soQ29yZUlQQzo6 RGF0YVJlZmVyZW5jZShDRkRhdGFHZXRCeXRlUHRyKHBkZlBhZ2VEYXRhLmdldCgpKSwgQ0ZEYXRh R2V0TGVuZ3RoKHBkZlBhZ2VEYXRhLmdldCgpKSksIGNhbGxiYWNrSUQpKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi93aW4vV2ViS2l0Mi52Y3Byb2oJKHJldmlzaW9uIDgwNTc2KQorKysgU291cmNlL1dlYktpdDIv d2luL1dlYktpdDIudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0xMTQ0LDYgKzExNDQsMjIgQEAK IAkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFx3aW5cTGF5ZXJUcmVlQ29u dGV4dFdpbi5jcHAiCiAJCQkJCT4KKwkJCQkJPEZpbGVDb25maWd1cmF0aW9uCisJCQkJCQlOYW1l PSJEZWJ1Z19DYWlyb19DRkxpdGV8V2luMzIiCisJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1 ZSIKKwkJCQkJCT4KKwkJCQkJCTxUb29sCisJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCIK KwkJCQkJCS8+CisJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+CisJCQkJCTxGaWxlQ29uZmlndXJh dGlvbgorCQkJCQkJTmFtZT0iUmVsZWFzZV9DYWlyb19DRkxpdGV8V2luMzIiCisJCQkJCQlFeGNs dWRlZEZyb21CdWlsZD0idHJ1ZSIKKwkJCQkJCT4KKwkJCQkJCTxUb29sCisJCQkJCQkJTmFtZT0i VkNDTENvbXBpbGVyVG9vbCIKKwkJCQkJCS8+CisJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+CiAJ CQkJPC9GaWxlPgogCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXHdpblxO YXRpdmVXZWJLZXlib2FyZEV2ZW50V2luLmNwcCIK 85078 2011-03-08 12:19:32 -0800 2011-03-08 12:22:06 -0800 Correct <stdint.h> include ordering webkit2_wincairo_3.patch text/plain 15536 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTc3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDMtMDggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NTk1NgorICAgICAgICBXZWJLaXQyIENoYW5nZXMgdG8gY29ycmVjdCBXaW5DYWlybyBw b3J0IGJ1aWxkCisKKyAgICAgICAgKiBTaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oOiBEb24ndCBl eGNsdWRlIENvcmVJUEMgZGVjbGFyYXRpb25zIGZvciBub24tYWNjZWxlcmF0ZWQKKyAgICAgICAg ICBjb21wb3NpdGluZyBjYXNlLgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 Lmg6IEFkZCAic3RkaW50LmgiIGluY2x1ZGUgbmVlZGVkIGZvciBDYWlybyBidWlsZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOiBFeGNsdWRlIGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIGNvZGUgZm9yCisgICAgICAgICAgV2luQ2Fpcm8gYnVpbGQuCisgICAg ICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwp OgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50 ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdB cmVhUHJveHlJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAo V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRl KToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXNw YXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eUltcGwuaDogRXhjbHVkZSBkZWNsYXJhdGlvbnMgZm9yIGNvZGUgb25seSB1 c2VkIHdoZW4KKyAgICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6aXNJbkFjY2VsZXJhdGVkQ29t cG9zaXRpbmdNb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOiBQcm90 ZWN0IENHLXNwZWNpZmljIGRyYXdpbmcgY29kZS4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6 c2V0RmluZEluZGljYXRvcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWQuaDogQWxsb3cgQ0ZMaXRlIGltcGxlbnRhdGlvbiB0byBzaGFyZSBvdmVyd3JpdGUgZmxhZywK KyAgICAgICAgICBhcyB3ZWxsIGFzIGRlc3RpbmF0aW9uIGFuZCBidW5kbGUgcGF0aHMuCisgICAg ICAgICogV2ViUHJvY2Vzcy9Eb3dubG9hZHMvY3VybC9Eb3dubG9hZEN1cmwuY3BwOiBSZW1vdmUg c3R1YiAodG8gc2hhcmUgQ0ZOZXQgaW1wbGVtZW50YXRpb24KKyAgICAgICAgICBvZiBmaWxlIGhh bmRsaW5nLiAgVGhpcyB3aWxsIGJlIG1vdmVkIHRvIGEgY29tbW9uIGFyZWEgaW4gYSBmdXR1cmUg cGF0Y2guKQorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3Bw OiBFeGNsdWRlIGFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nIHBhdGhzLgorICAgICAgICAoV2ViS2l0 OjpEcmF3aW5nQXJlYUltcGw6OmxheWVySG9zdERpZEZsdXNoTGF5ZXJzKToKKyAgICAgICAgKFdl YktpdDo6RHJhd2luZ0FyZWFJbXBsOjpzZW5kRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpOgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOiBQcm90 ZWN0IENHLXNwZWNpZmljIGRyYXdpbmcgY29kZS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 ZHJhd1JlY3RUb1BERik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRyYXdQYWdlc1RvUERG KToKKyAgICAgICAgKiB3aW4vV2ViS2l0Mi52Y3Byb2o6IEV4Y2x1ZGUgdW51c2VkIExheWVyVHJl ZUNvbnRleHQgZnJvbSBXaW5DYWlybworCiAyMDExLTAzLTA4ICBKZWZmIE1pbGxlciAgPGplZmZt QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggbGFzdCBjaGFuZ2Ugc28gV0tC YXNlV2luLmggaXMgaW4gYWxwaGFiZXRpY2FsIG9yZGVyIGluIHRoZSBwcm9qZWN0IFhNTC4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaAkocmV2aXNpb24gODA1 NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNiwxMyArMjYsMTMgQEAKICNpZm5kZWYgTGF5ZXJUcmVlQ29udGV4dF9oCiAj ZGVmaW5lIExheWVyVHJlZUNvbnRleHRfaAogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQotCiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAgICAgY2xhc3MgQXJndW1lbnREZWNvZGVyOwog ICAgIGNsYXNzIEFyZ3VtZW50RW5jb2RlcjsKIH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIExheWVyVHJlZUNvbnRleHQg ewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCShy ZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKICNkZWZpbmUgRHJhd2luZ0Fy ZWFQcm94eV9oCiAKICNpbmNsdWRlICJEcmF3aW5nQXJlYUluZm8uaCIKKyNpbmNsdWRlIDxzdGRp bnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ludFNpemUuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29w eWFibGUuaD4KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHlJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2lu Z0FyZWFQcm94eUltcGwuY3BwCShyZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDkg KzU4LDExIEBAIERyYXdpbmdBcmVhUHJveHlJbXBsOjpEcmF3aW5nQXJlYVByb3h5SW0KIAogRHJh d2luZ0FyZWFQcm94eUltcGw6On5EcmF3aW5nQXJlYVByb3h5SW1wbCgpCiB7CisjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIC8vIE1ha2Ugc3VyZSB0byBleGl0IGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIG1vZGUuCiAgICAgaWYgKGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZSgpKQogICAgICAgICBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKKyNlbmRp ZgogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpwYWludChCYWNraW5nU3RvcmU6OlBs YXRmb3JtR3JhcGhpY3NDb250ZXh0IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QsIFJlZ2lv biYgdW5wYWludGVkUmVnaW9uKQpAQCAtMTYyLDYgKzE2NCw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQ cm94eUltcGw6OmRpZFVwZGF0ZUJhY2sKICAgICBpZiAobV9uZXh0QmFja2luZ1N0b3JlU3RhdGVJ RCAhPSBtX2N1cnJlbnRCYWNraW5nU3RvcmVTdGF0ZUlEKQogICAgICAgICBzZW5kVXBkYXRlQmFj a2luZ1N0b3JlU3RhdGUoUmVzcG9uZEltbWVkaWF0ZWx5KTsKIAorI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKICAgICBpZiAobGF5ZXJUcmVlQ29udGV4dCAhPSBtX2xheWVyVHJlZUNv bnRleHQpIHsKICAgICAgICAgaWYgKCFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CiAg ICAgICAgICAgICBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKQEAgLTE3OCw2ICsx ODEsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpkaWRVcGRhdGVCYWNrCiAgICAgICAg IEFTU0VSVCghbV9iYWNraW5nU3RvcmUpOwogICAgICAgICByZXR1cm47CiAgICAgfQorI2VuZGlm CiAKICAgICAvLyBGSVhNRTogV2UgY291bGQganVzdCByZXVzZSBvdXIgZXhpc3RpbmcgYmFja2lu ZyBzdG9yZSBpZiBpdCdzIHRoZSBzYW1lIHNpemUgYXMKICAgICAvLyB1cGRhdGVJbmZvLnZpZXdT aXplLgpAQCAtMTkxLDcgKzE5NSw5IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmVudGVy QWNjZWxlcmEKICAgICBpZiAoYmFja2luZ1N0b3JlU3RhdGVJRCA8IG1fY3VycmVudEJhY2tpbmdT dG9yZVN0YXRlSUQpCiAgICAgICAgIHJldHVybjsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICAgICBlbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGxheWVyVHJlZUNv bnRleHQpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBiYWNraW5nU3RvcmVTdGF0ZUlELCBjb25z dCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvKQpAQCAtMjAwLDcgKzIwNiw5IEBAIHZvaWQgRHJhd2lu Z0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXQKICAgICBpZiAoYmFja2luZ1N0b3JlU3RhdGVJ RCA8IG1fY3VycmVudEJhY2tpbmdTdG9yZVN0YXRlSUQpCiAgICAgICAgIHJldHVybjsKIAorI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBleGl0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGUoKTsKKyNlbmRpZgogCiAgICAgaW5jb3Jwb3JhdGVVcGRhdGUodXBkYXRlSW5mbyk7 CiB9CkBAIC0yNTIsMTEgKzI2MCwxMyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpzZW5k VXBkYXRlQmFjCiAgICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6 RHJhd2luZ0FyZWE6OlVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKG1fbmV4dEJhY2tpbmdTdG9yZVN0 YXRlSUQsIHJlc3BvbmRJbW1lZGlhdGVseU9yTm90ID09IFJlc3BvbmRJbW1lZGlhdGVseSwgbV9z aXplLCBtX3Njcm9sbE9mZnNldCksIG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSk7CiAgICAgbV9z Y3JvbGxPZmZzZXQgPSBJbnRTaXplKCk7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCiAgICAgaWYgKG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgJiYg IW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gV2FpdCBmb3IgdGhl IERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2UuIE5vcm1hbGx5IHdlIGRvbiB0aGlz IGluIERyYXdpbmdBcmVhUHJveHlJbXBsOjpwYWludCwgYnV0IHRoYXQKICAgICAgICAgLy8gZnVu Y3Rpb24gaXMgbmV2ZXIgY2FsbGVkIHdoZW4gaW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9k ZS4KICAgICAgICAgd2FpdEZvckFuZERpc3BhdGNoRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUo KTsKICAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6d2FpdEZv ckFuZERpc3BhdGNoRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoKQpAQCAtMjY4LDYgKzI3OCw3 IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXMKICAgICBpZiAobV93 ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+aXNMYXVuY2hpbmcoKSkKICAgICAgICAgcmV0dXJuOwog ICAgIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBGSVhNRTogd2Fp dEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHkgd2lsbCBhbHdheXMgcmV0dXJuIHRoZSBvbGRlc3Qg RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZSB0aGF0CiAgICAgLy8gaGFzbid0IHll dCBiZWVuIHByb2Nlc3NlZC4gQnV0IGl0IG1pZ2h0IGJlIGJldHRlciB0byBza2lwIGFoZWFkIHRv IHNvbWUgb3RoZXIgRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUKICAgICAvLyBtZXNzYWdlLCBp ZiBtdWx0aXBsZSBEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlcyBhcmUgd2FpdGlu ZyB0byBiZSBwcm9jZXNzZWQuIEZvciBpbnN0YW5jZSwgd2UgY291bGQKQEAgLTI3Niw4ICsyODcs MTAgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6d2FpdEZvckFuZERpcwogICAgIC8vIFRo ZSB0aW1lb3V0LCBpbiBzZWNvbmRzLCB3ZSB1c2Ugd2hlbiB3YWl0aW5nIGZvciBhIERpZFVwZGF0 ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2Ugd2hlbiB3ZSdyZSBhc2tlZCB0byBwYWludC4KICAg ICBzdGF0aWMgY29uc3QgZG91YmxlIGRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlVGltZW91dCA9 IDAuNTsKICAgICBtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5jb25uZWN0aW9uKCktPndhaXRG b3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpEaWRV cGRhdGVCYWNraW5nU3RvcmVTdGF0ZT4obV93ZWJQYWdlUHJveHktPnBhZ2VJRCgpLCBkaWRVcGRh dGVCYWNraW5nU3RvcmVTdGF0ZVRpbWVvdXQpOworI2VuZGlmCiB9CiAKKyNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNv bnRleHQpCiB7CiAgICAgQVNTRVJUKCFpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSk7 CkBAIC0yOTQsNiArMzA3LDcgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZXhpdEFjY2Vs ZXJhdAogICAgIG1fbGF5ZXJUcmVlQ29udGV4dCA9IExheWVyVHJlZUNvbnRleHQoKTsgICAgCiAg ICAgbV93ZWJQYWdlUHJveHktPmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwogfQor I2VuZGlmCiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmRpc2NhcmRCYWNraW5nU3RvcmVT b29uKCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5oCShyZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC02OCwxMCArNjgsMTQg QEAgcHJpdmF0ZToKICAgICB2b2lkIHNlbmRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZShSZXNwb25k SW1tZWRpYXRlbHlPck5vdCk7CiAgICAgdm9pZCB3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVC YWNraW5nU3RvcmVTdGF0ZSgpOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQog ICAgIHZvaWQgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVD b250ZXh0Jik7CiAgICAgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKIAog ICAgIGJvb2wgaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4g IW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCk7IH0KKyNlbHNlCisgICAgYm9vbCBpc0luQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorI2VuZGlm CiAKICAgICB2b2lkIGRpc2NhcmRCYWNraW5nU3RvcmVTb29uKCk7CiAgICAgdm9pZCBkaXNjYXJk QmFja2luZ1N0b3JlKCk7CkBAIC04NSw5ICs4OSwxMSBAQCBwcml2YXRlOgogICAgIC8vIHdoZW5l dmVyIG91ciBzdGF0ZSBjaGFuZ2VzIGluIGEgd2F5IHRoYXQgd2lsbCByZXF1aXJlIGEgbmV3IGJh Y2tpbmcgc3RvcmUgdG8gYmUgYWxsb2NhdGVkLgogICAgIHVpbnQ2NF90IG1fbmV4dEJhY2tpbmdT dG9yZVN0YXRlSUQ7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8g VGhlIGN1cnJlbnQgbGF5ZXIgdHJlZSBjb250ZXh0LgogICAgIExheWVyVHJlZUNvbnRleHQgbV9s YXllclRyZWVDb250ZXh0OwotICAgIAorI2VuZGlmCisKICAgICAvLyBXaGV0aGVyIHdlJ3ZlIHNl bnQgYSBVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlIGFuZCBhcmUgbm93IHdhaXRpbmcg Zm9yIGEgRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZS4KICAgICAvLyBVc2VkIHRv IHRocm90dGxlIFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2VzIHNvIHdlIGRvbid0IHNl bmQgdGhlbSBmYXN0ZXIgdGhhbiB0aGUgV2ViIHByb2Nlc3MgY2FuIGhhbmRsZS4KICAgICBib29s IG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGU7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDgwNTc1KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDQsNyArNDQsOSBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQml0bWFwSW5mby5oPgogI2luY2x1ZGUg PFdlYkNvcmUvQ3Vyc29yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KKyNpZiBQ TEFURk9STShDRykKICNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dENHLmg+CisjZW5k aWYKICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NvZnRM aW5raW5nLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XZWJDb3JlSW5zdGFuY2VIYW5kbGUuaD4KQEAg LTExMTAsMTEgKzExMTIsMTUgQEAgdm9pZCBXZWJWaWV3OjpzZXRGaW5kSW5kaWNhdG9yKFBhc3NS ZWZQdAogCiAgICAgICAgICAgICBoYm1wID0gQ3JlYXRlRElCU2VjdGlvbigwLCAmYml0bWFwSW5m bywgRElCX1JHQl9DT0xPUlMsIHN0YXRpY19jYXN0PHZvaWQqKj4oJmJpdHMpLCAwLCAwKTsKICAg ICAgICAgICAgIEhCSVRNQVAgaGJtcE9sZCA9IHN0YXRpY19jYXN0PEhCSVRNQVA+KFNlbGVjdE9i amVjdChoZGMsIGhibXApKTsKKyNpZiBQTEFURk9STShDRykKICAgICAgICAgICAgIFJldGFpblB0 cjxDR0NvbnRleHRSZWY+IGNvbnRleHQoQWRvcHRDRiwgQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKGJp dHMsIHdpZHRoLCBoZWlnaHQsCiAgICAgICAgICAgICAgICAgOCwgd2lkdGggKiBzaXplb2YoUkdC UVVBRCksIGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKSwga0NHQml0bWFwQnl0ZU9yZGVyMzJMaXR0 bGUgfCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0KSk7CiAKICAgICAgICAgICAgIEdy YXBoaWNzQ29udGV4dCBncmFwaGljc0NvbnRleHQoY29udGV4dC5nZXQoKSk7CiAgICAgICAgICAg ICBjb250ZW50SW1hZ2UtPnBhaW50KGdyYXBoaWNzQ29udGV4dCwgSW50UG9pbnQoKSwgY29udGVu dEltYWdlLT5ib3VuZHMoKSk7CisjZWxzZQorICAgICAgICAgICAgLy8gRklYTUU6IEltcGxlbWVu dCEKKyNlbmRpZgogCiAgICAgICAgICAgICA6OlNlbGVjdE9iamVjdChoZGMsIGhibXBPbGQpOwog ICAgICAgICAgICAgOjpEZWxldGVEQyhoZGMpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5oCShyZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgJKHdvcmtpbmcgY29weSkK QEAgLTEwNSwxMCArMTA1LDEwIEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TVVJMRG93bmxv YWQ+IG1fbnNVUkxEb3dubG9hZDsKICAgICBSZXRhaW5QdHI8V0tEb3dubG9hZEFzRGVsZWdhdGU+ IG1fZGVsZWdhdGU7CiAjZW5kaWYKLSNpZiBVU0UoQ0ZORVRXT1JLKQogICAgIGJvb2wgbV9hbGxv d092ZXJ3cml0ZTsKICAgICBTdHJpbmcgbV9kZXN0aW5hdGlvbjsKICAgICBTdHJpbmcgbV9idW5k bGVQYXRoOworI2lmIFVTRShDRk5FVFdPUkspCiAgICAgUmV0YWluUHRyPENGVVJMRG93bmxvYWRS ZWY+IG1fZG93bmxvYWQ7CiAjZW5kaWYKIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0Rvd25sb2Fkcy9jdXJsL0Rvd25sb2FkQ3VybC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvY3VybC9Eb3dubG9hZEN1cmwuY3BwCShyZXZp c2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRG93bmxvYWRzL2N1cmwv RG93bmxvYWRDdXJsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsOSArNTgsNCBAQCB2b2lkIERv d25sb2FkOjpkaWREZWNpZGVEZXN0aW5hdGlvbihjb25zCiAgICAgbm90SW1wbGVtZW50ZWQoKTsK IH0KIAotdm9pZCBEb3dubG9hZDo6cGxhdGZvcm1EaWRGaW5pc2goKQotewotICAgIG5vdEltcGxl bWVudGVkKCk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJKHJl dmlzaW9uIDgwNTc1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdp bmdBcmVhSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Nyw3ICsxOTcsOSBAQCB2b2lkIERy YXdpbmdBcmVhSW1wbDo6bGF5ZXJIb3N0RGlkRmx1c2hMCiAgICAgaWYgKCFtX2xheWVyVHJlZUhv c3QpCiAgICAgICAgIHJldHVybjsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK ICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkVudGVyQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobV9iYWNraW5nU3RvcmVTdGF0ZUlELCBtX2xheWVyVHJl ZUhvc3QtPmxheWVyVHJlZUNvbnRleHQoKSkpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaGljc0xh eWVyKQpAQCAtMjkxLDExICsyOTMsMTMgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OnNlbmREaWRV cGRhdGVCYWNraQogICAgIG1fc2hvdWxkU2VuZERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlID0g ZmFsc2U7CiAKICAgICBVcGRhdGVJbmZvIHVwZGF0ZUluZm87Ci0gICAgTGF5ZXJUcmVlQ29udGV4 dCBsYXllclRyZWVDb250ZXh0OwogCiAgICAgaWYgKCFtX2lzUGFpbnRpbmdTdXNwZW5kZWQgJiYg IW1fbGF5ZXJUcmVlSG9zdCkKICAgICAgICAgZGlzcGxheSh1cGRhdGVJbmZvKTsKIAorI2lmIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBMYXllclRyZWVDb250ZXh0IGxheWVyVHJl ZUNvbnRleHQ7CisKICAgICBpZiAobV9pc1BhaW50aW5nU3VzcGVuZGVkIHx8IG1fbGF5ZXJUcmVl SG9zdCkgewogICAgICAgICB1cGRhdGVJbmZvLnZpZXdTaXplID0gbV93ZWJQYWdlLT5zaXplKCk7 CiAKQEAgLTMxMSw2ICszMTUsNyBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2VuZERpZFVwZGF0 ZUJhY2tpCiAgICAgfQogCiAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJl YVByb3h5OjpEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZShtX2JhY2tpbmdTdG9yZVN0YXRlSUQs IHVwZGF0ZUluZm8sIGxheWVyVHJlZUNvbnRleHQpKTsKKyNlbmRpZgogfQogCiB2b2lkIERyYXdp bmdBcmVhSW1wbDo6ZGlkVXBkYXRlKCkKQEAgLTM5MSw5ICszOTYsMTEgQEAgdm9pZCBEcmF3aW5n QXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbQogICAgIGVsc2UKICAgICAgICAgZGlzcGxheSh1 cGRhdGVJbmZvKTsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBT ZW5kIGFsb25nIGEgY29tcGxldGUgdXBkYXRlIG9mIHRoZSBwYWdlIHNvIHdlIGNhbiBwYWludCB0 aGUgY29udGVudHMgcmlnaHQgYWZ0ZXIgd2UgZXhpdCB0aGUKICAgICAvLyBhY2NlbGVyYXRlZCBj b21wb3NpdGluZyBtb2RlLCBlbGltaW5pYXRpbmcgZmxpY2tlci4KICAgICBtX3dlYlBhZ2UtPnNl bmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZShtX2JhY2tpbmdTdG9yZVN0YXRlSUQsIHVwZGF0ZUluZm8pKTsKKyNlbmRpZgogfQogCiB2 b2lkIERyYXdpbmdBcmVhSW1wbDo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlU29vbigp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CShyZXZpc2lvbiA4MDU3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAwNSw2ICsyMDA1LDcgQEAgdm9pZCBXZWJQ YWdlOjpkcmF3UmVjdFRvUERGKHVpbnQ2NF90IGZyYQogICAgIGlmIChjb3JlRnJhbWUpIHsKICAg ICAgICAgQVNTRVJUKGNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+cHJpbnRpbmcoKSk7CiAKKyNpZiBQ TEFURk9STShDRykKICAgICAgICAgLy8gRklYTUU6IFVzZSBDR0RhdGFDb25zdW1lckNyZWF0ZSB3 aXRoIGNhbGxiYWNrcyB0byBhdm9pZCBjb3B5aW5nIHRoZSBkYXRhLgogICAgICAgICBSZXRhaW5Q dHI8Q0dEYXRhQ29uc3VtZXJSZWY+IHBkZkRhdGFDb25zdW1lcihBZG9wdENGLCBDR0RhdGFDb25z dW1lckNyZWF0ZVdpdGhDRkRhdGEocGRmUGFnZURhdGEuZ2V0KCkpKTsKIApAQCAtMjAyMCw2ICsy MDIxLDcgQEAgdm9pZCBXZWJQYWdlOjpkcmF3UmVjdFRvUERGKHVpbnQ2NF90IGZyYQogCiAgICAg ICAgIENHUERGQ29udGV4dEVuZFBhZ2UoY29udGV4dC5nZXQoKSk7CiAgICAgICAgIENHUERGQ29u dGV4dENsb3NlKGNvbnRleHQuZ2V0KCkpOworI2VuZGlmCiAgICAgfQogCiAgICAgc2VuZChNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEYXRhQ2FsbGJhY2soQ29yZUlQQzo6RGF0YVJlZmVyZW5jZShD RkRhdGFHZXRCeXRlUHRyKHBkZlBhZ2VEYXRhLmdldCgpKSwgQ0ZEYXRhR2V0TGVuZ3RoKHBkZlBh Z2VEYXRhLmdldCgpKSksIGNhbGxiYWNrSUQpKTsKQEAgLTIwMzUsNiArMjAzNyw3IEBAIHZvaWQg V2ViUGFnZTo6ZHJhd1BhZ2VzVG9QREYodWludDY0X3QgZnIKICAgICBpZiAoY29yZUZyYW1lKSB7 CiAgICAgICAgIEFTU0VSVChjb3JlRnJhbWUtPmRvY3VtZW50KCktPnByaW50aW5nKCkpOwogCisj aWYgUExBVEZPUk0oQ0cpCiAgICAgICAgIC8vIEZJWE1FOiBVc2UgQ0dEYXRhQ29uc3VtZXJDcmVh dGUgd2l0aCBjYWxsYmFja3MgdG8gYXZvaWQgY29weWluZyB0aGUgZGF0YS4KICAgICAgICAgUmV0 YWluUHRyPENHRGF0YUNvbnN1bWVyUmVmPiBwZGZEYXRhQ29uc3VtZXIoQWRvcHRDRiwgQ0dEYXRh Q29uc3VtZXJDcmVhdGVXaXRoQ0ZEYXRhKHBkZlBhZ2VEYXRhLmdldCgpKSk7CiAKQEAgLTIwNTUs NiArMjA1OCw3IEBAIHZvaWQgV2ViUGFnZTo6ZHJhd1BhZ2VzVG9QREYodWludDY0X3QgZnIKICAg ICAgICAgICAgIENHUERGQ29udGV4dEVuZFBhZ2UoY29udGV4dC5nZXQoKSk7CiAgICAgICAgIH0K ICAgICAgICAgQ0dQREZDb250ZXh0Q2xvc2UoY29udGV4dC5nZXQoKSk7CisjZW5kaWYKICAgICB9 CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRhdGFDYWxsYmFjayhDb3JlSVBD OjpEYXRhUmVmZXJlbmNlKENGRGF0YUdldEJ5dGVQdHIocGRmUGFnZURhdGEuZ2V0KCkpLCBDRkRh dGFHZXRMZW5ndGgocGRmUGFnZURhdGEuZ2V0KCkpKSwgY2FsbGJhY2tJRCkpOwpJbmRleDogU291 cmNlL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL3dpbi9XZWJLaXQyLnZjcHJvagkocmV2aXNpb24gODA1NzYpCisrKyBTb3VyY2UvV2ViS2l0 Mi93aW4vV2ViS2l0Mi52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTExNDQsNiArMTE0NCwyMiBA QAogCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXHdpblxMYXllclRyZWVD b250ZXh0V2luLmNwcCIKIAkJCQkJPgorCQkJCQk8RmlsZUNvbmZpZ3VyYXRpb24KKwkJCQkJCU5h bWU9IkRlYnVnX0NhaXJvX0NGTGl0ZXxXaW4zMiIKKwkJCQkJCUV4Y2x1ZGVkRnJvbUJ1aWxkPSJ0 cnVlIgorCQkJCQkJPgorCQkJCQkJPFRvb2wKKwkJCQkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29s IgorCQkJCQkJLz4KKwkJCQkJPC9GaWxlQ29uZmlndXJhdGlvbj4KKwkJCQkJPEZpbGVDb25maWd1 cmF0aW9uCisJCQkJCQlOYW1lPSJSZWxlYXNlX0NhaXJvX0NGTGl0ZXxXaW4zMiIKKwkJCQkJCUV4 Y2x1ZGVkRnJvbUJ1aWxkPSJ0cnVlIgorCQkJCQkJPgorCQkJCQkJPFRvb2wKKwkJCQkJCQlOYW1l PSJWQ0NMQ29tcGlsZXJUb29sIgorCQkJCQkJLz4KKwkJCQkJPC9GaWxlQ29uZmlndXJhdGlvbj4K IAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxTaGFyZWRcd2lu XE5hdGl2ZVdlYktleWJvYXJkRXZlbnRXaW4uY3BwIgo=