102025 2012-11-12 17:58:47 -0800 Web Inspector: [WK1]: Add a dock button to the top right corner of the window 2012-11-13 13:23:07 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy apavlov joepeck keishi loislo pfeldman pmuellr timothy vsevik web-inspector-bugs yurys oldest_to_newest 765054 0 timothy 2012-11-12 17:58:47 -0800 We should add a dock button to the top right corner of the window (similar to the full screen button). 765089 1 173783 timothy 2012-11-12 18:21:38 -0800 Created attachment 173783 Proposed Change 765095 2 173783 joepeck 2012-11-12 18:29:04 -0800 Comment on attachment 173783 Proposed Change View in context: https://bugs.webkit.org/attachment.cgi?id=173783&action=review > Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm:72 > +- (NSCursor *)_cursorForResizeDirection:(NSInteger)direction { > + // Don't show a resize cursor for the northeast (top right) direction if the dock button is visible. > + // This matches what happens when the full screen button is visible. > + if (direction == 1 && ![_dockButton.get() isHidden]) Same comments as Anders on the WK2 patch. Newline before the "{" and the .get() isn't necessary on direct RetainPtr<> messages anymore. > Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm:396 > + // Get the frame view, the usperview of the content view, and its frame. Nit (typo): "usperview" => "superview" 765985 3 timothy 2012-11-13 13:23:07 -0800 r134347 173783 2012-11-12 18:21:38 -0800 2012-11-12 18:29:04 -0800 Proposed Change 0001-Add-a-dock-button-to-the-top-right-corner-of-the-Web.patch text/plain 16854 timothy RnJvbSAyYjIwMWM2YTY0ODQzNDFlNzU4M2ZmYzViMzIyZmRiZmZkZjA5YmU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDEyIE5vdiAyMDEyIDE4OjE4OjQ5IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gQWRk IGEgZG9jayBidXR0b24gdG8gdGhlIHRvcCByaWdodCBjb3JuZXIgb2YgdGhlIFdlYgogSW5zcGVj dG9yIHdpbmRvdyAoc2ltaWxhciB0byB0aGUgZnVsbCBzY3JlZW4gYnV0dG9uKS4KCmh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIwMjUKClJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKU291cmNlL1dlYktpdDoKCiogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2o6IEFkZGVkIERvY2sucGRmLgoKU291cmNlL1dlYktpdC9tYWM6CgoqIFJlc291cmNlcy9E b2NrLnBkZjogQWRkZWQuCiogV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6Ciog V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tOgooLVtXZWJJbnNwZWN0b3JXaW5k b3cgX2N1cnNvckZvclJlc2l6ZURpcmVjdGlvbjpdKTogQWRkZWQuCihXZWJJbnNwZWN0b3JDbGll bnQ6OmRpZFJlc2l6ZU1haW5GcmFtZSk6IENhbGwgYXR0YWNoQXZhaWxhYmlsaXR5Q2hhbmdlZCBp bnN0ZWFkLgooV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmF0dGFjaEF2YWlsYWJpbGl0eUNo YW5nZWQpOiBBZGRlZC4KKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciB3aW5kb3ddKTog Q3JlYXRlIHRoZSBkb2NrIGJ1dHRvbiBhbmQgYWRkIGl0LgooLVtXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyIGF0dGFjaFdpbmRvdzpdKTogQWRkZWQuCigtW1dlYkluc3BlY3RvcldpbmRvd0Nv bnRyb2xsZXIgYXR0YWNoXSk6IENhbGwgc2V0QXR0YWNoZWRXaW5kb3cuCigtW1dlYkluc3BlY3Rv cldpbmRvd0NvbnRyb2xsZXIgZGV0YWNoXSk6IERpdHRvLgooLVtXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyIHNldERvY2tpbmdVbmF2YWlsYWJsZTpdKTogQWRkZWQuIFVwZGF0ZSBoaWRkZW4g c3RhdGUgb2YgdGhlIGRvY2sgYnV0dG9uLgotLS0KIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMCArKysKIFNvdXJjZS9XZWJLaXQvV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogICAgIHwgICAgNCArCiBTb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjAgKysrKysKIFNvdXJjZS9X ZWJLaXQvbWFjL1Jlc291cmNlcy9Eb2NrLnBkZiAgICAgICAgICAgICAgIHwgIEJpbiAwIC0+IDIy ODggYnl0ZXMKIC4uLi9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVu dC5oIHwgICAgMiArCiAuLi4vbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5t bSAgICAgICB8ICAgOTAgKysrKysrKysrKysrKysrKysrKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTIz IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgU291cmNl L1dlYktpdC9tYWMvUmVzb3VyY2VzL0RvY2sucGRmCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2MGYxODg5Li5lMmY2 NTMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTExLTEyICBUaW1vdGh5IEhhdGNo ZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBkb2NrIGJ1dHRvbiB0byB0 aGUgdG9wIHJpZ2h0IGNvcm5lciBvZiB0aGUgV2ViIEluc3BlY3RvciB3aW5kb3cgKHNpbWlsYXIg dG8gdGhlIGZ1bGwgc2NyZWVuIGJ1dHRvbikuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjAyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6 IEFkZGVkIERvY2sucGRmLgorCiAyMDEyLTExLTA4ICBMYXN6bG8gR29tYm9zICA8bC5nb21ib3NA c2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gUmVtb3ZlIG5vbi12YXJpYWJsZSBvcHRpb25z IGZyb20gdGhlIGJ1aWxkIHN5c3RlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggZDMzYjc0MS4uMDE5Y2JkNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC02NCw2ICs2NCw3IEBA CiAJCTFDNjhGNjcyMDk1QjVGQzEwMEMyOTg0RSAvKiBXZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDNjhGNjY2MDk1 QjVGQzEwMEMyOTg0RSAvKiBXZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbSAqLzsgfTsKIAkJMUM3QjBD NjYwRUIyNDY0RDAwQTI4NTAyIC8qIFdlYkluc3BlY3RvckNsaWVudENGLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDN0IwQzY1MEVCMjQ2NEQwMEEy ODUwMiAvKiBXZWJJbnNwZWN0b3JDbGllbnRDRi5jcHAgKi87IH07CiAJCTFDOENCMDdBMEFFOTgz MEMwMEIxRjZFOSAvKiBXZWJFZGl0aW5nRGVsZWdhdGVQcml2YXRlLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzhDQjA3OTBBRTk4MzBDMDBCMUY2RTkg LyogV2ViRWRpdGluZ0RlbGVnYXRlUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVT ID0gKFByaXZhdGUsICk7IH07IH07CisJCTFDOUY1RUZDMTY1MUNERjcwMEM0ODBGOCAvKiBEb2Nr LnBkZiBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM5 RjVFRkIxNjUxQ0RGNzAwQzQ4MEY4IC8qIERvY2sucGRmICovOyB9OwogCQkxQ0NGRkQxMzBCMUY4 MUYyMDAyRUU5MjYgLyogT2xkV2ViQXNzZXJ0aW9ucy5jIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUNDRkZEMTIwQjFGODFGMjAwMkVFOTI2IC8qIE9sZFdl YkFzc2VydGlvbnMuYyAqLzsgfTsKIAkJMjI0MTAwRjMwOTE4MThEOTAwRDJEMjY2IC8qIFdlYlBs dWdpbnNQcml2YXRlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyMjQxMDBGMjA5MTgxOEQ5MDBEMkQyNjYgLyogV2ViUGx1Z2luc1ByaXZhdGUuaCAqLzsg c2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkyMjQxMDBGOTA5 MTgxOTAxMDBEMkQyNjYgLyogV2ViUGx1Z2luc1ByaXZhdGUubSBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDIyNDEwMEY4MDkxODE5MDEwMEQyRDI2NiAvKiBX ZWJQbHVnaW5zUHJpdmF0ZS5tICovOyB9OwpAQCAtNDM4LDYgKzQzOSw3IEBACiAJCTFDOTA0RkQz MEJBOUREMEYwMDgxRTlEMCAvKiBWZXJzaW9uLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2Nv bmZpZzsgcGF0aCA9IFZlcnNpb24ueGNjb25maWc7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFDOTA0RkQ0MEJBOUREMEYwMDgxRTlEMCAvKiBEZWJ1Z1JlbGVhc2UueGNjb25maWcgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSB0ZXh0LnhjY29uZmlnOyBwYXRoID0gRGVidWdSZWxlYXNlLnhjY29uZmlnOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzkwNEZENTBCQTlERDBGMDA4MUU5RDAgLyogQmFz ZS54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBCYXNlLnhjY29uZmln OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzlGNUVGQjE2NTFDREY3MDBDNDgwRjgg LyogRG9jay5wZGYgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSBpbWFnZS5wZGY7IHBhdGggPSBEb2NrLnBkZjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMUNDRkZEMTIwQjFGODFGMjAwMkVFOTI2IC8qIE9sZFdlYkFzc2VydGlvbnMuYyAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5jOyBwYXRoID0gT2xkV2ViQXNzZXJ0aW9ucy5jOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkyMjQxMDBGMjA5MTgxOEQ5MDBEMkQyNjYgLyogV2ViUGx1 Z2luc1ByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBXZWJQbHVnaW5zUHJpdmF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJX aWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJMjI0MTAwRjgwOTE4MTkwMTAwRDJEMjY2IC8q IFdlYlBsdWdpbnNQcml2YXRlLm0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5vYmpjOyBwYXRoID0gV2ViUGx1Z2luc1ByaXZhdGUubTsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CkBAIC04MzEsNiArODMzLDcgQEAK IAkJMDg5QzE2NjVGRTg0MTE1OEMwMkFBQzA3IC8qIFJlc291cmNlcyAqLyA9IHsKIAkJCWlzYSA9 IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJMUM5RjVFRkIxNjUxQ0RGNzAwQzQ4MEY4 IC8qIERvY2sucGRmICovLAogCQkJCTkzMjVGQkRDMDdEODI5QUUwMDE1OTg2MiAvKiBJRE5TY3Jp cHRXaGl0ZUxpc3QudHh0ICovLAogCQkJCTkzOTgxMTMyMDgyNEJGMDEwMDhERjAzOCAvKiBJbmZv LnBsaXN0ICovLAogCQkJCUY1QjY3MTMwMDIzRURGODkwMUMxQTUyNSAvKiB1cmxfaWNvbi50aWZm ICovLApAQCAtMTcwMSw2ICsxNzA0LDcgQEAKIAkJCQk5Mzk4MTBCNzA4MjRCRjAxMDA4REYwMzgg LyogdXJsX2ljb24udGlmZiBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJOTM5ODEwQjUwODI0QkYwMTAw OERGMDM4IC8qIFdlYkF1dGhlbnRpY2F0aW9uUGFuZWwubmliIGluIFJlc291cmNlcyAqLywKIAkJ CQk1REU4M0E3QTBEMEY3Rjk0MDBDQUQxMkEgLyogV2ViSmF2YVNjcmlwdFRleHRJbnB1dFBhbmVs Lm5pYiBpbiBSZXNvdXJjZXMgKi8sCisJCQkJMUM5RjVFRkMxNjUxQ0RGNzAwQzQ4MEY4IC8qIERv Y2sucGRmIGluIFJlc291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBv c3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA2MzlkMTAyLi5lNTRj M2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMTEtMTIgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGRvY2sgYnV0 dG9uIHRvIHRoZSB0b3AgcmlnaHQgY29ybmVyIG9mIHRoZSBXZWIgSW5zcGVjdG9yIHdpbmRvdyAo c2ltaWxhciB0byB0aGUgZnVsbCBzY3JlZW4gYnV0dG9uKS4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMDI1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvRG9jay5wZGY6IEFkZGVk LgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbToKKyAgICAgICAgKC1bV2Vi SW5zcGVjdG9yV2luZG93IF9jdXJzb3JGb3JSZXNpemVEaXJlY3Rpb246XSk6IEFkZGVkLgorICAg ICAgICAoV2ViSW5zcGVjdG9yQ2xpZW50OjpkaWRSZXNpemVNYWluRnJhbWUpOiBDYWxsIGF0dGFj aEF2YWlsYWJpbGl0eUNoYW5nZWQgaW5zdGVhZC4KKyAgICAgICAgKFdlYkluc3BlY3RvckZyb250 ZW5kQ2xpZW50OjphdHRhY2hBdmFpbGFiaWxpdHlDaGFuZ2VkKTogQWRkZWQuCisgICAgICAgICgt W1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgd2luZG93XSk6IENyZWF0ZSB0aGUgZG9jayBi dXR0b24gYW5kIGFkZCBpdC4KKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxl ciBhdHRhY2hXaW5kb3c6XSk6IEFkZGVkLgorICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyIGF0dGFjaF0pOiBDYWxsIHNldEF0dGFjaGVkV2luZG93LgorICAgICAgICAoLVtX ZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyIGRldGFjaF0pOiBEaXR0by4KKyAgICAgICAgKC1b V2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciBzZXREb2NraW5nVW5hdmFpbGFibGU6XSk6IEFk ZGVkLiBVcGRhdGUgaGlkZGVuIHN0YXRlIG9mIHRoZSBkb2NrIGJ1dHRvbi4KKwogMjAxMi0xMS0w OCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgQWx3YXlz IHVzZSBhIHRleHR1cmVkIHdpbmRvdyBmb3IgdGhlIFdlYiBJbnNwZWN0b3IuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9SZXNvdXJjZXMvRG9jay5wZGYgYi9Tb3VyY2UvV2ViS2l0L21h Yy9SZXNvdXJjZXMvRG9jay5wZGYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDBiYjhiOGJiZmViMmIwOTBmNjZhZTJj ZTBlZDhkNzc4MzY0NGI1OQpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMjI4OAp6Y21haSQyfi1u ejk+KjAqJn1nTCNhPzNnIzV5VjFmYSpfbjBPNV9sXjV9K2J0SXdTKWBBYzE2ezV6TG1wVmt4aiYK ek4+Tik7YWY+Mz9MIWhYTFR0WD9OQVBSXnBNKigzJFdyNH5IU1hLXnFoTkklflVndTNSfDlzfl56 aVdRKV45I3dGCno+dWR3clFpLUk3ayFLQGd4bHtqYVlpSzBXMDElSntBMF50YDFMT21VQm9xdzs9 JE9PPCRqOyZqNnA+LXEycEMxVQp6aClebSowMCMlNjlGLXcoQnZHK2BtK3VCJkU4bihIWjVoNjx3 KktJe3BOMiNMNXw7aFZyYmk8US14RytSNUxMfVMKekRzUGErMUojPDFNaHkpTiZLaE5ednNoN0V6 Tl5UfSQ7bWxVWVVyQWp1QkpfUEdXOVYxVkJIfUh7Y2EqNjV2YGNWCnpSKE1vK0RFUVRtaFRwP2ls cnsxQzkqYVQldk5zJk1eZXNhcUNfcjZ+b3JsUCFGKXw/ezJOPXRPbFQ/Q1lfdkhZZAp6RlA1QUtB YC0pVXIzeFNyIX59P2pvazJ0X3lBPzBeUT4jXyttUHYodDFPKTt5UzZwV3gycH5JMkJjdzhaNmY4 c2wKenlsaFQjMncqT21iI1RCZHZ8X188amc2SmN2WCp2e0orVXkhZCtfUT91K2pvI0UpcHZpQjBR SjllX3IkeGVnbzI4CnotPm5ZR1FyO3khTjhxNEtRcChUOGUqQ30rVzIyJSpmP0d6OyNEMlk7KEpw ST9WS3leNC0mbkpFXm0+Njt7TzMlPAp6e1E4ZiYpd052aFAyVlIzJDlGJSFiPThmWldMQENxOHZt cTAlWEcodGhUbVhpWV9LSzI7cWM2aDdTO2drRzNXNy0KelVoWnl6XyokbCstJmR5I3VialZZYVZq SE0/X2Ahb049STN6eUx4QmdzSGFWT09SS2hSbyRsezwjcypETkhuZEVuCnp8Ri1EKStgS2p9XzFF QGZHcH0wYFRAJDZAPn1IP2FvI0VIcng3S1JUJjVGd2p6Zk50Tnl2S00/dHgpWWQ8dkRGZAp6ZHow bUVQZ0JRQFUkPEcwPUB4Q01CR159VGdePGYoZngzWXpXNikxeGVBNnI+eXt6YjRTYXhAaW9FQlhV ejB8VGoKejgjNnJ+XnVAdXNiMiR+bDgoUFd6eVBvXmpCcylJMUhvYX1xeStseDQ7UmIpRUZgTT9I PEc3ayl5VSVwfndAUzRDCnp2NVA9Wnc2JmttdU15dUttQWxEZj9yMDFZenM7YnVlVEZwbHl+XkN+ S31ASzIqKExwaXJ+YjI3eU0jfkReSGhCQwp6TC09OWNlcjNUS0wxd2k3cXJ8P0p2T3tOWHRDXj5Y WUk5cU02RXFWWHVOR0QxWHwjNSpuYmQ1KFhZTDx8T1JuVmEKej5BOHtfO0luQ2dhKXhzeE98Pigh QD5Lb0Y/SlprdyN7T1d+cVBNQFhlUlJpWE1JbXZhZjlkSmNzTGF5dWBRfTFqCnokMmR3YklNKEdA I1U/KUBaMGlsYDxPTl45YysyR3BtdXYyK1hBXnVzZT9SQXZjTlhQakwkeCEqbzx2YjRwN15OKwp6 aFJuUD12P0tiQ3ZDe3RDbD0kfV9ee1p7TmVSNFFXI1prNHRscGJ7Q2Nkd3R7OSRZcEs4aShwIURx KGg9OXBCKHkKeiRGQUY9TDZrK1piKj05eXQhQWRHeWtkT3kqcSt8Yz0wOCRlZWRUa2ZgPkR+Myow alloR2ZVaWVPYENoUUxBMWFMCno5WTlrakVRWjxQa1EqTkVJS0lXY25OVEA8WFFDIU45RyNEemBi U0BDV0R9IUEocztkb3d5VV8qVzxIWHEjYHo+Sgp6PEA2OERsZDwoMTczTDxwNTNqI1JkVmZzJUZy Y2w2Kkhkfmk9UmcxWnl2PSteb3VrVShjMU9pdlRmdClYViFrOSMKemtmK317eiZWO3wkaG1CeHZ7 dnB+dXVAdG8kcU5UaygxNHB9M2w+NEFZU0x7clNkfnchRk9hKDhpdl9Td1VySkVlCnp7cVBIUE9U SzR3e0lMR1ckQCF9SkFNSzR4d3BJeEtudnB3UEp2cU1kZEYkb3tsV0dIJFNhI0lvVEQ7QUYtIXFf VAp6a3FHQXI0O3A9Y1BBbytBMCh2aUdUOz8lVWphfTJgeHZfYE9qaHMkVnUoTUp1VTZZQHRkTm5p K1FQcytgcyVEU08Kej9rS3NlS0Nfc2kxRzNvPEJSQFBxUWM7Sl92IW5nQE8ldV94WkxMOW5CTWZa R2J9TmtpN28lREM8TD1edTsrLTNoCnpIe1lOSC1GSGRTWktkaG45a0Y3M2RaVzVOXmBiQDE3aU0y UyswI0Updm9FJTliTDRNPCtAelFGb0g3NWZ6JnN1MAp6IzBOOUFNbT05bmRMRG03JX0mKnZ4bWk4 Kl9AZTdEQSlVYEk4SklIfWJzeT9PJWk5JFJ6eCY7XzxaYHclamIyYDEKejhnVD8+RlpKNHlEYVV8 eShUY2FaaUd2MmA3WDtGbnQzMUxIZz0ta2MrPzxeRCFnNTNlO0VkdHtMOTFKRWRhaCNjCno2PHA9 LSN3RV9kNyEwYChLejB8NDxRTn11SGU9Uy1GYzhBJmBucDlZNz08SUdxMDhLc3VLQGNNSDZkdV8y YGRqKwp6MnpjPjxnOCY1RCtTeVY3cEJQdyUjc0xfRW10ZHx5Y2RtdkZ0cXVoJUV9SF5FNmJRbVRP cXZ+cWF0SCkxdkdkaT0KekhRYGBmN3NVdiUzQWZ9RG4rWjxYVV8tQEgyXldYKmwxK1MyTkpWUlp6 WTBfI0xxZHF5PSU1bjhLTXNJRnImSC1iCnoyKFkzLU9jcGp0QEJAJm5ZOVBlSXN7WG5MKFYxQTx1 V0tNayFQMHN8Z1kyK156TSlZdT51K2NmbyUqKDREJnJrfgp6cHx8IXk0RWtHc0F0dnxeamdIT0kp bVRzJkVSSH5BT01mSHk7eUEyKypvZm12ckM1OTVFcjFvJE8lZnUtZFMhWGQKeiNrJDN3NilYJTFm dkVeZmgpfGlKb2UqVHZmPzxZO05Adm1OUjNSblVmJXhaSm1iKj1rVnkmX0NMTGZVUEw/bl4rCklj e3ZtUjU1ZVNHa05eTXgKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKaW5kZXggODA2 OTMzNC4uY2IyZjkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTkwLDYgKzkwLDggQEAgY2xhc3MgV2ViSW5z cGVjdG9yRnJvbnRlbmRDbGllbnQgOiBwdWJsaWMgV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRD bGllbnRMb2NhbAogcHVibGljOgogICAgIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50KFdlYlZp ZXcqLCBXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyKiwgV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlciosIFdlYkNvcmU6OlBhZ2UqLCBQYXNzT3duUHRyPFNldHRpbmdzPik7CiAKKyAgICB2 b2lkIGF0dGFjaEF2YWlsYWJpbGl0eUNoYW5nZWQoYm9vbCk7CisKICAgICB2aXJ0dWFsIHZvaWQg ZnJvbnRlbmRMb2FkZWQoKTsKIAogICAgIHZpcnR1YWwgU3RyaW5nIGxvY2FsaXplZFN0cmluZ3NV UkwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbQppbmRleCAwYjkwNDFkLi5kMTdhNDg2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCkBA IC00OSwxMSArNDksMzcgQEAKIAogU09GVF9MSU5LX1NUQUdFRF9GUkFNRVdPUktfT1BUSU9OQUwo V2ViSW5zcGVjdG9yLCBQcml2YXRlRnJhbWV3b3JrcywgQSkKIAorLy8gVGhlIG1hcmdpbiBmcm9t IHRoZSB0b3AgYW5kIHJpZ2h0IG9mIHRoZSBkb2NrIGJ1dHRvbiAoc2FtZSBhcyB0aGUgZnVsbCBz Y3JlZW4gYnV0dG9uKS4KK3N0YXRpYyBjb25zdCBDR0Zsb2F0IGRvY2tCdXR0b25NYXJnaW4gPSAz OworCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorQGludGVyZmFjZSBOU1dpbmRvdyAoQXBw S2l0RGV0YWlscykKKy0gKE5TQ3Vyc29yICopX2N1cnNvckZvclJlc2l6ZURpcmVjdGlvbjooTlNJ bnRlZ2VyKWRpcmVjdGlvbjsKK0BlbmQKKworQGludGVyZmFjZSBXZWJJbnNwZWN0b3JXaW5kb3cg OiBOU1dpbmRvdyB7CitAcHVibGljCisgICAgUmV0YWluUHRyPE5TQnV0dG9uPiBfZG9ja0J1dHRv bjsKK30KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFdlYkluc3BlY3RvcldpbmRvdworCistIChO U0N1cnNvciAqKV9jdXJzb3JGb3JSZXNpemVEaXJlY3Rpb246KE5TSW50ZWdlcilkaXJlY3Rpb24g eworICAgIC8vIERvbid0IHNob3cgYSByZXNpemUgY3Vyc29yIGZvciB0aGUgbm9ydGhlYXN0ICh0 b3AgcmlnaHQpIGRpcmVjdGlvbiBpZiB0aGUgZG9jayBidXR0b24gaXMgdmlzaWJsZS4KKyAgICAv LyBUaGlzIG1hdGNoZXMgd2hhdCBoYXBwZW5zIHdoZW4gdGhlIGZ1bGwgc2NyZWVuIGJ1dHRvbiBp cyB2aXNpYmxlLgorICAgIGlmIChkaXJlY3Rpb24gPT0gMSAmJiAhW19kb2NrQnV0dG9uLmdldCgp IGlzSGlkZGVuXSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICByZXR1cm4gW3N1cGVyIF9jdXJz b3JGb3JSZXNpemVEaXJlY3Rpb246ZGlyZWN0aW9uXTsKK30KKworQGVuZAorCiBAaW50ZXJmYWNl IFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgOiBOU1dpbmRvd0NvbnRyb2xsZXIgPE5TV2lu ZG93RGVsZWdhdGU+IHsKIEBwcml2YXRlCiAgICAgUmV0YWluUHRyPFdlYlZpZXc+IF9pbnNwZWN0 ZWRXZWJWaWV3OworICAgIFJldGFpblB0cjxOU0J1dHRvbj4gX2RvY2tCdXR0b247CiAgICAgV2Vi VmlldyAqX3dlYlZpZXc7CiAgICAgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQqIF9mcm9udGVu ZENsaWVudDsKICAgICBXZWJJbnNwZWN0b3JDbGllbnQqIF9pbnNwZWN0b3JDbGllbnQ7CkBAIC03 Miw2ICs5OCw3IEBAIC0gKHZvaWQpc2V0RnJvbnRlbmRDbGllbnQ6KFdlYkluc3BlY3RvckZyb250 ZW5kQ2xpZW50Kilmcm9udGVuZENsaWVudDsKIC0gKHZvaWQpc2V0SW5zcGVjdG9yQ2xpZW50OihX ZWJJbnNwZWN0b3JDbGllbnQqKWluc3BlY3RvckNsaWVudDsKIC0gKFdlYkluc3BlY3RvckNsaWVu dCopaW5zcGVjdG9yQ2xpZW50OwogLSAodm9pZClzZXRBdHRhY2hlZFdpbmRvd0hlaWdodDoodW5z aWduZWQpaGVpZ2h0OworLSAodm9pZClzZXREb2NraW5nVW5hdmFpbGFibGU6KEJPT0wpdW5hdmFp bGFibGU7CiAtICh2b2lkKWRlc3Ryb3lJbnNwZWN0b3JWaWV3Oihib29sKW5vdGlmeUluc3BlY3Rv ckNvbnRyb2xsZXI7CiBAZW5kCiAKQEAgLTEyMCw3ICsxNDcsNyBAQCB2b2lkIFdlYkluc3BlY3Rv ckNsaWVudDo6YnJpbmdGcm9udGVuZFRvRnJvbnQoKQogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6 OmRpZFJlc2l6ZU1haW5GcmFtZShGcmFtZSopCiB7CiAgICAgaWYgKG1fZnJvbnRlbmRDbGllbnQp Ci0gICAgICAgIG1fZnJvbnRlbmRDbGllbnQtPnNldERvY2tpbmdVbmF2YWlsYWJsZSghbV9mcm9u dGVuZENsaWVudC0+Y2FuQXR0YWNoV2luZG93KCkpOworICAgICAgICBtX2Zyb250ZW5kQ2xpZW50 LT5hdHRhY2hBdmFpbGFiaWxpdHlDaGFuZ2VkKG1fZnJvbnRlbmRDbGllbnQtPmNhbkF0dGFjaFdp bmRvdygpKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodCgpCkBAIC0x NDcsNiArMTc0LDEyIEBAIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjpXZWJJbnNwZWN0b3JG cm9udGVuZENsaWVudChXZWJWaWV3KiBpbnNwZWN0ZWRXZWJWaWV3CiAgICAgW3dpbmRvd0NvbnRy b2xsZXIgc2V0RnJvbnRlbmRDbGllbnQ6dGhpc107CiB9CiAKK3ZvaWQgV2ViSW5zcGVjdG9yRnJv bnRlbmRDbGllbnQ6OmF0dGFjaEF2YWlsYWJpbGl0eUNoYW5nZWQoYm9vbCBhdmFpbGFibGUpCit7 CisgICAgc2V0RG9ja2luZ1VuYXZhaWxhYmxlKCFhdmFpbGFibGUpOworICAgIFttX3dpbmRvd0Nv bnRyb2xsZXIuZ2V0KCkgc2V0RG9ja2luZ1VuYXZhaWxhYmxlOiFhdmFpbGFibGVdOworfQorCiB2 b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojpmcm9udGVuZExvYWRlZCgpCiB7CiAgICAg W21fd2luZG93Q29udHJvbGxlci5nZXQoKSBzaG93V2luZG93Om5pbF07CkBAIC0zMzIsMTggKzM2 NSw1NyBAQCAtIChXZWJWaWV3ICopd2ViVmlldwogCiAtIChOU1dpbmRvdyAqKXdpbmRvdwogewot ICAgIE5TV2luZG93ICp3aW5kb3cgPSBbc3VwZXIgd2luZG93XTsKKyAgICBXZWJJbnNwZWN0b3JX aW5kb3cgKndpbmRvdyA9IChXZWJJbnNwZWN0b3JXaW5kb3cgKilbc3VwZXIgd2luZG93XTsKICAg ICBpZiAod2luZG93KQogICAgICAgICByZXR1cm4gd2luZG93OwogCiAgICAgTlNVSW50ZWdlciBz dHlsZU1hc2sgPSAoTlNUaXRsZWRXaW5kb3dNYXNrIHwgTlNDbG9zYWJsZVdpbmRvd01hc2sgfCBO U01pbmlhdHVyaXphYmxlV2luZG93TWFzayB8IE5TUmVzaXphYmxlV2luZG93TWFzayB8IE5TVGV4 dHVyZWRCYWNrZ3JvdW5kV2luZG93TWFzayk7Ci0gICAgd2luZG93ID0gW1tOU1dpbmRvdyBhbGxv Y10gaW5pdFdpdGhDb250ZW50UmVjdDpOU01ha2VSZWN0KDYwLjAsIDIwMC4wLCA3NTAuMCwgNjUw LjApIHN0eWxlTWFzazpzdHlsZU1hc2sgYmFja2luZzpOU0JhY2tpbmdTdG9yZUJ1ZmZlcmVkIGRl ZmVyOk5PXTsKKyAgICB3aW5kb3cgPSBbW1dlYkluc3BlY3RvcldpbmRvdyBhbGxvY10gaW5pdFdp dGhDb250ZW50UmVjdDpOU01ha2VSZWN0KDYwLjAsIDIwMC4wLCA3NTAuMCwgNjUwLjApIHN0eWxl TWFzazpzdHlsZU1hc2sgYmFja2luZzpOU0JhY2tpbmdTdG9yZUJ1ZmZlcmVkIGRlZmVyOk5PXTsK ICAgICBbd2luZG93IHNldERlbGVnYXRlOnNlbGZdOwogICAgIFt3aW5kb3cgc2V0TWluU2l6ZTpO U01ha2VTaXplKDQwMC4wLCA0MDAuMCldOwogICAgIFt3aW5kb3cgc2V0QXV0b3JlY2FsY3VsYXRl c0NvbnRlbnRCb3JkZXJUaGlja25lc3M6Tk8gZm9yRWRnZTpOU01heFlFZGdlXTsKICAgICBbd2lu ZG93IHNldENvbnRlbnRCb3JkZXJUaGlja25lc3M6NTUuIGZvckVkZ2U6TlNNYXhZRWRnZV07CiAg ICAgV0tOU1dpbmRvd01ha2VCb3R0b21Db3JuZXJzU3F1YXJlKHdpbmRvdyk7CiAKKyAgICAvLyBD cmVhdGUgYSBmdWxsIHNjcmVlbiBidXR0b24gc28gd2UgY2FuIHR1cm4gaXQgaW50byBhIGRvY2sg YnV0dG9uLgorICAgIF9kb2NrQnV0dG9uID0gW05TV2luZG93IHN0YW5kYXJkV2luZG93QnV0dG9u Ok5TV2luZG93RnVsbFNjcmVlbkJ1dHRvbiBmb3JTdHlsZU1hc2s6c3R5bGVNYXNrXTsKKyAgICBf ZG9ja0J1dHRvbi5nZXQoKS50YXJnZXQgPSBzZWxmOworICAgIF9kb2NrQnV0dG9uLmdldCgpLmFj dGlvbiA9IEBzZWxlY3RvcihhdHRhY2hXaW5kb3c6KTsKKworICAgIC8vIFN0b3JlIHRoZSBkb2Nr IGJ1dHRvbiBvbiB0aGUgd2luZG93IHRvbyBzbyBpdCBjYW4gY2hlY2sgaXRzIHZpc2liaWxpdHku CisgICAgd2luZG93LT5fZG9ja0J1dHRvbiA9IF9kb2NrQnV0dG9uLmdldCgpOworCisgICAgLy8g R2V0IHRoZSBkb2NrIGltYWdlIGFuZCBtYWtlIGl0IGEgdGVtcGxhdGUgc28gdGhlIGJ1dHRvbiBj ZWxsIGVmZmVjdHMgd2lsbCBhcHBseS4KKyAgICBOU0ltYWdlICpkb2NrSW1hZ2UgPSBbW05TQnVu ZGxlIGJ1bmRsZUZvckNsYXNzOltzZWxmIGNsYXNzXV0gaW1hZ2VGb3JSZXNvdXJjZTpAIkRvY2si XTsKKyAgICBbZG9ja0ltYWdlIHNldFRlbXBsYXRlOllFU107CisKKyAgICAvLyBTZXQgdGhlIGRv Y2sgaW1hZ2Ugb24gdGhlIGJ1dHRvbiBjZWxsLgorICAgIE5TQ2VsbCAqZG9ja0J1dHRvbkNlbGwg PSBfZG9ja0J1dHRvbi5nZXQoKS5jZWxsOworICAgIGRvY2tCdXR0b25DZWxsLmltYWdlID0gZG9j a0ltYWdlOworCisgICAgLy8gR2V0IHRoZSBmcmFtZSB2aWV3LCB0aGUgdXNwZXJ2aWV3IG9mIHRo ZSBjb250ZW50IHZpZXcsIGFuZCBpdHMgZnJhbWUuCisgICAgLy8gVGhpcyB3aWxsIGJlIHRoZSBz dXBlcnZpZXcgb2YgdGhlIGRvY2sgYnV0dG9uIHRvby4KKyAgICBOU1ZpZXcgKmNvbnRlbnRWaWV3 ID0gd2luZG93LmNvbnRlbnRWaWV3OworICAgIE5TVmlldyAqZnJhbWVWaWV3ID0gY29udGVudFZp ZXcuc3VwZXJ2aWV3OworICAgIE5TUmVjdCBmcmFtZVZpZXdCb3VuZHMgPSBmcmFtZVZpZXcuYm91 bmRzOworICAgIE5TU2l6ZSBkb2NrQnV0dG9uU2l6ZSA9IF9kb2NrQnV0dG9uLmdldCgpLmZyYW1l LnNpemU7CisKKyAgICBBU1NFUlQoIWZyYW1lVmlldy5mbGlwcGVkKTsKKworICAgIC8vIFBvc2l0 aW9uIHRoZSBkb2NrIGJ1dHRvbiBpbiB0aGUgY29ybmVyIHRvIG1hdGNoIHdoZXJlIHRoZSBmdWxs IHNjcmVlbiBidXR0b24gaXMgbm9ybWFsbHkuCisgICAgTlNQb2ludCBkb2NrQnV0dG9uT3JpZ2lu OworICAgIGRvY2tCdXR0b25PcmlnaW4ueCA9IE5TTWF4WChmcmFtZVZpZXdCb3VuZHMpIC0gZG9j a0J1dHRvblNpemUud2lkdGggLSBkb2NrQnV0dG9uTWFyZ2luOworICAgIGRvY2tCdXR0b25Pcmln aW4ueSA9IE5TTWF4WShmcmFtZVZpZXdCb3VuZHMpIC0gZG9ja0J1dHRvblNpemUuaGVpZ2h0IC0g ZG9ja0J1dHRvbk1hcmdpbjsKKyAgICBfZG9ja0J1dHRvbi5nZXQoKS5mcmFtZU9yaWdpbiA9IGRv Y2tCdXR0b25PcmlnaW47CisKKyAgICAvLyBTZXQgdGhlIGF1dG9yZXNpemluZyBtYXNrIHRvIGtl ZXAgdGhlIGRvY2sgYnV0dG9uIHBpbm5lZCB0byB0aGUgdG9wIHJpZ2h0IGNvcm5lci4KKyAgICBf ZG9ja0J1dHRvbi5nZXQoKS5hdXRvcmVzaXppbmdNYXNrID0gTlNWaWV3TWluWE1hcmdpbiB8IE5T Vmlld01pbllNYXJnaW47CisKKyAgICBbZnJhbWVWaWV3IGFkZFN1YnZpZXc6X2RvY2tCdXR0b24u Z2V0KCldOworCisgICAgLy8gSGlkZSB0aGUgZG9jayBidXR0b24gaWYgd2UgY2FuJ3QgYXR0YWNo LgorICAgIF9kb2NrQnV0dG9uLmdldCgpLmhpZGRlbiA9ICFfZnJvbnRlbmRDbGllbnQtPmNhbkF0 dGFjaFdpbmRvdygpOworCiAgICAgW3NlbGYgc2V0V2luZG93OndpbmRvd107CiAgICAgW3dpbmRv dyByZWxlYXNlXTsKIApAQCAtMzg4LDYgKzQ2MCwxMSBAQCAtICh2b2lkKWNsb3NlCiAgICAgICAg IFtzdXBlciBjbG9zZV07CiB9CiAKKy0gKElCQWN0aW9uKWF0dGFjaFdpbmRvdzooaWQpc2VuZGVy Cit7CisgICAgX2Zyb250ZW5kQ2xpZW50LT5hdHRhY2hXaW5kb3coKTsKK30KKwogLSAoSUJBY3Rp b24pc2hvd1dpbmRvdzooaWQpc2VuZGVyCiB7CiAgICAgaWYgKF92aXNpYmxlKSB7CkBAIC00MzUs NiArNTEyLDcgQEAgLSAodm9pZClhdHRhY2gKICAgICAgICAgcmV0dXJuOwogCiAgICAgX2luc3Bl Y3RvckNsaWVudC0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQodHJ1ZSk7CisgICAgX2Zyb250 ZW5kQ2xpZW50LT5zZXRBdHRhY2hlZFdpbmRvdyh0cnVlKTsKIAogICAgIFtzZWxmIGNsb3NlXTsK ICAgICBbc2VsZiBzaG93V2luZG93Om5pbF07CkBAIC00NDYsNiArNTI0LDcgQEAgLSAodm9pZClk ZXRhY2gKICAgICAgICAgcmV0dXJuOwogCiAgICAgX2luc3BlY3RvckNsaWVudC0+c2V0SW5zcGVj dG9yU3RhcnRzQXR0YWNoZWQoZmFsc2UpOworICAgIF9mcm9udGVuZENsaWVudC0+c2V0QXR0YWNo ZWRXaW5kb3coZmFsc2UpOwogCiAgICAgW3NlbGYgY2xvc2VdOwogICAgIFtzZWxmIHNob3dXaW5k b3c6bmlsXTsKQEAgLTQ4OSw2ICs1NjgsMTEgQEAgLSAodm9pZClzZXRBdHRhY2hlZFdpbmRvd0hl aWdodDoodW5zaWduZWQpaGVpZ2h0CiAgICAgW2ZyYW1lVmlldyBzZXRGcmFtZTpmcmFtZVZpZXdS ZWN0XTsKIH0KIAorLSAodm9pZClzZXREb2NraW5nVW5hdmFpbGFibGU6KEJPT0wpdW5hdmFpbGFi bGUKK3sKKyAgICBfZG9ja0J1dHRvbi5nZXQoKS5oaWRkZW4gPSB1bmF2YWlsYWJsZTsKK30KKwog LSAodm9pZClkZXN0cm95SW5zcGVjdG9yVmlldzooYm9vbClub3RpZnlJbnNwZWN0b3JDb250cm9s bGVyCiB7CiAgICAgW1tfaW5zcGVjdGVkV2ViVmlldy5nZXQoKSBpbnNwZWN0b3JdIHJlbGVhc2VG cm9udGVuZF07Ci0tIAoxLjcuMTAuMiAoQXBwbGUgR2l0LTMzKQoK