167196 2017-01-19 00:34:35 -0800 [Threaded Compositor] Initialize the threaded compositor with the current size 2017-01-19 22:57:09 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply oldest_to_newest 1268063 0 cgarcia 2017-01-19 00:34:35 -0800 We are always creating the threaded compositor with and empty size and then a sizeDidChange always happen when the backing store state changes. This is always happening because the threaded compositor is created before the first backing store state, but if we wanted to create it later, for example to enter/leave AC mode on demand, the threaded compositor will not have the viewport size unless the window is resized, or sizeDidChange is called manually when entering AC mode. Creating the threaded compositor is sync and changing the size too, so it's better to do both things at the same time using the same sync operation. 1268067 1 299239 cgarcia 2017-01-19 00:43:33 -0800 Created attachment 299239 Patch 1268106 2 299239 zan 2017-01-19 09:08:25 -0800 Comment on attachment 299239 Patch LGTM. 1268369 3 cgarcia 2017-01-19 22:57:09 -0800 Committed r210954: <http://trac.webkit.org/changeset/210954> 299239 2017-01-19 00:43:33 -0800 2017-01-19 09:08:25 -0800 Patch wk2-initial-size.diff text/plain 8817 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzYzA5YmM3MDRlZC4uZGI1Y2UzMDBiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMCBAQAogMjAxNy0wMS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW1RocmVhZGVkIENvbXBvc2l0b3JdIEluaXRpYWxpemUgdGhl IHRocmVhZGVkIGNvbXBvc2l0b3Igd2l0aCB0aGUgY3VycmVudCBzaXplCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcxOTYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgYWx3YXlzIGNyZWF0aW5n IHRoZSB0aHJlYWRlZCBjb21wb3NpdG9yIHdpdGggYW4gZW1wdHkgc2l6ZSBhbmQgdGhlbiBhIHNp emVEaWRDaGFuZ2UgYWx3YXlzIGhhcHBlbiB3aGVuCisgICAgICAgIHRoZSBiYWNraW5nIHN0b3Jl IHN0YXRlIGNoYW5nZXMuIFRoaXMgaXMgYWx3YXlzIGhhcHBlbmluZyBiZWNhdXNlIHRoZSB0aHJl YWRlZCBjb21wb3NpdG9yIGlzIGNyZWF0ZWQgYmVmb3JlIHRoZQorICAgICAgICBmaXJzdCBiYWNr aW5nIHN0b3JlIHN0YXRlLCBidXQgaWYgd2Ugd2FudGVkIHRvIGNyZWF0ZSBpdCBsYXRlciwgZm9y IGV4YW1wbGUgdG8gZW50ZXIvbGVhdmUgQUMgbW9kZSBvbiBkZW1hbmQsCisgICAgICAgIHRoZSB0 aHJlYWRlZCBjb21wb3NpdG9yIHdpbGwgbm90IGhhdmUgdGhlIHZpZXdwb3J0IHNpemUgdW5sZXNz IHRoZSB3aW5kb3cgaXMgcmVzaXplZCwgb3Igc2l6ZURpZENoYW5nZSBpcyBjYWxsZWQKKyAgICAg ICAgbWFudWFsbHkgd2hlbiBlbnRlcmluZyBBQyBtb2RlLiBDcmVhdGluZyB0aGUgdGhyZWFkZWQg Y29tcG9zaXRvciBpcyBzeW5jIGFuZCBjaGFuZ2luZyB0aGUgc2l6ZSB0b28sIHNvIGl0J3MKKyAg ICAgICAgYmV0dGVyIHRvIGRvIGJvdGggdGhpbmdzIGF0IHRoZSBzYW1lIHRpbWUgdXNpbmcgdGhl IHNhbWUgc3luYyBvcGVyYXRpb24uCisKKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFw aGljcy9TaW1wbGVWaWV3cG9ydENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTaW1w bGVWaWV3cG9ydENvbnRyb2xsZXI6OlNpbXBsZVZpZXdwb3J0Q29udHJvbGxlcik6IFBhc3MgYW4g aW5pdGlhbCBzaXplIHRvIHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgKiBTaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy9TaW1wbGVWaWV3cG9ydENvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBTaGFy ZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3Np dG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpjcmVhdGUpOiBB ZGQgdmlld3BvcnRTaXplIGFuZCBzY2FsZUZhY3RvciBjb25zdHJ1Y3Rpb24gcGFyYW1ldGVycywK KyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpUaHJlYWRlZENvbXBvc2l0b3Ip OiBEaXR0by4gQWxzbyBtYXJrIGFzIG5lZWRzIHJlc2l6ZSBpZiB0aGUgZ2l2ZW4gc2l6ZSBpcyBu b3QgZW1wdHkuCisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRj b21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1RocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6 OlRocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0KTogSW5pdGlhbGl6ZSB0aGUgdGhyZWFk ZWQgY29tcG9zaXRvcgorICAgICAgICB3aXRoIGFuIGluaXRpYWwgdmlld3BvcnQgc2l6ZSBhbmQg c2NhbGUgZmFjdG9yLgorCisyMDE3LTAxLTE5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBEbyBub3QgdXBkYXRlIHRoZSBiYWNraW5n IHN0b3JlIHN0YXRlIHVubmVjZXNzYXJpbHkgd2hlbiBwYWdlIHZpc2liaWxpdHkgY2hhbmdlcwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MTk1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL1Np bXBsZVZpZXdwb3J0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy9TaW1wbGVWaWV3cG9ydENvbnRyb2xsZXIuY3BwCmluZGV4IGE3YmRiY2Iz NzQ1Li5iZmI2ZWQzMWI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvU2ltcGxlVmlld3BvcnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9TaW1wbGVWaWV3cG9ydENvbnRyb2xs ZXIuY3BwCkBAIC0yOCw3ICsyOCw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotU2ltcGxlVmlld3BvcnRDb250cm9sbGVyOjpTaW1wbGVWaWV3cG9y dENvbnRyb2xsZXIoKQorU2ltcGxlVmlld3BvcnRDb250cm9sbGVyOjpTaW1wbGVWaWV3cG9ydENv bnRyb2xsZXIoY29uc3QgSW50U2l6ZSYgc2l6ZSkKKyAgICA6IG1fdmlld3BvcnRTaXplKHNpemUp CiB7CiAgICAgcmVzZXRWaWV3cG9ydFRvRGVmYXVsdFN0YXRlKCk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9TaW1wbGVWaWV3cG9ydENv bnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL1Np bXBsZVZpZXdwb3J0Q29udHJvbGxlci5oCmluZGV4IDMwODI5ZTgxYzQ0Li5hMzExY2QzODkzYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvU2lt cGxlVmlld3BvcnRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvU2ltcGxlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTM3LDcgKzM3LDcg QEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBTaW1wbGVWaWV3cG9ydENvbnRyb2xsZXIgewog ICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNpbXBsZVZpZXdwb3J0Q29udHJvbGxlcik7CiBwdWJs aWM6Ci0gICAgU2ltcGxlVmlld3BvcnRDb250cm9sbGVyKCk7CisgICAgU2ltcGxlVmlld3BvcnRD b250cm9sbGVyKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKIAogICAgIHZvaWQgZGlkQ2hhbmdl Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2b2lkIGRpZENoYW5n ZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3Iv VGhyZWFkZWRDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCmluZGV4 IDY0ZDUzNDAyYzJjLi4wOTFkOGI0MDUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9z aXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv dGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAKQEAgLTQyLDE2ICs0Miwx OSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVJl ZjxUaHJlYWRlZENvbXBvc2l0b3I+IFRocmVhZGVkQ29tcG9zaXRvcjo6Y3JlYXRlKENsaWVudCYg Y2xpZW50LCB1aW50NjRfdCBuYXRpdmVTdXJmYWNlSGFuZGxlLCBTaG91bGREb0ZyYW1lU3luYyBk b0ZyYW1lU3luYywgVGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyBwYWludEZsYWdzKQorUmVmPFRo cmVhZGVkQ29tcG9zaXRvcj4gVGhyZWFkZWRDb21wb3NpdG9yOjpjcmVhdGUoQ2xpZW50JiBjbGll bnQsIGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6ZSwgZmxvYXQgc2NhbGVGYWN0b3IsIHVpbnQ2 NF90IG5hdGl2ZVN1cmZhY2VIYW5kbGUsIFNob3VsZERvRnJhbWVTeW5jIGRvRnJhbWVTeW5jLCBU ZXh0dXJlTWFwcGVyOjpQYWludEZsYWdzIHBhaW50RmxhZ3MpCiB7Ci0gICAgcmV0dXJuIGFkb3B0 UmVmKCpuZXcgVGhyZWFkZWRDb21wb3NpdG9yKGNsaWVudCwgbmF0aXZlU3VyZmFjZUhhbmRsZSwg ZG9GcmFtZVN5bmMsIHBhaW50RmxhZ3MpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBUaHJl YWRlZENvbXBvc2l0b3IoY2xpZW50LCB2aWV3cG9ydFNpemUsIHNjYWxlRmFjdG9yLCBuYXRpdmVT dXJmYWNlSGFuZGxlLCBkb0ZyYW1lU3luYywgcGFpbnRGbGFncykpOwogfQogCi1UaHJlYWRlZENv bXBvc2l0b3I6OlRocmVhZGVkQ29tcG9zaXRvcihDbGllbnQmIGNsaWVudCwgdWludDY0X3QgbmF0 aXZlU3VyZmFjZUhhbmRsZSwgU2hvdWxkRG9GcmFtZVN5bmMgZG9GcmFtZVN5bmMsIFRleHR1cmVN YXBwZXI6OlBhaW50RmxhZ3MgcGFpbnRGbGFncykKK1RocmVhZGVkQ29tcG9zaXRvcjo6VGhyZWFk ZWRDb21wb3NpdG9yKENsaWVudCYgY2xpZW50LCBjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUs IGZsb2F0IHNjYWxlRmFjdG9yLCB1aW50NjRfdCBuYXRpdmVTdXJmYWNlSGFuZGxlLCBTaG91bGRE b0ZyYW1lU3luYyBkb0ZyYW1lU3luYywgVGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyBwYWludEZs YWdzKQogICAgIDogbV9jbGllbnQoY2xpZW50KQorICAgICwgbV92aWV3cG9ydFNpemUodmlld3Bv cnRTaXplKQorICAgICwgbV9zY2FsZUZhY3RvcihzY2FsZUZhY3RvcikKICAgICAsIG1fbmF0aXZl U3VyZmFjZUhhbmRsZShuYXRpdmVTdXJmYWNlSGFuZGxlKQogICAgICwgbV9kb0ZyYW1lU3luYyhk b0ZyYW1lU3luYykKICAgICAsIG1fcGFpbnRGbGFncyhwYWludEZsYWdzKQorICAgICwgbV9uZWVk c1Jlc2l6ZSghdmlld3BvcnRTaXplLmlzRW1wdHkoKSkKICAgICAsIG1fY29tcG9zaXRpbmdSdW5M b29wKHN0ZDo6bWFrZV91bmlxdWU8Q29tcG9zaXRpbmdSdW5Mb29wPihbdGhpc10geyByZW5kZXJM YXllclRyZWUoKTsgfSkpCiB7CiAgICAgbV9jb21wb3NpdGluZ1J1bkxvb3AtPnBlcmZvcm1UYXNr U3luYyhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBv c2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKaW5k ZXggZDdmZmM4MmQxOTMuLmIxNzRhMmUyYTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21w b3NpdG9yLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv dGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCkBAIC01OCw3ICs1OCw3IEBA IHB1YmxpYzoKIAogICAgIGVudW0gY2xhc3MgU2hvdWxkRG9GcmFtZVN5bmMgeyBObywgWWVzIH07 CiAKLSAgICBzdGF0aWMgUmVmPFRocmVhZGVkQ29tcG9zaXRvcj4gY3JlYXRlKENsaWVudCYsIHVp bnQ2NF90IG5hdGl2ZVN1cmZhY2VIYW5kbGUgPSAwLCBTaG91bGREb0ZyYW1lU3luYyA9IFNob3Vs ZERvRnJhbWVTeW5jOjpZZXMsIFdlYkNvcmU6OlRleHR1cmVNYXBwZXI6OlBhaW50RmxhZ3MgPSAw KTsKKyAgICBzdGF0aWMgUmVmPFRocmVhZGVkQ29tcG9zaXRvcj4gY3JlYXRlKENsaWVudCYsIGNv bnN0IFdlYkNvcmU6OkludFNpemUmLCBmbG9hdCBzY2FsZUZhY3RvciwgdWludDY0X3QgbmF0aXZl U3VyZmFjZUhhbmRsZSA9IDAsIFNob3VsZERvRnJhbWVTeW5jID0gU2hvdWxkRG9GcmFtZVN5bmM6 OlllcywgV2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyA9IDApOwogICAgIHZpcnR1 YWwgflRocmVhZGVkQ29tcG9zaXRvcigpOwogCiAgICAgdm9pZCBzZXROYXRpdmVTdXJmYWNlSGFu ZGxlRm9yQ29tcG9zaXRpbmcodWludDY0X3QpOwpAQCAtNzQsNyArNzQsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBmb3JjZVJlcGFpbnQoKTsKIAogcHJpdmF0ZToKLSAgICBUaHJlYWRlZENvbXBvc2l0 b3IoQ2xpZW50JiwgdWludDY0X3QgbmF0aXZlU3VyZmFjZUhhbmRsZSwgU2hvdWxkRG9GcmFtZVN5 bmMsIFdlYkNvcmU6OlRleHR1cmVNYXBwZXI6OlBhaW50RmxhZ3MpOworICAgIFRocmVhZGVkQ29t cG9zaXRvcihDbGllbnQmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgZmxvYXQgc2NhbGVGYWN0 b3IsIHVpbnQ2NF90IG5hdGl2ZVN1cmZhY2VIYW5kbGUsIFNob3VsZERvRnJhbWVTeW5jLCBXZWJD b3JlOjpUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdzKTsKIAogICAgIC8vIENvb3JkaW5hdGVkR3Jh cGhpY3NTY2VuZUNsaWVudAogICAgIHZvaWQgcmVuZGVyTmV4dEZyYW1lKCkgb3ZlcnJpZGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRH cmFwaGljcy9UaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9UaHJlYWRlZENvb3Jk aW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggNTdhMGExZjAwOTkuLjU4ZGE4ZWI2ZTNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRH cmFwaGljcy9UaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRD b29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCkBAIC01Myw3ICs1MywxMiBAQCBUaHJlYWRlZENv b3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6VGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Qo V2ViUGFnZSYgd2ViUAogICAgIDogQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0KHdlYlBhZ2UpCiAg ICAgLCBtX2NvbXBvc2l0b3JDbGllbnQoKnRoaXMpCiAgICAgLCBtX3N1cmZhY2UoQWNjZWxlcmF0 ZWRTdXJmYWNlOjpjcmVhdGUod2ViUGFnZSkpCisgICAgLCBtX3ZpZXdwb3J0Q29udHJvbGxlcih3 ZWJQYWdlLnNpemUoKSkKIHsKKyAgICBJbnRTaXplIHNjYWxlZFNpemUobV93ZWJQYWdlLnNpemUo KSk7CisgICAgc2NhbGVkU2l6ZS5zY2FsZShtX3dlYlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSk7 CisgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBtX3dlYlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSAq IG1fdmlld3BvcnRDb250cm9sbGVyLnBhZ2VTY2FsZUZhY3RvcigpOworCiAgICAgaWYgKG1fc3Vy ZmFjZSkgewogICAgICAgICBUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdzIHBhaW50RmxhZ3MgPSAw OwogCkBAIC02MywxMCArNjgsMTIgQEAgVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6 OlRocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0KFdlYlBhZ2UmIHdlYlAKICAgICAgICAg Ly8gRG8gbm90IGRvIGZyYW1lIHN5bmMgd2hlbiByZW5kZXJpbmcgb2Zmc2NyZWVuIGluIHRoZSB3 ZWIgcHJvY2VzcyB0byBlbnN1cmUgdGhhdCBTd2FwQnVmZmVycyBuZXZlciBibG9ja3MuCiAgICAg ICAgIC8vIFJlbmRlcmluZyB0byB0aGUgYWN0dWFsIHNjcmVlbiB3aWxsIGhhcHBlbiBsYXRlciBh bnl3YXkgc2luY2UgdGhlIFVJIHByb2Nlc3Mgc2NoZWR1bGVzIGEgcmVkcmF3IGZvciBldmVyeSB1 cGRhdGUsCiAgICAgICAgIC8vIHRoZSBjb21wb3NpdG9yIHdpbGwgdGFrZSBjYXJlIG9mIHN5bmNp bmcgdG8gdmJsYW5rLgotICAgICAgICBtX2NvbXBvc2l0b3IgPSBUaHJlYWRlZENvbXBvc2l0b3I6 OmNyZWF0ZShtX2NvbXBvc2l0b3JDbGllbnQsIG1fc3VyZmFjZS0+d2luZG93KCksIFRocmVhZGVk Q29tcG9zaXRvcjo6U2hvdWxkRG9GcmFtZVN5bmM6Ok5vLCBwYWludEZsYWdzKTsKKyAgICAgICAg bV9jb21wb3NpdG9yID0gVGhyZWFkZWRDb21wb3NpdG9yOjpjcmVhdGUobV9jb21wb3NpdG9yQ2xp ZW50LCBzY2FsZWRTaXplLCBzY2FsZUZhY3RvciwgbV9zdXJmYWNlLT53aW5kb3coKSwgVGhyZWFk ZWRDb21wb3NpdG9yOjpTaG91bGREb0ZyYW1lU3luYzo6Tm8sIHBhaW50RmxhZ3MpOwogICAgICAg ICBtX2xheWVyVHJlZUNvbnRleHQuY29udGV4dElEID0gbV9zdXJmYWNlLT5zdXJmYWNlSUQoKTsK ICAgICB9IGVsc2UKLSAgICAgICAgbV9jb21wb3NpdG9yID0gVGhyZWFkZWRDb21wb3NpdG9yOjpj cmVhdGUobV9jb21wb3NpdG9yQ2xpZW50KTsKKyAgICAgICAgbV9jb21wb3NpdG9yID0gVGhyZWFk ZWRDb21wb3NpdG9yOjpjcmVhdGUobV9jb21wb3NpdG9yQ2xpZW50LCBzY2FsZWRTaXplLCBzY2Fs ZUZhY3Rvcik7CisKKyAgICBkaWRDaGFuZ2VWaWV3cG9ydCgpOwogfQogCiB2b2lkIFRocmVhZGVk Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjppbnZhbGlkYXRlKCkK