138447 2014-11-05 17:08:27 -0800 Clients should be able to customize the view used for page previews 2014-11-06 18:02:07 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 conrad_shultz conrad_shultz andersca bdakin commit-queue conrad_shultz thorton webkit-bug-importer oldest_to_newest 1046654 0 conrad_shultz 2014-11-05 17:08:27 -0800 Clients should be able to customize the view used for page previews 1046655 1 webkit-bug-importer 2014-11-05 17:09:15 -0800 <rdar://problem/18889231> 1046661 2 241074 conrad_shultz 2014-11-05 17:18:21 -0800 Created attachment 241074 Patch 1046665 3 241074 andersca 2014-11-05 17:33:04 -0800 Comment on attachment 241074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241074&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h:124 > +- (NSView *)_previewViewForURL:(NSURL *)url frame:(NSRect)frame; This sounds kind of ambiguous, as both a verb and a noun. I can't think of a better name though. Can it return a WKView? 1046666 4 conrad_shultz 2014-11-05 17:34:40 -0800 (In reply to comment #3) > Comment on attachment 241074 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241074&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h:124 > > +- (NSView *)_previewViewForURL:(NSURL *)url frame:(NSRect)frame; > > This sounds kind of ambiguous, as both a verb and a noun. I can't think of a > better name though. > Can it return a WKView? I'd rather not constrain it as such, especially since the internal implementation actually uses WKWebView. I initially had -_viewForPreviewingURL:frame:, but thought this read better. Perhaps I was wrong? 1046671 5 241074 andersca 2014-11-05 17:39:33 -0800 Comment on attachment 241074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241074&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:112 > + RetainPtr<NSView> previewView; > + NSRect defaultFrame = NSMakeRect(0, 0, _mainViewSize.width, _mainViewSize.height); I'd move these around, put the initial assignment here and then have the check below be if (!previewView) { ... } > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:819 > +- (RetainPtr<NSView>)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController previewViewForURL:(NSURL *)url frame:(NSRect)frame I don't think this needs to return a RetainPtr. 1046676 6 conrad_shultz 2014-11-05 17:45:03 -0800 (In reply to comment #5) > Comment on attachment 241074 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241074&action=review > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:112 > > + RetainPtr<NSView> previewView; > > + NSRect defaultFrame = NSMakeRect(0, 0, _mainViewSize.width, _mainViewSize.height); > > I'd move these around, put the initial assignment here and then have the > check below be > > if (!previewView) { > ... > } > Agreed, will fix. > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:819 > > +- (RetainPtr<NSView>)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController previewViewForURL:(NSURL *)url frame:(NSRect)frame > > I don't think this needs to return a RetainPtr. I don't think so either. 1046829 7 241113 conrad_shultz 2014-11-06 09:11:19 -0800 Created attachment 241113 Patch 1046889 8 241113 andersca 2014-11-06 13:17:02 -0800 Comment on attachment 241113 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241113&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h:124 > +- (NSView *)_viewForPreviewingURL:(NSURL *)url frame:(NSRect)frame; I think this should be called initialFrameSize (and take an NSSize). 1046945 9 conrad_shultz 2014-11-06 15:50:34 -0800 (In reply to comment #8) > Comment on attachment 241113 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241113&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h:124 > > +- (NSView *)_viewForPreviewingURL:(NSURL *)url frame:(NSRect)frame; > > I think this should be called initialFrameSize (and take an NSSize). Agreed; new version coming. 1046967 10 241147 conrad_shultz 2014-11-06 17:00:24 -0800 Created attachment 241147 Patch 1046983 11 241147 commit-queue 2014-11-06 18:02:03 -0800 Comment on attachment 241147 Patch Clearing flags on attachment: 241147 Committed r175732: <http://trac.webkit.org/changeset/175732> 1046984 12 commit-queue 2014-11-06 18:02:07 -0800 All reviewed patches have been landed. Closing bug. 241074 2014-11-05 17:18:21 -0800 2014-11-05 17:45:21 -0800 Patch bug-138447-20141105171832.patch text/plain 6083 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjczZTEwMDkwZTY2NjVi NDA4MjkyODU2ODM3ZmE1NWYyZWY3N2IxOC4uZjg5NzM5NWM4YzliZThiYmI0ZDJlMDQ0YmQzOWQ3 N2Y4YjM4YjUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTExLTA1ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xpZW50cyBz aG91bGQgYmUgYWJsZSB0byBjdXN0b21pemUgdGhlIHZpZXcgdXNlZCBmb3IgcGFnZSBwcmV2aWV3 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDQ3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFNQ SSB0byBXS1ZpZXcgdGhhdCBjbGllbnRzIGNhbiB1c2UgdG8gY3VzdG9taXplIHRoZSB2aWV3IHVz ZWQgaW4gdGhlIHBhZ2UgcHJldmlldyBwb3BvdmVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xhcmUgLV9wcmV2aWV3Vmlld0Zv clVSTDpmcmFtZTouCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06Cisg ICAgICAgICgtW1dLVmlldyBfcHJldmlld1ZpZXdGb3JVUkw6ZnJhbWU6XSk6CisgICAgICAgIFJl dHVybiBuaWwgaW4gdGhlIGRlZmF1bHQgaW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dLUGFnZVBy ZXZpZXdWaWV3Q29udHJvbGxlciBsb2FkVmlld10pOgorICAgICAgICBPbmx5IHNwaW4gdXAgYSBX S1dlYlZpZXcgaWYgdGhlIGRlbGVnYXRlIChhbmQsIHRoZXJlZm9yZSwgdGhlIHByZXNlbnRpbmcg V0tWaWV3KSBkb2Vzbid0IHN1cHBseSBhIGN1c3RvbSB2aWV3LgorICAgICAgICAoLVtXS0FjdGlv bk1lbnVDb250cm9sbGVyIHBhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI6cHJldmlld1ZpZXdGb3JV Ukw6ZnJhbWU6XSk6CisgICAgICAgIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlckRlbGVnYXRl IG1ldGhvZDsgd3JhcCB0aGUgV0tWaWV3IFNQSS4KKworMjAxNC0xMS0wNSAgQ29ucmFkIFNodWx0 eiAgPGNvbnJhZF9zaHVsdHpAYXBwbGUuY29tPgorCiAgICAgICAgIEl0IHNob3VsZCBiZSBwb3Nz aWJsZSB0byBvcGVuIGEgcGFnZSBwcmV2aWV3IGJ5IGNsaWNraW5nIG9uIGl0CiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg0NDUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaAppbmRleCBl MmE1ZGM0ZDhiOTVmMTZhYWZmZjExY2RmMjFiNDNiMzZlNTJhNjhkLi4zNDUxMmFjMTRjMzI2MjFh Yjg1MGRkMjM0YzI3NzFhMGJlNDdiMmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaApAQCAtMTIwLDYgKzEyMCw4IEBACiAKIC0g KE5TQXJyYXkgKilfYWN0aW9uTWVudUl0ZW1zRm9ySGl0VGVzdFJlc3VsdDooV0tIaXRUZXN0UmVz dWx0UmVmKWhpdFRlc3RSZXN1bHQgd2l0aFR5cGU6KF9XS0FjdGlvbk1lbnVUeXBlKXR5cGUgZGVm YXVsdEFjdGlvbk1lbnVJdGVtczooTlNBcnJheSAqKWRlZmF1bHRNZW51SXRlbXM7CiAtIChOU0Fy cmF5ICopX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6KFdLSGl0VGVzdFJlc3VsdFJl ZiloaXRUZXN0UmVzdWx0IHdpdGhUeXBlOihfV0tBY3Rpb25NZW51VHlwZSl0eXBlIGRlZmF1bHRB Y3Rpb25NZW51SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVudUl0ZW1zIHVzZXJEYXRhOihXS1R5 cGVSZWYpdXNlckRhdGE7CisKKy0gKE5TVmlldyAqKV9wcmV2aWV3Vmlld0ZvclVSTDooTlNVUkwg Kil1cmwgZnJhbWU6KE5TUmVjdClmcmFtZTsKICNlbmRpZgogCiBAZW5kCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggMWQxNjYyYjRiZThkZGM0NTM2NmYx NWE3YzJjODIzZWZlYjk3MmY4NS4uZmE4NjY2YzE3ZWFlNmViZDJjYzRkMWNmMzBlY2MxOTM3NTQx NWIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAt NDE3NCw2ICs0MTc0LDExIEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFt ZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAgICAgcmV0dXJuIFtzZWxmIF9hY3Rpb25NZW51SXRl bXNGb3JIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHQgd2l0aFR5cGU6dHlwZSBkZWZhdWx0QWN0 aW9uTWVudUl0ZW1zOmRlZmF1bHRNZW51SXRlbXNdOwogfQogCistIChOU1ZpZXcgKilfcHJldmll d1ZpZXdGb3JVUkw6KE5TVVJMICopdXJsIGZyYW1lOihOU1JlY3QpZnJhbWUKK3sKKyAgICByZXR1 cm4gbmlsOworfQorCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEw MDAKIAogLSAodm9pZClfc2V0QXV0b21hdGljYWxseUFkanVzdHNDb250ZW50SW5zZXRzOihCT09M KWF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IGFhMDEx NDhlYTA2MjMxYTViMjNkZmRiMjE3MDViNGZkZDkyNDA3NjkuLjcxZWE5YmVkMWIyOTM0NjlmMGJm NjI2YzNmMDIxYmJmMzU2ZDRiN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KQEAgLTc4LDYgKzc4LDcgQEAgc3Rh dGljIGNvbnN0IENHRmxvYXQgcG9wb3ZlclRvVmlld1NjYWxlID0gMC43NTsKIEBjbGFzcyBXS1Bh Z2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI7CiAKIEBwcm90b2NvbCBXS1BhZ2VQcmV2aWV3Vmlld0Nv bnRyb2xsZXJEZWxlZ2F0ZSA8TlNPYmplY3Q+CistIChSZXRhaW5QdHI8TlNWaWV3PilwYWdlUHJl dmlld1ZpZXdDb250cm9sbGVyOihXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgKilwYWdlUHJl dmlld1ZpZXdDb250cm9sbGVyIHByZXZpZXdWaWV3Rm9yVVJMOihOU1VSTCAqKXVybCBmcmFtZToo TlNSZWN0KWZyYW1lOwogLSAodm9pZClwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyV2FzQ2xpY2tl ZDooV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyICopcGFnZVByZXZpZXdWaWV3Q29udHJvbGxl cjsKIEBlbmQKIApAQCAtMTA3LDE5ICsxMDgsMjQgQEAgc3RhdGljIGNvbnN0IENHRmxvYXQgcG9w b3ZlclRvVmlld1NjYWxlID0gMC43NTsKIAogLSAodm9pZClsb2FkVmlldwogewotICAgIFJldGFp blB0cjxXS1dlYlZpZXc+IHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0 V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgX21haW5WaWV3U2l6ZS53aWR0aCwgX21haW5WaWV3 U2l6ZS5oZWlnaHQpXSk7Ci0gICAgW3dlYlZpZXcgX3NldElnbm9yZXNOb25XaGVlbE1vdXNlRXZl bnRzOllFU107Ci0gICAgaWYgKF91cmwpIHsKLSAgICAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0 ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpfdXJsLmdldCgpXTsKLSAgICAgICAgW3dl YlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgUmV0YWluUHRyPE5TVmlldz4gcHJldmll d1ZpZXc7CisgICAgTlNSZWN0IGRlZmF1bHRGcmFtZSA9IE5TTWFrZVJlY3QoMCwgMCwgX21haW5W aWV3U2l6ZS53aWR0aCwgX21haW5WaWV3U2l6ZS5oZWlnaHQpOworICAgIGlmICghKHByZXZpZXdW aWV3ID0gW19kZWxlZ2F0ZSBwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyOnNlbGYgcHJldmlld1Zp ZXdGb3JVUkw6X3VybC5nZXQoKSBmcmFtZTpkZWZhdWx0RnJhbWVdKSkgeworICAgICAgICBSZXRh aW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpkZWZhdWx0RnJhbWVdKTsKKyAgICAgICAgW3dlYlZpZXcgX3NldElnbm9yZXNO b25XaGVlbE1vdXNlRXZlbnRzOllFU107CisgICAgICAgIGlmIChfdXJsKSB7CisgICAgICAgICAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOl91 cmwuZ2V0KCldOworICAgICAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07Cisg ICAgICAgIH0KKyAgICAgICAgcHJldmlld1ZpZXcgPSB3ZWJWaWV3OwogICAgIH0KIAotICAgIC8v IFNldHRpbmcgdGhlIHdlYlZpZXcgYm91bmRzIHdpbGwgc2NhbGUgaXQgdG8gNzUlIG9mIHRoZSBf bWFpblZpZXdTaXplLiAKLSAgICBbd2ViVmlldyBzZXRCb3VuZHM6TlNNYWtlUmVjdCgwLCAwLCBf bWFpblZpZXdTaXplLndpZHRoIC8gcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFpblZpZXdTaXplLmhl aWdodCAvIHBvcG92ZXJUb1ZpZXdTY2FsZSldOworICAgIC8vIFNldHRpbmcgdGhlIHdlYlZpZXcg Ym91bmRzIHdpbGwgc2NhbGUgaXQgdG8gNzUlIG9mIHRoZSBfbWFpblZpZXdTaXplLgorICAgIFtw cmV2aWV3VmlldyBzZXRCb3VuZHM6TlNNYWtlUmVjdCgwLCAwLCBfbWFpblZpZXdTaXplLndpZHRo IC8gcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFpblZpZXdTaXplLmhlaWdodCAvIHBvcG92ZXJUb1Zp ZXdTY2FsZSldOwogCiAgICAgUmV0YWluUHRyPE5TQ2xpY2tHZXN0dXJlUmVjb2duaXplcj4gY2xp Y2tSZWNvZ25pemVyID0gYWRvcHROUyhbW05TQ2xpY2tHZXN0dXJlUmVjb2duaXplciBhbGxvY10g aW5pdFdpdGhUYXJnZXQ6c2VsZiBhY3Rpb246QHNlbGVjdG9yKF9jbGlja1JlY29nbml6ZWQ6KV0p OwotICAgIFt3ZWJWaWV3IGFkZEdlc3R1cmVSZWNvZ25pemVyOmNsaWNrUmVjb2duaXplci5nZXQo KV07Ci0gICAgc2VsZi52aWV3ID0gd2ViVmlldy5nZXQoKTsKKyAgICBbcHJldmlld1ZpZXcgYWRk R2VzdHVyZVJlY29nbml6ZXI6Y2xpY2tSZWNvZ25pemVyLmdldCgpXTsKKyAgICBzZWxmLnZpZXcg PSBwcmV2aWV3Vmlldy5nZXQoKTsKIH0KIAogLSAodm9pZClfY2xpY2tSZWNvZ25pemVkOihOU0dl c3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKQEAgLTgxMCw2ICs4MTYsMTEgQEAg c3RhdGljIE5TSW1hZ2UgKndlYktpdEJ1bmRsZUltYWdlTmFtZWQoTlNTdHJpbmcgKm5hbWUpCiAK ICNwcmFnbWEgbWFyayBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZQogCistIChS ZXRhaW5QdHI8TlNWaWV3PilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyOihXS1BhZ2VQcmV2aWV3 Vmlld0NvbnRyb2xsZXIgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIHByZXZpZXdWaWV3Rm9y VVJMOihOU1VSTCAqKXVybCBmcmFtZTooTlNSZWN0KWZyYW1lCit7CisgICAgcmV0dXJuIFtfd2tW aWV3IF9wcmV2aWV3Vmlld0ZvclVSTDp1cmwgZnJhbWU6ZnJhbWVdOworfQorCiAtICh2b2lkKXBh Z2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJXYXNDbGlja2VkOihXS1BhZ2VQcmV2aWV3Vmlld0NvbnRy b2xsZXIgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyCiB7CiAgICAgaWYgKE5TVVJMICp1cmwg PSBwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLT5fdXJsLmdldCgpKQo= 241113 2014-11-06 09:11:19 -0800 2014-11-06 17:00:21 -0800 Patch bug-138447-20141106091130.patch text/plain 6045 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1Njk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWIxYmY3Y2VlZWQ4M2Nm NzYwYTY5MjA5MTQxOTk1ODU4NTAwYjUxNS4uY2IwN2QzYjdhZDg2NmRhNjdiNDJiZDMwMmYzNzI5 ODU5NjAxM2VmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTExLTA1ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xpZW50cyBz aG91bGQgYmUgYWJsZSB0byBjdXN0b21pemUgdGhlIHZpZXcgdXNlZCBmb3IgcGFnZSBwcmV2aWV3 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDQ3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFNQ SSB0byBXS1ZpZXcgdGhhdCBjbGllbnRzIGNhbiB1c2UgdG8gY3VzdG9taXplIHRoZSB2aWV3IHVz ZWQgaW4gdGhlIHBhZ2UgcHJldmlldyBwb3BvdmVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xhcmUgLV92aWV3Rm9yUHJldmll d2luZ1VSTDpmcmFtZTouCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06 CisgICAgICAgICgtW1dLVmlldyBfdmlld0ZvclByZXZpZXdpbmdVUkw6ZnJhbWU6XSk6CisgICAg ICAgIFJldHVybiBuaWwgaW4gdGhlIGRlZmF1bHQgaW1wbGVtZW50YXRpb24uCisKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dL UGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBsb2FkVmlld10pOgorICAgICAgICBPbmx5IHNwaW4g dXAgYSBXS1dlYlZpZXcgaWYgdGhlIGRlbGVnYXRlIChhbmQsIHRoZXJlZm9yZSwgdGhlIHByZXNl bnRpbmcgV0tWaWV3KSBkb2Vzbid0IHN1cHBseSBhIGN1c3RvbSB2aWV3LgorICAgICAgICAoLVtX S0FjdGlvbk1lbnVDb250cm9sbGVyIHBhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI6dmlld0ZvclBy ZXZpZXdpbmdVUkw6ZnJhbWU6XSk6CisgICAgICAgIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxl ckRlbGVnYXRlIG1ldGhvZDsgd3JhcCB0aGUgV0tWaWV3IFNQSS4KKwogMjAxNC0xMS0wNiAgRGFu aWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gV2ViUHJvY2Vz cyBuZWVkcyB0byB0YWtlIGEgYmFja2dyb3VuZCB0YXNrIGFzc2VydGlvbiB0byBwcmV2ZW50IGJl aW5nIGtpbGxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1ZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL Vmlld1ByaXZhdGUuaAppbmRleCBlMmE1ZGM0ZDhiOTVmMTZhYWZmZjExY2RmMjFiNDNiMzZlNTJh NjhkLi5mNDk5MmY4ZDdlN2VlMjc4YTFmMmI4MTU1OGY4N2RiNzYxNTYwMTQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaApAQCAt MTIwLDYgKzEyMCw4IEBACiAKIC0gKE5TQXJyYXkgKilfYWN0aW9uTWVudUl0ZW1zRm9ySGl0VGVz dFJlc3VsdDooV0tIaXRUZXN0UmVzdWx0UmVmKWhpdFRlc3RSZXN1bHQgd2l0aFR5cGU6KF9XS0Fj dGlvbk1lbnVUeXBlKXR5cGUgZGVmYXVsdEFjdGlvbk1lbnVJdGVtczooTlNBcnJheSAqKWRlZmF1 bHRNZW51SXRlbXM7CiAtIChOU0FycmF5ICopX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1 bHQ6KFdLSGl0VGVzdFJlc3VsdFJlZiloaXRUZXN0UmVzdWx0IHdpdGhUeXBlOihfV0tBY3Rpb25N ZW51VHlwZSl0eXBlIGRlZmF1bHRBY3Rpb25NZW51SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVu dUl0ZW1zIHVzZXJEYXRhOihXS1R5cGVSZWYpdXNlckRhdGE7CisKKy0gKE5TVmlldyAqKV92aWV3 Rm9yUHJldmlld2luZ1VSTDooTlNVUkwgKil1cmwgZnJhbWU6KE5TUmVjdClmcmFtZTsKICNlbmRp ZgogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5k ZXggMWQxNjYyYjRiZThkZGM0NTM2NmYxNWE3YzJjODIzZWZlYjk3MmY4NS4uZjYwYmYzOWQ2N2Ez MjQxZGI5NmY1Yzk3OGYwMmM1NDI5MTI5MDg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtNDE3NCw2ICs0MTc0LDExIEBAIHN0YXRpYyBOU1N0cmlu ZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAgICAgcmV0 dXJuIFtzZWxmIF9hY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHQg d2l0aFR5cGU6dHlwZSBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOmRlZmF1bHRNZW51SXRlbXNdOwog fQogCistIChOU1ZpZXcgKilfdmlld0ZvclByZXZpZXdpbmdVUkw6KE5TVVJMICopdXJsIGZyYW1l OihOU1JlY3QpZnJhbWUKK3sKKyAgICByZXR1cm4gbmlsOworfQorCiAjaWYgX19NQUNfT1NfWF9W RVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKIAogLSAodm9pZClfc2V0QXV0b21hdGljYWxs eUFkanVzdHNDb250ZW50SW5zZXRzOihCT09MKWF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudElu c2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1l bnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1l bnVDb250cm9sbGVyLm1tCmluZGV4IDczZGFkNDc0YTU0ZGMwZjFmNjM1NmUxNDIzMDU0NTE4OTJi ZDNlM2MuLjY3YjViZmQwOTY4OTg4ODgzMzIzYzRlOTEzY2YyMWQ0YzI5ZDA4YjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xs ZXIubW0KQEAgLTc4LDYgKzc4LDcgQEAgc3RhdGljIGNvbnN0IENHRmxvYXQgcG9wb3ZlclRvVmll d1NjYWxlID0gMC43NTsKIEBjbGFzcyBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI7CiAKIEBw cm90b2NvbCBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSA8TlNPYmplY3Q+Cist IChOU1ZpZXcgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyOihXS1BhZ2VQcmV2aWV3Vmlld0Nv bnRyb2xsZXIgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIHZpZXdGb3JQcmV2aWV3aW5nVVJM OihOU1VSTCAqKXVybCBmcmFtZTooTlNSZWN0KWZyYW1lOwogLSAodm9pZClwYWdlUHJldmlld1Zp ZXdDb250cm9sbGVyV2FzQ2xpY2tlZDooV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyICopcGFn ZVByZXZpZXdWaWV3Q29udHJvbGxlcjsKIEBlbmQKIApAQCAtMTA3LDE5ICsxMDgsMjQgQEAgc3Rh dGljIGNvbnN0IENHRmxvYXQgcG9wb3ZlclRvVmlld1NjYWxlID0gMC43NTsKIAogLSAodm9pZCls b2FkVmlldwogewotICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHdlYlZpZXcgPSBhZG9wdE5TKFtb V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgX21haW5WaWV3 U2l6ZS53aWR0aCwgX21haW5WaWV3U2l6ZS5oZWlnaHQpXSk7Ci0gICAgW3dlYlZpZXcgX3NldEln bm9yZXNOb25XaGVlbE1vdXNlRXZlbnRzOllFU107Ci0gICAgaWYgKF91cmwpIHsKLSAgICAgICAg TlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpfdXJs LmdldCgpXTsKLSAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgTlNS ZWN0IGRlZmF1bHRGcmFtZSA9IE5TTWFrZVJlY3QoMCwgMCwgX21haW5WaWV3U2l6ZS53aWR0aCwg X21haW5WaWV3U2l6ZS5oZWlnaHQpOworICAgIFJldGFpblB0cjxOU1ZpZXc+IHByZXZpZXdWaWV3 ID0gW19kZWxlZ2F0ZSBwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyOnNlbGYgdmlld0ZvclByZXZp ZXdpbmdVUkw6X3VybC5nZXQoKSBmcmFtZTpkZWZhdWx0RnJhbWVdOworICAgIGlmICghcHJldmll d1ZpZXcpIHsKKyAgICAgICAgUmV0YWluUHRyPFdLV2ViVmlldz4gd2ViVmlldyA9IGFkb3B0TlMo W1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6ZGVmYXVsdEZyYW1lXSk7CisgICAgICAg IFt3ZWJWaWV3IF9zZXRJZ25vcmVzTm9uV2hlZWxNb3VzZUV2ZW50czpZRVNdOworICAgICAgICBp ZiAoX3VybCkgeworICAgICAgICAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVx dWVzdCByZXF1ZXN0V2l0aFVSTDpfdXJsLmdldCgpXTsKKyAgICAgICAgICAgIFt3ZWJWaWV3IGxv YWRSZXF1ZXN0OnJlcXVlc3RdOworICAgICAgICB9CisgICAgICAgIHByZXZpZXdWaWV3ID0gd2Vi VmlldzsKICAgICB9CiAKLSAgICAvLyBTZXR0aW5nIHRoZSB3ZWJWaWV3IGJvdW5kcyB3aWxsIHNj YWxlIGl0IHRvIDc1JSBvZiB0aGUgX21haW5WaWV3U2l6ZS4gCi0gICAgW3dlYlZpZXcgc2V0Qm91 bmRzOk5TTWFrZVJlY3QoMCwgMCwgX21haW5WaWV3U2l6ZS53aWR0aCAvIHBvcG92ZXJUb1ZpZXdT Y2FsZSwgX21haW5WaWV3U2l6ZS5oZWlnaHQgLyBwb3BvdmVyVG9WaWV3U2NhbGUpXTsKKyAgICAv LyBTZXR0aW5nIHRoZSB3ZWJWaWV3IGJvdW5kcyB3aWxsIHNjYWxlIGl0IHRvIDc1JSBvZiB0aGUg X21haW5WaWV3U2l6ZS4KKyAgICBbcHJldmlld1ZpZXcgc2V0Qm91bmRzOk5TTWFrZVJlY3QoMCwg MCwgX21haW5WaWV3U2l6ZS53aWR0aCAvIHBvcG92ZXJUb1ZpZXdTY2FsZSwgX21haW5WaWV3U2l6 ZS5oZWlnaHQgLyBwb3BvdmVyVG9WaWV3U2NhbGUpXTsKIAogICAgIFJldGFpblB0cjxOU0NsaWNr R2VzdHVyZVJlY29nbml6ZXI+IGNsaWNrUmVjb2duaXplciA9IGFkb3B0TlMoW1tOU0NsaWNrR2Vz dHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3Rv cihfY2xpY2tSZWNvZ25pemVkOildKTsKLSAgICBbd2ViVmlldyBhZGRHZXN0dXJlUmVjb2duaXpl cjpjbGlja1JlY29nbml6ZXIuZ2V0KCldOwotICAgIHNlbGYudmlldyA9IHdlYlZpZXcuZ2V0KCk7 CisgICAgW3ByZXZpZXdWaWV3IGFkZEdlc3R1cmVSZWNvZ25pemVyOmNsaWNrUmVjb2duaXplci5n ZXQoKV07CisgICAgc2VsZi52aWV3ID0gcHJldmlld1ZpZXcuZ2V0KCk7CiB9CiAKIC0gKHZvaWQp X2NsaWNrUmVjb2duaXplZDooTlNHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVy CkBAIC04MTAsNiArODE2LDExIEBAIHN0YXRpYyBOU0ltYWdlICp3ZWJLaXRCdW5kbGVJbWFnZU5h bWVkKE5TU3RyaW5nICpuYW1lKQogCiAjcHJhZ21hIG1hcmsgV0tQYWdlUHJldmlld1ZpZXdDb250 cm9sbGVyRGVsZWdhdGUKIAorLSAoTlNWaWV3ICopcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcjoo V0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyICopcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciB2 aWV3Rm9yUHJldmlld2luZ1VSTDooTlNVUkwgKil1cmwgZnJhbWU6KE5TUmVjdClmcmFtZQorewor ICAgIHJldHVybiBbX3drVmlldyBfdmlld0ZvclByZXZpZXdpbmdVUkw6dXJsIGZyYW1lOmZyYW1l XTsKK30KKwogLSAodm9pZClwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyV2FzQ2xpY2tlZDooV0tQ YWdlUHJldmlld1ZpZXdDb250cm9sbGVyICopcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcgogewog ICAgIGlmIChOU1VSTCAqdXJsID0gcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlci0+X3VybC5nZXQo KSkK 241147 2014-11-06 17:00:24 -0800 2014-11-06 18:02:03 -0800 Patch bug-138447-20141106170035.patch text/plain 6113 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmVmNTBmY2NhNDNkYjY1 ZGNlM2U3OGRjMWZiNGQyOTZkNjBmZTRlYS4uNmRmODc1NjY3MjIxNzVmNzBmZDI1ZTVmZmMxNWI5 ZTBkNWQyZGQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTExLTA1ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xpZW50cyBz aG91bGQgYmUgYWJsZSB0byBjdXN0b21pemUgdGhlIHZpZXcgdXNlZCBmb3IgcGFnZSBwcmV2aWV3 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDQ3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFNQ SSB0byBXS1ZpZXcgdGhhdCBjbGllbnRzIGNhbiB1c2UgdG8gY3VzdG9taXplIHRoZSB2aWV3IHVz ZWQgaW4gdGhlIHBhZ2UgcHJldmlldyBwb3BvdmVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xhcmUgLV92aWV3Rm9yUHJldmll d2luZ1VSTDppbml0aWFsRnJhbWVTaXplOi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF92aWV3Rm9yUHJldmlld2luZ1VSTDppbml0 aWFsRnJhbWVTaXplOl0pOgorICAgICAgICBSZXR1cm4gbmlsIGluIHRoZSBkZWZhdWx0IGltcGxl bWVudGF0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9s bGVyLm1tOgorICAgICAgICAoLVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXdd KToKKyAgICAgICAgT25seSBzcGluIHVwIGEgV0tXZWJWaWV3IGlmIHRoZSBkZWxlZ2F0ZSAoYW5k LCB0aGVyZWZvcmUsIHRoZSBwcmVzZW50aW5nIFdLVmlldykgZG9lc24ndCBzdXBwbHkgYSBjdXN0 b20gdmlldy4KKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBwYWdlUHJldmlld1Zp ZXdDb250cm9sbGVyOnZpZXdGb3JQcmV2aWV3aW5nVVJMOmluaXRpYWxGcmFtZVNpemU6XSk6Cisg ICAgICAgIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlckRlbGVnYXRlIG1ldGhvZDsgd3JhcCB0 aGUgV0tWaWV3IFNQSS4KKwogMjAxNC0xMS0wNiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5j b20+CiAKICAgICAgICAgW2ZpbHRlcnMyXSBTdXBwb3J0IGZvciBiYWNrZHJvcC1maWx0ZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgK aW5kZXggZTJhNWRjNGQ4Yjk1ZjE2YWFmZmYxMWNkZjIxYjQzYjM2ZTUyYTY4ZC4uNGMwYzZjMDg3 N2Q3NWM5NTJjOGVkYmY2MTY5MzUyZGQzOTdmMjJmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgKQEAgLTEyMCw2ICsxMjAsOCBA QAogCiAtIChOU0FycmF5ICopX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6KFdLSGl0 VGVzdFJlc3VsdFJlZiloaXRUZXN0UmVzdWx0IHdpdGhUeXBlOihfV0tBY3Rpb25NZW51VHlwZSl0 eXBlIGRlZmF1bHRBY3Rpb25NZW51SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVudUl0ZW1zOwog LSAoTlNBcnJheSAqKV9hY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OihXS0hpdFRlc3RS ZXN1bHRSZWYpaGl0VGVzdFJlc3VsdCB3aXRoVHlwZTooX1dLQWN0aW9uTWVudVR5cGUpdHlwZSBk ZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0FycmF5ICopZGVmYXVsdE1lbnVJdGVtcyB1c2VyRGF0 YTooV0tUeXBlUmVmKXVzZXJEYXRhOworCistIChOU1ZpZXcgKilfdmlld0ZvclByZXZpZXdpbmdV Ukw6KE5TVVJMICopdXJsIGluaXRpYWxGcmFtZVNpemU6KE5TU2l6ZSlpbml0aWFsRnJhbWVTaXpl OwogI2VuZGlmCiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQppbmRleCAxZDE2NjJiNGJlOGRkYzQ1MzY2ZjE1YTdjMmM4MjNlZmViOTcyZjg1Li5iNmQz NTAyYzQ2NDBiYzcwYmY2OGU5Y2U4YzU2MWFjMzA3OTRlYmExIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC00MTc0LDYgKzQxNzQsMTEgQEAgc3RhdGlj IE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkK ICAgICByZXR1cm4gW3NlbGYgX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6aGl0VGVz dFJlc3VsdCB3aXRoVHlwZTp0eXBlIGRlZmF1bHRBY3Rpb25NZW51SXRlbXM6ZGVmYXVsdE1lbnVJ dGVtc107CiB9CiAKKy0gKE5TVmlldyAqKV92aWV3Rm9yUHJldmlld2luZ1VSTDooTlNVUkwgKil1 cmwgaW5pdGlhbEZyYW1lU2l6ZTooTlNTaXplKWluaXRpYWxGcmFtZVNpemUKK3sKKyAgICByZXR1 cm4gbmlsOworfQorCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEw MDAKIAogLSAodm9pZClfc2V0QXV0b21hdGljYWxseUFkanVzdHNDb250ZW50SW5zZXRzOihCT09M KWF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IGJjOWEy ZDk3Yjk3Yzc3Y2FlOTU2YTU0ZDQyNmVlMDJkM2Y0MjJhZmUuLmNiZDgzMTU2ZTBmZGQwNjgyYWE0 YmJlMGYwZGUwNTMzZDAyNjY0MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KQEAgLTc3LDYgKzc3LDcgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKIEBjbGFzcyBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI7 CiAKIEBwcm90b2NvbCBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSA8TlNPYmpl Y3Q+CistIChOU1ZpZXcgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyOihXS1BhZ2VQcmV2aWV3 Vmlld0NvbnRyb2xsZXIgKilwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIHZpZXdGb3JQcmV2aWV3 aW5nVVJMOihOU1VSTCAqKXVybCBpbml0aWFsRnJhbWVTaXplOihOU1NpemUpaW5pdGlhbEZyYW1l U2l6ZTsKIC0gKHZvaWQpcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcldhc0NsaWNrZWQ6KFdLUGFn ZVByZXZpZXdWaWV3Q29udHJvbGxlciAqKXBhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXI7CiBAZW5k CiAKQEAgLTEwOCwxOSArMTA5LDI0IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIC0gKHZv aWQpbG9hZFZpZXcKIHsKLSAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHRO UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIF9tYWlu Vmlld1NpemUud2lkdGgsIF9tYWluVmlld1NpemUuaGVpZ2h0KV0pOwotICAgIFt3ZWJWaWV3IF9z ZXRJZ25vcmVzTm9uV2hlZWxNb3VzZUV2ZW50czpZRVNdOwotICAgIGlmIChfdXJsKSB7Ci0gICAg ICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6 X3VybC5nZXQoKV07Ci0gICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAg IE5TUmVjdCBkZWZhdWx0RnJhbWUgPSBOU01ha2VSZWN0KDAsIDAsIF9tYWluVmlld1NpemUud2lk dGgsIF9tYWluVmlld1NpemUuaGVpZ2h0KTsKKyAgICBSZXRhaW5QdHI8TlNWaWV3PiBwcmV2aWV3 VmlldyA9IFtfZGVsZWdhdGUgcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcjpzZWxmIHZpZXdGb3JQ cmV2aWV3aW5nVVJMOl91cmwuZ2V0KCkgaW5pdGlhbEZyYW1lU2l6ZTpkZWZhdWx0RnJhbWUuc2l6 ZV07CisgICAgaWYgKCFwcmV2aWV3VmlldykgeworICAgICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3 PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpkZWZh dWx0RnJhbWVdKTsKKyAgICAgICAgW3dlYlZpZXcgX3NldElnbm9yZXNOb25XaGVlbE1vdXNlRXZl bnRzOllFU107CisgICAgICAgIGlmIChfdXJsKSB7CisgICAgICAgICAgICBOU1VSTFJlcXVlc3Qg KnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOl91cmwuZ2V0KCldOworICAg ICAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgICAgIH0KKyAgICAg ICAgcHJldmlld1ZpZXcgPSB3ZWJWaWV3OwogICAgIH0KIAotICAgIC8vIFNldHRpbmcgdGhlIHdl YlZpZXcgYm91bmRzIHdpbGwgc2NhbGUgaXQgdG8gNzUlIG9mIHRoZSBfbWFpblZpZXdTaXplLiAK LSAgICBbd2ViVmlldyBzZXRCb3VuZHM6TlNNYWtlUmVjdCgwLCAwLCBfbWFpblZpZXdTaXplLndp ZHRoIC8gX3BvcG92ZXJUb1ZpZXdTY2FsZSwgX21haW5WaWV3U2l6ZS5oZWlnaHQgLyBfcG9wb3Zl clRvVmlld1NjYWxlKV07CisgICAgLy8gU2V0dGluZyB0aGUgd2ViVmlldyBib3VuZHMgd2lsbCBz Y2FsZSBpdCB0byA3NSUgb2YgdGhlIF9tYWluVmlld1NpemUuCisgICAgW3ByZXZpZXdWaWV3IHNl dEJvdW5kczpOU01ha2VSZWN0KDAsIDAsIF9tYWluVmlld1NpemUud2lkdGggLyBfcG9wb3ZlclRv Vmlld1NjYWxlLCBfbWFpblZpZXdTaXplLmhlaWdodCAvIF9wb3BvdmVyVG9WaWV3U2NhbGUpXTsK IAogICAgIFJldGFpblB0cjxOU0NsaWNrR2VzdHVyZVJlY29nbml6ZXI+IGNsaWNrUmVjb2duaXpl ciA9IGFkb3B0TlMoW1tOU0NsaWNrR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFy Z2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihfY2xpY2tSZWNvZ25pemVkOildKTsKLSAgICBbd2Vi VmlldyBhZGRHZXN0dXJlUmVjb2duaXplcjpjbGlja1JlY29nbml6ZXIuZ2V0KCldOwotICAgIHNl bGYudmlldyA9IHdlYlZpZXcuZ2V0KCk7CisgICAgW3ByZXZpZXdWaWV3IGFkZEdlc3R1cmVSZWNv Z25pemVyOmNsaWNrUmVjb2duaXplci5nZXQoKV07CisgICAgc2VsZi52aWV3ID0gcHJldmlld1Zp ZXcuZ2V0KCk7CiB9CiAKIC0gKHZvaWQpX2NsaWNrUmVjb2duaXplZDooTlNHZXN0dXJlUmVjb2du aXplciAqKWdlc3R1cmVSZWNvZ25pemVyCkBAIC04MzMsNiArODM5LDExIEBAIHN0YXRpYyBOU0lt YWdlICp3ZWJLaXRCdW5kbGVJbWFnZU5hbWVkKE5TU3RyaW5nICpuYW1lKQogCiAjcHJhZ21hIG1h cmsgV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyRGVsZWdhdGUKIAorLSAoTlNWaWV3ICopcGFn ZVByZXZpZXdWaWV3Q29udHJvbGxlcjooV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyICopcGFn ZVByZXZpZXdWaWV3Q29udHJvbGxlciB2aWV3Rm9yUHJldmlld2luZ1VSTDooTlNVUkwgKil1cmwg aW5pdGlhbEZyYW1lU2l6ZTooTlNTaXplKWluaXRpYWxGcmFtZVNpemUKK3sKKyAgICByZXR1cm4g W193a1ZpZXcgX3ZpZXdGb3JQcmV2aWV3aW5nVVJMOnVybCBpbml0aWFsRnJhbWVTaXplOmluaXRp YWxGcmFtZVNpemVdOworfQorCiAtICh2b2lkKXBhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXJXYXND bGlja2VkOihXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgKilwYWdlUHJldmlld1ZpZXdDb250 cm9sbGVyCiB7CiAgICAgaWYgKE5TVVJMICp1cmwgPSBwYWdlUHJldmlld1ZpZXdDb250cm9sbGVy LT5fdXJsLmdldCgpKQo=