143115 2015-03-26 15:16:30 -0700 REGRESSION(r180768): Slower startup time for WKWebView 2015-03-26 16:25:04 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica thorton oldest_to_newest 1080420 0 enrica 2015-03-26 15:16:30 -0700 In http://trac.webkit.org/changeset/180768 we added an observer to track visibility of the NSFontPanel to ensure we could fetch the font information for the current selection when the panel first became visible. It turns out that adding the observer requires the shared font panel object to be created. That is apparently a very expensive operation that is regressing the initialization time for the WKWebView. We should do that lazily. rdar://problem/20233711 1080424 1 249518 enrica 2015-03-26 15:24:47 -0700 Created attachment 249518 Patch 1080425 2 249518 andersca 2015-03-26 15:28:07 -0700 Comment on attachment 249518 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249518&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:2622 > + [[NSFontPanel sharedFontPanel] addObserver:self forKeyPath:@"visible" options:NSKeyValueObservingOptionNew context:nil]; I don't think you need NSKeyValueObservingOptionNew unless you actually get it from the dictionary in your observe method. Also you need to specify a context. Just add something like static void* wkViewObservationContext = &wkViewObservationContext; and pass that in add and remove. You also need to compare the context in your observe method. 1080442 3 249524 enrica 2015-03-26 15:52:56 -0700 Created attachment 249524 Patch2 New patch that includes feedback from Anders. 1080446 4 249524 enrica 2015-03-26 15:54:08 -0700 Comment on attachment 249524 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=249524&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:3728 > + NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingCursorUpdate; Please disregard this line. I had to update ToT. 1080475 5 enrica 2015-03-26 16:25:04 -0700 Committed revision 182037. 249518 2015-03-26 15:24:47 -0700 2015-03-26 15:52:56 -0700 Patch lazyfontpanel.txt text/plain 5086 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAyNykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAzLTI2ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMTgwNzY4 OSk6IFNsb3dlciBzdGFydHVwIHRpbWUgZm9yIFdLV2ViVmlldy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzExNQorICAgICAgICByZGFyOi8vcHJv YmxlbS8yMDIzMzcxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE4MDc2OCB3ZSBhZGRl ZCBhbiBvYnNlcnZlciB0bworICAgICAgICB0cmFjayB2aXNpYmlsaXR5IG9mIHRoZSBOU0ZvbnRQ YW5lbCB0byBlbnN1cmUgd2UgY291bGQgZmV0Y2ggdGhlIGZvbnQKKyAgICAgICAgaW5mb3JtYXRp b24gZm9yIHRoZSBjdXJyZW50IHNlbGVjdGlvbiB3aGVuIHRoZSBwYW5lbCBmaXJzdCBiZWNvbWVz IHZpc2libGUuCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGFkZGluZyB0aGUgb2JzZXJ2ZXIg cmVxdWlyZXMgdGhlIHNoYXJlZCBmb250IHBhbmVsCisgICAgICAgIG9iamVjdCB0byBiZSBjcmVh dGVkLgorICAgICAgICBUaGF0IGlzIGFwcGFyZW50bHkgYSB2ZXJ5IGV4cGVuc2l2ZSBvcGVyYXRp b24gdGhhdCBpcyByZWdyZXNzaW5nCisgICAgICAgIHRoZSBpbml0aWFsaXphdGlvbiB0aW1lIGZv ciB0aGUgV0tXZWJWaWV3LgorICAgICAgICBXZSBzaG91bGQgaW5pdGlhbGl6ZSB0aGUgTlNGb250 UGFuZWwgbGF6aWx5LCBvbmx5IHdoZW4gd2UgbWFrZSB0aGUgZW50aXJlCisgICAgICAgIHZpZXcg ZWRpdGFibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9zZXRFZGl0YWJsZTpdKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBhZGRXaW5kb3dPYnNlcnZl cnNGb3JXaW5kb3c6XSk6CisgICAgICAgICgtW1dLVmlldyBfYWRkRm9udFBhbmVsT2JzZXJ2ZXJd KToKKyAgICAgICAgKC1bV0tWaWV3IHJlbW92ZVdpbmRvd09ic2VydmVyc10pOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisKIDIwMTUtMDMtMjYgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ3Vyc29yIGRvZXNuJ3QgY2hh bmdlIGJhY2sgdG8gcG9pbnRlciB3aGVuIGxlYXZpbmcgTWFpbApJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDE4MjAy MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0xNjU5LDYgKzE2NTksNyBAQCAtIChCT09MKV9pc0VkaXRhYmxlCiAt ICh2b2lkKV9zZXRFZGl0YWJsZTooQk9PTCllZGl0YWJsZQogewogICAgIF9wYWdlLT5zZXRFZGl0 YWJsZShlZGl0YWJsZSk7CisgICAgW193a1ZpZXcgX2FkZEZvbnRQYW5lbE9ic2VydmVyXTsKIH0K IAogLSAoX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgKilfcmVtb3RlT2JqZWN0UmVnaXN0cnkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0JKHJldmlzaW9u IDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQko d29ya2luZyBjb3B5KQpAQCAtMjYwOSwxMCArMjYwOSw2IEBAIC0gKHZvaWQpYWRkV2luZG93T2Jz ZXJ2ZXJzRm9yV2luZG93OihOU1cKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmFtZTpAIl9OU1dpbmRvd0RpZENoYW5nZUNvbnRlbnRzSG9zdGVk SW5MYXllclN1cmZhY2VOb3RpZmljYXRpb24iIG9iamVjdDp3aW5kb3ddOwogICAgICAgICBbW05T Tm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0 b3I6QHNlbGVjdG9yKF93aW5kb3dEaWRDaGFuZ2VPY2NsdXNpb25TdGF0ZTopCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6TlNXaW5kb3dE aWRDaGFuZ2VPY2NsdXNpb25TdGF0ZU5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsKLSAgICAg ICAgW1tOU0ZvbnRQYW5lbCBzaGFyZWRGb250UGFuZWxdIGFkZE9ic2VydmVyOnNlbGYKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb3JLZXlQYXRoOkAidmlzaWJsZSIK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zOk5TS2V5 VmFsdWVPYnNlcnZpbmdPcHRpb25OZXcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb250ZXh0Om5pbF07CiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFV SVJFRCA+PSAxMDEwMDAKICAgICAgICAgW3dpbmRvdyBhZGRPYnNlcnZlcjpzZWxmIGZvcktleVBh dGg6QCJjb250ZW50TGF5b3V0UmVjdCIgb3B0aW9uczpOU0tleVZhbHVlT2JzZXJ2aW5nT3B0aW9u SW5pdGlhbCBjb250ZXh0OmtleVZhbHVlT2JzZXJ2aW5nQ29udGV4dF07CiAgICAgICAgIFt3aW5k b3cgYWRkT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAidGl0bGViYXJBcHBlYXJzVHJhbnNwYXJl bnQiIG9wdGlvbnM6TlNLZXlWYWx1ZU9ic2VydmluZ09wdGlvbkluaXRpYWwgY29udGV4dDprZXlW YWx1ZU9ic2VydmluZ0NvbnRleHRdOwpAQCAtMjYyMSw2ICsyNjE3LDExIEBAIC0gKHZvaWQpYWRk V2luZG93T2JzZXJ2ZXJzRm9yV2luZG93OihOU1cKICAgICB9CiB9CiAKKy0gKHZvaWQpX2FkZEZv bnRQYW5lbE9ic2VydmVyCit7CisgICAgW1tOU0ZvbnRQYW5lbCBzaGFyZWRGb250UGFuZWxdIGFk ZE9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAInZpc2libGUiIG9wdGlvbnM6TlNLZXlWYWx1ZU9i c2VydmluZ09wdGlvbk5ldyBjb250ZXh0Om5pbF07Cit9CisKIC0gKHZvaWQpcmVtb3ZlV2luZG93 T2JzZXJ2ZXJzCiB7CiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IF9kYXRhLT5fdGFyZ2V0V2luZG93 Rm9yTW92ZVByZXBhcmF0aW9uID8gX2RhdGEtPl90YXJnZXRXaW5kb3dGb3JNb3ZlUHJlcGFyYXRp b24gOiBbc2VsZiB3aW5kb3ddOwpAQCAtMjYzNyw3ICsyNjM4LDggQEAgLSAodm9pZClyZW1vdmVX aW5kb3dPYnNlcnZlcnMKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpOU1dpbmRvd0RpZENoYW5nZVNjcmVlbk5vdGlmaWNh dGlvbiBvYmplY3Q6d2luZG93XTsKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRD ZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpAIl9OU1dpbmRvd0RpZENoYW5nZUNvbnRl bnRzSG9zdGVkSW5MYXllclN1cmZhY2VOb3RpZmljYXRpb24iIG9iamVjdDp3aW5kb3ddOwogICAg IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2Vs ZiBuYW1lOk5TV2luZG93RGlkQ2hhbmdlT2NjbHVzaW9uU3RhdGVOb3RpZmljYXRpb24gb2JqZWN0 OndpbmRvd107Ci0gICAgW1tOU0ZvbnRQYW5lbCBzaGFyZWRGb250UGFuZWxdIHJlbW92ZU9ic2Vy dmVyOnNlbGYgZm9yS2V5UGF0aDpAInZpc2libGUiIGNvbnRleHQ6bmlsXTsKKyAgICBpZiAoX2Rh dGEtPl9wYWdlLT5pc0VkaXRhYmxlKCkpCisgICAgICAgIFtbTlNGb250UGFuZWwgc2hhcmVkRm9u dFBhbmVsXSByZW1vdmVPYnNlcnZlcjpzZWxmIGZvcktleVBhdGg6QCJ2aXNpYmxlIiBjb250ZXh0 Om5pbF07CiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKICAg ICBbd2luZG93IHJlbW92ZU9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAImNvbnRlbnRMYXlvdXRS ZWN0IiBjb250ZXh0OmtleVZhbHVlT2JzZXJ2aW5nQ29udGV4dF07CiAgICAgW3dpbmRvdyByZW1v dmVPYnNlcnZlcjpzZWxmIGZvcktleVBhdGg6QCJ0aXRsZWJhckFwcGVhcnNUcmFuc3BhcmVudCIg Y29udGV4dDprZXlWYWx1ZU9ic2VydmluZ0NvbnRleHRdOwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiAxODIw MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMzIsNiArMTMyLDcgQEAgQGludGVyZmFjZSBXS1ZpZXcgKCkK IC0gKHZvaWQpX3dpbmRvd0RpZE9yZGVyT25TY3JlZW46KE5TTm90aWZpY2F0aW9uICopbm90aWZp Y2F0aW9uOwogLSAodm9pZClfd2luZG93RGlkT3JkZXJPZmZTY3JlZW46KE5TTm90aWZpY2F0aW9u ICopbm90aWZpY2F0aW9uOwogCistICh2b2lkKV9hZGRGb250UGFuZWxPYnNlcnZlcjsKIC8vIEZ1 bGxTY3JlZW4KIAogQHByb3BlcnR5IChyZWFkb25seSkgQk9PTCBfaGFzRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXI7Cg== 249524 2015-03-26 15:52:56 -0700 2015-03-26 16:23:08 -0700 Patch2 lazyfontpanel.txt text/plain 7047 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjAzMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAzLTI2ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMTgwNzY4 OSk6IFNsb3dlciBzdGFydHVwIHRpbWUgZm9yIFdLV2ViVmlldy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzExNQorICAgICAgICByZGFyOi8vcHJv YmxlbS8yMDIzMzcxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE4MDc2OCB3ZSBhZGRl ZCBhbiBvYnNlcnZlciB0bworICAgICAgICB0cmFjayB2aXNpYmlsaXR5IG9mIHRoZSBOU0ZvbnRQ YW5lbCB0byBlbnN1cmUgd2UgY291bGQgZmV0Y2ggdGhlIGZvbnQKKyAgICAgICAgaW5mb3JtYXRp b24gZm9yIHRoZSBjdXJyZW50IHNlbGVjdGlvbiB3aGVuIHRoZSBwYW5lbCBmaXJzdCBiZWNvbWVz IHZpc2libGUuCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGFkZGluZyB0aGUgb2JzZXJ2ZXIg cmVxdWlyZXMgdGhlIHNoYXJlZCBmb250IHBhbmVsCisgICAgICAgIG9iamVjdCB0byBiZSBjcmVh dGVkLgorICAgICAgICBUaGF0IGlzIGFwcGFyZW50bHkgYSB2ZXJ5IGV4cGVuc2l2ZSBvcGVyYXRp b24gdGhhdCBpcyByZWdyZXNzaW5nCisgICAgICAgIHRoZSBpbml0aWFsaXphdGlvbiB0aW1lIGZv ciB0aGUgV0tXZWJWaWV3LgorICAgICAgICBXZSBzaG91bGQgaW5pdGlhbGl6ZSB0aGUgTlNGb250 UGFuZWwgbGF6aWx5LCBvbmx5IHdoZW4gd2UgbWFrZSB0aGUgZW50aXJlCisgICAgICAgIHZpZXcg ZWRpdGFibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9zZXRFZGl0YWJsZTpdKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBhZGRXaW5kb3dPYnNlcnZl cnNGb3JXaW5kb3c6XSk6CisgICAgICAgICgtW1dLVmlldyBfYWRkRm9udFBhbmVsT2JzZXJ2ZXJd KToKKyAgICAgICAgKC1bV0tWaWV3IHJlbW92ZVdpbmRvd09ic2VydmVyc10pOgorICAgICAgICAo LVtXS1ZpZXcgb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDpvZk9iamVjdDpjaGFuZ2U6Y29udGV4dDpd KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oOgorCiAyMDE1 LTAzLTI2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbRGFy d2luXSBCb29zdCB0aGUgd2ViIHByb2Nlc3MgUW9TIGxldmVsIHdoaWxlIGhhbmRsaW5nIGEgc3lu Y2hyb25vdXMgSVBDIG1lc3NhZ2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTgyMDIyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAg LTE2NTksNiArMTY1OSw3IEBAIC0gKEJPT0wpX2lzRWRpdGFibGUKIC0gKHZvaWQpX3NldEVkaXRh YmxlOihCT09MKWVkaXRhYmxlCiB7CiAgICAgX3BhZ2UtPnNldEVkaXRhYmxlKGVkaXRhYmxlKTsK KyAgICBbX3drVmlldyBfYWRkRm9udFBhbmVsT2JzZXJ2ZXJdOwogfQogCiAtIChfV0tSZW1vdGVP YmplY3RSZWdpc3RyeSAqKV9yZW1vdGVPYmplY3RSZWdpc3RyeQpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTgyMDIyKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0yNjA5LDEwICsyNjA5LDYgQEAgLSAodm9pZClhZGRXaW5kb3dPYnNlcnZlcnNGb3JXaW5kb3c6 KE5TVwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBuYW1lOkAiX05TV2luZG93RGlkQ2hhbmdlQ29udGVudHNIb3N0ZWRJbkxheWVyU3VyZmFjZU5v dGlmaWNhdGlvbiIgb2JqZWN0OndpbmRvd107CiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50 ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3dp bmRvd0RpZENoYW5nZU9jY2x1c2lvblN0YXRlOikKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFtZTpOU1dpbmRvd0RpZENoYW5nZU9jY2x1c2lv blN0YXRlTm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3ddOwotICAgICAgICBbW05TRm9udFBhbmVs IHNoYXJlZEZvbnRQYW5lbF0gYWRkT2JzZXJ2ZXI6c2VsZgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZvcktleVBhdGg6QCJ2aXNpYmxlIgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6TlNLZXlWYWx1ZU9ic2VydmluZ09w dGlvbk5ldwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRl eHQ6bmlsXTsKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAog ICAgICAgICBbd2luZG93IGFkZE9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAImNvbnRlbnRMYXlv dXRSZWN0IiBvcHRpb25zOk5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25Jbml0aWFsIGNvbnRleHQ6 a2V5VmFsdWVPYnNlcnZpbmdDb250ZXh0XTsKICAgICAgICAgW3dpbmRvdyBhZGRPYnNlcnZlcjpz ZWxmIGZvcktleVBhdGg6QCJ0aXRsZWJhckFwcGVhcnNUcmFuc3BhcmVudCIgb3B0aW9uczpOU0tl eVZhbHVlT2JzZXJ2aW5nT3B0aW9uSW5pdGlhbCBjb250ZXh0OmtleVZhbHVlT2JzZXJ2aW5nQ29u dGV4dF07CkBAIC0yNjIxLDYgKzI2MTcsMTEgQEAgLSAodm9pZClhZGRXaW5kb3dPYnNlcnZlcnNG b3JXaW5kb3c6KE5TVwogICAgIH0KIH0KIAorLSAodm9pZClfYWRkRm9udFBhbmVsT2JzZXJ2ZXIK K3sKKyAgICBbW05TRm9udFBhbmVsIHNoYXJlZEZvbnRQYW5lbF0gYWRkT2JzZXJ2ZXI6c2VsZiBm b3JLZXlQYXRoOkAidmlzaWJsZSIgb3B0aW9uczowIGNvbnRleHQ6a2V5VmFsdWVPYnNlcnZpbmdD b250ZXh0XTsKK30KKwogLSAodm9pZClyZW1vdmVXaW5kb3dPYnNlcnZlcnMKIHsKICAgICBOU1dp bmRvdyAqd2luZG93ID0gX2RhdGEtPl90YXJnZXRXaW5kb3dGb3JNb3ZlUHJlcGFyYXRpb24gPyBf ZGF0YS0+X3RhcmdldFdpbmRvd0Zvck1vdmVQcmVwYXJhdGlvbiA6IFtzZWxmIHdpbmRvd107CkBA IC0yNjM3LDcgKzI2MzgsOCBAQCAtICh2b2lkKXJlbW92ZVdpbmRvd09ic2VydmVycwogICAgIFtb TlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBu YW1lOk5TV2luZG93RGlkQ2hhbmdlU2NyZWVuTm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3ddOwog ICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6 c2VsZiBuYW1lOkAiX05TV2luZG93RGlkQ2hhbmdlQ29udGVudHNIb3N0ZWRJbkxheWVyU3VyZmFj ZU5vdGlmaWNhdGlvbiIgb2JqZWN0OndpbmRvd107CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6TlNXaW5kb3dEaWRDaGFu Z2VPY2NsdXNpb25TdGF0ZU5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsKLSAgICBbW05TRm9u dFBhbmVsIHNoYXJlZEZvbnRQYW5lbF0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAi dmlzaWJsZSIgY29udGV4dDpuaWxdOworICAgIGlmIChfZGF0YS0+X3BhZ2UtPmlzRWRpdGFibGUo KSkKKyAgICAgICAgW1tOU0ZvbnRQYW5lbCBzaGFyZWRGb250UGFuZWxdIHJlbW92ZU9ic2VydmVy OnNlbGYgZm9yS2V5UGF0aDpAInZpc2libGUiIGNvbnRleHQ6a2V5VmFsdWVPYnNlcnZpbmdDb250 ZXh0XTsKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAogICAg IFt3aW5kb3cgcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAiY29udGVudExheW91dFJl Y3QiIGNvbnRleHQ6a2V5VmFsdWVPYnNlcnZpbmdDb250ZXh0XTsKICAgICBbd2luZG93IHJlbW92 ZU9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAInRpdGxlYmFyQXBwZWFyc1RyYW5zcGFyZW50IiBj b250ZXh0OmtleVZhbHVlT2JzZXJ2aW5nQ29udGV4dF07CkBAIC0zNzIzLDcgKzM3MjUsNyBAQCAt IChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyCiAgICAgSW5pdGlhbGl6ZVdl YktpdDIoKTsKIAogICAgIC8vIExlZ2FjeSBzdHlsZSBzY3JvbGxiYXJzIGhhdmUgZGVzaWduIGRl dGFpbHMgdGhhdCByZWx5IG9uIHRyYWNraW5nIHRoZSBtb3VzZSBhbGwgdGhlIHRpbWUuCi0gICAg TlNUcmFja2luZ0FyZWFPcHRpb25zIG9wdGlvbnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5T VHJhY2tpbmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdDsK KyAgICBOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1vdmVk IHwgTlNUcmFja2luZ01vdXNlRW50ZXJlZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2libGVS ZWN0IHwgTlNUcmFja2luZ0N1cnNvclVwZGF0ZTsKICAgICBpZiAoV0tSZWNvbW1lbmRlZFNjcm9s bGVyU3R5bGUoKSA9PSBOU1Njcm9sbGVyU3R5bGVMZWdhY3kpCiAgICAgICAgIG9wdGlvbnMgfD0g TlNUcmFja2luZ0FjdGl2ZUFsd2F5czsKICAgICBlbHNlCkBAIC0zODQ4LDE4ICszODUwLDE4IEBA IC0gKHZvaWQpX3VwZGF0ZUNvbnRlbnRJbnNldHNJZkF1dG9tYXRpYwogCiAtICh2b2lkKW9ic2Vy dmVWYWx1ZUZvcktleVBhdGg6KE5TU3RyaW5nICopa2V5UGF0aCBvZk9iamVjdDooaWQpb2JqZWN0 IGNoYW5nZTooTlNEaWN0aW9uYXJ5ICopY2hhbmdlIGNvbnRleHQ6KHZvaWQgKiljb250ZXh0CiB7 Ci0gICAgaWYgKFtOU0ZvbnRQYW5lbCBzaGFyZWRGb250UGFuZWxFeGlzdHNdICYmIG9iamVjdCA9 PSBbTlNGb250UGFuZWwgc2hhcmVkRm9udFBhbmVsXSkgewotICAgICAgICBbc2VsZiB1cGRhdGVG b250UGFuZWxJZk5lZWRlZF07CisgICAgaWYgKGNvbnRleHQgIT0ga2V5VmFsdWVPYnNlcnZpbmdD b250ZXh0KSB7CisgICAgICAgIFtzdXBlciBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOmtleVBhdGgg b2ZPYmplY3Q6b2JqZWN0IGNoYW5nZTpjaGFuZ2UgY29udGV4dDpjb250ZXh0XTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEw MTAwMAotICAgIGlmIChjb250ZXh0ID09IGtleVZhbHVlT2JzZXJ2aW5nQ29udGV4dCkgewotICAg ICAgICBpZiAoW2tleVBhdGggaXNFcXVhbFRvU3RyaW5nOkAiY29udGVudExheW91dFJlY3QiXSB8 fCBba2V5UGF0aCBpc0VxdWFsVG9TdHJpbmc6QCJ0aXRsZWJhckFwcGVhcnNUcmFuc3BhcmVudCJd KQotICAgICAgICAgICAgW3NlbGYgX3VwZGF0ZUNvbnRlbnRJbnNldHNJZkF1dG9tYXRpY107CisK KyAgICBpZiAoW2tleVBhdGggaXNFcXVhbFRvU3RyaW5nOkAidmlzaWJsZSJdICYmIFtOU0ZvbnRQ YW5lbCBzaGFyZWRGb250UGFuZWxFeGlzdHNdICYmIG9iamVjdCA9PSBbTlNGb250UGFuZWwgc2hh cmVkRm9udFBhbmVsXSkgeworICAgICAgICBbc2VsZiB1cGRhdGVGb250UGFuZWxJZk5lZWRlZF07 CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KLSAgICBbc3VwZXIgb2JzZXJ2ZVZhbHVlRm9yS2V5 UGF0aDprZXlQYXRoIG9mT2JqZWN0Om9iamVjdCBjaGFuZ2U6Y2hhbmdlIGNvbnRleHQ6Y29udGV4 dF07CisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKKyAgICBp ZiAoW2tleVBhdGggaXNFcXVhbFRvU3RyaW5nOkAiY29udGVudExheW91dFJlY3QiXSB8fCBba2V5 UGF0aCBpc0VxdWFsVG9TdHJpbmc6QCJ0aXRsZWJhckFwcGVhcnNUcmFuc3BhcmVudCJdKQorICAg ICAgICBbc2VsZiBfdXBkYXRlQ29udGVudEluc2V0c0lmQXV0b21hdGljXTsKICNlbmRpZgogfQog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0lu dGVybmFsLmgJKHJldmlzaW9uIDE4MjAyMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlld0ludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw2ICsxMzIsNyBA QCBAaW50ZXJmYWNlIFdLVmlldyAoKQogLSAodm9pZClfd2luZG93RGlkT3JkZXJPblNjcmVlbjoo TlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb247CiAtICh2b2lkKV93aW5kb3dEaWRPcmRlck9m ZlNjcmVlbjooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb247CiAKKy0gKHZvaWQpX2FkZEZv bnRQYW5lbE9ic2VydmVyOwogLy8gRnVsbFNjcmVlbgogCiBAcHJvcGVydHkgKHJlYWRvbmx5KSBC T09MIF9oYXNGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcjsK