149077 2015-09-11 15:26:05 -0700 Still need view snapshotting code for non-IOSurface for the sim 2015-09-11 16:06:32 -0700 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue thorton oldest_to_newest 1125274 0 bdakin 2015-09-11 15:26:05 -0700 l need view snapshotting code for non-IOSurface for the sim 1125275 1 261021 bdakin 2015-09-11 15:27:08 -0700 Created attachment 261021 Patch 1125276 2 commit-queue 2015-09-11 15:27:57 -0700 Attachment 261021 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h:57: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm:150: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1125277 3 261021 thorton 2015-09-11 15:30:15 -0700 Comment on attachment 261021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=261021&action=review > Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm:570 > +#if USE(IOSURFACE) No need. This is always true on Mac. > Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm:819 > +#if USE(IOSURFACE) No need. This is always true on Mac. 1125278 4 bdakin 2015-09-11 15:33:44 -0700 Thanks! http://trac.webkit.org/changeset/189635 1125284 5 bdakin 2015-09-11 16:06:32 -0700 Build fix: http://trac.webkit.org/changeset/189637 261021 2015-09-11 15:27:08 -0700 2015-09-11 15:30:15 -0700 Patch for-review-2.txt text/plain 9258 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTYzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDE1LTA5LTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBTdGlsbCBuZWVkIHZpZXcgc25hcHNo b3R0aW5nIGNvZGUgZm9yIG5vbi1JT1N1cmZhY2UgZm9yIHRoZSBzaW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTA3NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgZml4ZXMgdGhlIHNpbXVsYXRv ciBidWlsZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF90YWtlVmlld1NuYXBzaG90XSk6CisgICAgICAgICgtW1dLV2Vi VmlldyBfem9vbVRvUG9pbnQ6YXRTY2FsZTphbmltYXRlZDpdKToKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Vmll d0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2VzdHVyZSk6CisgICAgICAgIChXZWJLaXQ6 OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dpcGVTbmFwc2hvdCk6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpWaWV3 U25hcHNob3Q6OnNldERldmljZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKFdlYktpdDo6Vmlld1Nu YXBzaG90OjpkZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hv dDo6c3VyZmFjZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdDo6aW1hZ2VTaXplSW5C eXRlcyk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdDo6c2l6ZSk6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbToKKyAgICAgICAgKFdlYktpdDo6Vmll d1NuYXBzaG90U3RvcmU6OnNpbmdsZXRvbik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hv dFN0b3JlOjpzbmFwc2hvdHRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6Vmlld1NuYXBz aG90U3RvcmU6OmRpZEFkZEltYWdlVG9TbmFwc2hvdCk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdT bmFwc2hvdFN0b3JlOjpkaXNjYXJkU25hcHNob3RJbWFnZXMpOgorICAgICAgICAoV2ViS2l0OjpW aWV3U25hcHNob3Q6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdDo6Vmll d1NuYXBzaG90KToKKyAgICAgICAgKFdlYktpdDo6Vmlld1NuYXBzaG90Ojp+Vmlld1NuYXBzaG90 KToKKyAgICAgICAgKFdlYktpdDo6Vmlld1NuYXBzaG90OjpzZXRTdXJmYWNlKToKKyAgICAgICAg KFdlYktpdDo6Vmlld1NuYXBzaG90OjpoYXNJbWFnZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdT bmFwc2hvdDo6Y2xlYXJJbWFnZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdDo6YXNM YXllckNvbnRlbnRzKToKKwogMjAxNS0wOS0xMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5j b20+CiAKICAgICAgICAgQnVpbGQgZml4CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTg5NjI4KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkK QEAgLTExMDcsMTAgKzExMDcsMjIgQEAgLSAoUGFzc1JlZlB0cjxXZWJLaXQ6OlZpZXdTbmFwc2hv dD4pX3RhawogICAgIHNuYXBzaG90U2l6ZS5zY2FsZShkZXZpY2VTY2FsZSwgZGV2aWNlU2NhbGUp OwogCiAgICAgQ0FUcmFuc2Zvcm0zRCB0cmFuc2Zvcm0gPSBDQVRyYW5zZm9ybTNETWFrZVNjYWxl KGRldmljZVNjYWxlLCBkZXZpY2VTY2FsZSwgMSk7CisKKyNpZiBVU0UoSU9TVVJGQUNFKQogICAg IGF1dG8gc3VyZmFjZSA9IFdlYkNvcmU6OklPU3VyZmFjZTo6Y3JlYXRlKFdlYkNvcmU6OmV4cGFu ZGVkSW50U2l6ZShzbmFwc2hvdFNpemUpLCBXZWJDb3JlOjpDb2xvclNwYWNlRGV2aWNlUkdCKTsK ICAgICBDQVJlbmRlclNlcnZlclJlbmRlckxheWVyV2l0aFRyYW5zZm9ybShNQUNIX1BPUlRfTlVM TCwgc2VsZi5sYXllci5jb250ZXh0LmNvbnRleHRJZCwgcmVpbnRlcnByZXRfY2FzdDx1aW50NjRf dD4oc2VsZi5sYXllciksIHN1cmZhY2UtPnN1cmZhY2UoKSwgMCwgMCwgJnRyYW5zZm9ybSk7CiAK ICAgICByZXR1cm4gV2ViS2l0OjpWaWV3U25hcHNob3Q6OmNyZWF0ZShudWxscHRyKTsKKyNlbHNl CisgICAgdWludDMyX3Qgc2xvdElEID0gW1dlYktpdDo6Vmlld1NuYXBzaG90U3RvcmU6OnNuYXBz aG90dGluZ0NvbnRleHQoKSBjcmVhdGVJbWFnZVNsb3Q6c25hcHNob3RTaXplIGhhc0FscGhhOllF U107CisKKyAgICBpZiAoIXNsb3RJRCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBD QVJlbmRlclNlcnZlckNhcHR1cmVMYXllcldpdGhUcmFuc2Zvcm0oTUFDSF9QT1JUX05VTEwsIHNl bGYubGF5ZXIuY29udGV4dC5jb250ZXh0SWQsICh1aW50NjRfdClzZWxmLmxheWVyLCBzbG90SUQs IDAsIDAsICZ0cmFuc2Zvcm0pOworICAgIFdlYkNvcmU6OkludFNpemUgaW1hZ2VTaXplID0gV2Vi Q29yZTo6ZXhwYW5kZWRJbnRTaXplKFdlYkNvcmU6OkZsb2F0U2l6ZShzbmFwc2hvdFNpemUpKTsK KyAgICByZXR1cm4gV2ViS2l0OjpWaWV3U25hcHNob3Q6OmNyZWF0ZShzbG90SUQsIGltYWdlU2l6 ZSwgaW1hZ2VTaXplLndpZHRoKCkgKiBpbWFnZVNpemUuaGVpZ2h0KCkgKiA0KTsKKyNlbmRpZgog fQogCiAtICh2b2lkKV96b29tVG9Qb2ludDooV2ViQ29yZTo6RmxvYXRQb2ludClwb2ludCBhdFNj YWxlOihkb3VibGUpc2NhbGUgYW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVy TWFjLm1tCShyZXZpc2lvbiAxODk2MzApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTY3LDcgKzU2 Nyw5IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2UKICAgICAgICAg Q29sb3IgY29yZUNvbG9yID0gc25hcHNob3QtPmJhY2tncm91bmRDb2xvcigpOwogICAgICAgICBp ZiAoY29yZUNvbG9yLmlzVmFsaWQoKSkKICAgICAgICAgICAgIGJhY2tncm91bmRDb2xvciA9IGNh Y2hlZENHQ29sb3IoY29yZUNvbG9yLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyNpZiBVU0UoSU9T VVJGQUNFKQogICAgICAgICBtX2N1cnJlbnRTd2lwZVNuYXBzaG90ID0gc25hcHNob3Q7CisjZW5k aWYKICAgICB9CiAKICAgICBbbV9zd2lwZUxheWVyIHNldEJhY2tncm91bmRDb2xvcjpiYWNrZ3Jv dW5kQ29sb3IuZ2V0KCldOwpAQCAtODE0LDkgKzgxNiwxMSBAQCB2b2lkIFZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6cmVtb3ZlU3dpcGVTCiAgICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0gVmll d0dlc3R1cmVUeXBlOjpTd2lwZSkKICAgICAgICAgcmV0dXJuOwogCisjaWYgVVNFKElPU1VSRkFD RSkKICAgICBpZiAobV9jdXJyZW50U3dpcGVTbmFwc2hvdCAmJiBtX2N1cnJlbnRTd2lwZVNuYXBz aG90LT5zdXJmYWNlKCkpCiAgICAgICAgIG1fY3VycmVudFN3aXBlU25hcHNob3QtPnN1cmZhY2Uo KS0+c2V0SXNWb2xhdGlsZSh0cnVlKTsKICAgICBtX2N1cnJlbnRTd2lwZVNuYXBzaG90ID0gbnVs bHB0cjsKKyNlbmRpZgogCiAgICAgZm9yIChjb25zdCBhdXRvJiBsYXllciA6IG1fY3VycmVudFN3 aXBlTGl2ZUxheWVycykKICAgICAgICAgW2xheWVyIHNldFRyYW5zZm9ybTpDQVRyYW5zZm9ybTNE SWRlbnRpdHldOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25hcHNo b3RTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmll d1NuYXBzaG90U3RvcmUuaAkocmV2aXNpb24gMTg5NjI4KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1 MywxMSBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFZpZXdTbmFwc2hvdCA6IHB1Ymxp YyBSZWZDb3VudGVkPFZpZXdTbmFwc2hvdD4gewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8Vmll d1NuYXBzaG90PiBjcmVhdGUoc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OklPU3VyZmFjZT4pOwor I2lmIFVTRShJT1NVUkZBQ0UpCisgICAgIHN0YXRpYyBSZWY8Vmlld1NuYXBzaG90PiBjcmVhdGUo c3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OklPU3VyZmFjZT4pOworI2Vsc2UKKyAgICBzdGF0aWMg UmVmPFZpZXdTbmFwc2hvdD4gY3JlYXRlKHVpbnQzMl90IHNsb3RJRCwgV2ViQ29yZTo6SW50U2l6 ZSwgc2l6ZV90IGltYWdlU2l6ZUluQnl0ZXMpOworI2VuZGlmCiAKICAgICB+Vmlld1NuYXBzaG90 KCk7CiAKQEAgLTcwLDE3ICs3NCwyOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXREZXZpY2VTY2Fs ZUZhY3RvcihmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcikgeyBtX2RldmljZVNjYWxlRmFjdG9yID0g ZGV2aWNlU2NhbGVGYWN0b3I7IH0KICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0 IHsgcmV0dXJuIG1fZGV2aWNlU2NhbGVGYWN0b3I7IH0KIAorI2lmIFVTRShJT1NVUkZBQ0UpCiAg ICAgV2ViQ29yZTo6SU9TdXJmYWNlKiBzdXJmYWNlKCkgY29uc3QgeyByZXR1cm4gbV9zdXJmYWNl LmdldCgpOyB9CiAKICAgICBzaXplX3QgaW1hZ2VTaXplSW5CeXRlcygpIGNvbnN0IHsgcmV0dXJu IG1fc3VyZmFjZSA/IG1fc3VyZmFjZS0+dG90YWxCeXRlcygpIDogMDsgfQogICAgIFdlYkNvcmU6 OkludFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VyZmFjZSA/IG1fc3VyZmFjZS0+c2l6 ZSgpIDogV2ViQ29yZTo6SW50U2l6ZSgpOyB9CiAKICAgICB2b2lkIHNldFN1cmZhY2Uoc3RkOjp1 bmlxdWVfcHRyPFdlYkNvcmU6OklPU3VyZmFjZT4pOworI2Vsc2UKKyAgICBXZWJDb3JlOjpJbnRT aXplIHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KKyNlbmRpZgogCiBwcml2YXRlOgor I2lmIFVTRShJT1NVUkZBQ0UpCiAgICAgZXhwbGljaXQgVmlld1NuYXBzaG90KHN0ZDo6dW5pcXVl X3B0cjxXZWJDb3JlOjpJT1N1cmZhY2U+KTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3Jl OjpJT1N1cmZhY2U+IG1fc3VyZmFjZTsKKyNlbHNlCisgICAgZXhwbGljaXQgVmlld1NuYXBzaG90 KHVpbnQzMl90IHNsb3RJRCwgV2ViQ29yZTo6SW50U2l6ZSwgc2l6ZV90IGltYWdlU2l6ZUluQnl0 ZXMpOworCisgICAgdWludDMyX3QgbV9zbG90SUQ7CisgICAgc2l6ZV90IG1faW1hZ2VTaXplSW5C eXRlczsKKyAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2l6ZTsKKyNlbmRpZgogCiAgICAgdWludDY0 X3QgbV9yZW5kZXJUcmVlU2l6ZTsKICAgICBmbG9hdCBtX2RldmljZVNjYWxlRmFjdG9yOwpAQCAt MTAwLDYgKzExNiwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRpc2NhcmRTbmFwc2hvdEltYWdl cygpOwogCisjaWYgIVVTRShJT1NVUkZBQ0UpCisgICAgc3RhdGljIENBQ29udGV4dCAqc25hcHNo b3R0aW5nQ29udGV4dCgpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgdm9pZCBkaWRBZGRJbWFn ZVRvU25hcHNob3QoVmlld1NuYXBzaG90Jik7CiAgICAgdm9pZCB3aWxsUmVtb3ZlSW1hZ2VGcm9t U25hcHNob3QoVmlld1NuYXBzaG90Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1ZpZXdTbmFwc2hvdFN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUubW0JKHJldmlzaW9uIDE4OTYyOCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUubW0JKHdvcmtpbmcg Y29weSkKQEAgLTYxLDYgKzYxLDI0IEBAIFZpZXdTbmFwc2hvdFN0b3JlJiBWaWV3U25hcHNob3RT dG9yZTo6c2kKICAgICByZXR1cm4gc3RvcmU7CiB9CiAKKyNpZiAhVVNFKElPU1VSRkFDRSkKK0NB Q29udGV4dCAqVmlld1NuYXBzaG90U3RvcmU6OnNuYXBzaG90dGluZ0NvbnRleHQoKQoreworICAg IHN0YXRpYyBDQUNvbnRleHQgKmNvbnRleHQ7CisgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBv bmNlVG9rZW47CisgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeeworICAgICAgICBOU0Rp Y3Rpb25hcnkgKm9wdGlvbnMgPSBAeworICAgICAgICAgICAga0NBQ29udGV4dERpc3BsYXlOYW1l OiBAIldlYktpdFNuYXBzaG90dGluZyIsCisgICAgICAgICAgICBrQ0FDb250ZXh0SWdub3Jlc0hp dFRlc3Q6IEBZRVMsCisgICAgICAgICAgICBrQ0FDb250ZXh0RGlzcGxheUlkIDogQDIwMDAwCisg ICAgICAgIH07CisgICAgICAgIGNvbnRleHQgPSBbW0NBQ29udGV4dCByZW1vdGVDb250ZXh0V2l0 aE9wdGlvbnM6b3B0aW9uc10gcmV0YWluXTsKKyAgICB9KTsKKworICAgIHJldHVybiBjb250ZXh0 OworfQorI2VuZGlmCisKIHZvaWQgVmlld1NuYXBzaG90U3RvcmU6OmRpZEFkZEltYWdlVG9TbmFw c2hvdChWaWV3U25hcHNob3QmIHNuYXBzaG90KQogewogICAgIGJvb2wgaXNOZXdFbnRyeSA9IG1f c25hcHNob3RzV2l0aEltYWdlcy5hZGQoJnNuYXBzaG90KS5pc05ld0VudHJ5OwpAQCAtMTEzLDEz ICsxMzEsMjcgQEAgdm9pZCBWaWV3U25hcHNob3RTdG9yZTo6ZGlzY2FyZFNuYXBzaG90SQogICAg ICAgICBtX3NuYXBzaG90c1dpdGhJbWFnZXMuZmlyc3QoKS0+Y2xlYXJJbWFnZSgpOwogfQogCisj aWYgVVNFKElPU1VSRkFDRSkKIFJlZjxWaWV3U25hcHNob3Q+IFZpZXdTbmFwc2hvdDo6Y3JlYXRl KHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IHN1cmZhY2UpCiB7CiAgICAgcmV0dXJuIGFkb3B0 UmVmKCpuZXcgVmlld1NuYXBzaG90KFdURjo6bW92ZShzdXJmYWNlKSkpOwogfQorI2Vsc2UKK1Jl ZjxWaWV3U25hcHNob3Q+IFZpZXdTbmFwc2hvdDo6Y3JlYXRlKHVpbnQzMl90IHNsb3RJRCwgSW50 U2l6ZSBzaXplLCBzaXplX3QgaW1hZ2VTaXplSW5CeXRlcykKK3sKKyAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBWaWV3U25hcHNob3Qoc2xvdElELCBzaXplLCBpbWFnZVNpemVJbkJ5dGVzKSk7Cit9 CisjZW5kaWYKIAorI2lmIFVTRShJT1NVUkZBQ0UpCiBWaWV3U25hcHNob3Q6OlZpZXdTbmFwc2hv dChzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBzdXJmYWNlKQogICAgIDogbV9zdXJmYWNlKFdU Rjo6bW92ZShzdXJmYWNlKSkKKyNlbHNlCitWaWV3U25hcHNob3Q6OlZpZXdTbmFwc2hvdCh1aW50 MzJfdCBzbG90SUQsIEludFNpemUgc2l6ZSwgc2l6ZV90IGltYWdlU2l6ZUluQnl0ZXMpCisgICAg OiBtX3Nsb3RJRChzbG90SUQpCisgICAgLCBtX2ltYWdlU2l6ZUluQnl0ZXMoaW1hZ2VTaXplSW5C eXRlcykKKyAgICAsIG1fc2l6ZShzaXplKQorI2VuZGlmCiB7CiAgICAgaWYgKGhhc0ltYWdlKCkp CiAgICAgICAgIFZpZXdTbmFwc2hvdFN0b3JlOjpzaW5nbGV0b24oKS5kaWRBZGRJbWFnZVRvU25h cHNob3QoKnRoaXMpOwpAQCAtMTMwLDYgKzE2Miw3IEBAIFZpZXdTbmFwc2hvdDo6flZpZXdTbmFw c2hvdCgpCiAgICAgY2xlYXJJbWFnZSgpOwogfQogCisjaWYgVVNFKElPU1VSRkFDRSkKIHZvaWQg Vmlld1NuYXBzaG90OjpzZXRTdXJmYWNlKHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpJT1N1cmZh Y2U+IHN1cmZhY2UpCiB7CiAgICAgQVNTRVJUKCFtX3N1cmZhY2UpOwpAQCAtMTQxLDEwICsxNzQs MTUgQEAgdm9pZCBWaWV3U25hcHNob3Q6OnNldFN1cmZhY2Uoc3RkOjp1bmlxdQogICAgIG1fc3Vy ZmFjZSA9IFdURjo6bW92ZShzdXJmYWNlKTsKICAgICBWaWV3U25hcHNob3RTdG9yZTo6c2luZ2xl dG9uKCkuZGlkQWRkSW1hZ2VUb1NuYXBzaG90KCp0aGlzKTsKIH0KKyNlbmRpZgogCiBib29sIFZp ZXdTbmFwc2hvdDo6aGFzSW1hZ2UoKSBjb25zdAogeworI2lmIFVTRShJT1NVUkZBQ0UpCiAgICAg cmV0dXJuICEhbV9zdXJmYWNlOworI2Vsc2UKKyAgICByZXR1cm4gbV9zbG90SUQ7CisjZW5kaWYK IH0KIAogdm9pZCBWaWV3U25hcHNob3Q6OmNsZWFySW1hZ2UoKQpAQCAtMTU0LDExICsxOTIsMTgg QEAgdm9pZCBWaWV3U25hcHNob3Q6OmNsZWFySW1hZ2UoKQogCiAgICAgVmlld1NuYXBzaG90U3Rv cmU6OnNpbmdsZXRvbigpLndpbGxSZW1vdmVJbWFnZUZyb21TbmFwc2hvdCgqdGhpcyk7CiAKKyNp ZiBVU0UoSU9TVVJGQUNFKQogICAgIG1fc3VyZmFjZSA9IG51bGxwdHI7CisjZWxzZQorICAgIFtW aWV3U25hcHNob3RTdG9yZTo6c25hcHNob3R0aW5nQ29udGV4dCgpIGRlbGV0ZVNsb3Q6bV9zbG90 SURdOworICAgIG1fc2xvdElEID0gMDsKKyAgICBtX2ltYWdlU2l6ZUluQnl0ZXMgPSAwOworI2Vu ZGlmCiB9CiAKIGlkIFZpZXdTbmFwc2hvdDo6YXNMYXllckNvbnRlbnRzKCkKIHsKKyNpZiBVU0Uo SU9TVVJGQUNFKQogICAgIGlmICghbV9zdXJmYWNlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK IApAQCAtMTY4LDYgKzIxMyw5IEBAIGlkIFZpZXdTbmFwc2hvdDo6YXNMYXllckNvbnRlbnRzKCkK ICAgICB9CiAKICAgICByZXR1cm4gKGlkKW1fc3VyZmFjZS0+c3VyZmFjZSgpOworI2Vsc2UKKyAg ICByZXR1cm4gW0NBQ29udGV4dCBvYmplY3RGb3JTbG90Om1fc2xvdElEXTsKKyNlbmRpZgogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK