149090 2015-09-12 01:00:40 -0700 [Win][HighDPI] Windowed plugins have incorrect placement. 2015-09-17 11:23:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peavo webkit-unassigned achristensen bfulgham commit-queue oldest_to_newest 1125367 0 peavo 2015-09-12 01:00:40 -0700 We have to scale with device scale factor. 1125368 1 261051 peavo 2015-09-12 01:23:48 -0700 Created attachment 261051 Patch 1125593 2 peavo 2015-09-14 07:44:48 -0700 (In reply to comment #1) > Created attachment 261051 [details] > Patch This patch needs a little tweaking, it also affects the placements of windowless plugins, which already have correct placement ... :) 1125669 3 261051 achristensen 2015-09-14 11:12:29 -0700 Comment on attachment 261051 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=261051&action=review > Source/WebKit/win/Plugins/PluginViewWin.cpp:961 > + FrameView& frameView = downcast<FrameView>(*parent()); Is the parent always non-null and always a FrameView? 1125699 4 peavo 2015-09-14 12:29:35 -0700 (In reply to comment #3) > Comment on attachment 261051 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=261051&action=review > > > Source/WebKit/win/Plugins/PluginViewWin.cpp:961 > > + FrameView& frameView = downcast<FrameView>(*parent()); > > Is the parent always non-null and always a FrameView? Thanks for reviewing :) This is a good point, I'm not sure. I will put an assert there and test. 1126714 5 261393 peavo 2015-09-17 09:53:29 -0700 Created attachment 261393 Patch 1126727 6 261393 achristensen 2015-09-17 10:35:31 -0700 Comment on attachment 261393 Patch r=me. Thanks! 1126747 7 peavo 2015-09-17 11:09:32 -0700 (In reply to comment #6) > Comment on attachment 261393 [details] > Patch > > r=me. Thanks! Thanks for reviewing :) 1126756 8 261393 commit-queue 2015-09-17 11:23:11 -0700 Comment on attachment 261393 Patch Clearing flags on attachment: 261393 Committed r189919: <http://trac.webkit.org/changeset/189919> 1126757 9 commit-queue 2015-09-17 11:23:16 -0700 All reviewed patches have been landed. Closing bug. 261051 2015-09-12 01:23:48 -0700 2015-09-17 09:53:20 -0700 Patch bug-149090-20150912102339.patch text/plain 3959 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTY0OSkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA5LTEy ICBQZXIgQXJuZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luXVtI aWdoRFBJXSBXaW5kb3dlZCBwbHVnaW5zIGhhdmUgaW5jb3JyZWN0IHBsYWNlbWVudC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTA5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgdG8gc2Nh bGUgcGx1Z2luIGRpbWVuc2lvbnMgd2l0aCBkZXZpY2Ugc2NhbGUgZmFjdG9yLgorCisgICAgICAg ICogUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6 OndpbmRvd0NsaXBSZWN0KToKKyAgICAgICAgKiBQbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAg ICAgKiBQbHVnaW5zL1BsdWdpblZpZXdXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6dXBkYXRlUGx1Z2luV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6 OnNldE5QV2luZG93UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpzbmFwc2hv dCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpkZXZpY2VTY2FsZUZhY3Rvcik6CisK IDIwMTUtMDktMDggIFBlciBBcm5lIFZvbGxhbiAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAg ICAgIFtXaW5dIEltcGxlbWVudCBET01Ob2RlOjphdHRyaWJ1dGVzLgpJbmRleDogU291cmNlL1dl YktpdC93aW4vUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCShyZXZpc2lvbiAxODk2NDkpCisrKyBTb3Vy Y2UvV2ViS2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MjcsNyArMTI3LDkgQEAgSW50UmVjdCBQbHVnaW5WaWV3Ojp3aW5kb3dDbGlwUmVjdCgpIGNvbgog ICAgIAogICAgIC8vIFRha2Ugb3VyIGVsZW1lbnQgYW5kIGdldCB0aGUgY2xpcCByZWN0IGZyb20g dGhlIGVuY2xvc2luZyBsYXllciBhbmQgZnJhbWUgdmlldy4KICAgICBGcmFtZVZpZXcqIHBhcmVu dFZpZXcgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCkudmlldygpOwotICAgIGNsaXBSZWN0LmludGVy c2VjdChwYXJlbnRWaWV3LT53aW5kb3dDbGlwUmVjdEZvckZyYW1lT3duZXIobV9lbGVtZW50LCB0 cnVlKSk7CisgICAgSW50UmVjdCB3aW5kb3dDbGlwUmVjdCA9IHBhcmVudFZpZXctPndpbmRvd0Ns aXBSZWN0Rm9yRnJhbWVPd25lcihtX2VsZW1lbnQsIHRydWUpOworICAgIHdpbmRvd0NsaXBSZWN0 LnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKCkpOworICAgIGNsaXBSZWN0LmludGVyc2VjdCh3aW5k b3dDbGlwUmVjdCk7CiAKICAgICByZXR1cm4gY2xpcFJlY3Q7CiB9CkluZGV4OiBTb3VyY2UvV2Vi S2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuaAkocmV2aXNpb24gMTg5NjQ5KQorKysgU291cmNlL1dl YktpdC93aW4vUGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5NCw2ICsy OTQsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgcGFpbnRJbnRvVHJhbnNm b3JtZWRDb250ZXh0KEhEQyk7CiAgICAgICAgIFBhc3NSZWZQdHI8SW1hZ2U+IHNuYXBzaG90KCk7 CiAKKyAgICAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdDsKKwogICAgICAgICBp bnQgbV9tb2RlOwogICAgICAgICBpbnQgbV9wYXJhbUNvdW50OwogICAgICAgICBjaGFyKiogbV9w YXJhbU5hbWVzOwpJbmRleDogU291cmNlL1dlYktpdC93aW4vUGx1Z2lucy9QbHVnaW5WaWV3V2lu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXdX aW4uY3BwCShyZXZpc2lvbiAxODk2NDkpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9QbHVnaW5zL1Bs dWdpblZpZXdXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjYsNiArMzY2LDcgQEAgdm9pZCBQ bHVnaW5WaWV3Ojp1cGRhdGVQbHVnaW5XaWRnZXQoKQogICAgIEludFJlY3Qgb2xkQ2xpcFJlY3Qg PSBtX2NsaXBSZWN0OwogCiAgICAgbV93aW5kb3dSZWN0ID0gSW50UmVjdChmcmFtZVZpZXcuY29u dGVudHNUb1dpbmRvdyhmcmFtZVJlY3QoKS5sb2NhdGlvbigpKSwgZnJhbWVSZWN0KCkuc2l6ZSgp KTsKKyAgICBtX3dpbmRvd1JlY3Quc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgbV9j bGlwUmVjdCA9IHdpbmRvd0NsaXBSZWN0KCk7CiAgICAgbV9jbGlwUmVjdC5tb3ZlKC1tX3dpbmRv d1JlY3QueCgpLCAtbV93aW5kb3dSZWN0LnkoKSk7CiAKQEAgLTcxMiwxNSArNzEzLDIyIEBAIHZv aWQgUGx1Z2luVmlldzo6c2V0TlBXaW5kb3dSZWN0KGNvbnN0IEkKICAgICBpZiAoIW1faXNTdGFy dGVkKQogICAgICAgICByZXR1cm47CiAKKyAgICBmbG9hdCBzY2FsZUZhY3RvciA9IGRldmljZVNj YWxlRmFjdG9yKCk7CisKICAgICBJbnRQb2ludCBwID0gZG93bmNhc3Q8RnJhbWVWaWV3PigqcGFy ZW50KCkpLmNvbnRlbnRzVG9XaW5kb3cocmVjdC5sb2NhdGlvbigpKTsKKyAgICBwLnNjYWxlKHNj YWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CisKKyAgICBJbnRTaXplIHMgPSByZWN0LnNpemUoKTsK KyAgICBzLnNjYWxlKHNjYWxlRmFjdG9yKTsKKwogICAgIG1fbnBXaW5kb3cueCA9IHAueCgpOwog ICAgIG1fbnBXaW5kb3cueSA9IHAueSgpOwogCi0gICAgbV9ucFdpbmRvdy53aWR0aCA9IHJlY3Qu d2lkdGgoKTsKLSAgICBtX25wV2luZG93LmhlaWdodCA9IHJlY3QuaGVpZ2h0KCk7CisgICAgbV9u cFdpbmRvdy53aWR0aCA9IHMud2lkdGgoKTsKKyAgICBtX25wV2luZG93LmhlaWdodCA9IHMuaGVp Z2h0KCk7CiAKLSAgICBtX25wV2luZG93LmNsaXBSZWN0LnJpZ2h0ID0gcmVjdC53aWR0aCgpOwot ICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QuYm90dG9tID0gcmVjdC5oZWlnaHQoKTsKKyAgICBtX25w V2luZG93LmNsaXBSZWN0LnJpZ2h0ID0gcy53aWR0aCgpOworICAgIG1fbnBXaW5kb3cuY2xpcFJl Y3QuYm90dG9tID0gcy5oZWlnaHQoKTsKICAgICBtX25wV2luZG93LmNsaXBSZWN0LmxlZnQgPSAw OwogICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QudG9wID0gMDsKIApAQCAtOTQ4LDQgKzk1NiwxNiBA QCBQYXNzUmVmUHRyPEltYWdlPiBQbHVnaW5WaWV3OjpzbmFwc2hvdCgpCiAjZW5kaWYKIH0KIAor ZmxvYXQgUGx1Z2luVmlldzo6ZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdAoreworICAgIEZyYW1l VmlldyYgZnJhbWVWaWV3ID0gZG93bmNhc3Q8RnJhbWVWaWV3PigqcGFyZW50KCkpOworCisgICAg ZmxvYXQgc2NhbGVGYWN0b3IgPSAxLjBmOworCisgICAgaWYgKGZyYW1lVmlldy5mcmFtZSgpLmRv Y3VtZW50KCkpCisgICAgICAgIHNjYWxlRmFjdG9yID0gZnJhbWVWaWV3LmZyYW1lKCkuZG9jdW1l bnQoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKKworICAgIHJldHVybiBzY2FsZUZhY3RvcjsKK30K KwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 261393 2015-09-17 09:53:29 -0700 2015-09-17 11:23:11 -0700 Patch bug-149090-20150917185313.patch text/plain 4204 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTkxNCkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA5LTE3 ICBQZXIgQXJuZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luXVtI aWdoRFBJXSBXaW5kb3dlZCBwbHVnaW5zIGhhdmUgaW5jb3JyZWN0IHBsYWNlbWVudC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTA5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgdG8gc2Nh bGUgcGx1Z2luIGRpbWVuc2lvbnMgd2l0aCBkZXZpY2Ugc2NhbGUgZmFjdG9yLgorCisgICAgICAg ICogUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6 OndpbmRvd0NsaXBSZWN0KToKKyAgICAgICAgKiBQbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAg ICAgKiBQbHVnaW5zL1BsdWdpblZpZXdXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6dXBkYXRlUGx1Z2luV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6 OnNldE5QV2luZG93UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpzbmFwc2hv dCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpkZXZpY2VTY2FsZUZhY3Rvcik6CisK IDIwMTUtMDktMTUgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAg ICAgW1dpbl0gUHJvdmlkZSBhIG1lYW5zIGZvciB2aWV3aW5nIHRoZSBsYXllciB0cmVlCkluZGV4 OiBTb3VyY2UvV2ViS2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvd2luL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDE4OTkx MCkKKysrIFNvdXJjZS9XZWJLaXQvd2luL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyNyw3ICsxMjcsOSBAQCBJbnRSZWN0IFBsdWdpblZpZXc6OndpbmRvd0NsaXBS ZWN0KCkgY29uCiAgICAgCiAgICAgLy8gVGFrZSBvdXIgZWxlbWVudCBhbmQgZ2V0IHRoZSBjbGlw IHJlY3QgZnJvbSB0aGUgZW5jbG9zaW5nIGxheWVyIGFuZCBmcmFtZSB2aWV3LgogICAgIEZyYW1l VmlldyogcGFyZW50VmlldyA9IG1fZWxlbWVudC0+ZG9jdW1lbnQoKS52aWV3KCk7Ci0gICAgY2xp cFJlY3QuaW50ZXJzZWN0KHBhcmVudFZpZXctPndpbmRvd0NsaXBSZWN0Rm9yRnJhbWVPd25lciht X2VsZW1lbnQsIHRydWUpKTsKKyAgICBJbnRSZWN0IHdpbmRvd0NsaXBSZWN0ID0gcGFyZW50Vmll dy0+d2luZG93Q2xpcFJlY3RGb3JGcmFtZU93bmVyKG1fZWxlbWVudCwgdHJ1ZSk7CisgICAgd2lu ZG93Q2xpcFJlY3Quc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgY2xpcFJlY3QuaW50 ZXJzZWN0KHdpbmRvd0NsaXBSZWN0KTsKIAogICAgIHJldHVybiBjbGlwUmVjdDsKIH0KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL1BsdWdpbnMvUGx1Z2luVmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvd2luL1BsdWdpbnMvUGx1Z2luVmlldy5oCShyZXZpc2lvbiAxODk5MTApCisr KyBTb3VyY2UvV2ViS2l0L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuaAkod29ya2luZyBjb3B5KQpA QCAtMjk0LDYgKzI5NCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBwYWlu dEludG9UcmFuc2Zvcm1lZENvbnRleHQoSERDKTsKICAgICAgICAgUGFzc1JlZlB0cjxJbWFnZT4g c25hcHNob3QoKTsKIAorICAgICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0Owor CiAgICAgICAgIGludCBtX21vZGU7CiAgICAgICAgIGludCBtX3BhcmFtQ291bnQ7CiAgICAgICAg IGNoYXIqKiBtX3BhcmFtTmFtZXM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9QbHVnaW5zL1Bs dWdpblZpZXdXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1BsdWdpbnMv UGx1Z2luVmlld1dpbi5jcHAJKHJldmlzaW9uIDE4OTkxMCkKKysrIFNvdXJjZS9XZWJLaXQvd2lu L1BsdWdpbnMvUGx1Z2luVmlld1dpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2Niw2ICszNjYs NyBAQCB2b2lkIFBsdWdpblZpZXc6OnVwZGF0ZVBsdWdpbldpZGdldCgpCiAgICAgSW50UmVjdCBv bGRDbGlwUmVjdCA9IG1fY2xpcFJlY3Q7CiAKICAgICBtX3dpbmRvd1JlY3QgPSBJbnRSZWN0KGZy YW1lVmlldy5jb250ZW50c1RvV2luZG93KGZyYW1lUmVjdCgpLmxvY2F0aW9uKCkpLCBmcmFtZVJl Y3QoKS5zaXplKCkpOworICAgIG1fd2luZG93UmVjdC5zY2FsZShkZXZpY2VTY2FsZUZhY3Rvcigp KTsKICAgICBtX2NsaXBSZWN0ID0gd2luZG93Q2xpcFJlY3QoKTsKICAgICBtX2NsaXBSZWN0Lm1v dmUoLW1fd2luZG93UmVjdC54KCksIC1tX3dpbmRvd1JlY3QueSgpKTsKIApAQCAtNzEyLDE1ICs3 MTMsMjIgQEAgdm9pZCBQbHVnaW5WaWV3OjpzZXROUFdpbmRvd1JlY3QoY29uc3QgSQogICAgIGlm ICghbV9pc1N0YXJ0ZWQpCiAgICAgICAgIHJldHVybjsKIAorICAgIGZsb2F0IHNjYWxlRmFjdG9y ID0gZGV2aWNlU2NhbGVGYWN0b3IoKTsKKwogICAgIEludFBvaW50IHAgPSBkb3duY2FzdDxGcmFt ZVZpZXc+KCpwYXJlbnQoKSkuY29udGVudHNUb1dpbmRvdyhyZWN0LmxvY2F0aW9uKCkpOworICAg IHAuc2NhbGUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yKTsKKworICAgIEludFNpemUgcyA9IHJl Y3Quc2l6ZSgpOworICAgIHMuc2NhbGUoc2NhbGVGYWN0b3IpOworCiAgICAgbV9ucFdpbmRvdy54 ID0gcC54KCk7CiAgICAgbV9ucFdpbmRvdy55ID0gcC55KCk7CiAKLSAgICBtX25wV2luZG93Lndp ZHRoID0gcmVjdC53aWR0aCgpOwotICAgIG1fbnBXaW5kb3cuaGVpZ2h0ID0gcmVjdC5oZWlnaHQo KTsKKyAgICBtX25wV2luZG93LndpZHRoID0gcy53aWR0aCgpOworICAgIG1fbnBXaW5kb3cuaGVp Z2h0ID0gcy5oZWlnaHQoKTsKIAotICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QucmlnaHQgPSByZWN0 LndpZHRoKCk7Ci0gICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5ib3R0b20gPSByZWN0LmhlaWdodCgp OworICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QucmlnaHQgPSBzLndpZHRoKCk7CisgICAgbV9ucFdp bmRvdy5jbGlwUmVjdC5ib3R0b20gPSBzLmhlaWdodCgpOwogICAgIG1fbnBXaW5kb3cuY2xpcFJl Y3QubGVmdCA9IDA7CiAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC50b3AgPSAwOwogCkBAIC05NDgs NCArOTU2LDIzIEBAIFBhc3NSZWZQdHI8SW1hZ2U+IFBsdWdpblZpZXc6OnNuYXBzaG90KCkKICNl bmRpZgogfQogCitmbG9hdCBQbHVnaW5WaWV3OjpkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0Cit7 CisgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSAxLjBmOworCisgICAgaWYgKCFwYXJlbnQoKSB8fCAh cGFyZW50KCktPmlzRnJhbWVWaWV3KCkpCisgICAgICAgIHJldHVybiBzY2FsZUZhY3RvcjsKKwor ICAgIC8vIEZvciB3aW5kb3dsZXNzIHBsdWdpbnMsIHRoZSBkZXZpY2Ugc2NhbGUgZmFjdG9yIHdp bGwgYmUgYXBwbGllZCBhcyBmb3Igb3RoZXIgcGFnZSBlbGVtZW50cy4KKyAgICBpZiAoIW1faXNX aW5kb3dlZCkKKyAgICAgICAgcmV0dXJuIHNjYWxlRmFjdG9yOworCisgICAgRnJhbWVWaWV3JiBm cmFtZVZpZXcgPSBkb3duY2FzdDxGcmFtZVZpZXc+KCpwYXJlbnQoKSk7CisKKyAgICBpZiAoZnJh bWVWaWV3LmZyYW1lKCkuZG9jdW1lbnQoKSkKKyAgICAgICAgc2NhbGVGYWN0b3IgPSBmcmFtZVZp ZXcuZnJhbWUoKS5kb2N1bWVudCgpLT5kZXZpY2VTY2FsZUZhY3RvcigpOworCisgICAgcmV0dXJu IHNjYWxlRmFjdG9yOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==