123904 2013-11-06 11:20:49 -0800 Add WKBrowsingContextPolicyDelegate 2013-11-06 11:40:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 947799 0 sam 2013-11-06 11:20:49 -0800 Add WKBrowsingContextPolicyDelegate 947804 1 216197 sam 2013-11-06 11:23:01 -0800 Created attachment 216197 Patch 947808 2 216197 andersca 2013-11-06 11:26:47 -0800 Comment on attachment 216197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=216197&action=review > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h:46 > +@property (assign) id<WKBrowsingContextLoadDelegate> loadDelegate; > +@property (assign) id<WKBrowsingContextPolicyDelegate> policyDelegate; Space after id > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm:608 > + WKActionIsMainFrameKey: WKFrameIsMainFrame(frame) ? @YES : @NO, Can just do @(WKFrameIsMainFrame(frame)) > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm:624 > + WKActionIsMainFrameKey: WKFrameIsMainFrame(frame) ? @YES : @NO, Can just do @(WKFrameIsMainFrame(frame)) > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextPolicyDelegate.h:36 > +extern NSString *WKActionIsMainFrameKey; // NSNumber (BOOL) > +extern NSString *WKActionNavigationTypeKey; // NSNumber (WKNavigationType) > +extern NSString *WKActionMouseButtonKey; // NSNumber (0 for left button, 1 for middle button, 2 for right button) > +extern NSString *WKActionModifierFlagsKey; // NSNumber (unsigned) > +extern NSString *WKActionURLRequestKey; // NSURLRequest > +extern NSString *WKActionURLResponseKey; // NSURLResponse > +extern NSString *WKActionFrameNameKey; // NSString These should have headerdoc like documentation. 947812 3 sam 2013-11-06 11:40:07 -0800 Committed r158764: <http://trac.webkit.org/changeset/158764> 216197 2013-11-06 11:23:01 -0800 2013-11-06 11:26:47 -0800 Patch bug-123904-20131106112301.patch text/plain 17738 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODc2MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTExLTA2ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLQnJvd3NpbmdDb250ZXh0UG9s aWN5RGVsZWdhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMzkwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1t OgorICAgICAgICBJbXBsZW1lbnQgYSBXS1BhZ2VQb2xpY3lDbGllbnQgaW4gdGVybXMgb2YgdGhl IG5ldyBXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlIHByb3RvY29sLgorICAgICAgICAK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVn YXRlLmg6IAorICAgICAgICBBZGRlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dl YktpdDIuaDoKKyAgICAgICAgQWRkIG5ldyAjaW5jbHVkZSBvZiBXS0Jyb3dzaW5nQ29udGV4dFBv bGljeURlbGVnYXRlLmgKKworICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvajoKKyAgICAgICAgQWRkIG5ldyBmaWxlLgorCiAyMDEzLTExLTA2ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGRlYWQgY29kZQpJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250 cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLmgJKHJldmlzaW9uIDE1ODc2MSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5o CSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiBAY2xhc3MgV0tCYWNrRm9yd2FyZExp c3RJdGVtOwogQHByb3RvY29sIFdLQnJvd3NpbmdDb250ZXh0SGlzdG9yeURlbGVnYXRlOwogQHBy b3RvY29sIFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlOworQHByb3RvY29sIFdLQnJvd3Np bmdDb250ZXh0UG9saWN5RGVsZWdhdGU7CiAKIFdLX0VYUE9SVAogQGludGVyZmFjZSBXS0Jyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIgOiBOU09iamVjdCB7CkBAIC00MSw3ICs0Miw4IEBAIEBpbnRl cmZhY2UgV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIDoKIAogI3ByYWdtYSBtYXJrIERlbGVn YXRlcwogCi1AcHJvcGVydHkoYXNzaWduKSBpZDxXS0Jyb3dzaW5nQ29udGV4dExvYWREZWxlZ2F0 ZT4gbG9hZERlbGVnYXRlOworQHByb3BlcnR5IChhc3NpZ24pIGlkPFdLQnJvd3NpbmdDb250ZXh0 TG9hZERlbGVnYXRlPiBsb2FkRGVsZWdhdGU7CitAcHJvcGVydHkgKGFzc2lnbikgaWQ8V0tCcm93 c2luZ0NvbnRleHRQb2xpY3lEZWxlZ2F0ZT4gcG9saWN5RGVsZWdhdGU7CiAKICNpZiBXS19BUElf RU5BQkxFRAogQHByb3BlcnR5IChhc3NpZ24pIGlkIDxXS0Jyb3dzaW5nQ29udGV4dEhpc3RvcnlE ZWxlZ2F0ZT4gaGlzdG9yeURlbGVnYXRlOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ci5tbQkocmV2aXNpb24gMTU4NzYxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2 ICszMyw3IEBACiAjaW1wb3J0ICJXS0JhY2tGb3J3YXJkTGlzdEl0ZW1JbnRlcm5hbC5oIgogI2lt cG9ydCAiV0tFcnJvckNGLmgiCiAjaW1wb3J0ICJXS0ZyYW1lLmgiCisjaW1wb3J0ICJXS0ZyYW1l UG9saWN5TGlzdGVuZXIuaCIKICNpbXBvcnQgIldLTlNBcnJheS5oIgogI2ltcG9ydCAiV0tQYWdl UHJpdmF0ZS5oIgogI2ltcG9ydCAiV0tSZXRhaW5QdHIuaCIKQEAgLTQwLDYgKzQxLDggQEAKICNp bXBvcnQgIldLVVJMQ0YuaCIKICNpbXBvcnQgIldLVVJMUmVxdWVzdC5oIgogI2ltcG9ydCAiV0tV UkxSZXF1ZXN0TlMuaCIKKyNpbXBvcnQgIldLVVJMUmVzcG9uc2UuaCIKKyNpbXBvcnQgIldLVVJM UmVzcG9uc2VOUy5oIgogI2ltcG9ydCAiV2ViQ29udGV4dC5oIgogI2ltcG9ydCAiV2ViRGF0YS5o IgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCkBAIC00Nyw2ICs1MCw3IEBACiAjaW1wb3J0IDx3 dGYvUmV0YWluUHRyLmg+CiAKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRl LmgiCisjaW1wb3J0ICJXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmgiCiAKIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTYwLDYgKzY0LDI0IEBAIHN0YXRpYyBpbmxpbmUgTlNV UkwgKmF1dG9yZWxlYXNlZChXS1VSTFIKICAgICByZXR1cm4gdXJsID8gQ0ZCcmlkZ2luZ1JlbGVh c2UoV0tVUkxDb3B5Q0ZVUkwoa0NGQWxsb2NhdG9yRGVmYXVsdCwgYWRvcHRXSyh1cmwpLmdldCgp KSkgOiBuaWw7CiB9CiAKK3N0YXRpYyBpbmxpbmUgTlNVUkxSZXF1ZXN0ICphdXRvcmVsZWFzZWQo V0tVUkxSZXF1ZXN0UmVmIHVybFJlcXVlc3QpCit7CisgICAgcmV0dXJuIHVybFJlcXVlc3QgPyBD RkJyaWRnaW5nUmVsZWFzZShXS1VSTFJlcXVlc3RDb3B5TlNVUkxSZXF1ZXN0KGFkb3B0V0sodXJs UmVxdWVzdCkuZ2V0KCkpKSA6IG5pbDsKK30KKworc3RhdGljIGlubGluZSBOU1VSTFJlc3BvbnNl ICphdXRvcmVsZWFzZWQoV0tVUkxSZXNwb25zZVJlZiB1cmxSZXNwb25zZSkKK3sKKyAgICByZXR1 cm4gdXJsUmVzcG9uc2UgPyBDRkJyaWRnaW5nUmVsZWFzZShXS1VSTFJlc3BvbnNlQ29weU5TVVJM UmVzcG9uc2UoYWRvcHRXSyh1cmxSZXNwb25zZSkuZ2V0KCkpKSA6IG5pbDsKK30KKworTlNTdHJp bmcgKldLQWN0aW9uSXNNYWluRnJhbWVLZXkgPSBAIldLQWN0aW9uSXNNYWluRnJhbWVLZXkiOwor TlNTdHJpbmcgKldLQWN0aW9uTmF2aWdhdGlvblR5cGVLZXkgPSBAIldLQWN0aW9uTmF2aWdhdGlv blR5cGVLZXkiOworTlNTdHJpbmcgKldLQWN0aW9uTW91c2VCdXR0b25LZXkgPSBAIldLQWN0aW9u TW91c2VCdXR0b25LZXkiOworTlNTdHJpbmcgKldLQWN0aW9uTW9kaWZpZXJGbGFnc0tleSA9IEAi V0tBY3Rpb25Nb2RpZmllckZsYWdzS2V5IjsKK05TU3RyaW5nICpXS0FjdGlvblVSTFJlcXVlc3RL ZXkgPSBAIldLQWN0aW9uVVJMUmVxdWVzdEtleSI7CitOU1N0cmluZyAqV0tBY3Rpb25VUkxSZXNw b25zZUtleSA9IEAiV0tBY3Rpb25VUkxSZXNwb25zZUtleSI7CitOU1N0cmluZyAqV0tBY3Rpb25G cmFtZU5hbWVLZXkgPSBAIldLQWN0aW9uRnJhbWVOYW1lS2V5IjsKKwogQGludGVyZmFjZSBXS0Jy b3dzaW5nQ29udGV4dENvbnRyb2xsZXJEYXRhIDogTlNPYmplY3QgewogQHB1YmxpYwogICAgIC8v IFVuZGVybHlpbmcgV0tQYWdlUmVmLgpAQCAtNjcsNiArODksOSBAQCBAaW50ZXJmYWNlIFdLQnJv d3NpbmdDb250ZXh0Q29udHJvbGxlckRhCiAgICAgCiAgICAgLy8gRGVsZWdhdGUgZm9yIGxvYWQg Y2FsbGJhY2tzLgogICAgIGlkPFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlPiBfbG9hZERl bGVnYXRlOworCisgICAgLy8gRGVsZWdhdGUgZm9yIHBvbGljeSBjYWxsYmFja3MuCisgICAgaWQ8 V0tCcm93c2luZ0NvbnRleHRQb2xpY3lEZWxlZ2F0ZT4gX3BvbGljeURlbGVnYXRlOwogfQogQGVu ZAogCkBAIC03OCw3ICsxMDMsOCBAQCBAaW50ZXJmYWNlIFdLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlckRhCiAKIC0gKHZvaWQpZGVhbGxvYwogewotICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGll bnQoX2RhdGEtPl9wYWdlUmVmLmdldCgpLCAwKTsKKyAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xp ZW50KF9kYXRhLT5fcGFnZVJlZi5nZXQoKSwgbnVsbHB0cik7CisgICAgV0tQYWdlU2V0UGFnZVBv bGljeUNsaWVudChfZGF0YS0+X3BhZ2VSZWYuZ2V0KCksIG51bGxwdHIpOwogCiAgICAgW19kYXRh IHJlbGVhc2VdOwogICAgIFtzdXBlciBkZWFsbG9jXTsKQEAgLTEwMSw2ICsxMjcsMTYgQEAgLSAo dm9pZClzZXRMb2FkRGVsZWdhdGU6KGlkPFdLQnJvd3NpbmdDbwogICAgIF9kYXRhLT5fbG9hZERl bGVnYXRlID0gbG9hZERlbGVnYXRlOwogfQogCistIChpZDxXS0Jyb3dzaW5nQ29udGV4dFBvbGlj eURlbGVnYXRlPilwb2xpY3lEZWxlZ2F0ZQoreworICAgIHJldHVybiBfZGF0YS0+X3BvbGljeURl bGVnYXRlOworfQorCistICh2b2lkKXNldFBvbGljeURlbGVnYXRlOihpZDxXS0Jyb3dzaW5nQ29u dGV4dFBvbGljeURlbGVnYXRlPilwb2xpY3lEZWxlZ2F0ZQoreworICAgIF9kYXRhLT5fcG9saWN5 RGVsZWdhdGUgPSBwb2xpY3lEZWxlZ2F0ZTsKK30KKwogI3ByYWdtYSBtYXJrIExvYWRpbmcKIAog KyAodm9pZClyZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sOihOU1N0cmluZyAqKXNjaGVt ZQpAQCAtNTMzLDYgKzU2OSw4NyBAQCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VMb2FkZXJDbGllbnQo V0tCcm93CiAgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudChwYWdlUmVmLCAmbG9hZGVyQ2xp ZW50KTsKIH0KIAorc3RhdGljIFdLUG9saWN5RGVjaXNpb25IYW5kbGVyIG1ha2VQb2xpY3lEZWNp c2lvbkJsb2NrKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lcikKK3sKKyAgICBXS1Jl dGFpbihsaXN0ZW5lcik7IC8vIFJlbGVhc2VkIGluIHRoZSBkZWNpc2lvbiBoYW5kbGVyIGJlbG93 LgorCisgICAgcmV0dXJuIFtbXihXS1BvbGljeURlY2lzaW9uIGRlY2lzaW9uKSB7CisgICAgICAg IHN3aXRjaCAoZGVjaXNpb24pIHsKKyAgICAgICAgY2FzZSBXS1BvbGljeURlY2lzaW9uQ2FuY2Vs OgorICAgICAgICAgICAgV0tGcmFtZVBvbGljeUxpc3RlbmVySWdub3JlKGxpc3RlbmVyKTsgICAg ICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIAorICAgICAgICBj YXNlIFdLUG9saWN5RGVjaXNpb25BbGxvdzoKKyAgICAgICAgICAgIFdLRnJhbWVQb2xpY3lMaXN0 ZW5lclVzZShsaXN0ZW5lcik7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgCisgICAgICAg IGNhc2UgV0tQb2xpY3lEZWNpc2lvbkJlY29tZURvd25sb2FkOgorICAgICAgICAgICAgV0tGcmFt ZVBvbGljeUxpc3RlbmVyRG93bmxvYWQobGlzdGVuZXIpOworICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIH07CisKKyAgICAgICAgV0tSZWxlYXNlKGxpc3RlbmVyKTsgLy8gUmV0YWluZWQgaW4g dGhlIGNvbnRleHQgYWJvdmUuCisgICAgfSBjb3B5XSBhdXRvcmVsZWFzZV07Cit9CisKK3N0YXRp YyB2b2lkIHNldFVwUGFnZVBvbGljeUNsaWVudChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIg KmJyb3dzaW5nQ29udGV4dCwgV0tQYWdlUmVmIHBhZ2VSZWYpCit7CisgICAgV0tQYWdlUG9saWN5 Q2xpZW50IHBvbGljeUNsaWVudDsKKyAgICBtZW1zZXQoJnBvbGljeUNsaWVudCwgMCwgc2l6ZW9m KHBvbGljeUNsaWVudCkpOworCisgICAgcG9saWN5Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlUG9s aWN5Q2xpZW50Q3VycmVudFZlcnNpb247CisgICAgcG9saWN5Q2xpZW50LmNsaWVudEluZm8gPSBi cm93c2luZ0NvbnRleHQ7CisKKyAgICBwb2xpY3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbiA9IFtdKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0ZyYW1l TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJz LCBXS0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0 LCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIsIFdLVHlwZVJlZiB1c2VyRGF0YSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbykKKyAgICB7CisgICAgICAgIFdLQnJvd3NpbmdDb250ZXh0 Q29udHJvbGxlciAqYnJvd3NpbmdDb250ZXh0ID0gKFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ciAqKWNsaWVudEluZm87CisgICAgICAgIGlmIChbYnJvd3NpbmdDb250ZXh0LnBvbGljeURlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoYnJvd3NpbmdDb250ZXh0Q29udHJvbGxl cjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopXSkgewor ICAgICAgICAgICAgTlNEaWN0aW9uYXJ5ICphY3Rpb25EaWN0aW9uYXJ5ID0gQHsKKyAgICAgICAg ICAgICAgICBXS0FjdGlvbklzTWFpbkZyYW1lS2V5OiBXS0ZyYW1lSXNNYWluRnJhbWUoZnJhbWUp ID8gQFlFUyA6IEBOTywKKyAgICAgICAgICAgICAgICBXS0FjdGlvbk5hdmlnYXRpb25UeXBlS2V5 OiBAKG5hdmlnYXRpb25UeXBlKSwKKyAgICAgICAgICAgICAgICBXS0FjdGlvbk1vZGlmaWVyRmxh Z3NLZXk6IEAobW9kaWZpZXJzKSwKKyAgICAgICAgICAgICAgICBXS0FjdGlvbk1vdXNlQnV0dG9u S2V5OiBAKG1vdXNlQnV0dG9uKSwKKyAgICAgICAgICAgICAgICBXS0FjdGlvblVSTFJlcXVlc3RL ZXk6IGF1dG9yZWxlYXNlZChyZXF1ZXN0KQorICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIAor ICAgICAgICAgICAgW2Jyb3dzaW5nQ29udGV4dC5wb2xpY3lEZWxlZ2F0ZSBicm93c2luZ0NvbnRl eHRDb250cm9sbGVyOmJyb3dzaW5nQ29udGV4dCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uOmFjdGlvbkRpY3Rpb25hcnkgZGVjaXNpb25IYW5kbGVyOm1ha2VQb2xpY3lEZWNpc2lvbkJs b2NrKGxpc3RlbmVyKV07CisgICAgICAgIH0KKyAgICB9OworCisgICAgcG9saWN5Q2xpZW50LmRl Y2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbiA9IFtdKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1l UmVmIGZyYW1lLCBXS0ZyYW1lTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIFdLRXZlbnRN b2RpZmllcnMgbW9kaWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIFdLVVJM UmVxdWVzdFJlZiByZXF1ZXN0LCBXS1N0cmluZ1JlZiBmcmFtZU5hbWUsIFdLRnJhbWVQb2xpY3lM aXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQorICAgIHsKKyAgICAgICAgV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICpicm93 c2luZ0NvbnRleHQgPSAoV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5mbzsK KyAgICAgICAgaWYgKFticm93c2luZ0NvbnRleHQucG9saWN5RGVsZWdhdGUgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihicm93c2luZ0NvbnRleHRDb250cm9sbGVyOmRlY2lkZVBvbGljeUZv ck5ld1dpbmRvd0FjdGlvbjpkZWNpc2lvbkhhbmRsZXI6KV0pIHsKKyAgICAgICAgICAgIE5TRGlj dGlvbmFyeSAqYWN0aW9uRGljdGlvbmFyeSA9IEB7CisgICAgICAgICAgICAgICAgV0tBY3Rpb25J c01haW5GcmFtZUtleTogV0tGcmFtZUlzTWFpbkZyYW1lKGZyYW1lKSA/IEBZRVMgOiBATk8sCisg ICAgICAgICAgICAgICAgV0tBY3Rpb25OYXZpZ2F0aW9uVHlwZUtleTogQChuYXZpZ2F0aW9uVHlw ZSksCisgICAgICAgICAgICAgICAgV0tBY3Rpb25Nb2RpZmllckZsYWdzS2V5OiBAKG1vZGlmaWVy cyksCisgICAgICAgICAgICAgICAgV0tBY3Rpb25Nb3VzZUJ1dHRvbktleTogQChtb3VzZUJ1dHRv biksCisgICAgICAgICAgICAgICAgV0tBY3Rpb25VUkxSZXF1ZXN0S2V5OiBhdXRvcmVsZWFzZWQo cmVxdWVzdCksCisgICAgICAgICAgICAgICAgV0tBY3Rpb25GcmFtZU5hbWVLZXk6IHRvSW1wbChm cmFtZU5hbWUpLT53cmFwcGVyKCkKKyAgICAgICAgICAgIH07CisgICAgICAgICAgICAKKyAgICAg ICAgICAgIFticm93c2luZ0NvbnRleHQucG9saWN5RGVsZWdhdGUgYnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlcjpicm93c2luZ0NvbnRleHQgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uOmFj dGlvbkRpY3Rpb25hcnkgZGVjaXNpb25IYW5kbGVyOm1ha2VQb2xpY3lEZWNpc2lvbkJsb2NrKGxp c3RlbmVyKV07CisgICAgICAgIH0KKworICAgIH07CisKKyAgICBwb2xpY3lDbGllbnQuZGVjaWRl UG9saWN5Rm9yUmVzcG9uc2UgPSBbXShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwg V0tVUkxSZXNwb25zZVJlZiByZXNwb25zZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLRnJh bWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQorICAgIHsKKyAgICAgICAgV0tCcm93c2luZ0NvbnRleHRDb250cm9s bGVyICpicm93c2luZ0NvbnRleHQgPSAoV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopY2xp ZW50SW5mbzsKKyAgICAgICAgaWYgKFticm93c2luZ0NvbnRleHQucG9saWN5RGVsZWdhdGUgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihicm93c2luZ0NvbnRleHRDb250cm9sbGVyOmRlY2lk ZVBvbGljeUZvclJlc3BvbnNlQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopXSkgeworICAgICAgICAg ICAgTlNEaWN0aW9uYXJ5ICphY3Rpb25EaWN0aW9uYXJ5ID0gQHsKKyAgICAgICAgICAgICAgICBX S0FjdGlvbklzTWFpbkZyYW1lS2V5OiBXS0ZyYW1lSXNNYWluRnJhbWUoZnJhbWUpID8gQFlFUyA6 IEBOTywKKyAgICAgICAgICAgICAgICBXS0FjdGlvblVSTFJlcXVlc3RLZXk6IGF1dG9yZWxlYXNl ZChyZXF1ZXN0KSwKKyAgICAgICAgICAgICAgICBXS0FjdGlvblVSTFJlc3BvbnNlS2V5OiBhdXRv cmVsZWFzZWQocmVzcG9uc2UpCisgICAgICAgICAgICB9OworCisgICAgICAgICAgICBbYnJvd3Np bmdDb250ZXh0LnBvbGljeURlbGVnYXRlIGJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI6YnJvd3Np bmdDb250ZXh0IGRlY2lkZVBvbGljeUZvclJlc3BvbnNlQWN0aW9uOmFjdGlvbkRpY3Rpb25hcnkg ZGVjaXNpb25IYW5kbGVyOm1ha2VQb2xpY3lEZWNpc2lvbkJsb2NrKGxpc3RlbmVyKV07CisgICAg ICAgIH0KKyAgICB9OworCisgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudChwYWdlUmVmLCAm cG9saWN5Q2xpZW50KTsKK30KIAogLyogVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgZnJvbSBh c3NvY2lhdGUgdmlldy4gKi8KIApAQCAtNTQ2LDYgKzY2Myw3IEBAIC0gKGlkKV9pbml0V2l0aFBh Z2VSZWY6KFdLUGFnZVJlZilwYWdlUmUKICAgICBfZGF0YS0+X3BhZ2VSZWYgPSBwYWdlUmVmOwog CiAgICAgc2V0VXBQYWdlTG9hZGVyQ2xpZW50KHNlbGYsIHBhZ2VSZWYpOworICAgIHNldFVwUGFn ZVBvbGljeUNsaWVudChzZWxmLCBwYWdlUmVmKTsKIAogICAgIHJldHVybiBzZWxmOwogfQpJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRQb2xp Y3lEZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVsZWdhdGUuaAkocmV2aXNpb24gMCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVs ZWdhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDYyIEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lt cG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisKK0BjbGFzcyBXS0Jyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXI7CisKK2V4dGVybiBOU1N0cmluZyAqV0tBY3Rpb25Jc01haW5GcmFtZUtleTsg Ly8gTlNOdW1iZXIgKEJPT0wpCitleHRlcm4gTlNTdHJpbmcgKldLQWN0aW9uTmF2aWdhdGlvblR5 cGVLZXk7IC8vIE5TTnVtYmVyIChXS05hdmlnYXRpb25UeXBlKQorZXh0ZXJuIE5TU3RyaW5nICpX S0FjdGlvbk1vdXNlQnV0dG9uS2V5OyAvLyBOU051bWJlciAoMCBmb3IgbGVmdCBidXR0b24sIDEg Zm9yIG1pZGRsZSBidXR0b24sIDIgZm9yIHJpZ2h0IGJ1dHRvbikKK2V4dGVybiBOU1N0cmluZyAq V0tBY3Rpb25Nb2RpZmllckZsYWdzS2V5OyAvLyBOU051bWJlciAodW5zaWduZWQpCitleHRlcm4g TlNTdHJpbmcgKldLQWN0aW9uVVJMUmVxdWVzdEtleTsgLy8gTlNVUkxSZXF1ZXN0CitleHRlcm4g TlNTdHJpbmcgKldLQWN0aW9uVVJMUmVzcG9uc2VLZXk7IC8vIE5TVVJMUmVzcG9uc2UKK2V4dGVy biBOU1N0cmluZyAqV0tBY3Rpb25GcmFtZU5hbWVLZXk7IC8vIE5TU3RyaW5nCisKK3R5cGVkZWYg TlNfRU5VTShOU1VJbnRlZ2VyLCBXS05hdmlnYXRpb25UeXBlKSB7CisgICAgV0tOYXZpZ2F0aW9u VHlwZUxpbmtDbGlja2VkLAorICAgIFdLTmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkLAorICAg IFdLTmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZCwKKyAgICBXS05hdmlnYXRpb25UeXBlUmVsb2Fk LAorICAgIFdLTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQsCisgICAgV0tOYXZpZ2F0aW9u VHlwZU90aGVyCit9OworCit0eXBlZGVmIE5TX0VOVU0oTlNVSW50ZWdlciwgV0tQb2xpY3lEZWNp c2lvbikgeworICAgIFdLUG9saWN5RGVjaXNpb25DYW5jZWwsCisgICAgV0tQb2xpY3lEZWNpc2lv bkFsbG93LAorICAgIFdLUG9saWN5RGVjaXNpb25CZWNvbWVEb3dubG9hZAorfTsKKwordHlwZWRl ZiB2b2lkICheV0tQb2xpY3lEZWNpc2lvbkhhbmRsZXIpKFdLUG9saWN5RGVjaXNpb24pOworCitA cHJvdG9jb2wgV0tCcm93c2luZ0NvbnRleHRQb2xpY3lEZWxlZ2F0ZSA8TlNPYmplY3Q+CitAb3B0 aW9uYWwKKworLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyOihXS0Jyb3dzaW5nQ29u dGV4dENvbnRyb2xsZXIgKilzZW5kZXIgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjoo TlNEaWN0aW9uYXJ5ICopYWN0aW9uSW5mb3JtYXRpb24gZGVjaXNpb25IYW5kbGVyOihXS1BvbGlj eURlY2lzaW9uSGFuZGxlcilkZWNpc2lvbkhhbmRsZXI7CistICh2b2lkKWJyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXI6KFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKXNlbmRlciBkZWNpZGVQ b2xpY3lGb3JOZXdXaW5kb3dBY3Rpb246KE5TRGljdGlvbmFyeSAqKWFjdGlvbkluZm9ybWF0aW9u IGRlY2lzaW9uSGFuZGxlcjooV0tQb2xpY3lEZWNpc2lvbkhhbmRsZXIpZGVjaXNpb25IYW5kbGVy OworLSAodm9pZClicm93c2luZ0NvbnRleHRDb250cm9sbGVyOihXS0Jyb3dzaW5nQ29udGV4dENv bnRyb2xsZXIgKilzZW5kZXIgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VBY3Rpb246KE5TRGljdGlv bmFyeSAqKWFjdGlvbkluZm9ybWF0aW9uIGRlY2lzaW9uSGFuZGxlcjooV0tQb2xpY3lEZWNpc2lv bkhhbmRsZXIpZGVjaXNpb25IYW5kbGVyOworCitAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XZWJLaXQyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV2ViS2l0Mi5oCShyZXZpc2lvbiAxNTg3NjEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XZWJLaXQyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2 LDYgKzI2LDcgQEAKICNpbXBvcnQgPFdlYktpdDIvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVy Lmg+CiAjaW1wb3J0IDxXZWJLaXQyL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAuaD4KICNpbXBvcnQg PFdlYktpdDIvV0tCcm93c2luZ0NvbnRleHRMb2FkRGVsZWdhdGUuaD4KKyNpbXBvcnQgPFdlYktp dDIvV0tCcm93c2luZ0NvbnRleHRQb2xpY3lEZWxlZ2F0ZS5oPgogI2ltcG9ydCA8V2ViS2l0Mi9X S0Nvbm5lY3Rpb24uaD4KICNpbXBvcnQgPFdlYktpdDIvV0tGb3VuZGF0aW9uLmg+CiAjaW1wb3J0 IDxXZWJLaXQyL1dLUHJvY2Vzc0dyb3VwLmg+CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQy Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNTg3NjEpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcg Y29weSkKQEAgLTY2NSw2ICs2NjUsNyBAQAogCQk3QzNGOEM5MDE3M0FGNTJEMDA3QjdGMzkgLyog UGx1Z2luSW5mb3JtYXRpb24uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gN0MzRjhDOEUxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0aW9u LmNwcCAqLzsgfTsKIAkJN0MzRjhDOTExNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0 aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QzNG OEM4RjE3M0FGNTJEMDA3QjdGMzkgLyogUGx1Z2luSW5mb3JtYXRpb24uaCAqLzsgfTsKIAkJN0M2 RDM3RkMxNzJGNTU1RjAwOUQyODQ3IC8qIFBhZ2VCYW5uZXJNYWMubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QzZEMzdGQTE3MkY1NTVGMDA5RDI4NDcg LyogUGFnZUJhbm5lck1hYy5tbSAqLzsgfTsKKwkJN0NBMjU0RUIxODI5OTNDRTAwRkM4QTQxIC8q IFdLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVsZWdhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDQTI1NEVBMTgyOTkzQ0UwMEZDOEE0MSAvKiBXS0Jy b3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMg PSAoUHVibGljLCApOyB9OyB9OwogCQk3Q0IxNkZFRjE3MjRCQTIzMDA3QTBBOTUgLyogY29tLmFw cGxlLmlzdC5kcy5hcHBsZWNvbm5lY3Qud2VicGx1Z2luLnNiIGluIENvcHkgUGx1Zy1pbiBTYW5k Ym94IFByb2ZpbGVzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDQjE2RkUy MTcyNEI5QjUwMDdBMEE5NSAvKiBjb20uYXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVn aW4uc2IgKi87IH07CiAJCTdDQjE2RkYwMTcyNEJBMjQwMDdBMEE5NSAvKiBjb20uYXBwbGUuUXVp Y2tUaW1lIFBsdWdpbi5wbHVnaW4uc2IgaW4gQ29weSBQbHVnLWluIFNhbmRib3ggUHJvZmlsZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NCMTZGRTMxNzI0QjlCNTAwN0Ew QTk1IC8qIGNvbS5hcHBsZS5RdWlja1RpbWUgUGx1Z2luLnBsdWdpbi5zYiAqLzsgfTsKIAkJN0NC MTZGRjExNzI0QkEyNjAwN0EwQTk1IC8qIGNvbS5hcHBsZS5XZWJLaXQucGx1Z2luLWNvbW1vbi5z YiBpbiBDb3B5IFBsdWctaW4gU2FuZGJveCBQcm9maWxlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3Q0IxNkZFNDE3MjRCOUI1MDA3QTBBOTUgLyogY29tLmFwcGxlLldlYktp dC5wbHVnaW4tY29tbW9uLnNiICovOyB9OwpAQCAtMjE5NSw2ICsyMTk2LDcgQEAKIAkJN0MzRjhD OEUxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0aW9uLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpbkluZm9ybWF0aW9uLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0MzRjhDOEYxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbklu Zm9ybWF0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkluZm9y bWF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDNkQzN0ZBMTcyRjU1NUYw MDlEMjg0NyAvKiBQYWdlQmFubmVyTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2Jq Y3BwOyBwYXRoID0gUGFnZUJhbm5lck1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJN0NBMjU0RUExODI5OTNDRTAwRkM4QTQxIC8qIFdLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVs ZWdhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tCcm93c2luZ0NvbnRl eHRQb2xpY3lEZWxlZ2F0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0IxNkZF MjE3MjRCOUI1MDA3QTBBOTUgLyogY29tLmFwcGxlLmlzdC5kcy5hcHBsZWNvbm5lY3Qud2VicGx1 Z2luLnNiICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IGNvbS5hcHBsZS5pc3QuZHMuYXBwbGVjb25u ZWN0LndlYnBsdWdpbi5zYjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NCMTZGRTMx NzI0QjlCNTAwN0EwQTk1IC8qIGNvbS5hcHBsZS5RdWlja1RpbWUgUGx1Z2luLnBsdWdpbi5zYiAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQ7IHBhdGggPSAiY29tLmFwcGxlLlF1aWNrVGltZSBQbHVnaW4ucGx1Z2lu LnNiIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NCMTZGRTQxNzI0QjlCNTAwN0Ew QTk1IC8qIGNvbS5hcHBsZS5XZWJLaXQucGx1Z2luLWNvbW1vbi5zYiAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7 IHBhdGggPSAiY29tLmFwcGxlLldlYktpdC5wbHVnaW4tY29tbW9uLnNiIjsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKQEAgLTQ1NzcsNiArNDU3OSw3IEBACiAJCQkJQkNCQUFDRUYxNDUyMzI0 NDAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXAubW0gKi8sCiAJCQkJQkNCQUFDRjAx NDUyMzI0ODAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBQcml2YXRlLmggKi8sCiAJ CQkJQkNCQUFEMEExNDU2MEE0MzAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVn YXRlLmggKi8sCisJCQkJN0NBMjU0RUExODI5OTNDRTAwRkM4QTQxIC8qIFdLQnJvd3NpbmdDb250 ZXh0UG9saWN5RGVsZWdhdGUuaCAqLywKIAkJCQlCQ0EyODRENTE0OTJGMkM3MDAxRjkwNDIgLyog V0tDb25uZWN0aW9uLmggKi8sCiAJCQkJQkNBMjg0RDQxNDkyRjJDNzAwMUY5MDQyIC8qIFdLQ29u bmVjdGlvbi5tbSAqLywKIAkJCQlCQzVDNzVDNjE0OTU0REE2MDBCQzQ3NzUgLyogV0tDb25uZWN0 aW9uSW50ZXJuYWwuaCAqLywKQEAgLTU1MTAsNiArNTUxMyw3IEBACiAJCQkJOTNGQzY3QzAxMkQz Q0NGMjAwQTYwNjEwIC8qIEVuY29kZXJBZGFwdGVyLmggaW4gSGVhZGVycyAqLywKIAkJCQk1MUIx NUE4NTEzODQzQTM5MDAzMjFBRDggLyogRW52aXJvbm1lbnRVdGlsaXRpZXMuaCBpbiBIZWFkZXJz ICovLAogCQkJCTFBN0M2Q0RCMTM3ODk1MDgwMEI5QzA0RCAvKiBFbnZpcm9ubWVudFZhcmlhYmxl cy5oIGluIEhlYWRlcnMgKi8sCisJCQkJN0NBMjU0RUIxODI5OTNDRTAwRkM4QTQxIC8qIFdLQnJv d3NpbmdDb250ZXh0UG9saWN5RGVsZWdhdGUuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBQTU3NUZC MTQ5NkI1MjYwMEE0RUUwNiAvKiBFdmVudERpc3BhdGNoZXIuaCBpbiBIZWFkZXJzICovLAogCQkJ CTFBOTBDMUY0MTI2NEZENzEwMDNFNDRENCAvKiBGaW5kQ29udHJvbGxlci5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJMUE5MTAwNzExMjY2NzVDNDAwMTg0MkY1IC8qIEZpbmRJbmRpY2F0b3IuaCBpbiBI ZWFkZXJzICovLAo=