84009 2012-04-15 23:29:49 -0700 Introduce an internal feature for a fixed placeholder 2012-04-17 01:37:02 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83872 1 tkent tkent haraken morrita webkit.review.bot oldest_to_newest 602915 0 tkent 2012-04-15 23:29:49 -0700 Introduce an internal feature for a fixed placeholder 602921 1 137282 tkent 2012-04-15 23:38:52 -0700 Created attachment 137282 Patch 602960 2 137282 haraken 2012-04-16 01:22:36 -0700 Comment on attachment 137282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137282&action=review > Source/WebCore/html/InputType.h:243 > + // If supportsPlaceholder() && defaultPlaceholder().isEmpty(), it means a > + // type supports the 'placeholder' attribute. > + // If supportsPlaceholder() && !defaultPlaceholder().isEmpty(), it means a > + // type doesn't support the 'placeholder' attribute, but shows > + // defaultPlaceholder() string as a placeholder. Nit: It might be better to put this comment above supportsPlaceholder(). > Source/WebCore/html/TextFieldInputType.cpp:397 > + if (placeholderText.isEmpty()) Shouldn't this be 'if (!placeholderText.isEmpty())'? 602974 3 137282 tkent 2012-04-16 01:37:15 -0700 Comment on attachment 137282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137282&action=review >> Source/WebCore/html/InputType.h:243 >> + // defaultPlaceholder() string as a placeholder. > > Nit: It might be better to put this comment above supportsPlaceholder(). It's reasonable. I'll do. >> Source/WebCore/html/TextFieldInputType.cpp:397 >> + if (placeholderText.isEmpty()) > > Shouldn't this be 'if (!placeholderText.isEmpty())'? No. If defaultPlaceholder() is empty, we'll use the 'placeholder' attribute value. 602976 4 137302 tkent 2012-04-16 01:38:27 -0700 Created attachment 137302 Patch 2 Fix a comment 602980 5 137303 tkent 2012-04-16 01:39:55 -0700 Created attachment 137303 Patch 3 602981 6 137282 haraken 2012-04-16 01:40:41 -0700 Comment on attachment 137282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137282&action=review >>> Source/WebCore/html/TextFieldInputType.cpp:397 >>> + if (placeholderText.isEmpty()) >> >> Shouldn't this be 'if (!placeholderText.isEmpty())'? > > No. If defaultPlaceholder() is empty, we'll use the 'placeholder' attribute value. Ah, got it. I'd been confused. > Source/WebCore/html/TextFieldInputType.cpp:398 > + placeholderText = element()->strippedPlaceholder(); Nit: You can move this statement inside the below if statement. 602982 7 haraken 2012-04-16 01:41:41 -0700 (In reply to comment #6) > > Source/WebCore/html/TextFieldInputType.cpp:398 > > + placeholderText = element()->strippedPlaceholder(); > > Nit: You can move this statement inside the below if statement. Sorry, ignore this comment. You code is right. 603834 8 137486 tkent 2012-04-17 00:09:47 -0700 Created attachment 137486 Patch 4 Add InputType::usesFixedPlaceholder() 603860 9 137486 webkit.review.bot 2012-04-17 01:36:57 -0700 Comment on attachment 137486 Patch 4 Clearing flags on attachment: 137486 Committed r114360: <http://trac.webkit.org/changeset/114360> 603861 10 webkit.review.bot 2012-04-17 01:37:02 -0700 All reviewed patches have been landed. Closing bug. 137282 2012-04-15 23:38:52 -0700 2012-04-16 17:39:27 -0700 Patch bug-84009-20120416153850.patch text/plain 6519 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY1ZDExYjNkNDgwYmQ1 ZDEwOWNhMTQ4MjM2YWU0YTk3Yzg1MTM2ZS4uMzVkZGFjM2E3NjJkZTdmMTFhZTEyMDY4ODU4MGI3 MzM0Njg1YzU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTE1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnRyb2R1Y2UgYW4gaW50 ZXJuYWwgZmVhdHVyZSBmb3IgYSBmaXhlZCBwbGFjZWhvbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgZnJhbWV3b3Jr IHRvIHN1cHBvcnQgZml4ZWQgcGxhY2Vob2xkZXIgc3RyaW5nIGZvcgorICAgICAgICB0ZXh0Zmll bGQtbGlrZSA8aW5wdXQ+IHdpdGhvdXQgdGhlIHBhbGNlaG9sZGVyIGF0dHJpYnV0ZSBzdXBwb3J0 LiBUaGlzCisgICAgICAgIGRvZXNuJ3QgY2hhbmdlIGFueSBiZWhhdmlvciBvZiBpbnB1dCB0eXBl cyB3aGljaCBzdXBwb3J0IHRoZQorICAgICAgICAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKwor ICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIHN0YW5kYXJkLCA8aW5wdXQgdHlwZT1kYXRlPiBkb2Vz bid0IHN1cHBvcnQgdGhlCisgICAgICAgICdwbGFjZWhvbGRlcicgYXR0cmlidXRlLiBIb3dldmVy IGl0IGlzIGEga2luZCBvZiB0ZXh0IGZpZWxkIGluIFdlYktpdAorICAgICAgICBwbGF0Zm9ybXMg d2l0aCBFTkFCTEVfQ0FMRU5EQVJfUElDS0VSLCBhbmQgd2UgbWF5IHNob3cgc29tZXRoaW5nIHVz ZWZ1bAorICAgICAgICBpbmZvcm1hdGlvbiBhcyB0aGUgZGVmYXVsdCBwbGFjZWhvbGRlci4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBvZiBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisg ICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oOgorICAgICAgICAoSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQpOiBNYWtlIGlzUGxhY2Vob2xkZXJFbXB0eSgpIHZpcnR1 YWwuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5w dXRFbGVtZW50KTogT3ZlcnJpZGVzIGlzUGxhY2Vob2xkZXJFbXB0eSgpLgorICAgICAgICAqIGh0 bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVt ZW50Ojppc1BsYWNlaG9sZGVyRW1wdHkpOgorICAgICAgICBDaGVjayBJbnB1dFR5cGU6OmRlZmF1 bHRQbGFjZWhvbGRlcigpIGZpcnN0LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6ZGVmYXVsdFBsYWNlaG9sZGVyKTogQWRkZWQuIFJl dHVybiBhIG51bGwgc3RyaW5nLgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAg IChJbnB1dFR5cGUpOiBBZGQgZGVmYXVsdFBsYWNlaG9sZGVyKCkuCisgICAgICAgICogaHRtbC9U ZXh0RmllbGRJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkSW5wdXRU eXBlOjp1cGRhdGVQbGFjZWhvbGRlclRleHQpOgorICAgICAgICBJZiB3ZSBoYXZlIG5vbi1lbXB0 eSBkZWZhdWx0UGxhY2Vob2xkZXIoKSwgdXNlcyBpdC4KKwogMjAxMi0wNC0xNCAgRW1pbCBBIEVr bHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHBpeGVsU25hcHBpbmcgZm9y IENhbGVuZGFyUGlja2VyLCBNZWRpYUNvbnRyb2wgYW5kIFNjcm9sbGJhclBhcnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCmluZGV4IGZhM2M1OGYyYjIyMzJmNmI0NmM3 YTkyNWYzMzMwNmU1MWJiYmFjMjIuLjkzZDQxNzQ3MTkzNDYxYzUwNTZhYWRmMmM5ZDhkYjEwMjc1 NmIzZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApAQCAtMTc1 Niw2ICsxNzU2LDExIEBAIGJvb2wgSFRNTElucHV0RWxlbWVudDo6c3VwcG9ydHNQbGFjZWhvbGRl cigpIGNvbnN0CiAgICAgcmV0dXJuIG1faW5wdXRUeXBlLT5zdXBwb3J0c1BsYWNlaG9sZGVyKCk7 CiB9CiAKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6aXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9pbnB1dFR5cGUtPmRlZmF1bHRQbGFjZWhvbGRlcigpLmlzRW1wdHko KSAmJiBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6aXNQbGFjZWhvbGRlckVtcHR5KCk7Cit9 CisKIHZvaWQgSFRNTElucHV0RWxlbWVudDo6dXBkYXRlUGxhY2Vob2xkZXJUZXh0KCkKIHsKICAg ICByZXR1cm4gbV9pbnB1dFR5cGUtPnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaAppbmRleCBjMjEwOTE0ZGY4NWUwNTUwNDNmMzdlMzcz YTVlNzNkYTUzMzk2M2Y4Li43ZDMwMDY1MzkzMTBlNjUxZTU5ZDY4YWRhMjJhMGNmN2VhYTBkNWRk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaApAQCAtMzExLDYgKzMxMSw3 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc1RleHRUeXBlKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFs IGJvb2wgc3VwcG9ydHNQbGFjZWhvbGRlcigpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBpc1Bs YWNlaG9sZGVyRW1wdHkoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl UGxhY2Vob2xkZXJUZXh0KCk7CiAgICAgdmlydHVhbCBib29sIGlzRW1wdHlWYWx1ZSgpIGNvbnN0 IE9WRVJSSURFIHsgcmV0dXJuIGlubmVyVGV4dFZhbHVlKCkuaXNFbXB0eSgpOyB9CiAgICAgdmly dHVhbCBib29sIGlzRW1wdHlTdWdnZXN0ZWRWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIHN1Z2dlc3Rl ZFZhbHVlKCkuaXNFbXB0eSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50LmgKaW5kZXggNTljZDc0MWRkNjUzZmI2MDY3ZWE0YzQ5ZTIyMmEy NDU5MGEzYzdjYS4uMzk2YmU4Yjc2ZThiYmY1MzFlZjg0ZTZmNTk5YWY1MmYyMGNhZWUwOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaApA QCAtODYsNiArODYsNyBAQCBwdWJsaWM6CiAKIHByb3RlY3RlZDoKICAgICBIVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQqLCBIVE1MRm9ybUVs ZW1lbnQqKTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3Q7CiAg ICAgdmlydHVhbCB2b2lkIHVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpID0gMDsKIAogICAgIHZpcnR1 YWwgdm9pZCBwYXJzZUF0dHJpYnV0ZShBdHRyaWJ1dGUqKSBPVkVSUklERTsKQEAgLTExNiw4ICsx MTcsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEJsdXJFdmVudChQYXNz UmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKTsKICAgICB2aXJ0dWFsIGJvb2wgY2hpbGRTaG91 bGRDcmVhdGVSZW5kZXJlcihjb25zdCBOb2RlUmVuZGVyaW5nQ29udGV4dCYpIGNvbnN0IE9WRVJS SURFOwogCi0gICAgYm9vbCBpc1BsYWNlaG9sZGVyRW1wdHkoKSBjb25zdDsKLQogICAgIC8vIFJl dHVybnMgdHJ1ZSBpZiB1c2VyLWVkaXRhYmxlIHZhbHVlIGlzIGVtcHR5LiBVc2VkIHRvIGNoZWNr IHBsYWNlaG9sZGVyIHZpc2liaWxpdHkuCiAgICAgdmlydHVhbCBib29sIGlzRW1wdHlWYWx1ZSgp IGNvbnN0ID0gMDsKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgc3VnZ2VzdGVkIHZhbHVlIGlzIGVt cHR5LiBVc2VkIHRvIGNoZWNrIHBsYWNlaG9sZGVyIHZpc2liaWxpdHkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0lu cHV0VHlwZS5jcHAKaW5kZXggN2E5ZjFiMTk3ZDEyM2ZkZTFmZWRkYzJmOTAwZTAyMDNmYmI3ZTI1 YS4uNzJmOGQ1OTE1ZTUwYmMyMTdmNzVmNTJmNjA3M2VlMmU4MmIwOGYyYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSW5wdXRUeXBlLmNwcApAQCAtNzI4LDYgKzcyOCwxMSBAQCBib29sIElucHV0VHlwZTo6c3Vw cG9ydHNQbGFjZWhvbGRlcigpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitTdHJpbmcg SW5wdXRUeXBlOjpkZWZhdWx0UGxhY2Vob2xkZXIoKQoreworICAgIHJldHVybiBTdHJpbmcoKTsK K30KKwogdm9pZCBJbnB1dFR5cGU6OnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiB7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9JbnB1dFR5cGUuaAppbmRleCBkNzlkYjZmYTIyZDBmOWYzOGMwNGRhZjcyZmQxOThhNWYw YTE5NjU3Li44ZWVhYjFjMmJkNTc5NTg0ZjUwM2MzZmRmYjlkN2YxYzMwNjk4NTU3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSW5wdXRUeXBlLmgKQEAgLTIzNiw2ICsyMzYsMTIgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgYm9vbCBpc1N0ZXBwYWJsZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRSZXNw ZWN0SGVpZ2h0QW5kV2lkdGhBdHRyaWJ1dGVzKCk7CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRz UGxhY2Vob2xkZXIoKSBjb25zdDsKKyAgICAvLyBJZiBzdXBwb3J0c1BsYWNlaG9sZGVyKCkgJiYg ZGVmYXVsdFBsYWNlaG9sZGVyKCkuaXNFbXB0eSgpLCBpdCBtZWFucyBhCisgICAgLy8gdHlwZSBz dXBwb3J0cyB0aGUgJ3BsYWNlaG9sZGVyJyBhdHRyaWJ1dGUuCisgICAgLy8gSWYgc3VwcG9ydHNQ bGFjZWhvbGRlcigpICYmICFkZWZhdWx0UGxhY2Vob2xkZXIoKS5pc0VtcHR5KCksIGl0IG1lYW5z IGEKKyAgICAvLyB0eXBlIGRvZXNuJ3Qgc3VwcG9ydCB0aGUgJ3BsYWNlaG9sZGVyJyBhdHRyaWJ1 dGUsIGJ1dCBzaG93cworICAgIC8vIGRlZmF1bHRQbGFjZWhvbGRlcigpIHN0cmluZyBhcyBhIHBs YWNlaG9sZGVyLgorICAgIHZpcnR1YWwgU3RyaW5nIGRlZmF1bHRQbGFjZWhvbGRlcigpOwogICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVQbGFjZWhvbGRlclRleHQoKTsKICAgICB2aXJ0dWFsIHZvaWQg bXVsdGlwbGVBdHRyaWJ1dGVDaGFuZ2VkKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc2FibGVkQXR0 cmlidXRlQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0Rmll bGRJbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5cGUu Y3BwCmluZGV4IDVlNDk2MmJhMjkxMmIwOGE2MGM1MmQ2YTU3MzRhZTg0OTM5OTg0NzUuLmUxODA1 ZDU2OGYxYWNlYTAzMjU4ZmIyYTU2MDM1ODY2YmNlYTUxOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL1RleHRGaWVsZElucHV0VHlwZS5jcHAKQEAgLTM5Myw3ICszOTMsOSBAQCB2b2lkIFRleHRG aWVsZElucHV0VHlwZTo6dXBkYXRlUGxhY2Vob2xkZXJUZXh0KCkKICAgICBpZiAoIXN1cHBvcnRz UGxhY2Vob2xkZXIoKSkKICAgICAgICAgcmV0dXJuOwogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAw OwotICAgIFN0cmluZyBwbGFjZWhvbGRlclRleHQgPSBlbGVtZW50KCktPnN0cmlwcGVkUGxhY2Vo b2xkZXIoKTsKKyAgICBTdHJpbmcgcGxhY2Vob2xkZXJUZXh0ID0gZGVmYXVsdFBsYWNlaG9sZGVy KCk7CisgICAgaWYgKHBsYWNlaG9sZGVyVGV4dC5pc0VtcHR5KCkpCisgICAgICAgIHBsYWNlaG9s ZGVyVGV4dCA9IGVsZW1lbnQoKS0+c3RyaXBwZWRQbGFjZWhvbGRlcigpOwogICAgIGlmIChwbGFj ZWhvbGRlclRleHQuaXNFbXB0eSgpKSB7CiAgICAgICAgIGlmIChtX3BsYWNlaG9sZGVyKSB7CiAg ICAgICAgICAgICBtX3BsYWNlaG9sZGVyLT5wYXJlbnROb2RlKCktPnJlbW92ZUNoaWxkKG1fcGxh Y2Vob2xkZXIuZ2V0KCksIGVjKTsK 137302 2012-04-16 01:38:27 -0700 2012-04-16 01:39:49 -0700 Patch 2 bug-84009-20120416173825.patch text/plain 6613 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjAyOGJiYWFiNmQ1OGUy MWU0MTk0N2U2MTAyMmVkYzllNWE1ODYzYS4uMjUwNmJiYTYzNTllMjcyOWMxNTgyN2ZmYjdiNjI2 ZWEzNWI5ZWQ0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEyLTA0LTE1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAorICAgICAgICBJbnRyb2R1Y2UgYW4gaW50 ZXJuYWwgZmVhdHVyZSBmb3IgYSBmaXhlZCBwbGFjZWhvbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgZnJhbWV3b3Jr IHRvIHN1cHBvcnQgZml4ZWQgcGxhY2Vob2xkZXIgc3RyaW5nIGZvcgorICAgICAgICB0ZXh0Zmll bGQtbGlrZSA8aW5wdXQ+IHdpdGhvdXQgdGhlIHBhbGNlaG9sZGVyIGF0dHJpYnV0ZSBzdXBwb3J0 LiBUaGlzCisgICAgICAgIGRvZXNuJ3QgY2hhbmdlIGFueSBiZWhhdmlvciBvZiBpbnB1dCB0eXBl cyB3aGljaCBzdXBwb3J0IHRoZQorICAgICAgICAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKwor ICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIHN0YW5kYXJkLCA8aW5wdXQgdHlwZT1kYXRlPiBkb2Vz bid0IHN1cHBvcnQgdGhlCisgICAgICAgICdwbGFjZWhvbGRlcicgYXR0cmlidXRlLiBIb3dldmVy IGl0IGlzIGEga2luZCBvZiB0ZXh0IGZpZWxkIGluIFdlYktpdAorICAgICAgICBwbGF0Zm9ybXMg d2l0aCBFTkFCTEVfQ0FMRU5EQVJfUElDS0VSLCBhbmQgd2UgbWF5IHNob3cgc29tZXRoaW5nIHVz ZWZ1bAorICAgICAgICBpbmZvcm1hdGlvbiBhcyB0aGUgZGVmYXVsdCBwbGFjZWhvbGRlci4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBvZiBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisg ICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oOgorICAgICAgICAoSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQpOiBNYWtlIGlzUGxhY2Vob2xkZXJFbXB0eSgpIHZpcnR1 YWwuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5w dXRFbGVtZW50KTogT3ZlcnJpZGVzIGlzUGxhY2Vob2xkZXJFbXB0eSgpLgorICAgICAgICAqIGh0 bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVt ZW50Ojppc1BsYWNlaG9sZGVyRW1wdHkpOgorICAgICAgICBDaGVjayBJbnB1dFR5cGU6OmRlZmF1 bHRQbGFjZWhvbGRlcigpIGZpcnN0LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6ZGVmYXVsdFBsYWNlaG9sZGVyKTogQWRkZWQuIFJl dHVybiBhIG51bGwgc3RyaW5nLgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAg IChJbnB1dFR5cGUpOiBBZGQgZGVmYXVsdFBsYWNlaG9sZGVyKCkuCisgICAgICAgICogaHRtbC9U ZXh0RmllbGRJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkSW5wdXRU eXBlOjp1cGRhdGVQbGFjZWhvbGRlclRleHQpOgorICAgICAgICBJZiB3ZSBoYXZlIG5vbi1lbXB0 eSBkZWZhdWx0UGxhY2Vob2xkZXIoKSwgdXNlcyBpdC4KKworMjAxMi0wNC0xNSAgS2VudCBUYW11 cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViQ29yZTo6d2Vla0RheVNob3J0 TGFiZWxzKCkgZm9yIElDVSBhbHdheXMgcmV0dXJucyB0aGUgZmFsbGJhY2sgbGFiZWxzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzk5MQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAppbmRleCBmYTNjNThmMmIyMjMyZjZi NDZjN2E5MjVmMzMzMDZlNTFiYmJhYzIyLi45M2Q0MTc0NzE5MzQ2MWM1MDU2YWFkZjJjOWQ4ZGIx MDI3NTZiM2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKQEAg LTE3NTYsNiArMTc1NiwxMSBAQCBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OnN1cHBvcnRzUGxhY2Vo b2xkZXIoKSBjb25zdAogICAgIHJldHVybiBtX2lucHV0VHlwZS0+c3VwcG9ydHNQbGFjZWhvbGRl cigpOwogfQogCitib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzUGxhY2Vob2xkZXJFbXB0eSgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1faW5wdXRUeXBlLT5kZWZhdWx0UGxhY2Vob2xkZXIoKS5pc0Vt cHR5KCkgJiYgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmlzUGxhY2Vob2xkZXJFbXB0eSgp OworfQorCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiB7 CiAgICAgcmV0dXJuIG1faW5wdXRUeXBlLT51cGRhdGVQbGFjZWhvbGRlclRleHQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5kZXggYzIxMDkxNGRmODVlMDU1MDQzZjM3 ZTM3M2E1ZTczZGE1MzM5NjNmOC4uN2QzMDA2NTM5MzEwZTY1MWU1OWQ2OGFkYTIyYTBjZjdlYWEw ZDVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKQEAgLTMxMSw2ICsz MTEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNUZXh0VHlwZSgpIGNvbnN0OwogCiAgICAgdmly dHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wg aXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZVBsYWNlaG9sZGVyVGV4dCgpOwogICAgIHZpcnR1YWwgYm9vbCBpc0VtcHR5VmFsdWUoKSBj b25zdCBPVkVSUklERSB7IHJldHVybiBpbm5lclRleHRWYWx1ZSgpLmlzRW1wdHkoKTsgfQogICAg IHZpcnR1YWwgYm9vbCBpc0VtcHR5U3VnZ2VzdGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiBzdWdn ZXN0ZWRWYWx1ZSgpLmlzRW1wdHkoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudC5oCmluZGV4IDU5Y2Q3NDFkZDY1M2ZiNjA2N2VhNGM0OWUy MjJhMjQ1OTBhM2M3Y2EuLjM5NmJlOGI3NmU4YmJmNTMxZWY4NGU2ZjU5OWFmNTJmMjBjYWVlMDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 LmgKQEAgLTg2LDYgKzg2LDcgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50KiwgSFRNTEZv cm1FbGVtZW50Kik7CisgICAgdmlydHVhbCBib29sIGlzUGxhY2Vob2xkZXJFbXB0eSgpIGNvbnN0 OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVQbGFjZWhvbGRlclRleHQoKSA9IDA7CiAKICAgICB2 aXJ0dWFsIHZvaWQgcGFyc2VBdHRyaWJ1dGUoQXR0cmlidXRlKikgT1ZFUlJJREU7CkBAIC0xMTYs OCArMTE3LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hCbHVyRXZlbnQo UGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSk7CiAgICAgdmlydHVhbCBib29sIGNoaWxk U2hvdWxkQ3JlYXRlUmVuZGVyZXIoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmKSBjb25zdCBP VkVSUklERTsKIAotICAgIGJvb2wgaXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3Q7Ci0KICAgICAv LyBSZXR1cm5zIHRydWUgaWYgdXNlci1lZGl0YWJsZSB2YWx1ZSBpcyBlbXB0eS4gVXNlZCB0byBj aGVjayBwbGFjZWhvbGRlciB2aXNpYmlsaXR5LgogICAgIHZpcnR1YWwgYm9vbCBpc0VtcHR5VmFs dWUoKSBjb25zdCA9IDA7CiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHN1Z2dlc3RlZCB2YWx1ZSBp cyBlbXB0eS4gVXNlZCB0byBjaGVjayBwbGFjZWhvbGRlciB2aXNpYmlsaXR5LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9JbnB1dFR5cGUuY3BwCmluZGV4IDdhOWYxYjE5N2QxMjNmZGUxZmVkZGMyZjkwMGUwMjAzZmJi N2UyNWEuLjcyZjhkNTkxNWU1MGJjMjE3Zjc1ZjUyZjYwNzNlZTJlODJiMDhmMmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0lucHV0VHlwZS5jcHAKQEAgLTcyOCw2ICs3MjgsMTEgQEAgYm9vbCBJbnB1dFR5cGU6 OnN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorU3Ry aW5nIElucHV0VHlwZTo6ZGVmYXVsdFBsYWNlaG9sZGVyKCkKK3sKKyAgICByZXR1cm4gU3RyaW5n KCk7Cit9CisKIHZvaWQgSW5wdXRUeXBlOjp1cGRhdGVQbGFjZWhvbGRlclRleHQoKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSW5wdXRUeXBlLmgKaW5kZXggZDc5ZGI2ZmEyMmQwZjlmMzhjMDRkYWY3MmZkMTk4 YTVmMGExOTY1Ny4uNzNkYjQzMWI2NmFjNDEyNTk0MGZmZjkxM2VmOWE5ZTQzYzgzNjk3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0lucHV0VHlwZS5oCkBAIC0yMzUsNyArMjM1LDEzIEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGJvb2wgaXNDaGVja2FibGUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNTdGVwcGFibGUo KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVzcGVjdEhlaWdodEFuZFdpZHRoQXR0 cmlidXRlcygpOworICAgIC8vIElmIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSAmJiBkZWZhdWx0UGxh Y2Vob2xkZXIoKS5pc0VtcHR5KCksIGl0IG1lYW5zIGEKKyAgICAvLyB0eXBlIHN1cHBvcnRzIHRo ZSAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKyAgICAvLyBJZiBzdXBwb3J0c1BsYWNlaG9sZGVy KCkgJiYgIWRlZmF1bHRQbGFjZWhvbGRlcigpLmlzRW1wdHkoKSwgaXQgbWVhbnMgYQorICAgIC8v IHR5cGUgZG9lc24ndCBzdXBwb3J0IHRoZSAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZSwgYnV0IHNo b3dzCisgICAgLy8gZGVmYXVsdFBsYWNlaG9sZGVyKCkgc3RyaW5nIGFzIGEgcGxhY2Vob2xkZXIu CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdDsKKyAgICB2aXJ0 dWFsIFN0cmluZyBkZWZhdWx0UGxhY2Vob2xkZXIoKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl UGxhY2Vob2xkZXJUZXh0KCk7CiAgICAgdmlydHVhbCB2b2lkIG11bHRpcGxlQXR0cmlidXRlQ2hh bmdlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNhYmxlZEF0dHJpYnV0ZUNoYW5nZWQoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAppbmRleCA1ZTQ5NjJiYTI5 MTJiMDhhNjBjNTJkNmE1NzM0YWU4NDkzOTk4NDc1Li5lMTgwNWQ1NjhmMWFjZWEwMzI1OGZiMmE1 NjAzNTg2NmJjZWE1MThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVs ZElucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5 cGUuY3BwCkBAIC0zOTMsNyArMzkzLDkgQEAgdm9pZCBUZXh0RmllbGRJbnB1dFR5cGU6OnVwZGF0 ZVBsYWNlaG9sZGVyVGV4dCgpCiAgICAgaWYgKCFzdXBwb3J0c1BsYWNlaG9sZGVyKCkpCiAgICAg ICAgIHJldHVybjsKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBTdHJpbmcgcGxhY2Vo b2xkZXJUZXh0ID0gZWxlbWVudCgpLT5zdHJpcHBlZFBsYWNlaG9sZGVyKCk7CisgICAgU3RyaW5n IHBsYWNlaG9sZGVyVGV4dCA9IGRlZmF1bHRQbGFjZWhvbGRlcigpOworICAgIGlmIChwbGFjZWhv bGRlclRleHQuaXNFbXB0eSgpKQorICAgICAgICBwbGFjZWhvbGRlclRleHQgPSBlbGVtZW50KCkt PnN0cmlwcGVkUGxhY2Vob2xkZXIoKTsKICAgICBpZiAocGxhY2Vob2xkZXJUZXh0LmlzRW1wdHko KSkgewogICAgICAgICBpZiAobV9wbGFjZWhvbGRlcikgewogICAgICAgICAgICAgbV9wbGFjZWhv bGRlci0+cGFyZW50Tm9kZSgpLT5yZW1vdmVDaGlsZChtX3BsYWNlaG9sZGVyLmdldCgpLCBlYyk7 Cg== 137303 2012-04-16 01:39:55 -0700 2012-04-17 00:09:42 -0700 Patch 3 bug-84009-20120416173953.patch text/plain 6556 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjAyOGJiYWFiNmQ1OGUy MWU0MTk0N2U2MTAyMmVkYzllNWE1ODYzYS4uZjVkNTFhMjc0ZDIwNjNmMmFmYjY5NDExZDY2NzQ2 M2U2NThhOGUwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTE0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnRyb2R1Y2UgYW4gaW50 ZXJuYWwgZmVhdHVyZSBmb3IgYSBmaXhlZCBwbGFjZWhvbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgZnJhbWV3b3Jr IHRvIHN1cHBvcnQgZml4ZWQgcGxhY2Vob2xkZXIgc3RyaW5nIGZvcgorICAgICAgICB0ZXh0Zmll bGQtbGlrZSA8aW5wdXQ+IHdpdGhvdXQgdGhlIHBhbGNlaG9sZGVyIGF0dHJpYnV0ZSBzdXBwb3J0 LiBUaGlzCisgICAgICAgIGRvZXNuJ3QgY2hhbmdlIGFueSBiZWhhdmlvciBvZiBpbnB1dCB0eXBl cyB3aGljaCBzdXBwb3J0IHRoZQorICAgICAgICAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKwor ICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIHN0YW5kYXJkLCA8aW5wdXQgdHlwZT1kYXRlPiBkb2Vz bid0IHN1cHBvcnQgdGhlCisgICAgICAgICdwbGFjZWhvbGRlcicgYXR0cmlidXRlLiBIb3dldmVy IGl0IGlzIGEga2luZCBvZiB0ZXh0IGZpZWxkIGluIFdlYktpdAorICAgICAgICBwbGF0Zm9ybXMg d2l0aCBFTkFCTEVfQ0FMRU5EQVJfUElDS0VSLCBhbmQgd2UgbWF5IHNob3cgc29tZXRoaW5nIHVz ZWZ1bAorICAgICAgICBpbmZvcm1hdGlvbiBhcyB0aGUgZGVmYXVsdCBwbGFjZWhvbGRlci4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBvZiBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisg ICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oOgorICAgICAgICAoSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQpOiBNYWtlIGlzUGxhY2Vob2xkZXJFbXB0eSgpIHZpcnR1 YWwuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5w dXRFbGVtZW50KTogT3ZlcnJpZGVzIGlzUGxhY2Vob2xkZXJFbXB0eSgpLgorICAgICAgICAqIGh0 bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVt ZW50Ojppc1BsYWNlaG9sZGVyRW1wdHkpOgorICAgICAgICBDaGVjayBJbnB1dFR5cGU6OmRlZmF1 bHRQbGFjZWhvbGRlcigpIGZpcnN0LgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklucHV0VHlwZTo6ZGVmYXVsdFBsYWNlaG9sZGVyKTogQWRkZWQuIFJl dHVybiBhIG51bGwgc3RyaW5nLgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAg IChJbnB1dFR5cGUpOiBBZGQgZGVmYXVsdFBsYWNlaG9sZGVyKCkuCisgICAgICAgICogaHRtbC9U ZXh0RmllbGRJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkSW5wdXRU eXBlOjp1cGRhdGVQbGFjZWhvbGRlclRleHQpOgorICAgICAgICBJZiB3ZSBoYXZlIG5vbi1lbXB0 eSBkZWZhdWx0UGxhY2Vob2xkZXIoKSwgdXNlcyBpdC4KKwogMjAxMi0wNC0xNSAgS2VudCBUYW11 cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViQ29yZTo6d2Vla0RheVNob3J0 TGFiZWxzKCkgZm9yIElDVSBhbHdheXMgcmV0dXJucyB0aGUgZmFsbGJhY2sgbGFiZWxzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAppbmRleCBmYTNjNThmMmIyMjMyZjZi NDZjN2E5MjVmMzMzMDZlNTFiYmJhYzIyLi45M2Q0MTc0NzE5MzQ2MWM1MDU2YWFkZjJjOWQ4ZGIx MDI3NTZiM2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKQEAg LTE3NTYsNiArMTc1NiwxMSBAQCBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OnN1cHBvcnRzUGxhY2Vo b2xkZXIoKSBjb25zdAogICAgIHJldHVybiBtX2lucHV0VHlwZS0+c3VwcG9ydHNQbGFjZWhvbGRl cigpOwogfQogCitib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzUGxhY2Vob2xkZXJFbXB0eSgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1faW5wdXRUeXBlLT5kZWZhdWx0UGxhY2Vob2xkZXIoKS5pc0Vt cHR5KCkgJiYgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmlzUGxhY2Vob2xkZXJFbXB0eSgp OworfQorCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiB7 CiAgICAgcmV0dXJuIG1faW5wdXRUeXBlLT51cGRhdGVQbGFjZWhvbGRlclRleHQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5kZXggYzIxMDkxNGRmODVlMDU1MDQzZjM3 ZTM3M2E1ZTczZGE1MzM5NjNmOC4uN2QzMDA2NTM5MzEwZTY1MWU1OWQ2OGFkYTIyYTBjZjdlYWEw ZDVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKQEAgLTMxMSw2ICsz MTEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNUZXh0VHlwZSgpIGNvbnN0OwogCiAgICAgdmly dHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wg aXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZVBsYWNlaG9sZGVyVGV4dCgpOwogICAgIHZpcnR1YWwgYm9vbCBpc0VtcHR5VmFsdWUoKSBj b25zdCBPVkVSUklERSB7IHJldHVybiBpbm5lclRleHRWYWx1ZSgpLmlzRW1wdHkoKTsgfQogICAg IHZpcnR1YWwgYm9vbCBpc0VtcHR5U3VnZ2VzdGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiBzdWdn ZXN0ZWRWYWx1ZSgpLmlzRW1wdHkoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudC5oCmluZGV4IDU5Y2Q3NDFkZDY1M2ZiNjA2N2VhNGM0OWUy MjJhMjQ1OTBhM2M3Y2EuLjM5NmJlOGI3NmU4YmJmNTMxZWY4NGU2ZjU5OWFmNTJmMjBjYWVlMDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 LmgKQEAgLTg2LDYgKzg2LDcgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50KiwgSFRNTEZv cm1FbGVtZW50Kik7CisgICAgdmlydHVhbCBib29sIGlzUGxhY2Vob2xkZXJFbXB0eSgpIGNvbnN0 OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVQbGFjZWhvbGRlclRleHQoKSA9IDA7CiAKICAgICB2 aXJ0dWFsIHZvaWQgcGFyc2VBdHRyaWJ1dGUoQXR0cmlidXRlKikgT1ZFUlJJREU7CkBAIC0xMTYs OCArMTE3LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hCbHVyRXZlbnQo UGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSk7CiAgICAgdmlydHVhbCBib29sIGNoaWxk U2hvdWxkQ3JlYXRlUmVuZGVyZXIoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmKSBjb25zdCBP VkVSUklERTsKIAotICAgIGJvb2wgaXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3Q7Ci0KICAgICAv LyBSZXR1cm5zIHRydWUgaWYgdXNlci1lZGl0YWJsZSB2YWx1ZSBpcyBlbXB0eS4gVXNlZCB0byBj aGVjayBwbGFjZWhvbGRlciB2aXNpYmlsaXR5LgogICAgIHZpcnR1YWwgYm9vbCBpc0VtcHR5VmFs dWUoKSBjb25zdCA9IDA7CiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHN1Z2dlc3RlZCB2YWx1ZSBp cyBlbXB0eS4gVXNlZCB0byBjaGVjayBwbGFjZWhvbGRlciB2aXNpYmlsaXR5LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9JbnB1dFR5cGUuY3BwCmluZGV4IDdhOWYxYjE5N2QxMjNmZGUxZmVkZGMyZjkwMGUwMjAzZmJi N2UyNWEuLjcyZjhkNTkxNWU1MGJjMjE3Zjc1ZjUyZjYwNzNlZTJlODJiMDhmMmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0lucHV0VHlwZS5jcHAKQEAgLTcyOCw2ICs3MjgsMTEgQEAgYm9vbCBJbnB1dFR5cGU6 OnN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorU3Ry aW5nIElucHV0VHlwZTo6ZGVmYXVsdFBsYWNlaG9sZGVyKCkKK3sKKyAgICByZXR1cm4gU3RyaW5n KCk7Cit9CisKIHZvaWQgSW5wdXRUeXBlOjp1cGRhdGVQbGFjZWhvbGRlclRleHQoKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSW5wdXRUeXBlLmgKaW5kZXggZDc5ZGI2ZmEyMmQwZjlmMzhjMDRkYWY3MmZkMTk4 YTVmMGExOTY1Ny4uNzNkYjQzMWI2NmFjNDEyNTk0MGZmZjkxM2VmOWE5ZTQzYzgzNjk3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0lucHV0VHlwZS5oCkBAIC0yMzUsNyArMjM1LDEzIEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGJvb2wgaXNDaGVja2FibGUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNTdGVwcGFibGUo KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVzcGVjdEhlaWdodEFuZFdpZHRoQXR0 cmlidXRlcygpOworICAgIC8vIElmIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSAmJiBkZWZhdWx0UGxh Y2Vob2xkZXIoKS5pc0VtcHR5KCksIGl0IG1lYW5zIGEKKyAgICAvLyB0eXBlIHN1cHBvcnRzIHRo ZSAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKyAgICAvLyBJZiBzdXBwb3J0c1BsYWNlaG9sZGVy KCkgJiYgIWRlZmF1bHRQbGFjZWhvbGRlcigpLmlzRW1wdHkoKSwgaXQgbWVhbnMgYQorICAgIC8v IHR5cGUgZG9lc24ndCBzdXBwb3J0IHRoZSAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZSwgYnV0IHNo b3dzCisgICAgLy8gZGVmYXVsdFBsYWNlaG9sZGVyKCkgc3RyaW5nIGFzIGEgcGxhY2Vob2xkZXIu CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdDsKKyAgICB2aXJ0 dWFsIFN0cmluZyBkZWZhdWx0UGxhY2Vob2xkZXIoKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl UGxhY2Vob2xkZXJUZXh0KCk7CiAgICAgdmlydHVhbCB2b2lkIG11bHRpcGxlQXR0cmlidXRlQ2hh bmdlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNhYmxlZEF0dHJpYnV0ZUNoYW5nZWQoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAppbmRleCA1ZTQ5NjJiYTI5 MTJiMDhhNjBjNTJkNmE1NzM0YWU4NDkzOTk4NDc1Li5lMTgwNWQ1NjhmMWFjZWEwMzI1OGZiMmE1 NjAzNTg2NmJjZWE1MThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVs ZElucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJbnB1dFR5 cGUuY3BwCkBAIC0zOTMsNyArMzkzLDkgQEAgdm9pZCBUZXh0RmllbGRJbnB1dFR5cGU6OnVwZGF0 ZVBsYWNlaG9sZGVyVGV4dCgpCiAgICAgaWYgKCFzdXBwb3J0c1BsYWNlaG9sZGVyKCkpCiAgICAg ICAgIHJldHVybjsKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBTdHJpbmcgcGxhY2Vo b2xkZXJUZXh0ID0gZWxlbWVudCgpLT5zdHJpcHBlZFBsYWNlaG9sZGVyKCk7CisgICAgU3RyaW5n IHBsYWNlaG9sZGVyVGV4dCA9IGRlZmF1bHRQbGFjZWhvbGRlcigpOworICAgIGlmIChwbGFjZWhv bGRlclRleHQuaXNFbXB0eSgpKQorICAgICAgICBwbGFjZWhvbGRlclRleHQgPSBlbGVtZW50KCkt PnN0cmlwcGVkUGxhY2Vob2xkZXIoKTsKICAgICBpZiAocGxhY2Vob2xkZXJUZXh0LmlzRW1wdHko KSkgewogICAgICAgICBpZiAobV9wbGFjZWhvbGRlcikgewogICAgICAgICAgICAgbV9wbGFjZWhv bGRlci0+cGFyZW50Tm9kZSgpLT5yZW1vdmVDaGlsZChtX3BsYWNlaG9sZGVyLmdldCgpLCBlYyk7 Cg== 137486 2012-04-17 00:09:47 -0700 2012-04-17 01:36:57 -0700 Patch 4 bug-84009-20120417160946.patch text/plain 6811 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTViNGEzNzQyYmQ0MTRh YmNmZDQwMjQ1ODQ3MzZhMzJhZTA3NjhiMC4uMTYzYTdlNGEyNjBmMDU3OGJlMTc1ZWQ5ODdlY2Vj MTJhM2M3NGY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA0LTE3ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnRyb2R1Y2UgYW4gaW50 ZXJuYWwgZmVhdHVyZSBmb3IgYSBmaXhlZCBwbGFjZWhvbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgZnJhbWV3b3Jr IHRvIHN1cHBvcnQgZml4ZWQgcGxhY2Vob2xkZXIgc3RyaW5nIGZvcgorICAgICAgICB0ZXh0Zmll bGQtbGlrZSA8aW5wdXQ+IHdpdGhvdXQgdGhlIHBhbGNlaG9sZGVyIGF0dHJpYnV0ZSBzdXBwb3J0 LiBUaGlzCisgICAgICAgIGRvZXNuJ3QgY2hhbmdlIGFueSBiZWhhdmlvciBvZiBpbnB1dCB0eXBl cyB3aGljaCBzdXBwb3J0IHRoZQorICAgICAgICAncGxhY2Vob2xkZXInIGF0dHJpYnV0ZS4KKwor ICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIHN0YW5kYXJkLCA8aW5wdXQgdHlwZT1kYXRlPiBkb2Vz bid0IHN1cHBvcnQgdGhlCisgICAgICAgICdwbGFjZWhvbGRlcicgYXR0cmlidXRlLiBIb3dldmVy IGl0IGlzIGEga2luZCBvZiB0ZXh0IGZpZWxkIGluIFdlYktpdAorICAgICAgICBwbGF0Zm9ybXMg d2l0aCBFTkFCTEVfQ0FMRU5EQVJfUElDS0VSLCBhbmQgd2UgbWF5IHNob3cgc29tZXRoaW5nIHVz ZWZ1bAorICAgICAgICBpbmZvcm1hdGlvbiBhcyB0aGUgZGVmYXVsdCBwbGFjZWhvbGRlci4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBvZiBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisg ICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oOgorICAgICAgICAoSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQpOiBNYWtlIGlzUGxhY2Vob2xkZXJFbXB0eSgpIHZpcnR1 YWwuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5w dXRFbGVtZW50KTogT3ZlcnJpZGVzIGlzUGxhY2Vob2xkZXJFbXB0eSgpLgorICAgICAgICAqIGh0 bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVt ZW50Ojppc1BsYWNlaG9sZGVyRW1wdHkpOgorICAgICAgICBDaGVjayBJbnB1dFR5cGU6OmRlZmF1 bHRQbGFjZWhvbGRlcigpIGlmIElucHV0VHlwZTo6dXNlc0ZpeGVkUGxhY2Vob2xkZXIoKS4KKyAg ICAgICAgKiBodG1sL0lucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnB1dFR5cGU6 OnVzZXNGaXhlZFBsYWNlaG9sZGVyKTogQWRkZWQuIFJldHVybnMgZmFsc2UuCisgICAgICAgIChX ZWJDb3JlOjpJbnB1dFR5cGU6OmZpeGVkUGxhY2Vob2xkZXIpOiBBZGRlZC4gUmV0dXJucyBhIG51 bGwgc3RyaW5nLgorICAgICAgICAqIGh0bWwvSW5wdXRUeXBlLmg6CisgICAgICAgIChJbnB1dFR5 cGUpOiBBZGQgdXNlc0ZpeGVkUGxhY2Vob2xkZXIoKSBhbmQgZml4ZWRQbGFjZWhvbGRlcigpLgor ICAgICAgICAqIGh0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlRleHRGaWVsZElucHV0VHlwZTo6dXBkYXRlUGxhY2Vob2xkZXJUZXh0KToKKyAgICAgICAgVXNl cyBmaXhlZFBsYWNlaG9sZGVyKCkgaW5zdGVhZCBvZiBzdHJpcHBlZFBsYWNlaG9sZGVyKCkgaWYg dXNlc0ZpeGVkUGxhY2Vob2xkZXIoKS4KKwogMjAxMi0wNC0xNiAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1ha2Ug ZGlzdGNoZWNrIGlzc3Vlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElu cHV0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3Bw CmluZGV4IDA5YzUyYWQzM2VlNTY5YzdhNzNlYjUxYmZmNGMzMzNhZWM4NDcyY2UuLjA1MTk4ZDEw NmViNGViOTY0NWY5ZjllMmE4YjEwYjA0Zjk4ZjhiZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MSW5wdXRFbGVtZW50LmNwcApAQCAtMTc1OSw2ICsxNzU5LDEzIEBAIGJvb2wgSFRNTElucHV0 RWxlbWVudDo6c3VwcG9ydHNQbGFjZWhvbGRlcigpIGNvbnN0CiAgICAgcmV0dXJuIG1faW5wdXRU eXBlLT5zdXBwb3J0c1BsYWNlaG9sZGVyKCk7CiB9CiAKK2Jvb2wgSFRNTElucHV0RWxlbWVudDo6 aXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3QKK3sKKyAgICBpZiAobV9pbnB1dFR5cGUtPnVzZXNG aXhlZFBsYWNlaG9sZGVyKCkpCisgICAgICAgIHJldHVybiBtX2lucHV0VHlwZS0+Zml4ZWRQbGFj ZWhvbGRlcigpLmlzRW1wdHkoKTsKKyAgICByZXR1cm4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQ6OmlzUGxhY2Vob2xkZXJFbXB0eSgpOworfQorCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnVw ZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiB7CiAgICAgcmV0dXJuIG1faW5wdXRUeXBlLT51cGRhdGVQ bGFjZWhvbGRlclRleHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElu cHV0RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKaW5k ZXggMTcwZjk3M2I5NzVkZmU3NGM3YzYyMThkODYwMWNhNWVkYzczOTNkNi4uOTkxYTM4MDU0YmRh NGJiMGYwZDMyYjI1ZTI0M2VlMmRhYjQ5OWQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmgKQEAgLTMxMSw2ICszMTEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNUZXh0 VHlwZSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBj b25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNQbGFjZWhvbGRlckVtcHR5KCkgY29uc3QgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpOwogICAgIHZpcnR1 YWwgYm9vbCBpc0VtcHR5VmFsdWUoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBpbm5lclRleHRW YWx1ZSgpLmlzRW1wdHkoKTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0VtcHR5U3VnZ2VzdGVkVmFs dWUoKSBjb25zdCB7IHJldHVybiBzdWdnZXN0ZWRWYWx1ZSgpLmlzRW1wdHkoKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oCmluZGV4IGMy ODMwNTVmYTQ0YzUyNmFiYmUzZTU5YmNiMWQxNWRmMDk1MmYxNTEuLmJhZDgwN2ZkNmRmNzA1ZTQ1 MjhkMDdlMmZmODc4MTUxNDQ2NjQyZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgKQEAgLTg3LDYgKzg3LDcgQEAgcHVibGljOgogCiBw cm90ZWN0ZWQ6CiAgICAgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQoY29uc3QgUXVhbGlmaWVk TmFtZSYsIERvY3VtZW50KiwgSFRNTEZvcm1FbGVtZW50Kik7CisgICAgdmlydHVhbCBib29sIGlz UGxhY2Vob2xkZXJFbXB0eSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVQbGFjZWhv bGRlclRleHQoKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFyc2VBdHRyaWJ1dGUoQXR0cmli dXRlKikgT1ZFUlJJREU7CkBAIC0xMTcsOCArMTE4LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2hCbHVyRXZlbnQoUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSk7 CiAgICAgdmlydHVhbCBib29sIGNoaWxkU2hvdWxkQ3JlYXRlUmVuZGVyZXIoY29uc3QgTm9kZVJl bmRlcmluZ0NvbnRleHQmKSBjb25zdCBPVkVSUklERTsKIAotICAgIGJvb2wgaXNQbGFjZWhvbGRl ckVtcHR5KCkgY29uc3Q7Ci0KICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdXNlci1lZGl0YWJsZSB2 YWx1ZSBpcyBlbXB0eS4gVXNlZCB0byBjaGVjayBwbGFjZWhvbGRlciB2aXNpYmlsaXR5LgogICAg IHZpcnR1YWwgYm9vbCBpc0VtcHR5VmFsdWUoKSBjb25zdCA9IDA7CiAgICAgLy8gUmV0dXJucyB0 cnVlIGlmIHN1Z2dlc3RlZCB2YWx1ZSBpcyBlbXB0eS4gVXNlZCB0byBjaGVjayBwbGFjZWhvbGRl ciB2aXNpYmlsaXR5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCmluZGV4IDdhOWYxYjE5N2Qx MjNmZGUxZmVkZGMyZjkwMGUwMjAzZmJiN2UyNWEuLjlhM2RhNGRlZWFjOGY3NmQzMmNmNWNiZjUw MGNmNGZiZjQ4YjU5Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5jcHAKQEAgLTcyOCw2ICs3 MjgsMTYgQEAgYm9vbCBJbnB1dFR5cGU6OnN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdAogICAg IHJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBJbnB1dFR5cGU6OnVzZXNGaXhlZFBsYWNlaG9sZGVy KCkgY29uc3QKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK1N0cmluZyBJbnB1dFR5cGU6OmZp eGVkUGxhY2Vob2xkZXIoKQoreworICAgIHJldHVybiBTdHJpbmcoKTsKK30KKwogdm9pZCBJbnB1 dFR5cGU6OnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0lucHV0VHlwZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUu aAppbmRleCBkNzlkYjZmYTIyZDBmOWYzOGMwNGRhZjcyZmQxOThhNWYwYTE5NjU3Li43MzE2ZmZk MTlmZDJlNDEzM2ZkNDI1N2YwMjIzYWQyNzIxMmI5ZGQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0lucHV0VHlwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBl LmgKQEAgLTIzNSw3ICsyMzUsMTQgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc0NoZWNr YWJsZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1N0ZXBwYWJsZSgpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBzaG91bGRSZXNwZWN0SGVpZ2h0QW5kV2lkdGhBdHRyaWJ1dGVzKCk7CisgICAgLy8g SWYgc3VwcG9ydHNQbGFjZWhvbGRlcigpICYmICF1c2VzRml4ZWRQbGFjZWhvbGRlcigpLCBpdCBt ZWFucyBhIHR5cGUKKyAgICAvLyBzdXBwb3J0cyB0aGUgJ3BsYWNlaG9sZGVyJyBhdHRyaWJ1dGUu CisgICAgLy8gSWYgc3VwcG9ydHNQbGFjZWhvbGRlcigpICYmIHVzZXNGaXhlZFBsYWNlaG9sZGVy KCksIGl0IG1lYW5zIGEgdHlwZQorICAgIC8vIGRvZXNuJ3Qgc3VwcG9ydCB0aGUgJ3BsYWNlaG9s ZGVyJyBhdHRyaWJ1dGUsIGJ1dCBzaG93cworICAgIC8vIGZpeGVkUGxhY2Vob2xkZXIoKSBzdHJp bmcgYXMgYSBwbGFjZWhvbGRlci4KICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNQbGFjZWhvbGRl cigpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCB1c2VzRml4ZWRQbGFjZWhvbGRlcigpIGNvbnN0 OworICAgIHZpcnR1YWwgU3RyaW5nIGZpeGVkUGxhY2Vob2xkZXIoKTsKICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlUGxhY2Vob2xkZXJUZXh0KCk7CiAgICAgdmlydHVhbCB2b2lkIG11bHRpcGxlQXR0 cmlidXRlQ2hhbmdlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNhYmxlZEF0dHJpYnV0ZUNoYW5n ZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAppbmRleCA1 ZTQ5NjJiYTI5MTJiMDhhNjBjNTJkNmE1NzM0YWU4NDkzOTk4NDc1Li5mNGZjMTRlODI3Mjc3MjMy NmQwZTM0OGFiYWVjNmFmYTkwNTUzZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L1RleHRGaWVsZElucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0Rmll bGRJbnB1dFR5cGUuY3BwCkBAIC0zOTMsNyArMzkzLDcgQEAgdm9pZCBUZXh0RmllbGRJbnB1dFR5 cGU6OnVwZGF0ZVBsYWNlaG9sZGVyVGV4dCgpCiAgICAgaWYgKCFzdXBwb3J0c1BsYWNlaG9sZGVy KCkpCiAgICAgICAgIHJldHVybjsKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBTdHJp bmcgcGxhY2Vob2xkZXJUZXh0ID0gZWxlbWVudCgpLT5zdHJpcHBlZFBsYWNlaG9sZGVyKCk7Cisg ICAgU3RyaW5nIHBsYWNlaG9sZGVyVGV4dCA9IHVzZXNGaXhlZFBsYWNlaG9sZGVyKCkgPyBmaXhl ZFBsYWNlaG9sZGVyKCkgOiBlbGVtZW50KCktPnN0cmlwcGVkUGxhY2Vob2xkZXIoKTsKICAgICBp ZiAocGxhY2Vob2xkZXJUZXh0LmlzRW1wdHkoKSkgewogICAgICAgICBpZiAobV9wbGFjZWhvbGRl cikgewogICAgICAgICAgICAgbV9wbGFjZWhvbGRlci0+cGFyZW50Tm9kZSgpLT5yZW1vdmVDaGls ZChtX3BsYWNlaG9sZGVyLmdldCgpLCBlYyk7Cg==