103937 2012-12-03 15:17:45 -0800 [chromium] fix showFPScounter and showPaintRects not toggleable after page change 2012-12-04 10:48:50 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 egraether webkit-unassigned apavlov egraether keishi loislo nduca pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 781934 0 egraether 2012-12-03 15:17:45 -0800 [chromium] fix showFPScounter and showPaintRects not toggleable after page change 781938 1 177348 egraether 2012-12-03 15:21:48 -0800 Created attachment 177348 Patch 781958 2 egraether 2012-12-03 15:36:46 -0800 This bug was caused by a recent change in the way the compositor handles commandline settings and webinspector settings for showFPSCounter and showPaintRects. These settings are now seperate and get ORed together. Right now the showFPSCounter and showPaintRects values are updated in the WebSettings. The problem is that these values then become the commandline setting when the page is refreshed with the WebInspector opened. So they can no longer be toggled. In summary, this change avoids updating the values in the WebSettings and instead reads the settings from the InspectorPageAgent. This is necessary, to preserve the settings when changing the page with the WebInspector open. pfeldman can you please have a look? 781992 3 177348 pfeldman 2012-12-03 16:00:05 -0800 Comment on attachment 177348 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177348&action=review This patch looks good (except for InspectorPageAgent interaction from within WebKit). There are two other ways it could be implemented: 1) finding a signal that would reliably trigger after layer tree is there from within WebCore or 2) creating such a signal. > Source/WebKit/chromium/src/WebViewImpl.cpp:4048 > +#if ENABLE(INSPECTOR) chromium === ENABLE(INSPECTOR) > Source/WebKit/chromium/src/WebViewImpl.cpp:4049 > + InspectorPageAgent* pageAgent = page()->inspectorController()->pageAgent(); You can only talk to InspectorController from WebKit layer. 782024 4 177369 egraether 2012-12-03 16:40:08 -0800 Created attachment 177369 Patch 782027 5 egraether 2012-12-03 16:41:32 -0800 (In reply to comment #3) > (From update of attachment 177348 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177348&action=review > > This patch looks good (except for InspectorPageAgent interaction from within WebKit). There are two other ways it could be implemented: 1) finding a signal that would reliably trigger after layer tree is there from within WebCore or 2) creating such a signal. > > > Source/WebKit/chromium/src/WebViewImpl.cpp:4048 > > +#if ENABLE(INSPECTOR) > > chromium === ENABLE(INSPECTOR) > > > Source/WebKit/chromium/src/WebViewImpl.cpp:4049 > > + InspectorPageAgent* pageAgent = page()->inspectorController()->pageAgent(); > > You can only talk to InspectorController from WebKit layer. Thanks, I switched to storing the values in fields of WebViewImpl. 782286 6 177369 webkit.review.bot 2012-12-03 23:53:11 -0800 Comment on attachment 177369 Patch Rejecting attachment 177369 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ripts/update-webkit line 152. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 2 Updating OpenSource From http://git.chromium.org/external/Webkit ef0ca77..8cbb25f HEAD -> origin/HEAD error: Ref refs/remotes/origin/master is at 8cbb25f3febaaee8d69fbea1e5b98dd0173b71a9 but expected ef0ca77a554ed2a07b001ee4935266d6301b2bf8 ! ef0ca77..8cbb25f master -> origin/master (unable to update local ref) Died at Tools/Scripts/update-webkit line 152. Full output: http://queues.webkit.org/results/15120716 782703 7 177369 webkit.review.bot 2012-12-04 10:48:47 -0800 Comment on attachment 177369 Patch Clearing flags on attachment: 177369 Committed r136529: <http://trac.webkit.org/changeset/136529> 782704 8 webkit.review.bot 2012-12-04 10:48:50 -0800 All reviewed patches have been landed. Closing bug. 177348 2012-12-03 15:21:48 -0800 2012-12-03 16:40:04 -0800 Patch bug-103937-20121203151914.patch text/plain 5722 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGMyOWEyZDdlYzc3Yjhm YTIxMGYxNjU5OTNhMGYwNzBhNWRmMWEwYy4uZGFkYzMwNzEwMWZiZTM3ZWE0Yjc4MTMyOTRjNjJl NGVlNjIyMGVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTAzICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1 bV0gZml4IHNob3dGUFNjb3VudGVyIGFuZCBzaG93UGFpbnRSZWN0cyBub3QgdG9nZ2xlYWJsZSBh ZnRlciBwYWdlIGNoYW5nZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAzOTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBjaGFuZ2Ugbm8gbG9uZ2VyIHVwZGF0ZXMgdGhlIHZhbHVlcyBmb3Igc2hv d0ZQU0NvdW50ZXIgYW5kIHNob3dQYWludFJlY3RzCisgICAgICAgIGluIFdlYlZpZXdJbXBsOjpz ZXR0aW5nc0ltcGwoKSwgd2hpY2ggYXJlIGNvbnNpZGVyZWQgYXMgY29tbWFuZGxpbmUgc2V0dGlu Z3MsCisgICAgICAgIGFuZCByZWFkcyB0aGUgc3RhdGUgb2Ygc2hvd0ZQU0NvdW50ZXIgYW5kIHNo b3dQYWludFJlY3RzIGZyb20gdGhlIEluc3BlY3RvclBhZ2VBZ2VudAorICAgICAgICBpbnN0ZWFk LiBUaGlzIGZpeGVzIHNob3dGUFNDb3VudGVyIGFuZCBzaG93UGFpbnRSZWN0cyBiZWluZyBhY3Rp dmF0ZWQgaW4gdGhlCisgICAgICAgIFdlYkluc3BlY3RvciBhbmQgdHJlYXRlZCBhcyBjb21tYW5k bGluZSBzZXR0aW5ncyBhZnRlciBhIHBhZ2UgY2hhbmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnNob3dQYWludFJlY3RzKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50 OjpzaG93RlBTQ291bnRlcik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2Vu dC5oOgorCiAyMDEyLTEyLTAzICBBbGV4aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW0dUS10gRW5hYmxlIENTUzMgYmFja2dyb3VuZC1iYWNrZ3JvdW5kIHBvc2l0aW9u IG9mZnNldCBieSBkZWZhdWx0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBjNGQ4OWJl M2E4MTFlZTBjZmExYWMwMjMwMDc5MzExMGEwN2RjZjNmLi5iNTliNjQ1ZjQ2M2VkNzUzNGIxNzkx MDcyNGQ3ZjczN2IzMTcxMmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDEyLTEyLTAzICBFYmVyaGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUu Y29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gZml4IHNob3dGUFNjb3VudGVyIGFuZCBzaG93UGFp bnRSZWN0cyBub3QgdG9nZ2xlYWJsZSBhZnRlciBwYWdlIGNoYW5nZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzOTM3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ugbm8gbG9uZ2VyIHVw ZGF0ZXMgdGhlIHZhbHVlcyBmb3Igc2hvd0ZQU0NvdW50ZXIgYW5kIHNob3dQYWludFJlY3RzCisg ICAgICAgIGluIFdlYlZpZXdJbXBsOjpzZXR0aW5nc0ltcGwoKSwgd2hpY2ggYXJlIGNvbnNpZGVy ZWQgYXMgY29tbWFuZGxpbmUgc2V0dGluZ3MsCisgICAgICAgIGFuZCByZWFkcyB0aGUgc3RhdGUg b2Ygc2hvd0ZQU0NvdW50ZXIgYW5kIHNob3dQYWludFJlY3RzIGZyb20gdGhlIEluc3BlY3RvclBh Z2VBZ2VudAorICAgICAgICBpbnN0ZWFkLiBUaGlzIGZpeGVzIHNob3dGUFNDb3VudGVyIGFuZCBz aG93UGFpbnRSZWN0cyBiZWluZyBhY3RpdmF0ZWQgaW4gdGhlCisgICAgICAgIFdlYkluc3BlY3Rv ciBhbmQgdHJlYXRlZCBhcyBjb21tYW5kbGluZSBzZXR0aW5ncyBhZnRlciBhIHBhZ2UgY2hhbmdl LgorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6OnNldFNob3dQYWludFJlY3RzKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNl dElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisKIDIwMTItMTItMDMgIFRvbW15IFdp ZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAgU3BlZWNoIFJlY29nbml0 aW9uIEFQSTogVXBkYXRlIFNwZWVjaFJlY29nbml0aW9uRXZlbnQgdG8gbWF0Y2ggdGhlIHNwZWNp ZmljYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ YWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2Vu dC5jcHAKaW5kZXggMWE0NmU5YTE2Yzg1OWZiMDE2ZTM5Y2YyMDVmZGQyMWYxYzNkZWE3NC4uNGNk ODg1NjEzODk2ZGM5ZjE3NjdkMDQ3OWI5MDMwMjY3N2MyMTBlYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTM4MSw2ICszODEsMTYg QEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OndlYlZpZXdSZXNpemVkKGNvbnN0IEludFNpemUm IHNpemUpCiAgICAgbV9vdmVybGF5LT5yZXNpemUoY3VycmVudFdpZHRoID8gc2l6ZSA6IEludFNp emUoKSk7CiB9CiAKK2Jvb2wgSW5zcGVjdG9yUGFnZUFnZW50OjpzaG93UGFpbnRSZWN0cygpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fc3RhdGUtPmdldEJvb2xlYW4oUGFnZUFnZW50U3RhdGU6OnBh Z2VBZ2VudFNob3dQYWludFJlY3RzKTsKK30KKworYm9vbCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnNo b3dGUFNDb3VudGVyKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9zdGF0ZS0+Z2V0Qm9vbGVhbihQ YWdlQWdlbnRTdGF0ZTo6cGFnZUFnZW50U2hvd0ZQU0NvdW50ZXIpOworfQorCiB2b2lkIEluc3Bl Y3RvclBhZ2VBZ2VudDo6ZW5hYmxlKEVycm9yU3RyaW5nKikKIHsKICAgICBtX2VuYWJsZWQgPSB0 cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VB Z2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCmlu ZGV4IGRhYWNlMzYzNjA0YmRmYTM0Mzk4ZmMzOGM4YzE3NDk4YTQ0NjdjZjIuLmExYzY2ZDg0NzIw N2MzMGY4NjdjMjFhYTI0NWEyMjVmMGYyZjdjY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKQEAgLTE1MCw2ICsxNTAsOSBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIHdlYlZpZXdSZXNpemVkKGNvbnN0IEludFNpemUmKTsKIAorICAgIGJvb2wgc2hv d1BhaW50UmVjdHMoKSBjb25zdDsKKyAgICBib29sIHNob3dGUFNDb3VudGVyKCkgY29uc3Q7CisK ICAgICAvLyBDcm9zcy1hZ2VudHMgQVBJCiAgICAgRnJhbWUqIG1haW5GcmFtZSgpOwogICAgIFN0 cmluZyBjcmVhdGVJZGVudGlmaWVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAKaW5kZXggZjY2YWU0OGM0OGQ4YTM4ZWVlMjBkNzRmZmM3NDUzNzFlNzBiMTAw OC4uMTI2MTk4NTY3OTdmYzc5ZDEyY2I5NTE0NmYzYmZiYmRiMjJiYmU5YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNzksNiArNzksNyBAQAogI2lu Y2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgorI2luY2x1ZGUgIkluc3BlY3Rv clBhZ2VBZ2VudC5oIgogI2luY2x1ZGUgIktleWJvYXJkQ29kZXMuaCIKICNpbmNsdWRlICJLZXli b2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiTGF5ZXJQYWludGVyQ2hyb21pdW0uaCIKQEAgLTg0NSw3 ICs4NDYsNiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRTaG93RlBTQ291bnRlcihib29sIHNob3cp CiAjZW5kaWYKICAgICAgICAgbV9sYXllclRyZWVWaWV3LT5zZXRTaG93RlBTQ291bnRlcihzaG93 KTsKICAgICB9Ci0gICAgc2V0dGluZ3NJbXBsKCktPnNldFNob3dGUFNDb3VudGVyKHNob3cpOwog fQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRTaG93UGFpbnRSZWN0cyhib29sIHNob3cpCkBAIC04 NTQsNyArODU0LDYgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0U2hvd1BhaW50UmVjdHMoYm9vbCBz aG93KQogICAgICAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3SW1wbDo6c2V0U2hv d1BhaW50UmVjdHMiKTsKICAgICAgICAgbV9sYXllclRyZWVWaWV3LT5zZXRTaG93UGFpbnRSZWN0 cyhzaG93KTsKICAgICB9Ci0gICAgc2V0dGluZ3NJbXBsKCktPnNldFNob3dQYWludFJlY3RzKHNo b3cpOwogfQogCiBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXli b2FyZEV2ZW50JiBldmVudCkKQEAgLTQwNDYsOCArNDA0NSwxMSBAQCB2b2lkIFdlYlZpZXdJbXBs OjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAg ICAgICBpZiAobGF5ZXJUcmVlVmlld1NldHRpbmdzLnNob3dQbGF0Zm9ybUxheWVyVHJlZSkKICAg ICAgICAgICAgICAgICBsb2FkRm9udEF0bGFzSWZOZWNlc3NhcnkoKTsKIAotICAgICAgICAgICAg aWYgKHNldHRpbmdzSW1wbCgpLT5zaG93RlBTQ291bnRlcigpKQotICAgICAgICAgICAgICAgIHNl dFNob3dGUFNDb3VudGVyKHRydWUpOworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgICAgICAg ICBJbnNwZWN0b3JQYWdlQWdlbnQqIHBhZ2VBZ2VudCA9IHBhZ2UoKS0+aW5zcGVjdG9yQ29udHJv bGxlcigpLT5wYWdlQWdlbnQoKTsKKyAgICAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0U2hv d0ZQU0NvdW50ZXIocGFnZUFnZW50LT5zaG93RlBTQ291bnRlcigpKTsKKyAgICAgICAgICAgIG1f bGF5ZXJUcmVlVmlldy0+c2V0U2hvd1BhaW50UmVjdHMocGFnZUFnZW50LT5zaG93UGFpbnRSZWN0 cygpKTsKKyNlbmRpZgogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9ub25Db21wb3Np dGVkQ29udGVudEhvc3QuY2xlYXIoKTsKICAgICAgICAgICAgIG1faXNBY2NlbGVyYXRlZENvbXBv c2l0aW5nQWN0aXZlID0gZmFsc2U7Cg== 177369 2012-12-03 16:40:08 -0800 2012-12-04 10:48:47 -0800 Patch bug-103937-20121203163733.patch text/plain 3592 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGM0ZDg5YmUzYTgxMWVlMGNmYTFhYzAyMzAwNzkzMTEwYTA3ZGNmM2YuLjY4ODY1NTEwOTMwMjhi YjAzOWM1YmE2OTIyZjRhZDUwMzZmZmY5NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMTItMDMgIEViZXJoYXJkIEdyYWV0aGVyICA8ZWdyYWV0aGVy QGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBmaXggc2hvd0ZQU2NvdW50ZXIgYW5k IHNob3dQYWludFJlY3RzIG5vdCB0b2dnbGVhYmxlIGFmdGVyIHBhZ2UgY2hhbmdlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5MzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhdm9p ZHMgdXBkYXRpbmcgdGhlIFdlYlNldHRpbmdzIGFuZCB1c2VzIGZpZWxkcyBmb3Igc2hvd0ZQU0Nv dW50ZXIgYW5kCisgICAgICAgIHNob3dQYWludFJlY3RzIGluIFdlYlZpZXdJbXBsIGluc3RlYWQs IHdoaWNoIGhvbGQgdGhlIHZhbHVlcyBiZXR3ZWVuIEluc3BlY3RvclBhZ2VBZ2VudDo6cmVzdG9y ZSgpCisgICAgICAgIGFuZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n QWN0aXZlKCkuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6c2V0U2hvd0ZQU0NvdW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 c2V0U2hvd1BhaW50UmVjdHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0SXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu aDoKKwogMjAxMi0xMi0wMyAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4K IAogICAgICAgICBTcGVlY2ggUmVjb2duaXRpb24gQVBJOiBVcGRhdGUgU3BlZWNoUmVjb2duaXRp b25FdmVudCB0byBtYXRjaCB0aGUgc3BlY2lmaWNhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGY2NmFlNDhjNDhkOGEzOGVlZTIwZDc0ZmZjNzQ1 MzcxZTcwYjEwMDguLjZkZjNkYTIwODBhMjdkZjRkYmRhZTBhOTZjYzg0Mjc5MTc3MjViNTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTQ1NCw2ICs0 NTQsOCBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQog ICAgICwgbV9mbGluZ01vZGlmaWVyKDApCiAgICAgLCBtX3ZhbGlkYXRpb25NZXNzYWdlKFZhbGlk YXRpb25NZXNzYWdlQ2xpZW50SW1wbDo6Y3JlYXRlKCpjbGllbnQpKQogICAgICwgbV9zdXBwcmVz c0ludmFsaWRhdGlvbnMoZmFsc2UpCisgICAgLCBtX3Nob3dGUFNDb3VudGVyKGZhbHNlKQorICAg ICwgbV9zaG93UGFpbnRSZWN0cyhmYWxzZSkKIHsKICAgICAvLyBXZWJLaXQvd2luL1dlYlZpZXcu Y3BwIGRvZXMgdGhlIHNhbWUgdGhpbmcsIGV4Y2VwdCB0aGV5IGNhbGwgdGhlCiAgICAgLy8gS0pT IHNwZWNpZmljIHdyYXBwZXIgYXJvdW5kIHRoaXMgbWV0aG9kLiBXZSBuZWVkIHRvIGhhdmUgdGhy ZWFkaW5nCkBAIC04NDUsNyArODQ3LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0U2hvd0ZQU0Nv dW50ZXIoYm9vbCBzaG93KQogI2VuZGlmCiAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0U2hv d0ZQU0NvdW50ZXIoc2hvdyk7CiAgICAgfQotICAgIHNldHRpbmdzSW1wbCgpLT5zZXRTaG93RlBT Q291bnRlcihzaG93KTsKKyAgICBtX3Nob3dGUFNDb3VudGVyID0gc2hvdzsKIH0KIAogdm9pZCBX ZWJWaWV3SW1wbDo6c2V0U2hvd1BhaW50UmVjdHMoYm9vbCBzaG93KQpAQCAtODU0LDcgKzg1Niw3 IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldFNob3dQYWludFJlY3RzKGJvb2wgc2hvdykKICAgICAg ICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2ViVmlld0ltcGw6OnNldFNob3dQYWludFJlY3Rz Iik7CiAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0U2hvd1BhaW50UmVjdHMoc2hvdyk7CiAg ICAgfQotICAgIHNldHRpbmdzSW1wbCgpLT5zZXRTaG93UGFpbnRSZWN0cyhzaG93KTsKKyAgICBt X3Nob3dQYWludFJlY3RzID0gc2hvdzsKIH0KIAogYm9vbCBXZWJWaWV3SW1wbDo6aGFuZGxlS2V5 RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQpCkBAIC00MDQ2LDggKzQwNDgsOCBA QCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9v bCBhY3RpdmUpCiAgICAgICAgICAgICBpZiAobGF5ZXJUcmVlVmlld1NldHRpbmdzLnNob3dQbGF0 Zm9ybUxheWVyVHJlZSkKICAgICAgICAgICAgICAgICBsb2FkRm9udEF0bGFzSWZOZWNlc3Nhcnko KTsKIAotICAgICAgICAgICAgaWYgKHNldHRpbmdzSW1wbCgpLT5zaG93RlBTQ291bnRlcigpKQot ICAgICAgICAgICAgICAgIHNldFNob3dGUFNDb3VudGVyKHRydWUpOworICAgICAgICAgICAgbV9s YXllclRyZWVWaWV3LT5zZXRTaG93RlBTQ291bnRlcihtX3Nob3dGUFNDb3VudGVyKTsKKyAgICAg ICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0U2hvd1BhaW50UmVjdHMobV9zaG93UGFpbnRSZWN0 cyk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50 SG9zdC5jbGVhcigpOwogICAgICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3Rp dmUgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4 IDYyNDZjYWIwZTk1OGFhM2I4MjY1ODc3MWZiYjliMWI2MzM0MWYzMGMuLjNhOWY5MjMzMTNkYjU0 ZDM2NTVlNjNhZWU3YzM1OTVhYjNiZDk3MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaApAQCAtODgzLDYgKzg4Myw5IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPFZh bGlkYXRpb25NZXNzYWdlQ2xpZW50SW1wbD4gbV92YWxpZGF0aW9uTWVzc2FnZTsKIAogICAgIGJv b2wgbV9zdXBwcmVzc0ludmFsaWRhdGlvbnM7CisKKyAgICBib29sIG1fc2hvd0ZQU0NvdW50ZXI7 CisgICAgYm9vbCBtX3Nob3dQYWludFJlY3RzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 Cg==