70653 2011-10-21 14:59:26 -0700 Remove ability to create a WKView without a WKContextRef and WKPageGroupRef 2011-10-21 15:09:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 488686 0 sam 2011-10-21 14:59:26 -0700 Remove ability to create a WKView without a WKContextRef and WKPageGroupRef 488691 1 112026 sam 2011-10-21 15:02:51 -0700 Created attachment 112026 Patch 488696 2 112026 simon.fraser 2011-10-21 15:04:14 -0700 Comment on attachment 112026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112026&action=review > Source/WebKit2/ChangeLog:4 > + Remove ability to create a WKView without a WKContextRef and WKPageGroupRef > + https://bugs.webkit.org/show_bug.cgi?id=70653 Why? 488698 3 sam 2011-10-21 15:05:28 -0700 It is just to simplify things, removing the need for shared contexts. 488699 4 112026 darin 2011-10-21 15:05:38 -0700 Comment on attachment 112026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112026&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:-204 > -- (id)initWithFrame:(NSRect)frame > -{ > - return [self initWithFrame:frame contextRef:toAPI(WebContext::sharedProcessContext())]; > -} This is the designated initializer of the superclass. Normally you have to override this, at least to return nil. 488704 5 sam 2011-10-21 15:08:20 -0700 Committed r98159: <http://trac.webkit.org/changeset/98159> 488706 6 sam 2011-10-21 15:09:32 -0700 It is just to simplify things, removing the need for shared contexts.(In reply to comment #4) > (From update of attachment 112026 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=112026&action=review > > > Source/WebKit2/UIProcess/API/mac/WKView.mm:-204 > > -- (id)initWithFrame:(NSRect)frame > > -{ > > - return [self initWithFrame:frame contextRef:toAPI(WebContext::sharedProcessContext())]; > > -} > > This is the designated initializer of the superclass. Normally you have to override this, at least to return nil. Good point. Is it more idiomatic to return nil or throw (or both)? 112026 2011-10-21 15:02:51 -0700 2011-10-21 15:05:38 -0700 Patch bug-70653-20111021150249.patch text/plain 9384 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4MTU3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTAtMjEgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgYWJpbGl0eSB0byBjcmVhdGUg YSBXS1ZpZXcgd2l0aG91dCBhIFdLQ29udGV4dFJlZiBhbmQgV0tQYWdlR3JvdXBSZWYKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNjUzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOnByb2Nlc3ND bHVzdGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld1ByaXZhdGUuaDoK KyAgICAgICAgUmVtb3ZlIGluaXQgbWV0aG9kcyB0aGF0IGRpZG4ndCB0YWtlIGJvdGggYSBjb250 ZXh0IGFuZCBhIHBhZ2Vncm91cC4KKwogMjAxMS0xMC0yMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBDcmFzaCBhZnRlciBwcmludGluZyBhIHZp ZXcgd2l0aCBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBjb250ZW50CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiA5ODE1NikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpA QCAtMTk4LDE0ICsxOTgsOSBAQCAtIChib29sKWRpZFJlY2VpdmVVbmhhbmRsZWRDb21tYW5kOwog CiBAaW1wbGVtZW50YXRpb24gV0tWaWV3CiAKLS0gKGlkKWluaXRXaXRoRnJhbWU6KE5TUmVjdClm cmFtZQotewotICAgIHJldHVybiBbc2VsZiBpbml0V2l0aEZyYW1lOmZyYW1lIGNvbnRleHRSZWY6 dG9BUEkoV2ViQ29udGV4dDo6c2hhcmVkUHJvY2Vzc0NvbnRleHQoKSldOwotfQotCiAtIChpZClp bml0V2l0aEZyYW1lOihOU1JlY3QpZnJhbWUgcHJvY2Vzc0NsdXN0ZXI6KFdLUHJvY2Vzc0NsdXN0 ZXIgKilwcm9jZXNzQ2x1c3RlcgogewotICAgIHJldHVybiBbc2VsZiBpbml0V2l0aEZyYW1lOmZy YW1lIGNvbnRleHRSZWY6cHJvY2Vzc0NsdXN0ZXIuY29udGV4dFJlZl07CisgICAgcmV0dXJuIFtz ZWxmIGluaXRXaXRoRnJhbWU6ZnJhbWUgY29udGV4dFJlZjpwcm9jZXNzQ2x1c3Rlci5jb250ZXh0 UmVmIHBhZ2VHcm91cFJlZjowXTsKIH0KIAogLSAodm9pZClkZWFsbG9jCkBAIC0yNTcxLDExICsy NTY2LDYgQEAgLSAodm9pZCloYW5kbGVDb3JyZWN0aW9uUGFuZWxSZXN1bHQ6KE5TUwogCiBAaW1w bGVtZW50YXRpb24gV0tWaWV3IChQcml2YXRlKQogCi0tIChpZClpbml0V2l0aEZyYW1lOihOU1Jl Y3QpZnJhbWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYKLXsgICAKLSAgICBy ZXR1cm4gW3NlbGYgaW5pdFdpdGhGcmFtZTpmcmFtZSBjb250ZXh0UmVmOmNvbnRleHRSZWYgcGFn ZUdyb3VwUmVmOm5pbF07Ci19Ci0KIC0gKHZvaWQpX3JlZ2lzdGVyRHJhZ2dlZFR5cGVzCiB7CiAg ICAgTlNNdXRhYmxlU2V0ICp0eXBlcyA9IFtbTlNNdXRhYmxlU2V0IGFsbG9jXSBpbml0V2l0aEFy cmF5OlBhc3RlYm9hcmRUeXBlczo6Zm9yRWRpdGluZygpXTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDk4MTU2 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3UHJpdmF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw2IEBAIEBpbnRlcmZhY2UgV0tWaWV3IChQcml2YXRl KQogCiBAcHJvcGVydHkocmVhZG9ubHkpIFdLUGFnZVJlZiBwYWdlUmVmOwogCi0tIChpZClpbml0 V2l0aEZyYW1lOihOU1JlY3QpZnJhbWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRS ZWY7CiAtIChpZClpbml0V2l0aEZyYW1lOihOU1JlY3QpZnJhbWUgY29udGV4dFJlZjooV0tDb250 ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOihXS1BhZ2VHcm91cFJlZilwYWdlR3JvdXBS ZWY7CiAKIC0gKE5TUHJpbnRPcGVyYXRpb24gKilwcmludE9wZXJhdGlvbldpdGhQcmludEluZm86 KE5TUHJpbnRJbmZvICopcHJpbnRJbmZvIGZvckZyYW1lOihXS0ZyYW1lUmVmKWZyYW1lUmVmOwpJ bmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gOTgxNTcpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwyNSBAQAorMjAxMS0xMC0yMSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAg ICAgIFJlbW92ZSBhYmlsaXR5IHRvIGNyZWF0ZSBhIFdLVmlldyB3aXRob3V0IGEgV0tDb250ZXh0 UmVmIGFuZCBXS1BhZ2VHcm91cFJlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzA2NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5oOgorICAgICAgICAq IE1pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tOgorICAgICAgICAoLVtCcm93c2VyQXBwRGVs ZWdhdGUgaW5pdF0pOgorICAgICAgICAoLVtCcm93c2VyQXBwRGVsZWdhdGUgbmV3V2luZG93Ol0p OgorICAgICAgICAoLVtCcm93c2VyQXBwRGVsZWdhdGUgb3BlblBhbmVsRGlkRW5kOnJldHVybkNv ZGU6Y29udGV4dEluZm86XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5k b3dDb250cm9sbGVyLmg6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dD b250cm9sbGVyLm06CisgICAgICAgICgtW0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGluaXRXaXRo Q29udGV4dDpwYWdlR3JvdXA6XSk6CisgICAgICAgICgtW0Jyb3dzZXJXaW5kb3dDb250cm9sbGVy IHdpbmRvd1dpbGxDbG9zZTpdKToKKyAgICAgICAgKGNyZWF0ZU5ld1BhZ2UpOgorICAgICAgICAo LVtCcm93c2VyV2luZG93Q29udHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL21hYy9XZWJLaXRBZ25vc3RpY1Rlc3QubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjpXZWJLaXRBZ25vc3RpY1Rlc3Q6OnJ1bldlYktpdDJUZXN0KToKKyAgICAgICAgVXBkYXRl IHRlc3RpbmcgY29kZSB0byBwYXNzIGEgUGFnZUdyb3VwIGFzIG5lY2Vzc2FyeS4KKwogMjAxMS0x MC0yMSAgTGVhbmRybyBQZXJlaXJhICA8bGVhbmRyb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAg ICB3ZWJraXRweTogVGVhY2ggTlJXVCBhYm91dCB0aGUgRUZMIHBvcnQKSW5kZXg6IFRvb2xzL01p bmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93 c2VyL21hYy9BcHBEZWxlZ2F0ZS5oCShyZXZpc2lvbiA5ODE1NikKKysrIFRvb2xzL01pbmlCcm93 c2VyL21hYy9BcHBEZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBAIEBp bnRlcmZhY2UgQnJvd3NlckFwcERlbGVnYXRlIDogTlNPYmplY3QKICAgICBQcm9jZXNzTW9kZWwg X2N1cnJlbnRQcm9jZXNzTW9kZWw7CiAgICAgV0tDb250ZXh0UmVmIF90aHJlYWRDb250ZXh0Owog ICAgIFdLQ29udGV4dFJlZiBfcHJvY2Vzc0NvbnRleHQ7CisgICAgV0tQYWdlR3JvdXBSZWYgX3Bh Z2VHcm91cDsKIH0KIAogLSAoV0tDb250ZXh0UmVmKWdldEN1cnJlbnRDb250ZXh0OwpJbmRleDog VG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0JKHJldmlzaW9uIDk4MTU2KQorKysgVG9vbHMv TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0JKHdvcmtpbmcgY29weSkKQEAgLTE0OCw2ICsx NDgsMTAgQEAgLSAoaWQpaW5pdAogICAgICAgICBXS0NvbnRleHRTZXRDYWNoZU1vZGVsKF9wcm9j ZXNzQ29udGV4dCwga1dLQ2FjaGVNb2RlbFByaW1hcnlXZWJCcm93c2VyKTsKIAogICAgICAgICBX S1JlbGVhc2UoYnVuZGxlUGF0aCk7CisgICAgICAgIAorICAgICAgICBXS1N0cmluZ1JlZiBwYWdl R3JvdXBJZGVudGlmaWVyID0gV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoQ0ZTVFIoIk1pbmlC cm93c2VyIikpOworICAgICAgICBfcGFnZUdyb3VwID0gV0tQYWdlR3JvdXBDcmVhdGVXaXRoSWRl bnRpZmllcihwYWdlR3JvdXBJZGVudGlmaWVyKTsKKyAgICAgICAgV0tSZWxlYXNlKHBhZ2VHcm91 cElkZW50aWZpZXIpOwogICAgIH0KIAogICAgIHJldHVybiBzZWxmOwpAQCAtMTU1LDcgKzE1OSw3 IEBAIC0gKGlkKWluaXQKIAogLSAoSUJBY3Rpb24pbmV3V2luZG93OihpZClzZW5kZXIKIHsKLSAg ICBCcm93c2VyV2luZG93Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtbQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoQ29udGV4dDpbc2VsZiBnZXRDdXJyZW50Q29udGV4dF1d OworICAgIEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICpjb250cm9sbGVyID0gW1tCcm93c2VyV2lu ZG93Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhDb250ZXh0OltzZWxmIGdldEN1cnJlbnRDb250 ZXh0XSBwYWdlR3JvdXA6X3BhZ2VHcm91cF07CiAgICAgW1tjb250cm9sbGVyIHdpbmRvd10gbWFr ZUtleUFuZE9yZGVyRnJvbnQ6c2VuZGVyXTsKICAgICAKICAgICBbY29udHJvbGxlciBsb2FkVVJM U3RyaW5nOmRlZmF1bHRVUkxdOwpAQCAtMjU2LDcgKzI2MCw3IEBAIC0gKHZvaWQpb3BlblBhbmVs RGlkRW5kOihOU09wZW5QYW5lbCAqKXMKIAogICAgIEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICpj b250cm9sbGVyID0gW3NlbGYgZnJvbnRtb3N0QnJvd3NlcldpbmRvd0NvbnRyb2xsZXJdOwogICAg IGlmICghY29udHJvbGxlcikgewotICAgICAgICBjb250cm9sbGVyID0gW1tCcm93c2VyV2luZG93 Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhDb250ZXh0OltzZWxmIGdldEN1cnJlbnRDb250ZXh0 XV07CisgICAgICAgIGNvbnRyb2xsZXIgPSBbW0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGFsbG9j XSBpbml0V2l0aENvbnRleHQ6W3NlbGYgZ2V0Q3VycmVudENvbnRleHRdIHBhZ2VHcm91cDpfcGFn ZUdyb3VwXTsKICAgICAgICAgW1tjb250cm9sbGVyIHdpbmRvd10gbWFrZUtleUFuZE9yZGVyRnJv bnQ6c2VsZl07CiAgICAgfQogICAgIApJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dz ZXJXaW5kb3dDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLmgJKHJldmlzaW9uIDk4MTU2KQorKysgVG9vbHMvTWlu aUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTM1LDYgKzM1LDcgQEAgQGludGVyZmFjZSBCcm93c2VyV2luZG93Q29udHJvbGxlciA6IE5TVwog ICAgIElCT3V0bGV0IE5TV2luZG93ICpmaW5kUGFuZWxXaW5kb3c7CiAgICAgCiAgICAgV0tDb250 ZXh0UmVmIF9jb250ZXh0OworICAgIFdLUGFnZUdyb3VwUmVmIF9wYWdlR3JvdXA7CiAgICAgV0tW aWV3ICpfd2ViVmlldzsKICAgICBCT09MIF96b29tVGV4dE9ubHk7CiB9CkBAIC00Nyw3ICs0OCw3 IEBAIEBpbnRlcmZhY2UgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgOiBOU1cKIC0gKElCQWN0aW9u KXNob3dIaWRlV2ViVmlldzooaWQpc2VuZGVyOwogLSAoSUJBY3Rpb24pcmVtb3ZlUmVpbnNlcnRX ZWJWaWV3OihpZClzZW5kZXI7CiAKLS0gKGlkKWluaXRXaXRoQ29udGV4dDooV0tDb250ZXh0UmVm KWNvbnRleHQ7CistIChpZClpbml0V2l0aENvbnRleHQ6KFdLQ29udGV4dFJlZiljb250ZXh0IHBh Z2VHcm91cDooV0tQYWdlR3JvdXBSZWYpcGFnZUdyb3VwOwogLSAodm9pZClsb2FkVVJMU3RyaW5n OihOU1N0cmluZyAqKXVybFN0cmluZzsKIC0gKHZvaWQpYXBwbGljYXRpb25UZXJtaW5hdGluZzsK IApJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0JKHJldmlzaW9uIDk4MTU2KQorKysgVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJX aW5kb3dDb250cm9sbGVyLm0JKHdvcmtpbmcgY29weSkKQEAgLTQ0LDEwICs0NCwxMSBAQCAtICh2 b2lkKWRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtCiAKIEBpbXBsZW1lbnRhdGlvbiBC cm93c2VyV2luZG93Q29udHJvbGxlcgogCi0tIChpZClpbml0V2l0aENvbnRleHQ6KFdLQ29udGV4 dFJlZiljb250ZXh0CistIChpZClpbml0V2l0aENvbnRleHQ6KFdLQ29udGV4dFJlZiljb250ZXh0 IHBhZ2VHcm91cDooV0tQYWdlR3JvdXBSZWYpcGFnZUdyb3VwCiB7CiAgICAgaWYgKChzZWxmID0g W3N1cGVyIGluaXRXaXRoV2luZG93TmliTmFtZTpAIkJyb3dzZXJXaW5kb3ciXSkpIHsKICAgICAg ICAgX2NvbnRleHQgPSBXS1JldGFpbihjb250ZXh0KTsKKyAgICAgICAgX3BhZ2VHcm91cCA9IFdL UmV0YWluKHBhZ2VHcm91cCk7CiAgICAgICAgIF96b29tVGV4dE9ubHkgPSBOTzsKICAgICB9CiAg ICAgCkBAIC0xNjAsNiArMTYxLDggQEAgLSAodm9pZCl3aW5kb3dXaWxsQ2xvc2U6KE5TTm90aWZp Y2F0aW9uIAogewogICAgIFdLUmVsZWFzZShfY29udGV4dCk7CiAgICAgX2NvbnRleHQgPSAwOwor ICAgIFdLUmVsZWFzZShfcGFnZUdyb3VwKTsKKyAgICBfcGFnZUdyb3VwID0gMDsKIH0KIAogLSAo dm9pZClhcHBsaWNhdGlvblRlcm1pbmF0aW5nCkBAIC0zODEsNyArMzg0LDcgQEAgc3RhdGljIHZv aWQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYQogc3RhdGljIFdLUGFnZVJlZiBjcmVhdGVO ZXdQYWdlKFdLUGFnZVJlZiBwYWdlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tEaWN0aW9u YXJ5UmVmIGZlYXR1cmVzLCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tFdmVudE1vdXNl QnV0dG9uIGJ1dHRvbiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBMT0coQCJjcmVh dGVOZXdQYWdlIik7Ci0gICAgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSBb W0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aENvbnRleHQ6V0tQYWdlR2V0 Q29udGV4dChwYWdlKV07CisgICAgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIg PSBbW0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aENvbnRleHQ6V0tQYWdl R2V0Q29udGV4dChwYWdlKSBwYWdlR3JvdXA6V0tQYWdlR2V0UGFnZUdyb3VwKHBhZ2UpXTsKICAg ICBbY29udHJvbGxlciBsb2FkV2luZG93XTsKIAogICAgIHJldHVybiBjb250cm9sbGVyLT5fd2Vi Vmlldy5wYWdlUmVmOwpAQCAtNTY2LDcgKzU2OSw3IEBAIHN0YXRpYyB2b2lkIHJ1bk9wZW5QYW5l bChXS1BhZ2VSZWYgcGFnZSwKIAogLSAodm9pZClhd2FrZUZyb21OaWIKIHsKLSAgICBfd2ViVmll dyA9IFtbV0tWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOltjb250YWluZXJWaWV3IGZyYW1lXSBj b250ZXh0UmVmOl9jb250ZXh0XTsKKyAgICBfd2ViVmlldyA9IFtbV0tWaWV3IGFsbG9jXSBpbml0 V2l0aEZyYW1lOltjb250YWluZXJWaWV3IGZyYW1lXSBjb250ZXh0UmVmOl9jb250ZXh0IHBhZ2VH cm91cFJlZjpfcGFnZUdyb3VwXTsKIAogICAgIFtjb250YWluZXJWaWV3IGFkZFN1YnZpZXc6X3dl YlZpZXddOwogICAgIFtfd2ViVmlldyBzZXRGcmFtZTpbY29udGFpbmVyVmlldyBmcmFtZV1dOwpJ bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMvV2ViS2l0QWdub3N0aWNUZXN0Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvbWFjL1dlYktpdEFnbm9zdGljVGVzdC5tbQko cmV2aXNpb24gOTgxNTYpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL21hYy9XZWJLaXRBZ25vc3Rp Y1Rlc3QubW0JKHdvcmtpbmcgY29weSkKQEAgLTk2LDcgKzk2LDggQEAgdm9pZCBXZWJLaXRBZ25v c3RpY1Rlc3Q6OnJ1bldlYktpdDFUZXN0KAogdm9pZCBXZWJLaXRBZ25vc3RpY1Rlc3Q6OnJ1bldl YktpdDJUZXN0KCkKIHsKICAgICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBh ZG9wdFdLKFdLQ29udGV4dENyZWF0ZSgpKTsKLSAgICBSZXRhaW5QdHI8V0tWaWV3PiB2aWV3KEFk b3B0TlMsIFtbV0tWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOnZpZXdGcmFtZSBjb250ZXh0UmVm OmNvbnRleHQuZ2V0KCldKTsKKyAgICBXS1JldGFpblB0cjxXS1BhZ2VHcm91cFJlZj4gcGFnZUdy b3VwID0gYWRvcHRXSyhXS1BhZ2VHcm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKFV0aWw6OnRvV0so IldlYktpdEFnbm9zdGljVGVzdCIpLmdldCgpKSk7CisgICAgUmV0YWluUHRyPFdLVmlldz4gdmll dyhBZG9wdE5TLCBbW1dLVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTp2aWV3RnJhbWUgY29udGV4 dFJlZjpjb250ZXh0LmdldCgpIHBhZ2VHcm91cFJlZjpwYWdlR3JvdXAuZ2V0KCldKTsKICAgICBz ZXRQYWdlTG9hZGVyQ2xpZW50KFt2aWV3LmdldCgpIHBhZ2VSZWZdLCAmZGlkRmluaXNoTG9hZCk7 CiAgICAgaW5pdGlhbGl6ZVZpZXcodmlldy5nZXQoKSk7CiAK