158564 2016-06-09 05:56:49 -0700 [Threaded Compositor] Content and viewport sizes are mixed 2016-06-10 05:56:51 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 154070 1 cgarcia webkit-unassigned bugs-noreply yoon zan oldest_to_newest 1200818 0 cgarcia 2016-06-09 05:56:49 -0700 So, in ThreadedCoordinatedLayerTreeHost we have: - sizeDidChange: called when the main frame contents size changes, but that changes also the coordinator size - viewportSizeChanged: called when the viewport size changes, but doesn't change the coordinator size this is very confusing not only because we are mixing both sizes, but also because sizeDidChange is used in all other layer tree host implementations as the viewport size. 1200822 1 280916 cgarcia 2016-06-09 06:02:39 -0700 Created attachment 280916 Patch 1201198 2 280916 zan 2016-06-10 01:19:57 -0700 Comment on attachment 280916 Patch OK if Yoon approves. 1201213 3 280916 yoon 2016-06-10 05:24:21 -0700 Comment on attachment 280916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=280916&action=review > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:143 > +void ThreadedCoordinatedLayerTreeHost::contentsSizeChanged(const WebCore::IntSize& newSize) I like this change which makes more clear. > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:172 > +void ThreadedCoordinatedLayerTreeHost::sizeDidChange(const WebCore::IntSize& size) But I think it would be better to use viewportSizeChanged, which provide more clear idea. In this change, we will send same size to the CompositingCoordinator and Compositor which implies our contents size and viewport sile will be same all the time. But it is not true when we are in the fixed layout. 1201214 4 cgarcia 2016-06-10 05:29:25 -0700 (In reply to comment #3) > Comment on attachment 280916 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=280916&action=review > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:143 > > +void ThreadedCoordinatedLayerTreeHost::contentsSizeChanged(const WebCore::IntSize& newSize) > > I like this change which makes more clear. > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:172 > > +void ThreadedCoordinatedLayerTreeHost::sizeDidChange(const WebCore::IntSize& size) > > But I think it would be better to use viewportSizeChanged, which provide > more clear idea. > In this change, we will send same size to the CompositingCoordinator and > Compositor which implies > our contents size and viewport sile will be same all the time. > But it is not true when we are in the fixed layout. Current code is what is confusing, because it uses a different name than all other LayerTreeHost implementation, and requires to add #ifdefed code to the drawing area code. There's a check to only update the size when the contents size changes in case of fixed layout. 1201223 5 cgarcia 2016-06-10 05:56:51 -0700 Committed r201923: <http://trac.webkit.org/changeset/201923> 280916 2016-06-09 06:02:39 -0700 2016-06-10 01:19:57 -0700 Patch wk2-tc-sizes-mess.diff text/plain 8177 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZGU1MDk3Li5kNDMwYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTYtMDYtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtUaHJlYWRlZCBDb21wb3NpdG9yXSBDb250ZW50IGFuZCB2aWV3cG9ydCBz aXplcyBhcmUgbWl4ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1ODU2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1ha2UgVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OnNpemVEaWRDaGFu Z2UoKSB1cGRhdGUgdGhlIHZpZXdwb3J0IHNpemUgZm9yIGNvbnNpc3RlbmN5IHdpdGggYWxsIG90 aGVyCisgICAgICAgIExheWVyVHJlZUhvc3QgaW1wbGVtZW50YXRpb25zIGFuZCByZW5hbWUgdmll d3BvcnRTaXplQ2hhbmdlZCgpIGFzIGNvbnRlbnRzU2l6ZUNoYW5nZWQoKSBhbmQgdXBkYXRlIHRo ZSBjb250ZW50cworICAgICAgICBzaXplLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVD bGllbnQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQpOiBSZW1vdmUgaWZkZWZlZCBjb2RlIGhlcmUsIHRo ZSBkcmF3aW5nIGFyZWEgaXMgbm90aWZpZWQgdHdvIGxpbmVzIGJlbG93LgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkRHJhd2luZ0Fy ZWEuY3BwOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdpbmdBcmVhOjptYWluRnJh bWVDb250ZW50U2l6ZUNoYW5nZWQpOiBVcGRhdGUgdGhlIHZpZXdwb3J0IHNpemUgdG8gdGhlIGNv bnRlbnRzIHNpemUKKyAgICAgICAgb25seSB3aGVuIHVzaW5nIGEgZml4ZWQgbGF5b3V0IGhlcmUg aW5zdGVhZCBvZiBpbiBjcm9zcy1wbGF0Zm9ybSBjb2RlLgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1RocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVI b3N0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhv c3Q6OmNvbnRlbnRzU2l6ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvb3Jk aW5hdGVkTGF5ZXJUcmVlSG9zdDo6c2l6ZURpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OlRo cmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0Ojp2aWV3cG9ydFNpemVDaGFuZ2VkKTogRGVs ZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9U aHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl YUltcGw6Om1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZCk6IENhbGwgTGF5ZXJUcmVlSG9zdDo6 Y29udGVudHNTaXplQ2hhbmdlZCgpLgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6 OnVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKTogUmVtb3ZlIGlmZGVmZWQgY29kZSBmb3IgdGhlIHRo cmVhZGVjZCBjb21wb3NpdG9yIHNpbmNlIGl0J3MKKyAgICAgICAgbm93IGNvbnNpc3RlbnQgd2l0 aCBhbGwgb3RoZXIgTGF5ZXJUcmVlSG9zdCBpbXBsZW1lbnRhdGlvbnMuCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaDoKKworMjAxNi0wNi0wOSAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW1RocmVhZGVkIENv bXBvc2l0b3JdIE1ha2UgaXQgY2xlYXIgdGhhdCBjb21wb3NpdGluZyB0aHJlYWQgb3BlcmF0aW9u cyBhcmUgYWx3YXlzIHNjaGVkdWxlZCBmcm9tIHRoZSBtYWluIHRocmVhZAogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTYyCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50LmNwcAppbmRleCA1MTk1M2VkLi4xNTI2NTJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50 LmNwcApAQCAtNTEwLDExICs1MTAsNiBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6Y29udGVudHNT aXplQ2hhbmdlZChGcmFtZSogZnJhbWUsIGNvbnN0IEludFNpemUmIHNpemUpIGNvbgogICAgIGlm ICgmZnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCkgIT0gZnJhbWUpCiAgICAgICAgIHJldHVybjsK IAotI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKLSAgICBpZiAobV9wYWdlLT51c2VGaXhl ZExheW91dCgpKQotICAgICAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPmxheWVyVHJlZUhvc3Qo KS0+c2l6ZURpZENoYW5nZShzaXplKTsKLSNlbmRpZgotCiAgICAgbV9wYWdlLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZUNvbnRlbnRTaXplKHNpemUpKTsKIAogICAgIG1f cGFnZS0+ZHJhd2luZ0FyZWEoKS0+bWFpbkZyYW1lQ29udGVudFNpemVDaGFuZ2VkKHNpemUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVh LmNwcAppbmRleCBjZGYyZmFiLi5jYTExMDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdB cmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhLmNwcApAQCAtMTUxLDggKzE1MSwxMCBA QCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWE6OnVwZGF0ZVByZWZlcmVuY2VzKGNvbnN0IFdl YlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogICAgIG1fd2ViUGFnZS5jb3JlUGFnZSgpLT5zZXR0 aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShX ZWJQcmVmZXJlbmNlc0tleTo6Zm9yY2VDb21wb3NpdGluZ01vZGVLZXkoKSkpOwogfQogCi12b2lk IENvb3JkaW5hdGVkRHJhd2luZ0FyZWE6Om1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZChjb25z dCBXZWJDb3JlOjpJbnRTaXplJikKK3ZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYTo6bWFpbkZy YW1lQ29udGVudFNpemVDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpCiB7Cisg ICAgaWYgKG1fd2ViUGFnZS51c2VGaXhlZExheW91dCgpKQorICAgICAgICBtX2xheWVyVHJlZUhv c3QtPnNpemVEaWRDaGFuZ2Uoc2l6ZSk7CiAgICAgbV93ZWJQYWdlLm1haW5GcmFtZSgpLT5wYWdl T3ZlcmxheUNvbnRyb2xsZXIoKS5kaWRDaGFuZ2VEb2N1bWVudFNpemUoKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRDb29yZGluYXRl ZExheWVyVHJlZUhvc3QuY3BwCmluZGV4IDRkNWZjYWMuLjVkMWM3ZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1RocmVh ZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9UaHJlYWRlZENvb3JkaW5hdGVkTGF5 ZXJUcmVlSG9zdC5jcHAKQEAgLTE0MCw5ICsxNDAsMTAgQEAgYm9vbCBUaHJlYWRlZENvb3JkaW5h dGVkTGF5ZXJUcmVlSG9zdDo6Zm9yY2VSZXBhaW50QXN5bmModWludDY0X3QgY2FsbGJhY2tJRCkK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBUaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVl SG9zdDo6c2l6ZURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBuZXdTaXplKQordm9p ZCBUaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6Y29udGVudHNTaXplQ2hhbmdlZChj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBuZXdTaXplKQogewotICAgIG1fY29vcmRpbmF0b3ItPnNp emVEaWRDaGFuZ2UobmV3U2l6ZSk7CisgICAgaWYgKG1fd2ViUGFnZS51c2VGaXhlZExheW91dCgp KQorICAgICAgICBtX2Nvb3JkaW5hdG9yLT5zaXplRGlkQ2hhbmdlKG5ld1NpemUpOwogICAgIG1f Y29tcG9zaXRvci0+ZGlkQ2hhbmdlQ29udGVudHNTaXplKG5ld1NpemUpOwogfQogCkBAIC0xNjgs OCArMTY5LDkgQEAgR3JhcGhpY3NMYXllckZhY3RvcnkqIFRocmVhZGVkQ29vcmRpbmF0ZWRMYXll clRyZWVIb3N0OjpncmFwaGljc0xheWVyRmFjdG9yeSgpCiAgICAgcmV0dXJuIG1fY29vcmRpbmF0 b3IuZ2V0KCk7CiB9CiAKLXZvaWQgVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OnZp ZXdwb3J0U2l6ZUNoYW5nZWQoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSkKK3ZvaWQgVGhy ZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OnNpemVEaWRDaGFuZ2UoY29uc3QgV2ViQ29y ZTo6SW50U2l6ZSYgc2l6ZSkKIHsKKyAgICBtX2Nvb3JkaW5hdG9yLT5zaXplRGlkQ2hhbmdlKHNp emUpOwogICAgIG1fY29tcG9zaXRvci0+ZGlkQ2hhbmdlVmlld3BvcnRTaXplKHNpemUpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9UaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRDb29y ZGluYXRlZExheWVyVHJlZUhvc3QuaAppbmRleCBjZWQ4MzI4Li41NGRjMjE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9U aHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1RocmVhZGVkQ29vcmRpbmF0ZWRM YXllclRyZWVIb3N0LmgKQEAgLTc3LDcgKzc3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2Nyb2xs Tm9uQ29tcG9zaXRlZENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3Qp IG92ZXJyaWRlOwogICAgIHZvaWQgZm9yY2VSZXBhaW50KCkgb3ZlcnJpZGU7CiAgICAgYm9vbCBm b3JjZVJlcGFpbnRBc3luYyh1aW50NjRfdCAvKmNhbGxiYWNrSUQqLykgb3ZlcnJpZGU7Ci0gICAg dm9pZCBzaXplRGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIG5ld1NpemUpIG92ZXJy aWRlOworICAgIHZvaWQgc2l6ZURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgb3Zl cnJpZGU7CiAgICAgdm9pZCBkZXZpY2VPclBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKSBvdmVycmlk ZTsKIAogICAgIHZvaWQgcGF1c2VSZW5kZXJpbmcoKSBvdmVycmlkZTsKQEAgLTg2LDcgKzg2LDcg QEAgcHVibGljOgogICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBncmFwaGljc0xh eWVyRmFjdG9yeSgpIG92ZXJyaWRlOwogICAgIHZvaWQgcGFnZUJhY2tncm91bmRUcmFuc3BhcmVu Y3lDaGFuZ2VkKCkgb3ZlcnJpZGUgeyB9OwogCi0gICAgdm9pZCB2aWV3cG9ydFNpemVDaGFuZ2Vk KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSBvdmVycmlkZTsKKyAgICB2b2lkIGNvbnRlbnRzU2l6 ZUNoYW5nZWQoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlk Q2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRl cyYpIG92ZXJyaWRlOwogCiAjaWYgUExBVEZPUk0oR1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcAppbmRleCA1ODRhZWYz Li42NzMzMTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWFJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWFJbXBsLmNwcApAQCAtMjMwLDcgKzIzMCw3IEBAIHZvaWQgRHJhd2luZ0Fy ZWFJbXBsOjptYWluRnJhbWVDb250ZW50U2l6ZUNoYW5nZWQoY29uc3QgV2ViQ29yZTo6SW50U2l6 ZSYgbmV3U2l6CiB7CiAjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTX1RIUkVBREVEKQogICAg IGlmIChtX2xheWVyVHJlZUhvc3QpCi0gICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2l6ZURpZENo YW5nZShuZXdTaXplKTsKKyAgICAgICAgbV9sYXllclRyZWVIb3N0LT5jb250ZW50c1NpemVDaGFu Z2VkKG5ld1NpemUpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0obmV3U2l6ZSk7CiAjZW5kaWYK QEAgLTM0OSwxMyArMzQ5LDkgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OnVwZGF0ZUJhY2tpbmdT dG9yZVN0YXRlKHVpbnQ2NF90IHN0YXRlSUQsIGJvb2wgcmVzcG9uZEltbWUKICAgICAgICAgbV93 ZWJQYWdlLmxheW91dElmTmVlZGVkKCk7CiAgICAgICAgIG1fd2ViUGFnZS5zY3JvbGxNYWluRnJh bWVJZk5vdEF0TWF4U2Nyb2xsUG9zaXRpb24oc2Nyb2xsT2Zmc2V0KTsKIAotICAgICAgICBpZiAo bV9sYXllclRyZWVIb3N0KSB7Ci0jaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTX1RIUkVBREVE KQotICAgICAgICAgICAgbV9sYXllclRyZWVIb3N0LT52aWV3cG9ydFNpemVDaGFuZ2VkKG1fd2Vi UGFnZS5zaXplKCkpOwotI2Vsc2UKKyAgICAgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkKICAgICAg ICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2l6ZURpZENoYW5nZShtX3dlYlBhZ2Uuc2l6ZSgpKTsK LSNlbmRpZgotICAgICAgICB9IGVsc2UKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9kaXJ0 eVJlZ2lvbiA9IG1fd2ViUGFnZS5ib3VuZHMoKTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NF UlQoc2l6ZSA9PSBtX3dlYlBhZ2Uuc2l6ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDczYmQ5MWUuLjIxYmY5MTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3Qu aApAQCAtODYsNyArODYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogI2lmIFVTRShDT09SRElOQVRF RF9HUkFQSElDU19USFJFQURFRCkKLSAgICB2aXJ0dWFsIHZvaWQgdmlld3BvcnRTaXplQ2hhbmdl ZChjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBjb250ZW50 c1NpemVDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIGRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyhjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEF0 dHJpYnV0ZXMmKSA9IDA7CiAjZW5kaWYKIAo=