149847 2015-10-06 09:36:29 -0700 Refactor TokenPreloadScanner::StartTagScanner::processAttribute() 2015-10-06 13:41:28 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue esprehn+autocc gyuyoung.kim koivisto rniwa oldest_to_newest 1130991 0 cdumez 2015-10-06 09:36:29 -0700 Refactor TokenPreloadScanner::StartTagScanner::processAttribute() to only process attributes that make sense given the current tagId. 1130996 1 262517 cdumez 2015-10-06 09:41:35 -0700 Created attachment 262517 Patch 1131067 2 262517 koivisto 2015-10-06 12:12:13 -0700 Comment on attachment 262517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262517&action=review > Source/WebCore/html/parser/HTMLPreloadScanner.cpp:155 > + FALLTHROUGH; It would be nicer to factor common things into a function rather than doing Img->Script fallthrough. 1131098 3 262542 cdumez 2015-10-06 13:17:28 -0700 Created attachment 262542 Patch 1131107 4 262542 commit-queue 2015-10-06 13:41:23 -0700 Comment on attachment 262542 Patch Clearing flags on attachment: 262542 Committed r190641: <http://trac.webkit.org/changeset/190641> 1131108 5 commit-queue 2015-10-06 13:41:28 -0700 All reviewed patches have been landed. Closing bug. 262517 2015-10-06 09:41:35 -0700 2015-10-06 13:17:23 -0700 Patch bug-149847-20151006094106.patch text/plain 4648 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI2NWYyMmYzZjY4OTMw ZjNiODRiZTQ0ZjY5YThhYjA3NTJiNzAxOC4uOWJjOGZmMTRlYjU1YmMzYWMwYWJlZDYzYTBiOWJj YTk2OGRhYjhhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgVG9rZW5QcmVs b2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyOjpwcm9jZXNzQXR0cmlidXRlKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTg0NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIFRva2VuUHJl bG9hZFNjYW5uZXI6OlN0YXJ0VGFnU2Nhbm5lcjo6cHJvY2Vzc0F0dHJpYnV0ZSgpIHRvIG9ubHkK KyAgICAgICAgcHJvY2VzcyBhdHRyaWJ1dGVzIHRoYXQgbWFrZSBzZW5zZSBnaXZlbiB0aGUgY3Vy cmVudCB0YWdJZC4gSW4gcGFydGljdWxhciwKKyAgICAgICAgLSBXZSBvbmx5IHByb2Nlc3MgdGhl IGNoYXJzZXQgcGFyYW1ldGVyIGlmIHRoZSB0YWcgaXMgYSBsaW5rIG9yIGEgc2NyaXB0LgorICAg ICAgICAtIFdlIG9ubHkgcHJvY2VzcyB0aGUgc2l6ZXMgLyBzcmNzZXQgYXR0cmlidXRlcyBpZiB0 aGUgdGFnIGlzIGFuIGltZy4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nh bm5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUb2tlblByZWxvYWRTY2FubmVyOjpTdGFydFRh Z1NjYW5uZXI6OnByb2Nlc3NBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6VG9rZW5QcmVs b2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyOjpzZXRVcmxUb0xvYWQpOiBEZWxldGVkLgorCiAy MDE1LTEwLTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5wcmVmaXggLXdlYmtpdC1mb250LWZlYXR1cmUtc2V0dGluZ3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwCmluZGV4IDYyMGI1 MjY1YWIyN2Q5N2ZkODhiNDBlODgxMDZiYjAzOTZlMmNhMDMuLmNkYWU0NmFmYmU0OWRhNDVlOTBm YTA0NTRiOTM1MDNjZDc2Y2JhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcApAQCAtMTQwLDM4ICsxNDAsNTQgQEAgcHVibGljOgog ICAgIH0KIAogcHJpdmF0ZToKLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBOYW1lVHlwZT4KLSAgICB2 b2lkIHByb2Nlc3NBdHRyaWJ1dGUoY29uc3QgTmFtZVR5cGUmIGF0dHJpYnV0ZU5hbWUsIGNvbnN0 IFN0cmluZyYgYXR0cmlidXRlVmFsdWUpCisgICAgdm9pZCBwcm9jZXNzQXR0cmlidXRlKGNvbnN0 IEF0b21pY1N0cmluZyYgYXR0cmlidXRlTmFtZSwgY29uc3QgU3RyaW5nJiBhdHRyaWJ1dGVWYWx1 ZSkKICAgICB7Ci0gICAgICAgIGlmIChtYXRjaChhdHRyaWJ1dGVOYW1lLCBjaGFyc2V0QXR0cikp Ci0gICAgICAgICAgICBtX2NoYXJzZXQgPSBhdHRyaWJ1dGVWYWx1ZTsKLQotICAgICAgICBpZiAo bV90YWdJZCA9PSBUYWdJZDo6U2NyaXB0IHx8IG1fdGFnSWQgPT0gVGFnSWQ6OkltZykgewotICAg ICAgICAgICAgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIHNyY0F0dHIpKQotICAgICAgICAgICAg ICAgIHNldFVybFRvTG9hZChhdHRyaWJ1dGVWYWx1ZSk7Ci0gICAgICAgICAgICBlbHNlIGlmICht YXRjaChhdHRyaWJ1dGVOYW1lLCBzcmNzZXRBdHRyKSAmJiBtX3NyY1NldEF0dHJpYnV0ZS5pc051 bGwoKSkKKyAgICAgICAgc3dpdGNoIChtX3RhZ0lkKSB7CisgICAgICAgIGNhc2UgVGFnSWQ6Oklt ZzoKKyAgICAgICAgICAgIGlmIChtYXRjaChhdHRyaWJ1dGVOYW1lLCBzcmNzZXRBdHRyKSAmJiBt X3NyY1NldEF0dHJpYnV0ZS5pc051bGwoKSkgewogICAgICAgICAgICAgICAgIG1fc3JjU2V0QXR0 cmlidXRlID0gYXR0cmlidXRlVmFsdWU7Ci0gICAgICAgICAgICBlbHNlIGlmIChtYXRjaChhdHRy aWJ1dGVOYW1lLCBzaXplc0F0dHIpICYmIG1fc2l6ZXNBdHRyaWJ1dGUuaXNOdWxsKCkpCisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobWF0Y2go YXR0cmlidXRlTmFtZSwgc2l6ZXNBdHRyKSAmJiBtX3NpemVzQXR0cmlidXRlLmlzTnVsbCgpKSB7 CiAgICAgICAgICAgICAgICAgbV9zaXplc0F0dHJpYnV0ZSA9IGF0dHJpYnV0ZVZhbHVlOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgRkFMTFRIUk9V R0g7CisgICAgICAgIGNhc2UgVGFnSWQ6OlNjcmlwdDoKKyAgICAgICAgICAgIGlmIChtYXRjaChh dHRyaWJ1dGVOYW1lLCBzcmNBdHRyKSkKKyAgICAgICAgICAgICAgICBzZXRVcmxUb0xvYWQoYXR0 cmlidXRlVmFsdWUpOwogICAgICAgICAgICAgZWxzZSBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwg Y3Jvc3NvcmlnaW5BdHRyKSAmJiAhYXR0cmlidXRlVmFsdWUuaXNOdWxsKCkpCiAgICAgICAgICAg ICAgICAgbV9jcm9zc09yaWdpbk1vZGUgPSBzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFj ZXMoYXR0cmlidXRlVmFsdWUpOwotICAgICAgICB9IGVsc2UgaWYgKG1fdGFnSWQgPT0gVGFnSWQ6 OkxpbmspIHsKKyAgICAgICAgICAgIGVsc2UgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIGNoYXJz ZXRBdHRyKSkKKyAgICAgICAgICAgICAgICBtX2NoYXJzZXQgPSBhdHRyaWJ1dGVWYWx1ZTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFRhZ0lkOjpMaW5rOgogICAgICAgICAgICAg aWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIGhyZWZBdHRyKSkKICAgICAgICAgICAgICAgICBzZXRV cmxUb0xvYWQoYXR0cmlidXRlVmFsdWUpOwogICAgICAgICAgICAgZWxzZSBpZiAobWF0Y2goYXR0 cmlidXRlTmFtZSwgcmVsQXR0cikpCiAgICAgICAgICAgICAgICAgbV9saW5rSXNTdHlsZVNoZWV0 ID0gcmVsQXR0cmlidXRlSXNTdHlsZVNoZWV0KGF0dHJpYnV0ZVZhbHVlKTsKICAgICAgICAgICAg IGVsc2UgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIG1lZGlhQXR0cikpCiAgICAgICAgICAgICAg ICAgbV9tZWRpYUF0dHJpYnV0ZSA9IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICB9IGVsc2UgaWYg KG1fdGFnSWQgPT0gVGFnSWQ6OklucHV0KSB7CisgICAgICAgICAgICBlbHNlIGlmIChtYXRjaChh dHRyaWJ1dGVOYW1lLCBjaGFyc2V0QXR0cikpCisgICAgICAgICAgICAgICAgbV9jaGFyc2V0ID0g YXR0cmlidXRlVmFsdWU7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBUYWdJZDo6 SW5wdXQ6CiAgICAgICAgICAgICBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgc3JjQXR0cikpCiAg ICAgICAgICAgICAgICAgc2V0VXJsVG9Mb2FkKGF0dHJpYnV0ZVZhbHVlKTsKICAgICAgICAgICAg IGVsc2UgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIHR5cGVBdHRyKSkKICAgICAgICAgICAgICAg ICBtX2lucHV0SXNJbWFnZSA9IGVxdWFsSWdub3JpbmdDYXNlKGF0dHJpYnV0ZVZhbHVlLCBJbnB1 dFR5cGVOYW1lczo6aW1hZ2UoKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAobV90YWdJZCA9PSBUYWdJ ZDo6TWV0YSkgeworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgVGFnSWQ6Ok1ldGE6 CiAgICAgICAgICAgICBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgY29udGVudEF0dHIpKQogICAg ICAgICAgICAgICAgIG1fbWV0YUNvbnRlbnQgPSBhdHRyaWJ1dGVWYWx1ZTsKICAgICAgICAgICAg IGVsc2UgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIG5hbWVBdHRyKSkKICAgICAgICAgICAgICAg ICBtX21ldGFJc1ZpZXdwb3J0ID0gZXF1YWxJZ25vcmluZ0Nhc2UoYXR0cmlidXRlVmFsdWUsICJ2 aWV3cG9ydCIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgVGFnSWQ6OkJhc2U6 CisgICAgICAgIGNhc2UgVGFnSWQ6OlN0eWxlOgorICAgICAgICBjYXNlIFRhZ0lkOjpUZW1wbGF0 ZToKKyAgICAgICAgY2FzZSBUYWdJZDo6VW5rbm93bjoKKyAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CiAgICAgfQogCkBAIC0xOTUsOSArMjExLDYgQEAgcHJpdmF0ZToKIAogICAgIGNvbnN0 IFN0cmluZyYgY2hhcnNldCgpIGNvbnN0CiAgICAgewotICAgICAgICAvLyBGSVhNRTogSXRzIG5v dCBjbGVhciB0aGF0IHRoaXMgaWYgaXMgbmVlZGVkLCB0aGUgbG9hZGVyIHByb2JhYmx5IGlnbm9y ZXMgY2hhcnNldCBmb3IgaW1hZ2UgcmVxdWVzdHMgYW55d2F5LgotICAgICAgICBpZiAobV90YWdJ ZCA9PSBUYWdJZDo6SW1nKQotICAgICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAgICAg ICAgIHJldHVybiBtX2NoYXJzZXQ7CiAgICAgfQogCg== 262542 2015-10-06 13:17:28 -0700 2015-10-06 13:41:23 -0700 Patch bug-149847-20151006131658.patch text/plain 5026 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI2NWYyMmYzZjY4OTMw ZjNiODRiZTQ0ZjY5YThhYjA3NTJiNzAxOC4uYjQwYWM0NDM2NDk0YzE2NTc5NjMwYjk2OWYxYjJm ZTA3YjdhZTA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgVG9rZW5QcmVs b2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyOjpwcm9jZXNzQXR0cmlidXRlKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTg0NworCisgICAgICAg IFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFJlZmFjdG9yIFRva2VuUHJl bG9hZFNjYW5uZXI6OlN0YXJ0VGFnU2Nhbm5lcjo6cHJvY2Vzc0F0dHJpYnV0ZSgpIHRvIG9ubHkK KyAgICAgICAgcHJvY2VzcyBhdHRyaWJ1dGVzIHRoYXQgbWFrZSBzZW5zZSBnaXZlbiB0aGUgY3Vy cmVudCB0YWdJZC4gSW4gcGFydGljdWxhciwKKyAgICAgICAgLSBXZSBvbmx5IHByb2Nlc3MgdGhl IGNoYXJzZXQgcGFyYW1ldGVyIGlmIHRoZSB0YWcgaXMgYSBsaW5rIG9yIGEgc2NyaXB0LgorICAg ICAgICAtIFdlIG9ubHkgcHJvY2VzcyB0aGUgc2l6ZXMgLyBzcmNzZXQgYXR0cmlidXRlcyBpZiB0 aGUgdGFnIGlzIGFuIGltZy4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nh bm5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUb2tlblByZWxvYWRTY2FubmVyOjpTdGFydFRh Z1NjYW5uZXI6OnByb2Nlc3NBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6VG9rZW5QcmVs b2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyOjpzZXRVcmxUb0xvYWQpOiBEZWxldGVkLgorCiAy MDE1LTEwLTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5wcmVmaXggLXdlYmtpdC1mb250LWZlYXR1cmUtc2V0dGluZ3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwCmluZGV4IDYyMGI1 MjY1YWIyN2Q5N2ZkODhiNDBlODgxMDZiYjAzOTZlMmNhMDMuLmM4MjJkNTNiOWNmNDhhODI1ODNk NDBmYzA5MGJmMmJhZWFlMWE2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcApAQCAtMTQwLDM4ICsxNDAsNjAgQEAgcHVibGljOgog ICAgIH0KIAogcHJpdmF0ZToKLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBOYW1lVHlwZT4KLSAgICB2 b2lkIHByb2Nlc3NBdHRyaWJ1dGUoY29uc3QgTmFtZVR5cGUmIGF0dHJpYnV0ZU5hbWUsIGNvbnN0 IFN0cmluZyYgYXR0cmlidXRlVmFsdWUpCisgICAgdm9pZCBwcm9jZXNzSW1hZ2VBbmRTY3JpcHRB dHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiBhdHRyaWJ1dGVOYW1lLCBjb25zdCBTdHJpbmcm IGF0dHJpYnV0ZVZhbHVlKQogICAgIHsKLSAgICAgICAgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUs IGNoYXJzZXRBdHRyKSkKKyAgICAgICAgaWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIHNyY0F0dHIp KQorICAgICAgICAgICAgc2V0VXJsVG9Mb2FkKGF0dHJpYnV0ZVZhbHVlKTsKKyAgICAgICAgZWxz ZSBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgY3Jvc3NvcmlnaW5BdHRyKSAmJiAhYXR0cmlidXRl VmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAgICBtX2Nyb3NzT3JpZ2luTW9kZSA9IHN0cmlwTGVh ZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlcyhhdHRyaWJ1dGVWYWx1ZSk7CisgICAgICAgIGVsc2Ug aWYgKG1hdGNoKGF0dHJpYnV0ZU5hbWUsIGNoYXJzZXRBdHRyKSkKICAgICAgICAgICAgIG1fY2hh cnNldCA9IGF0dHJpYnV0ZVZhbHVlOworICAgIH0KIAotICAgICAgICBpZiAobV90YWdJZCA9PSBU YWdJZDo6U2NyaXB0IHx8IG1fdGFnSWQgPT0gVGFnSWQ6OkltZykgewotICAgICAgICAgICAgaWYg KG1hdGNoKGF0dHJpYnV0ZU5hbWUsIHNyY0F0dHIpKQotICAgICAgICAgICAgICAgIHNldFVybFRv TG9hZChhdHRyaWJ1dGVWYWx1ZSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChtYXRjaChhdHRyaWJ1 dGVOYW1lLCBzcmNzZXRBdHRyKSAmJiBtX3NyY1NldEF0dHJpYnV0ZS5pc051bGwoKSkKKyAgICB2 b2lkIHByb2Nlc3NBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiBhdHRyaWJ1dGVOYW1lLCBj b25zdCBTdHJpbmcmIGF0dHJpYnV0ZVZhbHVlKQorICAgIHsKKyAgICAgICAgc3dpdGNoIChtX3Rh Z0lkKSB7CisgICAgICAgIGNhc2UgVGFnSWQ6OkltZzoKKyAgICAgICAgICAgIGlmIChtYXRjaChh dHRyaWJ1dGVOYW1lLCBzcmNzZXRBdHRyKSAmJiBtX3NyY1NldEF0dHJpYnV0ZS5pc051bGwoKSkg ewogICAgICAgICAgICAgICAgIG1fc3JjU2V0QXR0cmlidXRlID0gYXR0cmlidXRlVmFsdWU7Ci0g ICAgICAgICAgICBlbHNlIGlmIChtYXRjaChhdHRyaWJ1dGVOYW1lLCBzaXplc0F0dHIpICYmIG1f c2l6ZXNBdHRyaWJ1dGUuaXNOdWxsKCkpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgc2l6ZXNBdHRyKSAm JiBtX3NpemVzQXR0cmlidXRlLmlzTnVsbCgpKSB7CiAgICAgICAgICAgICAgICAgbV9zaXplc0F0 dHJpYnV0ZSA9IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICAgICAgZWxzZSBpZiAobWF0Y2goYXR0 cmlidXRlTmFtZSwgY3Jvc3NvcmlnaW5BdHRyKSAmJiAhYXR0cmlidXRlVmFsdWUuaXNOdWxsKCkp Ci0gICAgICAgICAgICAgICAgbV9jcm9zc09yaWdpbk1vZGUgPSBzdHJpcExlYWRpbmdBbmRUcmFp bGluZ0hUTUxTcGFjZXMoYXR0cmlidXRlVmFsdWUpOwotICAgICAgICB9IGVsc2UgaWYgKG1fdGFn SWQgPT0gVGFnSWQ6OkxpbmspIHsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIHByb2Nlc3NJbWFnZUFuZFNjcmlwdEF0dHJpYnV0ZShhdHRyaWJ1dGVO YW1lLCBhdHRyaWJ1dGVWYWx1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBU YWdJZDo6U2NyaXB0OgorICAgICAgICAgICAgcHJvY2Vzc0ltYWdlQW5kU2NyaXB0QXR0cmlidXRl KGF0dHJpYnV0ZU5hbWUsIGF0dHJpYnV0ZVZhbHVlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIFRhZ0lkOjpMaW5rOgogICAgICAgICAgICAgaWYgKG1hdGNoKGF0dHJpYnV0ZU5h bWUsIGhyZWZBdHRyKSkKICAgICAgICAgICAgICAgICBzZXRVcmxUb0xvYWQoYXR0cmlidXRlVmFs dWUpOwogICAgICAgICAgICAgZWxzZSBpZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgcmVsQXR0cikp CiAgICAgICAgICAgICAgICAgbV9saW5rSXNTdHlsZVNoZWV0ID0gcmVsQXR0cmlidXRlSXNTdHls ZVNoZWV0KGF0dHJpYnV0ZVZhbHVlKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG1hdGNoKGF0dHJp YnV0ZU5hbWUsIG1lZGlhQXR0cikpCiAgICAgICAgICAgICAgICAgbV9tZWRpYUF0dHJpYnV0ZSA9 IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICB9IGVsc2UgaWYgKG1fdGFnSWQgPT0gVGFnSWQ6Oklu cHV0KSB7CisgICAgICAgICAgICBlbHNlIGlmIChtYXRjaChhdHRyaWJ1dGVOYW1lLCBjaGFyc2V0 QXR0cikpCisgICAgICAgICAgICAgICAgbV9jaGFyc2V0ID0gYXR0cmlidXRlVmFsdWU7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBUYWdJZDo6SW5wdXQ6CiAgICAgICAgICAgICBp ZiAobWF0Y2goYXR0cmlidXRlTmFtZSwgc3JjQXR0cikpCiAgICAgICAgICAgICAgICAgc2V0VXJs VG9Mb2FkKGF0dHJpYnV0ZVZhbHVlKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG1hdGNoKGF0dHJp YnV0ZU5hbWUsIHR5cGVBdHRyKSkKICAgICAgICAgICAgICAgICBtX2lucHV0SXNJbWFnZSA9IGVx dWFsSWdub3JpbmdDYXNlKGF0dHJpYnV0ZVZhbHVlLCBJbnB1dFR5cGVOYW1lczo6aW1hZ2UoKSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAobV90YWdJZCA9PSBUYWdJZDo6TWV0YSkgeworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgVGFnSWQ6Ok1ldGE6CiAgICAgICAgICAgICBpZiAobWF0 Y2goYXR0cmlidXRlTmFtZSwgY29udGVudEF0dHIpKQogICAgICAgICAgICAgICAgIG1fbWV0YUNv bnRlbnQgPSBhdHRyaWJ1dGVWYWx1ZTsKICAgICAgICAgICAgIGVsc2UgaWYgKG1hdGNoKGF0dHJp YnV0ZU5hbWUsIG5hbWVBdHRyKSkKICAgICAgICAgICAgICAgICBtX21ldGFJc1ZpZXdwb3J0ID0g ZXF1YWxJZ25vcmluZ0Nhc2UoYXR0cmlidXRlVmFsdWUsICJ2aWV3cG9ydCIpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgVGFnSWQ6OkJhc2U6CisgICAgICAgIGNhc2UgVGFnSWQ6 OlN0eWxlOgorICAgICAgICBjYXNlIFRhZ0lkOjpUZW1wbGF0ZToKKyAgICAgICAgY2FzZSBUYWdJ ZDo6VW5rbm93bjoKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQogCkBAIC0x OTUsOSArMjE3LDYgQEAgcHJpdmF0ZToKIAogICAgIGNvbnN0IFN0cmluZyYgY2hhcnNldCgpIGNv bnN0CiAgICAgewotICAgICAgICAvLyBGSVhNRTogSXRzIG5vdCBjbGVhciB0aGF0IHRoaXMgaWYg aXMgbmVlZGVkLCB0aGUgbG9hZGVyIHByb2JhYmx5IGlnbm9yZXMgY2hhcnNldCBmb3IgaW1hZ2Ug cmVxdWVzdHMgYW55d2F5LgotICAgICAgICBpZiAobV90YWdJZCA9PSBUYWdJZDo6SW1nKQotICAg ICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAgICAgICAgIHJldHVybiBtX2NoYXJzZXQ7 CiAgICAgfQogCg==