111017 2013-02-27 15:01:44 -0800 [chromium] Use DumpRenderTree-specific interface for DRT's compositor embedding 2013-02-28 23:42:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111113 111146 1 jamesr jamesr abarth dglazkov enne fishd jochen peter+ews tkent+wkapi webkit.review.bot oldest_to_newest 843539 0 jamesr 2013-02-27 15:01:44 -0800 [chromium] Use DumpRenderTree-specific interface for DRT's compositor embedding 843541 1 190612 jamesr 2013-02-27 15:03:15 -0800 Created attachment 190612 Patch 843543 2 jamesr 2013-02-27 15:04:32 -0800 This is a bit insane but seems to work. Depends on https://codereview.chromium.org/12330184/ landing + rolling in or this won't compile. 843545 3 190612 webkit.review.bot 2013-02-27 15:07:17 -0800 Comment on attachment 190612 Patch Attachment 190612 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16802164 843552 4 190612 webkit.review.bot 2013-02-27 15:14:59 -0800 Comment on attachment 190612 Patch Attachment 190612 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16795169 843590 5 190624 jamesr 2013-02-27 15:58:53 -0800 Created attachment 190624 rejigger WebTestProxyBase to avoid WebViewClient indirection 843597 6 190624 webkit.review.bot 2013-02-27 16:11:48 -0800 Comment on attachment 190624 rejigger WebTestProxyBase to avoid WebViewClient indirection Attachment 190624 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16793166 843601 7 190624 webkit.review.bot 2013-02-27 16:16:11 -0800 Comment on attachment 190624 rejigger WebTestProxyBase to avoid WebViewClient indirection Attachment 190624 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16817260 843666 8 webkit.review.bot 2013-02-27 20:28:38 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 843737 9 jochen 2013-02-27 22:21:44 -0800 Any idea how to implement this in content shell (where WebViewHost is RenderViewImpl) 844056 10 190624 peter+ews 2013-02-28 07:16:37 -0800 Comment on attachment 190624 rejigger WebTestProxyBase to avoid WebViewClient indirection Attachment 190624 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/16802277 844232 11 jamesr 2013-02-28 11:02:09 -0800 (In reply to comment #9) > Any idea how to implement this in content shell (where WebViewHost is RenderViewImpl) There's no need to AFAIK. In content shell, the compositor embedding is handled by content::RenderWidget which uses content::RenderWidgetCompositor to deal with all of this. 844629 12 jamesr 2013-02-28 16:52:33 -0800 Committed r144398: <http://trac.webkit.org/changeset/144398> 190612 2013-02-27 15:03:15 -0800 2013-02-27 15:58:50 -0800 Patch bug-111017-20130227145928.patch text/plain 3603 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MjM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmQ1ZTMzNDQ2NTk5ODM3ODdkNWNlOTZmMmFkYWRmNzMy YzBmZGRmMi4uYjgyYmVhZjU3ZjVmZWY2MjRmYTAwOWY5OTFmMzVkOGMyNWI2NDM5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAyLTI3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBVc2UgRHVtcFJlbmRlclRyZWUtc3BlY2lmaWMgaW50ZXJmYWNl IGZvciBEUlQncyBjb21wb3NpdG9yIGVtYmVkZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMDE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBkZWNvdXBsZXMgRHVtcFJlbmRlclRyZWUgZnJv bSBXZWJMYXllclRyZWVWaWV3Q2xpZW50LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoV2ViVmlld0hvc3REUlRMYXllclRyZWVW aWV3Q2xpZW50KToKKyAgICAgICAgKFdlYlZpZXdIb3N0RFJUTGF5ZXJUcmVlVmlld0NsaWVudDo6 V2ViVmlld0hvc3REUlRMYXllclRyZWVWaWV3Q2xpZW50KToKKyAgICAgICAgKFdlYlZpZXdIb3N0 RFJUTGF5ZXJUcmVlVmlld0NsaWVudDo6fldlYlZpZXdIb3N0RFJUTGF5ZXJUcmVlVmlld0NsaWVu dCk6CisgICAgICAgIChXZWJWaWV3SG9zdERSVExheWVyVHJlZVZpZXdDbGllbnQ6OkxheW91dCk6 CisgICAgICAgIChXZWJWaWV3SG9zdERSVExheWVyVHJlZVZpZXdDbGllbnQ6OlNjaGVkdWxlQ29t cG9zaXRlKToKKyAgICAgICAgKFdlYlZpZXdIb3N0Ojppbml0aWFsaXplTGF5ZXJUcmVlVmlldyk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKyAgICAg ICAgKHdlYmtpdF9zdXBwb3J0KToKKyAgICAgICAgKFdlYlZpZXdIb3N0KToKKwogMjAxMy0wMi0y NyAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBwbHVn aW5zL25ldHNjYXBlLXBsdWdpbi1zZXR3aW5kb3ctc2l6ZSouaHRtbCBhbmQgcGx1Z2lucy9wYXNz LWRpZmZlcmVudC1ucHAtc3RydWN0Lmh0bWwgc2hvdWxkIGJlIGFzeW5jCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggNjk5ZDdiYWY4ZjExYWYy NmNmMDU2NjYwNjlkNzczMDNhNmNjNGNiOC4uNTg3NDlmMzVjNmI4ZTc5NmEyNWUzYTdiOGQ1ZTlm NDg5MThmZGIzNiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdI b3N0LmNwcApAQCAtMjYyLDEyICsyNjIsMjYgQEAgdm9pZCBXZWJWaWV3SG9zdDo6ZGlkQXV0b1Jl c2l6ZShjb25zdCBXZWJTaXplJiBuZXdTaXplKQogICAgIHNldFdpbmRvd1JlY3QoV2ViUmVjdCgw LCAwLCBuZXdTaXplLndpZHRoLCBuZXdTaXplLmhlaWdodCkpOwogfQogCitjbGFzcyBXZWJWaWV3 SG9zdERSVExheWVyVHJlZVZpZXdDbGllbnQgOiBwdWJsaWMgd2Via2l0X3N1cHBvcnQ6OkRSVExh eWVyVHJlZVZpZXdDbGllbnQgeworcHVibGljOgorICAgIGV4cGxpY2l0IFdlYlZpZXdIb3N0RFJU TGF5ZXJUcmVlVmlld0NsaWVudChXZWJWaWV3SG9zdCogaG9zdCkKKyAgICAgICAgOiBtX2hvc3Qo aG9zdCkgeyB9CisgICAgdmlydHVhbCB+V2ViVmlld0hvc3REUlRMYXllclRyZWVWaWV3Q2xpZW50 KCkgeyB9CisKKyAgICB2aXJ0dWFsIHZvaWQgTGF5b3V0KCkgeyBtX2hvc3QtPndlYlZpZXcoKS0+ bGF5b3V0KCk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgU2NoZWR1bGVDb21wb3NpdGUoKSB7IG1faG9z dC0+c2NoZWR1bGVDb21wb3NpdGUoKTsgfQorCitwcml2YXRlOgorICAgIFdlYlZpZXdIb3N0KiBt X2hvc3Q7Cit9OworCiB2b2lkIFdlYlZpZXdIb3N0Ojppbml0aWFsaXplTGF5ZXJUcmVlVmlldyhX ZWJMYXllclRyZWVWaWV3Q2xpZW50KiBjbGllbnQsIGNvbnN0IFdlYkxheWVyJiByb290TGF5ZXIs IGNvbnN0IFdlYkxheWVyVHJlZVZpZXc6OlNldHRpbmdzJiBzZXR0aW5ncykKIHsKKyAgICBtX2xh eWVyVHJlZVZpZXdDbGllbnQgPSBhZG9wdFB0cihuZXcgV2ViVmlld0hvc3REUlRMYXllclRyZWVW aWV3Q2xpZW50KHRoaXMpKTsKICAgICBpZiAobV9zaGVsbC0+c29mdHdhcmVDb21wb3NpdGluZ0Vu YWJsZWQoKSkKLSAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIod2Via2l0X3N1cHBv cnQ6OkNyZWF0ZUxheWVyVHJlZVZpZXdTb2Z0d2FyZShjbGllbnQpKTsKKyAgICAgICAgbV9sYXll clRyZWVWaWV3ID0gYWRvcHRQdHIod2Via2l0X3N1cHBvcnQ6OkNyZWF0ZUxheWVyVHJlZVZpZXdT b2Z0d2FyZShtX2xheWVyVHJlZVZpZXdDbGllbnQuZ2V0KCkpKTsKICAgICBlbHNlCi0gICAgICAg IG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKHdlYmtpdF9zdXBwb3J0OjpDcmVhdGVMYXllclRy ZWVWaWV3M2QoY2xpZW50KSk7CisgICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKHdl YmtpdF9zdXBwb3J0OjpDcmVhdGVMYXllclRyZWVWaWV3M2QobV9sYXllclRyZWVWaWV3Q2xpZW50 LmdldCgpKSk7CiAKICAgICBBU1NFUlQobV9sYXllclRyZWVWaWV3KTsKICAgICBtX2xheWVyVHJl ZVZpZXctPnNldFJvb3RMYXllcihyb290TGF5ZXIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1dlYlZpZXdIb3N0LmgKaW5kZXggZjgxYzAzMjJhNzc2YzNmODE1MjIxZTZjYWI1OTU4 N2U0ZTI2ZWQ0OC4uOTc1NmNmMmU2M2I4MTFmMmZlZTBmNDRjM2NhZDQ5MTQzOTcxOTBkOCAxMDA2 NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAorKysg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCkBAIC01OCw2ICs1 OCw3IEBAIHN0cnVjdCBXZWJXaW5kb3dGZWF0dXJlczsKIH0KIAogbmFtZXNwYWNlIHdlYmtpdF9z dXBwb3J0IHsKK2NsYXNzIERSVExheWVyVHJlZVZpZXdDbGllbnQ7CiBjbGFzcyBNZWRpYVN0cmVh bVV0aWw7CiBjbGFzcyBUZXN0TWVkaWFTdHJlYW1DbGllbnQ7CiB9CkBAIC0yNzgsNiArMjc5LDcg QEAgcHJpdmF0ZToKICAgICBXZWJUZXN0UnVubmVyOjpXZWJUYXNrTGlzdCBtX3Rhc2tMaXN0Owog ICAgIFZlY3RvcjxXZWJLaXQ6OldlYldpZGdldCo+IG1fcG9wdXBtZW51czsKIAorICAgIE93blB0 cjx3ZWJraXRfc3VwcG9ydDo6RFJUTGF5ZXJUcmVlVmlld0NsaWVudD4gbV9sYXllclRyZWVWaWV3 Q2xpZW50OwogICAgIE93blB0cjxXZWJLaXQ6OldlYkxheWVyVHJlZVZpZXc+IG1fbGF5ZXJUcmVl VmlldzsKIH07CiAK 190624 2013-02-27 15:58:53 -0800 2013-02-28 07:16:37 -0800 rejigger WebTestProxyBase to avoid WebViewClient indirection bug-111017-20130227155506.patch text/plain 4864 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MjM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmQ1ZTMzNDQ2NTk5ODM3ODdkNWNlOTZmMmFkYWRmNzMy YzBmZGRmMi4uYjgyYmVhZjU3ZjVmZWY2MjRmYTAwOWY5OTFmMzVkOGMyNWI2NDM5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAyLTI3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBVc2UgRHVtcFJlbmRlclRyZWUtc3BlY2lmaWMgaW50ZXJmYWNl IGZvciBEUlQncyBjb21wb3NpdG9yIGVtYmVkZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMDE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBkZWNvdXBsZXMgRHVtcFJlbmRlclRyZWUgZnJv bSBXZWJMYXllclRyZWVWaWV3Q2xpZW50LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoV2ViVmlld0hvc3REUlRMYXllclRyZWVW aWV3Q2xpZW50KToKKyAgICAgICAgKFdlYlZpZXdIb3N0RFJUTGF5ZXJUcmVlVmlld0NsaWVudDo6 V2ViVmlld0hvc3REUlRMYXllclRyZWVWaWV3Q2xpZW50KToKKyAgICAgICAgKFdlYlZpZXdIb3N0 RFJUTGF5ZXJUcmVlVmlld0NsaWVudDo6fldlYlZpZXdIb3N0RFJUTGF5ZXJUcmVlVmlld0NsaWVu dCk6CisgICAgICAgIChXZWJWaWV3SG9zdERSVExheWVyVHJlZVZpZXdDbGllbnQ6OkxheW91dCk6 CisgICAgICAgIChXZWJWaWV3SG9zdERSVExheWVyVHJlZVZpZXdDbGllbnQ6OlNjaGVkdWxlQ29t cG9zaXRlKToKKyAgICAgICAgKFdlYlZpZXdIb3N0Ojppbml0aWFsaXplTGF5ZXJUcmVlVmlldyk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKyAgICAg ICAgKHdlYmtpdF9zdXBwb3J0KToKKyAgICAgICAgKFdlYlZpZXdIb3N0KToKKwogMjAxMy0wMi0y NyAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBwbHVn aW5zL25ldHNjYXBlLXBsdWdpbi1zZXR3aW5kb3ctc2l6ZSouaHRtbCBhbmQgcGx1Z2lucy9wYXNz LWRpZmZlcmVudC1ucHAtc3RydWN0Lmh0bWwgc2hvdWxkIGJlIGFzeW5jCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0UHJv eHkuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVibGljL1dl YlRlc3RQcm94eS5oCmluZGV4IGNiNDA2NzI1N2QyZWZlYTZiZmU4NTllOTg5NmU1ZTgxZGFmZTI0 MmIuLjgxZTA5ZWQ4NzBjNjdhY2U4NjRmYzQwNjIwNjQ5MTE3NGJjOTg3ZWEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVibGljL1dlYlRlc3RQ cm94eS5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVi bGljL1dlYlRlc3RQcm94eS5oCkBAIC0xMDgsNiArMTA4LDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBzZXRMb2dDb25zb2xlT3V0cHV0KGJvb2wgZW5hYmxlZCk7CiAKKyAgICB2b2lkIHNjaGVkdWxl Q29tcG9zaXRlKCk7CisKICNpZiBXRUJURVNUUlVOTkVSX0lNUExFTUVOVEFUSU9OCiAgICAgdm9p ZCBkaXNwbGF5KCk7CiAgICAgdm9pZCBkaXNwbGF5SW52YWxpZGF0ZWRSZWdpb24oKTsKQEAgLTEy NSw3ICsxMjcsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGRpZEludmFsaWRhdGVSZWN0KGNv bnN0IFdlYktpdDo6V2ViUmVjdCYpOwogICAgIHZvaWQgZGlkU2Nyb2xsUmVjdChpbnQsIGludCwg Y29uc3QgV2ViS2l0OjpXZWJSZWN0Jik7Ci0gICAgdm9pZCBzY2hlZHVsZUNvbXBvc2l0ZSgpOwog ICAgIHZvaWQgc2NoZWR1bGVBbmltYXRpb24oKTsKICAgICB2b2lkIHNldFdpbmRvd1JlY3QoY29u c3QgV2ViS2l0OjpXZWJSZWN0Jik7CiAgICAgdm9pZCBzaG93KFdlYktpdDo6V2ViTmF2aWdhdGlv blBvbGljeSk7CkBAIC0yNDksMTEgKzI1MCw2IEBAIHB1YmxpYzoKICAgICAgICAgV2ViVGVzdFBy b3h5QmFzZTo6ZGlkU2Nyb2xsUmVjdChkeCwgZHksIGNsaXBSZWN0KTsKICAgICAgICAgQmFzZTo6 ZGlkU2Nyb2xsUmVjdChkeCwgZHksIGNsaXBSZWN0KTsKICAgICB9Ci0gICAgdmlydHVhbCB2b2lk IHNjaGVkdWxlQ29tcG9zaXRlKCkKLSAgICB7Ci0gICAgICAgIFdlYlRlc3RQcm94eUJhc2U6OnNj aGVkdWxlQ29tcG9zaXRlKCk7Ci0gICAgICAgIEJhc2U6OnNjaGVkdWxlQ29tcG9zaXRlKCk7Ci0g ICAgfQogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUFuaW1hdGlvbigpCiAgICAgewogICAgICAg ICBXZWJUZXN0UHJveHlCYXNlOjpzY2hlZHVsZUFuaW1hdGlvbigpOwpkaWZmIC0tZ2l0IGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCmluZGV4IDY5OWQ3YmFmOGYxMWFmMjZj ZjA1NjY2MDY5ZDc3MzAzYTZjYzRjYjguLjhjMmFlNGY4NDQ1ZDA4NWNkNGRjMDZlOTgyMjM1ZDI3 ZTAyZWU2MmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZp ZXdIb3N0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5jcHAKQEAgLTI2MiwxMiArMjYyLDI2IEBAIHZvaWQgV2ViVmlld0hvc3Q6OmRpZEF1dG9SZXNp emUoY29uc3QgV2ViU2l6ZSYgbmV3U2l6ZSkKICAgICBzZXRXaW5kb3dSZWN0KFdlYlJlY3QoMCwg MCwgbmV3U2l6ZS53aWR0aCwgbmV3U2l6ZS5oZWlnaHQpKTsKIH0KIAorY2xhc3MgV2ViVmlld0hv c3REUlRMYXllclRyZWVWaWV3Q2xpZW50IDogcHVibGljIHdlYmtpdF9zdXBwb3J0OjpEUlRMYXll clRyZWVWaWV3Q2xpZW50IHsKK3B1YmxpYzoKKyAgICBleHBsaWNpdCBXZWJWaWV3SG9zdERSVExh eWVyVHJlZVZpZXdDbGllbnQoV2ViVmlld0hvc3QqIGhvc3QpCisgICAgICAgIDogbV9ob3N0KGhv c3QpIHsgfQorICAgIHZpcnR1YWwgfldlYlZpZXdIb3N0RFJUTGF5ZXJUcmVlVmlld0NsaWVudCgp IHsgfQorCisgICAgdmlydHVhbCB2b2lkIExheW91dCgpIHsgbV9ob3N0LT53ZWJWaWV3KCktPmxh eW91dCgpOyB9CisgICAgdmlydHVhbCB2b2lkIFNjaGVkdWxlQ29tcG9zaXRlKCkgeyBtX2hvc3Qt PnByb3h5KCktPnNjaGVkdWxlQ29tcG9zaXRlKCk7IH0KKworcHJpdmF0ZToKKyAgICBXZWJWaWV3 SG9zdCogbV9ob3N0OworfTsKKwogdm9pZCBXZWJWaWV3SG9zdDo6aW5pdGlhbGl6ZUxheWVyVHJl ZVZpZXcoV2ViTGF5ZXJUcmVlVmlld0NsaWVudCogY2xpZW50LCBjb25zdCBXZWJMYXllciYgcm9v dExheWVyLCBjb25zdCBXZWJMYXllclRyZWVWaWV3OjpTZXR0aW5ncyYgc2V0dGluZ3MpCiB7Cisg ICAgbV9sYXllclRyZWVWaWV3Q2xpZW50ID0gYWRvcHRQdHIobmV3IFdlYlZpZXdIb3N0RFJUTGF5 ZXJUcmVlVmlld0NsaWVudCh0aGlzKSk7CiAgICAgaWYgKG1fc2hlbGwtPnNvZnR3YXJlQ29tcG9z aXRpbmdFbmFibGVkKCkpCi0gICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKHdlYmtp dF9zdXBwb3J0OjpDcmVhdGVMYXllclRyZWVWaWV3U29mdHdhcmUoY2xpZW50KSk7CisgICAgICAg IG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKHdlYmtpdF9zdXBwb3J0OjpDcmVhdGVMYXllclRy ZWVWaWV3U29mdHdhcmUobV9sYXllclRyZWVWaWV3Q2xpZW50LmdldCgpKSk7CiAgICAgZWxzZQot ICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBhZG9wdFB0cih3ZWJraXRfc3VwcG9ydDo6Q3JlYXRl TGF5ZXJUcmVlVmlldzNkKGNsaWVudCkpOworICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBhZG9w dFB0cih3ZWJraXRfc3VwcG9ydDo6Q3JlYXRlTGF5ZXJUcmVlVmlldzNkKG1fbGF5ZXJUcmVlVmll d0NsaWVudC5nZXQoKSkpOwogCiAgICAgQVNTRVJUKG1fbGF5ZXJUcmVlVmlldyk7CiAgICAgbV9s YXllclRyZWVWaWV3LT5zZXRSb290TGF5ZXIocm9vdExheWVyKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IGY4MWMwMzIyYTc3NmMzZjgxNTIyMWU2 Y2FiNTk1ODdlNGUyNmVkNDguLjk3NTZjZjJlNjNiODExZjJmZWUwZjQ0YzNjYWQ0OTE0Mzk3MTkw ZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0 LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaApAQCAt NTgsNiArNTgsNyBAQCBzdHJ1Y3QgV2ViV2luZG93RmVhdHVyZXM7CiB9CiAKIG5hbWVzcGFjZSB3 ZWJraXRfc3VwcG9ydCB7CitjbGFzcyBEUlRMYXllclRyZWVWaWV3Q2xpZW50OwogY2xhc3MgTWVk aWFTdHJlYW1VdGlsOwogY2xhc3MgVGVzdE1lZGlhU3RyZWFtQ2xpZW50OwogfQpAQCAtMjc4LDYg KzI3OSw3IEBAIHByaXZhdGU6CiAgICAgV2ViVGVzdFJ1bm5lcjo6V2ViVGFza0xpc3QgbV90YXNr TGlzdDsKICAgICBWZWN0b3I8V2ViS2l0OjpXZWJXaWRnZXQqPiBtX3BvcHVwbWVudXM7CiAKKyAg ICBPd25QdHI8d2Via2l0X3N1cHBvcnQ6OkRSVExheWVyVHJlZVZpZXdDbGllbnQ+IG1fbGF5ZXJU cmVlVmlld0NsaWVudDsKICAgICBPd25QdHI8V2ViS2l0OjpXZWJMYXllclRyZWVWaWV3PiBtX2xh eWVyVHJlZVZpZXc7CiB9OwogCg==