144162 2015-04-24 14:42:10 -0700 WKPDFView does not support password-protected PDFs 2015-04-24 21:28:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton aestes ddkilzer mitz simon.fraser oldest_to_newest 1088333 0 thorton 2015-04-24 14:42:10 -0700 WKPDFView does not support password-protected PDFs 1088337 1 251576 thorton 2015-04-24 14:48:19 -0700 Created attachment 251576 Patch 1088338 2 thorton 2015-04-24 14:49:23 -0700 <rdar://problem/18411512> 1088352 3 ddkilzer 2015-04-24 15:06:04 -0700 The initial iOS EWS orange status is due to me updating the EWS to iOS 8.3. It should retry again. 1088357 4 251576 aestes 2015-04-24 15:18:21 -0700 Comment on attachment 251576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251576&action=review > Source/WebKit2/Platform/spi/ios/UIKitSPI.h:689 > +@interface UIDocumentPasswordView : UIView <UITextFieldDelegate> > + > +- (id)initWithDocumentName:(NSString *)documentName; > + > +@property (nonatomic, assign) NSObject<UIDocumentPasswordViewDelegate> *passwordDelegate; > +@property (nonatomic, readonly) UITextField *passwordField; > + > +@end I believe the convention for these SPI headers is to declare all methods and properties in a category. > Source/WebKit2/UIProcess/ios/WKPDFView.mm:735 > + if (![passwordField isEditing]) passwordField.isEditing? > Source/WebKit2/UIProcess/ios/WKPDFView.mm:742 > + UIWindow *window = [_scrollView window]; _scrollView.window? > Source/WebKit2/UIProcess/ios/WKPDFView.mm:755 > + CGPoint contentOffset = [_scrollView contentOffset]; _scrollView.contentOffset? > Source/WebKit2/UIProcess/ios/WKPDFView.mm:809 > + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("OK", "OK (PDF password failure alert)", "OK button label in PDF password failure alert") style:UIAlertActionStyleDefault handler:^(UIAlertAction *) { }]; Not that it matters here since you don't capture anything, but you could use a lambda instead of a block. 1088361 5 251576 aestes 2015-04-24 15:37:01 -0700 Comment on attachment 251576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251576&action=review > Source/WebKit2/UIProcess/ios/WKPDFView.mm:801 > + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardDidShowNotification object:nil]; Are you sure that this will always be called before a WKPDFView is deallocated? Should this be done in -dealloc as well? 1088413 6 thorton 2015-04-24 16:57:00 -0700 http://trac.webkit.org/changeset/183293 1088475 7 ddkilzer 2015-04-24 21:28:37 -0700 (In reply to comment #6) > http://trac.webkit.org/changeset/183293 Build fix: <http://trac.webkit.org/changeset/183296> 251576 2015-04-24 14:48:19 -0700 2015-04-24 15:18:21 -0700 Patch bug-144162-20150424144714.patch text/plain 13862 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNjY2FiZWNiZjMwNTgy NmE2Nzk1NzdlYTgzNDkzYzBjOGYyODA5ZS4uM2ZjZTllNDJmMGRkMDliYjQyZTVkNzE1NzA3OTc5 MzFlOWQ2NGQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTI0ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFdLUERGVmlldyBk b2VzIG5vdCBzdXBwb3J0IHBhc3N3b3JkLXByb3RlY3RlZCBQREZzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQxNjIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE4NDExNTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzOgorICAgICAgICBB ZGQgc29tZSBsb2NhbGl6YWJsZSBzdHJpbmdzLgorCiAyMDE1LTA0LTIzICBSb2dlciBGb25nICA8 cm9nZXJfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gTWlzc2VkIGEgYnV0 dG9uIGluIHIxODI5MDAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzFiNWIxYzIyOTdiZjAyYjIwYjYwODgzOGZl NWM5MmI0MTEwYjk1OS4uMWQ1ZGJjNWQ4YTFhYmI2NTFjNTljY2NiMWNjNWUxZTU0NGJiNGRlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE1LTA0LTI0ICBUaW0gSG9ydG9uICA8dGlt b3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFdLUERGVmlldyBkb2VzIG5vdCBzdXBw b3J0IHBhc3N3b3JkLXByb3RlY3RlZCBQREZzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQxNjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4NDEx NTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog UGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oOgorICAgICAgICBBZGQgc29tZSBTUEkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tQREZWaWV3Lm1tOgorICAgICAgICAoLVtXS1BERlZpZXcgX2RpZExvYWRQREZEb2N1bWVu dF0pOgorICAgICAgICAoLVtXS1BERlZpZXcgd2ViX3NldENvbnRlbnRQcm92aWRlckRhdGE6c3Vn Z2VzdGVkRmlsZW5hbWU6XSk6CisgICAgICAgIE1vdmUgY3JlYXRpb24gb2YgdGhlIFVJUERGRG9j dW1lbnQgKG9ubHkgcG9zc2libGUgaWYgdGhlIENHUERGRG9jdW1lbnQgaXMgdW5sb2NrZWQpCisg ICAgICAgIGFuZCBpbml0aWFsIHNldHVwIG9mIHRoZSBwYWdlIHZpZXdzIG91dCBpbnRvIF9kaWRM b2FkUERGRG9jdW1lbnQuCisKKyAgICAgICAgSWYgdGhlIENHUERGRG9jdW1lbnQgaXMgbG9ja2Vk LCB3ZSdsbCBzaG93IHNvbWUgVUkgdG8gdW5sb2NrIGl0OyBvdGhlcndpc2UKKyAgICAgICAgd2Un bGwgY29udGludWUgb24gdG8gX2RpZExvYWRQREZEb2N1bWVudCBhcyBwcmV2aW91c2x5LgorCisg ICAgICAgICgtW1dLUERGVmlldyB3ZWJfc2V0TWluaW11bVNpemU6XSk6CisgICAgICAgIFJlc2l6 ZSB0aGUgcGFzc3dvcmQgVUkgaW5zdGVhZCBvZiB0aGUgUERGIHBhZ2VzIGlmIHdlIGhhdmUgaXQu CisKKyAgICAgICAgKC1bV0tQREZWaWV3IF9jb21wdXRlUGFnZUFuZERvY3VtZW50RnJhbWVzXSk6 CisgICAgICAgIERvbid0IGJvdGhlciBkb2luZyBhbnkgd29yayByZXZhbGlkYXRpbmcgUERGIHBh Z2VzIGlmIHRoZSBkb2N1bWVudCBpcyBsb2NrZWQuCisKKyAgICAgICAgKC1bV0tQREZWaWV3IF91 cGRhdGVQYXNzd29yZEVudHJ5RmllbGRdKToKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgdGhlIFVJ RG9jdW1lbnRQYXNzd29yZCB2aWV3IGlzIGFsd2F5cyB0aGUgc2l6ZSBvZiB0aGUgc2Nyb2xsdmll dy4KKyAgICAgICAgVGhpcyB0YWtlcyBjYXJlIG9mIHJvdGF0aW9uLgorCisgICAgICAgICgtW1dL UERGVmlldyBfa2V5Ym9hcmREaWRTaG93Ol0pOgorICAgICAgICBNYWtlIHN1cmUgdGhhdCB3ZSBz Y3JvbGwgdGhlIHBhc3N3b3JkIGZpZWxkIGFyb3VuZCwgaWYgbmVjZXNzYXJ5LCB0byBrZWVwIGl0 CisgICAgICAgIG9uIHNjcmVlbiB3aGVuIGVkaXRpbmcgYmVnaW5zLgorCisgICAgICAgICgtW1dL UERGVmlldyBfc2hvd1Bhc3N3b3JkRW50cnlGaWVsZF0pOgorICAgICAgICAoLVtXS1BERlZpZXcg X2hpZGVQYXNzd29yZEVudHJ5RmllbGRdKToKKyAgICAgICAgQWRqdXN0IHRoZSBiYWNrZ3JvdW5k IGNvbG9yICh0byBtYXRjaCB0aGUgVUlEb2N1bWVudFBhc3N3b3JkVmlldykgYW5kIGRpc2FibGUg em9vbWluZworICAgICAgICB3aGlsZSBpdCdzIHVwLiBUaGUgVUlEb2N1bWVudFBhc3N3b3JkIHZp ZXcgaXMgaW5zdGFsbGVkIGludG8gdGhlIHNjcm9sbCB2aWV3CisgICAgICAgIHRvIG1hdGNoIFVJ V2ViVmlldyBiZWhhdmlvci4KKworICAgICAgICAoLVtXS1BERlZpZXcgdXNlckRpZEVudGVyUGFz c3dvcmQ6Zm9yUGFzc3dvcmRWaWV3Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgZGlkQmVnaW5F ZGl0aW5nUGFzc3dvcmQ6aW5WaWV3Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgZGlkRW5kRWRp dGluZ1Bhc3N3b3JkOmluVmlldzpdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IF9kaWRGYWlsVG9V bmxvY2tdKToKKyAgICAgICAgUG9wIHVwIGEgZGlhbG9nIGluZm9ybWluZyB0aGUgdXNlciB0aGF0 IHRoZXkgZW50ZXJlZCB0aGUgd3JvbmcgcGFzc3dvcmQuCisKKyAgICAgICAgKC1bV0tQREZWaWV3 IF90cnlUb1VubG9ja1dpdGhQYXNzd29yZDpdKToKKyAgICAgICAgVHJ5IHRvIHVubG9jayB0aGUg ZG9jdW1lbnQuIElmIGl0IHN1Y2NlZWRzLCBoaWRlIHRoZSB1bmxvY2sgVUkgYW5kIGdvIGJhY2sg dG8KKyAgICAgICAgX2RpZExvYWRQREZEb2N1bWVudC4KKwogMjAxNS0wNC0yMiAgQWxleGV5IFBy b3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBXZWJLaXQgc2Vydmlj ZXMgc2hvdWxkIGluaGVyaXQgZW52aXJvbm1lbnQgdmFyaWFibGVzIGZvciBob21lCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9T b3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKaW5kZXggY2Zl YzMwMDYzNzI4MjI4Y2FiMGY4NTJjNTg1MGMzZjdmNDU0ODYxZC4uNDJiNWVlMjVmMGVmNzc3NDVl M2MyZGYzNzJmN2Y1MmQ5MmU0NzZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlz aC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gu bHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwpAQCAtMTEwOCwzICsxMTA4LDggQEAKIC8qIGFjY2Vz c2liaWxpdHkgbGFiZWwgZm9yIHZpZGVvIGVsZW1lbnQgY29udHJvbGxlciAqLwogInZpZGVvIHBs YXliYWNrIiA9ICJ2aWRlbyBwbGF5YmFjayI7CiAKKy8qIFBERiBwYXNzd29yZCBmYWlsdXJlIGFs ZXJ0IG1lc3NhZ2UgKi8KKyJUaGUgZG9jdW1lbnQgY291bGQgbm90IGJlIG9wZW5lZCB3aXRoIHRo YXQgcGFzc3dvcmQuIiA9ICJUaGUgZG9jdW1lbnQgY291bGQgbm90IGJlIG9wZW5lZCB3aXRoIHRo YXQgcGFzc3dvcmQuIjsKKworLyogT0sgYnV0dG9uIGxhYmVsIGluIFBERiBwYXNzd29yZCBmYWls dXJlIGFsZXJ0ICovCisiT0sgKFBERiBwYXNzd29yZCBmYWlsdXJlIGFsZXJ0KSIgPSAiT0siOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIv U291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IGViZjE1OGIx OGI5ZDk4N2U4Y2Y2N2UxNjVlN2RmYmJmMDJiOWJkZjMuLjUxN2IyMjY5OWNkZmQxMTU3NjZlMDI1 ZGU2NTM1YzgxNGIwZTZkOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3Nw aS9pb3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJ S2l0U1BJLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNpbXBvcnQgPFVJS2l0L1VJQmFyQnV0dG9uSXRl bV9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSURhdGVQaWNrZXJfUHJpdmF0ZS5oPgogI2lt cG9ydCA8VUlLaXQvVUlEZXZpY2VfUHJpdmF0ZS5oPgorI2ltcG9ydCA8VUlLaXQvVUlEb2N1bWVu dFBhc3N3b3JkVmlldy5oPgogI2ltcG9ydCA8VUlLaXQvVUlGb250X1ByaXZhdGUuaD4KICNpbXBv cnQgPFVJS2l0L1VJR2VvbWV0cnlfUHJpdmF0ZS5oPgogI2ltcG9ydCA8VUlLaXQvVUlHZXN0dXJl UmVjb2duaXplcl9Qcml2YXRlLmg+CkBAIC02NzYsNiArNjc3LDMwIEBAIHR5cGVkZWYgZW51bSB7 CiBAcHJvcGVydHkgKG5vbmF0b21pYywgYXNzaWduLCBzZXR0ZXIgPSBfc2V0SWdub3JlQXBwbGlj YXRpb25FbnRpdGxlbWVudEZvckltcG9ydDosIGdldHRlciA9IF9pZ25vcmVBcHBsaWNhdGlvbkVu dGl0bGVtZW50Rm9ySW1wb3J0KSBCT09MIF9pZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9y SW1wb3J0OwogQGVuZAogCitAcHJvdG9jb2wgVUlEb2N1bWVudFBhc3N3b3JkVmlld0RlbGVnYXRl OworCitAaW50ZXJmYWNlIFVJRG9jdW1lbnRQYXNzd29yZFZpZXcgOiBVSVZpZXcgPFVJVGV4dEZp ZWxkRGVsZWdhdGU+CisKKy0gKGlkKWluaXRXaXRoRG9jdW1lbnROYW1lOihOU1N0cmluZyAqKWRv Y3VtZW50TmFtZTsKKworQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbikgTlNPYmplY3Q8VUlE b2N1bWVudFBhc3N3b3JkVmlld0RlbGVnYXRlPiAqcGFzc3dvcmREZWxlZ2F0ZTsKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgVUlUZXh0RmllbGQgKnBhc3N3b3JkRmllbGQ7CisKK0Bl bmQKKworQHByb3RvY29sIFVJRG9jdW1lbnRQYXNzd29yZFZpZXdEZWxlZ2F0ZQorCitAcmVxdWly ZWQKKworLSAodm9pZCl1c2VyRGlkRW50ZXJQYXNzd29yZDooTlNTdHJpbmcgKilwYXNzd29yZCBm b3JQYXNzd29yZFZpZXc6KFVJRG9jdW1lbnRQYXNzd29yZFZpZXcgKilwYXNzd29yZFZpZXc7CisK K0BvcHRpb25hbAorCistICh2b2lkKWRpZEJlZ2luRWRpdGluZ1Bhc3N3b3JkOihVSVRleHRGaWVs ZCAqKXBhc3N3b3JkRmllbGQgaW5WaWV3OihVSURvY3VtZW50UGFzc3dvcmRWaWV3ICopcGFzc3dv cmRWaWV3OworLSAodm9pZClkaWRFbmRFZGl0aW5nUGFzc3dvcmQ6KFVJVGV4dEZpZWxkICopcGFz c3dvcmRGaWVsZCBpblZpZXc6KFVJRG9jdW1lbnRQYXNzd29yZFZpZXcgKilwYXNzd29yZFZpZXc7 CisKK0BlbmQKKwogI2VuZGlmIC8vIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAKIEBpbnRlcmZh Y2UgVUlWaWV3IChJUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLUERGVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaApp bmRleCBkODNkOWZmMDA3MjE0MzdlZjc5YmZiYjJhNzM3NzhiN2MxNDVjMTdiLi4zY2Q5OTAwODBh OGE0YjZiMTkzNDUzNTMwYTY2OTdmMDRiMTdlZjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tQREZWaWV3LmgKQEAgLTI2LDExICsyNiwxMSBAQAogI2lmIFBMQVRGT1JNKElPUykK IAogI2ltcG9ydCAiQ29yZVBERlNQSS5oIgorI2ltcG9ydCAiVUlLaXRTUEkuaCIKICNpbXBvcnQg IldLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaCIKICNpbXBvcnQgIldLV2ViVmlld0NvbnRlbnRQcm92 aWRlci5oIgotI2ltcG9ydCA8VUlLaXQvVUlWaWV3Lmg+CiAKLUBpbnRlcmZhY2UgV0tQREZWaWV3 IDogVUlWaWV3IDxXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIsIFVJUERGUGFnZVZpZXdEZWxlZ2F0 ZSwgVUlQREZBbm5vdGF0aW9uQ29udHJvbGxlckRlbGVnYXRlLCBXS0FjdGlvblNoZWV0QXNzaXN0 YW50RGVsZWdhdGU+CitAaW50ZXJmYWNlIFdLUERGVmlldyA6IFVJVmlldyA8V0tXZWJWaWV3Q29u dGVudFByb3ZpZGVyLCBVSVBERlBhZ2VWaWV3RGVsZWdhdGUsIFVJUERGQW5ub3RhdGlvbkNvbnRy b2xsZXJEZWxlZ2F0ZSwgV0tBY3Rpb25TaGVldEFzc2lzdGFudERlbGVnYXRlLCBVSURvY3VtZW50 UGFzc3dvcmRWaWV3RGVsZWdhdGU+CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkg TlNTdHJpbmcgKnN1Z2dlc3RlZEZpbGVuYW1lOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5KSBDR1BERkRvY3VtZW50UmVmIHBkZkRvY3VtZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLUERGVmlldy5tbQppbmRleCBkNDk0OTU3Mjc5NmY5NjNlYTc0NmNhMmYxY2YyYWI5 NTRkMDQ2NGJhLi5hM2YzMmFkNDE2ZTI5NzY0YzhjZTI4M2JmYTMxY2VjOWU1OTE0ZDBhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtNDAsNiArNDAsNyBA QAogI2ltcG9ydCAiX1dLRmluZERlbGVnYXRlLmgiCiAjaW1wb3J0IDxNb2JpbGVDb3JlU2Vydmlj ZXMvVVRDb3JlVHlwZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvRmxvYXRSZWN0Lmg+CisjaW1wb3J0 IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K ICNpbXBvcnQgPHd0Zi9WZWN0b3IuaD4KIApAQCAtNDksNiArNTAsOCBAQCBjb25zdCBDR0Zsb2F0 IHBkZlBhZ2VNYXJnaW4gPSA4OwogY29uc3QgQ0dGbG9hdCBwZGZNaW5pbXVtWm9vbVNjYWxlID0g MTsKIGNvbnN0IENHRmxvYXQgcGRmTWF4aW11bVpvb21TY2FsZSA9IDU7CiAKK2NvbnN0IENHRmxv YXQgcGFzc3dvcmRFbnRyeUZpZWxkUGFkZGluZyA9IDEwOworCiBjb25zdCBmbG9hdCBvdmVyZHJh d0hlaWdodE11bHRpcGxpZXIgPSAxLjU7CiAKIHN0YXRpYyBjb25zdCBDR0Zsb2F0IHNtYXJ0TWFn bmlmaWNhdGlvbkVsZW1lbnRQYWRkaW5nID0gMC4wNTsKQEAgLTY1LDEwICs2OCwxMyBAQCB0eXBl ZGVmIHN0cnVjdCB7CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXS1BERlZpZXcgeworICAgIFJl dGFpblB0cjxDR1BERkRvY3VtZW50UmVmPiBfY2dQREZEb2N1bWVudDsKICAgICBSZXRhaW5QdHI8 VUlQREZEb2N1bWVudD4gX3BkZkRvY3VtZW50OwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX3N1 Z2dlc3RlZEZpbGVuYW1lOwogICAgIFJldGFpblB0cjxXS1BERlBhZ2VOdW1iZXJJbmRpY2F0b3I+ IF9wYWdlTnVtYmVySW5kaWNhdG9yOwogCisgICAgUmV0YWluUHRyPFVJRG9jdW1lbnRQYXNzd29y ZFZpZXc+IF9wYXNzd29yZFZpZXc7CisKICAgICBWZWN0b3I8UERGUGFnZUluZm8+IF9wYWdlczsK ICAgICB1bnNpZ25lZCBfY2VudGVyUGFnZU51bWJlcjsKIApAQCAtMTUyLDYgKzE1OCwxNyBAQCB0 eXBlZGVmIHN0cnVjdCB7CiAgICAgX3BhZ2VzLmNsZWFyKCk7CiB9CiAKKy0gKHZvaWQpX2RpZExv YWRQREZEb2N1bWVudAoreworICAgIF9wZGZEb2N1bWVudCA9IGFkb3B0TlMoW1tVSVBERkRvY3Vt ZW50IGFsbG9jXSBpbml0V2l0aENHUERGRG9jdW1lbnQ6X2NnUERGRG9jdW1lbnQuZ2V0KCldKTsK KworICAgIC8vIEZJWE1FOiBSZXN0b3JlIHRoZSBzY3JvbGwgcG9zaXRpb24gYW5kIHBhZ2Ugc2Nh bGUgaWYgbmF2aWdhdGluZyBmcm9tIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KKworICAgIFtzZWxm IF9jb21wdXRlUGFnZUFuZERvY3VtZW50RnJhbWVzXTsKKyAgICBbc2VsZiBfcmV2YWxpZGF0ZVZp ZXdzXTsKKyAgICBbc2VsZiBfc2Nyb2xsVG9GcmFnbWVudDpfd2ViVmlldy5VUkwuZnJhZ21lbnRd OworfQorCiAtICh2b2lkKXdlYl9zZXRDb250ZW50UHJvdmlkZXJEYXRhOihOU0RhdGEgKilkYXRh IHN1Z2dlc3RlZEZpbGVuYW1lOihOU1N0cmluZyAqKWZpbGVuYW1lCiB7CiAgICAgX3N1Z2dlc3Rl ZEZpbGVuYW1lID0gYWRvcHROUyhbZmlsZW5hbWUgY29weV0pOwpAQCAtMTU5LDE4ICsxNzYsMjYg QEAgdHlwZWRlZiBzdHJ1Y3QgewogICAgIFtzZWxmIF9jbGVhclBhZ2VzXTsKIAogICAgIFJldGFp blB0cjxDR0RhdGFQcm92aWRlclJlZj4gZGF0YVByb3ZpZGVyID0gYWRvcHRDRihDR0RhdGFQcm92 aWRlckNyZWF0ZVdpdGhDRkRhdGEoKENGRGF0YVJlZilkYXRhKSk7Ci0gICAgUmV0YWluUHRyPENH UERGRG9jdW1lbnRSZWY+IGNnUERGRG9jdW1lbnQgPSBhZG9wdENGKENHUERGRG9jdW1lbnRDcmVh dGVXaXRoUHJvdmlkZXIoZGF0YVByb3ZpZGVyLmdldCgpKSk7Ci0gICAgX3BkZkRvY3VtZW50ID0g YWRvcHROUyhbW1VJUERGRG9jdW1lbnQgYWxsb2NdIGluaXRXaXRoQ0dQREZEb2N1bWVudDpjZ1BE RkRvY3VtZW50LmdldCgpXSk7CisgICAgX2NnUERGRG9jdW1lbnQgPSBhZG9wdENGKENHUERGRG9j dW1lbnRDcmVhdGVXaXRoUHJvdmlkZXIoZGF0YVByb3ZpZGVyLmdldCgpKSk7CiAKLSAgICAvLyBG SVhNRTogcmVzdG9yZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFuZCBwYWdlIHNjYWxlIGlmIG5hdmln YXRpbmcgZnJvbSB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCisgICAgaWYgKCFfY2dQREZEb2N1bWVu dCkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgW3NlbGYgX2NvbXB1dGVQYWdlQW5kRG9jdW1lbnRG cmFtZXNdOwotICAgIFtzZWxmIF9yZXZhbGlkYXRlVmlld3NdOwotICAgIFtzZWxmIF9zY3JvbGxU b0ZyYWdtZW50Ol93ZWJWaWV3LlVSTC5mcmFnbWVudF07CisgICAgaWYgKENHUERGRG9jdW1lbnRJ c1VubG9ja2VkKF9jZ1BERkRvY3VtZW50LmdldCgpKSkgeworICAgICAgICBbc2VsZiBfZGlkTG9h ZFBERkRvY3VtZW50XTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFtzZWxmIF9zaG93 UGFzc3dvcmRFbnRyeUZpZWxkXTsKIH0KIAogLSAodm9pZCl3ZWJfc2V0TWluaW11bVNpemU6KENH U2l6ZSlzaXplCiB7CisgICAgaWYgKF9wYXNzd29yZFZpZXcpIHsKKyAgICAgICAgW3NlbGYgX3Vw ZGF0ZVBhc3N3b3JkRW50cnlGaWVsZF07CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBf bWluaW11bVNpemUgPSBzaXplOwogCiAgICAgQ0dGbG9hdCBvbGREb2N1bWVudExlZnRGcmFjdGlv biA9IDA7CkBAIC0zMjgsNiArMzUzLDkgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAtICh2b2lkKV9j b21wdXRlUGFnZUFuZERvY3VtZW50RnJhbWVzCiB7CisgICAgaWYgKF9wYXNzd29yZFZpZXcpCisg ICAgICAgIHJldHVybjsKKwogICAgIE5TVUludGVnZXIgcGFnZUNvdW50ID0gW19wZGZEb2N1bWVu dCBudW1iZXJPZlBhZ2VzXTsKICAgICBbX3BhZ2VOdW1iZXJJbmRpY2F0b3Igc2V0UGFnZUNvdW50 OnBhZ2VDb3VudF07CiAgICAgCkBAIC02OTMsNiArNzIxLDExMCBAQCBzdGF0aWMgTlNTdHJpbmdD b21wYXJlT3B0aW9ucyBzdHJpbmdDb21wYXJlT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyBvcHRpb25z KQogICAgIHJldHVybiBfd2ViVmlldy0+X3BhZ2UtPnVpQ2xpZW50KCkuYWN0aW9uc0ZvckVsZW1l bnQoZWxlbWVudCwgV1RGOjptb3ZlKGRlZmF1bHRBY3Rpb25zKSk7CiB9CiAKKyNwcmFnbWEgbWFy ayBQYXNzd29yZCBwcm90ZWN0aW9uIFVJCisKKy0gKHZvaWQpX3VwZGF0ZVBhc3N3b3JkRW50cnlG aWVsZAoreworICAgIFtfcGFzc3dvcmRWaWV3IHNldEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgX3dl YlZpZXcuYm91bmRzLnNpemUud2lkdGgsIF93ZWJWaWV3LmJvdW5kcy5zaXplLmhlaWdodCldOwor ICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50U2l6ZTpbX3Bhc3N3b3JkVmlldyBib3VuZHNdLnNp emVdOworfQorCistICh2b2lkKV9rZXlib2FyZERpZFNob3c6KE5TTm90aWZpY2F0aW9uICopbm90 aWZpY2F0aW9uCit7CisgICAgVUlUZXh0RmllbGQgKnBhc3N3b3JkRmllbGQgPSBbX3Bhc3N3b3Jk VmlldyBwYXNzd29yZEZpZWxkXTsKKyAgICBpZiAoIVtwYXNzd29yZEZpZWxkIGlzRWRpdGluZ10p CisgICAgICAgIHJldHVybjsKKworICAgIENHUmVjdCBrZXlib2FyZFJlY3QgPSBbVUlQZXJpcGhl cmFsSG9zdCB2aXNpYmxlUGVyaXBoZXJhbEZyYW1lXTsKKyAgICBpZiAoQ0dSZWN0SXNFbXB0eShr ZXlib2FyZFJlY3QpKQorICAgICAgICByZXR1cm47CisKKyAgICBVSVdpbmRvdyAqd2luZG93ID0g W19zY3JvbGxWaWV3IHdpbmRvd107CisgICAga2V5Ym9hcmRSZWN0ID0gW3dpbmRvdyBjb252ZXJ0 UmVjdDprZXlib2FyZFJlY3QgZnJvbVdpbmRvdzpuaWxdOworICAgIGtleWJvYXJkUmVjdCA9IFtf c2Nyb2xsVmlldyBjb252ZXJ0UmVjdDprZXlib2FyZFJlY3QgZnJvbVZpZXc6d2luZG93XTsKKwor ICAgIENHUmVjdCBwYXNzd29yZEZpZWxkRnJhbWUgPSBbcGFzc3dvcmRGaWVsZCBjb252ZXJ0UmVj dDpwYXNzd29yZEZpZWxkLmJvdW5kcyB0b1ZpZXc6X3Njcm9sbFZpZXddOworCisgICAgQ0dTaXpl IGNvbnRlbnRTaXplID0gW19wYXNzd29yZFZpZXcgYm91bmRzXS5zaXplOworICAgIGNvbnRlbnRT aXplLmhlaWdodCArPSBDR1JlY3RHZXRIZWlnaHQoa2V5Ym9hcmRSZWN0KTsKKyAgICBbX3Njcm9s bFZpZXcgc2V0Q29udGVudFNpemU6Y29udGVudFNpemVdOworCisgICAgaWYgKENHUmVjdEludGVy c2VjdHNSZWN0KHBhc3N3b3JkRmllbGRGcmFtZSwga2V5Ym9hcmRSZWN0KSkgeworICAgICAgICBD R0Zsb2F0IHlEZWx0YSA9IENHUmVjdEdldE1heFkocGFzc3dvcmRGaWVsZEZyYW1lKSAtIENHUmVj dEdldE1pblkoa2V5Ym9hcmRSZWN0KTsKKworICAgICAgICBDR1BvaW50IGNvbnRlbnRPZmZzZXQg PSBbX3Njcm9sbFZpZXcgY29udGVudE9mZnNldF07CisgICAgICAgIGNvbnRlbnRPZmZzZXQueSAr PSB5RGVsdGEgKyBwYXNzd29yZEVudHJ5RmllbGRQYWRkaW5nOworCisgICAgICAgIFtfc2Nyb2xs VmlldyBzZXRDb250ZW50T2Zmc2V0OmNvbnRlbnRPZmZzZXQgYW5pbWF0ZWQ6WUVTXTsKKyAgICB9 Cit9CisKKy0gKHZvaWQpX3Nob3dQYXNzd29yZEVudHJ5RmllbGQKK3sKKyAgICBbX3Njcm9sbFZp ZXcgc2V0TWluaW11bVpvb21TY2FsZToxXTsKKyAgICBbX3Njcm9sbFZpZXcgc2V0TWF4aW11bVpv b21TY2FsZToxXTsKKyAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOltVSUNvbG9y IGdyb3VwVGFibGVWaWV3QmFja2dyb3VuZENvbG9yXV07CisKKyAgICBfcGFzc3dvcmRWaWV3ID0g YWRvcHROUyhbW1VJRG9jdW1lbnRQYXNzd29yZFZpZXcgYWxsb2NdIGluaXRXaXRoRG9jdW1lbnRO YW1lOl9zdWdnZXN0ZWRGaWxlbmFtZS5nZXQoKV0pOworICAgIFtfcGFzc3dvcmRWaWV3IHNldFBh c3N3b3JkRGVsZWdhdGU6c2VsZl07CisKKyAgICBbc2VsZiBfdXBkYXRlUGFzc3dvcmRFbnRyeUZp ZWxkXTsKKworICAgIFtzZWxmIGFkZFN1YnZpZXc6X3Bhc3N3b3JkVmlldy5nZXQoKV07Cit9CisK Ky0gKHZvaWQpX2hpZGVQYXNzd29yZEVudHJ5RmllbGQKK3sKKyAgICBbX3Bhc3N3b3JkVmlldyBy ZW1vdmVGcm9tU3VwZXJ2aWV3XTsKKyAgICBfcGFzc3dvcmRWaWV3ID0gbmlsOworCisgICAgW19z Y3JvbGxWaWV3IHNldE1pbmltdW1ab29tU2NhbGU6cGRmTWluaW11bVpvb21TY2FsZV07CisgICAg W19zY3JvbGxWaWV3IHNldE1heGltdW1ab29tU2NhbGU6cGRmTWF4aW11bVpvb21TY2FsZV07Cisg ICAgW19zY3JvbGxWaWV3IHNldEJhY2tncm91bmRDb2xvcjpbVUlDb2xvciBncmF5Q29sb3JdXTsK K30KKworLSAodm9pZCl1c2VyRGlkRW50ZXJQYXNzd29yZDooTlNTdHJpbmcgKilwYXNzd29yZCBm b3JQYXNzd29yZFZpZXc6KFVJRG9jdW1lbnRQYXNzd29yZFZpZXcgKilwYXNzd29yZFZpZXcKK3sK KyAgICBbc2VsZiBfdHJ5VG9VbmxvY2tXaXRoUGFzc3dvcmQ6cGFzc3dvcmRdOworfQorCistICh2 b2lkKWRpZEJlZ2luRWRpdGluZ1Bhc3N3b3JkOihVSVRleHRGaWVsZCAqKXBhc3N3b3JkRmllbGQg aW5WaWV3OihVSURvY3VtZW50UGFzc3dvcmRWaWV3ICopcGFzc3dvcmRWaWV3Cit7CisgICAgW1tO U05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVj dG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmREaWRTaG93OikgbmFtZTpVSUtleWJvYXJkRGlkU2hvd05v dGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKK30KKworLSAodm9pZClkaWRFbmRFZGl0aW5nUGFzc3dv cmQ6KFVJVGV4dEZpZWxkICopcGFzc3dvcmRGaWVsZCBpblZpZXc6KFVJRG9jdW1lbnRQYXNzd29y ZFZpZXcgKilwYXNzd29yZFZpZXcKK3sKKyAgICBbX3Njcm9sbFZpZXcgc2V0Q29udGVudFNpemU6 W19wYXNzd29yZFZpZXcgZnJhbWVdLnNpemVdOworICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50 T2Zmc2V0OkNHUG9pbnRNYWtlKC1fc2Nyb2xsVmlldy5jb250ZW50SW5zZXQubGVmdCwgLV9zY3Jv bGxWaWV3LmNvbnRlbnRJbnNldC50b3ApIGFuaW1hdGVkOllFU107CisKKyAgICBbW05TTm90aWZp Y2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpVSUtl eWJvYXJkRGlkU2hvd05vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKK30KKworLSAodm9pZClfZGlk RmFpbFRvVW5sb2NrCit7CisgICAgW1tfcGFzc3dvcmRWaWV3IHBhc3N3b3JkRmllbGRdIHNldFRl eHQ6QCIiXTsKKyAgICBVSUFsZXJ0Q29udHJvbGxlciogYWxlcnQgPSBbVUlBbGVydENvbnRyb2xs ZXIgYWxlcnRDb250cm9sbGVyV2l0aFRpdGxlOldFQl9VSV9TVFJJTkcoIlRoZSBkb2N1bWVudCBj b3VsZCBub3QgYmUgb3BlbmVkIHdpdGggdGhhdCBwYXNzd29yZC4iLCAiUERGIHBhc3N3b3JkIGZh aWx1cmUgYWxlcnQgbWVzc2FnZSIpIG1lc3NhZ2U6QCIiIHByZWZlcnJlZFN0eWxlOlVJQWxlcnRD b250cm9sbGVyU3R5bGVBbGVydF07CisKKyAgICBVSUFsZXJ0QWN0aW9uKiBkZWZhdWx0QWN0aW9u ID0gW1VJQWxlcnRBY3Rpb24gYWN0aW9uV2l0aFRpdGxlOldFQl9VSV9TVFJJTkdfS0VZKCJPSyIs ICJPSyAoUERGIHBhc3N3b3JkIGZhaWx1cmUgYWxlcnQpIiwgIk9LIGJ1dHRvbiBsYWJlbCBpbiBQ REYgcGFzc3dvcmQgZmFpbHVyZSBhbGVydCIpIHN0eWxlOlVJQWxlcnRBY3Rpb25TdHlsZURlZmF1 bHQgaGFuZGxlcjpeKFVJQWxlcnRBY3Rpb24gKikgeyB9XTsKKyAgICAKKyAgICBbYWxlcnQgYWRk QWN0aW9uOmRlZmF1bHRBY3Rpb25dOworCisgICAgW3NlbGYud2luZG93LnJvb3RWaWV3Q29udHJv bGxlciBwcmVzZW50Vmlld0NvbnRyb2xsZXI6YWxlcnQgYW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246 bmlsXTsKK30KKworLSAoQk9PTClfdHJ5VG9VbmxvY2tXaXRoUGFzc3dvcmQ6KE5TU3RyaW5nICop cGFzc3dvcmQKK3sKKyAgICBpZiAoQ0dQREZEb2N1bWVudFVubG9ja1dpdGhQYXNzd29yZChfY2dQ REZEb2N1bWVudC5nZXQoKSwgW3Bhc3N3b3JkIFVURjhTdHJpbmddKSkgeworICAgICAgICBbc2Vs ZiBfaGlkZVBhc3N3b3JkRW50cnlGaWVsZF07CisgICAgICAgIFtzZWxmIF9kaWRMb2FkUERGRG9j dW1lbnRdOworICAgICAgICByZXR1cm4gWUVTOworICAgIH0KKworICAgIFtzZWxmIF9kaWRGYWls VG9VbmxvY2tdOworICAgIHJldHVybiBOTzsKK30KKwogQGVuZAogCiAjZW5kaWYgLyogUExBVEZP Uk0oSU9TKSAqLwo=