118173 2013-06-28 02:17:32 -0700 [wk2] TiledCoreAnimationDrawingArea should support scrolling its exposed rect 2013-07-01 14:48:43 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca simon.fraser webkit-bug-importer oldest_to_newest 904507 0 thorton 2013-06-28 02:17:32 -0700 Currently we mandate that scrolling must be disabled if we're clipping to the WKView's visible/prepared-content rect, because TCADA doesn't know how to keep the exposed rect offset by the scroll position as it should. But, it can! 904508 1 webkit-bug-importer 2013-06-28 02:18:02 -0700 <rdar://problem/14301166> 904532 2 205688 thorton 2013-06-28 03:11:51 -0700 Created attachment 205688 preliminary 904797 3 205755 thorton 2013-06-28 16:30:19 -0700 Created attachment 205755 patch 904802 4 205755 sam 2013-06-28 16:47:23 -0700 Comment on attachment 205755 patch View in context: https://bugs.webkit.org/attachment.cgi?id=205755&action=review > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:441 > + for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) > + if (TiledBacking* tiledBacking = it->value->tiledBacking()) > + tiledBacking->setExposedRect(m_scrolledExposedRect); Braces please. 904807 5 205755 thorton 2013-06-28 16:57:52 -0700 Comment on attachment 205755 patch View in context: https://bugs.webkit.org/attachment.cgi?id=205755&action=review >> Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:441 >> + tiledBacking->setExposedRect(m_scrolledExposedRect); > > Braces please. Indeed. 905151 6 thorton 2013-07-01 14:48:43 -0700 http://trac.webkit.org/changeset/152266 205688 2013-06-28 03:11:51 -0700 2013-06-28 16:30:19 -0700 preliminary cliptovisible-scroll.diff text/plain 5156 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCA3ZTJhZDAzLi5l NDQwYWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC0x MTEsNiArMTExLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgdXBkYXRlSW50cmluc2ljQ29udGVu dFNpemVUaW1lckZpcmVkKFdlYkNvcmU6OlRpbWVyPFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhPiopOwogICAgIHZvaWQgdXBkYXRlTWFpbkZyYW1lQ2xpcHNUb0V4cG9zZWRSZWN0KCk7Cisg ICAgdm9pZCB1cGRhdGVTY3JvbGxlZEV4cG9zZWRSZWN0KCk7CiAgICAgCiAgICAgdm9pZCBpbnZh bGlkYXRlQWxsUGFnZU92ZXJsYXlzKCk7CiAKQEAgLTEzMiw2ICsxMzMsNyBAQCBwcml2YXRlOgog ICAgIGJvb2wgbV9oYXNSb290Q29tcG9zaXRpbmdMYXllcjsKIAogICAgIFdlYkNvcmU6OkZsb2F0 UmVjdCBtX2V4cG9zZWRSZWN0OworICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3Njcm9sbGVkRXhw b3NlZFJlY3Q7CiAgICAgYm9vbCBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKIAogICAgIFdlYkNvcmU6 OkludFNpemUgbV9sYXN0U2VudEludHJpbnNpY0NvbnRlbnRTaXplOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggZTM0YjdkNi4uODNiNzk3OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC0xMTIsNiArMTEyLDcg QEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0TmVlZHNEaXNwbGF5SW5S ZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWE6OnNjcm9sbChjb25zdCBJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBJbnRTaXplJiBz Y3JvbGxEZWx0YSkKIHsKKyAgICB1cGRhdGVTY3JvbGxlZEV4cG9zZWRSZWN0KCk7CiB9CiAKIHZv aWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmludmFsaWRhdGVBbGxQYWdlT3Zlcmxh eXMoKQpAQCAtMzUwLDggKzM1MSw4IEBAIGJvb2wgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWE6OmZsdXNoTGF5ZXJzKCkKICAgICB9CiAKICAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gZW5j bG9zaW5nSW50UmVjdChtX3Jvb3RMYXllci5nZXQoKS5mcmFtZSk7Ci0gICAgICAgIHZpc2libGVS ZWN0LmludGVyc2VjdChlbmNsb3NpbmdJbnRSZWN0KG1fZXhwb3NlZFJlY3QpKTsKICAgICBpZiAo bV9jbGlwc1RvRXhwb3NlZFJlY3QpCisgICAgICAgIHZpc2libGVSZWN0LmludGVyc2VjdChlbmNs b3NpbmdJbnRSZWN0KG1fc2Nyb2xsZWRFeHBvc2VkUmVjdCkpOwogICAgIGZvciAoUGFnZU92ZXJs YXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCksIGVu ZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAg ICBHcmFwaGljc0xheWVyKiBsYXllciA9IGl0LT52YWx1ZS5nZXQoKTsKICAgICAgICAgbGF5ZXIt PmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSh2aXNpYmxlUmVjdCk7CkBAIC00MDMsMjIgKzQwNCw0MiBA QCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpyZXN1bWVQYWludGluZygpCiAK IHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldEV4cG9zZWRSZWN0KGNvbnN0 IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3QpCiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJl IG1hcHBlZCB0aHJvdWdoIHRoZSBzY3JvbGwgb2Zmc2V0LCBidXQgd2UgbmVlZCB0byBrZWVwIGl0 IHVwIHRvIGRhdGUuCiAgICAgbV9leHBvc2VkUmVjdCA9IGV4cG9zZWRSZWN0OwotCi0gICAgbWFp bkZyYW1lVGlsZWRCYWNraW5nKCktPnNldEV4cG9zZWRSZWN0KGV4cG9zZWRSZWN0KTsKLQotICAg IGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5 ZXJzLmJlZ2luKCksIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9IGVuZDsg KytpdCkKLSAgICAgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gaXQtPnZhbHVl LT50aWxlZEJhY2tpbmcoKSkKLSAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0RXhwb3NlZFJl Y3QoZXhwb3NlZFJlY3QpOworICAgIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKTsKIH0KIAog dm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Q2xpcHNUb0V4cG9zZWRSZWN0 KGJvb2wgY2xpcHNUb0V4cG9zZWRSZWN0KQogewogICAgIG1fY2xpcHNUb0V4cG9zZWRSZWN0ID0g Y2xpcHNUb0V4cG9zZWRSZWN0OworICAgIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKTsKICAg ICB1cGRhdGVNYWluRnJhbWVDbGlwc1RvRXhwb3NlZFJlY3QoKTsKIH0KIAordm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpCit7Cisg ICAgaWYgKCFtX2NsaXBzVG9FeHBvc2VkUmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgRnJh bWUqIGZyYW1lID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKTsKKyAgICBpZiAo IWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGZy YW1lLT52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAg IEludFBvaW50IHNjcm9sbFBvc2l0aW9uV2l0aE9yaWdpbiA9IGZyYW1lVmlldy0+c2Nyb2xsUG9z aXRpb24oKSArIHRvSW50U2l6ZShmcmFtZVZpZXctPnNjcm9sbE9yaWdpbigpKTsKKworICAgIG1f c2Nyb2xsZWRFeHBvc2VkUmVjdCA9IG1fZXhwb3NlZFJlY3Q7CisgICAgbV9zY3JvbGxlZEV4cG9z ZWRSZWN0Lm1vdmVCeShzY3JvbGxQb3NpdGlvbldpdGhPcmlnaW4pOworCisgICAgbWFpbkZyYW1l VGlsZWRCYWNraW5nKCktPnNldEV4cG9zZWRSZWN0KG1fc2Nyb2xsZWRFeHBvc2VkUmVjdCk7CisK KyAgICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3Zlcmxh eUxheWVycy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBl bmQ7ICsraXQpCisgICAgICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IGl0LT52 YWx1ZS0+dGlsZWRCYWNraW5nKCkpCisgICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9z ZWRSZWN0KG1fc2Nyb2xsZWRFeHBvc2VkUmVjdCk7Cit9CisKIHZvaWQgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIHZpZXdTaXplLCBj b25zdCBJbnRTaXplJiBsYXllclBvc2l0aW9uKQogewogICAgIG1faW5VcGRhdGVHZW9tZXRyeSA9 IHRydWU7CkBAIC01NjQsNyArNTg1LDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYTo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoQ0FMYXllciAqbGF5ZXIpCiAKICAgICBpZiAo VGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKSkgewog ICAgICAgICB0aWxlZEJhY2tpbmctPnNldEFnZ3Jlc3NpdmVseVJldGFpbnNUaWxlcyhtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCktPmFnZ3Jlc3NpdmVUaWxlUmV0ZW50aW9uRW5hYmxl ZCgpKTsKLSAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX2V4cG9zZWRSZWN0 KTsKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX3Njcm9sbGVkRXhwb3Nl ZFJlY3QpOwogICAgIH0KIAogICAgIHVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVjdCgp OwpAQCAtNTg4LDcgKzYwOSw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6 OmNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoUGFnZU92ZXJsYXkqIHBhZ2VPdmVyCiAgICAgbV9wYWdl T3ZlcmxheVBsYXRmb3JtTGF5ZXJzLnNldChsYXllci5nZXQoKSwgbGF5ZXItPnBsYXRmb3JtTGF5 ZXIoKSk7CiAKICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBsYXllci0+dGls ZWRCYWNraW5nKCkpIHsKLSAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX2V4 cG9zZWRSZWN0KTsKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX3Njcm9s bGVkRXhwb3NlZFJlY3QpOwogICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2Vk UmVjdChtX2NsaXBzVG9FeHBvc2VkUmVjdCk7CiAgICAgfQogCkBAIC02MzYsNyArNjU3LDcgQEAg dm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6ZGlkQ29tbWl0Q2hhbmdlc0Zvckxh eWVyKGNvbnN0IEdyYXBoaWNzTGF5ZXIKICAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogCiAg ICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbGF5ZXItPnRpbGVkQmFja2luZygp KSB7Ci0gICAgICAgIHRpbGVkQmFja2luZy0+c2V0RXhwb3NlZFJlY3QobV9leHBvc2VkUmVjdCk7 CisgICAgICAgIHRpbGVkQmFja2luZy0+c2V0RXhwb3NlZFJlY3QobV9zY3JvbGxlZEV4cG9zZWRS ZWN0KTsKICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QobV9jbGlw c1RvRXhwb3NlZFJlY3QpOwogICAgIH0KIAo= 205755 2013-06-28 16:30:19 -0700 2013-07-01 14:45:54 -0700 patch cliptovisible-scroll.diff text/plain 7447 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZjA5MzViLi5lNGNjMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQg QEAKIDIwMTMtMDYtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgW3drMl0gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEgc2hvdWxkIHN1cHBv cnQgc2Nyb2xsaW5nIGl0cyBleHBvc2VkIHJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODE3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTQz MDExNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg T2Zmc2V0IHRoZSBleHBvc2VkIHJlY3QgcGFzc2VkIGZyb20gdGhlIFdLVmlldyBieSB0aGUgbWFp biBmcmFtZSdzIGN1cnJlbnQgc2Nyb2xsIHBvc2l0aW9uCisgICAgICAgIGJlZm9yZSBzZW5kaW5n IGl0IHRvIG91ciBUaWxlZEJhY2tpbmdzLCBzbyB0aGF0IGl0IGlzIGluIHRoZSBzYW1lIGNvb3Jk aW5hdGUgc3BhY2UgYXMgdGhlaXIKKyAgICAgICAgb3JkaW5hcnkgdmlzaWJsZVJlY3RzLgorCisg ICAgICAgIFRoaXMgaGFzIHRoZSBzaWRlIGVmZmVjdCBvZiBtYWtpbmcgY2xpcHMtdG8tZXhwb3Nl ZC1yZWN0IHRlc3RhYmxlICh0aG91Z2ggdXNlbGVzcykgaW4gU2FmYXJpLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oOgor ICAgICAgICBBZGQgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpIGFuZCBtX3Njcm9sbGVkRXhw b3NlZFJlY3QuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6c2Nyb2xsKToKKyAgICAgICAgQ2FsbCB1cGRhdGVTY3JvbGxlZEV4cG9z ZWRSZWN0IHdoZW4gdGhlIG1haW4gZnJhbWUgc2Nyb2xscy4KKworICAgICAgICAoV2ViS2l0OjpU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0RXhwb3NlZFJlY3QpOgorICAgICAgICBS ZW1vdmUgYSBGSVhNRSBhYm91dCB0aGlzIGNoYW5nZS4KKyAgICAgICAgQ2FsbCB1cGRhdGVTY3Jv bGxlZEV4cG9zZWRSZWN0IGluc3RlYWQgb2YgcGFzc2luZyBkb3duIHRoZSB1bnNjcm9sbGVkIHJl Y3QuCisKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNl dENsaXBzVG9FeHBvc2VkUmVjdCk6CisgICAgICAgIENhbGwgdXBkYXRlU2Nyb2xsZWRFeHBvc2Vk UmVjdCwgYmVjYXVzZSB0aGF0IG1ldGhvZCB3aWxsIHNob3J0LWNpcmN1aXQgaWYKKyAgICAgICAg c2V0Q2xpcHNUb0V4cG9zZWRSZWN0IGlzIGZhbHNlLCBzbyB3ZSBuZWVkIHRvIHVwZGF0ZSBoZXJl IGZvciBjb3JyZWN0bmVzcworICAgICAgICBpZiB3ZSBnZXQgYSBzZXRFeHBvc2VkUmVjdCgpLCBz ZXRDbGlwc1RvRXhwb3NlZFJlY3QodHJ1ZSkgcGFpci4KKworICAgICAgICAoV2ViS2l0OjpUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCk6Cisg ICAgICAgIFVwZGF0ZSBtX3Njcm9sbGVkRXhwb3NlZFJlY3QgYW5kIHByb3BhZ2F0ZSBpdCB0byBv dXIgVGlsZWRCYWNraW5ncy4KKworICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYTo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIpOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Y3JlYXRlUGFnZU92ZXJsYXlMYXll cik6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpkaWRD b21taXRDaGFuZ2VzRm9yTGF5ZXIpOgorICAgICAgICBVc2UgdGhlIHNjcm9sbGVkIGV4cG9zZWQg cmVjdC4KKworMjAxMy0wNi0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKwogICAgICAgICBbd2syXSBXS1ZpZXcgc2hvdWxkbid0IGZvcmNlIHNjcm9sbGluZyBvZmYg aWYgc2hvdWxkQ2xpcFRvVmlzaWJsZVJlY3QgaXMgc2V0CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgxNzQKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzE0MzAxMTc1PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmluZGV4 IDdlMmFkMDMuLmU0NDBhZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhLmgKQEAgLTExMSw2ICsxMTEsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVJbnRy aW5zaWNDb250ZW50U2l6ZVRpbWVyRmlyZWQoV2ViQ29yZTo6VGltZXI8VGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE+Kik7CiAgICAgdm9pZCB1cGRhdGVNYWluRnJhbWVDbGlwc1RvRXhwb3Nl ZFJlY3QoKTsKKyAgICB2b2lkIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKTsKICAgICAKICAg ICB2b2lkIGludmFsaWRhdGVBbGxQYWdlT3ZlcmxheXMoKTsKIApAQCAtMTMyLDYgKzEzMyw3IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc1Jvb3RDb21wb3NpdGluZ0xheWVyOwogCiAgICAgV2Vi Q29yZTo6RmxvYXRSZWN0IG1fZXhwb3NlZFJlY3Q7CisgICAgV2ViQ29yZTo6RmxvYXRSZWN0IG1f c2Nyb2xsZWRFeHBvc2VkUmVjdDsKICAgICBib29sIG1fY2xpcHNUb0V4cG9zZWRSZWN0OwogCiAg ICAgV2ViQ29yZTo6SW50U2l6ZSBtX2xhc3RTZW50SW50cmluc2ljQ29udGVudFNpemU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCAzNGYyN2Y3Li5iM2Ni ZTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTEx Miw2ICsxMTIsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzZXROZWVk c0Rpc3BsYXlJblJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIAogdm9pZCBUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYTo6c2Nyb2xsKGNvbnN0IEludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0 IEludFNpemUmIHNjcm9sbERlbHRhKQogeworICAgIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3Qo KTsKIH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6aW52YWxpZGF0ZUFs bFBhZ2VPdmVybGF5cygpCkBAIC0zNTEsNyArMzUyLDcgQEAgYm9vbCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMoKQogCiAgICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9 IGVuY2xvc2luZ0ludFJlY3QobV9yb290TGF5ZXIuZ2V0KCkuZnJhbWUpOwogICAgIGlmIChtX2Ns aXBzVG9FeHBvc2VkUmVjdCkKLSAgICAgICAgdmlzaWJsZVJlY3QuaW50ZXJzZWN0KGVuY2xvc2lu Z0ludFJlY3QobV9leHBvc2VkUmVjdCkpOworICAgICAgICB2aXNpYmxlUmVjdC5pbnRlcnNlY3Qo ZW5jbG9zaW5nSW50UmVjdChtX3Njcm9sbGVkRXhwb3NlZFJlY3QpKTsKIAogICAgIGZvciAoUGFn ZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2lu KCksIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewog ICAgICAgICBHcmFwaGljc0xheWVyKiBsYXllciA9IGl0LT52YWx1ZS5nZXQoKTsKQEAgLTQwNCwy MiArNDA1LDQyIEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnJlc3VtZVBh aW50aW5nKCkKIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0RXhwb3Nl ZFJlY3QoY29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCkKIHsKLSAgICAvLyBGSVhNRTogVGhp cyBzaG91bGQgYmUgbWFwcGVkIHRocm91Z2ggdGhlIHNjcm9sbCBvZmZzZXQsIGJ1dCB3ZSBuZWVk IHRvIGtlZXAgaXQgdXAgdG8gZGF0ZS4KICAgICBtX2V4cG9zZWRSZWN0ID0gZXhwb3NlZFJlY3Q7 Ci0KLSAgICBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKS0+c2V0RXhwb3NlZFJlY3QoZXhwb3NlZFJl Y3QpOwotCi0gICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFn ZU92ZXJsYXlMYXllcnMuYmVnaW4oKSwgZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KQotICAgICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcg PSBpdC0+dmFsdWUtPnRpbGVkQmFja2luZygpKQotICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5z ZXRFeHBvc2VkUmVjdChleHBvc2VkUmVjdCk7CisgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVj dCgpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzZXRDbGlwc1Rv RXhwb3NlZFJlY3QoYm9vbCBjbGlwc1RvRXhwb3NlZFJlY3QpCiB7CiAgICAgbV9jbGlwc1RvRXhw b3NlZFJlY3QgPSBjbGlwc1RvRXhwb3NlZFJlY3Q7CisgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2Vk UmVjdCgpOwogICAgIHVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVjdCgpOwogfQogCit2 b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVTY3JvbGxlZEV4cG9zZWRS ZWN0KCkKK3sKKyAgICBpZiAoIW1fY2xpcHNUb0V4cG9zZWRSZWN0KQorICAgICAgICByZXR1cm47 CisKKyAgICBGcmFtZSogZnJhbWUgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgp OworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lVmlldyogZnJh bWVWaWV3ID0gZnJhbWUtPnZpZXcoKTsKKyAgICBpZiAoIWZyYW1lVmlldykKKyAgICAgICAgcmV0 dXJuOworCisgICAgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb25XaXRoT3JpZ2luID0gZnJhbWVWaWV3 LT5zY3JvbGxQb3NpdGlvbigpICsgdG9JbnRTaXplKGZyYW1lVmlldy0+c2Nyb2xsT3JpZ2luKCkp OworCisgICAgbV9zY3JvbGxlZEV4cG9zZWRSZWN0ID0gbV9leHBvc2VkUmVjdDsKKyAgICBtX3Nj cm9sbGVkRXhwb3NlZFJlY3QubW92ZUJ5KHNjcm9sbFBvc2l0aW9uV2l0aE9yaWdpbik7CisKKyAg ICBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKS0+c2V0RXhwb3NlZFJlY3QobV9zY3JvbGxlZEV4cG9z ZWRSZWN0KTsKKworICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBt X3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCksIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5k KCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNr aW5nID0gaXQtPnZhbHVlLT50aWxlZEJhY2tpbmcoKSkKKyAgICAgICAgICAgIHRpbGVkQmFja2lu Zy0+c2V0RXhwb3NlZFJlY3QobV9zY3JvbGxlZEV4cG9zZWRSZWN0KTsKK30KKwogdm9pZCBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlR2VvbWV0cnkoY29uc3QgSW50U2l6ZSYg dmlld1NpemUsIGNvbnN0IEludFNpemUmIGxheWVyUG9zaXRpb24pCiB7CiAgICAgbV9pblVwZGF0 ZUdlb21ldHJ5ID0gdHJ1ZTsKQEAgLTU2NSw3ICs1ODYsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihDQUxheWVyICpsYXllcikK IAogICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IG1haW5GcmFtZVRpbGVkQmFj a2luZygpKSB7CiAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0QWdncmVzc2l2ZWx5UmV0YWluc1Rp bGVzKG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3MoKS0+YWdncmVzc2l2ZVRpbGVSZXRl bnRpb25FbmFibGVkKCkpOwotICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KG1f ZXhwb3NlZFJlY3QpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KG1fc2Ny b2xsZWRFeHBvc2VkUmVjdCk7CiAgICAgfQogCiAgICAgdXBkYXRlTWFpbkZyYW1lQ2xpcHNUb0V4 cG9zZWRSZWN0KCk7CkBAIC01ODksNyArNjEwLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcihQYWdlT3ZlcmxheSogcGFnZU92ZXIK ICAgICBtX3BhZ2VPdmVybGF5UGxhdGZvcm1MYXllcnMuc2V0KGxheWVyLmdldCgpLCBsYXllci0+ cGxhdGZvcm1MYXllcigpKTsKIAogICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9 IGxheWVyLT50aWxlZEJhY2tpbmcoKSkgewotICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9z ZWRSZWN0KG1fZXhwb3NlZFJlY3QpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRS ZWN0KG1fc2Nyb2xsZWRFeHBvc2VkUmVjdCk7CiAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xp cHNUb0V4cG9zZWRSZWN0KG1fY2xpcHNUb0V4cG9zZWRSZWN0KTsKICAgICB9CiAKQEAgLTYzNyw3 ICs2NTgsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpkaWRDb21taXRD aGFuZ2VzRm9yTGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllcgogICAgIFtDQVRyYW5zYWN0aW9uIGNv bW1pdF07CiAKICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBsYXllci0+dGls ZWRCYWNraW5nKCkpIHsKLSAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX2V4 cG9zZWRSZWN0KTsKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX3Njcm9s bGVkRXhwb3NlZFJlY3QpOwogICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2Vk UmVjdChtX2NsaXBzVG9FeHBvc2VkUmVjdCk7CiAgICAgfQogCg==