147279 2015-07-24 15:27:35 -0700 [Win] Enable CSP_NEXT and implement UserScript and UserStyleSheet to support testing 2015-07-25 18:45:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue mkwst webkit-bug-importer oldest_to_newest 1112115 0 bfulgham 2015-07-24 15:27:35 -0700 While investigating the cause of some recent test failures on Windows, I noticed that WebView on Windows does not implement 'addUserScriptToGroup' and 'addUserStyleSheetToGroup'. This causes a number of tests to fail because the test-specific stylesheets and scripts are not being loaded on Windows. 1112116 1 webkit-bug-importer 2015-07-24 15:28:58 -0700 <rdar://problem/21990767> 1112119 2 257485 bfulgham 2015-07-24 15:39:53 -0700 Created attachment 257485 Patch 1112127 3 bfulgham 2015-07-24 16:09:48 -0700 This test will probably introduce some test expectation changes on Windows. I'll revise them once I see the actual test output on the live machine. 1112130 4 bfulgham 2015-07-24 16:25:57 -0700 Committed r187370: <http://trac.webkit.org/changeset/187370> 1112138 5 bfulgham 2015-07-24 16:41:50 -0700 Waiting for r187370 to hit the test bots. I'll land updates once I see the output on the production system. 1112259 6 ap 2015-07-25 18:45:57 -0700 Yes, looks like this broke one test, please update: https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2Fsecurity%2FcontentSecurityPolicy%2Fsource-list-parsing-10.html 257485 2015-07-24 15:39:53 -0700 2015-07-24 16:05:51 -0700 Patch bug-147279-20150724155304.patch text/plain 22003 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzM2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTI0ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENvbm5lY3QgVXNl clNjcmlwdCBhbmQgVXNlclN0eWxlU2hlZXQgdGhyb3VnaCBXZWJWaWV3LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Mjc5CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMTk5MDc2Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0ZWQgYnkgaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvdXNlci1zdHlsZS1zaGVldC1mb250LWNyYXNoZXIuaHRtbCBhcyB3ZWxsCisgICAg ICAgIGFzIG1hbnkgc2tpcHBlZCB0ZXN0cy4KKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLmNw cDogQ29uZGl0aW9uYWxseSBjb21waWxlIEpTU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudC5j cHAgaWYgQ1NQX05FWFQgaXMgZW5hYmxlZC4KKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5tYWtl OiBHZW5lcmF0ZSBiaW5kaW5ncyBmb3IgU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudC5pZGwu CisgICAgICAgICogV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvajogQWRkIG1pc3Npbmcg ZmlsZXMuCisgICAgICAgICogV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJz OiBEaXR0by4KKwogMjAxNS0wNy0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtpT1NdOiBJbmxpbmUgdmlkZW8gY29udHJvbHMgYXJlIGJsdXJyeSBvbiBzY2Fs ZWQtZG93biBwYWdlcyBvbiBub24tcmV0aW5hIGRldmljZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9EZXJpdmVkU291cmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvRGVyaXZl ZFNvdXJjZXMuY3BwCShyZXZpc2lvbiAxODczNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9EZXJpdmVk U291cmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNCw2ICszMTQsOSBAQAogI2luY2x1ZGUg IkpTU2NyZWVuLmNwcCIKICNpbmNsdWRlICJKU1NjcmlwdFByb2ZpbGUuY3BwIgogI2luY2x1ZGUg IkpTU2NyaXB0UHJvZmlsZU5vZGUuY3BwIgorI2lmIEVOQUJMRShDU1BfTkVYVCkKKyNpbmNsdWRl ICJKU1NlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQuY3BwIgorI2VuZGlmCiAjaW5jbHVkZSAi SlNTUUxFcnJvci5jcHAiCiAjaW5jbHVkZSAiSlNTUUxFeGNlcHRpb24uY3BwIgogI2luY2x1ZGUg IkpTU1FMUmVzdWx0U2V0LmNwcCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2Vz Lm1ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQko cmV2aXNpb24gMTg3MzQ0KQorKysgU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQko d29ya2luZyBjb3B5KQpAQCAtMzE4LDYgKzMxOCw3IEBAIE5PTl9TVkdfQklORElOR19JRExTID0g XAogICAgICQoV2ViQ29yZSkvZG9tL1JhbmdlLmlkbCBcCiAgICAgJChXZWJDb3JlKS9kb20vUmFu Z2VFeGNlcHRpb24uaWRsIFwKICAgICAkKFdlYkNvcmUpL2RvbS9SZXF1ZXN0QW5pbWF0aW9uRnJh bWVDYWxsYmFjay5pZGwgXAorICAgICQoV2ViQ29yZSkvZG9tL1NlY3VyaXR5UG9saWN5VmlvbGF0 aW9uRXZlbnQuaWRsIFwKICAgICAkKFdlYkNvcmUpL2RvbS9TdHJpbmdDYWxsYmFjay5pZGwgXAog ICAgICQoV2ViQ29yZSkvZG9tL1RleHQuaWRsIFwKICAgICAkKFdlYkNvcmUpL2RvbS9UZXh0RXZl bnQuaWRsIFwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZj eHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNv cmUudmN4cHJvagkocmV2aXNpb24gMTg3MzQ0KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDAyOSw2ICs0MDI5LDIx IEBACiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9u KXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+CiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9u KXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxk PgogICAgIDwvQ2xDb21waWxlPgorICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iJChDb25maWd1cmF0 aW9uQnVpbGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUpXCQoUHJvamVjdE5hbWUpXERl cml2ZWRTb3VyY2VzXEpTU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudC5jcHAiPgorICAgICAg PEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9y bSknPT0nRGVidWd8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAgIDxFeGNs dWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09 J0RlYnVnfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAgICAgPEV4Y2x1ZGVkRnJv bUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdf V2luQ2Fpcm98V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAgIDxFeGNsdWRl ZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0Rl YnVnX1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAgICAgPEV4Y2x1 ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0n RGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAgIDxFeGNs dWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09 J0RlYnVnU3VmZml4fHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAgICAgPEV4Y2x1 ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0n UmVsZWFzZXxXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAgICAgPEV4Y2x1ZGVk RnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVs ZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAgIDxFeGNsdWRlZEZyb21C dWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1JlbGVhc2Vf V2luQ2Fpcm98V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAgIDxFeGNsdWRl ZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1Jl bGVhc2VfV2luQ2Fpcm98eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+CisgICAgICA8RXhj bHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9 PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+CisgICAgICA8RXhj bHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9 PSdQcm9kdWN0aW9ufHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAgIDwvQ2xDb21w aWxlPgorCiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilc b2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNc SlNTUUxFcnJvci5jcHAiPgogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQo Q29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj50cnVlPC9FeGNsdWRl ZEZyb21CdWlsZD4KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZp Z3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1 aWxkPgpAQCAtNzIxNyw2ICs3MjMyLDcgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHBh Z2VcYW5pbWF0aW9uXENTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcCIgLz4KICAgICA8Q2xDb21waWxl IEluY2x1ZGU9Ii4uXHBhZ2VcRGV2aWNlQ29udHJvbGxlci5jcHAiIC8+CiAgICAgPENsQ29tcGls ZSBJbmNsdWRlPSIuLlxwYWdlXERpYWdub3N0aWNMb2dnaW5nS2V5cy5jcHAiIC8+CisgICAgPENs Q29tcGlsZSBJbmNsdWRlPSIuLlxwYWdlXERPTVNlY3VyaXR5UG9saWN5LmNwcCIgLz4KICAgICA8 Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHBhZ2VcRE9NU2VsZWN0aW9uLmNwcCIgLz4KICAgICA8Q2xD b21waWxlIEluY2x1ZGU9Ii4uXHBhZ2VcRE9NVGltZXIuY3BwIiAvPgogICAgIDxDbENvbXBpbGUg SW5jbHVkZT0iLi5ccGFnZVxET01XaW5kb3cuY3BwIiAvPgpAQCAtMTk4NzQsNiArMTk4OTAsNyBA QAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGFnZVxEZXZpY2VDb250cm9sbGVyLmgiIC8+ CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxwYWdlXERpYWdub3N0aWNMb2dnaW5nS2V5cy5o IiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGFnZVxEaWFnbm9zdGljTG9nZ2luZ1Jl c3VsdFR5cGUuaCIgLz4KKyAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHBhZ2VcRE9NU2VjdXJp dHlQb2xpY3kuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHBhZ2VcRE9NU2VsZWN0 aW9uLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxwYWdlXERPTVRpbWVyLmgiIC8+ CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxwYWdlXERPTVdpbmRvdy5oIiAvPgpJbmRleDog U291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHBy b2ouZmlsdGVycwkocmV2aXNpb24gMTg3MzQ0KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCSh3b3JraW5nIGNvcHkpCkBAIC01NzIyLDYg KzU3MjIsOSBAQAogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iJChDb25maWd1cmF0aW9uQnVpbGRE aXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUpXCQoUHJvamVjdE5hbWUpXERlcml2ZWRTb3Vy Y2VzXEpTU2NyZWVuLmNwcCI+CiAgICAgICA8RmlsdGVyPkRlcml2ZWRTb3VyY2VzPC9GaWx0ZXI+ CiAgICAgPC9DbENvbXBpbGU+CisgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRp b25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVy aXZlZFNvdXJjZXNcSlNTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50LmNwcCI+CisgICAgICA8 RmlsdGVyPkRlcml2ZWRTb3VyY2VzPC9GaWx0ZXI+CisgICAgPC9DbENvbXBpbGU+CiAgICAgPENs Q29tcGlsZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFy Y2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcSlNTUUxFcnJvci5jcHAi PgogICAgICAgPEZpbHRlcj5EZXJpdmVkU291cmNlczwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxl PgpAQCAtNzI3Miw2ICs3Mjc1LDkgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHBsYXRm b3JtXHdpblxHRElVdGlsaXRpZXMuY3BwIj4KICAgICAgIDxGaWx0ZXI+cGxhdGZvcm1cZ3JhcGhp Y3Ncd2luPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+CisgICAgPENsQ29tcGlsZSBJbmNsdWRl PSIuLlxwYWdlXERPTVNlY3VyaXR5UG9saWN5LmNwcCI+CisgICAgICA8RmlsdGVyPnBhZ2U8L0Zp bHRlcj4KKyAgICA8L0NsQ29tcGlsZT4KICAgPC9JdGVtR3JvdXA+CiAgIDxJdGVtR3JvdXA+CiAg ICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxNb2R1bGVzXGdlb2xvY2F0aW9uXENvb3JkaW5hdGVz LmgiPgpAQCAtMTUyNjQsNiArMTUyNzAsOSBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5c cGxhdGZvcm1cd2luXEdESVV0aWxpdGllcy5oIj4KICAgICAgIDxGaWx0ZXI+cGxhdGZvcm1cZ3Jh cGhpY3Ncd2luPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CisgICAgPENsSW5jbHVkZSBJbmNs dWRlPSIuLlxwYWdlXERPTVNlY3VyaXR5UG9saWN5LmgiPgorICAgICAgPEZpbHRlcj5wYWdlPC9G aWx0ZXI+CisgICAgPC9DbEluY2x1ZGU+CiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgog ICAgIDxOb25lIEluY2x1ZGU9Ii4uXGNzc1xDU1NHcmFtbWFyLnkuaW4iPgpJbmRleDogU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL0No YW5nZUxvZwkocmV2aXNpb24gMTg3MzY2KQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTUtMDctMjQgIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dpbl0gQ29ubmVjdCBVc2VyU2Ny aXB0IGFuZCBVc2VyU3R5bGVTaGVldCB0aHJvdWdoIFdlYlZpZXcuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcyNzkKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzIxOTkwNzY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogSW50ZXJmYWNlcy9JV2ViVmlld1ByaXZhdGUuaWRsOiBBZGQgdXBkYXRlZCBB UEkgZm9yICdhZGRVc2VyU2NyaXB0VG9Hcm91cCcgYW5kCisgICAgICAgICdhZGRVc2VyU3R5bGVT aGVldFRvR3JvdXAnCisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojph ZGRVc2VyU2NyaXB0VG9Hcm91cCk6IEFkZCBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKHRvU3Ry aW5nVmVjdG9yKTogQWRkZWQgaGVscGVyIGZ1bmN0aW9uLgorICAgICAgICAoV2ViVmlldzo6YWRk VXNlclN0eWxlU2hlZXRUb0dyb3VwKTogQWRkIGltcGxlbWVudGF0aW9uLgorICAgICAgICAoV2Vi Vmlldzo6cmVtb3ZlVXNlclNjcmlwdEZyb21Hcm91cCk6IERpdHRvLgorICAgICAgICAoV2ViVmll dzo6cmVtb3ZlVXNlclN0eWxlU2hlZXRGcm9tR3JvdXApOiBEaXR0by4KKyAgICAgICAgKFdlYlZp ZXc6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbUdyb3VwKTogRGl0dG8uCisgICAgICAgIChXZWJWaWV3 OjpyZW1vdmVVc2VyU3R5bGVTaGVldHNGcm9tR3JvdXApOiBEaXR0by4KKyAgICAgICAgKFdlYlZp ZXc6OnJlbW92ZUFsbFVzZXJDb250ZW50RnJvbUdyb3VwKTogRGl0dG8uCisgICAgICAgICogV2Vi Vmlldy5oOgorCiAyMDE1LTA3LTI0ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwu Y29tPgogCiAgICAgICAgIFJlbW92ZSBydW50aW1lIGZsYWdzIGZvciBzeW1ib2xzCkluZGV4OiBT b3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTg3MzQ0KQorKysgU291cmNlL1dlYktpdC93aW4v V2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1Nyw2ICsxNTcsOCBAQAogI2luY2x1ZGUg PFdlYkNvcmUvU2V0dGluZ3MuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1N5c3RlbUluZm8uaD4KICNp bmNsdWRlIDxXZWJDb3JlL1VzZXJDb250ZW50Q29udHJvbGxlci5oPgorI2luY2x1ZGUgPFdlYkNv cmUvVXNlclNjcmlwdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvVXNlclN0eWxlU2hlZXQuaD4KICNp bmNsdWRlIDxXZWJDb3JlL1dpbmRvd01lc3NhZ2VCcm9hZGNhc3Rlci5oPgogI2luY2x1ZGUgPFdl YkNvcmUvV2luZG93c1RvdWNoLmg+CiAjaW5jbHVkZSA8YmluZGluZ3MvU2NyaXB0VmFsdWUuaD4K QEAgLTY1MTgsMzQgKzY1MjAsMTQxIEBAIEhSRVNVTFQgV2ViVmlldzo6YWRkVXNlclNjcmlwdFRv R3JvdXAoQlMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg YmxhY2tsaXN0Q291bnQsIEJTVFIqIGJsYWNrbGlzdCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgV2ViVXNlclNjcmlwdEluamVjdGlvblRpbWUgaW5qZWN0aW9uVGltZSkK IHsKLSAgICByZXR1cm4gRV9OT1RJTVBMOworICAgIHJldHVybiBhZGRVc2VyU2NyaXB0VG9Hcm91 cChncm91cE5hbWUsIGlXb3JsZCwgc291cmNlLCB1cmwsIHdoaXRlbGlzdENvdW50LCB3aGl0ZWxp c3QsIGJsYWNrbGlzdENvdW50LCBibGFja2xpc3QsIGluamVjdGlvblRpbWUsIFdlYkluamVjdElu QWxsRnJhbWVzKTsKK30KKworc3RhdGljIFZlY3RvcjxTdHJpbmc+IHRvU3RyaW5nVmVjdG9yKEJT VFIqIGVudHJpZXMsIHVuc2lnbmVkIGNvdW50KQoreworICAgIFZlY3RvcjxTdHJpbmc+IGVudHJp ZXNWZWN0b3I7CisgICAgaWYgKCFlbnRyaWVzIHx8ICFjb3VudCkKKyAgICAgICAgcmV0dXJuIGVu dHJpZXNWZWN0b3I7CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY291bnQ7ICsraSkK KyAgICAgICAgZW50cmllc1ZlY3Rvci5hcHBlbmQodG9TdHJpbmcoZW50cmllc1tpXSkpOworCisg ICAgcmV0dXJuIGVudHJpZXNWZWN0b3I7Cit9CisKK0hSRVNVTFQgV2ViVmlldzo6YWRkVXNlclNj cmlwdFRvR3JvdXAoQlNUUiBncm91cE5hbWUsIElXZWJTY3JpcHRXb3JsZCogaVdvcmxkLCBCU1RS IHNvdXJjZSwgQlNUUiB1cmwsCisgICAgdW5zaWduZWQgd2hpdGVsaXN0Q291bnQsIEJTVFIqIHdo aXRlbGlzdCwgdW5zaWduZWQgYmxhY2tsaXN0Q291bnQsIEJTVFIqIGJsYWNrbGlzdCwKKyAgICBX ZWJVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lLCBXZWJVc2VyQ29udGVudElu amVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzKQoreworICAgIFN0cmluZyBncm91cCA9IHRvU3Ry aW5nKGdyb3VwTmFtZSk7CisgICAgaWYgKGdyb3VwLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu IEVfRkFJTDsKKworICAgIGF1dG8gdmlld0dyb3VwID0gV2ViVmlld0dyb3VwOjpnZXRPckNyZWF0 ZShncm91cCwgU3RyaW5nKCkpOworICAgIGlmICghdmlld0dyb3VwKQorICAgICAgICByZXR1cm4g RV9GQUlMOworCisgICAgaWYgKCFpV29ybGQpCisgICAgICAgIHJldHVybiBFX1BPSU5URVI7CisK KyAgICBXZWJTY3JpcHRXb3JsZCogd29ybGQgPSByZWludGVycHJldF9jYXN0PFdlYlNjcmlwdFdv cmxkKj4oaVdvcmxkKTsKKyAgICBhdXRvIHVzZXJTY3JpcHQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVz ZXJTY3JpcHQ+KHNvdXJjZSwgdG9VUkwodXJsKSwgdG9TdHJpbmdWZWN0b3Iod2hpdGVsaXN0LCB3 aGl0ZWxpc3RDb3VudCksCisgICAgICAgIHRvU3RyaW5nVmVjdG9yKGJsYWNrbGlzdCwgYmxhY2ts aXN0Q291bnQpLCBpbmplY3Rpb25UaW1lID09IFdlYkluamVjdEF0RG9jdW1lbnRTdGFydCA/IElu amVjdEF0RG9jdW1lbnRTdGFydCA6IEluamVjdEF0RG9jdW1lbnRFbmQsCisgICAgICAgIGluamVj dGVkRnJhbWVzID09IFdlYkluamVjdEluQWxsRnJhbWVzID8gSW5qZWN0SW5BbGxGcmFtZXMgOiBJ bmplY3RJblRvcEZyYW1lT25seSk7CisgICAgdmlld0dyb3VwLT51c2VyQ29udGVudENvbnRyb2xs ZXIoKS5hZGRVc2VyU2NyaXB0KHdvcmxkLT53b3JsZCgpLCBXVEY6Om1vdmUodXNlclNjcmlwdCkp OworICAgIHJldHVybiBTX09LOwogfQogCiBIUkVTVUxUIFdlYlZpZXc6OmFkZFVzZXJTdHlsZVNo ZWV0VG9Hcm91cChCU1RSIGdyb3VwTmFtZSwgSVdlYlNjcmlwdFdvcmxkKiBpV29ybGQsIEJTVFIg c291cmNlLCBCU1RSIHVybCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHVuc2lnbmVkIHdoaXRlbGlzdENvdW50LCBCU1RSKiB3aGl0ZWxpc3QsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBibGFja2xpc3RDb3VudCwg QlNUUiogYmxhY2tsaXN0KQorICAgIHVuc2lnbmVkIHdoaXRlbGlzdENvdW50LCBCU1RSKiB3aGl0 ZWxpc3QsIHVuc2lnbmVkIGJsYWNrbGlzdENvdW50LCBCU1RSKiBibGFja2xpc3QpCiB7Ci0gICAg cmV0dXJuIEVfTk9USU1QTDsKKyAgICByZXR1cm4gYWRkVXNlclN0eWxlU2hlZXRUb0dyb3VwKGdy b3VwTmFtZSwgaVdvcmxkLCBzb3VyY2UsIHVybCwgd2hpdGVsaXN0Q291bnQsIHdoaXRlbGlzdCwg YmxhY2tsaXN0Q291bnQsIGJsYWNrbGlzdCwgV2ViSW5qZWN0SW5BbGxGcmFtZXMpOworfQorCitI UkVTVUxUIFdlYlZpZXc6OmFkZFVzZXJTdHlsZVNoZWV0VG9Hcm91cChCU1RSIGdyb3VwTmFtZSwg SVdlYlNjcmlwdFdvcmxkKiBpV29ybGQsIEJTVFIgc291cmNlLCBCU1RSIHVybCwKKyAgICB1bnNp Z25lZCB3aGl0ZWxpc3RDb3VudCwgQlNUUiogd2hpdGVsaXN0LCB1bnNpZ25lZCBibGFja2xpc3RD b3VudCwgQlNUUiogYmxhY2tsaXN0LCBXZWJVc2VyQ29udGVudEluamVjdGVkRnJhbWVzIGluamVj dGVkRnJhbWVzKQoreworICAgIFN0cmluZyBncm91cCA9IHRvU3RyaW5nKGdyb3VwTmFtZSk7Cisg ICAgaWYgKGdyb3VwLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEVfRkFJTDsKKworICAgIGF1 dG8gdmlld0dyb3VwID0gV2ViVmlld0dyb3VwOjpnZXRPckNyZWF0ZShncm91cCwgU3RyaW5nKCkp OworICAgIGlmICghdmlld0dyb3VwKQorICAgICAgICByZXR1cm4gRV9GQUlMOworCisgICAgaWYg KCFpV29ybGQpCisgICAgICAgIHJldHVybiBFX1BPSU5URVI7CisKKyAgICBXZWJTY3JpcHRXb3Js ZCogd29ybGQgPSByZWludGVycHJldF9jYXN0PFdlYlNjcmlwdFdvcmxkKj4oaVdvcmxkKTsKKyAg ICBhdXRvIHN0eWxlU2hlZXQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTdHlsZVNoZWV0Pihzb3Vy Y2UsIHRvVVJMKHVybCksIHRvU3RyaW5nVmVjdG9yKHdoaXRlbGlzdCwgd2hpdGVsaXN0Q291bnQp LCB0b1N0cmluZ1ZlY3RvcihibGFja2xpc3QsIGJsYWNrbGlzdENvdW50KSwKKyAgICAgICAgaW5q ZWN0ZWRGcmFtZXMgPT0gV2ViSW5qZWN0SW5BbGxGcmFtZXMgPyBJbmplY3RJbkFsbEZyYW1lcyA6 IEluamVjdEluVG9wRnJhbWVPbmx5LCBVc2VyU3R5bGVVc2VyTGV2ZWwpOworICAgIHZpZXdHcm91 cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkuYWRkVXNlclN0eWxlU2hlZXQod29ybGQtPndvcmxk KCksIFdURjo6bW92ZShzdHlsZVNoZWV0KSwgSW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cyk7Cisg ICAgcmV0dXJuIFNfT0s7CiB9CiAKIEhSRVNVTFQgV2ViVmlldzo6cmVtb3ZlVXNlclNjcmlwdEZy b21Hcm91cChCU1RSIGdyb3VwTmFtZSwgSVdlYlNjcmlwdFdvcmxkKiBpV29ybGQsIEJTVFIgdXJs KQogewotICAgIHJldHVybiBFX05PVElNUEw7CisgICAgU3RyaW5nIGdyb3VwID0gdG9TdHJpbmco Z3JvdXBOYW1lKTsKKyAgICBpZiAoZ3JvdXAuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gRV9G QUlMOworCisgICAgYXV0byB2aWV3R3JvdXAgPSBXZWJWaWV3R3JvdXA6OmdldChncm91cCk7Cisg ICAgaWYgKCF2aWV3R3JvdXApCisgICAgICAgIHJldHVybiBTX09LOworCisgICAgaWYgKCFpV29y bGQpCisgICAgICAgIHJldHVybiBFX1BPSU5URVI7CisKKyAgICBXZWJTY3JpcHRXb3JsZCogd29y bGQgPSByZWludGVycHJldF9jYXN0PFdlYlNjcmlwdFdvcmxkKj4oaVdvcmxkKTsKKyAgICB2aWV3 R3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigpLnJlbW92ZVVzZXJTY3JpcHQod29ybGQtPndv cmxkKCksIHRvVVJMKHVybCkpOworICAgIHJldHVybiBTX09LOwogfQogCiBIUkVTVUxUIFdlYlZp ZXc6OnJlbW92ZVVzZXJTdHlsZVNoZWV0RnJvbUdyb3VwKEJTVFIgZ3JvdXBOYW1lLCBJV2ViU2Ny aXB0V29ybGQqIGlXb3JsZCwgQlNUUiB1cmwpCiB7Ci0gICAgcmV0dXJuIEVfTk9USU1QTDsKKyAg ICBTdHJpbmcgZ3JvdXAgPSB0b1N0cmluZyhncm91cE5hbWUpOworICAgIGlmIChncm91cC5pc0Vt cHR5KCkpCisgICAgICAgIHJldHVybiBFX0ZBSUw7CisKKyAgICBhdXRvIHZpZXdHcm91cCA9IFdl YlZpZXdHcm91cDo6Z2V0KGdyb3VwKTsKKyAgICBpZiAoIXZpZXdHcm91cCkKKyAgICAgICAgcmV0 dXJuIFNfT0s7CisKKyAgICBpZiAoIWlXb3JsZCkKKyAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsK KworICAgIFdlYlNjcmlwdFdvcmxkKiB3b3JsZCA9IHJlaW50ZXJwcmV0X2Nhc3Q8V2ViU2NyaXB0 V29ybGQqPihpV29ybGQpOworICAgIHZpZXdHcm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCku cmVtb3ZlVXNlclN0eWxlU2hlZXQod29ybGQtPndvcmxkKCksIHRvVVJMKHVybCkpOworICAgIHJl dHVybiBTX09LOwogfQogCiBIUkVTVUxUIFdlYlZpZXc6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbUdy b3VwKEJTVFIgZ3JvdXBOYW1lLCBJV2ViU2NyaXB0V29ybGQqIGlXb3JsZCkKIHsKLSAgICByZXR1 cm4gRV9OT1RJTVBMOworICAgIFN0cmluZyBncm91cCA9IHRvU3RyaW5nKGdyb3VwTmFtZSk7Cisg ICAgaWYgKGdyb3VwLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEVfRkFJTDsKKworICAgIGF1 dG8gdmlld0dyb3VwID0gV2ViVmlld0dyb3VwOjpnZXQoZ3JvdXApOworICAgIGlmICghdmlld0dy b3VwKQorICAgICAgICByZXR1cm4gU19PSzsKKworICAgIGlmICghaVdvcmxkKQorICAgICAgICBy ZXR1cm4gRV9QT0lOVEVSOworCisgICAgV2ViU2NyaXB0V29ybGQqIHdvcmxkID0gcmVpbnRlcnBy ZXRfY2FzdDxXZWJTY3JpcHRXb3JsZCo+KGlXb3JsZCk7CisgICAgdmlld0dyb3VwLT51c2VyQ29u dGVudENvbnRyb2xsZXIoKS5yZW1vdmVVc2VyU2NyaXB0cyh3b3JsZC0+d29ybGQoKSk7CisgICAg cmV0dXJuIFNfT0s7CiB9CiAKIEhSRVNVTFQgV2ViVmlldzo6cmVtb3ZlVXNlclN0eWxlU2hlZXRz RnJvbUdyb3VwKEJTVFIgZ3JvdXBOYW1lLCBJV2ViU2NyaXB0V29ybGQqIGlXb3JsZCkKIHsKLSAg ICByZXR1cm4gRV9OT1RJTVBMOworICAgIFN0cmluZyBncm91cCA9IHRvU3RyaW5nKGdyb3VwTmFt ZSk7CisgICAgaWYgKGdyb3VwLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEVfRkFJTDsKKwor ICAgIGF1dG8gdmlld0dyb3VwID0gV2ViVmlld0dyb3VwOjpnZXQoZ3JvdXApOworICAgIGlmICgh dmlld0dyb3VwKQorICAgICAgICByZXR1cm4gU19PSzsKKworICAgIGlmICghaVdvcmxkKQorICAg ICAgICByZXR1cm4gRV9QT0lOVEVSOworCisgICAgV2ViU2NyaXB0V29ybGQqIHdvcmxkID0gcmVp bnRlcnByZXRfY2FzdDxXZWJTY3JpcHRXb3JsZCo+KGlXb3JsZCk7CisgICAgdmlld0dyb3VwLT51 c2VyQ29udGVudENvbnRyb2xsZXIoKS5yZW1vdmVVc2VyU3R5bGVTaGVldHMod29ybGQtPndvcmxk KCkpOworICAgIHJldHVybiBTX09LOwogfQogCiBIUkVTVUxUIFdlYlZpZXc6OnJlbW92ZUFsbFVz ZXJDb250ZW50RnJvbUdyb3VwKEJTVFIgZ3JvdXBOYW1lKQpJbmRleDogU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAko cmV2aXNpb24gMTg3MzQ0KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywg MjAwOCwgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiwgMjAxNCBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMTIsIDIwMTQtMjAxNSBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEwLCAy MDExIEFwcGNlbGVyYXRvciwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0 IChDKSAyMDExIEJyZW50IEZ1bGdoYW0uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgpAQCAtODQ2 LDYgKzg0NiwxMCBAQCBwdWJsaWM6CiAgICAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaXNw YXRjaFBlbmRpbmdMb2FkUmVxdWVzdHMoKTsKICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9E Q0FMTFRZUEUgc2V0Q3VzdG9tQmFja2luZ1NjYWxlRmFjdG9yKGRvdWJsZSk7CiAgICAgdmlydHVh bCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIGJhY2tpbmdTY2FsZUZhY3Rvcihkb3VibGUqKTsK KyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgYWRkVXNlclNjcmlwdFRvR3Jv dXAoQlNUUiBncm91cE5hbWUsIElXZWJTY3JpcHRXb3JsZCosIEJTVFIgc291cmNlLCBCU1RSIHVy bCwKKyAgICAgICAgdW5zaWduZWQgd2hpdGVsaXN0Q291bnQsIEJTVFIqIHdoaXRlbGlzdCwgdW5z aWduZWQgYmxhY2tsaXN0Q291bnQsIEJTVFIqIGJsYWNrbGlzdCwgV2ViVXNlclNjcmlwdEluamVj dGlvblRpbWUsIFdlYlVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMpOworICAgIHZpcnR1YWwgSFJF U1VMVCBTVERNRVRIT0RDQUxMVFlQRSBhZGRVc2VyU3R5bGVTaGVldFRvR3JvdXAoQlNUUiBncm91 cE5hbWUsIElXZWJTY3JpcHRXb3JsZCosIEJTVFIgc291cmNlLCBCU1RSIHVybCwKKyAgICAgICAg dW5zaWduZWQgd2hpdGVsaXN0Q291bnQsIEJTVFIqIHdoaXRlbGlzdCwgdW5zaWduZWQgYmxhY2ts aXN0Q291bnQsIEJTVFIqIGJsYWNrbGlzdCwgV2ViVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyk7 CiAKICAgICAvLyBXZWJWaWV3CiAgICAgYm9vbCBzaG91bGRVc2VFbWJlZGRlZFZpZXcoY29uc3Qg V1RGOjpTdHJpbmcmIG1pbWVUeXBlKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0lu dGVyZmFjZXMvSVdlYlZpZXdQcml2YXRlLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9JbnRlcmZhY2VzL0lXZWJWaWV3UHJpdmF0ZS5pZGwJKHJldmlzaW9uIDE4NzM0NCkKKysr IFNvdXJjZS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYlZpZXdQcml2YXRlLmlkbAkod29ya2lu ZyBjb3B5KQpAQCAtNTAsNiArNTAsMTEgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBXZWJJbmplY3RB dERvY3VtZW50RW5kLAogfSBXZWJVc2VyU2NyaXB0SW5qZWN0aW9uVGltZTsKIAordHlwZWRlZiBl bnVtIHsKKyAgICBXZWJJbmplY3RJbkFsbEZyYW1lcyA9IDAsCisgICAgV2ViSW5qZWN0SW5Ub3BG cmFtZU9ubHksCit9IFdlYlVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXM7CisKIFsKICAgICBvYmpl Y3QsCiAgICAgb2xlYXV0b21hdGlvbiwKQEAgLTMwNCw0ICszMDksMTQgQEAgaW50ZXJmYWNlIElX ZWJWaWV3UHJpdmF0ZTIgOiBJV2ViVmlld1ByaQogCiAgICAgSFJFU1VMVCBzZXRDdXN0b21CYWNr aW5nU2NhbGVGYWN0b3IoW2luXSBkb3VibGUpOwogICAgIEhSRVNVTFQgYmFja2luZ1NjYWxlRmFj dG9yKFtvdXRdIGRvdWJsZSopOworCisgICAgSFJFU1VMVCBhZGRVc2VyU2NyaXB0VG9Hcm91cChb aW5dIEJTVFIgZ3JvdXBOYW1lLCBbaW5dIElXZWJTY3JpcHRXb3JsZCosIFtpbl0gQlNUUiBzb3Vy Y2UsIFtpbl0gQlNUUiB1cmwsCisgICAgICAgIFtpbl0gdW5zaWduZWQgd2hpdGVsaXN0Q291bnQs IFtpbiwgc2l6ZV9pcyh3aGl0ZWxpc3RDb3VudCldIEJTVFIqIHdoaXRlbGlzdCwKKyAgICAgICAg W2luXSB1bnNpZ25lZCBibGFja2xpc3RDb3VudCwgW2luLCBzaXplX2lzKGJsYWNrbGlzdENvdW50 KV0gQlNUUiogYmxhY2tsaXN0LAorICAgICAgICBbaW5dIFdlYlVzZXJTY3JpcHRJbmplY3Rpb25U aW1lIGluamVjdGlvblRpbWUsIFtpbl0gV2ViVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmpl Y3RlZEZyYW1lcyk7CisKKyAgICBIUkVTVUxUIGFkZFVzZXJTdHlsZVNoZWV0VG9Hcm91cChbaW5d IEJTVFIgZ3JvdXBOYW1lLCBbaW5dIElXZWJTY3JpcHRXb3JsZCosIFtpbl0gQlNUUiBzb3VyY2Us IFtpbl0gQlNUUiB1cmwsCisgICAgICAgIFtpbl0gdW5zaWduZWQgd2hpdGVsaXN0Q291bnQsIFtp biwgc2l6ZV9pcyh3aGl0ZWxpc3RDb3VudCldIEJTVFIqIHdoaXRlbGlzdCwKKyAgICAgICAgW2lu XSB1bnNpZ25lZCBibGFja2xpc3RDb3VudCwgW2luLCBzaXplX2lzKGJsYWNrbGlzdENvdW50KV0g QlNUUiogYmxhY2tsaXN0LAorICAgICAgICBbaW5dIFdlYlVzZXJDb250ZW50SW5qZWN0ZWRGcmFt ZXMgaW5qZWN0ZWRGcmFtZXMpOwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6 IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9u IDE4NzM2NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2 IEBACisyMDE1LTA3LTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisg ICAgICAgIFtXaW5dIEFjdGl2YXRlIENTUF9ORVhUIGFuZCBDb25uZWN0IFVzZXJTY3JpcHQgYW5k IFVzZXJTdHlsZVNoZWV0IHRocm91Z2ggV2ViVmlldy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzI3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjE5OTA3Njc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldpbi5jcHA6CisgICAgICAgIChUZXN0 UnVubmVyOjphZGRVc2VyU2NyaXB0KToKKyAgICAgICAgKFRlc3RSdW5uZXI6OmFkZFVzZXJTdHls ZVNoZWV0KToKKyAgICAgICAgKFRlc3RSdW5uZXI6OnNldERldmVsb3BlckV4dHJhc0VuYWJsZWQp OgorCiAyMDE1LTA3LTI0ICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9jbGVtZW50QGFwcGxlLmNv bT4KIAogICAgICAgICBDYWxsIGZpeENoYW5nZUxvZ1BhdGNoIHdoZW4gZ2VuZXJhdGluZyBwYXRj aGVzIGZyb20gd2Via2l0LXBhdGNoCkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVGVz dFJ1bm5lcldpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rl c3RSdW5uZXJXaW4uY3BwCShyZXZpc2lvbiAxODczNDQpCisrKyBUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vVGVzdFJ1bm5lcldpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk5Nyw3ICs5OTcsOSBA QCB2b2lkIFRlc3RSdW5uZXI6OmFkZFVzZXJTY3JpcHQoSlNTdHJpbmdSCiAgICAgaWYgKEZBSUxF RChXZWJLaXRDcmVhdGVJbnN0YW5jZShfX3V1aWRvZihXZWJTY3JpcHRXb3JsZCksIDAsIF9fdXVp ZG9mKHdvcmxkKSwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZ3b3JsZCkpKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgd2ViVmlldy0+YWRkVXNlclNjcmlwdFRvR3JvdXAoX2JzdHJfdChMIm9y Zy53ZWJraXQuRHVtcFJlbmRlclRyZWUiKS5HZXRCU1RSKCksIHdvcmxkLmdldCgpLCBic3RyVChz b3VyY2UpLkdldEJTVFIoKSwgMCwgMCwgMCwgMCwgMCwgcnVuQXRTdGFydCA/IFdlYkluamVjdEF0 RG9jdW1lbnRTdGFydCA6IFdlYkluamVjdEF0RG9jdW1lbnRFbmQpOworICAgIHdlYlZpZXctPmFk ZFVzZXJTY3JpcHRUb0dyb3VwKF9ic3RyX3QoTCJvcmcud2Via2l0LkR1bXBSZW5kZXJUcmVlIiku R2V0QlNUUigpLCB3b3JsZC5nZXQoKSwgYnN0clQoc291cmNlKS5HZXRCU1RSKCksCisgICAgICAg IG51bGxwdHIsIDAsIG51bGxwdHIsIDAsIG51bGxwdHIsIHJ1bkF0U3RhcnQgPyBXZWJJbmplY3RB dERvY3VtZW50U3RhcnQgOiBXZWJJbmplY3RBdERvY3VtZW50RW5kLAorICAgICAgICBhbGxGcmFt ZXMgPyBXZWJJbmplY3RJbkFsbEZyYW1lcyA6IFdlYkluamVjdEluVG9wRnJhbWVPbmx5KTsKIH0K IAogdm9pZCBUZXN0UnVubmVyOjphZGRVc2VyU3R5bGVTaGVldChKU1N0cmluZ1JlZiBzb3VyY2Us IGJvb2wgYWxsRnJhbWVzKQpAQCAtMTAxMCw3ICsxMDEyLDggQEAgdm9pZCBUZXN0UnVubmVyOjph ZGRVc2VyU3R5bGVTaGVldChKU1N0cgogICAgIGlmIChGQUlMRUQoV2ViS2l0Q3JlYXRlSW5zdGFu Y2UoX191dWlkb2YoV2ViU2NyaXB0V29ybGQpLCAwLCBfX3V1aWRvZih3b3JsZCksIHJlaW50ZXJw cmV0X2Nhc3Q8dm9pZCoqPigmd29ybGQpKSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHdlYlZp ZXctPmFkZFVzZXJTdHlsZVNoZWV0VG9Hcm91cChfYnN0cl90KEwib3JnLndlYmtpdC5EdW1wUmVu ZGVyVHJlZSIpLkdldEJTVFIoKSwgd29ybGQuZ2V0KCksIGJzdHJUKHNvdXJjZSkuR2V0QlNUUigp LCAwLCAwLCAwLCAwLCAwKTsKKyAgICB3ZWJWaWV3LT5hZGRVc2VyU3R5bGVTaGVldFRvR3JvdXAo X2JzdHJfdChMIm9yZy53ZWJraXQuRHVtcFJlbmRlclRyZWUiKS5HZXRCU1RSKCksIHdvcmxkLmdl dCgpLCBic3RyVChzb3VyY2UpLkdldEJTVFIoKSwKKyAgICAgICAgbnVsbHB0ciwgMCwgbnVsbHB0 ciwgMCwgbnVsbHB0ciwgYWxsRnJhbWVzID8gV2ViSW5qZWN0SW5BbGxGcmFtZXMgOiBXZWJJbmpl Y3RJblRvcEZyYW1lT25seSk7CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6c2V0RGV2ZWxvcGVyRXh0 cmFzRW5hYmxlZChib29sIGVuYWJsZWQpCkluZGV4OiBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xz L3ZzcHJvcHMvRmVhdHVyZURlZmluZXMucHJvcHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0TGlicmFy aWVzL3dpbi90b29scy92c3Byb3BzL0ZlYXR1cmVEZWZpbmVzLnByb3BzCShyZXZpc2lvbiAxODcz NDQpCisrKyBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvRmVhdHVyZURlZmluZXMu cHJvcHMJKHdvcmtpbmcgY29weSkKQEAgLTgsNyArOCw3IEBACiAgICAgPEVOQUJMRV9DQU5WQVNf UEFUSD5FTkFCTEVfQ0FOVkFTX1BBVEg8L0VOQUJMRV9DQU5WQVNfUEFUSD4KICAgICA8RU5BQkxF X0NBTlZBU19QUk9YWSAvPgogICAgIDxFTkFCTEVfQ0hBTk5FTF9NRVNTQUdJTkc+RU5BQkxFX0NI QU5ORUxfTUVTU0FHSU5HPC9FTkFCTEVfQ0hBTk5FTF9NRVNTQUdJTkc+Ci0gICAgPEVOQUJMRV9D U1BfTkVYVCAvPgorICAgIDxFTkFCTEVfQ1NQX05FWFQ+RU5BQkxFX0NTUF9ORVhUPC9FTkFCTEVf Q1NQX05FWFQ+CiAgICAgPEVOQUJMRV9DU1MzX0NPTkRJVElPTkFMX1JVTEVTPkVOQUJMRV9DU1Mz X0NPTkRJVElPTkFMX1JVTEVTPC9FTkFCTEVfQ1NTM19DT05ESVRJT05BTF9SVUxFUz4KICAgICA8 RU5BQkxFX0NTUzNfVEVYVCAvPgogICAgIDxFTkFCTEVfQ1NTX0JPWF9ERUNPUkFUSU9OX0JSRUFL PkVOQUJMRV9DU1NfQk9YX0RFQ09SQVRJT05fQlJFQUs8L0VOQUJMRV9DU1NfQk9YX0RFQ09SQVRJ T05fQlJFQUs+CkluZGV4OiBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvRmVhdHVy ZURlZmluZXNDYWlyby5wcm9wcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRMaWJyYXJpZXMvd2luL3Rv b2xzL3ZzcHJvcHMvRmVhdHVyZURlZmluZXNDYWlyby5wcm9wcwkocmV2aXNpb24gMTg3MzQ0KQor KysgV2ViS2l0TGlicmFyaWVzL3dpbi90b29scy92c3Byb3BzL0ZlYXR1cmVEZWZpbmVzQ2Fpcm8u cHJvcHMJKHdvcmtpbmcgY29weSkKQEAgLTgsNyArOCw3IEBACiAgICAgPEVOQUJMRV9DQU5WQVNf UEFUSD5FTkFCTEVfQ0FOVkFTX1BBVEg8L0VOQUJMRV9DQU5WQVNfUEFUSD4KICAgICA8RU5BQkxF X0NBTlZBU19QUk9YWSAvPgogICAgIDxFTkFCTEVfQ0hBTk5FTF9NRVNTQUdJTkc+RU5BQkxFX0NI QU5ORUxfTUVTU0FHSU5HPC9FTkFCTEVfQ0hBTk5FTF9NRVNTQUdJTkc+Ci0gICAgPEVOQUJMRV9D U1BfTkVYVCAvPgorICAgIDxFTkFCTEVfQ1NQX05FWFQ+RU5BQkxFX0NTUF9ORVhUPC9FTkFCTEVf Q1NQX05FWFQ+CiAgICAgPEVOQUJMRV9DU1MzX0NPTkRJVElPTkFMX1JVTEVTPkVOQUJMRV9DU1Mz X0NPTkRJVElPTkFMX1JVTEVTPC9FTkFCTEVfQ1NTM19DT05ESVRJT05BTF9SVUxFUz4KICAgICA8 RU5BQkxFX0NTUzNfVEVYVCAvPgogICAgIDxFTkFCTEVfQ1NTX0JPWF9ERUNPUkFUSU9OX0JSRUFL PkVOQUJMRV9DU1NfQk9YX0RFQ09SQVRJT05fQlJFQUs8L0VOQUJMRV9DU1NfQk9YX0RFQ09SQVRJ T05fQlJFQUs+CkluZGV4OiBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvY29tbW9u LnByb3BzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdExpYnJhcmllcy93aW4vdG9vbHMvdnNwcm9wcy9j b21tb24ucHJvcHMJKHJldmlzaW9uIDE4NzM0NCkKKysrIFdlYktpdExpYnJhcmllcy93aW4vdG9v bHMvdnNwcm9wcy9jb21tb24ucHJvcHMJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAg bm1ha2UgL25vbG9nbyAtZiAkKFByb2plY3ROYW1lKS5tYWtlIGNsZQogICAgIDxDbENvbXBpbGU+ CiAgICAgICA8QWRkaXRpb25hbE9wdGlvbnM+L2JpZ29iaiAvR1MgJShBZGRpdGlvbmFsT3B0aW9u cyk8L0FkZGl0aW9uYWxPcHRpb25zPgogICAgICAgPFByZXByb2Nlc3NvckRlZmluaXRpb25zPl9X SU5ET1dTO1dJTlZFUj0weDUwMjtfQ1JUX1NFQ1VSRV9DUFBfT1ZFUkxPQURfU1RBTkRBUkRfTkFN RVM9MTtfSEFTX0VYQ0VQVElPTlM9MDtCVUlMRElOR18kKFByb2plY3ROYW1lKTtOT01JTk1BWDtX SU4zMjslKFByZXByb2Nlc3NvckRlZmluaXRpb25zKTwvUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM+ Ci0gICAgICA8UHJlcHJvY2Vzc29yRGVmaW5pdGlvbnMgQ29uZGl0aW9uPSIkKFBsYXRmb3JtKT09 J1dpbjMyJyI+V0lOMzI7JShQcmVwcm9jZXNzb3JEZWZpbml0aW9ucyk8L1ByZXByb2Nlc3NvckRl ZmluaXRpb25zPgorICAgICAgPFByZXByb2Nlc3NvckRlZmluaXRpb25zIENvbmRpdGlvbj0iJChQ bGF0Zm9ybSk9PSdXaW4zMiciPldJTjMyO1dJTlZFUj0weDYwMTslKFByZXByb2Nlc3NvckRlZmlu aXRpb25zKTwvUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM+CiAgICAgICA8UHJlcHJvY2Vzc29yRGVm aW5pdGlvbnMgQ29uZGl0aW9uPSIkKFBsYXRmb3JtKT09J1dpbjY0JyI+eDY0PC9QcmVwcm9jZXNz b3JEZWZpbml0aW9ucz4KICAgICAgIDxFeGNlcHRpb25IYW5kbGluZz5mYWxzZTwvRXhjZXB0aW9u SGFuZGxpbmc+CiAgICAgICA8UnVudGltZVR5cGVJbmZvPmZhbHNlPC9SdW50aW1lVHlwZUluZm8+ Cg==