159463 2016-07-06 05:07:23 -0700 [GTK] Avoid the redirected window resize when the view is realized in AC mode 2016-07-21 00:06:05 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 154066 159455 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson yoon zan oldest_to_newest 1208175 0 cgarcia 2016-07-06 05:07:23 -0700 We are always creating the redirected window at 1x1 and then resizing it if we are in AC mode. When the view is realized and AC mode is already enabled, which happens for example when AC mode is forced, or when the threaded compositor is enabled, we could just pass the initial size to the redirected window constructor to create the XWindow at the right size. 1208179 1 282881 cgarcia 2016-07-06 05:13:07 -0700 Created attachment 282881 Patch 1208180 2 commit-queue 2016-07-06 05:14:59 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1208181 3 commit-queue 2016-07-06 05:15:07 -0700 Attachment 282881 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h:48: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h:56: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1212958 4 282881 mcatanzaro 2016-07-20 17:18:44 -0700 Comment on attachment 282881 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282881&action=review > Source/WebKit2/ChangeLog:18 > + WebPageProxy the redirected window has access to the devide scale factor and view widget to get the parent device > Source/WebKit2/ChangeLog:26 > + (WebKit::RedirectedXCompositeWindow::~RedirectedXCompositeWindow): Deleted. prepare-ChangeLog bug > Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp:140 > + return std::unique_ptr<RedirectedXCompositeWindow>(new RedirectedXCompositeWindow(webPage, initialSize, WTFMove(damageNotify))); Since you modified this line anyway, change it to use std::make_unique while you're at it, please. Using new outside of a create function is not OK anymore. 1213065 5 cgarcia 2016-07-21 00:04:51 -0700 (In reply to comment #4) > Comment on attachment 282881 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282881&action=review > > > Source/WebKit2/ChangeLog:18 > > + WebPageProxy the redirected window has access to the devide scale factor and view widget to get the parent > > device > > > Source/WebKit2/ChangeLog:26 > > + (WebKit::RedirectedXCompositeWindow::~RedirectedXCompositeWindow): Deleted. > > prepare-ChangeLog bug > > > Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp:140 > > + return std::unique_ptr<RedirectedXCompositeWindow>(new RedirectedXCompositeWindow(webPage, initialSize, WTFMove(damageNotify))); > > Since you modified this line anyway, change it to use std::make_unique while > you're at it, please. Using new outside of a create function is not OK > anymore. This is the create() function and the constructor is private. 1213066 6 cgarcia 2016-07-21 00:06:05 -0700 Committed r203495: <http://trac.webkit.org/changeset/203495> 282881 2016-07-06 05:13:07 -0700 2016-07-20 17:18:44 -0700 Patch wk2-redirected-window-initial-size.diff text/plain 10217 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NDY5OTAwLi45NWQ5ZDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTYtMDctMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEF2b2lkIHRoZSByZWRpcmVjdGVkIHdpbmRvdyByZXNpemUgd2hl biB0aGUgdmlldyBpcyByZWFsaXplZCBpbiBBQyBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk0NjMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgYWx3YXlzIGNyZWF0aW5nIHRoZSByZWRp cmVjdGVkIHdpbmRvdyBhdCAxeDEgYW5kIHRoZW4gcmVzaXppbmcgaXQgaWYgd2UgYXJlIGluIEFD IG1vZGUuIFdoZW4gdGhlIHZpZXcgaXMKKyAgICAgICAgcmVhbGl6ZWQgYW5kIEFDIG1vZGUgaXMg YWxyZWFkeSBlbmFibGVkLCB3aGljaCBoYXBwZW5zIGZvciBleGFtcGxlIHdoZW4gQUMgbW9kZSBp cyBmb3JjZWQsIG9yIHdoZW4gdGhlIHRocmVhZGVkCisgICAgICAgIGNvbXBvc2l0b3IgaXMgZW5h YmxlZCwgd2UgY291bGQganVzdCBwYXNzIHRoZSBpbml0aWFsIHNpemUgdG8gdGhlIHJlZGlyZWN0 ZWQgd2luZG93IGNvbnN0cnVjdG9yIHRvIGNyZWF0ZSB0aGUKKyAgICAgICAgWFdpbmRvdyBhdCB0 aGUgcmlnaHQgc2l6ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3RlZFdp bmRvdyk6IFdlIG5vIGxvbmdlciBuZWVkIHRvIHBhc3MgdGhlIGRldmljZSBzY2FsZSBmYWN0b3Is IHNpbmNlIHRoZQorICAgICAgICBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyBhbHJlYWR5IGtu b3dzIGl0LgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VSZWFsaXplKTogUGFzcyB0aGUgV2Vi UGFnZVByb3h5IGFuZCBhbiBpbml0aWFsIHNpemUgdG8gdGhlIFJlZGlyZWN0ZWRYQ29tcG9zaXRl V2luZG93CisgICAgICAgIGNvbnN0cnVjdG9yIGluc3RlYWQgb2YgdGhlIHBhcmVudCBHZGtXaW5k b3cuIElmIEFDIG1vZGUgaXMgZGlzYWJsZWQsIHRoZSBpbml0aWFsIHNpemUgd2lsbCBiZSBlbXB0 eS4gV2l0aCB0aGUKKyAgICAgICAgV2ViUGFnZVByb3h5IHRoZSByZWRpcmVjdGVkIHdpbmRvdyBo YXMgYWNjZXNzIHRvIHRoZSBkZXZpZGUgc2NhbGUgZmFjdG9yIGFuZCB2aWV3IHdpZGdldCB0byBn ZXQgdGhlIHBhcmVudAorICAgICAgICBHZGtXaW5kb3cuCisgICAgICAgIChkZXZpY2VTY2FsZUZh Y3RvckNoYW5nZWQpOiBSZXNpemUgdGhlIHJlZGlyZWN0ZWQgd2luZG93IHdoZW4gZGV2aWNlIHNj YWxlIGZhY3RvciBjaGFuZ2VzLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhD b21wb3NpdGVXaW5kb3cuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZWRpcmVjdGVkWENvbXBvc2l0 ZVdpbmRvdzo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6UmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3c6OlJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6UmVk aXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OnJlc2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OlJlZGly ZWN0ZWRYQ29tcG9zaXRlV2luZG93OjpzdXJmYWNlKToKKyAgICAgICAgKFdlYktpdDo6UmVkaXJl Y3RlZFhDb21wb3NpdGVXaW5kb3c6On5SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyk6IERlbGV0 ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5o OgorCiAyMDE2LTA3LTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBXZWJLaXRHdGsrIHVzZXMgdG9vIG1hbnkgZmlsZSBkZXNjcmlw dG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwCmluZGV4IDk3NTJiNzczLi42OGY2NDY4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBA IC0zNTksOCArMzU5LDggQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VSZXNpemVSZWRp cmVjdGVkV2luZG93KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3KQogewogICAgIFdlYktpdFdl YlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CiAgICAgRHJhd2luZ0FyZWFQ cm94eUltcGwqIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUltcGwq Pihwcml2LT5wYWdlUHJveHktPmRyYXdpbmdBcmVhKCkpOwotICAgIEFTU0VSVChkcmF3aW5nQXJl YSk7Ci0gICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IocHJp di0+cGFnZVByb3h5LT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICBpZiAoIWRyYXdpbmdBcmVh KQorICAgICAgICByZXR1cm47CiAgICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+cmVzaXplKGRy YXdpbmdBcmVhLT5zaXplKCkpOwogfQogI2VuZGlmCkBAIC0zNzMsMTkgKzM3MywxOSBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVJlYWxpemUoR3RrV2lkZ2V0KiB3aWRnZXQpCiAjaWYg VVNFKFJFRElSRUNURURfWENPTVBPU0lURV9XSU5ET1cpCiAgICAgaWYgKFBsYXRmb3JtRGlzcGxh eTo6c2hhcmVkRGlzcGxheSgpLnR5cGUoKSA9PSBQbGF0Zm9ybURpc3BsYXk6OlR5cGU6OlgxMSkg ewogICAgICAgICBBU1NFUlQoIXByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpOworICAgICAgICBEcmF3 aW5nQXJlYVByb3h5SW1wbCogZHJhd2luZ0FyZWEgPSBzdGF0aWNfY2FzdDxEcmF3aW5nQXJlYVBy b3h5SW1wbCo+KHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSk7CiAgICAgICAgIHByaXYt PnJlZGlyZWN0ZWRXaW5kb3cgPSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKAot ICAgICAgICAgICAgZ3RrX3dpZGdldF9nZXRfcGFyZW50X3dpbmRvdyh3aWRnZXQpLAorICAgICAg ICAgICAgKnByaXYtPnBhZ2VQcm94eSwKKyAgICAgICAgICAgIGRyYXdpbmdBcmVhICYmIGRyYXdp bmdBcmVhLT5pc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSA/IGRyYXdpbmdBcmVhLT5z aXplKCkgOiBJbnRTaXplKCksCiAgICAgICAgICAgICBbd2ViVmlld10gewogICAgICAgICAgICAg ICAgIERyYXdpbmdBcmVhUHJveHlJbXBsKiBkcmF3aW5nQXJlYSA9IHN0YXRpY19jYXN0PERyYXdp bmdBcmVhUHJveHlJbXBsKj4od2ViVmlldy0+cHJpdi0+cGFnZVByb3h5LT5kcmF3aW5nQXJlYSgp KTsKICAgICAgICAgICAgICAgICBpZiAoZHJhd2luZ0FyZWEgJiYgZHJhd2luZ0FyZWEtPmlzSW5B Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKQogICAgICAgICAgICAgICAgICAgICBndGtfd2lk Z2V0X3F1ZXVlX2RyYXcoR1RLX1dJREdFVCh3ZWJWaWV3KSk7CiAgICAgICAgICAgICB9KTsKLSAg ICAgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpIHsKLSAgICAgICAgICAgIGlmIChEcmF3 aW5nQXJlYVByb3h5SW1wbCogZHJhd2luZ0FyZWEgPSBzdGF0aWNfY2FzdDxEcmF3aW5nQXJlYVBy b3h5SW1wbCo+KHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkpIHsKLSAgICAgICAgICAg ICAgICBkcmF3aW5nQXJlYS0+c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHBy aXYtPnJlZGlyZWN0ZWRXaW5kb3ctPndpbmRvd0lEKCkpOwotICAgICAgICAgICAgICAgIGlmIChk cmF3aW5nQXJlYS0+aXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpCi0gICAgICAgICAg ICAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3RlZFdpbmRvdyh3ZWJWaWV3 KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cgJiYg ZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgICAgIGRyYXdpbmdBcmVhLT5zZXROYXRpdmVTdXJmYWNl SGFuZGxlRm9yQ29tcG9zaXRpbmcocHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+d2luZG93SUQoKSk7 CisgICAgICAgICAgICBpZiAoZHJhd2luZ0FyZWEtPmlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZSgpKQorICAgICAgICAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3Rl ZFdpbmRvdyh3ZWJWaWV3KTsKICAgICAgICAgfQogICAgIH0KICNlbmRpZgpAQCAtMTI2MCw3ICsx MjYwLDcgQEAgc3RhdGljIHZvaWQgZGV2aWNlU2NhbGVGYWN0b3JDaGFuZ2VkKFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIHsKICNpZiBVU0UoUkVESVJFQ1RFRF9YQ09NUE9T SVRFX1dJTkRPVykKICAgICBpZiAod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnJlZGlyZWN0ZWRX aW5kb3cpCi0gICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5yZWRpcmVjdGVkV2luZG93 LT5zZXREZXZpY2VTY2FsZUZhY3Rvcih3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+cGFnZVByb3h5 LT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICAgICAgd2Via2l0V2ViVmlld0Jhc2VSZXNpemVS ZWRpcmVjdGVkV2luZG93KHdlYmtpdFdlYlZpZXdCYXNlKTsKICNlbmRpZgogICAgIHdlYmtpdFdl YlZpZXdCYXNlLT5wcml2LT5wYWdlUHJveHktPnNldEludHJpbnNpY0RldmljZVNjYWxlRmFjdG9y KGd0a193aWRnZXRfZ2V0X3NjYWxlX2ZhY3RvcihHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNl KSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVj dGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1Jl ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcAppbmRleCBhZDA3MTMzLi44ZGE1ZjA1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRl V2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93LmNwcApAQCAtMjksNiArMjksNyBAQAogCiAjaWYgVVNFKFJFRElSRUNU RURfWENPTVBPU0lURV9XSU5ET1cpCiAKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNs dWRlIDxXZWJDb3JlL0NhaXJvVXRpbGl0aWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9y bURpc3BsYXlYMTEuaD4KICNpbmNsdWRlIDxYMTEvWGxpYi5oPgpAQCAtMTMwLDIxICsxMzEsMjYg QEAgc3RhdGljIGJvb2wgc3VwcG9ydHNYRGFtYWdlQW5kWENvbXBvc2l0ZShHZGtXaW5kb3cqIHdp bmRvdykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFJlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93PiBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKEdka1dp bmRvdyogcGFyZW50V2luZG93LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGFtYWdlTm90aWZ5KQor c3RkOjp1bmlxdWVfcHRyPFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93PiBSZWRpcmVjdGVkWENv bXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSwgY29uc3QgSW50U2l6 ZSYgaW5pdGlhbFNpemUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiYmIGRhbWFnZU5vdGlmeSkKIHsK KyAgICBHZGtXaW5kb3cqIHBhcmVudFdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5k b3cod2ViUGFnZS52aWV3V2lkZ2V0KCkpOwogICAgIEFTU0VSVChHREtfSVNfV0lORE9XKHBhcmVu dFdpbmRvdykpOwotICAgIHJldHVybiBzdXBwb3J0c1hEYW1hZ2VBbmRYQ29tcG9zaXRlKHBhcmVu dFdpbmRvdykgPyBzdGQ6OnVuaXF1ZV9wdHI8UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c+KG5l dyBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyhwYXJlbnRXaW5kb3csIGRhbWFnZU5vdGlmeSkp IDogbnVsbHB0cjsKKyAgICBpZiAoIXN1cHBvcnRzWERhbWFnZUFuZFhDb21wb3NpdGUocGFyZW50 V2luZG93KSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHN0ZDo6dW5pcXVl X3B0cjxSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdz4obmV3IFJlZGlyZWN0ZWRYQ29tcG9zaXRl V2luZG93KHdlYlBhZ2UsIGluaXRpYWxTaXplLCBXVEZNb3ZlKGRhbWFnZU5vdGlmeSkpKTsKIH0K IAotUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OlJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93 KEdka1dpbmRvdyogcGFyZW50V2luZG93LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGFtYWdlTm90 aWZ5KQotICAgIDogbV9kaXNwbGF5KEdES19ESVNQTEFZX1hESVNQTEFZKGdka193aW5kb3dfZ2V0 X2Rpc3BsYXkocGFyZW50V2luZG93KSkpCi0gICAgLCBtX25lZWRzTmV3UGl4bWFwQWZ0ZXJSZXNp emUoZmFsc2UpCi0gICAgLCBtX2RldmljZVNjYWxlKDEpCitSZWRpcmVjdGVkWENvbXBvc2l0ZVdp bmRvdzo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3coV2ViUGFnZVByb3h5JiB3ZWJQYWdlLCBj b25zdCBJbnRTaXplJiBpbml0aWFsU2l6ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYgZGFtYWdl Tm90aWZ5KQorICAgIDogbV93ZWJQYWdlKHdlYlBhZ2UpCisgICAgLCBtX2Rpc3BsYXkoR0RLX0RJ U1BMQVlfWERJU1BMQVkoZ2RrX3dpbmRvd19nZXRfZGlzcGxheShndGtfd2lkZ2V0X2dldF9wYXJl bnRfd2luZG93KHdlYlBhZ2Uudmlld1dpZGdldCgpKSkpKQorICAgICwgbV9zaXplKGluaXRpYWxT aXplKQogeworICAgIG1fc2l6ZS5zY2FsZShtX3dlYlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSk7 CisKICAgICBBU1NFUlQoZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihQbGF0Zm9ybURpc3Bs YXk6OnNoYXJlZERpc3BsYXkoKSkubmF0aXZlKCkgPT0gbV9kaXNwbGF5KTsKICAgICBTY3JlZW4q IHNjcmVlbiA9IERlZmF1bHRTY3JlZW5PZkRpc3BsYXkobV9kaXNwbGF5KTsKIAotICAgIEdka1Zp c3VhbCogdmlzdWFsID0gZ2RrX3dpbmRvd19nZXRfdmlzdWFsKHBhcmVudFdpbmRvdyk7CisgICAg R2RrVmlzdWFsKiB2aXN1YWwgPSBnZGtfd2luZG93X2dldF92aXN1YWwoZ3RrX3dpZGdldF9nZXRf cGFyZW50X3dpbmRvdyh3ZWJQYWdlLnZpZXdXaWRnZXQoKSkpOwogICAgIFhVbmlxdWVDb2xvcm1h cCBjb2xvcm1hcChYQ3JlYXRlQ29sb3JtYXAobV9kaXNwbGF5LCBSb290V2luZG93T2ZTY3JlZW4o c2NyZWVuKSwgR0RLX1ZJU1VBTF9YVklTVUFMKHZpc3VhbCksIEFsbG9jTm9uZSkpOwogCiAgICAg Ly8gVGhpcyBpcyBiYXNlZCBvbiBjb2RlIGZyb20gQ2hyb21pdW06IHNyYy9jb250ZW50L2NvbW1v bi9ncHUvaW1hZ2VfdHJhbnNwb3J0X3N1cmZhY2VfbGludXguY2MKQEAgLTIxNCw4ICsyMjAsNyBA QCBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6flJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93 KCkKIHZvaWQgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OnJlc2l6ZShjb25zdCBJbnRTaXpl JiBzaXplKQogewogICAgIEludFNpemUgc2NhbGVkU2l6ZShzaXplKTsKLSAgICBzY2FsZWRTaXpl LnNjYWxlKG1fZGV2aWNlU2NhbGUpOwotCisgICAgc2NhbGVkU2l6ZS5zY2FsZShtX3dlYlBhZ2Uu ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgaWYgKHNjYWxlZFNpemUgPT0gbV9zaXplKQogICAg ICAgICByZXR1cm47CiAKQEAgLTI2MSw3ICsyNjYsNyBAQCBjYWlyb19zdXJmYWNlX3QqIFJlZGly ZWN0ZWRYQ29tcG9zaXRlV2luZG93OjpzdXJmYWNlKCkKICAgICB9CiAKICAgICBSZWZQdHI8Y2Fp cm9fc3VyZmFjZV90PiBuZXdTdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9feGxpYl9zdXJmYWNlX2Ny ZWF0ZShtX2Rpc3BsYXksIG5ld1BpeG1hcC5nZXQoKSwgd2luZG93QXR0cmlidXRlcy52aXN1YWws IG1fc2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCkpKTsKLSAgICBjYWlyb1N1cmZhY2VTZXRE ZXZpY2VTY2FsZShuZXdTdXJmYWNlLmdldCgpLCBtX2RldmljZVNjYWxlLCBtX2RldmljZVNjYWxl KTsKKyAgICBjYWlyb1N1cmZhY2VTZXREZXZpY2VTY2FsZShuZXdTdXJmYWNlLmdldCgpLCBtX3dl YlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV93ZWJQYWdlLmRldmljZVNjYWxlRmFjdG9yKCkp OwogCiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNyID0gYWRvcHRSZWYoY2Fpcm9fY3JlYXRlKG5ld1N1 cmZhY2UuZ2V0KCkpKTsKICAgICBjYWlyb19zZXRfc291cmNlX3JnYihjci5nZXQoKSwgMSwgMSwg MSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0 ZWRYQ29tcG9zaXRlV2luZG93LmgKaW5kZXggYmZjMmExNC4uY2JlZWRkNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3cuaApAQCAtNDAsMjkgKzQwLDMxIEBAIHR5cGVkZWYgdW5zaWduZWQgbG9uZyBXaW5kb3c7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJQYWdlUHJveHk7CisKIGNsYXNzIFJl ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93IHsKKyAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSZWRp cmVjdGVkWENvbXBvc2l0ZVdpbmRvdyk7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGlj OgotICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c+ IGNyZWF0ZShHZGtXaW5kb3cqLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGFtYWdlTm90aWZ5KTsK KyAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93PiBj cmVhdGUoV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYsIHN0ZDo6ZnVuY3Rp b248dm9pZCAoKT4mJiBkYW1hZ2VOb3RpZnkpOwogICAgIH5SZWRpcmVjdGVkWENvbXBvc2l0ZVdp bmRvdygpOwogCiAgICAgV2luZG93IHdpbmRvd0lEKCkgY29uc3QgeyByZXR1cm4gbV93aW5kb3cu Z2V0KCk7IH0KICAgICB2b2lkIHJlc2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7Ci0gICAg dm9pZCBzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSkgeyBtX2RldmljZVNjYWxlID0g c2NhbGU7IH0KICAgICBjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UoKTsKIAogcHJpdmF0ZToKLSAg ICBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyhHZGtXaW5kb3cqLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoKT4gZGFtYWdlTm90aWZ5KTsKKyAgICBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyhXZWJQ YWdlUHJveHkmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgc3RkOjpmdW5jdGlvbjx2b2lkICgp PiYmIGRhbWFnZU5vdGlmeSk7CiAgICAgdm9pZCBjbGVhbnVwUGl4bWFwQW5kUGl4bWFwU3VyZmFj ZSgpOwogCi0gICAgRGlzcGxheSogbV9kaXNwbGF5OworICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQ YWdlOworICAgIERpc3BsYXkqIG1fZGlzcGxheSB7IG51bGxwdHIgfTsKICAgICBXZWJDb3JlOjpJ bnRTaXplIG1fc2l6ZTsKICAgICBXZWJDb3JlOjpYVW5pcXVlV2luZG93IG1fd2luZG93OwogICAg IFdlYkNvcmU6OlhVbmlxdWVXaW5kb3cgbV9wYXJlbnRXaW5kb3c7CiAgICAgV2ViQ29yZTo6WFVu aXF1ZVBpeG1hcCBtX3BpeG1hcDsKICAgICBXZWJDb3JlOjpYVW5pcXVlRGFtYWdlIG1fZGFtYWdl OwogICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IG1fc3VyZmFjZTsKLSAgICBib29sIG1fbmVl ZHNOZXdQaXhtYXBBZnRlclJlc2l6ZTsKLSAgICBmbG9hdCBtX2RldmljZVNjYWxlOworICAgIGJv b2wgbV9uZWVkc05ld1BpeG1hcEFmdGVyUmVzaXplIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAo=