138370 2014-11-04 13:50:47 -0800 Use a web view for Quick Look in action menus 2014-11-04 17:48:53 -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 mitz sam thorton webkit-bug-importer oldest_to_newest 1046160 0 conrad_shultz 2014-11-04 13:50:47 -0800 WebKit should manage its own view for the Quick Look menu item. 1046161 1 webkit-bug-importer 2014-11-04 13:54:17 -0800 <rdar://problem/18871842> 1046179 2 240948 conrad_shultz 2014-11-04 14:23:00 -0800 Created attachment 240948 Patch 1046190 3 240948 andersca 2014-11-04 14:53:15 -0800 Comment on attachment 240948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240948&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:70 > +@interface _WKPagePreviewViewController : NSViewController { This does not be prefixed by an underscore since it's an internal class. 1046196 4 240948 thorton 2014-11-04 15:02:55 -0800 Comment on attachment 240948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240948&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:71 > + @private; don't think that semicolon belongs, does it? > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:91 > + _preferredSize = NSMakeSize(320, 568); Where do these crazy numbers come from! > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:223 > + NSPopover *popover = [[NSPopover alloc] init]; is the memory management of popover correct? 1046203 5 conrad_shultz 2014-11-04 15:07:47 -0800 (In reply to comment #3) > Comment on attachment 240948 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240948&action=review > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:70 > > +@interface _WKPagePreviewViewController : NSViewController { > > This does not be prefixed by an underscore since it's an internal class. Removed. 1046212 6 conrad_shultz 2014-11-04 15:18:59 -0800 (In reply to comment #4) > Comment on attachment 240948 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240948&action=review > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:71 > > + @private; > > don't think that semicolon belongs, does it? Nope, not sure how that snuck in. > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:91 > > + _preferredSize = NSMakeSize(320, 568); > > Where do these crazy numbers come from! "somewhat arbitrary" = "iPhone 5 screen size"; I'll add that to the ChangeLog. > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:223 > > + NSPopover *popover = [[NSPopover alloc] init]; > > is the memory management of popover correct? No, that should use RetainPtr too. New patch coming. 1046214 7 240959 conrad_shultz 2014-11-04 15:22:13 -0800 Created attachment 240959 Patch 1046216 8 240961 conrad_shultz 2014-11-04 15:23:18 -0800 Created attachment 240961 Patch 1046226 9 240961 andersca 2014-11-04 15:39:36 -0800 Comment on attachment 240961 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240961&action=review > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:71 > + @private I don't think this needs to be indented. > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:77 > +@property (nonatomic, readonly) NSURL *url; > +@property (nonatomic) NSSize preferredSize; I think these can just be ivars, they don't need to be properties. 1046238 10 conrad_shultz 2014-11-04 15:49:55 -0800 (In reply to comment #9) > Comment on attachment 240961 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240961&action=review > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:71 > > + @private > > I don't think this needs to be indented. Fixed. > > > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:77 > > +@property (nonatomic, readonly) NSURL *url; > > +@property (nonatomic) NSSize preferredSize; > > I think these can just be ivars, they don't need to be properties. It feels really strange to me to prefer direct ivar access, but I'll post a new version doing so. 1046239 11 240971 conrad_shultz 2014-11-04 15:52:13 -0800 Created attachment 240971 Patch 1046276 12 240971 commit-queue 2014-11-04 16:35:24 -0800 Comment on attachment 240971 Patch Clearing flags on attachment: 240971 Committed r175589: <http://trac.webkit.org/changeset/175589> 1046277 13 commit-queue 2014-11-04 16:35:27 -0800 All reviewed patches have been landed. Closing bug. 1046320 14 thorton 2014-11-04 17:48:53 -0800 Build fix in http://trac.webkit.org/changeset/175591 240948 2014-11-04 14:23:00 -0800 2014-11-04 15:22:10 -0800 Patch bug-138370-20141104142310.patch text/plain 6800 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uN2IxOWIyN2ZhZGVlNjcxY2EyMzM0NTRjYmQ0YjMy Zjg0NjZmMmFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGEgd2Vi IHZpZXcgZm9yIFF1aWNrIExvb2sgaW4gYWN0aW9uIG1lbnVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzNzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHVzaW5nIHRoZSBRTFByZXZp ZXdCdWJibGUgU1BJLCBzaG93IGEgcG9wb3ZlciBjb250YWluaW5nIGEgd2ViIHZpZXcuIFRoaXMg Y3VycmVudGx5CisgICAgICAgIGRvZXMgbm90IGluaGVyaXQgYW55IGNvbmZpZ3VyYXRpb24gZnJv bSB0aGUgcHJlc2VudGluZyBXS1ZpZXcgYW5kIGRvZXMgbm90IGV4cG9zZSBhbnkKKyAgICAgICAg Y3VzdG9taXphdGlvbiBvcHRpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlv bk1lbnVDb250cm9sbGVyLm1tOgorICAgICAgICBEZWNsYXJlIG5ldyBpbnRlcm5hbCBOU1ZpZXdD b250cm9sbGVyIHN1YmNsYXNzLCBfV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLgorICAgICAg ICAoLVtfV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIGluaXRXaXRoUGFnZVVSTDpdKToKKyAg ICAgICAgU3RvcmUgdGhlIHBhc3NlZC1pbiBVUkwgYW5kIHNldCBhIHNvbWV3aGF0IGFyYml0cmFy eSBkZWZhdWx0IHByZWZlcnJlZCBzaXplLgorICAgICAgICAoLVtfV0tQYWdlUHJldmlld1ZpZXdD b250cm9sbGVyIHVybF0pOgorICAgICAgICBBY2Nlc3Nvci4KKyAgICAgICAgKC1bX1dLUGFnZVBy ZXZpZXdWaWV3Q29udHJvbGxlciBsb2FkVmlld10pOgorICAgICAgICBDcmVhdGUgYSBXS1dlYlZp ZXcgYW5kIGxvYWQgdGhlIFVSTCBwYXNzZWQgaW50byB0aGUgaW5pdGlhbGl6ZXIuCisgICAgICAg ICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX3ByZXZpZXdVUkxGcm9tQWN0aW9uTWVudTpdKToK KyAgICAgICAgUmVuYW1lZCBmcm9tIC1fcXVpY2tMb29rVVJMRnJvbUFjdGlvbk1lbnU6OyBwcmVz ZW50IHRoZSBwb3BvdmVyIHJldHVybmVkIGJ5IC1fcHJldmlld1BvcG92ZXJGb3JVUkw6LgorICAg ICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmV2aWV3UG9wb3ZlckZvclVSTDpdKToK KyAgICAgICAgTmV3IGhlbHBlciBtZXRob2Q7IHJldHVybiBhIHBvcG92ZXIgdGhhdCBvd25zIGEg X1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBjb25maWd1cmVkIHRvIHNob3cgYSBzY2FsZWQt ZG93biB3ZWIgcGFnZS4KKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRl QWN0aW9uTWVudUl0ZW1Gb3JUYWc6XSk6CisgICAgICAgIFVwZGF0ZSB0byByZWZsZWN0IG1ldGhv ZCByZW5hbWUuCisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX3F1aWNrTG9va1VS TEZyb21BY3Rpb25NZW51Ol0pOiBEZWxldGVkLgorCiAyMDE0LTExLTAzICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEV4cG9zZSB2aXNpYmxlRGVidWdP dmVybGF5UmVnaW9ucyBwcmVmIHZpYSB0aGUgV0syIEMgU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KaW5kZXggNTFm YTA3ZDQ0YTdhOTljYjkwMDhhN2JlMmI2MGJlMzQ5OTJmZDUxNC4uY2ZhMjFjNTg5NDExMGI3MDg0 ZGMyOGJiOGRiNDFlZTk0NDkzN2NiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQpAQCAtMzAsNiArMzAsNyBAQAog CiAjaW1wb3J0ICJXS05TVVJMRXh0cmFzLmgiCiAjaW1wb3J0ICJXS1ZpZXdJbnRlcm5hbC5oIgor I2ltcG9ydCAiV0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJXZWJDb250ZXh0LmgiCiAjaW1wb3J0ICJX ZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgIldlYlBhZ2VNZXNzYWdlcy5oIgpAQCAt NTEsMTcgKzUyLDYgQEAgZW51bSBjbGFzcyBNZW51VXBkYXRlU3RhZ2UgewogICAgIE1lbnVOZWVk c1VwZGF0ZQogfTsKIAotLy8gRklYTUU6IFRoaXMgc2hvdWxkIG1vdmUgaW50byBhbiBTUEkgaGVh ZGVyIGlmIGl0IHN0YXlzLgotQGNsYXNzIFFMUHJldmlld0J1YmJsZTsKLUBpbnRlcmZhY2UgTlNP YmplY3QgKFdLUUxQcmV2aWV3QnViYmxlRGV0YWlscykKLUBwcm9wZXJ0eSAoY29weSkgTlNBcnJh eSAqIGNvbnRyb2xzOwotQHByb3BlcnR5IE5TU2l6ZSBtYXhpbXVtU2l6ZTsKLUBwcm9wZXJ0eSBO U1JlY3RFZGdlIHByZWZlcnJlZEVkZ2U7Ci1AcHJvcGVydHkgKHJldGFpbikgSUJPdXRsZXQgTlNX aW5kb3cqIHBhcmVudFdpbmRvdzsKLS0gKHZvaWQpc2hvd1ByZXZpZXdJdGVtOihpZClwcmV2aWV3 SXRlbSBpdGVtRnJhbWU6KE5TUmVjdClmcmFtZTsKLS0gKHZvaWQpc2V0QXV0b21hdGljYWxseUNs b3NlV2l0aE1hc2s6KE5TRXZlbnRNYXNrKWF1dG9jbG9zZU1hc2sgZmlsdGVyTWFzazooTlNFdmVu dE1hc2spZmlsdGVyTWFzayBibG9jazoodm9pZCAoXikodm9pZCkpYmxvY2s7Ci1AZW5kCi0KIFNP RlRfTElOS19GUkFNRVdPUktfSU5fVU1CUkVMTEEoUXVhcnR6LCBJbWFnZUtpdCkKIFNPRlRfTElO S19DTEFTUyhJbWFnZUtpdCwgSUtTbGlkZXNob3cpCiAKQEAgLTc3LDYgKzY3LDQ5IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAtIChOU0FycmF5ICopX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRl c3RSZXN1bHQ6KFdLSGl0VGVzdFJlc3VsdFJlZiloaXRUZXN0UmVzdWx0IGRlZmF1bHRBY3Rpb25N ZW51SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVudUl0ZW1zOwogQGVuZAogCitAaW50ZXJmYWNl IF9XS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgOiBOU1ZpZXdDb250cm9sbGVyIHsKKyAgICBA cHJpdmF0ZTsKKyAgICBSZXRhaW5QdHI8TlNVUkw+IF91cmw7CisgICAgTlNTaXplIF9wcmVmZXJy ZWRTaXplOworfQorCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVVJMICp1cmw7 CitAcHJvcGVydHkgKG5vbmF0b21pYykgTlNTaXplIHByZWZlcnJlZFNpemU7CisKKy0gKGluc3Rh bmNldHlwZSlpbml0V2l0aFBhZ2VVUkw6KE5TVVJMICopVVJMOworCitAZW5kCisKK0BpbXBsZW1l bnRhdGlvbiBfV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyCisKKy0gKGluc3RhbmNldHlwZSlp bml0V2l0aFBhZ2VVUkw6KE5TVVJMICopVVJMCit7CisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBp bml0XSkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBfdXJsID0gVVJMOworICAgIF9wcmVm ZXJyZWRTaXplID0gTlNNYWtlU2l6ZSgzMjAsIDU2OCk7CisKKyAgICByZXR1cm4gc2VsZjsKK30K KworLSAoTlNVUkwgKil1cmwKK3sKKyAgICByZXR1cm4gX3VybC5nZXQoKTsKK30KKworLSAodm9p ZClsb2FkVmlldworeworICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IFtbV0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgX3ByZWZlcnJlZFNpemUud2lkdGgsIF9w cmVmZXJyZWRTaXplLmhlaWdodCldOworICAgIGlmIChfdXJsKSB7CisgICAgICAgIE5TVVJMUmVx dWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6X3VybC5nZXQoKV07 CisgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIH0KKyAgICBbc2Vs ZiBzZXRWaWV3OndlYlZpZXddOworfQorCitAZW5kCisKIEBpbXBsZW1lbnRhdGlvbiBXS0FjdGlv bk1lbnVDb250cm9sbGVyCiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYlBhZ2VQ cm94eSYpcGFnZSB2aWV3OihXS1ZpZXcgKil3a1ZpZXcKQEAgLTE3MywyMyArMjA2LDI0IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAgW3NlcnZpY2UgcGVyZm9ybVdpdGhJdGVtczpAWyBb TlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VS TCgpXSBdXTsKIH0KIAotLSAodm9pZClfcXVpY2tMb29rVVJMRnJvbUFjdGlvbk1lbnU6KGlkKXNl bmRlcgorLSAodm9pZClfcHJldmlld1VSTEZyb21BY3Rpb25NZW51OihpZClzZW5kZXIKIHsKICAg ICBXZWJIaXRUZXN0UmVzdWx0KiBoaXRUZXN0UmVzdWx0ID0gX3BhZ2UtPmxhc3RNb3VzZU1vdmVI aXRUZXN0UmVzdWx0KCk7Ci0gICAgTlNSZWN0IGl0ZW1GcmFtZSA9IFtfd2tWaWV3IGNvbnZlcnRS ZWN0OmhpdFRlc3RSZXN1bHQtPmVsZW1lbnRCb3VuZGluZ0JveCgpIHRvVmlldzpuaWxdOwotICAg IE5TU2l6ZSBtYXhpbXVtUHJldmlld1NpemUgPSBOU01ha2VTaXplKF93a1ZpZXcuYm91bmRzLnNp emUud2lkdGggKiAwLjc1LCBfd2tWaWV3LmJvdW5kcy5zaXplLmhlaWdodCAqIDAuNzUpOwotCi0g ICAgUmV0YWluUHRyPFFMUHJldmlld0J1YmJsZT4gYnViYmxlID0gYWRvcHROUyhbW05TQ2xhc3NG cm9tU3RyaW5nKEAiUUxQcmV2aWV3QnViYmxlIikgYWxsb2NdIGluaXRdKTsKLSAgICBbYnViYmxl IHNldFBhcmVudFdpbmRvdzpfd2tWaWV3LndpbmRvd107Ci0gICAgW2J1YmJsZSBzZXRNYXhpbXVt U2l6ZTptYXhpbXVtUHJldmlld1NpemVdOwotICAgIFtidWJibGUgc2V0UHJlZmVycmVkRWRnZTpO U01heFlFZGdlXTsKLSAgICBbYnViYmxlIHNldENvbnRyb2xzOkBbIF1dOwotICAgIE5TRXZlbnRN YXNrIGZpbHRlck1hc2sgPSBOU0FueUV2ZW50TWFzayAmIH4oTlNBcHBLaXREZWZpbmVkTWFzayB8 IE5TU3lzdGVtRGVmaW5lZE1hc2sgfCBOU0FwcGxpY2F0aW9uRGVmaW5lZE1hc2sgfCBOU01vdXNl RW50ZXJlZE1hc2sgfCBOU01vdXNlRXhpdGVkTWFzayk7Ci0gICAgTlNFdmVudE1hc2sgYXV0b2Ns b3NlTWFzayA9IE5TTGVmdE1vdXNlRG93bk1hc2sgfCBOU1JpZ2h0TW91c2VEb3duTWFzayB8IE5T S2V5RG93bk1hc2s7Ci0gICAgW2J1YmJsZSBzZXRBdXRvbWF0aWNhbGx5Q2xvc2VXaXRoTWFzazph dXRvY2xvc2VNYXNrIGZpbHRlck1hc2s6ZmlsdGVyTWFzayBibG9jazpbYnViYmxlXSB7Ci0gICAg ICAgIFtidWJibGUgY2xvc2VdOwotICAgIH1dOwotICAgIFtidWJibGUgc2hvd1ByZXZpZXdJdGVt OltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVMaW5r VVJMKCldIGl0ZW1GcmFtZTppdGVtRnJhbWVdOworICAgIE5TVVJMICp1cmwgPSBbTlNVUkwgX3dl Yl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXTsKKyAg ICBSZXRhaW5QdHI8TlNQb3BvdmVyPiBwb3BvdmVyID0gYWRvcHROUyhbc2VsZiBfcHJldmlld1Bv cG92ZXJGb3JVUkw6dXJsXSk7CisgICAgW3BvcG92ZXIgc2hvd1JlbGF0aXZlVG9SZWN0OmhpdFRl c3RSZXN1bHQtPmVsZW1lbnRCb3VuZGluZ0JveCgpIG9mVmlldzpfd2tWaWV3IHByZWZlcnJlZEVk Z2U6TlNNYXhZRWRnZV07Cit9CisKKy0gKE5TUG9wb3ZlciAqKV9wcmV2aWV3UG9wb3ZlckZvclVS TDooTlNVUkwgKil1cmwKK3sKKyAgICBSZXRhaW5QdHI8X1dLUGFnZVByZXZpZXdWaWV3Q29udHJv bGxlcj4gcHJldmlld1ZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbW19XS1BhZ2VQcmV2aWV3Vmll d0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUGFnZVVSTDp1cmxdKTsKKyAgICBOU1JlY3Qgd2tW aWV3Qm91bmRzID0gW193a1ZpZXcgYm91bmRzXTsKKyAgICBbcHJldmlld1ZpZXdDb250cm9sbGVy IHNldFByZWZlcnJlZFNpemU6TlNNYWtlU2l6ZShOU1dpZHRoKHdrVmlld0JvdW5kcykgKiAwLjc1 LCBOU0hlaWdodCh3a1ZpZXdCb3VuZHMpICogMC43NSldOworCisgICAgTlNQb3BvdmVyICpwb3Bv dmVyID0gW1tOU1BvcG92ZXIgYWxsb2NdIGluaXRdOworICAgIFtwb3BvdmVyIHNldEJlaGF2aW9y Ok5TUG9wb3ZlckJlaGF2aW9yVHJhbnNpZW50XTsKKyAgICBbcG9wb3ZlciBzZXRDb250ZW50Vmll d0NvbnRyb2xsZXI6cHJldmlld1ZpZXdDb250cm9sbGVyLmdldCgpXTsKKyAgICByZXR1cm4gcG9w b3ZlcjsKIH0KIAogI3ByYWdtYSBtYXJrIEltYWdlIGFjdGlvbnMKQEAgLTQ2NSw3ICs0OTksNyBA QCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRG aWxlbmFtZSkKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIGtXS0NvbnRleHRBY3Rpb25JdGVt VGFnUHJldmlld0xpbms6Ci0gICAgICAgIHNlbGVjdG9yID0gQHNlbGVjdG9yKF9xdWlja0xvb2tV UkxGcm9tQWN0aW9uTWVudTopOworICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfcHJldmll d1VSTEZyb21BY3Rpb25NZW51Oik7CiAgICAgICAgIHRpdGxlID0gQCJQcmV2aWV3IjsKICAgICAg ICAgaW1hZ2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51UXVpY2tMb29rIl07 CiAgICAgICAgIGJyZWFrOwo= 240959 2014-11-04 15:22:13 -0800 2014-11-04 15:23:15 -0800 Patch bug-138370-20141104152223.patch text/plain 6851 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uZjdhOWRhNWMzMjg5YTBmY2EzYTBlMmZmZDQyN2Rk Y2FmYjhjODBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGEgd2Vi IHZpZXcgZm9yIFF1aWNrIExvb2sgaW4gYWN0aW9uIG1lbnVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzNzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHVzaW5nIHRoZSBRTFByZXZp ZXdCdWJibGUgU1BJLCBzaG93IGEgcG9wb3ZlciBjb250YWluaW5nIGEgd2ViIHZpZXcuIFRoaXMg Y3VycmVudGx5CisgICAgICAgIGRvZXMgbm90IGluaGVyaXQgYW55IGNvbmZpZ3VyYXRpb24gZnJv bSB0aGUgcHJlc2VudGluZyBXS1ZpZXcgYW5kIGRvZXMgbm90IGV4cG9zZSBhbnkKKyAgICAgICAg Y3VzdG9taXphdGlvbiBvcHRpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlv bk1lbnVDb250cm9sbGVyLm1tOgorICAgICAgICBEZWNsYXJlIG5ldyBpbnRlcm5hbCBOU1ZpZXdD b250cm9sbGVyIHN1YmNsYXNzLCBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIuCisgICAgICAg ICgtW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBpbml0V2l0aFBhZ2VVUkw6XSk6CisgICAg ICAgIFN0b3JlIHRoZSBwYXNzZWQtaW4gVVJMIGFuZCBzZXQgYSBzb21ld2hhdCBhcmJpdHJhcnkg KGlQaG9uZSA1IHNjcmVlbiBzaXplKSBkZWZhdWx0IHByZWZlcnJlZCBzaXplLgorICAgICAgICAo LVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgdXJsXSk6CisgICAgICAgIEFjY2Vzc29yLgor ICAgICAgICAoLVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAg ICAgQ3JlYXRlIGEgV0tXZWJWaWV3IGFuZCBsb2FkIHRoZSBVUkwgcGFzc2VkIGludG8gdGhlIGlu aXRpYWxpemVyLgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmV2aWV3VVJM RnJvbUFjdGlvbk1lbnU6XSk6CisgICAgICAgIFJlbmFtZWQgZnJvbSAtX3F1aWNrTG9va1VSTEZy b21BY3Rpb25NZW51OjsgcHJlc2VudCB0aGUgcG9wb3ZlciByZXR1cm5lZCBieSAtX3ByZXZpZXdQ b3BvdmVyRm9yVVJMOi4KKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRl UHJldmlld1BvcG92ZXJGb3JVUkw6XSk6CisgICAgICAgIE5ldyBoZWxwZXIgbWV0aG9kOyByZXR1 cm4gYSBwb3BvdmVyIHRoYXQgb3ducyBhIF9XS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgY29u ZmlndXJlZCB0byBzaG93IGEgc2NhbGVkLWRvd24gd2ViIHBhZ2UuCisgICAgICAgICgtW1dLQWN0 aW9uTWVudUNvbnRyb2xsZXIgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOl0pOgorICAgICAg ICBVcGRhdGUgdG8gcmVmbGVjdCBtZXRob2QgcmVuYW1lLgorICAgICAgICAoLVtXS0FjdGlvbk1l bnVDb250cm9sbGVyIF9xdWlja0xvb2tVUkxGcm9tQWN0aW9uTWVudTpdKTogRGVsZXRlZC4KKwog MjAxNC0xMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBFeHBvc2UgdmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgcHJlZiB2aWEgdGhlIFdLMiBD IFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1l bnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1l bnVDb250cm9sbGVyLm1tCmluZGV4IDUxZmEwN2Q0NGE3YTk5Y2I5MDA4YTdiZTJiNjBiZTM0OTky ZmQ1MTQuLmIzY2RjMzJiODAzYmU5YWE4YzQ2NDRhOTdhOTZmZDA3NDQ5OWZiMmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xs ZXIubW0KQEAgLTMwLDYgKzMwLDcgQEAKIAogI2ltcG9ydCAiV0tOU1VSTEV4dHJhcy5oIgogI2lt cG9ydCAiV0tWaWV3SW50ZXJuYWwuaCIKKyNpbXBvcnQgIldLV2ViVmlldy5oIgogI2ltcG9ydCAi V2ViQ29udGV4dC5oIgogI2ltcG9ydCAiV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmgiCiAjaW1wb3J0 ICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTUxLDE3ICs1Miw2IEBAIGVudW0gY2xhc3MgTWVudVVw ZGF0ZVN0YWdlIHsKICAgICBNZW51TmVlZHNVcGRhdGUKIH07CiAKLS8vIEZJWE1FOiBUaGlzIHNo b3VsZCBtb3ZlIGludG8gYW4gU1BJIGhlYWRlciBpZiBpdCBzdGF5cy4KLUBjbGFzcyBRTFByZXZp ZXdCdWJibGU7Ci1AaW50ZXJmYWNlIE5TT2JqZWN0IChXS1FMUHJldmlld0J1YmJsZURldGFpbHMp Ci1AcHJvcGVydHkgKGNvcHkpIE5TQXJyYXkgKiBjb250cm9sczsKLUBwcm9wZXJ0eSBOU1NpemUg bWF4aW11bVNpemU7Ci1AcHJvcGVydHkgTlNSZWN0RWRnZSBwcmVmZXJyZWRFZGdlOwotQHByb3Bl cnR5IChyZXRhaW4pIElCT3V0bGV0IE5TV2luZG93KiBwYXJlbnRXaW5kb3c7Ci0tICh2b2lkKXNo b3dQcmV2aWV3SXRlbTooaWQpcHJldmlld0l0ZW0gaXRlbUZyYW1lOihOU1JlY3QpZnJhbWU7Ci0t ICh2b2lkKXNldEF1dG9tYXRpY2FsbHlDbG9zZVdpdGhNYXNrOihOU0V2ZW50TWFzaylhdXRvY2xv c2VNYXNrIGZpbHRlck1hc2s6KE5TRXZlbnRNYXNrKWZpbHRlck1hc2sgYmxvY2s6KHZvaWQgKF4p KHZvaWQpKWJsb2NrOwotQGVuZAotCiBTT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExBKFF1 YXJ0eiwgSW1hZ2VLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoSW1hZ2VLaXQsIElLU2xpZGVzaG93KQog CkBAIC03Nyw2ICs2Nyw0OSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogLSAoTlNBcnJheSAq KV9hY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OihXS0hpdFRlc3RSZXN1bHRSZWYpaGl0 VGVzdFJlc3VsdCBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0FycmF5ICopZGVmYXVsdE1lbnVJ dGVtczsKIEBlbmQKIAorQGludGVyZmFjZSBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgOiBO U1ZpZXdDb250cm9sbGVyIHsKKyAgICBAcHJpdmF0ZQorICAgIFJldGFpblB0cjxOU1VSTD4gX3Vy bDsKKyAgICBOU1NpemUgX3ByZWZlcnJlZFNpemU7Cit9CisKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj LCByZWFkb25seSkgTlNVUkwgKnVybDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBOU1NpemUgcHJl ZmVycmVkU2l6ZTsKKworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZVVSTDooTlNVUkwgKilV Ukw7CisKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxl cgorCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlVVJMOihOU1VSTCAqKVVSTAoreworICAg IGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAg X3VybCA9IFVSTDsKKyAgICBfcHJlZmVycmVkU2l6ZSA9IE5TTWFrZVNpemUoMzIwLCA1NjgpOwor CisgICAgcmV0dXJuIHNlbGY7Cit9CisKKy0gKE5TVVJMICopdXJsCit7CisgICAgcmV0dXJuIF91 cmwuZ2V0KCk7Cit9CisKKy0gKHZvaWQpbG9hZFZpZXcKK3sKKyAgICBXS1dlYlZpZXcgKndlYlZp ZXcgPSBbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIF9w cmVmZXJyZWRTaXplLndpZHRoLCBfcHJlZmVycmVkU2l6ZS5oZWlnaHQpXTsKKyAgICBpZiAoX3Vy bCkgeworICAgICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVl c3RXaXRoVVJMOl91cmwuZ2V0KCldOworICAgICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1 ZXN0XTsKKyAgICB9CisgICAgW3NlbGYgc2V0Vmlldzp3ZWJWaWV3XTsKK30KKworQGVuZAorCiBA aW1wbGVtZW50YXRpb24gV0tBY3Rpb25NZW51Q29udHJvbGxlcgogCiAtIChpbnN0YW5jZXR5cGUp aW5pdFdpdGhQYWdlOihXZWJQYWdlUHJveHkmKXBhZ2UgdmlldzooV0tWaWV3ICopd2tWaWV3CkBA IC0xNzMsMjMgKzIwNiwyNCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogICAgIFtzZXJ2aWNl IHBlcmZvcm1XaXRoSXRlbXM6QFsgW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpoaXRUZXN0 UmVzdWx0LT5hYnNvbHV0ZUxpbmtVUkwoKV0gXV07CiB9CiAKLS0gKHZvaWQpX3F1aWNrTG9va1VS TEZyb21BY3Rpb25NZW51OihpZClzZW5kZXIKKy0gKHZvaWQpX3ByZXZpZXdVUkxGcm9tQWN0aW9u TWVudTooaWQpc2VuZGVyCiB7CiAgICAgV2ViSGl0VGVzdFJlc3VsdCogaGl0VGVzdFJlc3VsdCA9 IF9wYWdlLT5sYXN0TW91c2VNb3ZlSGl0VGVzdFJlc3VsdCgpOwotICAgIE5TUmVjdCBpdGVtRnJh bWUgPSBbX3drVmlldyBjb252ZXJ0UmVjdDpoaXRUZXN0UmVzdWx0LT5lbGVtZW50Qm91bmRpbmdC b3goKSB0b1ZpZXc6bmlsXTsKLSAgICBOU1NpemUgbWF4aW11bVByZXZpZXdTaXplID0gTlNNYWtl U2l6ZShfd2tWaWV3LmJvdW5kcy5zaXplLndpZHRoICogMC43NSwgX3drVmlldy5ib3VuZHMuc2l6 ZS5oZWlnaHQgKiAwLjc1KTsKLQotICAgIFJldGFpblB0cjxRTFByZXZpZXdCdWJibGU+IGJ1YmJs ZSA9IGFkb3B0TlMoW1tOU0NsYXNzRnJvbVN0cmluZyhAIlFMUHJldmlld0J1YmJsZSIpIGFsbG9j XSBpbml0XSk7Ci0gICAgW2J1YmJsZSBzZXRQYXJlbnRXaW5kb3c6X3drVmlldy53aW5kb3ddOwot ICAgIFtidWJibGUgc2V0TWF4aW11bVNpemU6bWF4aW11bVByZXZpZXdTaXplXTsKLSAgICBbYnVi YmxlIHNldFByZWZlcnJlZEVkZ2U6TlNNYXhZRWRnZV07Ci0gICAgW2J1YmJsZSBzZXRDb250cm9s czpAWyBdXTsKLSAgICBOU0V2ZW50TWFzayBmaWx0ZXJNYXNrID0gTlNBbnlFdmVudE1hc2sgJiB+ KE5TQXBwS2l0RGVmaW5lZE1hc2sgfCBOU1N5c3RlbURlZmluZWRNYXNrIHwgTlNBcHBsaWNhdGlv bkRlZmluZWRNYXNrIHwgTlNNb3VzZUVudGVyZWRNYXNrIHwgTlNNb3VzZUV4aXRlZE1hc2spOwot ICAgIE5TRXZlbnRNYXNrIGF1dG9jbG9zZU1hc2sgPSBOU0xlZnRNb3VzZURvd25NYXNrIHwgTlNS aWdodE1vdXNlRG93bk1hc2sgfCBOU0tleURvd25NYXNrOwotICAgIFtidWJibGUgc2V0QXV0b21h dGljYWxseUNsb3NlV2l0aE1hc2s6YXV0b2Nsb3NlTWFzayBmaWx0ZXJNYXNrOmZpbHRlck1hc2sg YmxvY2s6W2J1YmJsZV0gewotICAgICAgICBbYnViYmxlIGNsb3NlXTsKLSAgICB9XTsKLSAgICBb YnViYmxlIHNob3dQcmV2aWV3SXRlbTpbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRl c3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXSBpdGVtRnJhbWU6aXRlbUZyYW1lXTsKKyAgICBO U1VSTCAqdXJsID0gW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpoaXRUZXN0UmVzdWx0LT5h YnNvbHV0ZUxpbmtVUkwoKV07CisgICAgUmV0YWluUHRyPE5TUG9wb3Zlcj4gcG9wb3ZlciA9IFtz ZWxmIF9jcmVhdGVQcmV2aWV3UG9wb3ZlckZvclVSTDp1cmxdOworICAgIFtwb3BvdmVyIHNob3dS ZWxhdGl2ZVRvUmVjdDpoaXRUZXN0UmVzdWx0LT5lbGVtZW50Qm91bmRpbmdCb3goKSBvZlZpZXc6 X3drVmlldyBwcmVmZXJyZWRFZGdlOk5TTWF4WUVkZ2VdOworfQorCistIChSZXRhaW5QdHI8TlNQ b3BvdmVyPilfY3JlYXRlUHJldmlld1BvcG92ZXJGb3JVUkw6KE5TVVJMICopdXJsCit7CisgICAg UmV0YWluUHRyPFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcj4gcHJldmlld1ZpZXdDb250cm9s bGVyID0gYWRvcHROUyhbW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdFdp dGhQYWdlVVJMOnVybF0pOworICAgIE5TUmVjdCB3a1ZpZXdCb3VuZHMgPSBbX3drVmlldyBib3Vu ZHNdOworICAgIFtwcmV2aWV3Vmlld0NvbnRyb2xsZXIgc2V0UHJlZmVycmVkU2l6ZTpOU01ha2VT aXplKE5TV2lkdGgod2tWaWV3Qm91bmRzKSAqIDAuNzUsIE5TSGVpZ2h0KHdrVmlld0JvdW5kcykg KiAwLjc1KV07CisKKyAgICBSZXRhaW5QdHI8TlNQb3BvdmVyPiBwb3BvdmVyID0gYWRvcHROUyhb W05TUG9wb3ZlciBhbGxvY10gaW5pdF0pOworICAgIFtwb3BvdmVyIHNldEJlaGF2aW9yOk5TUG9w b3ZlckJlaGF2aW9yVHJhbnNpZW50XTsKKyAgICBbcG9wb3ZlciBzZXRDb250ZW50Vmlld0NvbnRy b2xsZXI6cHJldmlld1ZpZXdDb250cm9sbGVyLmdldCgpXTsKKyAgICByZXR1cm4gcG9wb3ZlcjsK IH0KIAogI3ByYWdtYSBtYXJrIEltYWdlIGFjdGlvbnMKQEAgLTQ2NSw3ICs0OTksNyBAQCBzdGF0 aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRGaWxlbmFt ZSkKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnUHJl dmlld0xpbms6Ci0gICAgICAgIHNlbGVjdG9yID0gQHNlbGVjdG9yKF9xdWlja0xvb2tVUkxGcm9t QWN0aW9uTWVudTopOworICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfcHJldmlld1VSTEZy b21BY3Rpb25NZW51Oik7CiAgICAgICAgIHRpdGxlID0gQCJQcmV2aWV3IjsKICAgICAgICAgaW1h Z2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51UXVpY2tMb29rIl07CiAgICAg ICAgIGJyZWFrOwo= 240961 2014-11-04 15:23:18 -0800 2014-11-04 15:52:10 -0800 Patch bug-138370-20141104152328.patch text/plain 6857 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uOTJjNjc3ZTUzYzA2NzAwN2VhYTI3MDdiNTM3M2Yz OGNhNjFlMzAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGEgd2Vi IHZpZXcgZm9yIFF1aWNrIExvb2sgaW4gYWN0aW9uIG1lbnVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzNzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHVzaW5nIHRoZSBRTFByZXZp ZXdCdWJibGUgU1BJLCBzaG93IGEgcG9wb3ZlciBjb250YWluaW5nIGEgd2ViIHZpZXcuIFRoaXMg Y3VycmVudGx5CisgICAgICAgIGRvZXMgbm90IGluaGVyaXQgYW55IGNvbmZpZ3VyYXRpb24gZnJv bSB0aGUgcHJlc2VudGluZyBXS1ZpZXcgYW5kIGRvZXMgbm90IGV4cG9zZSBhbnkKKyAgICAgICAg Y3VzdG9taXphdGlvbiBvcHRpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlv bk1lbnVDb250cm9sbGVyLm1tOgorICAgICAgICBEZWNsYXJlIG5ldyBpbnRlcm5hbCBOU1ZpZXdD b250cm9sbGVyIHN1YmNsYXNzLCBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIuCisgICAgICAg ICgtW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBpbml0V2l0aFBhZ2VVUkw6XSk6CisgICAg ICAgIFN0b3JlIHRoZSBwYXNzZWQtaW4gVVJMIGFuZCBzZXQgYSBzb21ld2hhdCBhcmJpdHJhcnkg KGlQaG9uZSA1IHNjcmVlbiBzaXplKSBkZWZhdWx0IHByZWZlcnJlZCBzaXplLgorICAgICAgICAo LVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgdXJsXSk6CisgICAgICAgIEFjY2Vzc29yLgor ICAgICAgICAoLVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAg ICAgQ3JlYXRlIGEgV0tXZWJWaWV3IGFuZCBsb2FkIHRoZSBVUkwgcGFzc2VkIGludG8gdGhlIGlu aXRpYWxpemVyLgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmV2aWV3VVJM RnJvbUFjdGlvbk1lbnU6XSk6CisgICAgICAgIFJlbmFtZWQgZnJvbSAtX3F1aWNrTG9va1VSTEZy b21BY3Rpb25NZW51OjsgcHJlc2VudCB0aGUgcG9wb3ZlciByZXR1cm5lZCBieSAtX2NyZWF0ZVBy ZXZpZXdQb3BvdmVyRm9yVVJMOi4KKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBf Y3JlYXRlUHJldmlld1BvcG92ZXJGb3JVUkw6XSk6CisgICAgICAgIE5ldyBoZWxwZXIgbWV0aG9k OyByZXR1cm4gYSBwb3BvdmVyIHRoYXQgb3ducyBhIF9XS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xs ZXIgY29uZmlndXJlZCB0byBzaG93IGEgc2NhbGVkLWRvd24gd2ViIHBhZ2UuCisgICAgICAgICgt W1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOl0pOgor ICAgICAgICBVcGRhdGUgdG8gcmVmbGVjdCBtZXRob2QgcmVuYW1lLgorICAgICAgICAoLVtXS0Fj dGlvbk1lbnVDb250cm9sbGVyIF9xdWlja0xvb2tVUkxGcm9tQWN0aW9uTWVudTpdKTogRGVsZXRl ZC4KKwogMjAxNC0xMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBFeHBvc2UgdmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgcHJlZiB2aWEgdGhl IFdLMiBDIFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Fj dGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Fj dGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IDUxZmEwN2Q0NGE3YTk5Y2I5MDA4YTdiZTJiNjBi ZTM0OTkyZmQ1MTQuLmIzY2RjMzJiODAzYmU5YWE4YzQ2NDRhOTdhOTZmZDA3NDQ5OWZiMmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJv bGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNv bnRyb2xsZXIubW0KQEAgLTMwLDYgKzMwLDcgQEAKIAogI2ltcG9ydCAiV0tOU1VSTEV4dHJhcy5o IgogI2ltcG9ydCAiV0tWaWV3SW50ZXJuYWwuaCIKKyNpbXBvcnQgIldLV2ViVmlldy5oIgogI2lt cG9ydCAiV2ViQ29udGV4dC5oIgogI2ltcG9ydCAiV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmgiCiAj aW1wb3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTUxLDE3ICs1Miw2IEBAIGVudW0gY2xhc3Mg TWVudVVwZGF0ZVN0YWdlIHsKICAgICBNZW51TmVlZHNVcGRhdGUKIH07CiAKLS8vIEZJWE1FOiBU aGlzIHNob3VsZCBtb3ZlIGludG8gYW4gU1BJIGhlYWRlciBpZiBpdCBzdGF5cy4KLUBjbGFzcyBR TFByZXZpZXdCdWJibGU7Ci1AaW50ZXJmYWNlIE5TT2JqZWN0IChXS1FMUHJldmlld0J1YmJsZURl dGFpbHMpCi1AcHJvcGVydHkgKGNvcHkpIE5TQXJyYXkgKiBjb250cm9sczsKLUBwcm9wZXJ0eSBO U1NpemUgbWF4aW11bVNpemU7Ci1AcHJvcGVydHkgTlNSZWN0RWRnZSBwcmVmZXJyZWRFZGdlOwot QHByb3BlcnR5IChyZXRhaW4pIElCT3V0bGV0IE5TV2luZG93KiBwYXJlbnRXaW5kb3c7Ci0tICh2 b2lkKXNob3dQcmV2aWV3SXRlbTooaWQpcHJldmlld0l0ZW0gaXRlbUZyYW1lOihOU1JlY3QpZnJh bWU7Ci0tICh2b2lkKXNldEF1dG9tYXRpY2FsbHlDbG9zZVdpdGhNYXNrOihOU0V2ZW50TWFzaylh dXRvY2xvc2VNYXNrIGZpbHRlck1hc2s6KE5TRXZlbnRNYXNrKWZpbHRlck1hc2sgYmxvY2s6KHZv aWQgKF4pKHZvaWQpKWJsb2NrOwotQGVuZAotCiBTT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJF TExBKFF1YXJ0eiwgSW1hZ2VLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoSW1hZ2VLaXQsIElLU2xpZGVz aG93KQogCkBAIC03Nyw2ICs2Nyw0OSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogLSAoTlNB cnJheSAqKV9hY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OihXS0hpdFRlc3RSZXN1bHRS ZWYpaGl0VGVzdFJlc3VsdCBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0FycmF5ICopZGVmYXVs dE1lbnVJdGVtczsKIEBlbmQKIAorQGludGVyZmFjZSBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xs ZXIgOiBOU1ZpZXdDb250cm9sbGVyIHsKKyAgICBAcHJpdmF0ZQorICAgIFJldGFpblB0cjxOU1VS TD4gX3VybDsKKyAgICBOU1NpemUgX3ByZWZlcnJlZFNpemU7Cit9CisKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCByZWFkb25seSkgTlNVUkwgKnVybDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBOU1Np emUgcHJlZmVycmVkU2l6ZTsKKworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZVVSTDooTlNV UkwgKilVUkw7CisKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFdLUGFnZVByZXZpZXdWaWV3Q29u dHJvbGxlcgorCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlVVJMOihOU1VSTCAqKVVSTAor eworICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQorICAgICAgICByZXR1cm4gbmlsOwor CisgICAgX3VybCA9IFVSTDsKKyAgICBfcHJlZmVycmVkU2l6ZSA9IE5TTWFrZVNpemUoMzIwLCA1 NjgpOworCisgICAgcmV0dXJuIHNlbGY7Cit9CisKKy0gKE5TVVJMICopdXJsCit7CisgICAgcmV0 dXJuIF91cmwuZ2V0KCk7Cit9CisKKy0gKHZvaWQpbG9hZFZpZXcKK3sKKyAgICBXS1dlYlZpZXcg KndlYlZpZXcgPSBbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAs IDAsIF9wcmVmZXJyZWRTaXplLndpZHRoLCBfcHJlZmVycmVkU2l6ZS5oZWlnaHQpXTsKKyAgICBp ZiAoX3VybCkgeworICAgICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0 IHJlcXVlc3RXaXRoVVJMOl91cmwuZ2V0KCldOworICAgICAgICBbd2ViVmlldyBsb2FkUmVxdWVz dDpyZXF1ZXN0XTsKKyAgICB9CisgICAgW3NlbGYgc2V0Vmlldzp3ZWJWaWV3XTsKK30KKworQGVu ZAorCiBAaW1wbGVtZW50YXRpb24gV0tBY3Rpb25NZW51Q29udHJvbGxlcgogCiAtIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJQYWdlUHJveHkmKXBhZ2UgdmlldzooV0tWaWV3ICopd2tW aWV3CkBAIC0xNzMsMjMgKzIwNiwyNCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogICAgIFtz ZXJ2aWNlIHBlcmZvcm1XaXRoSXRlbXM6QFsgW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpo aXRUZXN0UmVzdWx0LT5hYnNvbHV0ZUxpbmtVUkwoKV0gXV07CiB9CiAKLS0gKHZvaWQpX3F1aWNr TG9va1VSTEZyb21BY3Rpb25NZW51OihpZClzZW5kZXIKKy0gKHZvaWQpX3ByZXZpZXdVUkxGcm9t QWN0aW9uTWVudTooaWQpc2VuZGVyCiB7CiAgICAgV2ViSGl0VGVzdFJlc3VsdCogaGl0VGVzdFJl c3VsdCA9IF9wYWdlLT5sYXN0TW91c2VNb3ZlSGl0VGVzdFJlc3VsdCgpOwotICAgIE5TUmVjdCBp dGVtRnJhbWUgPSBbX3drVmlldyBjb252ZXJ0UmVjdDpoaXRUZXN0UmVzdWx0LT5lbGVtZW50Qm91 bmRpbmdCb3goKSB0b1ZpZXc6bmlsXTsKLSAgICBOU1NpemUgbWF4aW11bVByZXZpZXdTaXplID0g TlNNYWtlU2l6ZShfd2tWaWV3LmJvdW5kcy5zaXplLndpZHRoICogMC43NSwgX3drVmlldy5ib3Vu ZHMuc2l6ZS5oZWlnaHQgKiAwLjc1KTsKLQotICAgIFJldGFpblB0cjxRTFByZXZpZXdCdWJibGU+ IGJ1YmJsZSA9IGFkb3B0TlMoW1tOU0NsYXNzRnJvbVN0cmluZyhAIlFMUHJldmlld0J1YmJsZSIp IGFsbG9jXSBpbml0XSk7Ci0gICAgW2J1YmJsZSBzZXRQYXJlbnRXaW5kb3c6X3drVmlldy53aW5k b3ddOwotICAgIFtidWJibGUgc2V0TWF4aW11bVNpemU6bWF4aW11bVByZXZpZXdTaXplXTsKLSAg ICBbYnViYmxlIHNldFByZWZlcnJlZEVkZ2U6TlNNYXhZRWRnZV07Ci0gICAgW2J1YmJsZSBzZXRD b250cm9sczpAWyBdXTsKLSAgICBOU0V2ZW50TWFzayBmaWx0ZXJNYXNrID0gTlNBbnlFdmVudE1h c2sgJiB+KE5TQXBwS2l0RGVmaW5lZE1hc2sgfCBOU1N5c3RlbURlZmluZWRNYXNrIHwgTlNBcHBs aWNhdGlvbkRlZmluZWRNYXNrIHwgTlNNb3VzZUVudGVyZWRNYXNrIHwgTlNNb3VzZUV4aXRlZE1h c2spOwotICAgIE5TRXZlbnRNYXNrIGF1dG9jbG9zZU1hc2sgPSBOU0xlZnRNb3VzZURvd25NYXNr IHwgTlNSaWdodE1vdXNlRG93bk1hc2sgfCBOU0tleURvd25NYXNrOwotICAgIFtidWJibGUgc2V0 QXV0b21hdGljYWxseUNsb3NlV2l0aE1hc2s6YXV0b2Nsb3NlTWFzayBmaWx0ZXJNYXNrOmZpbHRl ck1hc2sgYmxvY2s6W2J1YmJsZV0gewotICAgICAgICBbYnViYmxlIGNsb3NlXTsKLSAgICB9XTsK LSAgICBbYnViYmxlIHNob3dQcmV2aWV3SXRlbTpbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5n OmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXSBpdGVtRnJhbWU6aXRlbUZyYW1lXTsK KyAgICBOU1VSTCAqdXJsID0gW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpoaXRUZXN0UmVz dWx0LT5hYnNvbHV0ZUxpbmtVUkwoKV07CisgICAgUmV0YWluUHRyPE5TUG9wb3Zlcj4gcG9wb3Zl ciA9IFtzZWxmIF9jcmVhdGVQcmV2aWV3UG9wb3ZlckZvclVSTDp1cmxdOworICAgIFtwb3BvdmVy IHNob3dSZWxhdGl2ZVRvUmVjdDpoaXRUZXN0UmVzdWx0LT5lbGVtZW50Qm91bmRpbmdCb3goKSBv ZlZpZXc6X3drVmlldyBwcmVmZXJyZWRFZGdlOk5TTWF4WUVkZ2VdOworfQorCistIChSZXRhaW5Q dHI8TlNQb3BvdmVyPilfY3JlYXRlUHJldmlld1BvcG92ZXJGb3JVUkw6KE5TVVJMICopdXJsCit7 CisgICAgUmV0YWluUHRyPFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcj4gcHJldmlld1ZpZXdD b250cm9sbGVyID0gYWRvcHROUyhbW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBhbGxvY10g aW5pdFdpdGhQYWdlVVJMOnVybF0pOworICAgIE5TUmVjdCB3a1ZpZXdCb3VuZHMgPSBbX3drVmll dyBib3VuZHNdOworICAgIFtwcmV2aWV3Vmlld0NvbnRyb2xsZXIgc2V0UHJlZmVycmVkU2l6ZTpO U01ha2VTaXplKE5TV2lkdGgod2tWaWV3Qm91bmRzKSAqIDAuNzUsIE5TSGVpZ2h0KHdrVmlld0Jv dW5kcykgKiAwLjc1KV07CisKKyAgICBSZXRhaW5QdHI8TlNQb3BvdmVyPiBwb3BvdmVyID0gYWRv cHROUyhbW05TUG9wb3ZlciBhbGxvY10gaW5pdF0pOworICAgIFtwb3BvdmVyIHNldEJlaGF2aW9y Ok5TUG9wb3ZlckJlaGF2aW9yVHJhbnNpZW50XTsKKyAgICBbcG9wb3ZlciBzZXRDb250ZW50Vmll d0NvbnRyb2xsZXI6cHJldmlld1ZpZXdDb250cm9sbGVyLmdldCgpXTsKKyAgICByZXR1cm4gcG9w b3ZlcjsKIH0KIAogI3ByYWdtYSBtYXJrIEltYWdlIGFjdGlvbnMKQEAgLTQ2NSw3ICs0OTksNyBA QCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRG aWxlbmFtZSkKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIGtXS0NvbnRleHRBY3Rpb25JdGVt VGFnUHJldmlld0xpbms6Ci0gICAgICAgIHNlbGVjdG9yID0gQHNlbGVjdG9yKF9xdWlja0xvb2tV UkxGcm9tQWN0aW9uTWVudTopOworICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfcHJldmll d1VSTEZyb21BY3Rpb25NZW51Oik7CiAgICAgICAgIHRpdGxlID0gQCJQcmV2aWV3IjsKICAgICAg ICAgaW1hZ2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51UXVpY2tMb29rIl07 CiAgICAgICAgIGJyZWFrOwo= 240971 2014-11-04 15:52:13 -0800 2014-11-04 16:35:24 -0800 Patch bug-138370-20141104155223.patch text/plain 6657 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDZkYzFkZjA0ZTNhYTEy MjYxOWE0NTE5ZjZlMWRiOWI0ZDRlNzM4Yi4uNjIyYjNlMDIwOTYwZDM2Nzg5OTBiNGZlMWYyNDYy Yjc4OTEwMzBiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTExLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGEgd2Vi IHZpZXcgZm9yIFF1aWNrIExvb2sgaW4gYWN0aW9uIG1lbnVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzNzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHVzaW5nIHRoZSBRTFByZXZp ZXdCdWJibGUgU1BJLCBzaG93IGEgcG9wb3ZlciBjb250YWluaW5nIGEgd2ViIHZpZXcuIFRoaXMg Y3VycmVudGx5CisgICAgICAgIGRvZXMgbm90IGluaGVyaXQgYW55IGNvbmZpZ3VyYXRpb24gZnJv bSB0aGUgcHJlc2VudGluZyBXS1ZpZXcgYW5kIGRvZXMgbm90IGV4cG9zZSBhbnkKKyAgICAgICAg Y3VzdG9taXphdGlvbiBvcHRpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlv bk1lbnVDb250cm9sbGVyLm1tOgorICAgICAgICBEZWNsYXJlIG5ldyBpbnRlcm5hbCBOU1ZpZXdD b250cm9sbGVyIHN1YmNsYXNzLCBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIuCisgICAgICAg ICgtW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBpbml0V2l0aFBhZ2VVUkw6XSk6CisgICAg ICAgIFN0b3JlIHRoZSBwYXNzZWQtaW4gVVJMIGFuZCBzZXQgYSBzb21ld2hhdCBhcmJpdHJhcnkg KGlQaG9uZSA1IHNjcmVlbiBzaXplKSBkZWZhdWx0IHByZWZlcnJlZCBzaXplLgorICAgICAgICAo LVtXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAgICAgQ3JlYXRl IGEgV0tXZWJWaWV3IGFuZCBsb2FkIHRoZSBVUkwgcGFzc2VkIGludG8gdGhlIGluaXRpYWxpemVy LgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmV2aWV3VVJMRnJvbUFjdGlv bk1lbnU6XSk6CisgICAgICAgIFJlbmFtZWQgZnJvbSAtX3F1aWNrTG9va1VSTEZyb21BY3Rpb25N ZW51OjsgcHJlc2VudCB0aGUgcG9wb3ZlciByZXR1cm5lZCBieSAtX2NyZWF0ZVByZXZpZXdQb3Bv dmVyRm9yVVJMOi4KKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRlUHJl dmlld1BvcG92ZXJGb3JVUkw6XSk6CisgICAgICAgIE5ldyBoZWxwZXIgbWV0aG9kOyByZXR1cm4g YSBwb3BvdmVyIHRoYXQgb3ducyBhIF9XS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgY29uZmln dXJlZCB0byBzaG93IGEgc2NhbGVkLWRvd24gd2ViIHBhZ2UuCisgICAgICAgICgtW1dLQWN0aW9u TWVudUNvbnRyb2xsZXIgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOl0pOgorICAgICAgICBV cGRhdGUgdG8gcmVmbGVjdCBtZXRob2QgcmVuYW1lLgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVD b250cm9sbGVyIF9xdWlja0xvb2tVUkxGcm9tQWN0aW9uTWVudTpdKTogRGVsZXRlZC4KKwogMjAx NC0xMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBFeHBvc2UgdmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgcHJlZiB2aWEgdGhlIFdLMiBDIFNQ SQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVD b250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVD b250cm9sbGVyLm1tCmluZGV4IDUxZmEwN2Q0NGE3YTk5Y2I5MDA4YTdiZTJiNjBiZTM0OTkyZmQ1 MTQuLjc1OWIxNzBlM2EwNzYzM2E4OTE4NjY5YzM1YjkwZjY5NGJjYmJkMTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIu bW0KQEAgLTMwLDYgKzMwLDcgQEAKIAogI2ltcG9ydCAiV0tOU1VSTEV4dHJhcy5oIgogI2ltcG9y dCAiV0tWaWV3SW50ZXJuYWwuaCIKKyNpbXBvcnQgIldLV2ViVmlldy5oIgogI2ltcG9ydCAiV2Vi Q29udGV4dC5oIgogI2ltcG9ydCAiV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmgiCiAjaW1wb3J0ICJX ZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTUxLDE3ICs1Miw2IEBAIGVudW0gY2xhc3MgTWVudVVwZGF0 ZVN0YWdlIHsKICAgICBNZW51TmVlZHNVcGRhdGUKIH07CiAKLS8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBtb3ZlIGludG8gYW4gU1BJIGhlYWRlciBpZiBpdCBzdGF5cy4KLUBjbGFzcyBRTFByZXZpZXdC dWJibGU7Ci1AaW50ZXJmYWNlIE5TT2JqZWN0IChXS1FMUHJldmlld0J1YmJsZURldGFpbHMpCi1A cHJvcGVydHkgKGNvcHkpIE5TQXJyYXkgKiBjb250cm9sczsKLUBwcm9wZXJ0eSBOU1NpemUgbWF4 aW11bVNpemU7Ci1AcHJvcGVydHkgTlNSZWN0RWRnZSBwcmVmZXJyZWRFZGdlOwotQHByb3BlcnR5 IChyZXRhaW4pIElCT3V0bGV0IE5TV2luZG93KiBwYXJlbnRXaW5kb3c7Ci0tICh2b2lkKXNob3dQ cmV2aWV3SXRlbTooaWQpcHJldmlld0l0ZW0gaXRlbUZyYW1lOihOU1JlY3QpZnJhbWU7Ci0tICh2 b2lkKXNldEF1dG9tYXRpY2FsbHlDbG9zZVdpdGhNYXNrOihOU0V2ZW50TWFzaylhdXRvY2xvc2VN YXNrIGZpbHRlck1hc2s6KE5TRXZlbnRNYXNrKWZpbHRlck1hc2sgYmxvY2s6KHZvaWQgKF4pKHZv aWQpKWJsb2NrOwotQGVuZAotCiBTT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExBKFF1YXJ0 eiwgSW1hZ2VLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoSW1hZ2VLaXQsIElLU2xpZGVzaG93KQogCkBA IC03Nyw2ICs2Nyw0MyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogLSAoTlNBcnJheSAqKV9h Y3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OihXS0hpdFRlc3RSZXN1bHRSZWYpaGl0VGVz dFJlc3VsdCBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0FycmF5ICopZGVmYXVsdE1lbnVJdGVt czsKIEBlbmQKIAorQGludGVyZmFjZSBXS1BhZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgOiBOU1Zp ZXdDb250cm9sbGVyIHsKK0BwdWJsaWMKKyAgICBOU1NpemUgX3ByZWZlcnJlZFNpemU7CisKK0Bw cml2YXRlCisgICAgUmV0YWluUHRyPE5TVVJMPiBfdXJsOworfQorCistIChpbnN0YW5jZXR5cGUp aW5pdFdpdGhQYWdlVVJMOihOU1VSTCAqKVVSTDsKKworQGVuZAorCitAaW1wbGVtZW50YXRpb24g V0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyCisKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBh Z2VVUkw6KE5TVVJMICopVVJMCit7CisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCisg ICAgICAgIHJldHVybiBuaWw7CisKKyAgICBfdXJsID0gVVJMOworICAgIF9wcmVmZXJyZWRTaXpl ID0gTlNNYWtlU2l6ZSgzMjAsIDU2OCk7CisKKyAgICByZXR1cm4gc2VsZjsKK30KKworLSAodm9p ZClsb2FkVmlldworeworICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IFtbV0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgX3ByZWZlcnJlZFNpemUud2lkdGgsIF9w cmVmZXJyZWRTaXplLmhlaWdodCldOworICAgIGlmIChfdXJsKSB7CisgICAgICAgIE5TVVJMUmVx dWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6X3VybC5nZXQoKV07 CisgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIH0KKyAgICBbc2Vs ZiBzZXRWaWV3OndlYlZpZXddOworfQorCitAZW5kCisKIEBpbXBsZW1lbnRhdGlvbiBXS0FjdGlv bk1lbnVDb250cm9sbGVyCiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYlBhZ2VQ cm94eSYpcGFnZSB2aWV3OihXS1ZpZXcgKil3a1ZpZXcKQEAgLTE3MywyMyArMjAwLDI0IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAgW3NlcnZpY2UgcGVyZm9ybVdpdGhJdGVtczpAWyBb TlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VS TCgpXSBdXTsKIH0KIAotLSAodm9pZClfcXVpY2tMb29rVVJMRnJvbUFjdGlvbk1lbnU6KGlkKXNl bmRlcgorLSAodm9pZClfcHJldmlld1VSTEZyb21BY3Rpb25NZW51OihpZClzZW5kZXIKIHsKICAg ICBXZWJIaXRUZXN0UmVzdWx0KiBoaXRUZXN0UmVzdWx0ID0gX3BhZ2UtPmxhc3RNb3VzZU1vdmVI aXRUZXN0UmVzdWx0KCk7Ci0gICAgTlNSZWN0IGl0ZW1GcmFtZSA9IFtfd2tWaWV3IGNvbnZlcnRS ZWN0OmhpdFRlc3RSZXN1bHQtPmVsZW1lbnRCb3VuZGluZ0JveCgpIHRvVmlldzpuaWxdOwotICAg IE5TU2l6ZSBtYXhpbXVtUHJldmlld1NpemUgPSBOU01ha2VTaXplKF93a1ZpZXcuYm91bmRzLnNp emUud2lkdGggKiAwLjc1LCBfd2tWaWV3LmJvdW5kcy5zaXplLmhlaWdodCAqIDAuNzUpOwotCi0g ICAgUmV0YWluUHRyPFFMUHJldmlld0J1YmJsZT4gYnViYmxlID0gYWRvcHROUyhbW05TQ2xhc3NG cm9tU3RyaW5nKEAiUUxQcmV2aWV3QnViYmxlIikgYWxsb2NdIGluaXRdKTsKLSAgICBbYnViYmxl IHNldFBhcmVudFdpbmRvdzpfd2tWaWV3LndpbmRvd107Ci0gICAgW2J1YmJsZSBzZXRNYXhpbXVt U2l6ZTptYXhpbXVtUHJldmlld1NpemVdOwotICAgIFtidWJibGUgc2V0UHJlZmVycmVkRWRnZTpO U01heFlFZGdlXTsKLSAgICBbYnViYmxlIHNldENvbnRyb2xzOkBbIF1dOwotICAgIE5TRXZlbnRN YXNrIGZpbHRlck1hc2sgPSBOU0FueUV2ZW50TWFzayAmIH4oTlNBcHBLaXREZWZpbmVkTWFzayB8 IE5TU3lzdGVtRGVmaW5lZE1hc2sgfCBOU0FwcGxpY2F0aW9uRGVmaW5lZE1hc2sgfCBOU01vdXNl RW50ZXJlZE1hc2sgfCBOU01vdXNlRXhpdGVkTWFzayk7Ci0gICAgTlNFdmVudE1hc2sgYXV0b2Ns b3NlTWFzayA9IE5TTGVmdE1vdXNlRG93bk1hc2sgfCBOU1JpZ2h0TW91c2VEb3duTWFzayB8IE5T S2V5RG93bk1hc2s7Ci0gICAgW2J1YmJsZSBzZXRBdXRvbWF0aWNhbGx5Q2xvc2VXaXRoTWFzazph dXRvY2xvc2VNYXNrIGZpbHRlck1hc2s6ZmlsdGVyTWFzayBibG9jazpbYnViYmxlXSB7Ci0gICAg ICAgIFtidWJibGUgY2xvc2VdOwotICAgIH1dOwotICAgIFtidWJibGUgc2hvd1ByZXZpZXdJdGVt OltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVMaW5r VVJMKCldIGl0ZW1GcmFtZTppdGVtRnJhbWVdOworICAgIE5TVVJMICp1cmwgPSBbTlNVUkwgX3dl Yl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXTsKKyAg ICBSZXRhaW5QdHI8TlNQb3BvdmVyPiBwb3BvdmVyID0gW3NlbGYgX2NyZWF0ZVByZXZpZXdQb3Bv dmVyRm9yVVJMOnVybF07CisgICAgW3BvcG92ZXIgc2hvd1JlbGF0aXZlVG9SZWN0OmhpdFRlc3RS ZXN1bHQtPmVsZW1lbnRCb3VuZGluZ0JveCgpIG9mVmlldzpfd2tWaWV3IHByZWZlcnJlZEVkZ2U6 TlNNYXhZRWRnZV07Cit9CisKKy0gKFJldGFpblB0cjxOU1BvcG92ZXI+KV9jcmVhdGVQcmV2aWV3 UG9wb3ZlckZvclVSTDooTlNVUkwgKil1cmwKK3sKKyAgICBSZXRhaW5QdHI8V0tQYWdlUHJldmll d1ZpZXdDb250cm9sbGVyPiBwcmV2aWV3Vmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tQYWdl UHJldmlld1ZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFBhZ2VVUkw6dXJsXSk7CisgICAg TlNSZWN0IHdrVmlld0JvdW5kcyA9IFtfd2tWaWV3IGJvdW5kc107CisgICAgcHJldmlld1ZpZXdD b250cm9sbGVyLT5fcHJlZmVycmVkU2l6ZSA9IE5TTWFrZVNpemUoTlNXaWR0aCh3a1ZpZXdCb3Vu ZHMpICogMC43NSwgTlNIZWlnaHQod2tWaWV3Qm91bmRzKSAqIDAuNzUpOworCisgICAgUmV0YWlu UHRyPE5TUG9wb3Zlcj4gcG9wb3ZlciA9IGFkb3B0TlMoW1tOU1BvcG92ZXIgYWxsb2NdIGluaXRd KTsKKyAgICBbcG9wb3ZlciBzZXRCZWhhdmlvcjpOU1BvcG92ZXJCZWhhdmlvclRyYW5zaWVudF07 CisgICAgW3BvcG92ZXIgc2V0Q29udGVudFZpZXdDb250cm9sbGVyOnByZXZpZXdWaWV3Q29udHJv bGxlci5nZXQoKV07CisgICAgcmV0dXJuIHBvcG92ZXI7CiB9CiAKICNwcmFnbWEgbWFyayBJbWFn ZSBhY3Rpb25zCkBAIC00NjUsNyArNDkzLDcgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoVG9QaG90 b09uRGlzayhOU1N0cmluZyAqc3VnZ2VzdGVkRmlsZW5hbWUpCiAgICAgICAgIGJyZWFrOwogCiAg ICAgY2FzZSBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ1ByZXZpZXdMaW5rOgotICAgICAgICBzZWxl Y3RvciA9IEBzZWxlY3RvcihfcXVpY2tMb29rVVJMRnJvbUFjdGlvbk1lbnU6KTsKKyAgICAgICAg c2VsZWN0b3IgPSBAc2VsZWN0b3IoX3ByZXZpZXdVUkxGcm9tQWN0aW9uTWVudTopOwogICAgICAg ICB0aXRsZSA9IEAiUHJldmlldyI7CiAgICAgICAgIGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1l ZDpAIk5TQWN0aW9uTWVudVF1aWNrTG9vayJdOwogICAgICAgICBicmVhazsK