118105 2013-06-26 17:18:17 -0700 Web Inspector: AX: Add support for ARIA tablists/tabs to inspector tabs 2013-08-16 11:42:22 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 118104 1 jcraig jcraig commit-queue graouts jcraig joepeck timothy webkit-bug-importer oldest_to_newest 903999 0 jcraig 2013-06-26 17:18:17 -0700 Web Inspector: AX: Add support for ARIA tablists/tabs to inspector tabs I count at least four sets of tabs: 2 in the main toolbar, 1 in the console toolbar, and 1 in the element Styles inspector. 904000 1 webkit-bug-importer 2013-06-26 17:18:30 -0700 <rdar://problem/14283943> 904002 2 timothy 2013-06-26 17:22:45 -0700 What is the definition of tab and tab list? 904005 3 jcraig 2013-06-26 17:27:06 -0700 Those are ARIA roles. http://www.w3.org/WAI/PF/aria/complete#tab http://www.w3.org/WAI/PF/aria/complete#tablist 904129 4 jcraig 2013-06-27 02:47:05 -0700 Styles Inspector tab fixed as part of the patch for bug 118105, so this one should just cover the main tabs, and any others that still aren't fixed. 904130 5 jcraig 2013-06-27 02:48:50 -0700 Typo: Above reference should read …as part of the patch for bug 118104, not 118105. 917825 6 208883 jcraig 2013-08-15 23:35:40 -0700 Created attachment 208883 patch 918002 7 208883 joepeck 2013-08-16 10:30:08 -0700 Comment on attachment 208883 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208883&action=review r=me > Source/WebInspectorUI/UserInterface/ActivateButtonNavigationItem.js:33 > + Style: Remove this extra blank line. > Source/WebInspectorUI/UserInterface/ActivateButtonNavigationItem.js:64 > + if (this._role == "tab") Style: In Web Inspector we use strict equality `===` whenever possible. > Source/WebInspectorUI/UserInterface/ActivateButtonNavigationItem.js:69 > + if (this._role == "tab") === > Source/WebInspectorUI/UserInterface/Toolbar.js:38 > + this._leftSectionElement.setAttribute('role', 'tablist'); Style: In Web Inspector we use double quoted strings whenever possible. "role" / "tablist". > Source/WebInspectorUI/UserInterface/Toolbar.js:47 > + this._rightSectionElement.setAttribute('role', 'tablist'); "…" 918017 8 jcraig 2013-08-16 10:54:29 -0700 (In reply to comment #7) > Style: In Web Inspector we use double quoted strings whenever possible. "role" / "tablist". Do you think this is worth updating the check-webkit-style script? 918021 9 jcraig 2013-08-16 10:58:19 -0700 (In reply to comment #8) > Do you think this is worth updating the check-webkit-style script? bug 118105 918022 10 jcraig 2013-08-16 10:59:10 -0700 (In reply to comment #8) > Do you think this is worth updating the check-webkit-style script? Oops. Bug 119901. 918023 11 208932 jcraig 2013-08-16 11:04:20 -0700 Created attachment 208932 patch with review feedback 918028 12 208932 commit-queue 2013-08-16 11:10:42 -0700 Comment on attachment 208932 patch with review feedback Rejecting attachment 208932 from commit-queue. james@cookiecrook.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 918029 13 jcraig 2013-08-16 11:12:56 -0700 commit‑queue? 918030 14 208932 cfleizach 2013-08-16 11:13:23 -0700 Comment on attachment 208932 patch with review feedback Real review by Joe, but setting the flag to make it through commit bot 918043 15 208932 commit-queue 2013-08-16 11:42:20 -0700 Comment on attachment 208932 patch with review feedback Clearing flags on attachment: 208932 Committed r154196: <http://trac.webkit.org/changeset/154196> 918044 16 commit-queue 2013-08-16 11:42:22 -0700 All reviewed patches have been landed. Closing bug. 208883 2013-08-15 23:35:40 -0700 2013-08-16 11:04:20 -0700 patch 118105.patch text/plain 6569 jcraig SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0FjdGl2YXRlQnV0dG9u TmF2aWdhdGlvbkl0ZW0uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwkocmV2aXNpb24gMTU0 MTYzKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQWN0aXZhdGVCdXR0 b25OYXZpZ2F0aW9uSXRlbS5qcwkod29ya2luZyBjb3B5KQpAQCAtMjMsMTIgKzIzLDE0IEBACiAg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkFj dGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBmdW5jdGlvbihpZGVudGlmaWVyLCBkZWZhdWx0 VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0 LCBzdXBwcmVzc0VtYm9zcykKK1dlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25J dGVtID0gZnVuY3Rpb24oaWRlbnRpZmllciwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRvb2xU aXAsIGltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwgc3VwcHJlc3NFbWJvc3MsIHJvbGUp CiB7Ci0gICAgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLmNhbGwodGhpcywgaWRl bnRpZmllciwgZGVmYXVsdFRvb2xUaXAsIGltYWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwg c3VwcHJlc3NFbWJvc3MpOworICAgIFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5j YWxsKHRoaXMsIGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBpbWFnZSwgaW1hZ2VXaWR0aCwg aW1hZ2VIZWlnaHQsIHN1cHByZXNzRW1ib3NzLCByb2xlKTsKIAogICAgIHRoaXMuX2RlZmF1bHRU b29sVGlwID0gZGVmYXVsdFRvb2xUaXA7CiAgICAgdGhpcy5fYWN0aXZhdGVkVG9vbFRpcCA9IGFj dGl2YXRlZFRvb2xUaXAgfHwgZGVmYXVsdFRvb2xUaXA7CisgICAgdGhpcy5fcm9sZSA9IHJvbGU7 CisKIH07CiAKIFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLlN0eWxl Q2xhc3NOYW1lID0gImFjdGl2YXRlIjsKQEAgLTU5LDkgKzYxLDEzIEBACiAgICAgICAgIGlmIChm bGFnKSB7CiAgICAgICAgICAgICB0aGlzLnRvb2xUaXAgPSB0aGlzLl9hY3RpdmF0ZWRUb29sVGlw OwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkFj dGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uQWN0aXZhdGVkU3R5bGVDbGFzc05hbWUpOworICAg ICAgICAgICAgaWYgKHRoaXMuX3JvbGUgPT0gInRhYiIpCisgICAgICAgICAgICAgICAgdGhpcy5l bGVtZW50LnNldEF0dHJpYnV0ZSgiYXJpYS1zZWxlY3RlZCIsICJ0cnVlIik7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICB0aGlzLnRvb2xUaXAgPSB0aGlzLl9kZWZhdWx0VG9vbFRpcDsK ICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5B Y3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLkFjdGl2YXRlZFN0eWxlQ2xhc3NOYW1lKTsKKyAg ICAgICAgICAgIGlmICh0aGlzLl9yb2xlID09ICJ0YWIiKQorICAgICAgICAgICAgICAgIHRoaXMu ZWxlbWVudC5yZW1vdmVBdHRyaWJ1dGUoImFyaWEtc2VsZWN0ZWQiKTsKICAgICAgICAgfQogICAg IH0sCiAKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0J1dHRvblRv b2xiYXJJdGVtLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0J1dHRvblRvb2xiYXJJdGVtLmpzCShyZXZpc2lvbiAxNTQxNjMpCisrKyBTb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CdXR0b25Ub29sYmFySXRlbS5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMjMsOSArMjMsOSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5CdXR0b25Ub29sYmFySXRlbSA9IGZ1bmN0aW9uKGlk ZW50aWZpZXIsIHRvb2xUaXAsIGxhYmVsLCBpbWFnZSwgc3VwcHJlc3NFbWJvc3MpCitXZWJJbnNw ZWN0b3IuQnV0dG9uVG9vbGJhckl0ZW0gPSBmdW5jdGlvbihpZGVudGlmaWVyLCB0b29sVGlwLCBs YWJlbCwgaW1hZ2UsIHN1cHByZXNzRW1ib3NzLCByb2xlKQogewotICAgIFdlYkluc3BlY3Rvci5C dXR0b25OYXZpZ2F0aW9uSXRlbS5jYWxsKHRoaXMsIGlkZW50aWZpZXIsIHRvb2xUaXAsIGltYWdl LCAzMiwgMzIsIHN1cHByZXNzRW1ib3NzKTsKKyAgICBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdh dGlvbkl0ZW0uY2FsbCh0aGlzLCBpZGVudGlmaWVyLCB0b29sVGlwLCBpbWFnZSwgMzIsIDMyLCBz dXBwcmVzc0VtYm9zcywgcm9sZSk7CiAKICAgICBjb25zb2xlLmFzc2VydChsYWJlbCk7CiAKSW5k ZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NpZGViYXJQYW5lbC5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TaWRlYmFy UGFuZWwuanMJKHJldmlzaW9uIDE1NDE2MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1NpZGViYXJQYW5lbC5qcwkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNyBA QAogCiAgICAgdGhpcy5faWRlbnRpZmllciA9IGlkZW50aWZpZXI7CiAKLSAgICB0aGlzLl90b29s YmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbShpZGVu dGlmaWVyLCBzaG93VG9vbFRpcCwgaGlkZVRvb2xUaXAsIGRpc3BsYXlOYW1lLCBpbWFnZSk7Cisg ICAgdGhpcy5fdG9vbGJhckl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uVG9v bGJhckl0ZW0oaWRlbnRpZmllciwgc2hvd1Rvb2xUaXAsIGhpZGVUb29sVGlwLCBkaXNwbGF5TmFt ZSwgaW1hZ2UsIG51bGwsICJ0YWIiKTsKICAgICB0aGlzLl90b29sYmFySXRlbS5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLnRvZ2dsZSwgdGhpcyk7CiAgICAgdGhpcy5fdG9vbGJhckl0ZW0uZW5hYmxlZCA9IGZhbHNl OwogCkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9BY3RpdmF0ZUJ1 dHRvblRvb2xiYXJJdGVtLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0FjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0uanMJKHJldmlzaW9uIDE1NDE2 MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0FjdGl2YXRlQnV0dG9u VG9vbGJhckl0ZW0uanMJKHdvcmtpbmcgY29weSkKQEAgLTIzLDkgKzIzLDkgQEAKICAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuQWN0aXZhdGVC dXR0b25Ub29sYmFySXRlbSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBh Y3RpdmF0ZWRUb29sVGlwLCBsYWJlbCwgaW1hZ2UsIHN1cHByZXNzRW1ib3NzKQorV2ViSW5zcGVj dG9yLkFjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0gPSBmdW5jdGlvbihpZGVudGlmaWVyLCBkZWZh dWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgbGFiZWwsIGltYWdlLCBzdXBwcmVzc0VtYm9z cywgcm9sZSkKIHsKLSAgICBXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRl bS5jYWxsKHRoaXMsIGlkZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBhY3RpdmF0ZWRUb29sVGlw LCBpbWFnZSwgMzIsIDMyLCBzdXBwcmVzc0VtYm9zcyk7CisgICAgV2ViSW5zcGVjdG9yLkFjdGl2 YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uY2FsbCh0aGlzLCBpZGVudGlmaWVyLCBkZWZhdWx0VG9v bFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIDMyLCAzMiwgc3VwcHJlc3NFbWJvc3MsIHJv bGUpOwogCiAgICAgY29uc29sZS5hc3NlcnQobGFiZWwpOwogCkluZGV4OiBTb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Ub29sYmFyLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rvb2xiYXIuanMJKHJldmlzaW9uIDE1NDE2MykK KysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rvb2xiYXIuanMJKHdvcmtp bmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKIAogICAgIHRoaXMuX2xlZnRTZWN0aW9uRWxlbWVu dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuX2xlZnRTZWN0aW9u RWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVG9vbGJhci5JdGVtU2VjdGlvblN0eWxl Q2xhc3NOYW1lICsgIiAiICsgV2ViSW5zcGVjdG9yLlRvb2xiYXIuTGVmdEl0ZW1TZWN0aW9uU3R5 bGVDbGFzc05hbWU7CisgICAgdGhpcy5fbGVmdFNlY3Rpb25FbGVtZW50LnNldEF0dHJpYnV0ZSgn cm9sZScsICd0YWJsaXN0Jyk7CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9s ZWZ0U2VjdGlvbkVsZW1lbnQpOwogCiAgICAgdGhpcy5fY2VudGVyU2VjdGlvbkVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKQEAgLTQzLDYgKzQ0LDcgQEAKIAogICAgIHRo aXMuX3JpZ2h0U2VjdGlvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK ICAgICB0aGlzLl9yaWdodFNlY3Rpb25FbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5U b29sYmFyLkl0ZW1TZWN0aW9uU3R5bGVDbGFzc05hbWUgKyAiICIgKyBXZWJJbnNwZWN0b3IuVG9v bGJhci5SaWdodEl0ZW1TZWN0aW9uU3R5bGVDbGFzc05hbWU7CisgICAgdGhpcy5fcmlnaHRTZWN0 aW9uRWxlbWVudC5zZXRBdHRyaWJ1dGUoJ3JvbGUnLCAndGFibGlzdCcpOwogICAgIHRoaXMuX2Vs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fcmlnaHRTZWN0aW9uRWxlbWVudCk7CiAKICAgICB0aGlz Ll9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5faGFuZGxlQ29u dGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCBmYWxzZSk7CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cJKHJldmlzaW9uIDE1NDE2MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMy0wOC0xNSAgSmFtZXMgQ3Jh aWcgIDxqYW1lc0Bjb29raWVjcm9vay5jb20+CisKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzExODEwNT4gV2ViIEluc3BlY3RvcjogQVg6IEFkZCBzdXBwb3J0IGZvciBBUklBIHRhYmxp c3RzL3RhYnMgdG8gaW5zcGVjdG9yIHRhYnMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGluZyBhY2Nlc3NpYmlsaXR5IHJvbGVzIGFuZCBhdHRy aWJ1dGVzIGZvciBzaW5nbGUtc2VsZWN0IHRvb2xiYXIgaXRlbSBzZXRzLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0ucHJvdG90eXBlLnNldCBhY3Rp dmF0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQWN0aXZhdGVCdXR0b25Ub29sYmFySXRl bS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0J1dHRvblRvb2xiYXJJdGVtLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkJ1dHRvblRvb2xiYXJJdGVtKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZWwpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVG9vbGJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Ub29sYmFyKToKKwogMjAxMy0wOC0xMyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+ CiAKICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzExOTc3OD4gQWRkIENhbnZhcyBwcm90 b2NvbCBvYnNlcnZlcgo= 208932 2013-08-16 11:04:20 -0700 2013-08-16 11:42:20 -0700 patch with review feedback 118105.patch text/plain 6569 jcraig SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0MTYzKQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDEzLTA4LTE1ICBKYW1lcyBDcmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KKworICAg ICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE4MTA1PiBXZWIgSW5zcGVjdG9yOiBBWDogQWRk IHN1cHBvcnQgZm9yIEFSSUEgdGFibGlzdHMvdGFicyB0byBpbnNwZWN0b3IgdGFicworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0aW5nIGFjY2Vz c2liaWxpdHkgcm9sZXMgYW5kIGF0dHJpYnV0ZXMgZm9yIHNpbmdsZS1zZWxlY3QgdG9vbGJhciBp dGVtIHNldHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0FjdGl2YXRlQnV0dG9uTmF2aWdh dGlvbkl0ZW0uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0 aW9uSXRlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9u SXRlbS5wcm90b3R5cGUuc2V0IGFjdGl2YXRlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9B Y3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFjdGl2 YXRlQnV0dG9uVG9vbGJhckl0ZW0pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQnV0dG9uVG9v bGJhckl0ZW0uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnV0dG9uVG9vbGJhckl0ZW0pOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNpZGViYXJQYW5lbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Ub29sYmFyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRvb2xiYXIpOgorCiAyMDEzLTA4LTEzICBEZWFuIEph Y2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTE5Nzc4PiBBZGQgQ2FudmFzIHByb3RvY29sIG9ic2VydmVyCkluZGV4OiBTb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9TaWRlYmFyUGFuZWwuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2lkZWJhclBhbmVsLmpzCShyZXZpc2lv biAxNTQxNjMpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TaWRlYmFy UGFuZWwuanMJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAKIAogICAgIHRoaXMuX2lk ZW50aWZpZXIgPSBpZGVudGlmaWVyOwogCi0gICAgdGhpcy5fdG9vbGJhckl0ZW0gPSBuZXcgV2Vi SW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0oaWRlbnRpZmllciwgc2hvd1Rvb2xU aXAsIGhpZGVUb29sVGlwLCBkaXNwbGF5TmFtZSwgaW1hZ2UpOworICAgIHRoaXMuX3Rvb2xiYXJJ dGVtID0gbmV3IFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtKGlkZW50aWZp ZXIsIHNob3dUb29sVGlwLCBoaWRlVG9vbFRpcCwgZGlzcGxheU5hbWUsIGltYWdlLCBudWxsLCAi dGFiIik7CiAgICAgdGhpcy5fdG9vbGJhckl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy50b2dnbGUsIHRoaXMp OwogICAgIHRoaXMuX3Rvb2xiYXJJdGVtLmVuYWJsZWQgPSBmYWxzZTsKIApJbmRleDogU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQWN0aXZhdGVCdXR0b25Ub29sYmFySXRlbS5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9BY3Rp dmF0ZUJ1dHRvblRvb2xiYXJJdGVtLmpzCShyZXZpc2lvbiAxNTQxNjMpCisrKyBTb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9BY3RpdmF0ZUJ1dHRvblRvb2xiYXJJdGVtLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0yMyw5ICsyMyw5IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uVG9vbGJhckl0ZW0g PSBmdW5jdGlvbihpZGVudGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwg bGFiZWwsIGltYWdlLCBzdXBwcmVzc0VtYm9zcykKK1dlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRv blRvb2xiYXJJdGVtID0gZnVuY3Rpb24oaWRlbnRpZmllciwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2 YXRlZFRvb2xUaXAsIGxhYmVsLCBpbWFnZSwgc3VwcHJlc3NFbWJvc3MsIHJvbGUpCiB7Ci0gICAg V2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uY2FsbCh0aGlzLCBpZGVu dGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIDMyLCAzMiwg c3VwcHJlc3NFbWJvc3MpOworICAgIFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRp b25JdGVtLmNhbGwodGhpcywgaWRlbnRpZmllciwgZGVmYXVsdFRvb2xUaXAsIGFjdGl2YXRlZFRv b2xUaXAsIGltYWdlLCAzMiwgMzIsIHN1cHByZXNzRW1ib3NzLCByb2xlKTsKIAogICAgIGNvbnNv bGUuYXNzZXJ0KGxhYmVsKTsKIApJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVG9vbGJhci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Ub29sYmFyLmpzCShyZXZpc2lvbiAxNTQxNjMpCisrKyBTb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Ub29sYmFyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2 ICszNSw3IEBACiAKICAgICB0aGlzLl9sZWZ0U2VjdGlvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9sZWZ0U2VjdGlvbkVsZW1lbnQuY2xhc3NOYW1l ID0gV2ViSW5zcGVjdG9yLlRvb2xiYXIuSXRlbVNlY3Rpb25TdHlsZUNsYXNzTmFtZSArICIgIiAr IFdlYkluc3BlY3Rvci5Ub29sYmFyLkxlZnRJdGVtU2VjdGlvblN0eWxlQ2xhc3NOYW1lOworICAg IHRoaXMuX2xlZnRTZWN0aW9uRWxlbWVudC5zZXRBdHRyaWJ1dGUoInJvbGUiLCAidGFibGlzdCIp OwogICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGVmdFNlY3Rpb25FbGVtZW50 KTsKIAogICAgIHRoaXMuX2NlbnRlclNlY3Rpb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CkBAIC00Myw2ICs0NCw3IEBACiAKICAgICB0aGlzLl9yaWdodFNlY3Rpb25F bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5fcmlnaHRT ZWN0aW9uRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVG9vbGJhci5JdGVtU2VjdGlv blN0eWxlQ2xhc3NOYW1lICsgIiAiICsgV2ViSW5zcGVjdG9yLlRvb2xiYXIuUmlnaHRJdGVtU2Vj dGlvblN0eWxlQ2xhc3NOYW1lOworICAgIHRoaXMuX3JpZ2h0U2VjdGlvbkVsZW1lbnQuc2V0QXR0 cmlidXRlKCJyb2xlIiwgInRhYmxpc3QiKTsKICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3JpZ2h0U2VjdGlvbkVsZW1lbnQpOwogCiAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmlu ZCh0aGlzKSwgZmFsc2UpOwpJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVt LmpzCShyZXZpc2lvbiAxNTQxNjMpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0y MywxMiArMjMsMTMgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci1XZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IGZ1bmN0aW9uKGlk ZW50aWZpZXIsIGRlZmF1bHRUb29sVGlwLCBhY3RpdmF0ZWRUb29sVGlwLCBpbWFnZSwgaW1hZ2VX aWR0aCwgaW1hZ2VIZWlnaHQsIHN1cHByZXNzRW1ib3NzKQorV2ViSW5zcGVjdG9yLkFjdGl2YXRl QnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBmdW5jdGlvbihpZGVudGlmaWVyLCBkZWZhdWx0VG9vbFRp cCwgYWN0aXZhdGVkVG9vbFRpcCwgaW1hZ2UsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0LCBzdXBw cmVzc0VtYm9zcywgcm9sZSkKIHsKLSAgICBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uY2FsbCh0aGlzLCBpZGVudGlmaWVyLCBkZWZhdWx0VG9vbFRpcCwgaW1hZ2UsIGltYWdlV2lk dGgsIGltYWdlSGVpZ2h0LCBzdXBwcmVzc0VtYm9zcyk7CisgICAgV2ViSW5zcGVjdG9yLkJ1dHRv bk5hdmlnYXRpb25JdGVtLmNhbGwodGhpcywgaWRlbnRpZmllciwgZGVmYXVsdFRvb2xUaXAsIGlt YWdlLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwgc3VwcHJlc3NFbWJvc3MsIHJvbGUpOwogCiAg ICAgdGhpcy5fZGVmYXVsdFRvb2xUaXAgPSBkZWZhdWx0VG9vbFRpcDsKICAgICB0aGlzLl9hY3Rp dmF0ZWRUb29sVGlwID0gYWN0aXZhdGVkVG9vbFRpcCB8fCBkZWZhdWx0VG9vbFRpcDsKKyAgICB0 aGlzLl9yb2xlID0gcm9sZTsKIH07CiAKIFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvbk5hdmln YXRpb25JdGVtLlN0eWxlQ2xhc3NOYW1lID0gImFjdGl2YXRlIjsKQEAgLTU5LDkgKzYwLDEzIEBA CiAgICAgICAgIGlmIChmbGFnKSB7CiAgICAgICAgICAgICB0aGlzLnRvb2xUaXAgPSB0aGlzLl9h Y3RpdmF0ZWRUb29sVGlwOwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQo V2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uQWN0aXZhdGVkU3R5bGVD bGFzc05hbWUpOworICAgICAgICAgICAgaWYgKHRoaXMuX3JvbGUgPT09ICJ0YWIiKQorICAgICAg ICAgICAgICAgIHRoaXMuZWxlbWVudC5zZXRBdHRyaWJ1dGUoImFyaWEtc2VsZWN0ZWQiLCAidHJ1 ZSIpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy50b29sVGlwID0gdGhpcy5f ZGVmYXVsdFRvb2xUaXA7CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92 ZShXZWJJbnNwZWN0b3IuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5BY3RpdmF0ZWRTdHls ZUNsYXNzTmFtZSk7CisgICAgICAgICAgICBpZiAodGhpcy5fcm9sZSA9PT0gInRhYiIpCisgICAg ICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUF0dHJpYnV0ZSgiYXJpYS1zZWxlY3RlZCIp OwogICAgICAgICB9CiAgICAgfSwKIApJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQnV0dG9uVG9vbGJhckl0ZW0uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQnV0dG9uVG9vbGJhckl0ZW0uanMJKHJldmlzaW9uIDE1 NDE2MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0J1dHRvblRvb2xi YXJJdGVtLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMyw5ICsyMyw5IEBACiAgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkJ1dHRvblRvb2xiYXJJ dGVtID0gZnVuY3Rpb24oaWRlbnRpZmllciwgdG9vbFRpcCwgbGFiZWwsIGltYWdlLCBzdXBwcmVz c0VtYm9zcykKK1dlYkluc3BlY3Rvci5CdXR0b25Ub29sYmFySXRlbSA9IGZ1bmN0aW9uKGlkZW50 aWZpZXIsIHRvb2xUaXAsIGxhYmVsLCBpbWFnZSwgc3VwcHJlc3NFbWJvc3MsIHJvbGUpCiB7Ci0g ICAgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLmNhbGwodGhpcywgaWRlbnRpZmll ciwgdG9vbFRpcCwgaW1hZ2UsIDMyLCAzMiwgc3VwcHJlc3NFbWJvc3MpOworICAgIFdlYkluc3Bl Y3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5jYWxsKHRoaXMsIGlkZW50aWZpZXIsIHRvb2xUaXAs IGltYWdlLCAzMiwgMzIsIHN1cHByZXNzRW1ib3NzLCByb2xlKTsKIAogICAgIGNvbnNvbGUuYXNz ZXJ0KGxhYmVsKTsKIAo=