71856 2011-11-08 14:20:50 -0800 WebKit should use new NSWindowDidChangeBackingPropertiesNotification instead of old NSWindowDidChangeResolutionNotification 2011-11-08 14:44:39 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 498428 0 bdakin 2011-11-08 14:20:50 -0800 WebKit currently uses NSWindowDidChangeResolutionNotification to determine when a WebView/WKView's window's backing scale factor has changed. Going forward, we should use a new notification called NSWindowDidChangeBackingPropertiesNotification instead. <rdar://problem/10317253> 498433 1 114154 bdakin 2011-11-08 14:25:21 -0800 Created attachment 114154 Patch 498437 2 114154 timothy 2011-11-08 14:32:15 -0800 Comment on attachment 114154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114154&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:1892 > + CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue]; > + CGFloat newBackingScaleFactor = [self _intrinsicDeviceScaleFactor]; > + if (oldBackingScaleFactor == newBackingScaleFactor) > + return; > + > + _data->_page->setIntrinsicDeviceScaleFactor(newBackingScaleFactor); Wouldn't Page::setIntrinsicDeviceScaleFactor know the old scale factor, meaning you wouldn't need to check here? > Source/WebKit/mac/WebView/WebView.mm:3382 > + CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue]; > + CGFloat newBackingScaleFactor = [self _deviceScaleFactor]; > + if (oldBackingScaleFactor == newBackingScaleFactor) > + return; > + > + _private->page->setDeviceScaleFactor(newBackingScaleFactor); Wouldn't Page::setDeviceScaleFactor know the old scale factor, meaning you wouldn't need to check here? 498441 3 bdakin 2011-11-08 14:40:06 -0800 (In reply to comment #2) > (From update of attachment 114154 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114154&action=review > > > Source/WebKit2/UIProcess/API/mac/WKView.mm:1892 > > + CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue]; > > + CGFloat newBackingScaleFactor = [self _intrinsicDeviceScaleFactor]; > > + if (oldBackingScaleFactor == newBackingScaleFactor) > > + return; > > + > > + _data->_page->setIntrinsicDeviceScaleFactor(newBackingScaleFactor); > > Wouldn't Page::setIntrinsicDeviceScaleFactor know the old scale factor, meaning you wouldn't need to check here? > > > Source/WebKit/mac/WebView/WebView.mm:3382 > > + CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue]; > > + CGFloat newBackingScaleFactor = [self _deviceScaleFactor]; > > + if (oldBackingScaleFactor == newBackingScaleFactor) > > + return; > > + > > + _private->page->setDeviceScaleFactor(newBackingScaleFactor); > > Wouldn't Page::setDeviceScaleFactor know the old scale factor, meaning you wouldn't need to check here? Good question. It is true in both WebKit 1 and WebKit 2 that these setters know the old deviceScaleFactor, so it's not really necessary to return early before we call the setters. It's a little nice in the WebKit 1 case in particular, because doing the early return prevents WebKit from calling down into WebCore, which is admittedly not a really big deal, but it seems like a reasonable thing to avoid. Hmm. I don't know. I think I will leave the early returns in for the time being, but you do have me wondering if they are excessive… 498443 4 bdakin 2011-11-08 14:44:39 -0800 Committed change with revision 99617. 114154 2011-11-08 14:25:21 -0800 2011-11-08 14:32:15 -0800 Patch for-review.txt text/plain 8585 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NjE1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTEtMDggIEJldGggRGFr aW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTg1NgorICAgICAgICBXZWJLaXQgc2hvdWxkIHVzZSBuZXcgTlNX aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllc05vdGlmaWNhdGlvbiBpbnN0ZWFkIG9mIAor ICAgICAgICBvbGQgTlNXaW5kb3dEaWRDaGFuZ2VSZXNvbHV0aW9uTm90aWZpY2F0aW9uCisgICAg ICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwMzE3MjUz PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgYWRkV2luZG93T2Jz ZXJ2ZXJzRm9yV2luZG93Ol0pOgorICAgICAgICAoLVtXS1ZpZXcgcmVtb3ZlV2luZG93T2JzZXJ2 ZXJzXSk6CisKKyAgICAgICAgV2UgaGF2ZSB0byBjaGVjayB0aGF0IHRoZSBiYWNraW5nIHNjYWxl IGZhY3RvciBhY3R1YWxseSBjaGFuZ2VkIHNpbmNlIHRoaXMgCisgICAgICAgIG5vdGlmaWNhdGlv biBjYW4gYWxzbyBiZSB1c2VkIHRvIHNpZ25pZnkgb3RoZXIgY2hhbmdlcy4gCisgICAgICAgICgt W1dLVmlldyBfd2luZG93RGlkQ2hhbmdlQmFja2luZ1Byb3BlcnRpZXM6XSk6CisKIDIwMTEtMTEt MDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg YSBiYXNpYyBsYXllciBoaWVyYXJjaHkgdG8gdGhlIENvcmUgQW5pbWF0aW9uIGRyYXdpbmcgYXJl YQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2 aXNpb24gOTk0OTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTE3MjksOCArMTcyOSw5IEBAIC0gKEJPT0wpX3VwZGF0ZUdy b3dCb3hGb3JXaW5kb3dGcmFtZUNoYW4KICAgICByZXR1cm4gb3duc0dyb3dCb3g7CiB9CiAKLS8v IEZJWE1FOiBVc2UgYW4gQXBwS2l0IGNvbnN0YW50IGZvciB0aGlzIG9uY2Ugb25lIGlzIGF2YWls YWJsZS4KLXN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IHdpbmRvd0RpZENoYW5nZVJlc29sdXRpb25O b3RpZmljYXRpb24gPSBAIk5TV2luZG93RGlkQ2hhbmdlUmVzb2x1dGlvbk5vdGlmaWNhdGlvbiI7 CisvLyBGSVhNRTogVXNlIEFwcEtpdCBjb25zdGFudHMgZm9yIHRoZXNlIHdoZW4gdGhleSBhcmUg YXZhaWxhYmxlLgorc3RhdGljIE5TU3RyaW5nICogY29uc3Qgd2luZG93RGlkQ2hhbmdlQmFja2lu Z1Byb3BlcnRpZXNOb3RpZmljYXRpb24gPSBAIk5TV2luZG93RGlkQ2hhbmdlQmFja2luZ1Byb3Bl cnRpZXNOb3RpZmljYXRpb24iOworc3RhdGljIE5TU3RyaW5nICogY29uc3QgYmFja2luZ1Byb3Bl cnR5T2xkU2NhbGVGYWN0b3JLZXkgPSBAIk5TQmFja2luZ1Byb3BlcnR5T2xkU2NhbGVGYWN0b3JL ZXkiOwogCiAtICh2b2lkKWFkZFdpbmRvd09ic2VydmVyc0ZvcldpbmRvdzooTlNXaW5kb3cgKil3 aW5kb3cKIHsKQEAgLTE3NTEsOCArMTc1Miw4IEBAIC0gKHZvaWQpYWRkV2luZG93T2JzZXJ2ZXJz Rm9yV2luZG93OihOU1cKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbmFtZTpAIk5TV2luZG93RGlkT3JkZXJPZmZTY3JlZW5Ob3RpZmljYXRpb24i IG9iamVjdDp3aW5kb3ddOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRD ZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dEaWRPcmRl ck9uU2NyZWVuOikgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5hbWU6QCJfTlNXaW5kb3dEaWRCZWNvbWVWaXNpYmxlIiBvYmplY3Q6d2luZG93 XTsKLSAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNl cnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2luZG93RGlkQ2hhbmdlUmVzb2x1dGlvbjop Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5h bWU6d2luZG93RGlkQ2hhbmdlUmVzb2x1dGlvbk5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsK KyAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZl cjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2luZG93RGlkQ2hhbmdlQmFja2luZ1Byb3BlcnRp ZXM6KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBuYW1lOndpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVzTm90aWZpY2F0aW9uIG9iamVj dDp3aW5kb3ddOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dEaWRDaGFuZ2VTY3Jl ZW46KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBuYW1lOk5TV2luZG93RGlkQ2hhbmdlU2NyZWVuTm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3dd OwogICAgIH0KQEAgLTE3NzIsNyArMTc3Myw3IEBAIC0gKHZvaWQpcmVtb3ZlV2luZG93T2JzZXJ2 ZXJzCiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNl cnZlcjpzZWxmIG5hbWU6TlNXaW5kb3dEaWRSZXNpemVOb3RpZmljYXRpb24gb2JqZWN0OndpbmRv d107CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNl cnZlcjpzZWxmIG5hbWU6QCJOU1dpbmRvd0RpZE9yZGVyT2ZmU2NyZWVuTm90aWZpY2F0aW9uIiBv YmplY3Q6d2luZG93XTsKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpAIl9OU1dpbmRvd0RpZEJlY29tZVZpc2libGUiIG9i amVjdDp3aW5kb3ddOwotICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0g cmVtb3ZlT2JzZXJ2ZXI6c2VsZiBuYW1lOndpbmRvd0RpZENoYW5nZVJlc29sdXRpb25Ob3RpZmlj YXRpb24gb2JqZWN0OndpbmRvd107CisgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0 Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6d2luZG93RGlkQ2hhbmdlQmFja2luZ1By b3BlcnRpZXNOb3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CiAgICAgW1tOU05vdGlmaWNhdGlv bkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6TlNXaW5kb3dE aWRDaGFuZ2VTY3JlZW5Ob3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CiB9CiAKQEAgLTE4ODEs OSArMTg4MiwxNCBAQCAtICh2b2lkKV93aW5kb3dEaWRPcmRlck9uU2NyZWVuOihOU05vdGlmCiAg ICAgX2RhdGEtPl9wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3SXNW aXNpYmxlKTsKIH0KIAotLSAodm9pZClfd2luZG93RGlkQ2hhbmdlUmVzb2x1dGlvbjooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb24KKy0gKHZvaWQpX3dpbmRvd0RpZENoYW5nZUJhY2tpbmdQ cm9wZXJ0aWVzOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewotICAgIF9kYXRhLT5f cGFnZS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IoW3NlbGYgX2ludHJpbnNpY0Rldmlj ZVNjYWxlRmFjdG9yXSk7CisgICAgQ0dGbG9hdCBvbGRCYWNraW5nU2NhbGVGYWN0b3IgPSBbW25v dGlmaWNhdGlvbi51c2VySW5mbyBvYmplY3RGb3JLZXk6YmFja2luZ1Byb3BlcnR5T2xkU2NhbGVG YWN0b3JLZXldIGRvdWJsZVZhbHVlXTsgCisgICAgQ0dGbG9hdCBuZXdCYWNraW5nU2NhbGVGYWN0 b3IgPSBbc2VsZiBfaW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3JdOyAKKyAgICBpZiAob2xkQmFj a2luZ1NjYWxlRmFjdG9yID09IG5ld0JhY2tpbmdTY2FsZUZhY3RvcikgCisgICAgICAgIHJldHVy bjsgCisKKyAgICBfZGF0YS0+X3BhZ2UtPnNldEludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yKG5l d0JhY2tpbmdTY2FsZUZhY3Rvcik7CiB9CiAKIHN0YXRpYyB2b2lkIGRyYXdQYWdlQmFja2dyb3Vu ZChDR0NvbnRleHRSZWYgY29udGV4dCwgV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBJbnRSZWN0 JiByZWN0KQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gOTk2MTYpCisrKyBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAx MS0xMS0wOCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU2CisgICAgICAgIFdlYktpdCBz aG91bGQgdXNlIG5ldyBOU1dpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVzTm90aWZpY2F0 aW9uIGluc3RlYWQgb2YgCisgICAgICAgIG9sZCBOU1dpbmRvd0RpZENoYW5nZVJlc29sdXRpb25O b3RpZmljYXRpb24KKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTAzMTcyNTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgYWRk V2luZG93T2JzZXJ2ZXJzRm9yV2luZG93Ol0pOgorICAgICAgICAoLVtXZWJWaWV3IHJlbW92ZVdp bmRvd09ic2VydmVyc10pOgorCisgICAgICAgIFdlIGhhdmUgdG8gY2hlY2sgdGhhdCB0aGUgYmFj a2luZyBzY2FsZSBmYWN0b3IgYWN0dWFsbHkgY2hhbmdlZCBzaW5jZSB0aGlzIAorICAgICAgICBu b3RpZmljYXRpb24gY2FuIGFsc28gYmUgdXNlZCB0byBzaWduaWZ5IG90aGVyIGNoYW5nZXMuIAor ICAgICAgICAoLVtXZWJWaWV3IF93aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllczpdKToK KwogMjAxMS0xMS0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IE1vdmUgRG9tYWluUmVsYXhhdGlvbkZvcmJpZGRlbiBzY2hlbWUgcmVnaXN0cnkgdG8gU2NoZW1l UmVnaXN0cnkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9u IDk5NDkxKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0zMjIzLDggKzMyMjMsOSBAQCAtIChCT09MKXNob3VsZENsb3NlV2l0aFdpbmRv dwogICAgIHJldHVybiBfcHJpdmF0ZS0+c2hvdWxkQ2xvc2VXaXRoV2luZG93OwogfQogCi0vLyBG SVhNRTogVXNlIGFuIEFwcEtpdCBjb25zdGFudCBmb3IgdGhpcyBvbmNlIG9uZSBpcyBhdmFpbGFi bGUuCi1zdGF0aWMgTlNTdHJpbmcgKiBjb25zdCB3aW5kb3dEaWRDaGFuZ2VSZXNvbHV0aW9uTm90 aWZpY2F0aW9uID0gQCJOU1dpbmRvd0RpZENoYW5nZVJlc29sdXRpb25Ob3RpZmljYXRpb24iOwor Ly8gRklYTUU6IFVzZSBBcHBLaXQgY29uc3RhbnRzIGZvciB0aGVzZSB3aGVuIHRoZXkgYXJlIGF2 YWlsYWJsZS4KK3N0YXRpYyBOU1N0cmluZyAqIGNvbnN0IHdpbmRvd0RpZENoYW5nZUJhY2tpbmdQ cm9wZXJ0aWVzTm90aWZpY2F0aW9uID0gQCJOU1dpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0 aWVzTm90aWZpY2F0aW9uIjsKK3N0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tpbmdQcm9wZXJ0 eU9sZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5 IjsgCiAKIC0gKHZvaWQpYWRkV2luZG93T2JzZXJ2ZXJzRm9yV2luZG93OihOU1dpbmRvdyAqKXdp bmRvdwogewpAQCAtMzIzNyw4ICszMjM4LDggQEAgLSAodm9pZClhZGRXaW5kb3dPYnNlcnZlcnNG b3JXaW5kb3c6KE5TVwogICAgICAgICAgICAgbmFtZTpXS1dpbmRvd1dpbGxPcmRlck9uU2NyZWVu Tm90aWZpY2F0aW9uKCkgb2JqZWN0OndpbmRvd107CiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3Io X3dpbmRvd1dpbGxPcmRlck9mZlNjcmVlbjopCiAgICAgICAgICAgICBuYW1lOldLV2luZG93V2ls bE9yZGVyT2ZmU2NyZWVuTm90aWZpY2F0aW9uKCkgb2JqZWN0OndpbmRvd107Ci0gICAgICAgIFtb TlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxl Y3RvcjpAc2VsZWN0b3IoX3dpbmRvd0RpZENoYW5nZVJlc29sdXRpb246KQotICAgICAgICAgICAg bmFtZTp3aW5kb3dEaWRDaGFuZ2VSZXNvbHV0aW9uTm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3dd OworICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2Vy dmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVy dGllczopCisgICAgICAgICAgICBuYW1lOndpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVz Tm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3ddOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93 aW5kb3dEaWRDaGFuZ2VTY3JlZW46KQogICAgICAgICAgICAgbmFtZTpOU1dpbmRvd0RpZENoYW5n ZVNjcmVlbk5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsKICAgICB9CkBAIC0zMjU3LDcgKzMy NTgsNyBAQCAtICh2b2lkKXJlbW92ZVdpbmRvd09ic2VydmVycwogICAgICAgICBbW05TTm90aWZp Y2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYKICAgICAgICAg ICAgIG5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPZmZTY3JlZW5Ob3RpZmljYXRpb24oKSBvYmplY3Q6 d2luZG93XTsKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBy ZW1vdmVPYnNlcnZlcjpzZWxmCi0gICAgICAgICAgICBuYW1lOndpbmRvd0RpZENoYW5nZVJlc29s dXRpb25Ob3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CisgICAgICAgICAgICBuYW1lOndpbmRv d0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVzTm90aWZpY2F0aW9uIG9iamVjdDp3aW5kb3ddOwog ICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2Vy dmVyOnNlbGYKICAgICAgICAgICAgIG5hbWU6TlNXaW5kb3dEaWRDaGFuZ2VTY3JlZW5Ob3RpZmlj YXRpb24gb2JqZWN0OndpbmRvd107CiAgICAgfQpAQCAtMzM3MSw5ICszMzcyLDE0IEBAIC0gKHZv aWQpX3dpbmRvd1dpbGxDbG9zZTooTlNOb3RpZmljYXRpb24KICAgICAgICAgW3NlbGYgY2xvc2Vd OwogfQogCi0tICh2b2lkKV93aW5kb3dEaWRDaGFuZ2VSZXNvbHV0aW9uOihOU05vdGlmaWNhdGlv biAqKW5vdGlmaWNhdGlvbgorLSAodm9pZClfd2luZG93RGlkQ2hhbmdlQmFja2luZ1Byb3BlcnRp ZXM6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCiB7Ci0gICAgX3ByaXZhdGUtPnBhZ2Ut PnNldERldmljZVNjYWxlRmFjdG9yKFtzZWxmIF9kZXZpY2VTY2FsZUZhY3Rvcl0pOworICAgIENH RmxvYXQgb2xkQmFja2luZ1NjYWxlRmFjdG9yID0gW1tub3RpZmljYXRpb24udXNlckluZm8gb2Jq ZWN0Rm9yS2V5OmJhY2tpbmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5XSBkb3VibGVWYWx1ZV07 IAorICAgIENHRmxvYXQgbmV3QmFja2luZ1NjYWxlRmFjdG9yID0gW3NlbGYgX2RldmljZVNjYWxl RmFjdG9yXTsKKyAgICBpZiAob2xkQmFja2luZ1NjYWxlRmFjdG9yID09IG5ld0JhY2tpbmdTY2Fs ZUZhY3RvcikgCisgICAgICAgIHJldHVybjsgCisKKyAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0RGV2 aWNlU2NhbGVGYWN0b3IobmV3QmFja2luZ1NjYWxlRmFjdG9yKTsKIH0KIAogLSAodm9pZClzZXRQ cmVmZXJlbmNlczooV2ViUHJlZmVyZW5jZXMgKilwcmVmcwo=