89425 2012-06-18 23:02:29 -0700 [Forms] Move isKeyboardFocusable and isMouseFocusable to InputType from HTMLInputElement 2012-06-19 01:57:37 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88970 1 yosin yosin tkent webkit.review.bot oldest_to_newest 652058 0 yosin 2012-06-18 23:02:29 -0700 For introducing time fields UI and code cleanup, input type class should decide of keyboard/mouse focus-able rather than HTMLInputElement. == Current == bool HTMLInputElement::isKeyboardFocusable(KeyboardEvent* event) const { if (isTextField()) return HTMLTextFormControlElement::isFocusable(); return HTMLTextFormControlElement::isKeyboardFocusable(event) && m_inputType->isKeyboardFocusable(); } == Proposed == bool HTMLInputElement::isKeyboardFocusable(KeyboardEvent* event) const { return m_inputType->isKeyboardFocusable(event); } bool InputType::isKeyboardFocusable(KeyboardEvent* event) const { return element()->isTextFormControlKeyboardFocusable(event); // call new method in HTMLInputElement class } bool TextFieldInputType::isKeyboardFocusable(KeyboardEvent* event) const { return element()->isTextFormControlFocusable(); // call new method in HTMLInputElement class } 652096 1 148261 yosin 2012-06-18 23:36:07 -0700 Created attachment 148261 Patch 1 652097 2 148261 yosin 2012-06-18 23:36:32 -0700 Comment on attachment 148261 Patch 1 Could you review this patch? Thanks in advance. 652109 3 148261 tkent 2012-06-18 23:47:08 -0700 Comment on attachment 148261 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=148261&action=review > Source/WebCore/html/HTMLInputElement.h:267 > + virtual bool isTextFormControlFocusable() const; > + virtual bool isTextFormControlKeyboardFocusable(KeyboardEvent*) const; > + virtual bool isTextFormControlMouseFocusable() const; They shouldn't be virtual. Also, please put them just below setValueInternal() because it is also a helper for *InputType. > Source/WebCore/html/RadioInputType.cpp:119 > + if (!element()->isTextFormControlKeyboardFocusable(event)) if (!InputType::isKeyboardFocusable(event)) is better. 652131 4 148270 yosin 2012-06-19 00:12:52 -0700 Created attachment 148270 Patch 2 652132 5 148270 yosin 2012-06-19 00:15:02 -0700 Comment on attachment 148270 Patch 2 Could you review this patch? Thanks in advance. = Changes since last review == * Remove "virtual" from isTextFormControl*Focusable method declarations ** as suggested * Call InputType::isKeyboardFocusable() in RadioInputType::isKeyboardFocusable ** as suggested 652140 6 148270 buildbot 2012-06-19 00:24:29 -0700 Comment on attachment 148270 Patch 2 Attachment 148270 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12972717 652146 7 148274 yosin 2012-06-19 00:27:56 -0700 Created attachment 148274 Patch 3 652150 8 148274 yosin 2012-06-19 00:30:02 -0700 Comment on attachment 148274 Patch 3 Could you review this patch? Thanks in advance. = Changes since last review == * Remove "virtual" from isTextFormControl*Focusable method declarations ** as suggested * Call InputType::isKeyboardFocusable() in RadioInputType::isKeyboardFocusable ** as suggested * Remove unused prameter in TextFieldInputType::isKeyboardFocusable ** Failed on Mac build 652187 9 148274 tkent 2012-06-19 01:09:16 -0700 Comment on attachment 148274 Patch 3 ok 652231 10 148274 webkit.review.bot 2012-06-19 01:57:32 -0700 Comment on attachment 148274 Patch 3 Clearing flags on attachment: 148274 Committed r120695: <http://trac.webkit.org/changeset/120695> 652232 11 webkit.review.bot 2012-06-19 01:57:37 -0700 All reviewed patches have been landed. Closing bug. 148261 2012-06-18 23:36:07 -0700 2012-06-19 00:12:47 -0700 Patch 1 bug-89425-20120619153606.patch text/plain 8845 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FkM2Q0NWJmZWU1OTRh YTBhMjg3NmIwYTFkZjg4NDZhZTc2OTU2My4uYzQyYzg2NDVhMzY0MTlhY2M5MjM5MDZlNmE1ZjYw YTcyZDg2NzM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA2LTE4ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBNb3Zl IGlzS2V5Ym9hcmRGb2N1c2FibGUgYW5kIGlzTW91c2VGb2N1c2FibGUgdG8gSW5wdXRUeXBlIGZy b20gSFRNTElucHV0RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODk0MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIGltcGxlbWVudGF0aW9uIG9mIEhUTUxJbnB1ZUVs ZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUKKyAgICAgICAgYW5kIGlzTW91c2VGb2N1c2FibGUg dG8gSW5wdXRUeXBlIGNsYXNzIHRvIGFsbG93IGVhY2ggaW1wbGVtZW50YXRpb24KKyAgICAgICAg b2YgSW5wdXRUeXBlIGNhbiBkZWNpZGUgZm9jdXMtYWJpbGl0eS4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBo dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZSk6IENoYW5nZWQgdG8gY2FsbCBJbnB1dFR5cGU6Omlz S2V5Ym9hcmRGb2N1c2FibGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojpp c01vdXNlRm9jdXNhYmxlKTogQ2hhbmdlZCB0byBjYWxsIElucHV0VHlwZTo6aXNNb3VzZUZvY3Vz YWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1Db250 cm9sRm9jdXNhYmxlKTogQWRkZWQgdG8gYWxsb3cgSW5wdXRUeXBlIGNhbiBjYWxsIGEgbWV0aG9k IGluIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6SFRNTElu cHV0RWxlbWVudDo6aXNUZXh0Rm9ybUNvbnRyb2xLZXlib2FyZEZvY3VzYWJsZSk6IEFkZGVkIHRv IGFsbG93IElucHV0VHlwZSBjYW4gY2FsbCBhIG1ldGhvZCBpbiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1D b250cm9sTW91c2VGb2N1c2FibGUpOiBBZGRlZCB0byBhbGxvdyBJbnB1dFR5cGUgY2FuIGNhbGwg YSBtZXRob2QgaW4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuCisgICAgICAgICogaHRtbC9I VE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5wdXRFbGVtZW50KToKKyAgICAgICAg KiBodG1sL0lucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJs ZSk6IEFkZGVkIGZvciBkZWZhdWx0IG1ldGhvZCBvZiBkZXJpdmVkIElucHV0VHlwZSBjbGFzc2Vz LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAgIChJbnB1dFR5cGUpOiBDaGFn bmVkIHNpZ25hdHVyZSBvZiBpc0tleWJvYXJkRm9jdXNhYmxlLgorICAgICAgICAqIGh0bWwvUmFk aW9JbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFkaW9JbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZSB3aGljaCB3YXMgZG9uZSBpbiBIVE1MSW5wdXRFbGVtZW50LgorICAgICAgICAq IGh0bWwvUmFkaW9JbnB1dFR5cGUuaDoKKyAgICAgICAgKFJhZGlvSW5wdXRUeXBlKToKKyAgICAg ICAgKiBodG1sL1RleHRGaWVsZElucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0 RmllbGRJbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlv biBmcm9tIEhUTUxJbnB1dEVsZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGRJbnB1 dFR5cGU6OmlzTW91c2VGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlvbiBmcm9tIEhUTUxJ bnB1dEVsZW1lbnQuCisgICAgICAgICogaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuaDoKKyAgICAg ICAgKFRleHRGaWVsZElucHV0VHlwZSk6CisKIDIwMTItMDYtMTggIEpvb25lIEh1ciAgPGpvb25l Lmh1ckBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRm9udGNvbmZpZyBjYW4ndCBiZSBsaW5r ZWQgcHJvcGVybHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCmluZGV4 IDI5MmViOWIyMTY5ZmYzMjhmYTc4MWRkZGViMDA3MDIxZmIxYWNkNDUuLjFiNjMwMDRkZjEyMjky YzZhMTZiOGFmMDk4YTQ3ZGQ0NGM1OGEwMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmNwcApAQCAtMjk2LDE1ICsyOTYsMjYgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50 OjpzdGVwRG93bihpbnQgbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAKIGJvb2wgSFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KiBldmVudCkgY29uc3QKIHsK LSAgICBpZiAoaXNUZXh0RmllbGQoKSkKLSAgICAgICAgcmV0dXJuIEhUTUxUZXh0Rm9ybUNvbnRy b2xFbGVtZW50Ojppc0ZvY3VzYWJsZSgpOwotICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCkgJiYgbV9pbnB1dFR5cGUtPmlzS2V5 Ym9hcmRGb2N1c2FibGUoKTsKKyAgICByZXR1cm4gbV9pbnB1dFR5cGUtPmlzS2V5Ym9hcmRGb2N1 c2FibGUoZXZlbnQpOwogfQogCiBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzTW91c2VGb2N1c2Fi bGUoKSBjb25zdAogewotICAgIGlmIChpc1RleHRGaWVsZCgpKQotICAgICAgICByZXR1cm4gSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmlzRm9jdXNhYmxlKCk7CisgICAgcmV0dXJuIG1faW5w dXRUeXBlLT5pc01vdXNlRm9jdXNhYmxlKCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudDo6aXNGb2N1c2FibGUoKTsKK30KKworYm9vbCBIVE1MSW5wdXRF bGVtZW50Ojppc1RleHRGb3JtQ29udHJvbEtleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQq IGV2ZW50KSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6 aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CiAgICAgcmV0dXJuIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojppc01vdXNlRm9jdXNhYmxlKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5kZXggNmQyMzkwODQ1MjJmYjFjZjJhNDA5 NDQ2YjgyOGIzMDEwZDgzYWQyMi4uYTQ4ZGM3ZjlmZjBkZjJmNGE0MzI5YWMyOTFkOGU2YmYyMGVl ZDU0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKQEAgLTI2Miw2ICsy NjIsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SGVpZ2h0KHVuc2lnbmVkKTsKICAgICB2b2lk IHNldFdpZHRoKHVuc2lnbmVkKTsKIAorICAgIHZpcnR1YWwgYm9vbCBpc1RleHRGb3JtQ29udHJv bEZvY3VzYWJsZSgpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBpc1RleHRGb3JtQ29udHJvbEtl eWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wg aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpIGNvbnN0OworCiAgICAgdmlydHVhbCBj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUoKSBjb25zdCBPVkVSUklERTsKIAogcHJvdGVjdGVkOgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCmluZGV4IDhkMzgzZTI0ZjMxNjJjYjhmZTI5OTA1NjI3 MmEwNTJkMjM0YWMxOTguLmRhNmUzZDAzZWE0OWJkYTIwNDFjOTAwYTMzZTdjMWNiMDMxYzI5Mzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5jcHAKQEAgLTUwMCw5ICs1MDAsMTQgQEAgYm9vbCBJ bnB1dFR5cGU6OmNhblNldFN0cmluZ1ZhbHVlKCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAotYm9vbCBJbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUoKSBjb25zdAorYm9vbCBJbnB1 dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9hcmRFdmVudCogZXZlbnQpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGVsZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRy b2xLZXlib2FyZEZvY3VzYWJsZShldmVudCk7Cit9CisKK2Jvb2wgSW5wdXRUeXBlOjppc01vdXNl Rm9jdXNhYmxlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZWxlbWVudCgpLT5pc1RleHRGb3JtQ29u dHJvbE1vdXNlRm9jdXNhYmxlKCk7CiB9CiAKIGJvb2wgSW5wdXRUeXBlOjpzaG91bGRVc2VJbnB1 dE1ldGhvZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlw ZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaAppbmRleCBhY2QwYTdiZWM5Mjhk OGIyYWUyODZhNmYxN2E1YWYwY2JhOWZiYjIzLi5iOWRjZmI0NzNjY2VhOTU5MGIyZjNjZDgxN2Jh YWUyOGU1ZTczODYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmgKQEAgLTE5NCw3ICsxOTQsOCBA QCBwdWJsaWM6CiAgICAgLy8gSGVscGVycyBmb3IgZXZlbnQgaGFuZGxlcnMuCiAgICAgdmlydHVh bCBib29sIHNob3VsZFN1Ym1pdEltcGxpY2l0bHkoRXZlbnQqKTsKICAgICB2aXJ0dWFsIFBhc3NS ZWZQdHI8SFRNTEZvcm1FbGVtZW50PiBmb3JtRm9yU3VibWlzc2lvbigpIGNvbnN0OwotICAgIHZp cnR1YWwgYm9vbCBpc0tleWJvYXJkRm9jdXNhYmxlKCkgY29uc3Q7CisgICAgdmlydHVhbCBib29s IGlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9hcmRFdmVudCopIGNvbnN0OworICAgIHZpcnR1YWwg Ym9vbCBpc01vdXNlRm9jdXNhYmxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHNob3VsZFVz ZUlucHV0TWV0aG9kKCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUZvY3VzRXZlbnQo KTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQmx1ckV2ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv UmFkaW9JbnB1dFR5cGUuY3BwCmluZGV4IDE1NWJlODkxZGE2YTI0ZWExNzFmNzRjZTZjM2FmZTI2 NTU3OTYzNjIuLjM2ODZmY2Y5NTk1ODdjZDhlNmY3NjBkOTlkNzNhYTYxZGMzNDI3M2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvUmFkaW9JbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvUmFkaW9JbnB1dFR5cGUuY3BwCkBAIC0xMTQsOCArMTE0LDExIEBAIHZv aWQgUmFkaW9JbnB1dFR5cGU6OmhhbmRsZUtleXVwRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQp CiAgICAgZGlzcGF0Y2hTaW11bGF0ZWRDbGlja0lmQWN0aXZlKGV2ZW50KTsKIH0KIAotYm9vbCBS YWRpb0lucHV0VHlwZTo6aXNLZXlib2FyZEZvY3VzYWJsZSgpIGNvbnN0Citib29sIFJhZGlvSW5w dXRUeXBlOjppc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqIGV2ZW50KSBjb25zdAog eworICAgIGlmICghZWxlbWVudCgpLT5pc1RleHRGb3JtQ29udHJvbEtleWJvYXJkRm9jdXNhYmxl KGV2ZW50KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgLy8gV2hlbiB1c2luZyBTcGF0 aWFsIE5hdmlnYXRpb24sIGV2ZXJ5IHJhZGlvIGJ1dHRvbiBzaG91bGQgYmUgZm9jdXNhYmxlLgog ICAgIGlmIChpc1NwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZChlbGVtZW50KCktPmRvY3VtZW50KCkt PmZyYW1lKCkpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvUmFkaW9JbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvUmFkaW9JbnB1 dFR5cGUuaAppbmRleCA3NzkwYjUwNGM5OTFjYTAyYWY4ZTNmNTY4ZDAxMmEzOTg2NjYwZTU5Li4y NGUyN2JjNTczNjEzMDQxOGZjM2JkZDVmODJiOTU4ODhiZmE4ODNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9SYWRpb0lucHV0VHlwZS5oCkBAIC00Nyw3ICs0Nyw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVh bCB2b2lkIGhhbmRsZUNsaWNrRXZlbnQoTW91c2VFdmVudCopIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBoYW5kbGVLZXlkb3duRXZlbnQoS2V5Ym9hcmRFdmVudCopIE9WRVJSSURFOwogICAg IHZpcnR1YWwgdm9pZCBoYW5kbGVLZXl1cEV2ZW50KEtleWJvYXJkRXZlbnQqKSBPVkVSUklERTsK LSAgICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZSgpIGNvbnN0IE9WRVJSSURFOwor ICAgIHZpcnR1YWwgYm9vbCBpc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqKSBjb25z dCBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2VuZENoYW5nZUV2ZW50QWZ0ZXJD aGVja2VkQ2hhbmdlZCgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgUGFzc093blB0cjxDbGlja0hh bmRsaW5nU3RhdGU+IHdpbGxEaXNwYXRjaENsaWNrKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIGRpZERpc3BhdGNoQ2xpY2soRXZlbnQqLCBjb25zdCBDbGlja0hhbmRsaW5nU3RhdGUmKSBP VkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRU eXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAppbmRl eCA4MTg5MTQ0YTk5MzgwYTU4ZDBjOGE1YTc3YWNmMGI2OGMwZTBmNDhlLi5lNzMwNWU3NDYyOTI4 NjlmYzg4M2MyODM5MzU3NDk1Y2Y0NmYxOWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL1RleHRGaWVsZElucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0 RmllbGRJbnB1dFR5cGUuY3BwCkBAIC02NSw2ICs2NSwxNiBAQCBUZXh0RmllbGRJbnB1dFR5cGU6 On5UZXh0RmllbGRJbnB1dFR5cGUoKQogewogfQogCitib29sIFRleHRGaWVsZElucHV0VHlwZTo6 aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KiBldmVudCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gZWxlbWVudCgpLT5pc1RleHRGb3JtQ29udHJvbEZvY3VzYWJsZSgpOworfQorCitib29s IFRleHRGaWVsZElucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIGVsZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKTsKK30KKwogYm9vbCBU ZXh0RmllbGRJbnB1dFR5cGU6OmlzVGV4dEZpZWxkKCkgY29uc3QKIHsKICAgICByZXR1cm4gdHJ1 ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0VHlwZS5oCmluZGV4IDU1OWJlMjVl NzUxOTkyNmM4YzlkYTliNWFlYmRmNjI0YTg5YzJhMjAuLmIzNjI5ZDBkM2U4NDBiNWRmODBjMmUz N2YzMGMzNjI4ZGIxNjMwNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZp ZWxkSW5wdXRUeXBlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5 cGUuaApAQCAtNjcsNiArNjcsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGhhbmRs ZUJsdXJFdmVudCgpIE9WRVJSSURFOwogCiBwcml2YXRlOgorICAgIHZpcnR1YWwgYm9vbCBpc0tl eWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIGJvb2wgaXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwg Ym9vbCBpc1RleHRGaWVsZCgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCB2YWx1 ZU1pc3NpbmcoY29uc3QgU3RyaW5nJikgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lk IGhhbmRsZUJlZm9yZVRleHRJbnNlcnRlZEV2ZW50KEJlZm9yZVRleHRJbnNlcnRlZEV2ZW50Kikg T1ZFUlJJREU7Cg== 148270 2012-06-19 00:12:52 -0700 2012-06-19 00:27:50 -0700 Patch 2 bug-89425-20120619161251.patch text/plain 8909 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FkM2Q0NWJmZWU1OTRh YTBhMjg3NmIwYTFkZjg4NDZhZTc2OTU2My4uYzQyYzg2NDVhMzY0MTlhY2M5MjM5MDZlNmE1ZjYw YTcyZDg2NzM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA2LTE4ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBNb3Zl IGlzS2V5Ym9hcmRGb2N1c2FibGUgYW5kIGlzTW91c2VGb2N1c2FibGUgdG8gSW5wdXRUeXBlIGZy b20gSFRNTElucHV0RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODk0MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIGltcGxlbWVudGF0aW9uIG9mIEhUTUxJbnB1ZUVs ZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUKKyAgICAgICAgYW5kIGlzTW91c2VGb2N1c2FibGUg dG8gSW5wdXRUeXBlIGNsYXNzIHRvIGFsbG93IGVhY2ggaW1wbGVtZW50YXRpb24KKyAgICAgICAg b2YgSW5wdXRUeXBlIGNhbiBkZWNpZGUgZm9jdXMtYWJpbGl0eS4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBo dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZSk6IENoYW5nZWQgdG8gY2FsbCBJbnB1dFR5cGU6Omlz S2V5Ym9hcmRGb2N1c2FibGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojpp c01vdXNlRm9jdXNhYmxlKTogQ2hhbmdlZCB0byBjYWxsIElucHV0VHlwZTo6aXNNb3VzZUZvY3Vz YWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1Db250 cm9sRm9jdXNhYmxlKTogQWRkZWQgdG8gYWxsb3cgSW5wdXRUeXBlIGNhbiBjYWxsIGEgbWV0aG9k IGluIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6SFRNTElu cHV0RWxlbWVudDo6aXNUZXh0Rm9ybUNvbnRyb2xLZXlib2FyZEZvY3VzYWJsZSk6IEFkZGVkIHRv IGFsbG93IElucHV0VHlwZSBjYW4gY2FsbCBhIG1ldGhvZCBpbiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1D b250cm9sTW91c2VGb2N1c2FibGUpOiBBZGRlZCB0byBhbGxvdyBJbnB1dFR5cGUgY2FuIGNhbGwg YSBtZXRob2QgaW4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuCisgICAgICAgICogaHRtbC9I VE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5wdXRFbGVtZW50KToKKyAgICAgICAg KiBodG1sL0lucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJs ZSk6IEFkZGVkIGZvciBkZWZhdWx0IG1ldGhvZCBvZiBkZXJpdmVkIElucHV0VHlwZSBjbGFzc2Vz LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAgIChJbnB1dFR5cGUpOiBDaGFn bmVkIHNpZ25hdHVyZSBvZiBpc0tleWJvYXJkRm9jdXNhYmxlLgorICAgICAgICAqIGh0bWwvUmFk aW9JbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFkaW9JbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZSB3aGljaCB3YXMgZG9uZSBpbiBIVE1MSW5wdXRFbGVtZW50LgorICAgICAgICAq IGh0bWwvUmFkaW9JbnB1dFR5cGUuaDoKKyAgICAgICAgKFJhZGlvSW5wdXRUeXBlKToKKyAgICAg ICAgKiBodG1sL1RleHRGaWVsZElucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0 RmllbGRJbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlv biBmcm9tIEhUTUxJbnB1dEVsZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGRJbnB1 dFR5cGU6OmlzTW91c2VGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlvbiBmcm9tIEhUTUxJ bnB1dEVsZW1lbnQuCisgICAgICAgICogaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuaDoKKyAgICAg ICAgKFRleHRGaWVsZElucHV0VHlwZSk6CisKIDIwMTItMDYtMTggIEpvb25lIEh1ciAgPGpvb25l Lmh1ckBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRm9udGNvbmZpZyBjYW4ndCBiZSBsaW5r ZWQgcHJvcGVybHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCmluZGV4 IDI5MmViOWIyMTY5ZmYzMjhmYTc4MWRkZGViMDA3MDIxZmIxYWNkNDUuLjFiNjMwMDRkZjEyMjky YzZhMTZiOGFmMDk4YTQ3ZGQ0NGM1OGEwMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmNwcApAQCAtMjk2LDE1ICsyOTYsMjYgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50 OjpzdGVwRG93bihpbnQgbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAKIGJvb2wgSFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KiBldmVudCkgY29uc3QKIHsK LSAgICBpZiAoaXNUZXh0RmllbGQoKSkKLSAgICAgICAgcmV0dXJuIEhUTUxUZXh0Rm9ybUNvbnRy b2xFbGVtZW50Ojppc0ZvY3VzYWJsZSgpOwotICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCkgJiYgbV9pbnB1dFR5cGUtPmlzS2V5 Ym9hcmRGb2N1c2FibGUoKTsKKyAgICByZXR1cm4gbV9pbnB1dFR5cGUtPmlzS2V5Ym9hcmRGb2N1 c2FibGUoZXZlbnQpOwogfQogCiBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzTW91c2VGb2N1c2Fi bGUoKSBjb25zdAogewotICAgIGlmIChpc1RleHRGaWVsZCgpKQotICAgICAgICByZXR1cm4gSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmlzRm9jdXNhYmxlKCk7CisgICAgcmV0dXJuIG1faW5w dXRUeXBlLT5pc01vdXNlRm9jdXNhYmxlKCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudDo6aXNGb2N1c2FibGUoKTsKK30KKworYm9vbCBIVE1MSW5wdXRF bGVtZW50Ojppc1RleHRGb3JtQ29udHJvbEtleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQq IGV2ZW50KSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6 aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CiAgICAgcmV0dXJuIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojppc01vdXNlRm9jdXNhYmxlKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5kZXggNmQyMzkwODQ1MjJmYjFjZjJhNDA5 NDQ2YjgyOGIzMDEwZDgzYWQyMi4uNDdhMTljODEyNGU0MjhjOTM2YTVlYzdkZGJkYmIwNTRiZDJh OGY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKQEAgLTI0MSw2ICsy NDEsMTAgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRWYWx1ZUludGVybmFsKGNvbnN0IFN0cmlu ZyYsIFRleHRGaWVsZEV2ZW50QmVoYXZpb3IpOwogCisgICAgYm9vbCBpc1RleHRGb3JtQ29udHJv bEZvY3VzYWJsZSgpIGNvbnN0OworICAgIGJvb2wgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2FyZEZv Y3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3Q7CisgICAgYm9vbCBpc1RleHRGb3JtQ29udHJv bE1vdXNlRm9jdXNhYmxlKCkgY29uc3Q7CisKICAgICB2b2lkIGNhY2hlU2VsZWN0aW9uSW5SZXNw b25zZVRvU2V0VmFsdWUoaW50IGNhcmV0T2Zmc2V0KSB7IGNhY2hlU2VsZWN0aW9uKGNhcmV0T2Zm c2V0LCBjYXJldE9mZnNldCwgU2VsZWN0aW9uSGFzTm9EaXJlY3Rpb24pOyB9CiAKICNpZiBFTkFC TEUoSU5QVVRfVFlQRV9DT0xPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5w dXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmNwcAppbmRleCA4ZDM4 M2UyNGYzMTYyY2I4ZmUyOTkwNTYyNzJhMDUyZDIzNGFjMTk4Li5kYTZlM2QwM2VhNDliZGEyMDQx YzkwMGEzM2U3YzFjYjAzMWMyOTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lu cHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCkBAIC01 MDAsOSArNTAwLDE0IEBAIGJvb2wgSW5wdXRUeXBlOjpjYW5TZXRTdHJpbmdWYWx1ZSgpIGNvbnN0 CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNh YmxlKCkgY29uc3QKK2Jvb2wgSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJk RXZlbnQqIGV2ZW50KSBjb25zdAogewotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBlbGVt ZW50KCktPmlzVGV4dEZvcm1Db250cm9sS2V5Ym9hcmRGb2N1c2FibGUoZXZlbnQpOworfQorCiti b29sIElucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGVs ZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpOwogfQogCiBib29sIElu cHV0VHlwZTo6c2hvdWxkVXNlSW5wdXRNZXRob2QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBl LmgKaW5kZXggYWNkMGE3YmVjOTI4ZDhiMmFlMjg2YTZmMTdhNWFmMGNiYTlmYmIyMy4uYjlkY2Zi NDczY2NlYTk1OTBiMmYzY2Q4MTdiYWFlMjhlNWU3Mzg2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9JbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlw ZS5oCkBAIC0xOTQsNyArMTk0LDggQEAgcHVibGljOgogICAgIC8vIEhlbHBlcnMgZm9yIGV2ZW50 IGhhbmRsZXJzLgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRTdWJtaXRJbXBsaWNpdGx5KEV2ZW50 Kik7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEhUTUxGb3JtRWxlbWVudD4gZm9ybUZvclN1Ym1p c3Npb24oKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZSgpIGNv bnN0OworICAgIHZpcnR1YWwgYm9vbCBpc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQq KSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0OwogICAg IHZpcnR1YWwgYm9vbCBzaG91bGRVc2VJbnB1dE1ldGhvZCgpIGNvbnN0OwogICAgIHZpcnR1YWwg dm9pZCBoYW5kbGVGb2N1c0V2ZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUJsdXJFdmVu dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYWRpb0lucHV0VHlwZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmNwcAppbmRleCAxNTViZTg5MWRh NmEyNGVhMTcxZjc0Y2U2YzNhZmUyNjU1Nzk2MzYyLi4yYzE2YjFhMTY5NTEyYzVkMzk0ZTllZmU4 MzhiOTA2NzdkMjQ5NGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5w dXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmNwcApA QCAtMTE0LDggKzExNCwxMSBAQCB2b2lkIFJhZGlvSW5wdXRUeXBlOjpoYW5kbGVLZXl1cEV2ZW50 KEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIGRpc3BhdGNoU2ltdWxhdGVkQ2xpY2tJZkFjdGl2 ZShldmVudCk7CiB9CiAKLWJvb2wgUmFkaW9JbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUo KSBjb25zdAorYm9vbCBSYWRpb0lucHV0VHlwZTo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2Fy ZEV2ZW50KiBldmVudCkgY29uc3QKIHsKKyAgICBpZiAoIUlucHV0VHlwZTo6aXNLZXlib2FyZEZv Y3VzYWJsZShldmVudCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIC8vIFdoZW4gdXNp bmcgU3BhdGlhbCBOYXZpZ2F0aW9uLCBldmVyeSByYWRpbyBidXR0b24gc2hvdWxkIGJlIGZvY3Vz YWJsZS4KICAgICBpZiAoaXNTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoZWxlbWVudCgpLT5kb2N1 bWVudCgpLT5mcmFtZSgpKSkKICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1Jh ZGlvSW5wdXRUeXBlLmgKaW5kZXggNzc5MGI1MDRjOTkxY2EwMmFmOGUzZjU2OGQwMTJhMzk4NjY2 MGU1OS4uMjRlMjdiYzU3MzYxMzA0MThmYzNiZGQ1ZjgyYjk1ODg4YmZhODgzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYWRpb0lucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvUmFkaW9JbnB1dFR5cGUuaApAQCAtNDcsNyArNDcsNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBoYW5kbGVDbGlja0V2ZW50KE1vdXNlRXZlbnQqKSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIHZvaWQgaGFuZGxlS2V5ZG93bkV2ZW50KEtleWJvYXJkRXZlbnQqKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlS2V5dXBFdmVudChLZXlib2FyZEV2ZW50KikgT1ZF UlJJREU7Ci0gICAgdmlydHVhbCBib29sIGlzS2V5Ym9hcmRGb2N1c2FibGUoKSBjb25zdCBPVkVS UklERTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50 KikgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIHNob3VsZFNlbmRDaGFuZ2VFdmVu dEFmdGVyQ2hlY2tlZENoYW5nZWQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8 Q2xpY2tIYW5kbGluZ1N0YXRlPiB3aWxsRGlzcGF0Y2hDbGljaygpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCBkaWREaXNwYXRjaENsaWNrKEV2ZW50KiwgY29uc3QgQ2xpY2tIYW5kbGluZ1N0 YXRlJikgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVs ZElucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0VHlwZS5j cHAKaW5kZXggODE4OTE0NGE5OTM4MGE1OGQwYzhhNWE3N2FjZjBiNjhjMGUwZjQ4ZS4uZTczMDVl NzQ2MjkyODY5ZmM4ODNjMjgzOTM1NzQ5NWNmNDZmMTliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcApAQCAtNjUsNiArNjUsMTYgQEAgVGV4dEZpZWxkSW5w dXRUeXBlOjp+VGV4dEZpZWxkSW5wdXRUeXBlKCkKIHsKIH0KIAorYm9vbCBUZXh0RmllbGRJbnB1 dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9hcmRFdmVudCogZXZlbnQpIGNvbnN0Cit7 CisgICAgcmV0dXJuIGVsZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKTsKK30K KworYm9vbCBUZXh0RmllbGRJbnB1dFR5cGU6OmlzTW91c2VGb2N1c2FibGUoKSBjb25zdAorewor ICAgIHJldHVybiBlbGVtZW50KCktPmlzVGV4dEZvcm1Db250cm9sRm9jdXNhYmxlKCk7Cit9CisK IGJvb2wgVGV4dEZpZWxkSW5wdXRUeXBlOjppc1RleHRGaWVsZCgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0 VHlwZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuaAppbmRleCA1 NTliZTI1ZTc1MTk5MjZjOGM5ZGE5YjVhZWJkZjYyNGE4OWMyYTIwLi5iMzYyOWQwZDNlODQwYjVk ZjgwYzJlMzdmMzBjMzYyOGRiMTYzMDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L1RleHRGaWVsZElucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxk SW5wdXRUeXBlLmgKQEAgLTY3LDYgKzY3LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVCbHVyRXZlbnQoKSBPVkVSUklERTsKIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJv b2wgaXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3QgT1ZFUlJJREU7Cisg ICAgdmlydHVhbCBib29sIGlzTW91c2VGb2N1c2FibGUoKSBjb25zdCBPVkVSUklERTsKICAgICB2 aXJ0dWFsIGJvb2wgaXNUZXh0RmllbGQoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJv b2wgdmFsdWVNaXNzaW5nKGNvbnN0IFN0cmluZyYpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBoYW5kbGVCZWZvcmVUZXh0SW5zZXJ0ZWRFdmVudChCZWZvcmVUZXh0SW5zZXJ0ZWRF dmVudCopIE9WRVJSSURFOwo= 148274 2012-06-19 00:27:56 -0700 2012-06-19 01:57:32 -0700 Patch 3 bug-89425-20120619162755.patch text/plain 8903 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FkM2Q0NWJmZWU1OTRh YTBhMjg3NmIwYTFkZjg4NDZhZTc2OTU2My4uYzQyYzg2NDVhMzY0MTlhY2M5MjM5MDZlNmE1ZjYw YTcyZDg2NzM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA2LTE4ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBNb3Zl IGlzS2V5Ym9hcmRGb2N1c2FibGUgYW5kIGlzTW91c2VGb2N1c2FibGUgdG8gSW5wdXRUeXBlIGZy b20gSFRNTElucHV0RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODk0MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIGltcGxlbWVudGF0aW9uIG9mIEhUTUxJbnB1ZUVs ZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUKKyAgICAgICAgYW5kIGlzTW91c2VGb2N1c2FibGUg dG8gSW5wdXRUeXBlIGNsYXNzIHRvIGFsbG93IGVhY2ggaW1wbGVtZW50YXRpb24KKyAgICAgICAg b2YgSW5wdXRUeXBlIGNhbiBkZWNpZGUgZm9jdXMtYWJpbGl0eS4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBo dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZSk6IENoYW5nZWQgdG8gY2FsbCBJbnB1dFR5cGU6Omlz S2V5Ym9hcmRGb2N1c2FibGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojpp c01vdXNlRm9jdXNhYmxlKTogQ2hhbmdlZCB0byBjYWxsIElucHV0VHlwZTo6aXNNb3VzZUZvY3Vz YWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1Db250 cm9sRm9jdXNhYmxlKTogQWRkZWQgdG8gYWxsb3cgSW5wdXRUeXBlIGNhbiBjYWxsIGEgbWV0aG9k IGluIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6SFRNTElu cHV0RWxlbWVudDo6aXNUZXh0Rm9ybUNvbnRyb2xLZXlib2FyZEZvY3VzYWJsZSk6IEFkZGVkIHRv IGFsbG93IElucHV0VHlwZSBjYW4gY2FsbCBhIG1ldGhvZCBpbiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmlzVGV4dEZvcm1D b250cm9sTW91c2VGb2N1c2FibGUpOiBBZGRlZCB0byBhbGxvdyBJbnB1dFR5cGUgY2FuIGNhbGwg YSBtZXRob2QgaW4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuCisgICAgICAgICogaHRtbC9I VE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5wdXRFbGVtZW50KToKKyAgICAgICAg KiBodG1sL0lucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJs ZSk6IEFkZGVkIGZvciBkZWZhdWx0IG1ldGhvZCBvZiBkZXJpdmVkIElucHV0VHlwZSBjbGFzc2Vz LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAgIChJbnB1dFR5cGUpOiBDaGFn bmVkIHNpZ25hdHVyZSBvZiBpc0tleWJvYXJkRm9jdXNhYmxlLgorICAgICAgICAqIGh0bWwvUmFk aW9JbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFkaW9JbnB1dFR5cGU6OmlzS2V5 Ym9hcmRGb2N1c2FibGUpOiBDaGFuZ2VkIHRvIGNhbGwgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2Fy ZEZvY3VzYWJsZSB3aGljaCB3YXMgZG9uZSBpbiBIVE1MSW5wdXRFbGVtZW50LgorICAgICAgICAq IGh0bWwvUmFkaW9JbnB1dFR5cGUuaDoKKyAgICAgICAgKFJhZGlvSW5wdXRUeXBlKToKKyAgICAg ICAgKiBodG1sL1RleHRGaWVsZElucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0 RmllbGRJbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlv biBmcm9tIEhUTUxJbnB1dEVsZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGRJbnB1 dFR5cGU6OmlzTW91c2VGb2N1c2FibGUpOiBNb3ZlZCBpbXBsZW1lbnRhdGlvbiBmcm9tIEhUTUxJ bnB1dEVsZW1lbnQuCisgICAgICAgICogaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuaDoKKyAgICAg ICAgKFRleHRGaWVsZElucHV0VHlwZSk6CisKIDIwMTItMDYtMTggIEpvb25lIEh1ciAgPGpvb25l Lmh1ckBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRm9udGNvbmZpZyBjYW4ndCBiZSBsaW5r ZWQgcHJvcGVybHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCmluZGV4 IDI5MmViOWIyMTY5ZmYzMjhmYTc4MWRkZGViMDA3MDIxZmIxYWNkNDUuLjFiNjMwMDRkZjEyMjky YzZhMTZiOGFmMDk4YTQ3ZGQ0NGM1OGEwMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmNwcApAQCAtMjk2LDE1ICsyOTYsMjYgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50 OjpzdGVwRG93bihpbnQgbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAKIGJvb2wgSFRNTElucHV0RWxl bWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KiBldmVudCkgY29uc3QKIHsK LSAgICBpZiAoaXNUZXh0RmllbGQoKSkKLSAgICAgICAgcmV0dXJuIEhUTUxUZXh0Rm9ybUNvbnRy b2xFbGVtZW50Ojppc0ZvY3VzYWJsZSgpOwotICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCkgJiYgbV9pbnB1dFR5cGUtPmlzS2V5 Ym9hcmRGb2N1c2FibGUoKTsKKyAgICByZXR1cm4gbV9pbnB1dFR5cGUtPmlzS2V5Ym9hcmRGb2N1 c2FibGUoZXZlbnQpOwogfQogCiBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzTW91c2VGb2N1c2Fi bGUoKSBjb25zdAogewotICAgIGlmIChpc1RleHRGaWVsZCgpKQotICAgICAgICByZXR1cm4gSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmlzRm9jdXNhYmxlKCk7CisgICAgcmV0dXJuIG1faW5w dXRUeXBlLT5pc01vdXNlRm9jdXNhYmxlKCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudDo6aXNGb2N1c2FibGUoKTsKK30KKworYm9vbCBIVE1MSW5wdXRF bGVtZW50Ojppc1RleHRGb3JtQ29udHJvbEtleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQq IGV2ZW50KSBjb25zdAoreworICAgIHJldHVybiBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6 aXNLZXlib2FyZEZvY3VzYWJsZShldmVudCk7Cit9CisKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CiAgICAgcmV0dXJuIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojppc01vdXNlRm9jdXNhYmxlKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5kZXggNmQyMzkwODQ1MjJmYjFjZjJhNDA5 NDQ2YjgyOGIzMDEwZDgzYWQyMi4uNDdhMTljODEyNGU0MjhjOTM2YTVlYzdkZGJkYmIwNTRiZDJh OGY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKQEAgLTI0MSw2ICsy NDEsMTAgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRWYWx1ZUludGVybmFsKGNvbnN0IFN0cmlu ZyYsIFRleHRGaWVsZEV2ZW50QmVoYXZpb3IpOwogCisgICAgYm9vbCBpc1RleHRGb3JtQ29udHJv bEZvY3VzYWJsZSgpIGNvbnN0OworICAgIGJvb2wgaXNUZXh0Rm9ybUNvbnRyb2xLZXlib2FyZEZv Y3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3Q7CisgICAgYm9vbCBpc1RleHRGb3JtQ29udHJv bE1vdXNlRm9jdXNhYmxlKCkgY29uc3Q7CisKICAgICB2b2lkIGNhY2hlU2VsZWN0aW9uSW5SZXNw b25zZVRvU2V0VmFsdWUoaW50IGNhcmV0T2Zmc2V0KSB7IGNhY2hlU2VsZWN0aW9uKGNhcmV0T2Zm c2V0LCBjYXJldE9mZnNldCwgU2VsZWN0aW9uSGFzTm9EaXJlY3Rpb24pOyB9CiAKICNpZiBFTkFC TEUoSU5QVVRfVFlQRV9DT0xPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5w dXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmNwcAppbmRleCA4ZDM4 M2UyNGYzMTYyY2I4ZmUyOTkwNTYyNzJhMDUyZDIzNGFjMTk4Li5kYTZlM2QwM2VhNDliZGEyMDQx YzkwMGEzM2U3YzFjYjAzMWMyOTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lu cHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCkBAIC01 MDAsOSArNTAwLDE0IEBAIGJvb2wgSW5wdXRUeXBlOjpjYW5TZXRTdHJpbmdWYWx1ZSgpIGNvbnN0 CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNh YmxlKCkgY29uc3QKK2Jvb2wgSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJk RXZlbnQqIGV2ZW50KSBjb25zdAogewotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBlbGVt ZW50KCktPmlzVGV4dEZvcm1Db250cm9sS2V5Ym9hcmRGb2N1c2FibGUoZXZlbnQpOworfQorCiti b29sIElucHV0VHlwZTo6aXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGVs ZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRyb2xNb3VzZUZvY3VzYWJsZSgpOwogfQogCiBib29sIElu cHV0VHlwZTo6c2hvdWxkVXNlSW5wdXRNZXRob2QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBl LmgKaW5kZXggYWNkMGE3YmVjOTI4ZDhiMmFlMjg2YTZmMTdhNWFmMGNiYTlmYmIyMy4uYjlkY2Zi NDczY2NlYTk1OTBiMmYzY2Q4MTdiYWFlMjhlNWU3Mzg2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9JbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlw ZS5oCkBAIC0xOTQsNyArMTk0LDggQEAgcHVibGljOgogICAgIC8vIEhlbHBlcnMgZm9yIGV2ZW50 IGhhbmRsZXJzLgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRTdWJtaXRJbXBsaWNpdGx5KEV2ZW50 Kik7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEhUTUxGb3JtRWxlbWVudD4gZm9ybUZvclN1Ym1p c3Npb24oKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZSgpIGNv bnN0OworICAgIHZpcnR1YWwgYm9vbCBpc0tleWJvYXJkRm9jdXNhYmxlKEtleWJvYXJkRXZlbnQq KSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0OwogICAg IHZpcnR1YWwgYm9vbCBzaG91bGRVc2VJbnB1dE1ldGhvZCgpIGNvbnN0OwogICAgIHZpcnR1YWwg dm9pZCBoYW5kbGVGb2N1c0V2ZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUJsdXJFdmVu dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYWRpb0lucHV0VHlwZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmNwcAppbmRleCAxNTViZTg5MWRh NmEyNGVhMTcxZjc0Y2U2YzNhZmUyNjU1Nzk2MzYyLi4yYzE2YjFhMTY5NTEyYzVkMzk0ZTllZmU4 MzhiOTA2NzdkMjQ5NGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5w dXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmNwcApA QCAtMTE0LDggKzExNCwxMSBAQCB2b2lkIFJhZGlvSW5wdXRUeXBlOjpoYW5kbGVLZXl1cEV2ZW50 KEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIGRpc3BhdGNoU2ltdWxhdGVkQ2xpY2tJZkFjdGl2 ZShldmVudCk7CiB9CiAKLWJvb2wgUmFkaW9JbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUo KSBjb25zdAorYm9vbCBSYWRpb0lucHV0VHlwZTo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2Fy ZEV2ZW50KiBldmVudCkgY29uc3QKIHsKKyAgICBpZiAoIUlucHV0VHlwZTo6aXNLZXlib2FyZEZv Y3VzYWJsZShldmVudCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIC8vIFdoZW4gdXNp bmcgU3BhdGlhbCBOYXZpZ2F0aW9uLCBldmVyeSByYWRpbyBidXR0b24gc2hvdWxkIGJlIGZvY3Vz YWJsZS4KICAgICBpZiAoaXNTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoZWxlbWVudCgpLT5kb2N1 bWVudCgpLT5mcmFtZSgpKSkKICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhZGlvSW5wdXRUeXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1Jh ZGlvSW5wdXRUeXBlLmgKaW5kZXggNzc5MGI1MDRjOTkxY2EwMmFmOGUzZjU2OGQwMTJhMzk4NjY2 MGU1OS4uMjRlMjdiYzU3MzYxMzA0MThmYzNiZGQ1ZjgyYjk1ODg4YmZhODgzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYWRpb0lucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvUmFkaW9JbnB1dFR5cGUuaApAQCAtNDcsNyArNDcsNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBoYW5kbGVDbGlja0V2ZW50KE1vdXNlRXZlbnQqKSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIHZvaWQgaGFuZGxlS2V5ZG93bkV2ZW50KEtleWJvYXJkRXZlbnQqKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlS2V5dXBFdmVudChLZXlib2FyZEV2ZW50KikgT1ZF UlJJREU7Ci0gICAgdmlydHVhbCBib29sIGlzS2V5Ym9hcmRGb2N1c2FibGUoKSBjb25zdCBPVkVS UklERTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50 KikgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIHNob3VsZFNlbmRDaGFuZ2VFdmVu dEFmdGVyQ2hlY2tlZENoYW5nZWQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8 Q2xpY2tIYW5kbGluZ1N0YXRlPiB3aWxsRGlzcGF0Y2hDbGljaygpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCBkaWREaXNwYXRjaENsaWNrKEV2ZW50KiwgY29uc3QgQ2xpY2tIYW5kbGluZ1N0 YXRlJikgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVs ZElucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0VHlwZS5j cHAKaW5kZXggODE4OTE0NGE5OTM4MGE1OGQwYzhhNWE3N2FjZjBiNjhjMGUwZjQ4ZS4uYWY1MzI1 NWJiNjI2MjI2NTI4NzVjMDY4MTI1MmEwNmVhMjg4N2NmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcApAQCAtNjUsNiArNjUsMTYgQEAgVGV4dEZpZWxkSW5w dXRUeXBlOjp+VGV4dEZpZWxkSW5wdXRUeXBlKCkKIHsKIH0KIAorYm9vbCBUZXh0RmllbGRJbnB1 dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9hcmRFdmVudCopIGNvbnN0Cit7CisgICAg cmV0dXJuIGVsZW1lbnQoKS0+aXNUZXh0Rm9ybUNvbnRyb2xGb2N1c2FibGUoKTsKK30KKworYm9v bCBUZXh0RmllbGRJbnB1dFR5cGU6OmlzTW91c2VGb2N1c2FibGUoKSBjb25zdAoreworICAgIHJl dHVybiBlbGVtZW50KCktPmlzVGV4dEZvcm1Db250cm9sRm9jdXNhYmxlKCk7Cit9CisKIGJvb2wg VGV4dEZpZWxkSW5wdXRUeXBlOjppc1RleHRGaWVsZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHRy dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0VHlwZS5o IGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUuaAppbmRleCA1NTliZTI1 ZTc1MTk5MjZjOGM5ZGE5YjVhZWJkZjYyNGE4OWMyYTIwLi5iMzYyOWQwZDNlODQwYjVkZjgwYzJl MzdmMzBjMzYyOGRiMTYzMDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRG aWVsZElucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRU eXBlLmgKQEAgLTY3LDYgKzY3LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBoYW5k bGVCbHVyRXZlbnQoKSBPVkVSUklERTsKIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJvb2wgaXNL ZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3QgT1ZFUlJJREU7CisgICAgdmly dHVhbCBib29sIGlzTW91c2VGb2N1c2FibGUoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFs IGJvb2wgaXNUZXh0RmllbGQoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgdmFs dWVNaXNzaW5nKGNvbnN0IFN0cmluZyYpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVCZWZvcmVUZXh0SW5zZXJ0ZWRFdmVudChCZWZvcmVUZXh0SW5zZXJ0ZWRFdmVudCop IE9WRVJSSURFOwo=