92612 2012-07-29 22:19:42 -0700 [Forms] Get rid of Element::isReadOnlyFormControl other than CSS related 2012-07-30 19:01:42 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92602 1 yosin yosin eric mifenton tkent webkit.review.bot oldest_to_newest 681687 0 yosin 2012-07-29 22:19:42 -0700 Element::IsReadOnlyFormControl() was introduced for using :read-only/:read-write CSS pseudo classes. Although, it was used short cut for calling HTMLFormControlElement::readOnly(). Because of we have Element::shouldMatchReadWriteSelector() for this purpose, we don't need to have Element::IsReadOnlyFormControl() anymore. 681764 1 yosin 2012-07-30 01:20:00 -0700 We'll replace CSS related Element::isReadOnlyFormControl() to Element::shouldMatchReadWriteSelector() 681784 2 155234 yosin 2012-07-30 02:01:53 -0700 Created attachment 155234 Patch 1 681790 3 155234 buildbot 2012-07-30 02:10:48 -0700 Comment on attachment 155234 Patch 1 Attachment 155234 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13396230 681799 4 155237 yosin 2012-07-30 02:27:14 -0700 Created attachment 155237 Patch 2 681822 5 155242 yosin 2012-07-30 03:07:14 -0700 Created attachment 155242 Patch 3 681823 6 155242 yosin 2012-07-30 03:08:05 -0700 Comment on attachment 155242 Patch 3 Could you review this patch? Thanks in advance. 682599 7 155242 tkent 2012-07-30 18:28:22 -0700 Comment on attachment 155242 Patch 3 View in context: https://bugs.webkit.org/attachment.cgi?id=155242&action=review > Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp:243 > - if (element->isReadOnlyFormControl() || !element->isEnabledFormControl()) > + if (!element->isEnabledFormControl()) > return false; > > if (isPopupInputField(element)) > return false; > > - return element->isTextFormControl() || element->isContentEditable(); > + if (element->isTextFormControl()) > + return !static_cast<HTMLTextFormControl*>(element)->readOnly(); > + > + return element->isContentEditable(); Is it safe to change the evaluation order? 682609 8 155417 yosin 2012-07-30 18:47:34 -0700 Created attachment 155417 Patch 4 682613 9 155417 yosin 2012-07-30 18:51:16 -0700 Comment on attachment 155417 Patch 4 Could you review this patch? Thanks in advance. = Changes since the last review = * WebKit/blackberry/WebKitSupport/DOMSupport.cpp: Keep original evaluation order for read only control check. 682620 10 155417 tkent 2012-07-30 18:59:51 -0700 Comment on attachment 155417 Patch 4 Looks good. 682621 11 155417 yosin 2012-07-30 19:01:37 -0700 Comment on attachment 155417 Patch 4 Clearing flags on attachment: 155417 Committed r124146: <http://trac.webkit.org/changeset/124146> 682622 12 yosin 2012-07-30 19:01:42 -0700 All reviewed patches have been landed. Closing bug. 155234 2012-07-30 02:01:53 -0700 2012-07-30 02:27:10 -0700 Patch 1 bug-92612-20120730180137.patch text/plain 7881 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzOTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg0MzQ1MTQ4MjZjYzk4 N2ZmZDIzNTY3NjY0OTgwMDA2NGMzMjc3My4uZjFkZDBlNGY5MDU3Mjk1NzgxMWZiNGNhYTdmZGM4 OTg4NTVkNGVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA3LTMwICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBHZXQg cmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBvdGhlciB0aGFuIENTUyByZWxh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjYx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggcmVwbGFjZXMgRWxlbWVudDo6aXNSZWFkT25seUZvcm1Db250cm9sKCkgbm90IHJlbGF0 ZWQgdG8KKyAgICAgICAgQ1NTIHNlbGVjdG9yIG1hdGNoaW5nIHRvIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnJlYWRPbmx5KCkgZm9yCisgICAgICAgIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5n IEVsZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvci4K KworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBDaGFu Z2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAgICAgICogaHRt bC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6IENo YW5nZWQgaXNSZWFkT25seUZvcm1Db250cm9sKCkgdG8gcmVhZE9ubHkoKS4KKyAgICAgICAgKFdl YkNvcmU6OlNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpTcGluQnV0dG9uRWxlbWVudDo6c3RlcCk6IGRpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhh bmRsZXIpOiBkaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0RmllbGRTcGVlY2hCdXR0b25F bGVtZW50OjpzZXRSZWNvZ25pdGlvblJlc3VsdCk6IGRpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpw YWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKTogQ2hhbmdlZCBpc1JlYWRPbmx5Rm9ybUNvbnRy b2woKSB0byByZWFkT25seSgpLgorCiAyMDEyLTA3LTI5ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxA Y29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBtZXRob2QgSFRNTENvbnN0 cnVjdGlvblNpdGVUYXNrOjp0YWtlKEhUTUxDb25zdHJ1Y3Rpb25TaXRlVGFzayYpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCBmZmFlZTZkZTZmODcyODk2Zjg5OGFmZjcwM2VjOGVi MzYwMDEyNzkxLi4zMjJmYmRhYzU4NGFjYWEzMWNjNzA5YzdjMGMwOWNiMjM0NjlkYTFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNy0zMCAg WW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtGb3Jtc10g R2V0IHJpZCBvZiBFbGVtZW50Ojppc1JlYWRPbmx5Rm9ybUNvbnRyb2wgb3RoZXIgdGhhbiBDU1Mg cmVsYXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI2MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHJlcGxhY2VzIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvCisg ICAgICAgIEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnJlYWRPbmx5KCkgZm9yIHByZXBhcmF0aW9u IG9mIGludHJvZHVjaW5nCisgICAgICAgIEVsZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2Vs ZWN0b3IoKSwgYnVnIDkyNjAyLgorCisgICAgICAgICogV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0 LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RE9NU3VwcG9ydDo6aXNUZXh0QmFz ZWRDb250ZW50RWRpdGFibGVFbGVtZW50KToKKwogMjAxMi0wNy0yNyAgRWxpIEZpZGxlciAgPGVm aWRsZXJAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQWRhcHQgdG8gY2hhbmdlIGlu IHRoZSBGb250SW5mbyBwbGF0Zm9ybSBBUEkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcAppbmRleCBjY2NhZDgxZWY2ZDg3ZGJiMmMyMjdm OWQ2MGQxMDEwMTc3ZThmODIzLi5lOTA5NTc0NTc4YjQ4NDg2YzI0MDBkMTI5NjNkZThkYmZmMDdl MzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxl bWVudC5jcHAKQEAgLTMwMyw3ICszMDMsNyBAQCB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6ZGVm YXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgLy8gRklYTUU6IFNob3VsZCBoYW5k bGUgdGhpcyByZWFkb25seS9kaXNhYmxlZCBjaGVjayBpbiBtb3JlIGdlbmVyYWwgd2F5LgogICAg IC8vIE1pc3NpbmcgdGhpcyBraW5kIG9mIGNoZWNrIGlzIGxpa2VseSB0byBvY2N1ciBlbHNld2hl cmUgaWYgYWRkaW5nIGl0IGluIGVhY2ggc2hhZG93IGVsZW1lbnQuCiAgICAgSFRNTElucHV0RWxl bWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsKLSAgICBpZiAoIWlucHV0IHx8IGlucHV0LT5pc1Jl YWRPbmx5Rm9ybUNvbnRyb2woKSB8fCAhaW5wdXQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCkpIHsK KyAgICBpZiAoIWlucHV0IHx8IGlucHV0LT5yZWFkT25seSgpIHx8ICFpbnB1dC0+aXNFbmFibGVk Rm9ybUNvbnRyb2woKSkgewogICAgICAgICBzdG9wRHJhZ2dpbmcoKTsKICAgICAgICAgSFRNTERp dkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogICAgICAgICByZXR1cm47CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0Q29udHJvbElubmVyRWxl bWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVs ZW1lbnRzLmNwcAppbmRleCBlMzA5N2JiNWU0ODYxNDZkNjdlMGI0NzhjOTg3OGZhZmYxNzhlNzA2 Li4yMTljMmM0N2EzNWE4YWMyNWE2MTYxZDcwYTA5NTM0ODk4YmIyMDIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0Q29udHJvbElubmVyRWxlbWVudHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRDb250cm9sSW5uZXJFbGVtZW50cy5j cHAKQEAgLTE5OCw3ICsxOTgsNyBAQCB2b2lkIFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiB7CiAgICAgLy8gSWYgdGhlIGVs ZW1lbnQgaXMgdmlzaWJsZSwgb24gbW91c2V1cCwgY2xlYXIgdGhlIHZhbHVlLCBhbmQgc2V0IHNl bGVjdGlvbgogICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBpbnB1dChzdGF0aWNfY2FzdDxI VE1MSW5wdXRFbGVtZW50Kj4oc2hhZG93SG9zdCgpKSk7Ci0gICAgaWYgKGlucHV0LT5kaXNhYmxl ZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkgeworICAgIGlmIChpbnB1dC0+ ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9ubHkoKSkgewogICAgICAgICBpZiAoIWV2ZW50LT5k ZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1bHRFdmVu dEhhbmRsZXIoZXZlbnQpOwogICAgICAgICByZXR1cm47CkBAIC0yNzksNyArMjc5LDcgQEAgdm9p ZCBTcGluQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAg ICAgfQogCiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGlucHV0KHN0YXRpY19jYXN0PEhU TUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0KCkpKTsKLSAgICBpZiAoaW5wdXQtPmRpc2FibGVk KCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpKSB7CisgICAgaWYgKGlucHV0LT5k aXNhYmxlZCgpIHx8IGlucHV0LT5yZWFkT25seSgpKSB7CiAgICAgICAgIGlmICghZXZlbnQtPmRl ZmF1bHRIYW5kbGVkKCkpCiAgICAgICAgICAgICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50 SGFuZGxlcihldmVudCk7CiAgICAgICAgIHJldHVybjsKQEAgLTM2NSw3ICszNjUsNyBAQCB2b2lk IFNwaW5CdXR0b25FbGVtZW50OjpzdG9wUmVwZWF0aW5nVGltZXIoKQogdm9pZCBTcGluQnV0dG9u RWxlbWVudDo6c3RlcChpbnQgYW1vdW50KQogewogICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0 ID0gc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSk7Ci0gICAgaWYg KGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkKKyAg ICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPnJlYWRPbmx5KCkpCiAgICAgICAgIHJl dHVybjsKICAgICAvLyBPbiBNYWMgT1MsIE5TU3RlcHBlciB1cGRhdGVzIHRoZSB2YWx1ZSBmb3Ig dGhlIGJ1dHRvbiB1bmRlciB0aGUgbW91c2UKICAgICAvLyBjdXJzb3IgcmVnYXJkbGVzcyBvZiB0 aGUgYnV0dG9uIHByZXNzZWQgYXQgdGhlIGJlZ2lubmluZy4gU28gdGhlCkBAIC00MzEsNyArNDMx LDcgQEAgdm9pZCBJbnB1dEZpZWxkU3BlZWNoQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFu ZGxlcihFdmVudCogZXZlbnQpCiAgICAgLy8gaGVyZSwgd2UgdGFrZSBhIHRlbXBvcmFyeSByZWZl cmVuY2UuCiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGlucHV0KHN0YXRpY19jYXN0PEhU TUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0KCkpKTsKIAotICAgIGlmIChpbnB1dC0+ZGlzYWJs ZWQoKSB8fCBpbnB1dC0+aXNSZWFkT25seUZvcm1Db250cm9sKCkpIHsKKyAgICBpZiAoaW5wdXQt PmRpc2FibGVkKCkgfHwgaW5wdXQtPnJlYWRPbmx5KCkpIHsKICAgICAgICAgaWYgKCFldmVudC0+ ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAgICAgIEhUTUxEaXZFbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgcmV0dXJuOwpAQCAtNTEwLDcgKzUxMCw3IEBAIHZv aWQgSW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OnNldFJlY29nbml0aW9uUmVzdWx0KGlu dCwgY29uc3QgU3BlZWNoSW5wdXRSCiAgICAgLy8gcmVtb3ZlIHRoZSBpbnB1dCBlbGVtZW50IGZy b20gRE9NLiBUbyBtYWtlIHN1cmUgaXQgcmVtYWlucyB2YWxpZCB1bnRpbCB3ZSBmaW5pc2ggb3Vy IHdvcmsKICAgICAvLyBoZXJlLCB3ZSB0YWtlIGEgdGVtcG9yYXJ5IHJlZmVyZW5jZS4KICAgICBS ZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5wdXQoc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVu dCo+KHNoYWRvd0hvc3QoKSkpOwotICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+ aXNSZWFkT25seUZvcm1Db250cm9sKCkpCisgICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlu cHV0LT5yZWFkT25seSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBSZWZQdHI8SW5wdXRGaWVs ZFNwZWVjaEJ1dHRvbkVsZW1lbnQ+IGhvbGRSZWZCdXR0b24odGhpcyk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggMWI5MjAwNmYxNWNlYjQ4ZTcyNDg2 YjJiNmQxMGEyZjk1ZDkwZTI5NS4uNDJkYmViYTA2MjZmMzk3OTlhYWNjZThmZjI4NzJkODU0ZmE0 MTBiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAt MTU3MSw3ICsxNTcxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZENh bmNlbEJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW4KIAogICAgIE5TU2VhcmNo RmllbGRDZWxsKiBzZWFyY2ggPSB0aGlzLT5zZWFyY2goKTsKIAotICAgIGlmIChpbnB1dC0+aXNF bmFibGVkRm9ybUNvbnRyb2woKSAmJiAhaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpKSB7 CisgICAgaWYgKGlucHV0LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpICYmICFpbnB1dC0+cmVhZE9u bHkoKSkgewogICAgICAgICB1cGRhdGVBY3RpdmVTdGF0ZShbc2VhcmNoIGNhbmNlbEJ1dHRvbkNl bGxdLCBvKTsKICAgICAgICAgdXBkYXRlUHJlc3NlZFN0YXRlKFtzZWFyY2ggY2FuY2VsQnV0dG9u Q2VsbF0sIG8pOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0RPTVN1cHBvcnQuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvRE9NU3VwcG9ydC5jcHAKaW5kZXggMmI1NGMzMzdjOGMzMzdjMTliN2JmM2M1 MGMwMWNlOWJjMmFjZTUxMi4uZmNiYjVmYTk2ODQxNDhlMTdhYzk4ZTU3MTNjNTc5MGU2ODY1MjY1 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRE9N U3VwcG9ydC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv RE9NU3VwcG9ydC5jcHAKQEAgLTIzMSwxMyArMjMxLDE2IEBAIGJvb2wgaXNUZXh0QmFzZWRDb250 ZW50RWRpdGFibGVFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgaWYgKCFlbGVtZW50KQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoZWxlbWVudC0+aXNSZWFkT25seUZvcm1D b250cm9sKCkgfHwgIWVsZW1lbnQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCkpCisgICAgaWYgKCFl bGVtZW50LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBpZiAoaXNQb3B1cElucHV0RmllbGQoZWxlbWVudCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIHJldHVybiBlbGVtZW50LT5pc1RleHRGb3JtQ29udHJvbCgpIHx8IGVsZW1lbnQt PmlzQ29udGVudEVkaXRhYmxlKCk7CisgICAgaWYgKGVsZW1lbnQtPmlzVGV4dEZvcm1Db250cm9s KCkpCisgICAgICAgIHJldHVybiAhc3RhdGljX2Nhc3Q8SFRNTFRleHRGb3JtQ29udHJvbCo+KGVs ZW1lbnQpLT5yZWFkT25seSgpOworCisgICAgcmV0dXJuIGVsZW1lbnQtPmlzQ29udGVudEVkaXRh YmxlKCk7CiB9CiAKIEludFJlY3QgdHJhbnNmb3JtZWRCb3VuZGluZ0JveEZvclJhbmdlKGNvbnN0 IFJhbmdlJiByYW5nZSkK 155237 2012-07-30 02:27:14 -0700 2012-07-30 03:07:09 -0700 Patch 2 bug-92612-20120730182658.patch text/plain 8942 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzOTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg0MzQ1MTQ4MjZjYzk4 N2ZmZDIzNTY3NjY0OTgwMDA2NGMzMjc3My4uODg5MzEwODMzMGQwOTg4NjhkNjM3MGEzN2YxYTU4 YTYyZjc4MzczMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTMwICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBHZXQg cmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBvdGhlciB0aGFuIENTUyByZWxh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjYx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggcmVwbGFjZXMgRWxlbWVudDo6aXNSZWFkT25seUZvcm1Db250cm9sKCkgbm90IHJlbGF0 ZWQgdG8KKyAgICAgICAgQ1NTIHNlbGVjdG9yIG1hdGNoaW5nIHRvIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnJlYWRPbmx5KCkgZm9yCisgICAgICAgIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5n IEVsZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvci4K KworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBDaGFu Z2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAgICAgICogaHRt bC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6IENo YW5nZWQgaXNSZWFkT25seUZvcm1Db250cm9sKCkgdG8gcmVhZE9ubHkoKS4KKyAgICAgICAgKFdl YkNvcmU6OlNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpTcGluQnV0dG9uRWxlbWVudDo6c3RlcCk6IGRpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhh bmRsZXIpOiBkaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0RmllbGRTcGVlY2hCdXR0b25F bGVtZW50OjpzZXRSZWNvZ25pdGlvblJlc3VsdCk6IGRpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgICh1cGRhdGVVc2VyTW9kaWZ5UHJvcGVy dHkpOiBDaGFuZ2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOiBDaGFuZ2VkIGlzUmVh ZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisKIDIwMTItMDctMjkgIEt3YW5nIFl1 bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIG1l dGhvZCBIVE1MQ29uc3RydWN0aW9uU2l0ZVRhc2s6OnRha2UoSFRNTENvbnN0cnVjdGlvblNpdGVU YXNrJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGZmYWVlNmRlNmY4NzI4OTZm ODk4YWZmNzAzZWM4ZWIzNjAwMTI3OTEuLjMyMmZiZGFjNTg0YWNhYTMxY2M3MDljN2MwYzA5Y2Iy MzQ2OWRhMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDEyLTA3LTMwICBZb3NoaWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgW0Zvcm1zXSBHZXQgcmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBv dGhlciB0aGFuIENTUyByZWxhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MjYxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVwbGFjZXMgRWxlbWVudDo6aXNSZWFkT25seUZvcm1D b250cm9sKCkgdG8KKyAgICAgICAgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6cmVhZE9ubHkoKSBm b3IgcHJlcGFyYXRpb24gb2YgaW50cm9kdWNpbmcKKyAgICAgICAgRWxlbWVudDo6c2hvdWxkTWF0 Y2hSZWFkV3JpdGVTZWxlY3RvcigpLCBidWcgOTI2MDIuCisKKyAgICAgICAgKiBXZWJLaXRTdXBw b3J0L0RPTVN1cHBvcnQuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpET01TdXBw b3J0Ojppc1RleHRCYXNlZENvbnRlbnRFZGl0YWJsZUVsZW1lbnQpOgorCiAyMDEyLTA3LTI3ICBF bGkgRmlkbGVyICA8ZWZpZGxlckByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBBZGFw dCB0byBjaGFuZ2UgaW4gdGhlIEZvbnRJbmZvIHBsYXRmb3JtIEFQSS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IGNjY2FkODFl ZjZkODdkYmIyYzIyN2Y5ZDYwZDEwMTAxNzdlOGY4MjMuLmU5MDk1NzQ1NzhiNDg0ODZjMjQwMGQx Mjk2M2RlOGRiZmYwN2UzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93 L1NsaWRlclRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv U2xpZGVyVGh1bWJFbGVtZW50LmNwcApAQCAtMzAzLDcgKzMwMyw3IEBAIHZvaWQgU2xpZGVyVGh1 bWJFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAvLyBGSVhN RTogU2hvdWxkIGhhbmRsZSB0aGlzIHJlYWRvbmx5L2Rpc2FibGVkIGNoZWNrIGluIG1vcmUgZ2Vu ZXJhbCB3YXkuCiAgICAgLy8gTWlzc2luZyB0aGlzIGtpbmQgb2YgY2hlY2sgaXMgbGlrZWx5IHRv IG9jY3VyIGVsc2V3aGVyZSBpZiBhZGRpbmcgaXQgaW4gZWFjaCBzaGFkb3cgZWxlbWVudC4KICAg ICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1dCgpOwotICAgIGlmICghaW5wdXQg fHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHx8ICFpbnB1dC0+aXNFbmFibGVkRm9y bUNvbnRyb2woKSkgeworICAgIGlmICghaW5wdXQgfHwgaW5wdXQtPnJlYWRPbmx5KCkgfHwgIWlu cHV0LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpKSB7CiAgICAgICAgIHN0b3BEcmFnZ2luZygpOwog ICAgICAgICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAg ICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRD b250cm9sSW5uZXJFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0 Q29udHJvbElubmVyRWxlbWVudHMuY3BwCmluZGV4IGUzMDk3YmI1ZTQ4NjE0NmQ2N2UwYjQ3OGM5 ODc4ZmFmZjE3OGU3MDYuLjIxOWMyYzQ3YTM1YThhYzI1YTYxNjFkNzBhMDk1MzQ4OThiYjIwMjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRDb250cm9sSW5uZXJF bGVtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dENvbnRyb2xJ bm5lckVsZW1lbnRzLmNwcApAQCAtMTk4LDcgKzE5OCw3IEBAIHZvaWQgU2VhcmNoRmllbGRDYW5j ZWxCdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAg ICAvLyBJZiB0aGUgZWxlbWVudCBpcyB2aXNpYmxlLCBvbiBtb3VzZXVwLCBjbGVhciB0aGUgdmFs dWUsIGFuZCBzZXQgc2VsZWN0aW9uCiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGlucHV0 KHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0KCkpKTsKLSAgICBpZiAo aW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpKSB7Cisg ICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5yZWFkT25seSgpKSB7CiAgICAgICAg IGlmICghZXZlbnQtPmRlZmF1bHRIYW5kbGVkKCkpCiAgICAgICAgICAgICBIVE1MRGl2RWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIHJldHVybjsKQEAgLTI3OSw3 ICsyNzksNyBAQCB2b2lkIFNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2 ZW50KiBldmVudCkKICAgICB9CiAKICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5wdXQo c3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSkpOwotICAgIGlmIChp bnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+aXNSZWFkT25seUZvcm1Db250cm9sKCkpIHsKKyAg ICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPnJlYWRPbmx5KCkpIHsKICAgICAgICAg aWYgKCFldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAgICAgIEhUTUxEaXZFbGVtZW50 OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzY1LDcg KzM2NSw3IEBAIHZvaWQgU3BpbkJ1dHRvbkVsZW1lbnQ6OnN0b3BSZXBlYXRpbmdUaW1lcigpCiB2 b2lkIFNwaW5CdXR0b25FbGVtZW50OjpzdGVwKGludCBhbW91bnQpCiB7CiAgICAgSFRNTElucHV0 RWxlbWVudCogaW5wdXQgPSBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4oc2hhZG93SG9z dCgpKTsKLSAgICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3Jt Q29udHJvbCgpKQorICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9ubHko KSkKICAgICAgICAgcmV0dXJuOwogICAgIC8vIE9uIE1hYyBPUywgTlNTdGVwcGVyIHVwZGF0ZXMg dGhlIHZhbHVlIGZvciB0aGUgYnV0dG9uIHVuZGVyIHRoZSBtb3VzZQogICAgIC8vIGN1cnNvciBy ZWdhcmRsZXNzIG9mIHRoZSBidXR0b24gcHJlc3NlZCBhdCB0aGUgYmVnaW5uaW5nLiBTbyB0aGUK QEAgLTQzMSw3ICs0MzEsNyBAQCB2b2lkIElucHV0RmllbGRTcGVlY2hCdXR0b25FbGVtZW50Ojpk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAvLyBoZXJlLCB3ZSB0YWtlIGEg dGVtcG9yYXJ5IHJlZmVyZW5jZS4KICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5wdXQo c3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSkpOwogCi0gICAgaWYg KGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkgewor ICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9ubHkoKSkgewogICAgICAg ICBpZiAoIWV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICAgICAgSFRNTERpdkVsZW1l bnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogICAgICAgICByZXR1cm47CkBAIC01MTAs NyArNTEwLDcgQEAgdm9pZCBJbnB1dEZpZWxkU3BlZWNoQnV0dG9uRWxlbWVudDo6c2V0UmVjb2du aXRpb25SZXN1bHQoaW50LCBjb25zdCBTcGVlY2hJbnB1dFIKICAgICAvLyByZW1vdmUgdGhlIGlu cHV0IGVsZW1lbnQgZnJvbSBET00uIFRvIG1ha2Ugc3VyZSBpdCByZW1haW5zIHZhbGlkIHVudGls IHdlIGZpbmlzaCBvdXIgd29yawogICAgIC8vIGhlcmUsIHdlIHRha2UgYSB0ZW1wb3JhcnkgcmVm ZXJlbmNlLgogICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBpbnB1dChzdGF0aWNfY2FzdDxI VE1MSW5wdXRFbGVtZW50Kj4oc2hhZG93SG9zdCgpKSk7Ci0gICAgaWYgKGlucHV0LT5kaXNhYmxl ZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkKKyAgICBpZiAoaW5wdXQtPmRp c2FibGVkKCkgfHwgaW5wdXQtPnJlYWRPbmx5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJl ZlB0cjxJbnB1dEZpZWxkU3BlZWNoQnV0dG9uRWxlbWVudD4gaG9sZFJlZkJ1dHRvbih0aGlzKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCmluZGV4 IDhiMTM4MzUyZTQ2ODJiNDVmYmNlZTI0ZGU2N2I3Y2FmNzFiNTVlOTQuLjBlODNhNzExZWNlNWY5 YTYyNTc3YzE3ZjRkZDYwNTg2NmFlM2M1ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sLmNwcApAQCAtODEsNyArODEsNyBAQCBzdGF0aWMgaW5saW5l IGJvb2wgdXBkYXRlVXNlck1vZGlmeVByb3BlcnR5KE5vZGUqIG5vZGUsIFJlbmRlclN0eWxlKiBz dHlsZSkKICAgICBpZiAobm9kZS0+aXNFbGVtZW50Tm9kZSgpKSB7CiAgICAgICAgIEVsZW1lbnQq IGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSk7CiAgICAgICAgIGlzRW5hYmxl ZCA9IGVsZW1lbnQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCk7Ci0gICAgICAgIGlzUmVhZE9ubHlD b250cm9sID0gZWxlbWVudC0+aXNSZWFkT25seUZvcm1Db250cm9sKCk7CisgICAgICAgIGlzUmVh ZE9ubHlDb250cm9sID0gZWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSAmJiBzdGF0aWNf Y2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Kj4oZWxlbWVudCktPmlzUmVhZE9ubHlGb3JtQ29u dHJvbCgpOwogICAgIH0KIAogICAgIHN0eWxlLT5zZXRVc2VyTW9kaWZ5KChpc1JlYWRPbmx5Q29u dHJvbCB8fCAhaXNFbmFibGVkKSA/IFJFQURfT05MWSA6IFJFQURfV1JJVEVfUExBSU5URVhUX09O TFkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDFi OTIwMDZmMTVjZWI0OGU3MjQ4NmIyYjZkMTBhMmY5NWQ5MGUyOTUuLjQzNzZmODZkZGVjZTQzYzU1 OTQyMzEyM2UzY2MzMGZlNDg2NzEyM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVNYWMubW0KQEAgLTE1NzEsNyArMTU3MSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVNYWM6 OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWlu dEluCiAKICAgICBOU1NlYXJjaEZpZWxkQ2VsbCogc2VhcmNoID0gdGhpcy0+c2VhcmNoKCk7CiAK LSAgICBpZiAoaW5wdXQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCkgJiYgIWlucHV0LT5pc1JlYWRP bmx5Rm9ybUNvbnRyb2woKSkgeworICAgIGlmIChpbnB1dC0+aXNFbmFibGVkRm9ybUNvbnRyb2wo KSAmJiAoaW5wdXQtPmlzRm9ybUNvbnRyb2xFbGVtZW50KCkgJiYgIXN0YXRpY19jYXN0PEhUTUxG b3JtQ29udHJvbEVsZW1lbnQqPihpbnB1dCktPnJlYWRPbmx5KCkpKSB7CiAgICAgICAgIHVwZGF0 ZUFjdGl2ZVN0YXRlKFtzZWFyY2ggY2FuY2VsQnV0dG9uQ2VsbF0sIG8pOwogICAgICAgICB1cGRh dGVQcmVzc2VkU3RhdGUoW3NlYXJjaCBjYW5jZWxCdXR0b25DZWxsXSwgbyk7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRE9NU3VwcG9y dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0 LmNwcAppbmRleCAyYjU0YzMzN2M4YzMzN2MxOWI3YmYzYzUwYzAxY2U5YmMyYWNlNTEyLi5mY2Ji NWZhOTY4NDE0OGUxN2FjOThlNTcxM2M1NzkwZTY4NjUyNjU0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0LmNwcApAQCAtMjMx LDEzICsyMzEsMTYgQEAgYm9vbCBpc1RleHRCYXNlZENvbnRlbnRFZGl0YWJsZUVsZW1lbnQoRWxl bWVudCogZWxlbWVudCkKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIGlmIChlbGVtZW50LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSB8fCAhZWxlbWVudC0+ aXNFbmFibGVkRm9ybUNvbnRyb2woKSkKKyAgICBpZiAoIWVsZW1lbnQtPmlzRW5hYmxlZEZvcm1D b250cm9sKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChpc1BvcHVwSW5wdXRG aWVsZChlbGVtZW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIGVsZW1l bnQtPmlzVGV4dEZvcm1Db250cm9sKCkgfHwgZWxlbWVudC0+aXNDb250ZW50RWRpdGFibGUoKTsK KyAgICBpZiAoZWxlbWVudC0+aXNUZXh0Rm9ybUNvbnRyb2woKSkKKyAgICAgICAgcmV0dXJuICFz dGF0aWNfY2FzdDxIVE1MVGV4dEZvcm1Db250cm9sKj4oZWxlbWVudCktPnJlYWRPbmx5KCk7CisK KyAgICByZXR1cm4gZWxlbWVudC0+aXNDb250ZW50RWRpdGFibGUoKTsKIH0KIAogSW50UmVjdCB0 cmFuc2Zvcm1lZEJvdW5kaW5nQm94Rm9yUmFuZ2UoY29uc3QgUmFuZ2UmIHJhbmdlKQo= 155242 2012-07-30 03:07:14 -0700 2012-07-30 18:47:30 -0700 Patch 3 bug-92612-20120730190658.patch text/plain 8890 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTQ4MzJkZGUyOTk3YWVj YTcwZmNjY2U2NmZmN2E0OTEzZmQxZDcwNC4uMjIyYzkyMTk0NTkyMTNhODkyMTM5ZjZkMzk3Y2Mw OGZjYWUxZTg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTMwICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBHZXQg cmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBvdGhlciB0aGFuIENTUyByZWxh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjYx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggcmVwbGFjZXMgRWxlbWVudDo6aXNSZWFkT25seUZvcm1Db250cm9sKCkgbm90IHJlbGF0 ZWQgdG8KKyAgICAgICAgQ1NTIHNlbGVjdG9yIG1hdGNoaW5nIHRvIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnJlYWRPbmx5KCkgZm9yCisgICAgICAgIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5n IEVsZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvci4K KworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBDaGFu Z2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAgICAgICogaHRt bC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6IENo YW5nZWQgaXNSZWFkT25seUZvcm1Db250cm9sKCkgdG8gcmVhZE9ubHkoKS4KKyAgICAgICAgKFdl YkNvcmU6OlNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpTcGluQnV0dG9uRWxlbWVudDo6c3RlcCk6IGRpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhh bmRsZXIpOiBkaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0RmllbGRTcGVlY2hCdXR0b25F bGVtZW50OjpzZXRSZWNvZ25pdGlvblJlc3VsdCk6IGRpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgICh1cGRhdGVVc2VyTW9kaWZ5UHJvcGVy dHkpOiBDaGFuZ2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOiBDaGFuZ2VkIGlzUmVh ZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisKIDIwMTItMDctMzAgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMjQwMDQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCBm ZmFlZTZkZTZmODcyODk2Zjg5OGFmZjcwM2VjOGViMzYwMDEyNzkxLi4zMjJmYmRhYzU4NGFjYWEz MWNjNzA5YzdjMGMwOWNiMjM0NjlkYTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNy0zMCAgWW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtGb3Jtc10gR2V0IHJpZCBvZiBFbGVtZW50Ojppc1JlYWRP bmx5Rm9ybUNvbnRyb2wgb3RoZXIgdGhhbiBDU1MgcmVsYXRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI2MTIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlcGxhY2VzIEVsZW1lbnQ6 OmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvCisgICAgICAgIEhUTUxGb3JtQ29udHJvbEVsZW1l bnQ6OnJlYWRPbmx5KCkgZm9yIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5nCisgICAgICAgIEVs ZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6RE9NU3VwcG9ydDo6aXNUZXh0QmFzZWRDb250ZW50RWRpdGFibGVFbGVtZW50KToK KwogMjAxMi0wNy0yNyAgRWxpIEZpZGxlciAgPGVmaWRsZXJAcmltLmNvbT4KIAogICAgICAgICBb QmxhY2tCZXJyeV0gQWRhcHQgdG8gY2hhbmdlIGluIHRoZSBGb250SW5mbyBwbGF0Zm9ybSBBUEku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNw cAppbmRleCBjY2NhZDgxZWY2ZDg3ZGJiMmMyMjdmOWQ2MGQxMDEwMTc3ZThmODIzLi5lOTA5NTc0 NTc4YjQ4NDg2YzI0MDBkMTI5NjNkZThkYmZmMDdlMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKQEAgLTMwMyw3ICszMDMsNyBA QCB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZl bnQpCiAgICAgLy8gRklYTUU6IFNob3VsZCBoYW5kbGUgdGhpcyByZWFkb25seS9kaXNhYmxlZCBj aGVjayBpbiBtb3JlIGdlbmVyYWwgd2F5LgogICAgIC8vIE1pc3NpbmcgdGhpcyBraW5kIG9mIGNo ZWNrIGlzIGxpa2VseSB0byBvY2N1ciBlbHNld2hlcmUgaWYgYWRkaW5nIGl0IGluIGVhY2ggc2hh ZG93IGVsZW1lbnQuCiAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsK LSAgICBpZiAoIWlucHV0IHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSB8fCAhaW5w dXQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCkpIHsKKyAgICBpZiAoIWlucHV0IHx8IGlucHV0LT5y ZWFkT25seSgpIHx8ICFpbnB1dC0+aXNFbmFibGVkRm9ybUNvbnRyb2woKSkgewogICAgICAgICBz dG9wRHJhZ2dpbmcoKTsKICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRs ZXIoZXZlbnQpOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9UZXh0Q29udHJvbElubmVyRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcAppbmRleCBlMzA5N2JiNWU0 ODYxNDZkNjdlMGI0NzhjOTg3OGZhZmYxNzhlNzA2Li4yMTljMmM0N2EzNWE4YWMyNWE2MTYxZDcw YTA5NTM0ODk4YmIyMDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9U ZXh0Q29udHJvbElubmVyRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L1RleHRDb250cm9sSW5uZXJFbGVtZW50cy5jcHAKQEAgLTE5OCw3ICsxOTgsNyBAQCB2b2lk IFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVu dCogZXZlbnQpCiB7CiAgICAgLy8gSWYgdGhlIGVsZW1lbnQgaXMgdmlzaWJsZSwgb24gbW91c2V1 cCwgY2xlYXIgdGhlIHZhbHVlLCBhbmQgc2V0IHNlbGVjdGlvbgogICAgIFJlZlB0cjxIVE1MSW5w dXRFbGVtZW50PiBpbnB1dChzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4oc2hhZG93SG9z dCgpKSk7Ci0gICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9y bUNvbnRyb2woKSkgeworICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9u bHkoKSkgewogICAgICAgICBpZiAoIWV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICAg ICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogICAgICAgICBy ZXR1cm47CkBAIC0yNzksNyArMjc5LDcgQEAgdm9pZCBTcGluQnV0dG9uRWxlbWVudDo6ZGVmYXVs dEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgfQogCiAgICAgUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+IGlucHV0KHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0 KCkpKTsKLSAgICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3Jt Q29udHJvbCgpKSB7CisgICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5yZWFkT25s eSgpKSB7CiAgICAgICAgIGlmICghZXZlbnQtPmRlZmF1bHRIYW5kbGVkKCkpCiAgICAgICAgICAg ICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIHJl dHVybjsKQEAgLTM2NSw3ICszNjUsNyBAQCB2b2lkIFNwaW5CdXR0b25FbGVtZW50OjpzdG9wUmVw ZWF0aW5nVGltZXIoKQogdm9pZCBTcGluQnV0dG9uRWxlbWVudDo6c3RlcChpbnQgYW1vdW50KQog ewogICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0ID0gc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxl bWVudCo+KHNoYWRvd0hvc3QoKSk7Ci0gICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0 LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkKKyAgICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwg aW5wdXQtPnJlYWRPbmx5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAvLyBPbiBNYWMgT1MsIE5T U3RlcHBlciB1cGRhdGVzIHRoZSB2YWx1ZSBmb3IgdGhlIGJ1dHRvbiB1bmRlciB0aGUgbW91c2UK ICAgICAvLyBjdXJzb3IgcmVnYXJkbGVzcyBvZiB0aGUgYnV0dG9uIHByZXNzZWQgYXQgdGhlIGJl Z2lubmluZy4gU28gdGhlCkBAIC00MzEsNyArNDMxLDcgQEAgdm9pZCBJbnB1dEZpZWxkU3BlZWNo QnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgLy8g aGVyZSwgd2UgdGFrZSBhIHRlbXBvcmFyeSByZWZlcmVuY2UuCiAgICAgUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+IGlucHV0KHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0 KCkpKTsKIAotICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+aXNSZWFkT25seUZv cm1Db250cm9sKCkpIHsKKyAgICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPnJlYWRP bmx5KCkpIHsKICAgICAgICAgaWYgKCFldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAg ICAgIEhUTUxEaXZFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAg cmV0dXJuOwpAQCAtNTEwLDcgKzUxMCw3IEBAIHZvaWQgSW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVs ZW1lbnQ6OnNldFJlY29nbml0aW9uUmVzdWx0KGludCwgY29uc3QgU3BlZWNoSW5wdXRSCiAgICAg Ly8gcmVtb3ZlIHRoZSBpbnB1dCBlbGVtZW50IGZyb20gRE9NLiBUbyBtYWtlIHN1cmUgaXQgcmVt YWlucyB2YWxpZCB1bnRpbCB3ZSBmaW5pc2ggb3VyIHdvcmsKICAgICAvLyBoZXJlLCB3ZSB0YWtl IGEgdGVtcG9yYXJ5IHJlZmVyZW5jZS4KICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5w dXQoc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSkpOwotICAgIGlm IChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+aXNSZWFkT25seUZvcm1Db250cm9sKCkpCisg ICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5yZWFkT25seSgpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBSZWZQdHI8SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ+IGhvbGRS ZWZCdXR0b24odGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dENvbnRyb2wuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sLmNwcAppbmRleCA4YjEzODM1MmU0NjgyYjQ1ZmJjZWUyNGRlNjdiN2NhZjcxYjU1ZTk0 Li5kMDdjODExZDA2ZWE4NzQ0MDdhZTk3YTM3ZmMwN2FkYjkzMzYxZWE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKQEAgLTgxLDcgKzgxLDcg QEAgc3RhdGljIGlubGluZSBib29sIHVwZGF0ZVVzZXJNb2RpZnlQcm9wZXJ0eShOb2RlKiBub2Rl LCBSZW5kZXJTdHlsZSogc3R5bGUpCiAgICAgaWYgKG5vZGUtPmlzRWxlbWVudE5vZGUoKSkgewog ICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOwog ICAgICAgICBpc0VuYWJsZWQgPSBlbGVtZW50LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpOwotICAg ICAgICBpc1JlYWRPbmx5Q29udHJvbCA9IGVsZW1lbnQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgp OworICAgICAgICBpc1JlYWRPbmx5Q29udHJvbCA9IGVsZW1lbnQtPmlzVGV4dEZvcm1Db250cm9s KCkgJiYgc3RhdGljX2Nhc3Q8SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQqPihlbGVtZW50KS0+ cmVhZE9ubHkoKTsKICAgICB9CiAKICAgICBzdHlsZS0+c2V0VXNlck1vZGlmeSgoaXNSZWFkT25s eUNvbnRyb2wgfHwgIWlzRW5hYmxlZCkgPyBSRUFEX09OTFkgOiBSRUFEX1dSSVRFX1BMQUlOVEVY VF9PTkxZKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQppbmRl eCAxYjkyMDA2ZjE1Y2ViNDhlNzI0ODZiMmI2ZDEwYTJmOTVkOTBlMjk1Li4yNWIwM2I3MzcwMmY3 OGU0YTczMWRkZTc2NDU5ODc5NGZkY2UzMmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lTWFjLm1tCkBAIC0xNTcxLDcgKzE1NzEsNyBAQCBib29sIFJlbmRlclRoZW1l TWFjOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3Qg UGFpbnRJbgogCiAgICAgTlNTZWFyY2hGaWVsZENlbGwqIHNlYXJjaCA9IHRoaXMtPnNlYXJjaCgp OwogCi0gICAgaWYgKGlucHV0LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpICYmICFpbnB1dC0+aXNS ZWFkT25seUZvcm1Db250cm9sKCkpIHsKKyAgICBpZiAoaW5wdXQtPmlzRW5hYmxlZEZvcm1Db250 cm9sKCkgJiYgKGlucHV0LT5pc1RleHRGb3JtQ29udHJvbCgpICYmICFzdGF0aWNfY2FzdDxIVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudCo+KGlucHV0KS0+cmVhZE9ubHkoKSkpIHsKICAgICAgICAg dXBkYXRlQWN0aXZlU3RhdGUoW3NlYXJjaCBjYW5jZWxCdXR0b25DZWxsXSwgbyk7CiAgICAgICAg IHVwZGF0ZVByZXNzZWRTdGF0ZShbc2VhcmNoIGNhbmNlbEJ1dHRvbkNlbGxdLCBvKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9ET01T dXBwb3J0LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0RPTVN1 cHBvcnQuY3BwCmluZGV4IDJiNTRjMzM3YzhjMzM3YzE5YjdiZjNjNTBjMDFjZTliYzJhY2U1MTIu LmZjYmI1ZmE5Njg0MTQ4ZTE3YWM5OGU1NzEzYzU3OTBlNjg2NTI2NTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0RPTVN1cHBvcnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0RPTVN1cHBvcnQuY3BwCkBA IC0yMzEsMTMgKzIzMSwxNiBAQCBib29sIGlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVu dChFbGVtZW50KiBlbGVtZW50KQogICAgIGlmICghZWxlbWVudCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgaWYgKGVsZW1lbnQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHx8ICFlbGVt ZW50LT5pc0VuYWJsZWRGb3JtQ29udHJvbCgpKQorICAgIGlmICghZWxlbWVudC0+aXNFbmFibGVk Rm9ybUNvbnRyb2woKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKGlzUG9wdXBJ bnB1dEZpZWxkKGVsZW1lbnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4g ZWxlbWVudC0+aXNUZXh0Rm9ybUNvbnRyb2woKSB8fCBlbGVtZW50LT5pc0NvbnRlbnRFZGl0YWJs ZSgpOworICAgIGlmIChlbGVtZW50LT5pc1RleHRGb3JtQ29udHJvbCgpKQorICAgICAgICByZXR1 cm4gIXN0YXRpY19jYXN0PEhUTUxUZXh0Rm9ybUNvbnRyb2wqPihlbGVtZW50KS0+cmVhZE9ubHko KTsKKworICAgIHJldHVybiBlbGVtZW50LT5pc0NvbnRlbnRFZGl0YWJsZSgpOwogfQogCiBJbnRS ZWN0IHRyYW5zZm9ybWVkQm91bmRpbmdCb3hGb3JSYW5nZShjb25zdCBSYW5nZSYgcmFuZ2UpCg== 155417 2012-07-30 18:47:34 -0700 2012-07-30 19:01:36 -0700 Patch 4 bug-92612-20120731104718.patch text/plain 8844 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQxZWZhMzU5MGU3ZWM4 NzRkMjg4MmI0YWI3NTlhMjEyM2M3ZjY1Yi4uNTcwOTE0NjU0ZDVkMjZiOTUxMjhjNGM4ZWY1Y2M5 YzIyNDZkOWVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTMwICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBHZXQg cmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBvdGhlciB0aGFuIENTUyByZWxh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjYx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggcmVwbGFjZXMgRWxlbWVudDo6aXNSZWFkT25seUZvcm1Db250cm9sKCkgbm90IHJlbGF0 ZWQgdG8KKyAgICAgICAgQ1NTIHNlbGVjdG9yIG1hdGNoaW5nIHRvIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnJlYWRPbmx5KCkgZm9yCisgICAgICAgIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5n IEVsZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvci4K KworICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBDaGFu Z2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAgICAgICogaHRt bC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6IENo YW5nZWQgaXNSZWFkT25seUZvcm1Db250cm9sKCkgdG8gcmVhZE9ubHkoKS4KKyAgICAgICAgKFdl YkNvcmU6OlNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpTcGluQnV0dG9uRWxlbWVudDo6c3RlcCk6IGRpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhh bmRsZXIpOiBkaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OklucHV0RmllbGRTcGVlY2hCdXR0b25F bGVtZW50OjpzZXRSZWNvZ25pdGlvblJlc3VsdCk6IGRpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgICh1cGRhdGVVc2VyTW9kaWZ5UHJvcGVy dHkpOiBDaGFuZ2VkIGlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOiBDaGFuZ2VkIGlzUmVh ZE9ubHlGb3JtQ29udHJvbCgpIHRvIHJlYWRPbmx5KCkuCisKIDIwMTItMDctMzAgIEVyaWMgU2Vp ZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIEdyaWQgRGVtbyBzcGVuZHMgMS41JSBv ZiB0b3RhbCB0aW1lIGFsbG9jYXRpbmcgUGF0aCBvYmplY3RzIGluIFJlbmRlckJveE1vZGVsT2Jq ZWN0OjpwYWludEJvcmRlclNpZGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCBk Y2JiMDQyYmY0ODE0NDViOGY3NGQyNDJhOGVmNWMzYTYyOTg1MmY4Li4xZTI2ZmU4OWQ2MTdlY2Jh NWY5MmNlMjIzZTlmYjFlNTIwYjMwYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNy0zMCAgWW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtGb3Jtc10gR2V0IHJpZCBvZiBFbGVtZW50Ojppc1JlYWRP bmx5Rm9ybUNvbnRyb2wgb3RoZXIgdGhhbiBDU1MgcmVsYXRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI2MTIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlcGxhY2VzIEVsZW1lbnQ6 OmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHRvCisgICAgICAgIEhUTUxGb3JtQ29udHJvbEVsZW1l bnQ6OnJlYWRPbmx5KCkgZm9yIHByZXBhcmF0aW9uIG9mIGludHJvZHVjaW5nCisgICAgICAgIEVs ZW1lbnQ6OnNob3VsZE1hdGNoUmVhZFdyaXRlU2VsZWN0b3IoKSwgYnVnIDkyNjAyLgorCisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9ET01TdXBwb3J0LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6RE9NU3VwcG9ydDo6aXNUZXh0QmFzZWRDb250ZW50RWRpdGFibGVFbGVtZW50KTog UmVwbGFjZWQgaXNSZWFkT25seUZvcm1Db250cm9sKCkgYnkgSFRNTFRleHRGb3JtQ29udHJvbEVs ZW1lbnQ6OnJlYWRPbmx5KCkuCisKIDIwMTItMDctMzAgIE1pa2UgRmVudG9uICA8bWlmZW50b25A cmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gT3B0aW1pemUgdGhlIGdlbmVyYXRpb24g b2Ygc2VsZWN0aW9uIGRldGFpbHMgZ2VuZXJhdGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IDFkMzM0NTllMzcyZjQ5Zjlm OTFlZWI4N2Y3NDE4ZmVkNDA2NDcxODUuLmIwMjBiMzgyOTllNzc1ZTZkODFiZjYxNWU3MTk2ZWRl NzBiZWE4MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRo dW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1 bWJFbGVtZW50LmNwcApAQCAtMzAzLDcgKzMwMyw3IEBAIHZvaWQgU2xpZGVyVGh1bWJFbGVtZW50 OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAvLyBGSVhNRTogU2hvdWxk IGhhbmRsZSB0aGlzIHJlYWRvbmx5L2Rpc2FibGVkIGNoZWNrIGluIG1vcmUgZ2VuZXJhbCB3YXku CiAgICAgLy8gTWlzc2luZyB0aGlzIGtpbmQgb2YgY2hlY2sgaXMgbGlrZWx5IHRvIG9jY3VyIGVs c2V3aGVyZSBpZiBhZGRpbmcgaXQgaW4gZWFjaCBzaGFkb3cgZWxlbWVudC4KICAgICBIVE1MSW5w dXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1dCgpOwotICAgIGlmICghaW5wdXQgfHwgaW5wdXQt PmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHx8ICFpbnB1dC0+aXNFbmFibGVkRm9ybUNvbnRyb2wo KSkgeworICAgIGlmICghaW5wdXQgfHwgaW5wdXQtPnJlYWRPbmx5KCkgfHwgIWlucHV0LT5pc0Vu YWJsZWRGb3JtQ29udHJvbCgpKSB7CiAgICAgICAgIHN0b3BEcmFnZ2luZygpOwogICAgICAgICBI VE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIHJldHVy bjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRDb250cm9sSW5u ZXJFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0Q29udHJvbElu bmVyRWxlbWVudHMuY3BwCmluZGV4IDhmNmYxNzliMWE4ZjRmMjA0NjdjODc1OWU0Yjk1N2ZiZWE3 MzI3YjYuLjBmZDQxYzYwZTZhOTVmYmZjNThlNTI0MWRhOTY0YjUxYzE3NWRmY2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRDb250cm9sSW5uZXJFbGVtZW50cy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dENvbnRyb2xJbm5lckVsZW1l bnRzLmNwcApAQCAtMjAzLDcgKzIwMyw3IEBAIHZvaWQgU2VhcmNoRmllbGRDYW5jZWxCdXR0b25F bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICAvLyBJZiB0 aGUgZWxlbWVudCBpcyB2aXNpYmxlLCBvbiBtb3VzZXVwLCBjbGVhciB0aGUgdmFsdWUsIGFuZCBz ZXQgc2VsZWN0aW9uCiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGlucHV0KHN0YXRpY19j YXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzaGFkb3dIb3N0KCkpKTsKLSAgICBpZiAoaW5wdXQtPmRp c2FibGVkKCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpKSB7CisgICAgaWYgKGlu cHV0LT5kaXNhYmxlZCgpIHx8IGlucHV0LT5yZWFkT25seSgpKSB7CiAgICAgICAgIGlmICghZXZl bnQtPmRlZmF1bHRIYW5kbGVkKCkpCiAgICAgICAgICAgICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVs dEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIHJldHVybjsKQEAgLTI5Myw3ICsyOTMsNyBA QCB2b2lkIFNwaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVu dCkKICAgICB9CiAKICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5wdXQoc3RhdGljX2Nh c3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSkpOwotICAgIGlmIChpbnB1dC0+ZGlz YWJsZWQoKSB8fCBpbnB1dC0+aXNSZWFkT25seUZvcm1Db250cm9sKCkpIHsKKyAgICBpZiAoaW5w dXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPnJlYWRPbmx5KCkpIHsKICAgICAgICAgaWYgKCFldmVu dC0+ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAgICAgIEhUTUxEaXZFbGVtZW50OjpkZWZhdWx0 RXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzk3LDcgKzM5Nyw3IEBA IHZvaWQgU3BpbkJ1dHRvbkVsZW1lbnQ6OnN0b3BSZXBlYXRpbmdUaW1lcigpCiB2b2lkIFNwaW5C dXR0b25FbGVtZW50OjpzdGVwKGludCBhbW91bnQpCiB7CiAgICAgSFRNTElucHV0RWxlbWVudCog aW5wdXQgPSBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4oc2hhZG93SG9zdCgpKTsKLSAg ICBpZiAoaW5wdXQtPmRpc2FibGVkKCkgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgp KQorICAgIGlmIChpbnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9ubHkoKSkKICAgICAg ICAgcmV0dXJuOwogICAgIC8vIE9uIE1hYyBPUywgTlNTdGVwcGVyIHVwZGF0ZXMgdGhlIHZhbHVl IGZvciB0aGUgYnV0dG9uIHVuZGVyIHRoZSBtb3VzZQogICAgIC8vIGN1cnNvciByZWdhcmRsZXNz IG9mIHRoZSBidXR0b24gcHJlc3NlZCBhdCB0aGUgYmVnaW5uaW5nLiBTbyB0aGUKQEAgLTQ2Myw3 ICs0NjMsNyBAQCB2b2lkIElucHV0RmllbGRTcGVlY2hCdXR0b25FbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAvLyBoZXJlLCB3ZSB0YWtlIGEgdGVtcG9yYXJ5 IHJlZmVyZW5jZS4KICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gaW5wdXQoc3RhdGljX2Nh c3Q8SFRNTElucHV0RWxlbWVudCo+KHNoYWRvd0hvc3QoKSkpOwogCi0gICAgaWYgKGlucHV0LT5k aXNhYmxlZCgpIHx8IGlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkgeworICAgIGlmIChp bnB1dC0+ZGlzYWJsZWQoKSB8fCBpbnB1dC0+cmVhZE9ubHkoKSkgewogICAgICAgICBpZiAoIWV2 ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogICAgICAgICByZXR1cm47CkBAIC01NTEsNyArNTUxLDcg QEAgdm9pZCBJbnB1dEZpZWxkU3BlZWNoQnV0dG9uRWxlbWVudDo6c2V0UmVjb2duaXRpb25SZXN1 bHQoaW50LCBjb25zdCBTcGVlY2hJbnB1dFIKICAgICAvLyByZW1vdmUgdGhlIGlucHV0IGVsZW1l bnQgZnJvbSBET00uIFRvIG1ha2Ugc3VyZSBpdCByZW1haW5zIHZhbGlkIHVudGlsIHdlIGZpbmlz aCBvdXIgd29yawogICAgIC8vIGhlcmUsIHdlIHRha2UgYSB0ZW1wb3JhcnkgcmVmZXJlbmNlLgog ICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBpbnB1dChzdGF0aWNfY2FzdDxIVE1MSW5wdXRF bGVtZW50Kj4oc2hhZG93SG9zdCgpKSk7Ci0gICAgaWYgKGlucHV0LT5kaXNhYmxlZCgpIHx8IGlu cHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkKKyAgICBpZiAoaW5wdXQtPmRpc2FibGVkKCkg fHwgaW5wdXQtPnJlYWRPbmx5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxJbnB1 dEZpZWxkU3BlZWNoQnV0dG9uRWxlbWVudD4gaG9sZFJlZkJ1dHRvbih0aGlzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCmluZGV4IDhiMTM4MzUy ZTQ2ODJiNDVmYmNlZTI0ZGU2N2I3Y2FmNzFiNTVlOTQuLmQwN2M4MTFkMDZlYTg3NDQwN2FlOTdh MzdmYzA3YWRiOTMzNjFlYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUZXh0Q29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sLmNwcApAQCAtODEsNyArODEsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgdXBk YXRlVXNlck1vZGlmeVByb3BlcnR5KE5vZGUqIG5vZGUsIFJlbmRlclN0eWxlKiBzdHlsZSkKICAg ICBpZiAobm9kZS0+aXNFbGVtZW50Tm9kZSgpKSB7CiAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQg PSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSk7CiAgICAgICAgIGlzRW5hYmxlZCA9IGVsZW1l bnQtPmlzRW5hYmxlZEZvcm1Db250cm9sKCk7Ci0gICAgICAgIGlzUmVhZE9ubHlDb250cm9sID0g ZWxlbWVudC0+aXNSZWFkT25seUZvcm1Db250cm9sKCk7CisgICAgICAgIGlzUmVhZE9ubHlDb250 cm9sID0gZWxlbWVudC0+aXNUZXh0Rm9ybUNvbnRyb2woKSAmJiBzdGF0aWNfY2FzdDxIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudCo+KGVsZW1lbnQpLT5yZWFkT25seSgpOwogICAgIH0KIAogICAg IHN0eWxlLT5zZXRVc2VyTW9kaWZ5KChpc1JlYWRPbmx5Q29udHJvbCB8fCAhaXNFbmFibGVkKSA/ IFJFQURfT05MWSA6IFJFQURfV1JJVEVfUExBSU5URVhUX09OTFkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDFiOTIwMDZmMTVjZWI0OGU3MjQ4NmIy YjZkMTBhMmY5NWQ5MGUyOTUuLjI1YjAzYjczNzAyZjc4ZTRhNzMxZGRlNzY0NTk4Nzk0ZmRjZTMy ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KQEAgLTE1 NzEsNyArMTU3MSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRDYW5j ZWxCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluCiAKICAgICBOU1NlYXJjaEZp ZWxkQ2VsbCogc2VhcmNoID0gdGhpcy0+c2VhcmNoKCk7CiAKLSAgICBpZiAoaW5wdXQtPmlzRW5h YmxlZEZvcm1Db250cm9sKCkgJiYgIWlucHV0LT5pc1JlYWRPbmx5Rm9ybUNvbnRyb2woKSkgewor ICAgIGlmIChpbnB1dC0+aXNFbmFibGVkRm9ybUNvbnRyb2woKSAmJiAoaW5wdXQtPmlzVGV4dEZv cm1Db250cm9sKCkgJiYgIXN0YXRpY19jYXN0PEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Kj4o aW5wdXQpLT5yZWFkT25seSgpKSkgewogICAgICAgICB1cGRhdGVBY3RpdmVTdGF0ZShbc2VhcmNo IGNhbmNlbEJ1dHRvbkNlbGxdLCBvKTsKICAgICAgICAgdXBkYXRlUHJlc3NlZFN0YXRlKFtzZWFy Y2ggY2FuY2VsQnV0dG9uQ2VsbF0sIG8pOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0RPTVN1cHBvcnQuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRE9NU3VwcG9ydC5jcHAKaW5kZXggMmI1NGMzMzdj OGMzMzdjMTliN2JmM2M1MGMwMWNlOWJjMmFjZTUxMi4uOTk0MTFmMDFmNGNlZDY0ZWJhMzNlMDA0 ZjQxODE4NzRmM2Y2NDBjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvRE9NU3VwcG9ydC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvRE9NU3VwcG9ydC5jcHAKQEAgLTIzMSw3ICsyMzEsMTAgQEAgYm9vbCBp c1RleHRCYXNlZENvbnRlbnRFZGl0YWJsZUVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKICAgICBp ZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChlbGVtZW50LT5p c1JlYWRPbmx5Rm9ybUNvbnRyb2woKSB8fCAhZWxlbWVudC0+aXNFbmFibGVkRm9ybUNvbnRyb2wo KSkKKyAgICBpZiAoZWxlbWVudC0+aXNUZXh0Rm9ybUNvbnRyb2woKSAmJiBzdGF0aWNfY2FzdDxI VE1MVGV4dEZvcm1Db250cm9sRWxlbWVudCo+KGVsZW1lbnQpLT5yZWFkT25seSgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWVsZW1lbnQtPmlzRW5hYmxlZEZvcm1Db250cm9s KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChpc1BvcHVwSW5wdXRGaWVsZChl bGVtZW50KSkK