50768 2010-12-09 10:44:03 -0800 Add a basic implementation of PDF support on Mac 2010-12-09 11:01:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 319574 0 andersca 2010-12-09 10:44:03 -0800 Add a basic implementation of PDF support on Mac 319581 1 76094 andersca 2010-12-09 10:49:49 -0800 Created attachment 76094 Patch 319585 2 webkit.review.bot 2010-12-09 10:52:53 -0800 Attachment 76094 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebKit2/ChangeLog', u'WebKit2/UIProcess/API/mac/PDFViewController.h', u'WebKit2/UIProcess/API/mac/PDFViewController.mm', u'WebKit2/UIProcess/API/mac/PageClientImpl.mm', u'WebKit2/UIProcess/API/mac/WKView.mm', u'WebKit2/UIProcess/API/mac/WKViewInternal.h', u'WebKit2/WebKit2.xcodeproj/project.pbxproj']" exit_code: 1 WebKit2/UIProcess/API/mac/PDFViewController.h:39: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 319587 3 76094 sam 2010-12-09 10:53:03 -0800 Comment on attachment 76094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76094&action=review > WebKit2/UIProcess/API/mac/PDFViewController.h:48 > + static PassOwnPtr<PDFViewController> create(WKView *wkView); Parameter name is not needed. > WebKit2/UIProcess/API/mac/PDFViewController.h:67 > +} We usually put // namespace WebKit here. > WebKit2/UIProcess/API/mac/WKView.mm:1001 > +- (void)_setPageHasCustomRepresentation:(BOOL)pageHasCustomRepresentation { { should be on the next line. > WebKit2/UIProcess/API/mac/WKView.mm:1008 > +- (void)_didFinishLoadingDataForCustomRepresentation:(const CoreIPC::DataReference&)dataReference { Same here. 319596 4 andersca 2010-12-09 11:01:05 -0800 Committed r73630: <http://trac.webkit.org/changeset/73630> 76094 2010-12-09 10:49:49 -0800 2010-12-09 10:53:03 -0800 Patch bug-50768-20101209104948.patch text/plain 18832 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NDE4MDUzYjYyMGUyYTEyNDQyZGZlYjMzOTZmNGJiMjkwZDAwODM1ZC4uMDEwNDQ4NDVhYzM5MWUz M2ZjZjc5NzBmZWEzMGU1YzBhOWVlM2Q3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1NiBAQAogMjAxMC0xMi0wOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGJhc2ljIGltcGxlbWVudGF0aW9uIG9m IFBERiBzdXBwb3J0IG9uIE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTA3NjgKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdD b250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xs ZXIubW06IEFkZGVkLgorICAgICAgICAoLVtXS1BERlZpZXcgaW5pdFdpdGhGcmFtZTpQREZWaWV3 Q29udHJvbGxlcjpXZWJLaXQ6Ol0pOgorICAgICAgICBTZXR1cCB0aGUgdmlldyBoaWVyYXJjaHku CisKKyAgICAgICAgKC1bV0tQREZWaWV3IGludmFsaWRhdGVdKToKKyAgICAgICAgU2V0IHRoZSBj b250cm9sbGVyIHRvIG51bGwuCisKKyAgICAgICAgKC1bV0tQREZWaWV3IHBkZlZpZXddKToKKyAg ICAgICAgUmV0dXJuIHRoZSBQREYgdmlldy4KKworICAgICAgICAoV2ViS2l0OjpQREZWaWV3Q29u dHJvbGxlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6OlBE RlZpZXdDb250cm9sbGVyKToKKyAgICAgICAgQ3JlYXRlIGEgV0tQREZWaWV3IGFuZCBpbnNlcnQg aXQgYXMgYSBzdWJ2aWV3IG9mIHRoZSBXS1ZpZXcuCisKKyAgICAgICAgKFdlYktpdDo6UERGVmll d0NvbnRyb2xsZXI6On5QREZWaWV3Q29udHJvbGxlcik6CisgICAgICAgIFJlbW92ZSB0aGUgV0tQ REZWaWV3IGZyb20gdGhlIHZpZXcgaGllcmFyY2h5IGFuZCBpbnZhbGlkYXRlIGl0LgorCisgICAg ICAgIChXZWJLaXQ6OmNvbnZlcnRQb3N0U2NyaXB0RGF0YVNvdXJjZVRvUERGKToKKyAgICAgICAg Q29udmVydCB0aGUgZGF0YSBpbiB0aGUgZGF0YSByZWZlcmVuY2UgdG8gUERGIGFuZCByZXR1cm4g aXQgYXMgYSBDRkRhdGFSZWYuCisKKyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6 OnNldFBERkRvY3VtZW50RGF0YSk6CisgICAgICAgIENyZWF0ZSBhIFBERkRvY3VtZW50IGFuZCBz ZXQgaXQgb24gdGhlIFBERiB2aWV3LgorCisgICAgICAgIChXZWJLaXQ6OlBERlZpZXdDb250cm9s bGVyOjpwZGZEb2N1bWVudENsYXNzKToKKyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xs ZXI6OnBkZlByZXZpZXdWaWV3Q2xhc3MpOgorICAgICAgICAoV2ViS2l0OjpQREZWaWV3Q29udHJv bGxlcjo6cGRmS2l0QnVuZGxlKToKKyAgICAgICAgQWRkIHNvZnQtbGlua2luZyBoZWxwZXIgZnVu Y3Rpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW06 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRDb21taXRMb2FkRm9yTWFpbkZy YW1lKToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmRpZEZpbmlzaExvYWRpbmdE YXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb24pOgorICAgICAgICBDYWxsIHRoZSBXS1ZpZXcgbWV0 aG9kcy4KKyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgor ICAgICAgICAoLVtXS1ZpZXcgX3NldFBhZ2VIYXNDdXN0b21SZXByZXNlbnRhdGlvbjpdKToKKyAg ICAgICAgQ3JlYXRlIGEgUERGIHZpZXcgY29udHJvbGxlciBpZiBuZWNlc3NhcnkuCisKKyAgICAg ICAgKC1bV0tWaWV3IF9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9u OkNvcmVJUEM6Ol0pOgorICAgICAgICBQYXNzIHRoZSBkYXRhIGFsb25nIHRvIHRoZSBQREYgdmll dyBjb250cm9sbGVyLgorCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICBBZGQgbmV3IGZpbGVzLgorCisyMDEwLTEyLTA5ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5p Zy4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgY3VzdG9tIHJlcHJlc2VudGF0aW9uCmRpZmYg LS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLmggYi9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLmgKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u MjcxZjcyZWZjMzc5ZTJhNzU1MTc4ZmUzNmE5OGE3ZjZiZjg1YjhjNwotLS0gL2Rldi9udWxsCisr KyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIuaApAQCAtMCww ICsxLDY5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoK KyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZP UiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBI T1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4K KyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0Ug T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBQREZWaWV3Q29udHJvbGxlcl9oCisjZGVm aW5lIFBERlZpZXdDb250cm9sbGVyX2gKKworI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CisjaW5j bHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNp bmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisKK0BjbGFzcyBQREZWaWV3OworQGNsYXNzIFdLVmll dzsKK0BjbGFzcyBXS1BERlZpZXc7CisKK25hbWVzcGFjZSBDb3JlSVBDIHsKKyAgICBjbGFzcyBE YXRhUmVmZXJlbmNlOworfQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgUERGVmlld0Nv bnRyb2xsZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFBERlZpZXdDb250cm9sbGVyKTsK KworcHVibGljOgorICAgIHN0YXRpYyBQYXNzT3duUHRyPFBERlZpZXdDb250cm9sbGVyPiBjcmVh dGUoV0tWaWV3ICp3a1ZpZXcpOworICAgIH5QREZWaWV3Q29udHJvbGxlcigpOworCisgICAgV0tW aWV3KiB3a1ZpZXcoKSBjb25zdCB7IHJldHVybiBtX3drVmlldzsgfQorICAgIHZvaWQgc2V0UERG RG9jdW1lbnREYXRhKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IENvcmVJUEM6OkRhdGFS ZWZlcmVuY2UmKTsKKworICAgIHN0YXRpYyBDbGFzcyBwZGZEb2N1bWVudENsYXNzKCk7CisgICAg c3RhdGljIENsYXNzIHBkZlByZXZpZXdWaWV3Q2xhc3MoKTsKKyAgICAKK3ByaXZhdGU6CisgICAg ZXhwbGljaXQgUERGVmlld0NvbnRyb2xsZXIoV0tWaWV3ICp3a1ZpZXcpOworCisgICAgc3RhdGlj IE5TQnVuZGxlKiBwZGZLaXRCdW5kbGUoKTsKKworICAgIFdLVmlldyogbV93a1ZpZXc7CisgICAg UmV0YWluUHRyPFdLUERGVmlldz4gbV93a1BERlZpZXc7CisgICAgUERGVmlldyogbV9wZGZWaWV3 OworfTsKKworfQorCisjZW5kaWYgLy8gUERGVmlld0NvbnRyb2xsZXJfaApkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbSBiL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0KbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDdiYjcz ZTFkZjM5N2Q4OTAwZTg2MTJiN2FiMmQxM2ViZjdmODFmYwotLS0gL2Rldi9udWxsCisrKyBiL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0KQEAgLTAsMCArMSwx ODIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor ICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisg KiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICog Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0ICJQREZWaWV3Q29udHJvbGxlci5oIgorCisjaW1w b3J0ICJEYXRhUmVmZXJlbmNlLmgiCisjaW1wb3J0IDxQREZLaXQvUERGS2l0Lmg+CisjaW1wb3J0 IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworQGNsYXNzIFBERkRvY3VtZW50OworQGNsYXNzIFBE RlZpZXc7CisKK2V4dGVybiAiQyIgTlNTdHJpbmcgKl9OU1BhdGhGb3JTeXN0ZW1GcmFtZXdvcmso TlNTdHJpbmcgKmZyYW1ld29yayk7CisgICAgCitAaW50ZXJmYWNlIFdLUERGVmlldyA6IE5TVmll dworeworICAgIFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXIqIF9wZGZWaWV3Q29udHJvbGxlcjsK KworICAgIFJldGFpblB0cjxOU1ZpZXc+IF9wZGZQcmV2aWV3VmlldzsKKyAgICBQREZWaWV3ICpf cGRmVmlldzsKK30KKworLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyYW1lIFBERlZpZXdD b250cm9sbGVyOihXZWJLaXQ6OlBERlZpZXdDb250cm9sbGVyKilwZGZWaWV3Q29udHJvbGxlcjsK Ky0gKHZvaWQpaW52YWxpZGF0ZTsKKy0gKFBERlZpZXcgKilwZGZWaWV3OworCitAZW5kCisKK0Bp bXBsZW1lbnRhdGlvbiBXS1BERlZpZXcKKworLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZy YW1lIFBERlZpZXdDb250cm9sbGVyOihXZWJLaXQ6OlBERlZpZXdDb250cm9sbGVyKilwZGZWaWV3 Q29udHJvbGxlcgoreworICAgIGlmICgoc2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOmZyYW1l XSkpIHsKKyAgICAgICAgW3NlbGYgc2V0QXV0b3Jlc2l6aW5nTWFzazpOU1ZpZXdXaWR0aFNpemFi bGUgfCBOU1ZpZXdIZWlnaHRTaXphYmxlXTsKKyAgICAKKyAgICAgICAgQ2xhc3MgcHJldmlld1Zp ZXdDbGFzcyA9IFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6OnBkZlByZXZpZXdWaWV3Q2xhc3Mo KTsKKyAgICAgICAgQVNTRVJUKHByZXZpZXdWaWV3Q2xhc3MpOworICAgICAgICAKKyAgICAgICAg X3BkZlByZXZpZXdWaWV3LmFkb3B0TlMoW1twcmV2aWV3Vmlld0NsYXNzIGFsbG9jXSBpbml0V2l0 aEZyYW1lOmZyYW1lXSk7CisgICAgICAgIFtfcGRmUHJldmlld1ZpZXcuZ2V0KCkgc2V0QXV0b3Jl c2l6aW5nTWFzazpOU1ZpZXdXaWR0aFNpemFibGUgfCBOU1ZpZXdIZWlnaHRTaXphYmxlXTsKKyAg ICAgICAgW3NlbGYgYWRkU3VidmlldzpfcGRmUHJldmlld1ZpZXcuZ2V0KCldOworCisgICAgICAg IF9wZGZWaWV3ID0gW19wZGZQcmV2aWV3Vmlldy5nZXQoKSBwZXJmb3JtU2VsZWN0b3I6QHNlbGVj dG9yKHBkZlZpZXcpXTsKKyAgICB9CisKKyAgICByZXR1cm4gc2VsZjsKK30KKworLSAodm9pZClp bnZhbGlkYXRlCit7CisgICAgX3BkZlZpZXdDb250cm9sbGVyID0gbmlsOworfQorCistIChQREZW aWV3ICopcGRmVmlldworeworICAgIHJldHVybiBfcGRmVmlldzsKK30KKworQGVuZAorCituYW1l c3BhY2UgV2ViS2l0IHsKKworUGFzc093blB0cjxQREZWaWV3Q29udHJvbGxlcj4gUERGVmlld0Nv bnRyb2xsZXI6OmNyZWF0ZShXS1ZpZXcgKndrVmlldykKK3sKKyAgICByZXR1cm4gYWRvcHRQdHIo bmV3IFBERlZpZXdDb250cm9sbGVyKHdrVmlldykpOworfQorCitQREZWaWV3Q29udHJvbGxlcjo6 UERGVmlld0NvbnRyb2xsZXIoV0tWaWV3ICp3a1ZpZXcpCisgICAgOiBtX3drVmlldyh3a1ZpZXcp CisgICAgLCBtX3drUERGVmlldyhBZG9wdE5TLCBbW1dLUERGVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpbbV93a1ZpZXcgYm91bmRzXSBQREZWaWV3Q29udHJvbGxlcjp0aGlzXSkKKyAgICAsIG1f cGRmVmlldyhbbV93a1BERlZpZXcuZ2V0KCkgcGRmVmlld10pCit7CisgICAgW21fd2tWaWV3IGFk ZFN1YnZpZXc6bV93a1BERlZpZXcuZ2V0KCldOworfQorCitQREZWaWV3Q29udHJvbGxlcjo6flBE RlZpZXdDb250cm9sbGVyKCkKK3sKKyAgICBbbV93a1BERlZpZXcuZ2V0KCkgcmVtb3ZlRnJvbVN1 cGVydmlld107CisgICAgW21fd2tQREZWaWV3LmdldCgpIGludmFsaWRhdGVdOworICAgIG1fd2tQ REZWaWV3ID0gbnVsbHB0cjsKK30KKworc3RhdGljIFJldGFpblB0cjxDRkRhdGFSZWY+IGNvbnZl cnRQb3N0U2NyaXB0RGF0YVNvdXJjZVRvUERGKGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2Um IGRhdGFSZWZlcmVuY2UpCit7CisgICAgLy8gQ29udmVydCBQb3N0U2NyaXB0IHRvIFBERiB1c2lu ZyBRdWFydHogMkQgQVBJCisgICAgLy8gaHR0cDovL2RldmVsb3Blci5hcHBsZS5jb20vZG9jdW1l bnRhdGlvbi9HcmFwaGljc0ltYWdpbmcvQ29uY2VwdHVhbC9kcmF3aW5nd2l0aHF1YXJ0ejJkL2Rx X3BzX2NvbnZlcnQvY2hhcHRlcl8xNl9zZWN0aW9uXzEuaHRtbAorICAgIAorICAgIENHUFNDb252 ZXJ0ZXJDYWxsYmFja3MgY2FsbGJhY2tzID0geyAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwIH07ICAg IAorICAgIFJldGFpblB0cjxDR1BTQ29udmVydGVyUmVmPiBjb252ZXJ0ZXIoQWRvcHRDRiwgQ0dQ U0NvbnZlcnRlckNyZWF0ZSgwLCAmY2FsbGJhY2tzLCAwKSk7CisgICAgQVNTRVJUKGNvbnZlcnRl cik7CisKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBuc0RhdGEoQWRvcHROUywgW1tOU0RhdGEgYWxs b2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6Y29uc3RfY2FzdDx1aW50OF90Kj4oZGF0YVJlZmVyZW5j ZS5kYXRhKCkpIGxlbmd0aDpkYXRhUmVmZXJlbmNlLnNpemUoKSBmcmVlV2hlbkRvbmU6Tk9dKTsg ICAKKworICAgIFJldGFpblB0cjxDR0RhdGFQcm92aWRlclJlZj4gcHJvdmlkZXIoQWRvcHRDRiwg Q0dEYXRhUHJvdmlkZXJDcmVhdGVXaXRoQ0ZEYXRhKChDRkRhdGFSZWYpbnNEYXRhLmdldCgpKSk7 CisgICAgQVNTRVJUKHByb3ZpZGVyKTsKKworICAgIFJldGFpblB0cjxDRk11dGFibGVEYXRhUmVm PiByZXN1bHQoQWRvcHRDRiwgQ0ZEYXRhQ3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCAwKSk7CisgICAgQVNTRVJUKHJlc3VsdCk7CisgICAgCisgICAgUmV0YWluUHRyPENHRGF0YUNv bnN1bWVyUmVmPiBjb25zdW1lcihBZG9wdENGLCBDR0RhdGFDb25zdW1lckNyZWF0ZVdpdGhDRkRh dGEocmVzdWx0LmdldCgpKSk7CisgICAgQVNTRVJUKGNvbnN1bWVyKTsKKyAgICAKKyAgICBDR1BT Q29udmVydGVyQ29udmVydChjb252ZXJ0ZXIuZ2V0KCksIHByb3ZpZGVyLmdldCgpLCBjb25zdW1l ci5nZXQoKSwgMCk7CisKKyAgICBpZiAoIXJlc3VsdCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAg ICByZXR1cm4gcmVzdWx0OworfQorCit2b2lkIFBERlZpZXdDb250cm9sbGVyOjpzZXRQREZEb2N1 bWVudERhdGEoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVy ZW5jZSYgZGF0YVJlZmVyZW5jZSkKK3sKKyAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBkYXRhOwor ICAgIAorICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShtaW1lVHlwZSwgImFwcGxpY2F0aW9uL3Bv c3RzY3JpcHQiKSkgeworICAgICAgICBkYXRhID0gY29udmVydFBvc3RTY3JpcHREYXRhU291cmNl VG9QREYoZGF0YVJlZmVyZW5jZSk7CisgICAgICAgIGlmICghZGF0YSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBNYWtlIHN1cmUgdG8gY29weSB0aGUgZGF0 YS4KKyAgICAgICAgZGF0YS5hZG9wdENGKENGRGF0YUNyZWF0ZSgwLCBkYXRhUmVmZXJlbmNlLmRh dGEoKSwgZGF0YVJlZmVyZW5jZS5zaXplKCkpKTsKKyAgICB9CisKKyAgICBQREZEb2N1bWVudCog cGRmRG9jdW1lbnQgPSBbW3BkZkRvY3VtZW50Q2xhc3MoKSBhbGxvY10gaW5pdFdpdGhEYXRhOihO U0RhdGEgKilkYXRhLmdldCgpXTsKKyAgICBbbV9wZGZWaWV3IHNldERvY3VtZW50OnBkZkRvY3Vt ZW50XTsKK30KKworQ2xhc3MgUERGVmlld0NvbnRyb2xsZXI6OnBkZkRvY3VtZW50Q2xhc3MoKQor eworICAgIHN0YXRpYyBDbGFzcyBwZGZEb2N1bWVudENsYXNzID0gW3BkZktpdEJ1bmRsZSgpIGNs YXNzTmFtZWQ6QCJQREZEb2N1bWVudCJdOworICAgIAorICAgIHJldHVybiBwZGZEb2N1bWVudENs YXNzOworfQorCitDbGFzcyBQREZWaWV3Q29udHJvbGxlcjo6cGRmUHJldmlld1ZpZXdDbGFzcygp Cit7CisgICAgc3RhdGljIENsYXNzIHBkZlByZXZpZXdWaWV3Q2xhc3MgPSBbcGRmS2l0QnVuZGxl KCkgY2xhc3NOYW1lZDpAIlBERlByZXZpZXdWaWV3Il07CisgICAgCisgICAgcmV0dXJuIHBkZlBy ZXZpZXdWaWV3Q2xhc3M7Cit9CisgICAgCitOU0J1bmRsZSogUERGVmlld0NvbnRyb2xsZXI6OnBk ZktpdEJ1bmRsZSgpCit7CisgICAgc3RhdGljIE5TQnVuZGxlICpwZGZLaXRCdW5kbGU7CisgICAg aWYgKHBkZktpdEJ1bmRsZSkKKyAgICAgICAgcmV0dXJuIHBkZktpdEJ1bmRsZTsKKworICAgIE5T U3RyaW5nICpwZGZLaXRQYXRoID0gW19OU1BhdGhGb3JTeXN0ZW1GcmFtZXdvcmsoQCJRdWFydHou ZnJhbWV3b3JrIikgc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6QCIvRnJhbWV3b3Jrcy9QREZLaXQu ZnJhbWV3b3JrIl07CisgICAgaWYgKCFwZGZLaXRQYXRoKSB7CisgICAgICAgIExPR19FUlJPUigi Q291bGRuJ3QgZmluZCBQREZLaXQuZnJhbWV3b3JrIik7CisgICAgICAgIHJldHVybiBuaWw7Cisg ICAgfQorCisgICAgcGRmS2l0QnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZVdpdGhQYXRoOnBkZktp dFBhdGhdOworICAgIGlmICghW3BkZktpdEJ1bmRsZSBsb2FkXSkKKyAgICAgICAgTE9HX0VSUk9S KCJDb3VsZG4ndCBsb2FkIFBERktpdC5mcmFtZXdvcmsiKTsKKyAgICByZXR1cm4gcGRmS2l0QnVu ZGxlOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0gYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1BhZ2VDbGllbnRJbXBsLm1tCmluZGV4IDU3Mjk3YTI2YjUyZjNlNjU2ZmFkZjI2MTg1YTE4 NjdlYmQxZjU5NGMuLjg4ZGE2NzM1MThiNzBhN2NlMDhiMjk1MGVhMWVmMGIwZDYzYzQ4NmYgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KKysr IGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAtMjc1LDEw ICsyNzUsMTIgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6cGFnZURpZExlYXZlQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpCiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWlu RnJhbWUoYm9vbCB1c2VDdXN0b21SZXByZXNlbnRhdGlvbikKIHsKKyAgICBbbV93a1ZpZXcgX3Nl dFBhZ2VIYXNDdXN0b21SZXByZXNlbnRhdGlvbjp1c2VDdXN0b21SZXByZXNlbnRhdGlvbl07CiB9 CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVw cmVzZW50YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpCit2b2lkIFBhZ2VDbGll bnRJbXBsOjpkaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGNvbnN0 IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGFSZWZlcmVuY2UpCiB7CisgICAgW21fd2tWaWV3 IF9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uOmRhdGFSZWZlcmVu Y2VdOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0KaW5kZXggNGY4NWM1ZjdjMzcwODY1NzUyOWQ0MmUxNzMxNjBjYmZjOGQ1MDY5Zi4uM2Zl ZTZkYTZiMGMzZDYwNTdjMjk2YzhmYTRjY2RhMGZmMWJmZmIwNSAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9XS1ZpZXcubW0KQEAgLTM0LDYgKzM0LDcgQEAKICNpbXBvcnQgIkZpbmRJbmRpY2F0b3JX aW5kb3cuaCIKICNpbXBvcnQgIkxheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eS5oIgogI2ltcG9y dCAiTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oIgorI2ltcG9ydCAiUERGVmlld0NvbnRyb2xsZXIu aCIKICNpbXBvcnQgIlBhZ2VDbGllbnRJbXBsLmgiCiAjaW1wb3J0ICJSdW5Mb29wLmgiCiAjaW1w b3J0ICJXZWJDb250ZXh0LmgiCkBAIC05Niw2ICs5Nyw4IEBAIEBwdWJsaWMKICAgICAKICAgICBI YXNoTWFwPFN0cmluZywgRWRpdENvbW1hbmRTdGF0ZT4gX21lbnVNYXA7CiAKKyAgICBPd25QdHI8 UERGVmlld0NvbnRyb2xsZXI+IF9wZGZWaWV3Q29udHJvbGxlcjsKKwogICAgIE93blB0cjxGaW5k SW5kaWNhdG9yV2luZG93PiBfZmluZEluZGljYXRvcldpbmRvdzsKICAgICAvLyBXZSBrZWVwIGhl cmUgdGhlIGV2ZW50IHdoZW4gcmVzZW5kaW5nIGl0IHRvCiAgICAgLy8gdGhlIGFwcGxpY2F0aW9u IHRvIGRpc3Rpbmd1aXNoIHRoZSBjYXNlIG9mIGEgbmV3IGV2ZW50IGZyb20gb25lIApAQCAtOTk1 LDQgKzk5OCwxNyBAQCAtICh2b2lkKV9wYWdlRGlkTGVhdmVBY2NlbGVyYXRlZENvbXBvc2l0aW5n CiB9CiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCistICh2b2lkKV9z ZXRQYWdlSGFzQ3VzdG9tUmVwcmVzZW50YXRpb246KEJPT0wpcGFnZUhhc0N1c3RvbVJlcHJlc2Vu dGF0aW9uIHsKKyAgICBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyID0gbnVsbHB0cjsKKworICAg IGlmIChwYWdlSGFzQ3VzdG9tUmVwcmVzZW50YXRpb24pCisgICAgICAgIF9kYXRhLT5fcGRmVmll d0NvbnRyb2xsZXIgPSBQREZWaWV3Q29udHJvbGxlcjo6Y3JlYXRlKHNlbGYpOworfQorCistICh2 b2lkKV9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uOihjb25zdCBD b3JlSVBDOjpEYXRhUmVmZXJlbmNlJilkYXRhUmVmZXJlbmNlIHsKKyAgICBBU1NFUlQoX2RhdGEt Pl9wZGZWaWV3Q29udHJvbGxlcik7CisKKyAgICBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyLT5z ZXRQREZEb2N1bWVudERhdGEoX2RhdGEtPl9wYWdlLT5tYWluRnJhbWUoKS0+bWltZVR5cGUoKSwg ZGF0YVJlZmVyZW5jZSk7Cit9CisKIEBlbmQKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tW aWV3SW50ZXJuYWwuaAppbmRleCBlYTcwZWI3N2NhNjJlODAxMTMwZmRlNDFlMjZmMzM5MTEwYjY1 ZmE1Li4zYzEzOTI0YWU3NmQyNDY1ZTBmNDhhNDFmZDUwZWI3NTg5ZDRlOWU0IDEwMDY0NAotLS0g YS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKKysrIGIvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCkBAIC01MSw0ICs1MSw4IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogLSAodm9pZClfcGFnZURpZEVudGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZzsKIC0gKHZvaWQpX3BhZ2VEaWRMZWF2ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmc7CiAjZW5k aWYKKworLSAodm9pZClfc2V0UGFnZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uOihCT09MKXBhZ2VI YXNDdXN0b21SZXByZXNlbnRhdGlvbjsKKy0gKHZvaWQpX2RpZEZpbmlzaExvYWRpbmdEYXRhRm9y Q3VzdG9tUmVwcmVzZW50YXRpb246KGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmKWRhdGFS ZWZlcmVuY2U7CisKIEBlbmQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qIGIvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKaW5kZXggNjQ4MzE3ZTIwZGQ3OGI5ODRiMGU3YjZmMmZjNDNlOGZiNjBhYTI2My4uMmQ0YzM0 YTE2MDI5ODgxZjI2YmZlZGRlYjdkMWE2NmMxNjQzZjE0MCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvV2ViS2l0Mi9XZWJLaXQyLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTE1OSw2ICsxNTksOCBAQAogCQkxQUFCNEE4RDEy OTZGMEEyMDAyMzk1MkYgLyogU2FuZGJveEV4dGVuc2lvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBQjRBOEMxMjk2RjBBMjAwMjM5NTJGIC8qIFNh bmRib3hFeHRlbnNpb24uaCAqLzsgfTsKIAkJMUFBQjRBQUExMjk2RjE1NDAwMjM5NTJGIC8qIFNh bmRib3hFeHRlbnNpb25NYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxQUFCNEFBOTEyOTZGMTU0MDAyMzk1MkYgLyogU2FuZGJveEV4dGVuc2lvbk1h Yy5tbSAqLzsgfTsKIAkJMUFBREU2RkYxMEQ4NTVGQzAwRDNENjNEIC8qIEFwcGxpY2F0aW9uU2Vy dmljZXMuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUFBREU2RkUxMEQ4NTVGQzAwRDNENjNEIC8qIEFwcGxpY2F0aW9uU2VydmljZXMu ZnJhbWV3b3JrICovOyB9OworCQkxQUFGMDYxNDEyQjAxMTMxMDA4RTQ5RTIgLyogUERGVmlld0Nv bnRyb2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBQUYwNjEyMTJCMDExMzEwMDhFNDlFMiAvKiBQREZWaWV3Q29udHJvbGxlci5oICovOyB9Owor CQkxQUFGMDYxNTEyQjAxMTMxMDA4RTQ5RTIgLyogUERGVmlld0NvbnRyb2xsZXIubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUFGMDYxMzEyQjAxMTMx MDA4RTQ5RTIgLyogUERGVmlld0NvbnRyb2xsZXIubW0gKi87IH07CiAJCTFBQjdENENBMTI4OEFB QTcwMENGRDA4QyAvKiBEb3dubG9hZFByb3h5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQUI3RDRDODEyODhBQUE3MDBDRkQwOEMgLyogRG93bmxvYWRQ cm94eS5oICovOyB9OwogCQkxQUI3RDRDQjEyODhBQUE3MDBDRkQwOEMgLyogRG93bmxvYWRQcm94 eS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUI3 RDRDOTEyODhBQUE3MDBDRkQwOEMgLyogRG93bmxvYWRQcm94eS5jcHAgKi87IH07CiAJCTFBQjdE NjE5MTI4OEI5RDkwMENGRDA4QyAvKiBEb3dubG9hZFByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQjdENjE3MTI4 OEI5RDkwMENGRDA4QyAvKiBEb3dubG9hZFByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsK QEAgLTc4Niw2ICs3ODgsOCBAQAogCQkxQUFCNEE4QzEyOTZGMEEyMDAyMzk1MkYgLyogU2FuZGJv eEV4dGVuc2lvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTYW5kYm94RXh0 ZW5zaW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBQUI0QUE5MTI5NkYxNTQw MDIzOTUyRiAvKiBTYW5kYm94RXh0ZW5zaW9uTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAub2JqY3BwOyBwYXRoID0gU2FuZGJveEV4dGVuc2lvbk1hYy5tbTsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJMUFBREU2RkUxMEQ4NTVGQzAwRDNENjNEIC8qIEFwcGxpY2F0aW9uU2Vy dmljZXMuZnJhbWV3b3JrICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZp bGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IG5hbWUgPSBBcHBsaWNhdGlvblNlcnZpY2VzLmZy YW1ld29yazsgcGF0aCA9IFN5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3MvQXBwbGljYXRpb25TZXJ2 aWNlcy5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSBTREtST09UOyB9OworCQkxQUFGMDYxMjEyQjAx MTMxMDA4RTQ5RTIgLyogUERGVmlld0NvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gUERGVmlld0NvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKKwkJMUFBRjA2MTMxMkIwMTEzMTAwOEU0OUUyIC8qIFBERlZpZXdDb250cm9sbGVyLm1tICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUERGVmlld0NvbnRyb2xsZXIu bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBQjdENEM4MTI4OEFBQTcwMENGRDA4 QyAvKiBEb3dubG9hZFByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IERv d25sb2FkUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFCN0Q0QzkxMjg4 QUFBNzAwQ0ZEMDhDIC8qIERvd25sb2FkUHJveHkuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gRG93bmxvYWRQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTFBQjdENUU5MTI4OEI4QzAwMENGRDA4QyAvKiBEb3dubG9hZFByb3h5Lm1lc3NhZ2Vz LmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IERvd25sb2FkUHJveHkubWVzc2FnZXMuaW47IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xOTc4LDEwICsxOTgyLDEyIEBACiAJCUJDMTEx QjQ3MTEyRjYxNjkwMDMzN0JBQiAvKiBtYWMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJ CWNoaWxkcmVuID0gKAotCQkJCUJDMTExQjRCMTEyRjYxOTIwMDMzN0JBQiAvKiBQYWdlQ2xpZW50 SW1wbC5oICovLAotCQkJCUJDMTExQjRDMTEyRjYxOTIwMDMzN0JBQiAvKiBQYWdlQ2xpZW50SW1w bC5tbSAqLywKIAkJCQkxQTkxMDEwODEyNjhDOENBMDAxODQyRjUgLyogRmluZEluZGljYXRvcldp bmRvdy5oICovLAogCQkJCTFBOTEwMTA5MTI2OEM4Q0EwMDE4NDJGNSAvKiBGaW5kSW5kaWNhdG9y V2luZG93Lm1tICovLAorCQkJCTFBQUYwNjEyMTJCMDExMzEwMDhFNDlFMiAvKiBQREZWaWV3Q29u dHJvbGxlci5oICovLAorCQkJCTFBQUYwNjEzMTJCMDExMzEwMDhFNDlFMiAvKiBQREZWaWV3Q29u dHJvbGxlci5tbSAqLywKKwkJCQlCQzExMUI0QjExMkY2MTkyMDAzMzdCQUIgLyogUGFnZUNsaWVu dEltcGwuaCAqLywKKwkJCQlCQzExMUI0QzExMkY2MTkyMDAzMzdCQUIgLyogUGFnZUNsaWVudElt cGwubW0gKi8sCiAJCQkJQkM4Njk5QjIxMTZBQURBQTAwMkE5MjVCIC8qIFdLVmlldy5oICovLAog CQkJCUJDODY5OUIzMTE2QUFEQUEwMDJBOTI1QiAvKiBXS1ZpZXcubW0gKi8sCiAJCQkJQkM4Njk5 QjQxMTZBQURBQTAwMkE5MjVCIC8qIFdLVmlld0ludGVybmFsLmggKi8sCkBAIC0yNjQ1LDYgKzI2 NTEsNyBAQAogCQkJCUJDMkQwMjE3MTJBQzQxQ0IwMEU3MzJBMyAvKiBTYW1lRG9jdW1lbnROYXZp Z2F0aW9uVHlwZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkMyRDAyMTkxMkFDNDI2QzAwRTczMkEz IC8qIFdLUGFnZUxvYWRUeXBlcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRjZBMjVGREQxMkFEQzZD QzAwREM0MENDIC8qIFdlYkRhdGFiYXNlTWFuYWdlci5oIGluIEhlYWRlcnMgKi8sCisJCQkJMUFB RjA2MTQxMkIwMTEzMTAwOEU0OUUyIC8qIFBERlZpZXdDb250cm9sbGVyLmggaW4gSGVhZGVycyAq LywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJ fTsKQEAgLTMwNTQsNiArMzA2MSw3IEBACiAJCQkJRjYzNDQ0NUMxMkE4ODVFOTAwMDYxMkQ4IC8q IFdLU2VjdXJpdHlPcmlnaW4uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJRjZBMjVGRDkxMkFEQzZC RDAwREM0MENDIC8qIFdlYkRhdGFiYXNlTWFuYWdlck1hYy5tbSBpbiBTb3VyY2VzICovLAogCQkJ CUY2QTI1RkRDMTJBREM2Q0MwMERDNDBDQyAvKiBXZWJEYXRhYmFzZU1hbmFnZXIuY3BwIGluIFNv dXJjZXMgKi8sCisJCQkJMUFBRjA2MTUxMkIwMTEzMTAwOEU0OUUyIC8qIFBERlZpZXdDb250cm9s bGVyLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0 cHJvY2Vzc2luZyA9IDA7CiAJCX07Cg==