158562 2016-06-09 05:11:52 -0700 [Threaded Compositor] Make it clear that compositing thread operations are always scheduled from the main thread 2016-06-10 05:51:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 154070 1 cgarcia webkit-unassigned bugs-noreply commit-queue yoon zan oldest_to_newest 1200810 0 cgarcia 2016-06-09 05:11:52 -0700 The code is written as if the compositor thread could also call callOnCompositingRunLoop() which makes the code confusing. 1200811 1 280912 cgarcia 2016-06-09 05:18:12 -0700 Created attachment 280912 Patch 1200812 2 commit-queue 2016-06-09 05:19:01 -0700 Attachment 280912 did not pass style-queue: ERROR: Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:49: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:44: 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. 1201220 3 cgarcia 2016-06-10 05:51:17 -0700 Committed r201922: <http://trac.webkit.org/changeset/201922> 280912 2016-06-09 05:18:12 -0700 2016-06-10 01:17:01 -0700 Patch wk2-tc-perform-task.diff text/plain 9474 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYzM3Zjc2Li5mZGU1MDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzYg QEAKIDIwMTYtMDYtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtUaHJlYWRlZCBDb21wb3NpdG9yXSBNYWtlIGl0IGNsZWFyIHRoYXQgY29t cG9zaXRpbmcgdGhyZWFkIG9wZXJhdGlvbnMgYXJlIGFsd2F5cyBzY2hlZHVsZWQgZnJvbSB0aGUg bWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1ODU2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoZSBjb2RlIGlzIHdyaXR0ZW4gYXMgaWYgdGhlIGNvbXBvc2l0b3IgdGhyZWFkIGNvdWxk IGFsc28gY2FsbCBjYWxsT25Db21wb3NpdGluZ1J1bkxvb3AoKSB3aGljaCBtYWtlcyB0aGUgY29k ZQorICAgICAgICBjb25mdXNpbmcuIFRoaXMgcGF0Y2ggbm8gbG9uZ2VyIGNoZWNrcyBpZiB0aGUg dGFzayB3YXMgc2NoZWR1bGVkIGluIHRoZSBjb21wb3NpdGluZyB0aHJlYWQsIGFuZCBpbnN0ZWFk IGl0IGFkZHMKKyAgICAgICAgYW4gQVNTRVJUIHRvIGVuc3VyZSBpdCdzIGFsd2F5cyBjYWxsZWQg ZnJvbSB0aGUgbWFpbiB0aHJlYWQgYXMgZXhwZWN0ZWQuIEl0IGFsc28gYWRkcyBzb21lIG1vcmUg QVNTRVJUUyB0byBlbnN1cmUKKyAgICAgICAgYW5kIGNsYXJpZnkgdGhlIG1ldGhvZHMgYXJlIGNh bGxlZCBmcm9tIHRoZSBleHBlY3RlZCB0aHJlYWQuCisKKyAgICAgICAgKiBTaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcDoK KyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdSdW5Mb29wOjpwZXJmb3JtVGFzayk6CisgICAg ICAgIChXZWJLaXQ6OkNvbXBvc2l0aW5nUnVuTG9vcDo6Y2FsbE9uQ29tcG9zaXRpbmdSdW5Mb29w KTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRl ZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmg6CisgICAgICAgICogU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6c2V0TmF0aXZlU3VyZmFjZUhh bmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9y OjpzZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9z aXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRD b21wb3NpdG9yOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJLaXQ6 OlRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKFdl YktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyk6CisgICAgICAgIChXZWJLaXQ6OlRo cmVhZGVkQ29tcG9zaXRvcjo6c2Nyb2xsQnkpOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENv bXBvc2l0b3I6OmdsQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRv cjo6ZGlkQ2hhbmdlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBv c2l0b3I6OnJlbmRlckxheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9z aXRvcjo6dXBkYXRlU2NlbmVTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9z aXRvcjo6Y2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQpOiBEZWxldGVkLgorICAgICAgICAqIFNoYXJl ZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0 b3IuaDoKKworMjAxNi0wNi0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CisKICAgICAgICAgW1RocmVhZGVkIENvbXBvc2l0b3JdIE1hbnkgbGF5b3V0IHRlc3Rz IGNyYXNoIHdoZW4gdGhyZWFkZWQgY29tcG9zaXRvciBpcyBlbmFibGVkCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg1NjAKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3Np dG9yL0NvbXBvc2l0aW5nUnVuTG9vcC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcApp bmRleCAwNzFiNjU1Li5mMDU5MDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Q29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29w LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJl YWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcApAQCAtMjksNiArMjksNyBAQAog I2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDU19USFJFQURFRCkKIAogI2luY2x1ZGUgPHd0Zi9D dXJyZW50VGltZS5oPgorI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCkBAIC00MCwxMyArNDEsOSBAQCBDb21wb3NpdGluZ1J1bkxvb3A6OkNvbXBvc2l0 aW5nUnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+JiYgdXBkYXRlRnVuY3Rpb24pCiB7CiB9 CiAKLXZvaWQgQ29tcG9zaXRpbmdSdW5Mb29wOjpjYWxsT25Db21wb3NpdGluZ1J1bkxvb3Aoc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiYmIGZ1bmN0aW9uKQordm9pZCBDb21wb3NpdGluZ1J1bkxvb3A6 OnBlcmZvcm1UYXNrKHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4mJiBmdW5jdGlvbikKIHsKLSAgICBp ZiAoJm1fcnVuTG9vcCA9PSAmUnVuTG9vcDo6Y3VycmVudCgpKSB7Ci0gICAgICAgIGZ1bmN0aW9u KCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkp OwogICAgIG1fcnVuTG9vcC5kaXNwYXRjaChXVEZNb3ZlKGZ1bmN0aW9uKSk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVk Y29tcG9zaXRvci9Db21wb3NpdGluZ1J1bkxvb3AuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9D b29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9Db21wb3NpdGluZ1J1bkxvb3Au aAppbmRleCBjMmZjY2ZmLi4zODYwYTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5M b29wLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhy ZWFkZWRjb21wb3NpdG9yL0NvbXBvc2l0aW5nUnVuTG9vcC5oCkBAIC00Niw3ICs0Niw3IEBAIHB1 YmxpYzoKIAogICAgIENvbXBvc2l0aW5nUnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+JiYp OwogCi0gICAgdm9pZCBjYWxsT25Db21wb3NpdGluZ1J1bkxvb3Aoc3RkOjpmdW5jdGlvbjx2b2lk ICgpPiYmKTsKKyAgICB2b2lkIHBlcmZvcm1UYXNrKHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4mJik7 CiAKICAgICB2b2lkIHNldFVwZGF0ZVRpbWVyKFVwZGF0ZVRpbWluZyB0aW1pbmcgPSBJbW1lZGlh dGUpOwogICAgIHZvaWQgc3RvcFVwZGF0ZVRpbWVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFk ZWRDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBo aWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCmluZGV4IDA4NTA2 NzkuLmU3MDQ5MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCkBAIC02NCw3ICs2NCw3IEBAIFRocmVhZGVkQ29t cG9zaXRvcjo6flRocmVhZGVkQ29tcG9zaXRvcigpCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6 c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2NF90IGhhbmRsZSkKIHsK ICAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2Fs bE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3RvciwgaGFuZGxlXSB7CisgICAgbV9jb21wb3Np dGluZ1J1bkxvb3AtPnBlcmZvcm1UYXNrKFtwcm90ZWN0b3IsIGhhbmRsZV0gewogICAgICAgICBw cm90ZWN0b3ItPm1fbmF0aXZlU3VyZmFjZUhhbmRsZSA9IGhhbmRsZTsKICAgICAgICAgcHJvdGVj dG9yLT5tX3NjZW5lLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAgfSk7CkBAIC03Myw3ICs3Myw3IEBA IHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9z aXRpbmcodWludDY0X3QgaGFuZGxlKQogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNldERldmlj ZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlKQogewogICAgIFJlZlB0cjxUaHJlYWRlZENvbXBvc2l0 b3I+IHByb3RlY3Rvcih0aGlzKTsKLSAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJvdGVj dG9yLCBzY2FsZV0geworICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJv dGVjdG9yLCBzY2FsZV0gewogICAgICAgICBwcm90ZWN0b3ItPm1fZGV2aWNlU2NhbGVGYWN0b3Ig PSBzY2FsZTsKICAgICAgICAgcHJvdGVjdG9yLT5zY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgp OwogICAgIH0pOwpAQCAtODIsNyArODIsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2V0 RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUpCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6 ZGlkQ2hhbmdlVmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgUmVmUHRy PFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0 aW5nVGhyZWFkKFtwcm90ZWN0b3IsIHNpemVdIHsKKyAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+ cGVyZm9ybVRhc2soW3Byb3RlY3Rvciwgc2l6ZV0gewogICAgICAgICBwcm90ZWN0b3ItPnZpZXdw b3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydFNpemUoc2l6ZSk7CiAgICAgfSk7CiB9 CkBAIC05MCw3ICs5MCw3IEBAIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VWaWV3 cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpk aWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZShjb25zdCBWaWV3cG9ydEF0dHJpYnV0ZXMmIGF0dHIp CiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAg IGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFtwcm90ZWN0b3IsIGF0dHJdIHsKKyAgICBtX2NvbXBv c2l0aW5nUnVuTG9vcC0+cGVyZm9ybVRhc2soW3Byb3RlY3RvciwgYXR0cl0gewogICAgICAgICBw cm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0 ZShhdHRyKTsKICAgICB9KTsKIH0KQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBUaHJlYWRlZENvbXBv c2l0b3I6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlKGNvbnN0IFZpZXdwb3J0QXR0cmlidXRl cyYgYXQKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29u c3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90 ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3Rvciwgc2l6 ZV0geworICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJvdGVjdG9yLCBz aXplXSB7CiAgICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250cm9sbGVyKCktPmRpZENoYW5n ZUNvbnRlbnRzU2l6ZShzaXplKTsKICAgICB9KTsKIH0KQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lk IFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IEludFNpemUm IHNpemUpCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2Nyb2xsVG8oY29uc3QgSW50UG9pbnQm IHBvc2l0aW9uKQogewogICAgIFJlZlB0cjxUaHJlYWRlZENvbXBvc2l0b3I+IHByb3RlY3Rvcih0 aGlzKTsKLSAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJvdGVjdG9yLCBwb3NpdGlvbl0g eworICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJvdGVjdG9yLCBwb3Np dGlvbl0gewogICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5zY3JvbGxU byhwb3NpdGlvbik7CiAgICAgfSk7CiB9CkBAIC0xMTQsNyArMTE0LDcgQEAgdm9pZCBUaHJlYWRl ZENvbXBvc2l0b3I6OnNjcm9sbFRvKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHZvaWQgVGhy ZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxCeShjb25zdCBJbnRTaXplJiBkZWx0YSkKIHsKICAgICBS ZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9uQ29t cG9zaXRpbmdUaHJlYWQoW3Byb3RlY3RvciwgZGVsdGFdIHsKKyAgICBtX2NvbXBvc2l0aW5nUnVu TG9vcC0+cGVyZm9ybVRhc2soW3Byb3RlY3RvciwgZGVsdGFdIHsKICAgICAgICAgcHJvdGVjdG9y LT52aWV3cG9ydENvbnRyb2xsZXIoKS0+c2Nyb2xsQnkoZGVsdGEpOwogICAgIH0pOwogfQpAQCAt MTU5LDYgKzE1OSw4IEBAIGJvb2wgVGhyZWFkZWRDb21wb3NpdG9yOjplbnN1cmVHTENvbnRleHQo KQogCiBHTENvbnRleHQqIFRocmVhZGVkQ29tcG9zaXRvcjo6Z2xDb250ZXh0KCkKIHsKKyAgICBB U1NFUlQoJlJ1bkxvb3A6OmN1cnJlbnQoKSA9PSAmbV9jb21wb3NpdGluZ1J1bkxvb3AtPnJ1bkxv b3AoKSk7CisKICAgICBpZiAobV9jb250ZXh0KQogICAgICAgICByZXR1cm4gbV9jb250ZXh0Lmdl dCgpOwogCkBAIC0xNzYsNiArMTc4LDggQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNjaGVk dWxlRGlzcGxheUltbWVkaWF0ZWx5KCkKIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmRpZENo YW5nZVZpc2libGVSZWN0KCkKIHsKKyAgICBBU1NFUlQoJlJ1bkxvb3A6OmN1cnJlbnQoKSA9PSAm bV9jb21wb3NpdGluZ1J1bkxvb3AtPnJ1bkxvb3AoKSk7CisKICAgICBSZWZQdHI8VGhyZWFkZWRD b21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7CiAgICAgRmxvYXRSZWN0IHZpc2libGVSZWN0ID0g dmlld3BvcnRDb250cm9sbGVyKCktPnZpc2libGVDb250ZW50c1JlY3QoKTsKICAgICBmbG9hdCBz Y2FsZSA9IHZpZXdwb3J0Q29udHJvbGxlcigpLT5wYWdlU2NhbGVGYWN0b3IoKTsKQEAgLTE4OCw2 ICsxOTIsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlzaWJsZVJlY3Qo KQogCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6cmVuZGVyTGF5ZXJUcmVlKCkKIHsKKyAgICBB U1NFUlQoJlJ1bkxvb3A6OmN1cnJlbnQoKSA9PSAmbV9jb21wb3NpdGluZ1J1bkxvb3AtPnJ1bkxv b3AoKSk7CiAgICAgaWYgKCFtX3NjZW5lKQogICAgICAgICByZXR1cm47CiAKQEAgLTIwOCw2ICsy MTMsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6cmVuZGVyTGF5ZXJUcmVlKCkKIAogdm9p ZCBUaHJlYWRlZENvbXBvc2l0b3I6OnVwZGF0ZVNjZW5lU3RhdGUoY29uc3QgQ29vcmRpbmF0ZWRH cmFwaGljc1N0YXRlJiBzdGF0ZSkKIHsKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAg IFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU+IHNjZW5lID0gbV9zY2VuZTsKICAgICBt X3NjZW5lLT5hcHBlbmRVcGRhdGUoW3NjZW5lLCBzdGF0ZV0gewogICAgICAgICBzY2VuZS0+Y29t bWl0U2NlbmVTdGF0ZShzdGF0ZSk7CkBAIC0yMTYsMTEgKzIyMiw2IEBAIHZvaWQgVGhyZWFkZWRD b21wb3NpdG9yOjp1cGRhdGVTY2VuZVN0YXRlKGNvbnN0IENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0 ZSYgc3RhdGUpCiAgICAgc2NoZWR1bGVEaXNwbGF5SW1tZWRpYXRlbHkoKTsKIH0KIAotdm9pZCBU aHJlYWRlZENvbXBvc2l0b3I6OmNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKHN0ZDo6ZnVuY3Rpb248 dm9pZCgpPiYmIGZ1bmN0aW9uKQotewotICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5jYWxsT25D b21wb3NpdGluZ1J1bkxvb3AoV1RGTW92ZShmdW5jdGlvbikpOwotfQotCiB2b2lkIFRocmVhZGVk Q29tcG9zaXRvcjo6Y29tcG9zaXRpbmdUaHJlYWRFbnRyeSh2b2lkKiBjb29yZGluYXRlZENvbXBv c2l0b3IpCiB7CiAgICAgc3RhdGljX2Nhc3Q8VGhyZWFkZWRDb21wb3NpdG9yKj4oY29vcmRpbmF0 ZWRDb21wb3NpdG9yKS0+cnVuQ29tcG9zaXRpbmdUaHJlYWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9U aHJlYWRlZENvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdy YXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaAppbmRleCA3Mzky NTYwLi42NDQxNmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0 ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKKysrIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3Np dG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCkBAIC05Miw3ICs5Miw2IEBAIHByaXZhdGU6CiAgICAg V2ViQ29yZTo6R0xDb250ZXh0KiBnbENvbnRleHQoKTsKICAgICBTaW1wbGVWaWV3cG9ydENvbnRy b2xsZXIqIHZpZXdwb3J0Q29udHJvbGxlcigpIHsgcmV0dXJuIG1fdmlld3BvcnRDb250cm9sbGVy LmdldCgpOyB9CiAKLSAgICB2b2lkIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKHN0ZDo6ZnVuY3Rp b248dm9pZCgpPiYmKTsKICAgICB2b2lkIGNyZWF0ZUNvbXBvc2l0aW5nVGhyZWFkKCk7CiAgICAg dm9pZCBydW5Db21wb3NpdGluZ1RocmVhZCgpOwogICAgIHZvaWQgdGVybWluYXRlQ29tcG9zaXRp bmdUaHJlYWQoKTsK