160846 2016-08-14 14:02:19 -0700 [Cocoa] Remove deprecated _WKVisitedLinkProvider declarations that aren’t needed 2016-08-14 14:47:30 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz andersca commit-queue darin sam oldest_to_newest 1219944 0 mitz 2016-08-14 14:02:19 -0700 Patch forthcoming. 1219946 1 286031 mitz 2016-08-14 14:05:03 -0700 Created attachment 286031 Remove declarations 1219947 2 commit-queue 2016-08-14 14:07:15 -0700 Attachment 286031 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:759: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1219950 3 286031 darin 2016-08-14 14:39:16 -0700 Comment on attachment 286031 Remove declarations View in context: https://bugs.webkit.org/attachment.cgi?id=286031&action=review > Source/WebKit2/ChangeLog:10 > + cateogry implementation, changed type to _WKVisitedLinkStore. Typo here in the word category. > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:38 > +#import "_WKVisitedLinkStore.h" Do we need to include this header to compile the code below? I am surprised if we do, but maybe I am missing something. > Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm:34 > +// Defined for binary compatibility with Safari in iOS 10. Seems like this comment should go before even the @interface. 1219951 4 286031 mitz 2016-08-14 14:41:52 -0700 Comment on attachment 286031 Remove declarations View in context: https://bugs.webkit.org/attachment.cgi?id=286031&action=review >> Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:38 >> +#import "_WKVisitedLinkStore.h" > > Do we need to include this header to compile the code below? I am surprised if we do, but maybe I am missing something. We need the declaration of _WKVisitedLinkStore to compile some of the code in this file which allocates an instance of that class. 1219955 5 mitz 2016-08-14 14:47:30 -0700 Committed <https://trac.webkit.org/r204454>. 286031 2016-08-14 14:05:03 -0700 2016-08-14 14:39:16 -0700 Remove declarations bug-160846-20160814140320.patch text/plain 10637 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNDQ1MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA4LTE0ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdmUgZGVwcmVj YXRlZCBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyIGRlY2xhcmF0aW9ucyB0aGF0IGFyZW7igJl0IG5l ZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYw ODQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgt W1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Zpc2l0ZWRMaW5rUHJvdmlkZXJdKTogTW92ZWQgaW50 byBXS0JpbmFyeUNvbXBhdGliaWxpdHlJT1MxMAorICAgICAgICAgIGNhdGVvZ3J5IGltcGxlbWVu dGF0aW9uLCBjaGFuZ2VkIHR5cGUgdG8gX1dLVmlzaXRlZExpbmtTdG9yZS4KKyAgICAgICAgKC1b V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBfc2V0VmlzaXRlZExpbmtQcm92aWRlcjpdKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJp dmF0ZS5oOiBSZW1vdmVkIHByb3BlcnR5IGRlY2xhcmF0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tWaXNpdGVkTGlua1Byb3ZpZGVyLmg6IFJlbW92ZWQuCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tWaXNpdGVkTGlua1Byb3ZpZGVyLm1tOiBNb3ZlZCBk ZWNsYXJhdGlvbiBpbiBoZXJlLgorCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qOiBVcGRhdGVkIGZvciBoZWFkZXIgcmVtb3ZhbC4KKwogMjAxNi0wOC0xMiAgRGFu IEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gSW5zdGFuY2Vz IG9mIFdLT2JqZWN0IHN1YmNsYXNzZXMgZG9u4oCZdCB3b3JrIGNvcnJlY3RseSB3aXRoIENGR2V0 VHlwZUlEKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Q29uZmlndXJhdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0JKHJldmlzaW9uIDIwNDI0NCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJh dGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzUsNyArMzUsNyBAQAogI2ltcG9ydCAiV0tVc2Vy Q29udGVudENvbnRyb2xsZXIuaCIKICNpbXBvcnQgIldLV2ViVmlld0NvbnRlbnRQcm92aWRlclJl Z2lzdHJ5LmgiCiAjaW1wb3J0ICJXZWFrT2JqQ1B0ci5oIgotI2ltcG9ydCAiX1dLVmlzaXRlZExp bmtQcm92aWRlci5oIgorI2ltcG9ydCAiX1dLVmlzaXRlZExpbmtTdG9yZS5oIgogI2ltcG9ydCAi X1dLV2Vic2l0ZURhdGFTdG9yZUludGVybmFsLmgiCiAjaW1wb3J0IDxXZWJDb3JlL1J1bnRpbWVB cHBsaWNhdGlvbkNoZWNrcy5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgpAQCAtMzk2LDE2 ICszOTYsNiBAQCAtICh2b2lkKV9zZXRXZWJzaXRlRGF0YVN0b3JlOihfV0tXZWJzaXRlCiAgICAg c2VsZi53ZWJzaXRlRGF0YVN0b3JlID0gd2Vic2l0ZURhdGFTdG9yZSA/IHdlYnNpdGVEYXRhU3Rv cmUtPl9kYXRhU3RvcmUuZ2V0KCkgOiBudWxscHRyOwogfQogCi0tKF9XS1Zpc2l0ZWRMaW5rUHJv dmlkZXIgKilfdmlzaXRlZExpbmtQcm92aWRlcgotewotICAgIHJldHVybiAoX1dLVmlzaXRlZExp bmtQcm92aWRlciAqKXNlbGYuX3Zpc2l0ZWRMaW5rU3RvcmU7Ci19Ci0KLS0gKHZvaWQpX3NldFZp c2l0ZWRMaW5rUHJvdmlkZXI6KF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIgKilfdmlzaXRlZExpbmtQ cm92aWRlcgotewotICAgIHNlbGYuX3Zpc2l0ZWRMaW5rU3RvcmUgPSBfdmlzaXRlZExpbmtQcm92 aWRlcjsKLX0KLQogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAogCiAjaWYgUExBVEZPUk0o SU9TKQpAQCAtNzYzLDQgKzc1MywxOCBAQCAtICh2b2lkKXNldFJlcXVpcmVzVXNlckFjdGlvbkZv ck1lZGlhUGxhCiAKIEBlbmQKIAorQGltcGxlbWVudGF0aW9uIFdLV2ViVmlld0NvbmZpZ3VyYXRp b24gKFdLQmluYXJ5Q29tcGF0aWJpbGl0eVdpdGhJT1MxMCkKKworLShfV0tWaXNpdGVkTGlua1N0 b3JlICopX3Zpc2l0ZWRMaW5rUHJvdmlkZXIKK3sKKyAgICByZXR1cm4gc2VsZi5fdmlzaXRlZExp bmtTdG9yZTsKK30KKworLSAodm9pZClfc2V0VmlzaXRlZExpbmtQcm92aWRlcjooX1dLVmlzaXRl ZExpbmtTdG9yZSAqKXZpc2l0ZWRMaW5rUHJvdmlkZXIKK3sKKyAgICBzZWxmLl92aXNpdGVkTGlu a1N0b3JlID0gdmlzaXRlZExpbmtQcm92aWRlcjsKK30KKworQGVuZAorCiAjZW5kaWYgLy8gV0tf QVBJX0VOQUJMRUQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmgJKHJl dmlzaW9uIDIwNDI0NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgs NiBAQAogI2lmIFdLX0FQSV9FTkFCTEVECiAKIEBjbGFzcyBXS1dlYlZpZXc7Ci1AY2xhc3MgX1dL VmlzaXRlZExpbmtQcm92aWRlcjsKIEBjbGFzcyBfV0tWaXNpdGVkTGlua1N0b3JlOwogQGNsYXNz IF9XS1dlYnNpdGVEYXRhU3RvcmU7CiAKQEAgLTY4LDggKzY3LDYgQEAKIEBwcm9wZXJ0eSAobm9u YXRvbWljLCByZWFkd3JpdGUsIHNldHRlcj1fc2V0UmVxdWlyZXNVc2VyQWN0aW9uRm9yRWRpdGlu Z0NvbnRyb2xzTWFuYWdlcjopIEJPT0wgX3JlcXVpcmVzVXNlckFjdGlvbkZvckVkaXRpbmdDb250 cm9sc01hbmFnZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogI2VuZGlm CiAKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCBzdHJvbmcsIHNldHRlcj1fc2V0VmlzaXRlZExpbmtQ cm92aWRlcjopIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIgKl92aXNpdGVkTGlua1Byb3ZpZGVyIFdL X0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIl92aXNpdGVkTGlua1N0b3JlIiwgbWFj b3N4KDEwLjEwLCBXS19NQUNfVEJBKSwgaW9zKDguMCwgV0tfSU9TX1RCQSkpOwotCiBAcHJvcGVy dHkgKG5vbmF0b21pYywgc3Ryb25nLCBzZXR0ZXI9X3NldFdlYnNpdGVEYXRhU3RvcmU6KSBfV0tX ZWJzaXRlRGF0YVN0b3JlICpfd2Vic2l0ZURhdGFTdG9yZSBXS19BUElfREVQUkVDQVRFRF9XSVRI X1JFUExBQ0VNRU5UKCJ3ZWJzaXRlRGF0YVN0b3JlIiwgbWFjb3N4KDEwLjEwLCAxMC4xMSksIGlv cyg4LjAsIDkuMCkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0UmVxdWlyZXNV c2VyQWN0aW9uRm9yQXVkaW9QbGF5YmFjazopIEJPT0wgX3JlcXVpcmVzVXNlckFjdGlvbkZvckF1 ZGlvUGxheWJhY2sgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgibWVkaWFUeXBl c1JlcXVpcmluZ1VzZXJBY3Rpb25Gb3JQbGF5YmFjayIsIG1hY29zeChXS19NQUNfVEJBLCBXS19N QUNfVEJBKSwgaW9zKFdLX0lPU19UQkEsIFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCBzZXR0ZXI9X3NldFJlcXVpcmVzVXNlckFjdGlvbkZvclZpZGVvUGxheWJhY2s6KSBCT09M IF9yZXF1aXJlc1VzZXJBY3Rpb25Gb3JWaWRlb1BsYXliYWNrIFdLX0FQSV9ERVBSRUNBVEVEX1dJ VEhfUkVQTEFDRU1FTlQoIm1lZGlhVHlwZXNSZXF1aXJpbmdVc2VyQWN0aW9uRm9yUGxheWJhY2si LCBtYWNvc3goV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBLCBXS19JT1Nf VEJBKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Zpc2l0 ZWRMaW5rUHJvdmlkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIuaAkocmV2aXNpb24gMjA0MjQ0KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tWaXNpdGVkTGlua1Byb3ZpZGVy LmgJKHdvcmtpbmcgY29weSkKQEAgLTEsMzQgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykg MjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0g KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4g UmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBj b3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JT IGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05U UklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCi0gKiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQotICogQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbXBvcnQg PFdlYktpdC9fV0tWaXNpdGVkTGlua1N0b3JlLmg+Ci0KLSNpZiBXS19BUElfRU5BQkxFRAotCi1X S19DTEFTU19ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIl9XS1Zpc2l0ZWRMaW5rU3RvcmUi LCBtYWNvc3goMTAuMTAsIFdLX01BQ19UQkEpLCBpb3MoOC4wLCBXS19JT1NfVEJBKSkKLUBpbnRl cmZhY2UgX1dLVmlzaXRlZExpbmtQcm92aWRlciA6IF9XS1Zpc2l0ZWRMaW5rU3RvcmUKLUBlbmQK LQotI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Zp c2l0ZWRMaW5rUHJvdmlkZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tWaXNpdGVkTGlua1Byb3ZpZGVyLm1tCShyZXZpc2lvbiAyMDQyNDQp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Zpc2l0ZWRMaW5rUHJv dmlkZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI0LDEwICsyNCwxNSBAQAogICovCiAKICNpbmNs dWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLmgiCisjaW5j bHVkZSAiX1dLVmlzaXRlZExpbmtTdG9yZS5oIgogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAorQGlu dGVyZmFjZSBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyIDogX1dLVmlzaXRlZExpbmtTdG9yZQorQGVu ZAorCisvLyBEZWZpbmVkIGZvciBiaW5hcnkgY29tcGF0aWJpbGl0eSB3aXRoIFNhZmFyaSBpbiBp T1MgMTAuCisKIEBpbXBsZW1lbnRhdGlvbiBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyCiBAZW5kCiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oJKHJldmlzaW9uIDIwNDI0NCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTY0LDcgKzE2NCw2IEBACiAJ CTFBMUZFQzFDMTYyN0I0NTcwMDcwMEY2RCAvKiBXZWJDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVy LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMUZF QzFBMTYyN0I0NTYwMDcwMEY2RCAvKiBXZWJDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCAq LzsgfTsKIAkJMUExRkVDMUQxNjI3QjQ1NzAwNzAwRjZEIC8qIFdlYkNvbm5lY3Rpb25NZXNzYWdl cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUExRkVD MUIxNjI3QjQ1NzAwNzAwRjZEIC8qIFdlYkNvbm5lY3Rpb25NZXNzYWdlcy5oICovOyB9OwogCQkx QTIwNjc5MjFCOEI5MDY2MDBDMTNDMzYgLyogX1dLVmlzaXRlZExpbmtQcm92aWRlci5tbSBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMjA2NzkwMUI4Qjkw NjYwMEMxM0MzNiAvKiBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLm1tICovOyB9OwotCQkxQTIwNjc5 MzFCOEI5MDY2MDBDMTNDMzYgLyogX1dLVmlzaXRlZExpbmtQcm92aWRlci5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyMDY3OTExQjhCOTA2NjAwQzEz QzM2IC8qIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQTIxNjFCMDExRjM3NjY0MDA4QUQwRjUgLyogTlBS dW50aW1lT2JqZWN0TWFwLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQTIxNjFBRTExRjM3NjY0MDA4QUQwRjUgLyogTlBSdW50aW1lT2JqZWN0TWFwLmgg Ki87IH07CiAJCTFBMjE2MUIxMTFGMzc2NjQwMDhBRDBGNSAvKiBOUFJ1bnRpbWVPYmplY3RNYXAu Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyMTYx QUYxMUYzNzY2NDAwOEFEMEY1IC8qIE5QUnVudGltZU9iamVjdE1hcC5jcHAgKi87IH07CiAJCTFB MjE2MkIwMTFGMzg5NzEwMDhBRDBGNSAvKiBOUFJ1bnRpbWVVdGlsaXRpZXMuY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyMTYyQUUxMUYzODk3MTAw OEFEMEY1IC8qIE5QUnVudGltZVV0aWxpdGllcy5jcHAgKi87IH07CkBAIC0yMTM0LDcgKzIxMzMs NiBAQAogCQkxQTFGRUMxQTE2MjdCNDU2MDA3MDBGNkQgLyogV2ViQ29ubmVjdGlvbk1lc3NhZ2VS ZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJDb25u ZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MUExRkVDMUIxNjI3QjQ1NzAwNzAwRjZEIC8qIFdlYkNvbm5lY3Rpb25NZXNzYWdlcy5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJDb25uZWN0aW9uTWVzc2FnZXMuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEyMDY3OTAxQjhCOTA2NjAwQzEzQzM2IC8qIF9X S1Zpc2l0ZWRMaW5rUHJvdmlkZXIubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7 IHBhdGggPSBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwotCQkxQTIwNjc5MTFCOEI5MDY2MDBDMTNDMzYgLyogX1dLVmlzaXRlZExpbmtQcm92aWRl ci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBfV0tWaXNpdGVkTGlua1Byb3Zp ZGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMjE2MUFFMTFGMzc2NjQwMDhB RDBGNSAvKiBOUFJ1bnRpbWVPYmplY3RNYXAuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gTlBSdW50aW1lT2JqZWN0TWFwLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTFBMjE2MUFGMTFGMzc2NjQwMDhBRDBGNSAvKiBOUFJ1bnRpbWVPYmplY3RNYXAuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTlBSdW50aW1lT2JqZWN0TWFwLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEyMTYyQUUxMUYzODk3MTAwOEFEMEY1IC8q IE5QUnVudGltZVV0aWxpdGllcy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBOUFJ1bnRpbWVVdGlsaXRpZXMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtNDIyOCw3ICs0MjI2LDYgQEAKIAkJMUE0M0U4MjYxODhGMzhFMjAwOUU0RDMwIC8qIERlcHJl Y2F0ZWQgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAotCQkJCTFB MjA2NzkxMUI4QjkwNjYwMEMxM0MzNiAvKiBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLmggKi8sCiAJ CQkJMUEyMDY3OTAxQjhCOTA2NjAwQzEzQzM2IC8qIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIubW0g Ki8sCiAJCQkJMUFGQjRDNkMxQURGMEM3ODAwQjMzMzM5IC8qIF9XS1dlYnNpdGVEYXRhUmVjb3Jk LmggKi8sCiAJCQkJMUFGQjRDNzAxQURGMTU1RDAwQjMzMzM5IC8qIF9XS1dlYnNpdGVEYXRhU3Rv cmUuaCAqLywKQEAgLTc0MTUsNyArNzQxMiw2IEBACiAJCQkJN0NCMzY1QUQxRDMxREMxMDAwNzE1 OENBIC8qIF9XS1VzZXJJbml0aWF0ZWRBY3Rpb25JbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJMkQ4Nzg2MUQxQkRCNTRCRjAwRDAyQUJCIC8qIF9XS1VzZXJTdHlsZVNoZWV0LmggaW4gSGVh ZGVycyAqLywKIAkJCQkyRDg3ODYyMDFCREI1N0Y1MDBEMDJBQkIgLyogX1dLVXNlclN0eWxlU2hl ZXRJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8sCi0JCQkJMUEyMDY3OTMxQjhCOTA2NjAwQzEzQzM2 IC8qIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBODFCMzgx MThCRDY2QUQwMDA3RkRBQyAvKiBfV0tWaXNpdGVkTGlua1N0b3JlLmggaW4gSGVhZGVycyAqLywK IAkJCQkxQTgxQjM4NTE4QkQ2NzNBMDAwN0ZEQUMgLyogX1dLVmlzaXRlZExpbmtTdG9yZUludGVy bmFsLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQUZCNEM2RTFBREYwQzc4MDBCMzMzMzkgLyogX1dL V2Vic2l0ZURhdGFSZWNvcmQuaCBpbiBIZWFkZXJzICovLAo=