185219 2018-05-02 14:49:05 -0700 AX: In role=dialog elements with aria-modal=true VoiceOver iOS/macOS can't manually focus or read dialog paragraph description text inside the modal. 2018-05-11 14:58:26 -0700 1 1 1 Unclassified WebKit Accessibility Safari 11 All All RESOLVED FIXED InRadar P2 Major --- 1 paul webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs n_wang samuel_white webkit-bug-importer oldest_to_newest 1419874 0 339346 paul 2018-05-02 14:49:05 -0700 Created attachment 339346 dialog demo page Steps to Reproduce: 1. Turn on VoiceOver on macOS or iOS latest stable public versions. 2. Visit http://pauljadam.com/demos/dialog.html in Safari and open the modal dialog. 3. Manually move VoiceOver screen reader focus to the <p> text "The quick brown fox jumps over the lazy dog." Actual Results: 1. VoiceOver skips over the text "The quick brown fox jumps over the lazy dog." and cannot focus on that text or read it manually. Expected Results: 1. VoiceOver focuses and reads the text "The quick brown fox jumps over the lazy dog." 1419876 1 webkit-bug-importer 2018-05-02 14:49:22 -0700 <rdar://problem/39920009> 1423183 2 340202 n_wang 2018-05-11 10:54:08 -0700 Created attachment 340202 patch 1423184 3 ews-watchlist 2018-05-11 10:56:34 -0700 Attachment 340202 did not pass style-queue: ERROR: Source/WebCore/accessibility/AccessibilityObject.cpp:2091: Declaration has space between type name and * in Node *node [whitespace/declaration] [3] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1423186 4 340203 n_wang 2018-05-11 11:02:38 -0700 Created attachment 340203 patch update style 1423275 5 340203 commit-queue 2018-05-11 14:58:24 -0700 Comment on attachment 340203 patch Clearing flags on attachment: 340203 Committed r231720: <https://trac.webkit.org/changeset/231720> 1423276 6 commit-queue 2018-05-11 14:58:26 -0700 All reviewed patches have been landed. Closing bug. 339346 2018-05-02 14:49:05 -0700 2018-05-02 14:49:05 -0700 dialog demo page dialog.html text/html 2821 paul PCFkb2N0eXBlIGh0bWw+CjxodG1sIGxhbmc9ImVuLVVTIj4KPGhlYWQ+CjxtZXRhIGNoYXJzZXQ9 IlVURi04Ij4KPHRpdGxlPkFjY2Vzc2libGUgTW9kYWwgRGlhbG9nPC90aXRsZT4KPG1ldGEgbmFt ZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0x Ij4KPHNjcmlwdCBzcmM9Imh0dHA6Ly9jb2RlLmpxdWVyeS5jb20vanF1ZXJ5LmpzIj48L3Njcmlw dD4KPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwOi8vY29kZS5qcXVlcnkuY29tL21v YmlsZS8xLjQuNS9qcXVlcnkubW9iaWxlLTEuNC41Lm1pbi5jc3MiIC8+CjxzY3JpcHQ+CiQoZG9j dW1lbnQpLnJlYWR5KGZ1bmN0aW9uKGUpIHsKCSQoJyN0cmlnZ2VyLW1vZGFsJykuY2xpY2soZnVu Y3Rpb24oKSB7CgkJJCgnbWFpbicpLmF0dHIoJ2FyaWEtaGlkZGVuJywndHJ1ZScpOwoJCS8vdmFy IGxhc3RGb2N1cyA9IGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQ7IHdvbnQnIHdvcmsgb24gaU9TCgkJ dmFyIG1vZGFsT3ZlcmxheSA9ICQoJzxkaXY+JykuYXR0cih7aWQ6Im1vZGFsT3ZlcmxheSIsIGlk OiJtb2RhbE92ZXJsYXkifSk7CgkJJChtb2RhbE92ZXJsYXkpLmFwcGVuZFRvKCdib2R5Jyk7CQkK CQkkKCIjdHJpZ2dlci1tb2RhbCIpLmF0dHIoJ2Rpc2FibGVkJywndHJ1ZScpOwoJCXZhciBkaWFs b2cgPSAkKCc8ZGl2IHJvbGU9ImRpYWxvZyI+JykuYXR0cih7ImFyaWEtbGFiZWxsZWRieSI6ImRp YWxvZy1oZWFkaW5nIiwgImFyaWEtZGVzY3JpYmVkYnkiOiJkaWFsb2ctZGVzY3JpcHRpb24iLCAi YXJpYS1tb2RhbCI6InRydWUifSk7CgkJJChkaWFsb2cpLmh0bWwoJzxkaXYgaWQ9ImZpcnN0RWxl bWVudCIgdGFiaW5kZXg9IjAiPjwvZGl2PjxoMSBpZD0iZGlhbG9nLWhlYWRpbmciPk1vZGFsIERp YWxvZyBUaXRsZTwvaDE+PGRpdiBpZD0iZGlhbG9nLWRlc2NyaXB0aW9uIj48cD5UaGUgcXVpY2sg YnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLjwvcD48L2Rpdj48YnV0dG9uIGlkPSJm aXJzdEJ1dHRvbiI+T3B0aW9uIERvZzwvYnV0dG9uPjxidXR0b24+T3B0aW9uIEZveDwvYnV0dG9u PjxidXR0b24gaWQ9Imxhc3RCdXR0b24iIGFyaWEtbGFiZWw9IkNsb3NlIERpYWxvZyI+WDwvYnV0 dG9uPjxkaXYgaWQ9Imxhc3RFbGVtZW50IiB0YWJpbmRleD0iMCI+PC9kaXY+JykuYXBwZW5kVG8o J2JvZHknKTsKCQkkKCcjZmlyc3RCdXR0b24nKS5mb2N1cygpOwoKJCgnI2xhc3RFbGVtZW50Jyku Zm9jdXNpbihmdW5jdGlvbihlKSB7CgkgICAkKCcjZmlyc3RCdXR0b24nKS5mb2N1cygpOwp9KTsK JCgnI2ZpcnN0RWxlbWVudCcpLmZvY3VzaW4oZnVuY3Rpb24oZSkgewoJICAgJCgnI2xhc3RCdXR0 b24nKS5mb2N1cygpOwp9KTsKCgkkKCdib2R5Jykub24oJ2tleXVwJywgZnVuY3Rpb24oZSkgewoJ CWlmKGUua2V5Q29kZSA9PSAnMjcnKXsKICAgIAkJJCgnbWFpbicpLmF0dHIoJ2FyaWEtaGlkZGVu JywnZmFsc2UnKTsJCQoJCQkkKG1vZGFsT3ZlcmxheSkucmVtb3ZlKCk7CgkJCSQoZGlhbG9nKS5y ZW1vdmUoKTsKCSAgICAJJCgiI3RyaWdnZXItbW9kYWwiKS5yZW1vdmVBdHRyKCdkaXNhYmxlZCcp LmZvY3VzKCk7Ly93b3JrcyBvbiBpT1MKCQl9Cgl9KTsKCiQoJ1tyb2xlPWRpYWxvZ10gYnV0dG9u JykuY2xpY2soZnVuY3Rpb24oZSkgewogICAgCSQoJ21haW4nKS5hdHRyKCdhcmlhLWhpZGRlbics J2ZhbHNlJyk7CQkKCQkkKG1vZGFsT3ZlcmxheSkucmVtb3ZlKCk7CgkJJChkaWFsb2cpLnJlbW92 ZSgpOwogICAgICAgIC8vbGFzdEZvY3VzLmZvY3VzKCk7IG5vdCB3b3JraW5nIG9uIGlPUwoJICAg ICQoIiN0cmlnZ2VyLW1vZGFsIikucmVtb3ZlQXR0cignZGlzYWJsZWQnKS5mb2N1cygpOy8vd29y a3Mgb24gaU9TCgp9KTsKCQlyZXR1cm4gZmFsc2U7Cgl9KTsKCQp9KTsKPC9zY3JpcHQ+CjxzdHls ZSB0eXBlPSJ0ZXh0L2NzcyI+CiNtb2RhbE92ZXJsYXkgewoJd2lkdGg6MTAwJTsKCWhlaWdodDox MDAlOwoJei1pbmRleDoyOyAKCWJhY2tncm91bmQtY29sb3I6IzAwMDsKCW9wYWNpdHk6MC41OwoJ cG9zaXRpb246Zml4ZWQ7Cgl0b3A6MDsKCWxlZnQ6MDsKCW1hcmdpbjowOwoJcGFkZGluZzowOwp9 Cltyb2xlPWRpYWxvZ10gewoJd2lkdGg6NTAlOwoJbWFyZ2luLWxlZnQ6YXV0bzsKCW1hcmdpbi1y aWdodDphdXRvOwoJcGFkZGluZzogNXB4OwoJYm9yZGVyOiB0aGluICMwMDAgc29saWQ7CgliYWNr Z3JvdW5kLWNvbG9yOiNmZmY7Cgl6LWluZGV4OjM7Cglwb3NpdGlvbjpmaXhlZDsKCXRvcDoyNSU7 CglsZWZ0OjI1JTsKfQouc2Nyb2xsLWZyYW1lIHsKICAgIG92ZXJmbG93OiBhdXRvOwogICAgb3Zl cmZsb3cteDogaGlkZGVuOwogICAgLXdlYmtpdC1vdmVyZmxvdy1zY3JvbGxpbmc6dG91Y2g7Cglo ZWlnaHQ6NDAwcHg7Cgl3aWR0aDoxMDAlOwp9CmJ1dHRvblthcmlhLWxhYmVsPSJDbG9zZSBEaWFs b2ciXSB7IAogcG9zaXRpb246YWJzb2x1dGU7CnRvcDogMHB4OwpyaWdodDogMHB4Owp9Cjwvc3R5 bGU+CjwvaGVhZD4KCjxib2R5Pgo8bWFpbj4KPGgxPkFjY2Vzc2libGUgTW9kYWwgRGlhbG9nPC9o MT4KPHA+Q29kaW5nIGluc3RydWN0aW9uczogPGEgaHJlZj0iaHR0cDovL3czYy5naXRodWIuaW8v YXJpYS1wcmFjdGljZXMvI2RpYWxvZ19tb2RhbCI+aHR0cDovL3czYy5naXRodWIuaW8vYXJpYS1w cmFjdGljZXMvI2RpYWxvZ19tb2RhbDwvYT48L3A+CjxoMj5XQUktQVJJQSByb2xlPWRpYWxvZzwv aDI+CjxidXR0b24gaWQ9InRyaWdnZXItbW9kYWwiPlRyaWdnZXIgbW9kYWwgZGlhbG9nPC9idXR0 b24+CjwvbWFpbj4KPC9ib2R5Pgo8L2h0bWw+Cg== 340202 2018-05-11 10:54:08 -0700 2018-05-11 11:02:38 -0700 patch patch.txt text/plain 5451 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTcwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA1LTExICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEluIHJvbGU9ZGlhbG9nIGVsZW1l bnRzIHdpdGggYXJpYS1tb2RhbD10cnVlIFZvaWNlT3ZlciBpT1MvbWFjT1MgY2FuJ3QgbWFudWFs bHkgZm9jdXMgb3IgcmVhZCBkaWFsb2cgcGFyYWdyYXBoIGRlc2NyaXB0aW9uIHRleHQgaW5zaWRl IHRoZSBtb2RhbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NTIxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk5MjAwMDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRleHQgbm9kZSBkZXNj ZW5kYW50cyBvZiBhIG1vZGFsIGRpYWxvZyBhcmUgaWdub3JlZC4gRml4ZWQgaXQgYnkgdXNpbmcg QWNjZXNzaWJpbGl0eU9iamVjdCdzIAorICAgICAgICBub2RlKCkgdG8gZGV0ZXJtaW5lIGlmIGl0 J3MgdGhlIGRlc2NlbmRhbnQgb2YgdGhlIG1vZGFsIGRpYWxvZyBub2RlLgorCisgICAgICAgIFRl c3Q6IGFjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLmh0bWwKKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsRGVzY2VuZGFudCBjb25zdCk6CisK IDIwMTgtMDUtMTEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAg IE1ha2Ugc3VyZSBoaXN0b3J5IG5hdmlnYXRpb25zIHJldXNlIHRoZSBleGlzdGluZyBwcm9jZXNz IHdoZW4gbmVjZXNzYXJ5LgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiAyMzE2NTkpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMDg4LDE5ICsyMDg4LDE2IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpjdXJyZW50VmFsdWUKIAogYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsRGVzY2Vu ZGFudChOb2RlKiBtb2RhbE5vZGUpIGNvbnN0CiB7Ci0gICAgaWYgKCFtb2RhbE5vZGUgfHwgIXRo aXMtPmVsZW1lbnQoKSkKKyAgICBOb2RlICpub2RlID0gdGhpcy0+bm9kZSgpOworICAgIGlmICgh bW9kYWxOb2RlIHx8ICFub2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgaWYg KHRoaXMtPmVsZW1lbnQoKSA9PSBtb2RhbE5vZGUpCisgICAgaWYgKG5vZGUgPT0gbW9kYWxOb2Rl KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICAvLyBBUklBIDEuMSBhcmlhLW1vZGFs LCBpbmRpY2F0ZXMgd2hldGhlciBhbiBlbGVtZW50IGlzIG1vZGFsIHdoZW4gZGlzcGxheWVkLgog ICAgIC8vIEZvciB0aGUgZGVjZW5kYW50cyBvZiB0aGUgbW9kYWwgb2JqZWN0LCB0aGV5IHNob3Vs ZCBhbHNvIGJlIGNvbnNpZGVyZWQgYXMgYXJpYS1tb2RhbD10cnVlLgotICAgIGZvciAoYXV0byYg YW5jZXN0b3IgOiBlbGVtZW50QW5jZXN0b3JzKHRoaXMtPmVsZW1lbnQoKSkpIHsKLSAgICAgICAg aWYgKCZhbmNlc3RvciA9PSBtb2RhbE5vZGUpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICB9Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBub2RlLT5pc0Rlc2NlbmRhbnRPZigq bW9kYWxOb2RlKTsKIH0KIAogYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsTm9kZSgp IGNvbnN0CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE2NTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNS0xMSAgTmFuIFdhbmcg IDxuX3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBJbiByb2xlPWRpYWxvZyBlbGVtZW50 cyB3aXRoIGFyaWEtbW9kYWw9dHJ1ZSBWb2ljZU92ZXIgaU9TL21hY09TIGNhbid0IG1hbnVhbGx5 IGZvY3VzIG9yIHJlYWQgZGlhbG9nIHBhcmFncmFwaCBkZXNjcmlwdGlvbiB0ZXh0IGluc2lkZSB0 aGUgbW9kYWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODUyMTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5OTIwMDA5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlh LW1vZGFsLXRleHQtZGVzY2VuZGFudHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtdGV4dC1kZXNjZW5kYW50cy5odG1sOiBBZGRlZC4KKwog MjAxOC0wNS0xMCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogQVNTRVJUX05PVF9SRUFDSEVEIGluIFBhZ2VEZWJ1Z2dlckFnZW50Ojpk aWRBZGRFdmVudExpc3RlbmVyIHdoZW4gcGFnZSBhZGRzIGF0dHJpYnV0ZSBldmVudCBsaXN0ZW5l cgpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLXRleHQtZGVzY2Vu ZGFudHMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLWV4cGVjdGVkLnR4dAkobm9uZXhpc3RlbnQp CisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtdGV4dC1kZXNjZW5kYW50 cy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNyBAQAorVGhpcyB0ZXN0 cyB0ZXh0IGRlc2NlbmRhbnRzIG9mIG1vZGFsIGRpYWxvZyBhcmUgYWNjZXNzaWJsZS4KKworT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgYmFja2dyb3VuZEFjY2Vzc2libGUoKSBp cyBmYWxzZQorUEFTUyB0ZXh0LmlzSWdub3JlZCBpcyBmYWxzZQorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitPdGhlciBwYWdlIGNvbnRlbnQgd2l0aCBh IGR1bW15IGZvY3VzYWJsZSBlbGVtZW50CisKK0Rpc3BsYXkgYSBkaWFsb2cKKworSnVzdCBhbiBl eGFtcGxlLgorCit0ZXh0CkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9k YWwtdGV4dC1kZXNjZW5kYW50cy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLmh0bWwJKG5vbmV4aXN0ZW50KQor KysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLXRleHQtZGVzY2VuZGFudHMu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ5IEBACis8IURPQ1RZUEUgSFRNTCBQVUJM SUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9 Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxib2R5 IGlkPSJib2R5Ij4KKworPGRpdiBpZD0iYmciPgorPHAgaWQ9ImJnQ29udGVudCI+T3RoZXIgcGFn ZSBjb250ZW50IHdpdGggPGEgaHJlZj0iIyI+YSBkdW1teSBmb2N1c2FibGUgZWxlbWVudDwvYT48 L3A+Cis8cD48YSBocmVmPSIjIiByb2xlPSJidXR0b24iIGlkPSJkaXNwbGF5QnRuIj5EaXNwbGF5 IGEgZGlhbG9nPC9hPjwvcD4KKzwvZGl2PgorCis8ZGl2IHJvbGU9ImRpYWxvZyIgYXJpYS1tb2Rh bD0idHJ1ZSIgYXJpYS1sYWJlbGxlZGJ5PSJteURpYWxvZyIgaWQ9ImJveCIgY2xhc3M9ImJveC1o aWRkZW4iIHRhYmluZGV4PSItMSI+CisgICAgPGgzIGlkPSJteURpYWxvZyI+SnVzdCBhbiBleGFt cGxlLjwvaDM+CisgICAgPHAgaWQ9InRleHQiPnRleHQ8L3A+Cis8L2Rpdj4KKworCis8c2NyaXB0 PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGV4dCBkZXNjZW5kYW50cyBvZiBtb2Rh bCBkaWFsb2cgYXJlIGFjY2Vzc2libGUuIik7CisKKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxp dHlDb250cm9sbGVyKSB7CisgICAgICAgIC8vIEJhY2tncm91bmQgc2hvdWxkIGJlIHVuYWNjZXNz aWJsZSBhZnRlciBsb2FkaW5nLCBzaW5jZSB0aGUgCisgICAgICAgIC8vIGRpYWxvZyBpcyBkaXNw bGF5ZWQgYW5kIGFyaWEtbW9kYWw9dHJ1ZS4KKyAgICAgICAgc2hvdWxkQmVGYWxzZSgiYmFja2dy b3VuZEFjY2Vzc2libGUoKSIpOworICAgICAgICAKKyAgICAgICAgdmFyIHRleHQgPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRleHQiKS5jaGlsZEF0SW5k ZXgoMCk7CisgICAgICAgIHNob3VsZEJlRmFsc2UoInRleHQuaXNJZ25vcmVkIik7CisgICAgfQor ICAgIAorICAgIGZ1bmN0aW9uIGJhY2tncm91bmRBY2Nlc3NpYmxlKCkgeworICAgICAgICB2YXIg ZGlzcGxheUJ0biA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgiZGlzcGxheUJ0biIpOworICAgICAgICB2YXIgYmdDb250ZW50ID0gYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJiZ0NvbnRlbnQiKTsKKyAgICAgICAgCisg ICAgICAgIGlmICghZGlzcGxheUJ0biB8fCAhYmdDb250ZW50KQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAKKyAgICAgICAgcmV0dXJuICFkaXNwbGF5QnRuLmlzSWdub3JlZCAm JiAhYmdDb250ZW50LmlzSWdub3JlZDsKKyAgICB9CisKKworPC9zY3JpcHQ+CisKKworPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5Pgor PC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 340203 2018-05-11 11:02:38 -0700 2018-05-11 14:58:24 -0700 patch patch.txt text/plain 5451 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTcwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA1LTExICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEluIHJvbGU9ZGlhbG9nIGVsZW1l bnRzIHdpdGggYXJpYS1tb2RhbD10cnVlIFZvaWNlT3ZlciBpT1MvbWFjT1MgY2FuJ3QgbWFudWFs bHkgZm9jdXMgb3IgcmVhZCBkaWFsb2cgcGFyYWdyYXBoIGRlc2NyaXB0aW9uIHRleHQgaW5zaWRl IHRoZSBtb2RhbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NTIxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk5MjAwMDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRleHQgbm9kZSBkZXNj ZW5kYW50cyBvZiBhIG1vZGFsIGRpYWxvZyBhcmUgaWdub3JlZC4gRml4ZWQgaXQgYnkgdXNpbmcg QWNjZXNzaWJpbGl0eU9iamVjdCdzIAorICAgICAgICBub2RlKCkgdG8gZGV0ZXJtaW5lIGlmIGl0 J3MgdGhlIGRlc2NlbmRhbnQgb2YgdGhlIG1vZGFsIGRpYWxvZyBub2RlLgorCisgICAgICAgIFRl c3Q6IGFjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLmh0bWwKKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsRGVzY2VuZGFudCBjb25zdCk6CisK IDIwMTgtMDUtMTEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAg IE1ha2Ugc3VyZSBoaXN0b3J5IG5hdmlnYXRpb25zIHJldXNlIHRoZSBleGlzdGluZyBwcm9jZXNz IHdoZW4gbmVjZXNzYXJ5LgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiAyMzE2NTkpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMDg4LDE5ICsyMDg4LDE2IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpjdXJyZW50VmFsdWUKIAogYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsRGVzY2Vu ZGFudChOb2RlKiBtb2RhbE5vZGUpIGNvbnN0CiB7Ci0gICAgaWYgKCFtb2RhbE5vZGUgfHwgIXRo aXMtPmVsZW1lbnQoKSkKKyAgICBOb2RlKiBub2RlID0gdGhpcy0+bm9kZSgpOworICAgIGlmICgh bW9kYWxOb2RlIHx8ICFub2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgaWYg KHRoaXMtPmVsZW1lbnQoKSA9PSBtb2RhbE5vZGUpCisgICAgaWYgKG5vZGUgPT0gbW9kYWxOb2Rl KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICAvLyBBUklBIDEuMSBhcmlhLW1vZGFs LCBpbmRpY2F0ZXMgd2hldGhlciBhbiBlbGVtZW50IGlzIG1vZGFsIHdoZW4gZGlzcGxheWVkLgog ICAgIC8vIEZvciB0aGUgZGVjZW5kYW50cyBvZiB0aGUgbW9kYWwgb2JqZWN0LCB0aGV5IHNob3Vs ZCBhbHNvIGJlIGNvbnNpZGVyZWQgYXMgYXJpYS1tb2RhbD10cnVlLgotICAgIGZvciAoYXV0byYg YW5jZXN0b3IgOiBlbGVtZW50QW5jZXN0b3JzKHRoaXMtPmVsZW1lbnQoKSkpIHsKLSAgICAgICAg aWYgKCZhbmNlc3RvciA9PSBtb2RhbE5vZGUpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICB9Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBub2RlLT5pc0Rlc2NlbmRhbnRPZigq bW9kYWxOb2RlKTsKIH0KIAogYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc01vZGFsTm9kZSgp IGNvbnN0CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE2NTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNS0xMSAgTmFuIFdhbmcg IDxuX3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBJbiByb2xlPWRpYWxvZyBlbGVtZW50 cyB3aXRoIGFyaWEtbW9kYWw9dHJ1ZSBWb2ljZU92ZXIgaU9TL21hY09TIGNhbid0IG1hbnVhbGx5 IGZvY3VzIG9yIHJlYWQgZGlhbG9nIHBhcmFncmFwaCBkZXNjcmlwdGlvbiB0ZXh0IGluc2lkZSB0 aGUgbW9kYWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODUyMTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5OTIwMDA5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlh LW1vZGFsLXRleHQtZGVzY2VuZGFudHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtdGV4dC1kZXNjZW5kYW50cy5odG1sOiBBZGRlZC4KKwog MjAxOC0wNS0xMCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogQVNTRVJUX05PVF9SRUFDSEVEIGluIFBhZ2VEZWJ1Z2dlckFnZW50Ojpk aWRBZGRFdmVudExpc3RlbmVyIHdoZW4gcGFnZSBhZGRzIGF0dHJpYnV0ZSBldmVudCBsaXN0ZW5l cgpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLXRleHQtZGVzY2Vu ZGFudHMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLWV4cGVjdGVkLnR4dAkobm9uZXhpc3RlbnQp CisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtdGV4dC1kZXNjZW5kYW50 cy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNyBAQAorVGhpcyB0ZXN0 cyB0ZXh0IGRlc2NlbmRhbnRzIG9mIG1vZGFsIGRpYWxvZyBhcmUgYWNjZXNzaWJsZS4KKworT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgYmFja2dyb3VuZEFjY2Vzc2libGUoKSBp cyBmYWxzZQorUEFTUyB0ZXh0LmlzSWdub3JlZCBpcyBmYWxzZQorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitPdGhlciBwYWdlIGNvbnRlbnQgd2l0aCBh IGR1bW15IGZvY3VzYWJsZSBlbGVtZW50CisKK0Rpc3BsYXkgYSBkaWFsb2cKKworSnVzdCBhbiBl eGFtcGxlLgorCit0ZXh0CkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9k YWwtdGV4dC1kZXNjZW5kYW50cy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvYXJpYS1tb2RhbC10ZXh0LWRlc2NlbmRhbnRzLmh0bWwJKG5vbmV4aXN0ZW50KQor KysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLXRleHQtZGVzY2VuZGFudHMu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ5IEBACis8IURPQ1RZUEUgSFRNTCBQVUJM SUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9 Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxib2R5 IGlkPSJib2R5Ij4KKworPGRpdiBpZD0iYmciPgorPHAgaWQ9ImJnQ29udGVudCI+T3RoZXIgcGFn ZSBjb250ZW50IHdpdGggPGEgaHJlZj0iIyI+YSBkdW1teSBmb2N1c2FibGUgZWxlbWVudDwvYT48 L3A+Cis8cD48YSBocmVmPSIjIiByb2xlPSJidXR0b24iIGlkPSJkaXNwbGF5QnRuIj5EaXNwbGF5 IGEgZGlhbG9nPC9hPjwvcD4KKzwvZGl2PgorCis8ZGl2IHJvbGU9ImRpYWxvZyIgYXJpYS1tb2Rh bD0idHJ1ZSIgYXJpYS1sYWJlbGxlZGJ5PSJteURpYWxvZyIgaWQ9ImJveCIgY2xhc3M9ImJveC1o aWRkZW4iIHRhYmluZGV4PSItMSI+CisgICAgPGgzIGlkPSJteURpYWxvZyI+SnVzdCBhbiBleGFt cGxlLjwvaDM+CisgICAgPHAgaWQ9InRleHQiPnRleHQ8L3A+Cis8L2Rpdj4KKworCis8c2NyaXB0 PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGV4dCBkZXNjZW5kYW50cyBvZiBtb2Rh bCBkaWFsb2cgYXJlIGFjY2Vzc2libGUuIik7CisKKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxp dHlDb250cm9sbGVyKSB7CisgICAgICAgIC8vIEJhY2tncm91bmQgc2hvdWxkIGJlIHVuYWNjZXNz aWJsZSBhZnRlciBsb2FkaW5nLCBzaW5jZSB0aGUgCisgICAgICAgIC8vIGRpYWxvZyBpcyBkaXNw bGF5ZWQgYW5kIGFyaWEtbW9kYWw9dHJ1ZS4KKyAgICAgICAgc2hvdWxkQmVGYWxzZSgiYmFja2dy b3VuZEFjY2Vzc2libGUoKSIpOworICAgICAgICAKKyAgICAgICAgdmFyIHRleHQgPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRleHQiKS5jaGlsZEF0SW5k ZXgoMCk7CisgICAgICAgIHNob3VsZEJlRmFsc2UoInRleHQuaXNJZ25vcmVkIik7CisgICAgfQor ICAgIAorICAgIGZ1bmN0aW9uIGJhY2tncm91bmRBY2Nlc3NpYmxlKCkgeworICAgICAgICB2YXIg ZGlzcGxheUJ0biA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgiZGlzcGxheUJ0biIpOworICAgICAgICB2YXIgYmdDb250ZW50ID0gYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJiZ0NvbnRlbnQiKTsKKyAgICAgICAgCisg ICAgICAgIGlmICghZGlzcGxheUJ0biB8fCAhYmdDb250ZW50KQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAKKyAgICAgICAgcmV0dXJuICFkaXNwbGF5QnRuLmlzSWdub3JlZCAm JiAhYmdDb250ZW50LmlzSWdub3JlZDsKKyAgICB9CisKKworPC9zY3JpcHQ+CisKKworPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5Pgor PC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK