131779 2014-04-16 17:41:25 -0700 On iOS keep network process running using a process assertion rather than a boost 2014-04-16 18:40:35 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue oldest_to_newest 1001428 0 barraclough 2014-04-16 17:41:25 -0700 . 1001430 1 229507 barraclough 2014-04-16 17:47:15 -0700 Created attachment 229507 Fix 1001433 2 commit-queue 2014-04-16 17:49:22 -0700 Attachment 229507 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertion.mm:40: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1001441 3 229507 benjamin 2014-04-16 18:04:23 -0700 Comment on attachment 229507 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=229507&action=review > Source/WebKit2/UIProcess/WebProcessProxy.h:225 > + std::unique_ptr<ProcessAssertion> m_assertion; Let's move this guy to ChildProcessProxy. > Source/WebKit2/UIProcess/ios/ProcessAssertion.h:39 > + enum State { typed enum? > Source/WebKit2/UIProcess/ios/ProcessAssertion.mm:36 > +const BKSProcessAssertionFlags BackgroundTabFlags = (BKSProcessAssertionAllowIdleSleep); > +const BKSProcessAssertionFlags ForegroundTabFlags = (BKSProcessAssertionAllowIdleSleep | BKSProcessAssertionPreventTaskSuspend | BKSProcessAssertionAllowSuspendOnSleep | BKSProcessAssertionWantsForegroundResourcePriority | BKSProcessAssertionPreventTaskThrottleDown); Lowercase first letter for variable names. We'll probably need something configurable for BKSProcessAssertionPreventTaskThrottleDown on the WebProcess. > Source/WebKit2/UIProcess/ios/ProcessAssertion.mm:59 > + m_assertionState = assertionState; Let's assign this before the out call in case some delegate cause us to re-enter. 1001450 4 barraclough 2014-04-16 18:40:35 -0700 Transmitting file data ......... Committed revision 167410. 229507 2014-04-16 17:47:15 -0700 2014-04-16 18:04:22 -0700 Fix 131779.1.patch text/plain 17634 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQwNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE0LTA0LTE2ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIE9uIGlPUyBrZWVw IG5ldHdvcmsgcHJvY2VzcyBydW5uaW5nIHVzaW5nIGEgcHJvY2VzcyBhc3NlcnRpb24gcmF0aGVy IHRoYW4gYSBib29zdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMxNzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6Y29ubmVjdFRvU2VydmljZSk6CisgICAgICAgICAgICAtIE5vIG5lZWQg dG8gbGVhayBhIGJvb3N0IG9udG8gdGhlIE5ldHdvcmtQcm9jZXNzIG9uIGlPUy4KKyAgICAgICAg KiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAg ICAgIC0gVGFrZSBhIFByb2Nlc3NBc3NlcnRpb24gb24gdGhlIE5ldHdvcmtQcm9jZXNzLgorICAg ICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaDoKKyAgICAgICAg ICAgIC0gQWRkZWQgbV9hc3NlcnRpb24uCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5oOgorICAgICAgICAgICAgLSBNYWtlIG1fYXNzZXJ0aW9uIGEgUHJvY2Vzc0Fzc2VydGlv bi4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb24uaDogQWRkZWQuCisg ICAgICAgICAgICAtIEFkZGVkIC0gcmVmYWN0b3JlZCBmcm9tIFdlYlByb2Nlc3NQcm94eS5oLgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbi5tbTogQWRkZWQuCisgICAg ICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAg ICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZSk6CisgICAgICAgICAgICAtIEFk ZGVkIC0gcmVmYWN0b3JlZCBmcm9tIFdlYlByb2Nlc3NQcm94eUlPUy5tbS4KKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dlYlByb2Nlc3NQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzU3RhdGUpOgorICAgICAgICAgICAgLSBDb2RlIHJl ZmFjdG9yZWQgb3V0IHRvIFByb2Nlc3NBc3NlcnRpb24ubW0uCisgICAgICAgICogV2ViS2l0Mi54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAgICAgLSBBZGRlZCBmaWxlcy4KKwog MjAxNC0wNC0xNiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgTWFrZSBJUEM6OkFyZ3VtZW50cyBhIHZhcmlhZGljIHRlbXBsYXRlCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCShyZXZpc2lvbiAxNjczNzUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ3LDExICs0Nyw3IEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykgJiYgVVNF KFhQQ19TRVJWSUNFUykKLU9CSkNfQ0xBU1MgQktTUHJvY2Vzc0Fzc2VydGlvbjsKLWVudW0gUHJv Y2Vzc0Fzc2VydGlvblN0YXRlIHsKLSAgICBBc3NlcnRpb25CYWNrZ3JvdW5kLAotICAgIEFzc2Vy dGlvbkZvcmVncm91bmQKLX07CisjaW5jbHVkZSAiUHJvY2Vzc0Fzc2VydGlvbi5oIgogI2VuZGlm CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTY2LDcgKzYyLDcgQEAgY2xhc3MgV2ViQmFja0Zv cndhcmRMaXN0SXRlbTsKIGNsYXNzIFdlYkNvbnRleHQ7CiBjbGFzcyBXZWJQYWdlR3JvdXA7CiBz dHJ1Y3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZTsKLQorICAgIAogY2xhc3MgV2ViUHJvY2Vzc1By b3h5IDogcHVibGljIENoaWxkUHJvY2Vzc1Byb3h5LCBSZXNwb25zaXZlbmVzc1RpbWVyOjpDbGll bnQgewogcHVibGljOgogICAgIHR5cGVkZWYgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0+PiBXZWJCYWNrRm9yd2FyZExpc3RJdGVtTWFwOwpAQCAtMjI2LDgg KzIyMiw3IEBAIHByaXZhdGU6CiAgICAgaW50IG1fbnVtYmVyT2ZUaW1lc1N1ZGRlblRlcm1pbmF0 aW9uV2FzRGlzYWJsZWQ7CiAgICAgCiAjaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoWFBDX1NFUlZJ Q0VTKQotICAgIFJldGFpblB0cjxCS1NQcm9jZXNzQXNzZXJ0aW9uPiBtX2Fzc2VydGlvbjsKLSAg ICBQcm9jZXNzQXNzZXJ0aW9uU3RhdGUgbV9hc3NlcnRpb25TdGF0ZTsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8UHJvY2Vzc0Fzc2VydGlvbj4gbV9hc3NlcnRpb247CiAjZW5kaWYKIH07CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFj Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMv UHJvY2Vzc0xhdW5jaGVyTWFjLm1tCShyZXZpc2lvbiAxNjczODYpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMTgwLDcgKzE4MCw3IEBAIHN0YXRpYyB2b2lkIGNvbm5lY3RUb1NlcnZpY2UoY29u c3QgUHJvY2UKICAgICB4cGNfY29ubmVjdGlvbl9zZXRfZXZlbnRfaGFuZGxlcihjb25uZWN0aW9u LCBeKHhwY19vYmplY3RfdCBldmVudCkgeyB9KTsKICAgICB4cGNfY29ubmVjdGlvbl9yZXN1bWUo Y29ubmVjdGlvbik7CiAKLSNpZiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQorI2lmIEVOQUJMRShO RVRXT1JLX1BST0NFU1MpICYmICFQTEFURk9STShJT1MpCiAgICAgLy8gTGVhayBhIGJvb3N0IG9u dG8gdGhlIE5ldHdvcmtQcm9jZXNzLgogICAgIGlmIChsYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBl ID09IFByb2Nlc3NMYXVuY2hlcjo6TmV0d29ya1Byb2Nlc3MpIHsKICAgICAgICAgeHBjX29iamVj dF90IHByZUJvb3RzdHJhcE1lc3NhZ2UgPSB4cGNfZGljdGlvbmFyeV9jcmVhdGUoMCwgMCwgMCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1By b3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9O ZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMTY3Mzc1KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE5OSw2ICsxOTksMTAgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkaWRGaW5p c2hMYXVuYwogICAgIGlmIChtX3dlYkNvbnRleHQucHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgp KQogICAgICAgICBzZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKHRydWUpOwogI2VuZGlmCisg ICAgCisjaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoWFBDX1NFUlZJQ0VTKQorICAgIG1fYXNzZXJ0 aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPih4cGNfY29ubmVjdGlvbl9n ZXRfcGlkKGNvbm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpKSwgUHJvY2Vzc0Fzc2VydGlvbjo6 Rm9yZWdyb3VuZCk7CisjZW5kaWYKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oCShyZXZpc2lvbiAxNjczNzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv TmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3 LDEwIEBACiAjaW5jbHVkZSAiQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkuaCIKICNlbmRpZgog CisjaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoWFBDX1NFUlZJQ0VTKQorI2luY2x1ZGUgIlByb2Nl c3NBc3NlcnRpb24uaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZTsKIH0KQEAgLTk2LDYgKzEwMCwxMCBAQCBwcml2YXRlOgogI2lm IEVOQUJMRShDVVNUT01fUFJPVE9DT0xTKQogICAgIEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5 IG1fY3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHk7CiAjZW5kaWYKKyAgICAKKyNpZiBQTEFURk9S TShJT1MpICYmIFVTRShYUENfU0VSVklDRVMpCisgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NB c3NlcnRpb24+IG1fYXNzZXJ0aW9uOworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2Vy dGlvbi5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9j ZXNzQXNzZXJ0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw1NyBAQAorLyoKKyAqIENv cHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24u CisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMg Q09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FS UkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS CisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMu IE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJF Q1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwg REFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisg KiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJP RklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQor ICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICov CisKKyNpZm5kZWYgUHJvY2Vzc0Fzc2VydGlvbl9oCisjZGVmaW5lIFByb2Nlc3NBc3NlcnRpb25f aAorCisjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorCisjaWYgUExBVEZPUk0oSU9TKSAmJiBV U0UoWFBDX1NFUlZJQ0VTKQorCitPQkpDX0NMQVNTIEJLU1Byb2Nlc3NBc3NlcnRpb247CisKK25h bWVzcGFjZSBXZWJLaXQgeworICAgIAorY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbiB7CitwdWJsaWM6 CisgICAgZW51bSBTdGF0ZSB7CisgICAgICAgIEJhY2tncm91bmQsCisgICAgICAgIEZvcmVncm91 bmQKKyAgICB9OworICAgIAorICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIFN0YXRlKTsKKyAg ICAKKyAgICB2b2lkIHNldFN0YXRlKFN0YXRlKTsKKyAgICAKK3ByaXZhdGU6CisgICAgUmV0YWlu UHRyPEJLU1Byb2Nlc3NBc3NlcnRpb24+IG1fYXNzZXJ0aW9uOworICAgIFN0YXRlIG1fYXNzZXJ0 aW9uU3RhdGU7Cit9OworICAgIAorfQorCisjZW5kaWYgLy8gUExBVEZPUk0oSU9TKSAmJiBVU0Uo WFBDX1NFUlZJQ0VTKQorCisjZW5kaWYgLy8gUHJvY2Vzc0Fzc2VydGlvbl9oCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb24ubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uLm1tCShyZXZp c2lvbiAwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9u Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNjQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0 ICJjb25maWcuaCIKKyNpbXBvcnQgIlByb2Nlc3NBc3NlcnRpb24uaCIKKworI2lmIFBMQVRGT1JN KElPUykgJiYgVVNFKFhQQ19TRVJWSUNFUykKKworI2ltcG9ydCA8QXNzZXJ0aW9uU2VydmljZXMv QktTUHJvY2Vzc0Fzc2VydGlvbi5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY29uc3QgQktT UHJvY2Vzc0Fzc2VydGlvbkZsYWdzIEJhY2tncm91bmRUYWJGbGFncyA9IChCS1NQcm9jZXNzQXNz ZXJ0aW9uQWxsb3dJZGxlU2xlZXApOworY29uc3QgQktTUHJvY2Vzc0Fzc2VydGlvbkZsYWdzIEZv cmVncm91bmRUYWJGbGFncyA9IChCS1NQcm9jZXNzQXNzZXJ0aW9uQWxsb3dJZGxlU2xlZXAgfCBC S1NQcm9jZXNzQXNzZXJ0aW9uUHJldmVudFRhc2tTdXNwZW5kIHwgQktTUHJvY2Vzc0Fzc2VydGlv bkFsbG93U3VzcGVuZE9uU2xlZXAgfCBCS1NQcm9jZXNzQXNzZXJ0aW9uV2FudHNGb3JlZ3JvdW5k UmVzb3VyY2VQcmlvcml0eSB8IEJLU1Byb2Nlc3NBc3NlcnRpb25QcmV2ZW50VGFza1Rocm90dGxl RG93bik7CisgICAgCitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBp ZCwgU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCit7CisgICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVp c2l0aW9uSGFuZGxlciBoYW5kbGVyID0gXihCT09MIGFjcXVpcmVkKSB7CisgICAgICAgIGlmICgh YWNxdWlyZWQpIHsKKyAgICAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGFjcXVpcmUgYXNz ZXJ0aW9uIGZvciBwcm9jZXNzICVkIiwgcGlkKTsKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICB9CisgICAgfTsKKyAgICAKKyAgICBCS1NQcm9jZXNzQXNzZXJ0aW9u RmxhZ3MgZmxhZ3MgPSAoYXNzZXJ0aW9uU3RhdGUgPT0gRm9yZWdyb3VuZCkgPyBGb3JlZ3JvdW5k VGFiRmxhZ3MgOiBCYWNrZ3JvdW5kVGFiRmxhZ3M7CisgICAgbV9hc3NlcnRpb24gPSBhZG9wdE5T KFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZsYWdz IHJlYXNvbjpCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uIG5hbWU6QCJXZWIgY29u dGVudCB2aXNpYmxlIiB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7CisgICAgbV9hc3NlcnRpb25TdGF0 ZSA9IGFzc2VydGlvblN0YXRlOworfQorICAgIAordm9pZCBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRT dGF0ZShTdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK3sKKyAgICBpZiAobV9hc3NlcnRpb25TdGF0ZSA9 PSBhc3NlcnRpb25TdGF0ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQktTUHJvY2Vzc0Fzc2Vy dGlvbkZsYWdzIGZsYWdzID0gKGFzc2VydGlvblN0YXRlID09IEZvcmVncm91bmQpID8gRm9yZWdy b3VuZFRhYkZsYWdzIDogQmFja2dyb3VuZFRhYkZsYWdzOworICAgIFttX2Fzc2VydGlvbiBzZXRG bGFnczpmbGFnc107CisgICAgbV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlvblN0YXRlOworfQor Cit9CisKKyNlbmRpZiAvLyBQTEFURk9STShJT1MpICYmIFVTRShYUENfU0VSVklDRVMpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlByb2Nlc3NQcm94eUlPUy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlByb2Nlc3NQcm94eUlP Uy5tbQkocmV2aXNpb24gMTY3Mzc1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X ZWJQcm9jZXNzUHJveHlJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4LDE0ICsyOCw4IEBACiAK ICNpZiBQTEFURk9STShJT1MpCiAKLSNpbXBvcnQgPEFzc2VydGlvblNlcnZpY2VzL0JLU1Byb2Nl c3NBc3NlcnRpb24uaD4KICNpbXBvcnQgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KIAotI2lm IFVTRShYUENfU0VSVklDRVMpCi1jb25zdCBCS1NQcm9jZXNzQXNzZXJ0aW9uRmxhZ3MgQmFja2dy b3VuZFRhYkZsYWdzID0gKEJLU1Byb2Nlc3NBc3NlcnRpb25BbGxvd0lkbGVTbGVlcCk7Ci1jb25z dCBCS1NQcm9jZXNzQXNzZXJ0aW9uRmxhZ3MgRm9yZWdyb3VuZFRhYkZsYWdzID0gKEJLU1Byb2Nl c3NBc3NlcnRpb25BbGxvd0lkbGVTbGVlcCB8IEJLU1Byb2Nlc3NBc3NlcnRpb25QcmV2ZW50VGFz a1N1c3BlbmQgfCBCS1NQcm9jZXNzQXNzZXJ0aW9uV2FudHNGb3JlZ3JvdW5kUmVzb3VyY2VQcmlv cml0eSB8IEJLU1Byb2Nlc3NBc3NlcnRpb25QcmV2ZW50VGFza1Rocm90dGxlRG93bik7Ci0jZW5k aWYKLQogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5 Ym9hcmRBY2Nlc3NFbmFibGVkKCkKQEAgLTc1LDcgKzY5LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJv eHk6OnVwZGF0ZVByb2Nlc3NTdXBwcgogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9Ci0KKyAg ICAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzU3RhdGUoKQogewogI2lmIFVT RShYUENfU0VSVklDRVMpCkBAIC04NiwyOCArODAsMTggQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6 OnVwZGF0ZVByb2Nlc3NTdGF0ZQogICAgIGlmICgheHBjQ29ubmVjdGlvbikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgUHJvY2Vzc0Fzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlID0gQXNzZXJ0 aW9uQmFja2dyb3VuZDsKKyAgICBQcm9jZXNzQXNzZXJ0aW9uOjpTdGF0ZSBhc3NlcnRpb25TdGF0 ZSA9IFByb2Nlc3NBc3NlcnRpb246OkJhY2tncm91bmQ7CiAgICAgZm9yIChjb25zdCBhdXRvJiBw YWdlIDogbV9wYWdlTWFwLnZhbHVlcygpKSB7CiAgICAgICAgIGlmIChwYWdlLT5pc0luV2luZG93 KCkpIHsKLSAgICAgICAgICAgIGFzc2VydGlvblN0YXRlID0gQXNzZXJ0aW9uRm9yZWdyb3VuZDsK KyAgICAgICAgICAgIGFzc2VydGlvblN0YXRlID0gUHJvY2Vzc0Fzc2VydGlvbjo6Rm9yZWdyb3Vu ZDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQotICAgIEJLU1Byb2Nlc3NB c3NlcnRpb25GbGFncyBmbGFncyA9IChhc3NlcnRpb25TdGF0ZSA9PSBBc3NlcnRpb25Gb3JlZ3Jv dW5kKSA/IEZvcmVncm91bmRUYWJGbGFncyA6IEJhY2tncm91bmRUYWJGbGFnczsKLSAgICAKLSAg ICBpZiAoIW1fYXNzZXJ0aW9uKSB7Ci0gICAgICAgIHBpZF90IHBpZCA9IHhwY19jb25uZWN0aW9u X2dldF9waWQoeHBjQ29ubmVjdGlvbik7Ci0gICAgICAgIEJLU1Byb2Nlc3NBc3NlcnRpb25BY3F1 aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewotICAgICAgICAgICAg aWYgKCFhY3F1aXJlZCkgewotICAgICAgICAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGFj cXVpcmUgYXNzZXJ0aW9uIGZvciBXZWJDb250ZW50IHByb2Nlc3MgJWQiLCBwaWQpOwotICAgICAg ICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9 OwotICAgICAgICBtX2Fzc2VydGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFs bG9jXSBpbml0V2l0aFBJRDpwaWQgZmxhZ3M6ZmxhZ3MgcmVhc29uOkJLU1Byb2Nlc3NBc3NlcnRp b25SZWFzb25FeHRlbnNpb24gbmFtZTpAIldlYiBjb250ZW50IHZpc2libGUiIHdpdGhIYW5kbGVy OmhhbmRsZXJdKTsKLSAgICB9IGVsc2UgaWYgKG1fYXNzZXJ0aW9uU3RhdGUgIT0gYXNzZXJ0aW9u U3RhdGUpCi0gICAgICAgIFttX2Fzc2VydGlvbiBzZXRGbGFnczpmbGFnc107CiAgICAgCi0gICAg bV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlvblN0YXRlOworICAgIGlmICghbV9hc3NlcnRpb24p CisgICAgICAgIG1fYXNzZXJ0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9u Pih4cGNfY29ubmVjdGlvbl9nZXRfcGlkKHhwY0Nvbm5lY3Rpb24pLCBhc3NlcnRpb25TdGF0ZSk7 CisgICAgZWxzZQorICAgICAgICBtX2Fzc2VydGlvbi0+c2V0U3RhdGUoYXNzZXJ0aW9uU3RhdGUp OwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDE2NzM3NSkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTAw MCw2ICsxMDAwLDggQEAKIAkJN0VDNEYwRkIxOEU0QUNCQjAwODA1NkFGIC8qIE5ldHdvcmtQcm9j ZXNzQ29jb2EubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA3RUM0RjBGOTE4RTRBOTQ1MDA4MDU2QUYgLyogTmV0d29ya1Byb2Nlc3NDb2NvYS5tbSAqLzsg fTsKIAkJODQ0Nzc4NTMxNzZGQ0MwODAwQ0RDN0JCIC8qIEluamVjdGVkQnVuZGxlSGl0VGVzdFJl c3VsdE1lZGlhVHlwZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gODQ0Nzc4NTExNzZGQ0FDMTAwQ0RDN0JCIC8qIEluamVjdGVkQnVuZGxlSGl0VGVzdFJl c3VsdE1lZGlhVHlwZS5oICovOyB9OwogCQk4NjgxNjBEMDE4NzY0NTU3MDAyMUU3OUQgLyogV2lu ZG93U2VydmVyQ29ubmVjdGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDg2ODE2MENGMTg3NjQ1MzcwMDIxRTc5RCAvKiBXaW5kb3dTZXJ2ZXJDb25u ZWN0aW9uLm1tICovOyB9OworCQk4NkY5NTM2NDE4RkY1ODNDMDAxREIyRUYgLyogUHJvY2Vzc0Fz c2VydGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDg2Rjk1MzYyMThGRjU1MEIwMDFEQjJFRiAvKiBQcm9jZXNzQXNzZXJ0aW9uLm1tICovOyB9Owor CQk4NkY5NTM2NTE4RkY1OEY1MDAxREIyRUYgLyogUHJvY2Vzc0Fzc2VydGlvbi5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODZGOTUzNjAxOEZGNEZENDAw MURCMkVGIC8qIFByb2Nlc3NBc3NlcnRpb24uaCAqLzsgfTsKIAkJOENGRUNFOTQxNDkwRjE0MDAw MkFBQTMyIC8qIEVkaXRvclN0YXRlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDhDRkVDRTkzMTQ5MEYxNDAwMDJBQUEzMiAvKiBFZGl0b3JTdGF0ZS5j cHAgKi87IH07CiAJCThEQzJFRjUzMDQ4NkE2OTQwMDk4QjIxNiAvKiBJbmZvUGxpc3Quc3RyaW5n cyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMDg5QzE2 NjZGRTg0MTE1OEMwMkFBQzA3IC8qIEluZm9QbGlzdC5zdHJpbmdzICovOyB9OwogCQk5MDk4NTRF QzEyQkM0RTE3MDAwQUQwODAgLyogV2ViTWVtb3J5U2FtcGxlci5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MDU2MjBFODEyQkMyNDhCMDAwNzk5QjYg LyogV2ViTWVtb3J5U2FtcGxlci5jcHAgKi87IH07CkBAIC0yODY3LDYgKzI4NjksOCBAQAogCQk4 NDQ3Nzg1MTE3NkZDQUMxMDBDREM3QkIgLyogSW5qZWN0ZWRCdW5kbGVIaXRUZXN0UmVzdWx0TWVk aWFUeXBlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluamVjdGVkQnVuZGxl SGl0VGVzdFJlc3VsdE1lZGlhVHlwZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4 NjgxNjBDRDE4NzYzRDRCMDAyMUU3OUQgLyogV2luZG93U2VydmVyQ29ubmVjdGlvbi5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXaW5kb3dTZXJ2ZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTg2ODE2MENGMTg3NjQ1MzcwMDIxRTc5RCAvKiBXaW5kb3dTZXJ2ZXJDb25uZWN0 aW9uLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV2luZG93U2VydmVyQ29ubmVjdGlvbi5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJODZGOTUzNjAxOEZGNEZENDAwMURCMkVGIC8q IFByb2Nlc3NBc3NlcnRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gUHJv Y2Vzc0Fzc2VydGlvbi5oOyBwYXRoID0gaW9zL1Byb2Nlc3NBc3NlcnRpb24uaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJODZGOTUzNjIxOEZGNTUwQjAwMURCMkVGIC8qIFByb2Nlc3NB c3NlcnRpb24ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBQcm9j ZXNzQXNzZXJ0aW9uLm1tOyBwYXRoID0gaW9zL1Byb2Nlc3NBc3NlcnRpb24ubW07IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCThDRkVDRTkzMTQ5MEYxNDAwMDJBQUEzMiAvKiBFZGl0b3JT dGF0ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBFZGl0b3JTdGF0 ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCThEQzJFRjVBMDQ4NkE2OTQwMDk4 QjIxNiAvKiBJbmZvLnBsaXN0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5wbGlzdC54bWw7IHBhdGggPSBJbmZv LnBsaXN0OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4REMyRUY1QjA0ODZBNjk0MDA5 OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZXhwbGljaXRGaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBpbmNsdWRlSW5JbmRleCA9IDA7 IHBhdGggPSBXZWJLaXQyLmZyYW1ld29yazsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJ UjsgfTsKQEAgLTQ1MDQsNiArNDUwOCw4IEBACiAJCQkJMEYwQzM2NUQxOEMxMTBBNTAwRjYwN0Q3 IC8qIExheWVyUmVwcmVzZW50YXRpb24ubW0gKi8sCiAJCQkJMEZDQjRFMzYxOEJCRTA0NDAwMEZD RkM5IC8qIFBhZ2VDbGllbnRJbXBsSU9TLmggKi8sCiAJCQkJMEZDQjRFMzcxOEJCRTA0NDAwMEZD RkM5IC8qIFBhZ2VDbGllbnRJbXBsSU9TLm1tICovLAorCQkJCTg2Rjk1MzYwMThGRjRGRDQwMDFE QjJFRiAvKiBQcm9jZXNzQXNzZXJ0aW9uLmggKi8sCisJCQkJODZGOTUzNjIxOEZGNTUwQjAwMURC MkVGIC8qIFByb2Nlc3NBc3NlcnRpb24ubW0gKi8sCiAJCQkJMEYwQzM2NTcxOEMwNTFCQTAwRjYw N0Q3IC8qIFJlbW90ZUxheWVyVHJlZUhvc3RJT1MubW0gKi8sCiAJCQkJMEYwQzM2NUIxOEMwNUNB MTAwRjYwN0Q3IC8qIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW0gKi8sCiAJ CQkJMkRBMUU0RkMxOEMwMkI2QTAwREJDOTI5IC8qIFdLUERGVmlldy5oICovLApAQCAtNzM4NCw2 ICs3MzkwLDcgQEAKIAkJCQlDNUUxQUZFQjE2QjIwQjdFMDA2Q0MxRjIgLyogV0tXZWJBcmNoaXZl UmVzb3VyY2UuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDOTg5RDgyMTYxQTdFNUQwMDBENDZEMyAv KiBXS1dlYlByb2Nlc3NQbHVnSW4uaCBpbiBIZWFkZXJzICovLAogCQkJCTBGQ0I0RTY4MThCQkUz RDkwMDBGQ0ZDOSAvKiBXS1RleHRJbnB1dFdpbmRvd0NvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICov LAorCQkJCTg2Rjk1MzY1MThGRjU4RjUwMDFEQjJFRiAvKiBQcm9jZXNzQXNzZXJ0aW9uLmggaW4g SGVhZGVycyAqLywKIAkJCQlCQzhGMkYyRTE2MjczQUNDMDA1RkFDQjUgLyogV0tXZWJQcm9jZXNz UGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVySW50ZXJuYWwuaCBpbiBIZWFkZXJzICovLAog CQkJCTI5NTAxNzI0MTYyQTQ1MDQwMDRBOUQ3MSAvKiBXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2Vy Q29udGV4dENvbnRyb2xsZXJQcml2YXRlLmggaW4gSGVhZGVycyAqLywKIAkJCQkxRjc1MDZCNjE4 NTkxNjU3MDBFQzBGRjcgLyogV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZUludGVybmFsLmgg aW4gSGVhZGVycyAqLywKQEAgLTg0ODYsNiArODQ5Myw3IEBACiAJCQkJRjZBMjVGREMxMkFEQzZD QzAwREM0MENDIC8qIFdlYkRhdGFiYXNlTWFuYWdlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlG NjJBNzZCNjEyQjFCMjVGMDAwNUYxQjYgLyogV2ViRGF0YWJhc2VNYW5hZ2VyTWVzc2FnZVJlY2Vp dmVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTUxRTM1MjA5MTgwRjVENkIwMEU1M0JFOSAvKiBE YXRhYmFzZVNlcnZpY2VFbnRyeVBvaW50Lm1tIGluIFNvdXJjZXMgKi8sCisJCQkJODZGOTUzNjQx OEZGNTgzQzAwMURCMkVGIC8qIFByb2Nlc3NBc3NlcnRpb24ubW0gaW4gU291cmNlcyAqLywKIAkJ CQkyOTIzMkRGODE4QjJBOUFFMDBEMDU5NkYgLyogV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVj dElPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTNGNDE4RUY5MTg4N0JEOTcwMDI3OTVGRCAvKiBX ZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCUY2MkE3NjVDMTJCMUFCQzMwMDA1RjFCNiAvKiBXZWJEYXRhYmFzZU1hbmFnZXJQcm94 eS5jcHAgaW4gU291cmNlcyAqLywK