192774 2018-12-17 13:35:33 -0800 Flicker when exiting element fullscreen. 2019-06-16 20:58:22 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Mac Unspecified NEW InRadar P2 Normal --- 1 jeremyj-wk webkit-unassigned commit-queue jer.noble simon.fraser webkit-bug-importer oldest_to_newest 1488573 0 jeremyj-wk 2018-12-17 13:35:33 -0800 Flicker when exiting element fullscreen. 1488574 1 jeremyj-wk 2018-12-17 13:36:57 -0800 rdar://problem/33088878 1488576 2 357472 jeremyj-wk 2018-12-17 13:40:47 -0800 Created attachment 357472 Patch 1488603 3 357472 simon.fraser 2018-12-17 14:43:25 -0800 Comment on attachment 357472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357472&action=review > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:471 > + webViewContents = createImageWithCopiedData(webViewContents.get()); Why is this necessary? > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:479 > + [CATransaction commit]; > + [CATransaction flush]; > + > + [CATransaction begin]; > + [CATransaction setDisableActions:YES]; Do we need to start a second transaction? > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:526 > + [_exitPlaceholder removeFromSuperview]; > + [[_exitPlaceholder layer] setContents:nil]; I think it would be cleaner to just make a new _exitPlaceholder each time. 1489920 4 357472 jeremyj-wk 2018-12-20 10:27:10 -0800 Comment on attachment 357472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357472&action=review >> Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:471 >> + webViewContents = createImageWithCopiedData(webViewContents.get()); > > Why is this necessary? Copied explanatory comment from the other place this function is used. >> Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:479 >> + [CATransaction setDisableActions:YES]; > > Do we need to start a second transaction? I believe so, since we only want to setDisableActions for this group of changes. >> Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:526 >> + [[_exitPlaceholder layer] setContents:nil]; > > I think it would be cleaner to just make a new _exitPlaceholder each time. Done. 1489945 5 357835 jeremyj-wk 2018-12-20 11:11:26 -0800 Created attachment 357835 Patch 1489964 6 357835 simon.fraser 2018-12-20 11:40:58 -0800 Comment on attachment 357835 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357835&action=review > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:143 > - > + Whitespace. > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:464 > + RetainPtr<CGImageRef> webViewContents = adoptCF(CGWindowListCreateImage(NSRectToCGRect(exitPlaceholderScreenRect), kCGWindowListOptionIncludingWindow, [[_webView window] windowNumber], kCGWindowImageDefault)); Why not CGSHWCaptureWindowList() like the takeWindowSnapshot() code? > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:468 > + // Using the returned CGImage directly would result in calls to the WindowServer every time > + // the image was painted. Instead, copy the image data into our own process to eliminate that > + // future overhead. Is this really true? 1490094 7 jeremyj-wk 2018-12-20 15:10:04 -0800 (In reply to Simon Fraser (smfr) from comment #6) > Comment on attachment 357835 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=357835&action=review > > > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:143 > > - > > + > > Whitespace. > > > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:464 > > + RetainPtr<CGImageRef> webViewContents = adoptCF(CGWindowListCreateImage(NSRectToCGRect(exitPlaceholderScreenRect), kCGWindowListOptionIncludingWindow, [[_webView window] windowNumber], kCGWindowImageDefault)); > > Why not CGSHWCaptureWindowList() like the takeWindowSnapshot() code? I've switched to this method. > > > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:468 > > + // Using the returned CGImage directly would result in calls to the WindowServer every time > > + // the image was painted. Instead, copy the image data into our own process to eliminate that > > + // future overhead. > > Is this really true? No longer relevant since switching to CGSHWCaptureWindowList() 1490096 8 357877 jeremyj-wk 2018-12-20 15:16:19 -0800 Created attachment 357877 Patch for landing. 1490169 9 357877 commit-queue 2018-12-20 16:27:58 -0800 Comment on attachment 357877 Patch for landing. Clearing flags on attachment: 357877 Committed r239475: <https://trac.webkit.org/changeset/239475> 357472 2018-12-17 13:40:47 -0800 2018-12-20 11:11:25 -0800 Patch bug-192774-20181217134047.patch text/plain 6788 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1OWY2ZmQ0YjQxMzc4NTkw ODhiYzI2MDgyNGNjNjBjYTA3ZmYyYzAuLjBmYjU1NGUxYzA5Y2E5YTg2ZTI4OWVkNzE5ZmI4OWNj ZjZiNWIzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMTItMTcgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIEZsaWNrZXIgd2hlbiBleGl0aW5n IGVsZW1lbnQgZnVsbHNjcmVlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5Mjc3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGVzIGFuIGlzc3VlIHdoZXJlIHRoZSB3ZWIgcGFnZSB3b3VsZCBmbGlj a2VyIHVwb24gZXhpdGluZyBlbGVtbmVudCBmdWxsc2NyZWVuLgorCisgICAgICAgIFJlcGxhY2Ug V2ViVmlldyB3aXRoIGEgc25hcHNob3Qgd2hpbGUgdGhlIFdlYlZpZXcgaXMgcmVzdHlsZWQgYW5k IHJlc2l6ZWQgZm9yIGlubGluZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlciBpbml0V2l0aFdpbmRvdzp3ZWJWaWV3OnBhZ2U6XSk6CisgICAgICAgICgtW1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpd KToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBjb21wbGV0ZUZpbmlz aEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50XSk6CisKIDIwMTgtMTEtMjYgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZW5h bWUgV0tXZWJWaWV3Ll9zYWZlQnJvd3NpbmdXYXJuaW5nRm9yVGVzdGluZyB0byBfc2FmZUJyb3dz aW5nV2FybmluZyB0byB1c2UgaXQgZm9yIG1vcmUgdGhhbiB0ZXN0aW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIuaAppbmRleCAzM2M1OGU3OGQwZTVkNzYzYWEyZWJhODgyZmEzZmM5OTY5ODdkMjYxLi40MzM2 YzI1MDg1NGE4NDlmNmYwMTZhNmExODQxZDA3YmQyNjQ1NTFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVy LmgKQEAgLTQ4LDYgKzQ4LDcgQEAgdHlwZWRlZiBlbnVtIEZ1bGxTY3JlZW5TdGF0ZSA6IE5TSW50 ZWdlciBGdWxsU2NyZWVuU3RhdGU7CiAgICAgTlNWaWV3ICpfd2ViVmlldzsgLy8gQ2Fubm90IGJl IHJldGFpbmVkLCBzZWUgPHJkYXI6Ly9wcm9ibGVtLzE0ODg0NjY2Pi4KICAgICBXZWJLaXQ6Oldl YlBhZ2VQcm94eSogX3BhZ2U7CiAgICAgUmV0YWluUHRyPFdlYkNvcmVGdWxsU2NyZWVuUGxhY2Vo b2xkZXJWaWV3PiBfd2ViVmlld1BsYWNlaG9sZGVyOworICAgIFJldGFpblB0cjxOU1ZpZXc+IF9l eGl0UGxhY2Vob2xkZXI7CiAgICAgUmV0YWluUHRyPE5TVmlldz4gX2NsaXBWaWV3OwogICAgIFJl dGFpblB0cjxOU1ZpZXc+IF9iYWNrZ3JvdW5kVmlldzsKICAgICBOU1JlY3QgX2luaXRpYWxGcmFt ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5X aW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNj cmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXggMTA2NjhlNjI2MjM0MDlmMWE0NjA1YjQyZDM4 ODY0MjNmNzNjOGExYS4uOGFlNjQzMzY4Nzc5Y2YxOTcxMTU5ZThiMzEyYWQ2MzQ5OWFkNzAyNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNj cmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTE0MCw2ICsxNDAsMTIgQEAgLSAoaWQpaW5pdFdp dGhXaW5kb3c6KE5TV2luZG93ICopd2luZG93IHdlYlZpZXc6KE5TVmlldyAqKXdlYlZpZXcgcGFn ZTooV2ViS2l0OjoKICAgICBbX2NsaXBWaWV3IHNldFdhbnRzTGF5ZXI6WUVTXTsKICAgICBbX2Ns aXBWaWV3IHNldEF1dG9yZXNpemluZ01hc2s6KE5TVmlld1dpZHRoU2l6YWJsZSB8IE5TVmlld0hl aWdodFNpemFibGUpXTsKICAgICBbX2JhY2tncm91bmRWaWV3IGFkZFN1YnZpZXc6X2NsaXBWaWV3 LmdldCgpXTsKKyAgICAKKyAgICBfZXhpdFBsYWNlaG9sZGVyID0gYWRvcHROUyhbW05TVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpbX3dlYlZpZXcgZnJhbWVdXSk7CisgICAgW19leGl0UGxhY2Vo b2xkZXIgc2V0V2FudHNMYXllcjogWUVTXTsKKyAgICBbX2V4aXRQbGFjZWhvbGRlciBzZXRBdXRv cmVzaXplc1N1YnZpZXdzOiBZRVNdOworICAgIFtfZXhpdFBsYWNlaG9sZGVyIHNldExheWVyQ29u dGVudHNQbGFjZW1lbnQ6IE5TVmlld0xheWVyQ29udGVudHNQbGFjZW1lbnRTY2FsZVByb3BvcnRp b25hbGx5VG9GaXRdOworICAgIFtfZXhpdFBsYWNlaG9sZGVyIHNldExheWVyQ29udGVudHNSZWRy YXdQb2xpY3k6IE5TVmlld0xheWVyQ29udGVudHNSZWRyYXdOZXZlcl07CiAKICAgICBbc2VsZiB3 aW5kb3dEaWRMb2FkXTsKICAgICBbd2luZG93IGRpc3BsYXlJZk5lZWRlZF07CkBAIC00NTcsMjgg KzQ2MywzNCBAQCAtICh2b2lkKWZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246KGJvb2wp Y29tcGxldGVkCiAKICAgICBOU1Jlc3BvbmRlciAqZmlyc3RSZXNwb25kZXIgPSBbW3NlbGYgd2lu ZG93XSBmaXJzdFJlc3BvbmRlcl07CiAKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19CRUdJTgotICAgIC8vIFNjcmVlbiB1cGRhdGVzIHRvIGJlIHJlLWVuYWJsZWQgaW4gY29tcGxl dGVGaW5pc2hFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbkFmdGVyUmVwYWludC4KLSAgICBOU0Rpc2Fi bGVTY3JlZW5VcGRhdGVzKCk7Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E Ci0gICAgX3BhZ2UtPnNldFN1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXModHJ1ZSk7Ci0gICAgW1tz ZWxmIHdpbmRvd10gb3JkZXJPdXQ6c2VsZl07Ci0gICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtb c2VsZiB3aW5kb3ddIGNvbnRlbnRWaWV3XTsKLSAgICBjb250ZW50Vmlldy5oaWRkZW4gPSBZRVM7 CisgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRyYW5zYWN0aW9uIHNldERpc2Fi bGVBY3Rpb25zOllFU107CisgICAgTlNSZWN0IGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3QgPSBf aW5pdGlhbEZyYW1lOworICAgIGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3Qub3JpZ2luLnkgPSBO U01heFkoW1tbTlNTY3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0pIC0gTlNN YXhZKGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3QpOworICAgIFJldGFpblB0cjxDR0ltYWdlUmVm PiB3ZWJWaWV3Q29udGVudHMgPSBhZG9wdENGKENHV2luZG93TGlzdENyZWF0ZUltYWdlKE5TUmVj dFRvQ0dSZWN0KGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3QpLCBrQ0dXaW5kb3dMaXN0T3B0aW9u SW5jbHVkaW5nV2luZG93LCBbW193ZWJWaWV3IHdpbmRvd10gd2luZG93TnVtYmVyXSwga0NHV2lu ZG93SW1hZ2VEZWZhdWx0KSk7CisgICAgd2ViVmlld0NvbnRlbnRzID0gY3JlYXRlSW1hZ2VXaXRo Q29waWVkRGF0YSh3ZWJWaWV3Q29udGVudHMuZ2V0KCkpOworICAgIFtfZXhpdFBsYWNlaG9sZGVy IHNldEZyYW1lOltfd2ViVmlldyBmcmFtZV1dOworICAgIFtbX2V4aXRQbGFjZWhvbGRlciBsYXll cl0gc2V0Q29udGVudHM6KF9fYnJpZGdlIGlkKXdlYlZpZXdDb250ZW50cy5nZXQoKV07CisgICAg W1tfd2ViVmlldyBzdXBlcnZpZXddIGFkZFN1YnZpZXc6X2V4aXRQbGFjZWhvbGRlci5nZXQoKSBw b3NpdGlvbmVkOk5TV2luZG93QWJvdmUgcmVsYXRpdmVUbzpfd2ViVmlld107CisgICAgW0NBVHJh bnNhY3Rpb24gY29tbWl0XTsKKyAgICBbQ0FUcmFuc2FjdGlvbiBmbHVzaF07CisKKyAgICBbQ0FU cmFuc2FjdGlvbiBiZWdpbl07CisgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFjdGlvbnM6 WUVTXTsKKyAgICAKICAgICBbX2JhY2tncm91bmRWaWV3LmdldCgpLmxheWVyIHJlbW92ZUFsbEFu aW1hdGlvbnNdOwotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAg W1tfd2ViVmlld1BsYWNlaG9sZGVyIHdpbmRvd10gc2V0QXV0b2Rpc3BsYXk6Tk9dOwotICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAorICAgIF9wYWdlLT5zZXRTdXBwcmVzc1Zp c2liaWxpdHlVcGRhdGVzKHRydWUpOworICAgIFtfd2ViVmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3 XTsKKyAgICBbX3dlYlZpZXcgc2V0RnJhbWU6W193ZWJWaWV3UGxhY2Vob2xkZXIgZnJhbWVdXTsK KyAgICBbX3dlYlZpZXcgc2V0QXV0b3Jlc2l6aW5nTWFzazpbX3dlYlZpZXdQbGFjZWhvbGRlciBh dXRvcmVzaXppbmdNYXNrXV07CisgICAgW1tfd2ViVmlld1BsYWNlaG9sZGVyIHN1cGVydmlld10g YWRkU3Vidmlldzpfd2ViVmlldyBwb3NpdGlvbmVkOk5TV2luZG93QmVsb3cgcmVsYXRpdmVUbzpf d2ViVmlld1BsYWNlaG9sZGVyLmdldCgpXTsKIAotICAgIFtzZWxmIF9yZXBsYWNlVmlldzpfd2Vi Vmlld1BsYWNlaG9sZGVyLmdldCgpIHdpdGg6X3dlYlZpZXddOwogICAgIEJFR0lOX0JMT0NLX09C SkNfRVhDRVBUSU9OUwogICAgIFtOU0xheW91dENvbnN0cmFpbnQgYWN0aXZhdGVDb25zdHJhaW50 czpzZWxmLnNhdmVkQ29uc3RyYWludHNdOwogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMK ICAgICBzZWxmLnNhdmVkQ29uc3RyYWludHMgPSBuaWw7CiAgICAgbWFrZVJlc3BvbmRlckZpcnN0 UmVzcG9uZGVySWZEZXNjZW5kYW50T2ZWaWV3KF93ZWJWaWV3LndpbmRvdywgZmlyc3RSZXNwb25k ZXIsIF93ZWJWaWV3KTsKIAotICAgIFtbX3dlYlZpZXcgd2luZG93XSBtYWtlS2V5QW5kT3JkZXJG cm9udDpzZWxmXTsKLQogICAgIC8vIFRoZXNlIG1lc3NhZ2VzIG11c3QgYmUgc2VudCBhZnRlciB0 aGUgc3dhcCBvciBmbGFzaGluZyB3aWxsIG9jY3VyIGR1cmluZyBmb3JjZVJlcGFpbnQ6CiAgICAg W3NlbGYgX21hbmFnZXJdLT5kaWRFeGl0RnVsbFNjcmVlbigpOwogICAgIFtzZWxmIF9tYW5hZ2Vy XS0+c2V0QW5pbWF0aW5nRnVsbFNjcmVlbihmYWxzZSk7CkBAIC00OTYsMTkgKzUwOCwzMSBAQCAt ICh2b2lkKWZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246KGJvb2wpY29tcGxldGVkCiAg ICAgICAgIFtzZWxmIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJl cGFpbnRdOwogICAgIH0pOwogICAgIF9wYWdlLT5mb3JjZVJlcGFpbnQoX3JlcGFpbnRDYWxsYmFj ay5jb3B5UmVmKCkpOworCisgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKKyAgICBbQ0FUcmFu c2FjdGlvbiBmbHVzaF07CiB9CiAKIC0gKHZvaWQpY29tcGxldGVGaW5pc2hFeGl0RnVsbFNjcmVl bkFuaW1hdGlvbkFmdGVyUmVwYWludAogeworICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAg ICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0aW9uczpZRVNdOworCisgICAgW193ZWJWaWV3 UGxhY2Vob2xkZXIgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgW1tzZWxmIHdpbmRvd10gb3Jk ZXJPdXQ6c2VsZl07CisgICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtbc2VsZiB3aW5kb3ddIGNv bnRlbnRWaWV3XTsKKyAgICBjb250ZW50Vmlldy5oaWRkZW4gPSBZRVM7CisgICAgW19leGl0UGxh Y2Vob2xkZXIgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgW1tfZXhpdFBsYWNlaG9sZGVyIGxh eWVyXSBzZXRDb250ZW50czpuaWxdOworICAgIAorICAgIFtbX3dlYlZpZXcgd2luZG93XSBtYWtl S2V5QW5kT3JkZXJGcm9udDpzZWxmXTsKKyAgICBfd2ViVmlld1BsYWNlaG9sZGVyID0gbmlsOwor ICAgIAogICAgIF9yZXBhaW50Q2FsbGJhY2sgPSBudWxscHRyOwotICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAgW1tfd2ViVmlldyB3aW5kb3ddIHNldEF1dG9kaXNw bGF5OllFU107Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECi0gICAgW1tf d2ViVmlldyB3aW5kb3ddIGRpc3BsYXlJZk5lZWRlZF07CiAgICAgX3BhZ2UtPnNldFN1cHByZXNz VmlzaWJpbGl0eVVwZGF0ZXMoZmFsc2UpOwotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJ T05TX0JFR0lOCi0gICAgTlNFbmFibGVTY3JlZW5VcGRhdGVzKCk7Ci0gICAgQUxMT1dfREVQUkVD QVRFRF9ERUNMQVJBVElPTlNfRU5ECisKKyAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOworICAg IFtDQVRyYW5zYWN0aW9uIGZsdXNoXTsKIH0KIAogLSAodm9pZClwZXJmb3JtQ2xvc2U6KGlkKXNl bmRlcgo= 357835 2018-12-20 11:11:26 -0800 2018-12-20 11:32:26 -0800 Patch bug-192774-20181220111125.patch text/plain 7071 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1OWY2ZmQ0YjQxMzc4NTkw ODhiYzI2MDgyNGNjNjBjYTA3ZmYyYzAuLmJkYjljMzc5YzAxMmUxNjMwODM3NzYxYjQwOTg4ZjQy YTQ4YTA4YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMTItMTcgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIEZsaWNrZXIgd2hlbiBleGl0aW5n IGVsZW1lbnQgZnVsbHNjcmVlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5Mjc3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGVzIGFuIGlzc3VlIHdoZXJlIHRoZSB3ZWIgcGFnZSB3b3VsZCBmbGlj a2VyIHVwb24gZXhpdGluZyBlbGVtZW50IGZ1bGxzY3JlZW4uCisKKyAgICAgICAgUmVwbGFjZSBX ZWJWaWV3IHdpdGggYSBzbmFwc2hvdCB3aGlsZSB0aGUgV2ViVmlldyBpcyByZXN0eWxlZCBhbmQg cmVzaXplZCBmb3IgaW5saW5lLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyIGluaXRXaXRoV2luZG93OndlYlZpZXc6cGFnZTpdKToKKyAgICAgICAgKC1bV0tGdWxs U2NyZWVuV2luZG93Q29udHJvbGxlciBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOl0p OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGNvbXBsZXRlRmluaXNo RXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJlcGFpbnRdKToKKwogMjAxOC0xMS0yNiAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbmFt ZSBXS1dlYlZpZXcuX3NhZmVCcm93c2luZ1dhcm5pbmdGb3JUZXN0aW5nIHRvIF9zYWZlQnJvd3Np bmdXYXJuaW5nIHRvIHVzZSBpdCBmb3IgbW9yZSB0aGFuIHRlc3RpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5oCmluZGV4IDMzYzU4ZTc4ZDBlNWQ3NjNhYTJlYmE4ODJmYTNmYzk5Njk4N2QyNjEuLjQzMzZj MjUwODU0YTg0OWY2ZjAxNmE2YTE4NDFkMDdiZDI2NDU1MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIu aApAQCAtNDgsNiArNDgsNyBAQCB0eXBlZGVmIGVudW0gRnVsbFNjcmVlblN0YXRlIDogTlNJbnRl Z2VyIEZ1bGxTY3JlZW5TdGF0ZTsKICAgICBOU1ZpZXcgKl93ZWJWaWV3OyAvLyBDYW5ub3QgYmUg cmV0YWluZWQsIHNlZSA8cmRhcjovL3Byb2JsZW0vMTQ4ODQ2NjY+LgogICAgIFdlYktpdDo6V2Vi UGFnZVByb3h5KiBfcGFnZTsKICAgICBSZXRhaW5QdHI8V2ViQ29yZUZ1bGxTY3JlZW5QbGFjZWhv bGRlclZpZXc+IF93ZWJWaWV3UGxhY2Vob2xkZXI7CisgICAgUmV0YWluUHRyPE5TVmlldz4gX2V4 aXRQbGFjZWhvbGRlcjsKICAgICBSZXRhaW5QdHI8TlNWaWV3PiBfY2xpcFZpZXc7CiAgICAgUmV0 YWluUHRyPE5TVmlldz4gX2JhY2tncm91bmRWaWV3OwogICAgIE5TUmVjdCBfaW5pdGlhbEZyYW1l OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5tbQppbmRleCAxMDY2OGU2MjYyMzQwOWYxYTQ2MDViNDJkMzg4 NjQyM2Y3M2M4YTFhLi5kZmIzOTQxYWNiNzhiYjRhMmE4YmQ4MjAzNDIzODBmMTc2NDVjYmNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAtMTQwLDcgKzE0MCw3IEBAIC0gKGlkKWluaXRXaXRo V2luZG93OihOU1dpbmRvdyAqKXdpbmRvdyB3ZWJWaWV3OihOU1ZpZXcgKil3ZWJWaWV3IHBhZ2U6 KFdlYktpdDo6CiAgICAgW19jbGlwVmlldyBzZXRXYW50c0xheWVyOllFU107CiAgICAgW19jbGlw VmlldyBzZXRBdXRvcmVzaXppbmdNYXNrOihOU1ZpZXdXaWR0aFNpemFibGUgfCBOU1ZpZXdIZWln aHRTaXphYmxlKV07CiAgICAgW19iYWNrZ3JvdW5kVmlldyBhZGRTdWJ2aWV3Ol9jbGlwVmlldy5n ZXQoKV07Ci0KKyAgICAKICAgICBbc2VsZiB3aW5kb3dEaWRMb2FkXTsKICAgICBbd2luZG93IGRp c3BsYXlJZk5lZWRlZF07CiAgICAgX3dlYlZpZXcgPSB3ZWJWaWV3OwpAQCAtNDU3LDI4ICs0NTcs NDUgQEAgLSAodm9pZClmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOihib29sKWNvbXBs ZXRlZAogCiAgICAgTlNSZXNwb25kZXIgKmZpcnN0UmVzcG9uZGVyID0gW1tzZWxmIHdpbmRvd10g Zmlyc3RSZXNwb25kZXJdOwogCi0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVH SU4KLSAgICAvLyBTY3JlZW4gdXBkYXRlcyB0byBiZSByZS1lbmFibGVkIGluIGNvbXBsZXRlRmlu aXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJlcGFpbnQuCi0gICAgTlNEaXNhYmxlU2Ny ZWVuVXBkYXRlcygpOwotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAg IF9wYWdlLT5zZXRTdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzKHRydWUpOwotICAgIFtbc2VsZiB3 aW5kb3ddIG9yZGVyT3V0OnNlbGZdOwotICAgIE5TVmlldyAqY29udGVudFZpZXcgPSBbW3NlbGYg d2luZG93XSBjb250ZW50Vmlld107Ci0gICAgY29udGVudFZpZXcuaGlkZGVuID0gWUVTOworICAg IFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0 aW9uczpZRVNdOworICAgIE5TUmVjdCBleGl0UGxhY2Vob2xkZXJTY3JlZW5SZWN0ID0gX2luaXRp YWxGcmFtZTsKKyAgICBleGl0UGxhY2Vob2xkZXJTY3JlZW5SZWN0Lm9yaWdpbi55ID0gTlNNYXhZ KFtbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0SW5kZXg6MF0gZnJhbWVdKSAtIE5TTWF4WShl eGl0UGxhY2Vob2xkZXJTY3JlZW5SZWN0KTsKKyAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gd2Vi Vmlld0NvbnRlbnRzID0gYWRvcHRDRihDR1dpbmRvd0xpc3RDcmVhdGVJbWFnZShOU1JlY3RUb0NH UmVjdChleGl0UGxhY2Vob2xkZXJTY3JlZW5SZWN0KSwga0NHV2luZG93TGlzdE9wdGlvbkluY2x1 ZGluZ1dpbmRvdywgW1tfd2ViVmlldyB3aW5kb3ddIHdpbmRvd051bWJlcl0sIGtDR1dpbmRvd0lt YWdlRGVmYXVsdCkpOworCisgICAgLy8gVXNpbmcgdGhlIHJldHVybmVkIENHSW1hZ2UgZGlyZWN0 bHkgd291bGQgcmVzdWx0IGluIGNhbGxzIHRvIHRoZSBXaW5kb3dTZXJ2ZXIgZXZlcnkgdGltZQor ICAgIC8vIHRoZSBpbWFnZSB3YXMgcGFpbnRlZC4gSW5zdGVhZCwgY29weSB0aGUgaW1hZ2UgZGF0 YSBpbnRvIG91ciBvd24gcHJvY2VzcyB0byBlbGltaW5hdGUgdGhhdAorICAgIC8vIGZ1dHVyZSBv dmVyaGVhZC4KKyAgICB3ZWJWaWV3Q29udGVudHMgPSBjcmVhdGVJbWFnZVdpdGhDb3BpZWREYXRh KHdlYlZpZXdDb250ZW50cy5nZXQoKSk7CisgICAgCisgICAgX2V4aXRQbGFjZWhvbGRlciA9IGFk b3B0TlMoW1tOU1ZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6W193ZWJWaWV3IGZyYW1lXV0pOwor ICAgIFtfZXhpdFBsYWNlaG9sZGVyIHNldFdhbnRzTGF5ZXI6IFlFU107CisgICAgW19leGl0UGxh Y2Vob2xkZXIgc2V0QXV0b3Jlc2l6ZXNTdWJ2aWV3czogWUVTXTsKKyAgICBbX2V4aXRQbGFjZWhv bGRlciBzZXRMYXllckNvbnRlbnRzUGxhY2VtZW50OiBOU1ZpZXdMYXllckNvbnRlbnRzUGxhY2Vt ZW50U2NhbGVQcm9wb3J0aW9uYWxseVRvRml0XTsKKyAgICBbX2V4aXRQbGFjZWhvbGRlciBzZXRM YXllckNvbnRlbnRzUmVkcmF3UG9saWN5OiBOU1ZpZXdMYXllckNvbnRlbnRzUmVkcmF3TmV2ZXJd OworICAgIFtfZXhpdFBsYWNlaG9sZGVyIHNldEZyYW1lOltfd2ViVmlldyBmcmFtZV1dOworICAg IFtbX2V4aXRQbGFjZWhvbGRlciBsYXllcl0gc2V0Q29udGVudHM6KF9fYnJpZGdlIGlkKXdlYlZp ZXdDb250ZW50cy5nZXQoKV07CisgICAgW1tfd2ViVmlldyBzdXBlcnZpZXddIGFkZFN1YnZpZXc6 X2V4aXRQbGFjZWhvbGRlci5nZXQoKSBwb3NpdGlvbmVkOk5TV2luZG93QWJvdmUgcmVsYXRpdmVU bzpfd2ViVmlld107CisKKyAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOworICAgIFtDQVRyYW5z YWN0aW9uIGZsdXNoXTsKKworICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAgICBbQ0FUcmFu c2FjdGlvbiBzZXREaXNhYmxlQWN0aW9uczpZRVNdOworICAgIAogICAgIFtfYmFja2dyb3VuZFZp ZXcuZ2V0KCkubGF5ZXIgcmVtb3ZlQWxsQW5pbWF0aW9uc107Ci0gICAgQUxMT1dfREVQUkVDQVRF RF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICBbW193ZWJWaWV3UGxhY2Vob2xkZXIgd2luZG93XSBz ZXRBdXRvZGlzcGxheTpOT107Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E CisgICAgX3BhZ2UtPnNldFN1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXModHJ1ZSk7CisgICAgW193 ZWJWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOworICAgIFtfd2ViVmlldyBzZXRGcmFtZTpbX3dl YlZpZXdQbGFjZWhvbGRlciBmcmFtZV1dOworICAgIFtfd2ViVmlldyBzZXRBdXRvcmVzaXppbmdN YXNrOltfd2ViVmlld1BsYWNlaG9sZGVyIGF1dG9yZXNpemluZ01hc2tdXTsKKyAgICBbW193ZWJW aWV3UGxhY2Vob2xkZXIgc3VwZXJ2aWV3XSBhZGRTdWJ2aWV3Ol93ZWJWaWV3IHBvc2l0aW9uZWQ6 TlNXaW5kb3dCZWxvdyByZWxhdGl2ZVRvOl93ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCldOwogCi0g ICAgW3NlbGYgX3JlcGxhY2VWaWV3Ol93ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCkgd2l0aDpfd2Vi Vmlld107CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TCiAgICAgW05TTGF5b3V0Q29u c3RyYWludCBhY3RpdmF0ZUNvbnN0cmFpbnRzOnNlbGYuc2F2ZWRDb25zdHJhaW50c107CiAgICAg RU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwogICAgIHNlbGYuc2F2ZWRDb25zdHJhaW50cyA9IG5p bDsKICAgICBtYWtlUmVzcG9uZGVyRmlyc3RSZXNwb25kZXJJZkRlc2NlbmRhbnRPZlZpZXcoX3dl YlZpZXcud2luZG93LCBmaXJzdFJlc3BvbmRlciwgX3dlYlZpZXcpOwogCi0gICAgW1tfd2ViVmll dyB3aW5kb3ddIG1ha2VLZXlBbmRPcmRlckZyb250OnNlbGZdOwotCiAgICAgLy8gVGhlc2UgbWVz c2FnZXMgbXVzdCBiZSBzZW50IGFmdGVyIHRoZSBzd2FwIG9yIGZsYXNoaW5nIHdpbGwgb2NjdXIg ZHVyaW5nIGZvcmNlUmVwYWludDoKICAgICBbc2VsZiBfbWFuYWdlcl0tPmRpZEV4aXRGdWxsU2Ny ZWVuKCk7CiAgICAgW3NlbGYgX21hbmFnZXJdLT5zZXRBbmltYXRpbmdGdWxsU2NyZWVuKGZhbHNl KTsKQEAgLTQ5NiwxOSArNTEzLDMyIEBAIC0gKHZvaWQpZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFu aW1hdGlvbjooYm9vbCljb21wbGV0ZWQKICAgICAgICAgW3NlbGYgY29tcGxldGVGaW5pc2hFeGl0 RnVsbFNjcmVlbkFuaW1hdGlvbkFmdGVyUmVwYWludF07CiAgICAgfSk7CiAgICAgX3BhZ2UtPmZv cmNlUmVwYWludChfcmVwYWludENhbGxiYWNrLmNvcHlSZWYoKSk7CisKKyAgICBbQ0FUcmFuc2Fj dGlvbiBjb21taXRdOworICAgIFtDQVRyYW5zYWN0aW9uIGZsdXNoXTsKIH0KIAogLSAodm9pZClj b21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50CiB7CisgICAg W0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRyYW5zYWN0aW9uIHNldERpc2FibGVBY3Rp b25zOllFU107CisKKyAgICBbX3dlYlZpZXdQbGFjZWhvbGRlciByZW1vdmVGcm9tU3VwZXJ2aWV3 XTsKKyAgICBbW3NlbGYgd2luZG93XSBvcmRlck91dDpzZWxmXTsKKyAgICBOU1ZpZXcgKmNvbnRl bnRWaWV3ID0gW1tzZWxmIHdpbmRvd10gY29udGVudFZpZXddOworICAgIGNvbnRlbnRWaWV3Lmhp ZGRlbiA9IFlFUzsKKyAgICBbX2V4aXRQbGFjZWhvbGRlciByZW1vdmVGcm9tU3VwZXJ2aWV3XTsK KyAgICBbW19leGl0UGxhY2Vob2xkZXIgbGF5ZXJdIHNldENvbnRlbnRzOm5pbF07CisgICAgX2V4 aXRQbGFjZWhvbGRlciA9IG5pbDsKKyAgICAKKyAgICBbW193ZWJWaWV3IHdpbmRvd10gbWFrZUtl eUFuZE9yZGVyRnJvbnQ6c2VsZl07CisgICAgX3dlYlZpZXdQbGFjZWhvbGRlciA9IG5pbDsKKyAg ICAKICAgICBfcmVwYWludENhbGxiYWNrID0gbnVsbHB0cjsKLSAgICBBTExPV19ERVBSRUNBVEVE X0RFQ0xBUkFUSU9OU19CRUdJTgotICAgIFtbX3dlYlZpZXcgd2luZG93XSBzZXRBdXRvZGlzcGxh eTpZRVNdOwotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAgIFtbX3dl YlZpZXcgd2luZG93XSBkaXNwbGF5SWZOZWVkZWRdOwogICAgIF9wYWdlLT5zZXRTdXBwcmVzc1Zp c2liaWxpdHlVcGRhdGVzKGZhbHNlKTsKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19CRUdJTgotICAgIE5TRW5hYmxlU2NyZWVuVXBkYXRlcygpOwotICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0VORAorCisgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKKyAgICBb Q0FUcmFuc2FjdGlvbiBmbHVzaF07CiB9CiAKIC0gKHZvaWQpcGVyZm9ybUNsb3NlOihpZClzZW5k ZXIK 357877 2018-12-20 15:16:19 -0800 2018-12-20 16:27:58 -0800 Patch for landing. bug-192774-20181220151618.patch text/plain 7814 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1OWY2ZmQ0YjQxMzc4NTkw ODhiYzI2MDgyNGNjNjBjYTA3ZmYyYzAuLjNmNTZhOGU5MWE3NDNiOGVmYzkxMjVmYjkxYzJmYzIx NGJiYTdhYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMTItMTcgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIEZsaWNrZXIgd2hlbiBleGl0aW5n IGVsZW1lbnQgZnVsbHNjcmVlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5Mjc3NAorICAgICAgICByZGFyOi8vcHJvYmxlbS8zMzA4ODg3OAorCisg ICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4KKworICAgICAgICBGaXhlcyBhbiBpc3N1ZSB3 aGVyZSB0aGUgd2ViIHBhZ2Ugd291bGQgZmxpY2tlciB1cG9uIGV4aXRpbmcgZWxlbWVudCBmdWxs c2NyZWVuLgorCisgICAgICAgIFJlcGxhY2UgV2ViVmlldyB3aXRoIGEgc25hcHNob3Qgd2hpbGUg dGhlIFdlYlZpZXcgaXMgcmVzdHlsZWQgYW5kIHJlc2l6ZWQgZm9yIGlubGluZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbToKKyAgICAg ICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBpbml0V2l0aFdpbmRvdzp3ZWJWaWV3 OnBhZ2U6XSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNo ZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlciBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJS ZXBhaW50XSk6CisKIDIwMTgtMTEtMjYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KIAogICAgICAgICBSZW5hbWUgV0tXZWJWaWV3Ll9zYWZlQnJvd3NpbmdXYXJu aW5nRm9yVGVzdGluZyB0byBfc2FmZUJyb3dzaW5nV2FybmluZyB0byB1c2UgaXQgZm9yIG1vcmUg dGhhbiB0ZXN0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tG dWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaAppbmRleCAzM2M1OGU3OGQwZTVkNzYzYWEy ZWJhODgyZmEzZmM5OTY5ODdkMjYxLi40MzM2YzI1MDg1NGE4NDlmNmYwMTZhNmExODQxZDA3YmQy NjQ1NTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X S0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgdHlwZWRlZiBl bnVtIEZ1bGxTY3JlZW5TdGF0ZSA6IE5TSW50ZWdlciBGdWxsU2NyZWVuU3RhdGU7CiAgICAgTlNW aWV3ICpfd2ViVmlldzsgLy8gQ2Fubm90IGJlIHJldGFpbmVkLCBzZWUgPHJkYXI6Ly9wcm9ibGVt LzE0ODg0NjY2Pi4KICAgICBXZWJLaXQ6OldlYlBhZ2VQcm94eSogX3BhZ2U7CiAgICAgUmV0YWlu UHRyPFdlYkNvcmVGdWxsU2NyZWVuUGxhY2Vob2xkZXJWaWV3PiBfd2ViVmlld1BsYWNlaG9sZGVy OworICAgIFJldGFpblB0cjxOU1ZpZXc+IF9leGl0UGxhY2Vob2xkZXI7CiAgICAgUmV0YWluUHRy PE5TVmlldz4gX2NsaXBWaWV3OwogICAgIFJldGFpblB0cjxOU1ZpZXc+IF9iYWNrZ3JvdW5kVmll dzsKICAgICBOU1JlY3QgX2luaXRpYWxGcmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXgg MTA2NjhlNjI2MjM0MDlmMWE0NjA1YjQyZDM4ODY0MjNmNzNjOGExYS4uMGY3NmI4ZDFhZjBmMmY1 OTg4MTU1YTc1NGVkZDhmN2IxZThjYjI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTQ0 MCw2ICs0NDAsMjYgQEAgLSAodm9pZCliZWdhbkV4aXRGdWxsU2NyZWVuV2l0aEluaXRpYWxGcmFt ZTooTlNSZWN0KWluaXRpYWxGcmFtZSBmaW5hbEZyYW1lOihOU1IKICAgICBbW3NlbGYgd2luZG93 XSBleGl0RnVsbFNjcmVlbk1vZGU6c2VsZl07CiB9CiAKK1dURl9ERUNMQVJFX0NGX1RZUEVfVFJB SVQoQ0dJbWFnZSk7CisKK3N0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gdGFrZVdpbmRvd1Nu YXBzaG90KENHU1dpbmRvd0lEIHdpbmRvd0lELCBib29sIGNhcHR1cmVBdE5vbWluYWxSZXNvbHV0 aW9uKQoreworICAgIENHU1dpbmRvd0NhcHR1cmVPcHRpb25zIG9wdGlvbnMgPSBrQ0dTQ2FwdHVy ZUlnbm9yZUdsb2JhbENsaXBTaGFwZTsKKyAgICBpZiAoY2FwdHVyZUF0Tm9taW5hbFJlc29sdXRp b24pCisgICAgICAgIG9wdGlvbnMgfD0ga0NHU1dpbmRvd0NhcHR1cmVOb21pbmFsUmVzb2x1dGlv bjsKKyAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gd2luZG93U25hcHNob3RJbWFnZXMgPSBhZG9w dENGKENHU0hXQ2FwdHVyZVdpbmRvd0xpc3QoQ0dTTWFpbkNvbm5lY3Rpb25JRCgpLCAmd2luZG93 SUQsIDEsIG9wdGlvbnMpKTsKKworICAgIGlmICh3aW5kb3dTbmFwc2hvdEltYWdlcyAmJiBDRkFy cmF5R2V0Q291bnQod2luZG93U25hcHNob3RJbWFnZXMuZ2V0KCkpKQorICAgICAgICByZXR1cm4g Y2hlY2tlZF9jZl9jYXN0PENHSW1hZ2VSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgod2luZG93 U25hcHNob3RJbWFnZXMuZ2V0KCksIDApKTsKKworICAgIC8vIEZhbGwgYmFjayB0byB0aGUgbm9u LWhhcmR3YXJlIGNhcHR1cmUgcGF0aCBpZiB3ZSBkaWRuJ3QgZ2V0IGEgc25hcHNob3QKKyAgICAv LyAod2hpY2ggdXN1YWxseSBoYXBwZW5zIGlmIHRoZSB3aW5kb3cgaXMgZnVsbHkgb2ZmLXNjcmVl bikuCisgICAgQ0dXaW5kb3dJbWFnZU9wdGlvbiBpbWFnZU9wdGlvbnMgPSBrQ0dXaW5kb3dJbWFn ZUJvdW5kc0lnbm9yZUZyYW1pbmcgfCBrQ0dXaW5kb3dJbWFnZVNob3VsZEJlT3BhcXVlOworICAg IGlmIChjYXB0dXJlQXROb21pbmFsUmVzb2x1dGlvbikKKyAgICAgICAgaW1hZ2VPcHRpb25zIHw9 IGtDR1dpbmRvd0ltYWdlTm9taW5hbFJlc29sdXRpb247CisgICAgcmV0dXJuIGFkb3B0Q0YoQ0dX aW5kb3dMaXN0Q3JlYXRlSW1hZ2UoQ0dSZWN0TnVsbCwga0NHV2luZG93TGlzdE9wdGlvbkluY2x1 ZGluZ1dpbmRvdywgd2luZG93SUQsIGltYWdlT3B0aW9ucykpOworfQorCiAtICh2b2lkKWZpbmlz aGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246KGJvb2wpY29tcGxldGVkCiB7CiAgICAgaWYgKF9m dWxsU2NyZWVuU3RhdGUgPT0gSW5GdWxsU2NyZWVuKSB7CkBAIC00NTcsMjggKzQ3Nyw0MiBAQCAt ICh2b2lkKWZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246KGJvb2wpY29tcGxldGVkCiAK ICAgICBOU1Jlc3BvbmRlciAqZmlyc3RSZXNwb25kZXIgPSBbW3NlbGYgd2luZG93XSBmaXJzdFJl c3BvbmRlcl07CiAKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgotICAg IC8vIFNjcmVlbiB1cGRhdGVzIHRvIGJlIHJlLWVuYWJsZWQgaW4gY29tcGxldGVGaW5pc2hFeGl0 RnVsbFNjcmVlbkFuaW1hdGlvbkFmdGVyUmVwYWludC4KLSAgICBOU0Rpc2FibGVTY3JlZW5VcGRh dGVzKCk7Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECi0gICAgX3BhZ2Ut PnNldFN1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXModHJ1ZSk7Ci0gICAgW1tzZWxmIHdpbmRvd10g b3JkZXJPdXQ6c2VsZl07Ci0gICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtbc2VsZiB3aW5kb3dd IGNvbnRlbnRWaWV3XTsKLSAgICBjb250ZW50Vmlldy5oaWRkZW4gPSBZRVM7CisgICAgW0NBVHJh bnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRyYW5zYWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllF U107CisgICAgTlNSZWN0IGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3QgPSBfaW5pdGlhbEZyYW1l OworICAgIGV4aXRQbGFjZWhvbGRlclNjcmVlblJlY3Qub3JpZ2luLnkgPSBOU01heFkoW1tbTlNT Y3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0pIC0gTlNNYXhZKGV4aXRQbGFj ZWhvbGRlclNjcmVlblJlY3QpOworCisgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IHdlYlZpZXdD b250ZW50cyA9IHRha2VXaW5kb3dTbmFwc2hvdChbW193ZWJWaWV3IHdpbmRvd10gd2luZG93TnVt YmVyXSwgdHJ1ZSk7CisgICAgd2ViVmlld0NvbnRlbnRzID0gYWRvcHRDRihDR0ltYWdlQ3JlYXRl V2l0aEltYWdlSW5SZWN0KHdlYlZpZXdDb250ZW50cy5nZXQoKSwgTlNSZWN0VG9DR1JlY3QoZXhp dFBsYWNlaG9sZGVyU2NyZWVuUmVjdCkpKTsKKyAgICAKKyAgICBfZXhpdFBsYWNlaG9sZGVyID0g YWRvcHROUyhbW05TVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpbX3dlYlZpZXcgZnJhbWVdXSk7 CisgICAgW19leGl0UGxhY2Vob2xkZXIgc2V0V2FudHNMYXllcjogWUVTXTsKKyAgICBbX2V4aXRQ bGFjZWhvbGRlciBzZXRBdXRvcmVzaXplc1N1YnZpZXdzOiBZRVNdOworICAgIFtfZXhpdFBsYWNl aG9sZGVyIHNldExheWVyQ29udGVudHNQbGFjZW1lbnQ6IE5TVmlld0xheWVyQ29udGVudHNQbGFj ZW1lbnRTY2FsZVByb3BvcnRpb25hbGx5VG9GaXRdOworICAgIFtfZXhpdFBsYWNlaG9sZGVyIHNl dExheWVyQ29udGVudHNSZWRyYXdQb2xpY3k6IE5TVmlld0xheWVyQ29udGVudHNSZWRyYXdOZXZl cl07CisgICAgW19leGl0UGxhY2Vob2xkZXIgc2V0RnJhbWU6W193ZWJWaWV3IGZyYW1lXV07Cisg ICAgW1tfZXhpdFBsYWNlaG9sZGVyIGxheWVyXSBzZXRDb250ZW50czooX19icmlkZ2UgaWQpd2Vi Vmlld0NvbnRlbnRzLmdldCgpXTsKKyAgICBbW193ZWJWaWV3IHN1cGVydmlld10gYWRkU3Vidmll dzpfZXhpdFBsYWNlaG9sZGVyLmdldCgpIHBvc2l0aW9uZWQ6TlNXaW5kb3dBYm92ZSByZWxhdGl2 ZVRvOl93ZWJWaWV3XTsKKworICAgIFtDQVRyYW5zYWN0aW9uIGNvbW1pdF07CisgICAgW0NBVHJh bnNhY3Rpb24gZmx1c2hdOworCisgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRy YW5zYWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllFU107CisgICAgCiAgICAgW19iYWNrZ3JvdW5k Vmlldy5nZXQoKS5sYXllciByZW1vdmVBbGxBbmltYXRpb25zXTsKLSAgICBBTExPV19ERVBSRUNB VEVEX0RFQ0xBUkFUSU9OU19CRUdJTgotICAgIFtbX3dlYlZpZXdQbGFjZWhvbGRlciB3aW5kb3dd IHNldEF1dG9kaXNwbGF5Ok5PXTsKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19F TkQKKyAgICBfcGFnZS0+c2V0U3VwcHJlc3NWaXNpYmlsaXR5VXBkYXRlcyh0cnVlKTsKKyAgICBb X3dlYlZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgW193ZWJWaWV3IHNldEZyYW1lOltf d2ViVmlld1BsYWNlaG9sZGVyIGZyYW1lXV07CisgICAgW193ZWJWaWV3IHNldEF1dG9yZXNpemlu Z01hc2s6W193ZWJWaWV3UGxhY2Vob2xkZXIgYXV0b3Jlc2l6aW5nTWFza11dOworICAgIFtbX3dl YlZpZXdQbGFjZWhvbGRlciBzdXBlcnZpZXddIGFkZFN1YnZpZXc6X3dlYlZpZXcgcG9zaXRpb25l ZDpOU1dpbmRvd0JlbG93IHJlbGF0aXZlVG86X3dlYlZpZXdQbGFjZWhvbGRlci5nZXQoKV07CiAK LSAgICBbc2VsZiBfcmVwbGFjZVZpZXc6X3dlYlZpZXdQbGFjZWhvbGRlci5nZXQoKSB3aXRoOl93 ZWJWaWV3XTsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKICAgICBbTlNMYXlvdXRD b25zdHJhaW50IGFjdGl2YXRlQ29uc3RyYWludHM6c2VsZi5zYXZlZENvbnN0cmFpbnRzXTsKICAg ICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TCiAgICAgc2VsZi5zYXZlZENvbnN0cmFpbnRzID0g bmlsOwogICAgIG1ha2VSZXNwb25kZXJGaXJzdFJlc3BvbmRlcklmRGVzY2VuZGFudE9mVmlldyhf d2ViVmlldy53aW5kb3csIGZpcnN0UmVzcG9uZGVyLCBfd2ViVmlldyk7CiAKLSAgICBbW193ZWJW aWV3IHdpbmRvd10gbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VsZl07Ci0KICAgICAvLyBUaGVzZSBt ZXNzYWdlcyBtdXN0IGJlIHNlbnQgYWZ0ZXIgdGhlIHN3YXAgb3IgZmxhc2hpbmcgd2lsbCBvY2N1 ciBkdXJpbmcgZm9yY2VSZXBhaW50OgogICAgIFtzZWxmIF9tYW5hZ2VyXS0+ZGlkRXhpdEZ1bGxT Y3JlZW4oKTsKICAgICBbc2VsZiBfbWFuYWdlcl0tPnNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oZmFs c2UpOwpAQCAtNDk2LDE5ICs1MzAsMzIgQEAgLSAodm9pZClmaW5pc2hlZEV4aXRGdWxsU2NyZWVu QW5pbWF0aW9uOihib29sKWNvbXBsZXRlZAogICAgICAgICBbc2VsZiBjb21wbGV0ZUZpbmlzaEV4 aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50XTsKICAgICB9KTsKICAgICBfcGFnZS0+ Zm9yY2VSZXBhaW50KF9yZXBhaW50Q2FsbGJhY2suY29weVJlZigpKTsKKworICAgIFtDQVRyYW5z YWN0aW9uIGNvbW1pdF07CisgICAgW0NBVHJhbnNhY3Rpb24gZmx1c2hdOwogfQogCiAtICh2b2lk KWNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJlcGFpbnQKIHsKKyAg ICBbQ0FUcmFuc2FjdGlvbiBiZWdpbl07CisgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFj dGlvbnM6WUVTXTsKKworICAgIFtfd2ViVmlld1BsYWNlaG9sZGVyIHJlbW92ZUZyb21TdXBlcnZp ZXddOworICAgIFtbc2VsZiB3aW5kb3ddIG9yZGVyT3V0OnNlbGZdOworICAgIE5TVmlldyAqY29u dGVudFZpZXcgPSBbW3NlbGYgd2luZG93XSBjb250ZW50Vmlld107CisgICAgY29udGVudFZpZXcu aGlkZGVuID0gWUVTOworICAgIFtfZXhpdFBsYWNlaG9sZGVyIHJlbW92ZUZyb21TdXBlcnZpZXdd OworICAgIFtbX2V4aXRQbGFjZWhvbGRlciBsYXllcl0gc2V0Q29udGVudHM6bmlsXTsKKyAgICBf ZXhpdFBsYWNlaG9sZGVyID0gbmlsOworICAgIAorICAgIFtbX3dlYlZpZXcgd2luZG93XSBtYWtl S2V5QW5kT3JkZXJGcm9udDpzZWxmXTsKKyAgICBfd2ViVmlld1BsYWNlaG9sZGVyID0gbmlsOwor ICAgIAogICAgIF9yZXBhaW50Q2FsbGJhY2sgPSBudWxscHRyOwotICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAgW1tfd2ViVmlldyB3aW5kb3ddIHNldEF1dG9kaXNw bGF5OllFU107Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECi0gICAgW1tf d2ViVmlldyB3aW5kb3ddIGRpc3BsYXlJZk5lZWRlZF07CiAgICAgX3BhZ2UtPnNldFN1cHByZXNz VmlzaWJpbGl0eVVwZGF0ZXMoZmFsc2UpOwotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJ T05TX0JFR0lOCi0gICAgTlNFbmFibGVTY3JlZW5VcGRhdGVzKCk7Ci0gICAgQUxMT1dfREVQUkVD QVRFRF9ERUNMQVJBVElPTlNfRU5ECisKKyAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOworICAg IFtDQVRyYW5zYWN0aW9uIGZsdXNoXTsKIH0KIAogLSAodm9pZClwZXJmb3JtQ2xvc2U6KGlkKXNl bmRlcgo=