50453 2010-12-03 04:47:07 -0800 [Qt] QtWebKit does not seem to follow -webkit-slider-thumb 2011-08-24 03:51:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P3 Minor --- 66732 1 benjamin benjamin tanya.meshkova tonikitoo webkit.review.bot oldest_to_newest 316785 0 benjamin 2010-12-03 04:47:07 -0800 WebKit selectors include "-webkit-slider-thumb". This does not seem to do anything on QtWebKit. 453536 1 104433 tanya.meshkova 2011-08-18 18:30:08 -0700 Created attachment 104433 Patch 453719 2 104433 benjamin 2011-08-19 02:43:59 -0700 Comment on attachment 104433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104433&action=review > Source/WebCore/ChangeLog:8 > + Get rid of upcasting, that prevents related crashes. > + Allow to display SliderTrack and SliderThumb without <input type=range>. The changelog should explain the changes, it is not just a quick summary of what you have done. When the patch is trivial it is ok to have a simple changelog, but in general you need a good explanation. What is the crash you are fixing? Why haven't you included a layout test for it? 455134 3 tanya.meshkova 2011-08-22 18:13:02 -0700 (In reply to comment #2) I've filed RenderThemeQt::adjustSliderThumbSize changes separately, bug 66732 > What is the crash you are fixing? Why haven't you included a layout test for it? The test case is: <html><body><p style="-webkit-appearance: slider-vertical; height: 15px"></p></body></html> Making layout test 455309 4 104433 benjamin 2011-08-23 04:28:41 -0700 Comment on attachment 104433 Patch > Making layout test -> Clearing review flag in the meantime. 455685 5 104909 tanya.meshkova 2011-08-23 13:55:52 -0700 Created attachment 104909 Patch 455709 6 104909 kenneth 2011-08-23 14:23:10 -0700 Comment on attachment 104909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104909&action=review > LayoutTests/ChangeLog:7 > + Reviewed by NOBODY (OOPS!). > + A short desccription would be nice > Source/WebCore/ChangeLog:11 > + Get rid of upcasting. Allow to display SliderTrack and SliderThumb > + without <input type=range>. > + > + Reviewed by NOBODY (OOPS!). > + I think it is more common to have the Reviewed by right after the bugzilla links. > Source/WebCore/platform/qt/RenderThemeQt.cpp:-922 > - RenderSlider* renderSlider = toRenderSlider(o); > - HTMLInputElement* input = renderSlider->node()->toInputElement(); > - IntRect thumbRect = sliderThumbElementOf(input)->getRect(); > - You seem to remove a lot of code without the ChangeLog telling why that was possible > Source/WebCore/platform/qt/RenderThemeQt.cpp:953 > + option.orientation = Qt::Vertical; So it is initialized to Horizontal by default? Maybe add a comment or just add the else clause 455800 7 tanya.meshkova 2011-08-23 16:22:57 -0700 (In reply to comment #6) > > Source/WebCore/platform/qt/RenderThemeQt.cpp:953 > > + option.orientation = Qt::Vertical; > > So it is initialized to Horizontal by default? Maybe add a comment or just add the else clause yep, http://doc.qt.nokia.com/qstyleoptionslider.html#orientation-var Same code already used in RenderThemeQt twice with no comments. I don't think it's necessary to comment it now. I'll fix the rest. 455806 8 104927 tanya.meshkova 2011-08-23 16:31:39 -0700 Created attachment 104927 Patch 456045 9 104927 webkit.review.bot 2011-08-24 03:51:36 -0700 Comment on attachment 104927 Patch Clearing flags on attachment: 104927 Committed r93702: <http://trac.webkit.org/changeset/93702> 456046 10 webkit.review.bot 2011-08-24 03:51:40 -0700 All reviewed patches have been landed. Closing bug. 104433 2011-08-18 18:30:08 -0700 2011-08-23 13:55:41 -0700 Patch bug-50453-20110818182643.patch text/plain 4651 tanya.meshkova U3VidmVyc2lvbiBSZXZpc2lvbjogOTMzMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmOWYxNTI3MWE1YTZiMzI5 YTE2OThkMGYwNWI5OTQ4ODU3NmE4ZTc0Li44Y2ZhYzg0NmQ0YmQ3ZWE5ZDI4NzQ2M2I3YzI5M2Yz MzNhYzkyZDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMTggIFRhdGlh bmEgTWVzaGtvdmEgIDx0YW55YS5tZXNoa292YUBnbWFpbC5jb20+CisKKyAgICAgICAgUGFpbnQg U2xpZGVyVHJhY2sgYW5kIFNsaWRlclRodW1iIGluZGVwZW5kZW50bHkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDQ1MworICAgICAgICBBbHNvIGZp eGVzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTQ1NiBjcmFzaC4K KworICAgICAgICBHZXQgcmlkIG9mIHVwY2FzdGluZywgdGhhdCBwcmV2ZW50cyByZWxhdGVkIGNy YXNoZXMuCisgICAgICAgIEFsbG93IHRvIGRpc3BsYXkgU2xpZGVyVHJhY2sgYW5kIFNsaWRlclRo dW1iIHdpdGhvdXQgPGlucHV0IHR5cGU9cmFuZ2U+LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVF0OjpwYWludFNsaWRlclRyYWNrKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OnBhaW50U2xpZGVyVGh1bWIpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRdDo6YWRqdXN0U2xpZGVyVGh1bWJTaXplKToKKwogMjAx MS0wOC0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCBjbGFuZyBsaWJjKysgQysrMHggYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v cXQvUmVuZGVyVGhlbWVRdC5jcHAKaW5kZXggZGE1ZjFkMjVhMzQwZDk4NTVmYTFmY2U0MTFlYzlm ZmE1YTA0YTIyMi4uMWI4ZTY1YTUxMDhhNGVjNDMyYWUyMzFiZWQyY2EyMDZhMmFjY2FjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKQEAgLTkxMyw0 MyArOTEzLDIzIEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJP YmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGksCiAKICAgICBRU3R5bGVPcHRpb25TbGlkZXIg b3B0aW9uOwogICAgIGluaXRTdHlsZU9wdGlvbihwLndpZGdldCwgb3B0aW9uKTsKLSAgICBvcHRp b24uc3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRlckdyb292ZSB8IFFTdHlsZTo6U0NfU2xp ZGVySGFuZGxlOworICAgIG9wdGlvbi5zdWJDb250cm9scyA9IFFTdHlsZTo6U0NfU2xpZGVyR3Jv b3ZlOwogICAgIENvbnRyb2xQYXJ0IGFwcGVhcmFuY2UgPSBpbml0aWFsaXplQ29tbW9uUVN0eWxl T3B0aW9ucyhvcHRpb24sIG8pOwogCi0gICAgUmVuZGVyU2xpZGVyKiByZW5kZXJTbGlkZXIgPSB0 b1JlbmRlclNsaWRlcihvKTsKLSAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IHJlbmRlclNs aWRlci0+bm9kZSgpLT50b0lucHV0RWxlbWVudCgpOwotICAgIEludFJlY3QgdGh1bWJSZWN0ID0g c2xpZGVyVGh1bWJFbGVtZW50T2YoaW5wdXQpLT5nZXRSZWN0KCk7Ci0KICAgICBvcHRpb24ucmVj dCA9IHI7CiAKLSAgICBpbnQgdmFsdWU7Ci0gICAgaWYgKGFwcGVhcmFuY2UgPT0gU2xpZGVyVmVy dGljYWxQYXJ0KSB7Ci0gICAgICAgIG9wdGlvbi5tYXhpbXVtID0gci5oZWlnaHQoKSAtIHRodW1i UmVjdC5oZWlnaHQoKTsKLSAgICAgICAgdmFsdWUgPSB0aHVtYlJlY3QueSgpIC0gci55KCk7Ci0g ICAgfSBlbHNlIHsKLSAgICAgICAgb3B0aW9uLm1heGltdW0gPSByLndpZHRoKCkgLSB0aHVtYlJl Y3Qud2lkdGgoKTsKLSAgICAgICAgdmFsdWUgPSB0aHVtYlJlY3QueCgpIC0gci54KCk7Ci0gICAg fQotCi0gICAgdmFsdWUgPSBRU3R5bGU6OnNsaWRlclZhbHVlRnJvbVBvc2l0aW9uKDAsIG9wdGlv bi5tYXhpbXVtLCB2YWx1ZSwgb3B0aW9uLm1heGltdW0pOwotCi0gICAgb3B0aW9uLnNsaWRlclZh bHVlID0gdmFsdWU7Ci0gICAgb3B0aW9uLnNsaWRlclBvc2l0aW9uID0gdmFsdWU7CiAgICAgaWYg KGFwcGVhcmFuY2UgPT0gU2xpZGVyVmVydGljYWxQYXJ0KQogICAgICAgICBvcHRpb24ub3JpZW50 YXRpb24gPSBRdDo6VmVydGljYWw7CiAKLSAgICBpZiAocmVuZGVyU2xpZGVyLT5pbkRyYWdNb2Rl KCkpIHsKLSAgICAgICAgb3B0aW9uLmFjdGl2ZVN1YkNvbnRyb2xzID0gUVN0eWxlOjpTQ19TbGlk ZXJIYW5kbGU7CisgICAgaWYgKGlzUHJlc3NlZChvKSkKICAgICAgICAgb3B0aW9uLnN0YXRlIHw9 IFFTdHlsZTo6U3RhdGVfU3Vua2VuOwotICAgIH0KLQotICAgIGNvbnN0IFFQb2ludCB0b3BMZWZ0 ID0gci5sb2NhdGlvbigpOwotICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKHRvcExlZnQpOwotICAg IG9wdGlvbi5yZWN0Lm1vdmVUbyhRUG9pbnQoMCwgMCkpOwotICAgIG9wdGlvbi5yZWN0LnNldFNp emUoci5zaXplKCkpOwogCiAgICAgcC5kcmF3Q29tcGxleENvbnRyb2woUVN0eWxlOjpDQ19TbGlk ZXIsIG9wdGlvbik7Ci0gICAgcC5wYWludGVyLT50cmFuc2xhdGUoLXRvcExlZnQpOworICAgIGlm IChvcHRpb24uc3RhdGUgJiBRU3R5bGU6OlN0YXRlX0hhc0ZvY3VzKSB7CisgICAgICAgIFFTdHls ZU9wdGlvbkZvY3VzUmVjdCBmb2N1c09wdGlvbjsKKyAgICAgICAgZm9jdXNPcHRpb24ucmVjdCA9 IHI7CisgICAgICAgIHAuZHJhd1ByaW1pdGl2ZShRU3R5bGU6OlBFX0ZyYW1lRm9jdXNSZWN0LCBm b2N1c09wdGlvbik7CisgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtOTYyLDcgKzk0 MiwyNiBAQCB2b2lkIFJlbmRlclRoZW1lUXQ6OmFkanVzdFNsaWRlclRyYWNrU3R5bGUoQ1NTU3R5 bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiBzdHlsZQogYm9vbCBSZW5kZXJUaGVtZVF0OjpwYWlu dFNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBwaSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiByKQogewotICAg IC8vIFdlJ3ZlIGFscmVhZHkgcGFpbnRlZCBpdCBpbiBwYWludFNsaWRlclRyYWNrKCksIG5vIG5l ZWQgdG8gZG8gYW55dGhpbmcgaGVyZS4KKyAgICBTdHlsZVBhaW50ZXIgcCh0aGlzLCBwaSk7Cisg ICAgaWYgKCFwLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBRU3R5bGVP cHRpb25TbGlkZXIgb3B0aW9uOworICAgIGluaXRTdHlsZU9wdGlvbihwLndpZGdldCwgb3B0aW9u KTsKKyAgICBvcHRpb24uc3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRlckhhbmRsZTsKKyAg ICBDb250cm9sUGFydCBhcHBlYXJhbmNlID0gaW5pdGlhbGl6ZUNvbW1vblFTdHlsZU9wdGlvbnMo b3B0aW9uLCBvKTsKKyAgICBvcHRpb24ucmVjdCA9IHI7CisKKyAgICBpZiAoYXBwZWFyYW5jZSA9 PSBTbGlkZXJUaHVtYlZlcnRpY2FsUGFydCkKKyAgICAgICAgb3B0aW9uLm9yaWVudGF0aW9uID0g UXQ6OlZlcnRpY2FsOworCisgICAgaWYgKGlzUHJlc3NlZChvKSkgeworICAgICAgICBvcHRpb24u YWN0aXZlU3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRlckhhbmRsZTsKKyAgICAgICAgb3B0 aW9uLnN0YXRlIHw9IFFTdHlsZTo6U3RhdGVfU3Vua2VuOworICAgIH0KKworICAgIHAuZHJhd0Nv bXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2xpZGVyLCBvcHRpb24pOworCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCkBAIC0xNDkzLDggKzE0OTIsMTMgQEAgdm9pZCBSZW5kZXJUaGVtZVF0OjphZGp1 c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdAogCiAgICAgICAgIGlu dCB3aWR0aCA9IHFzdHlsZS0+cGl4ZWxNZXRyaWMoUVN0eWxlOjpQTV9TbGlkZXJMZW5ndGgsICZv cHRpb24pOwogICAgICAgICBpbnQgaGVpZ2h0ID0gcXN0eWxlLT5waXhlbE1ldHJpYyhRU3R5bGU6 OlBNX1NsaWRlclRoaWNrbmVzcywgJm9wdGlvbik7Ci0gICAgICAgIHN0eWxlLT5zZXRXaWR0aChM ZW5ndGgod2lkdGgsIEZpeGVkKSk7Ci0gICAgICAgIHN0eWxlLT5zZXRIZWlnaHQoTGVuZ3RoKGhl aWdodCwgRml4ZWQpKTsKKyAgICAgICAgaWYgKG9wdGlvbi5vcmllbnRhdGlvbiA9PSBRdDo6VmVy dGljYWwpIHsKKyAgICAgICAgICAgIHN0eWxlLT5zZXRXaWR0aChMZW5ndGgoaGVpZ2h0LCBGaXhl ZCkpOworICAgICAgICAgICAgc3R5bGUtPnNldEhlaWdodChMZW5ndGgod2lkdGgsIEZpeGVkKSk7 CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBzdHlsZS0+c2V0V2lkdGgoTGVuZ3RoKHdp ZHRoLCBGaXhlZCkpOworICAgICAgICAgICAgc3R5bGUtPnNldEhlaWdodChMZW5ndGgoaGVpZ2h0 LCBGaXhlZCkpOworICAgICAgICB9CiAgICAgfQogfQogCg== 104909 2011-08-23 13:55:52 -0700 2011-08-23 16:31:27 -0700 Patch bug-50453-20110823135209.patch text/plain 6862 tanya.meshkova U3VidmVyc2lvbiBSZXZpc2lvbjogOTM2MTgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNmJkNjQ3MDdmMjNhYmM0ZTc0OTM0 NDFkNWQyMGRiYjkyOWE0MDE4Li45ZmI0NzJjYzk2N2JiNWNmN2VlYjZhZTY0YWNiOWNjNTIzZDk5 ZWFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMjMgIFRhdGlhbmEgTWVzaGtvdmEg IDx0YXRpYW5hLm1lc2hrb3ZhQG5va2lhLmNvbT4KKworICAgICAgICBQaXhlbCBjcmFzaCB0ZXN0 IGZvciBSZW5kZXJUaGVtZVF0OjpwYWludFNsaWRlclRyYWNrLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L2Zhc3QvZm9ybXMvcmFu Z2Uvc2xpZGVyLWNyYXNoLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v cXQvZmFzdC9mb3Jtcy9yYW5nZS9zbGlkZXItY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5odG1sOiBB ZGRlZC4KKwogMjAxMS0wNy0yNSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgZGl2IGFsaWduPSJjZW50ZXIiIHJlbmRlcmluZyBwcm9ibGVtCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC1l eHBlY3RlZC5wbmcgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3Ns aWRlci1jcmFzaC1leHBlY3RlZC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGM4ZjAwMzdhMmQ3OGEyODMyZTA1 Mjk3OGIyZTM0NWZmZTc3ZjMyZQpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMzM2NQp6Y21lQVNA Tj8ob2xIeWB1VkJxIWlhMHl+eVV7K3ZZVjJhPmkxQiVRbFlicFJ6RVg3V3FBc2okWiE7I1ZmPFp+ OHkKekw+NG5KQEVya1IjO013VChtK0FZNjQhezU8YyFxaD9CZGN+aFU2M3JHcVlxdjFBYDx9NkhD TD9XUnRXczN1OXdiCnpHWHdKISkxKU1tIzZ7ZDJVb2tON08hOVBiNDVecyZfTzJtY3Z3O1khVkBG WS1BRGo4I216TzNkPX13dD4+Z25xPgp6UXp6YT9QY3ZnK1hnSEFsNj09KFlkSlh7dzFfZm1ZcGh5 bmBCTGptRzZBSl53MzU0TDhZTWA9dFBjOGMxfEZrKloKej5kakUwI0s/M1lfaittV3podiRNYFpa MGczPUFuTzkxSUstMVFpJDw5TlpkIVc9YitMNWhZa35gXj1obzM8c1J3CnpKe0FMN3RRM2RTNE9r c0VEdUA8U3FYOUErQW8lbjBYYktya0EpX2UtUzR9c1hKNFNRSVh6bSF6OWhoejQoVU83ZQpjbEht K3trKHpqYHMmY3A/dXclZ0I+RlZkUSZNQmJAME9XPypFQzJ1aQoKbGl0ZXJhbCAwCkhjbVY/ZDAw MDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9mb3Jtcy9yYW5n ZS9zbGlkZXItY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFz dC9mb3Jtcy9yYW5nZS9zbGlkZXItY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQwOWE5 MTZlMjRiOWRmMDg4MDQxOGE1ZmQ2N2E4ZDg0MDQ5MTgwMWIKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAg UmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAw eDYwMAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVu ZGVyQm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTc2CisgICAgICBSZW5kZXJCbG9jayB7 UH0gYXQgKDAsMCkgc2l6ZSA3ODR4MTUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L3F0L2Zhc3QvZm9ybXMvcmFuZ2Uvc2xpZGVyLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjll YWNlYWViZmYwNGQ1ZWNkMzNiNTQ1OGIyOWNjNTYxMjQyYTI1ZWQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5o dG1sCkBAIC0wLDAgKzEsNSBAQAorPGh0bWw+Cis8Ym9keT4KKzxwIHN0eWxlPSItd2Via2l0LWFw cGVhcmFuY2U6IHNsaWRlci12ZXJ0aWNhbDsgaGVpZ2h0OiAxNXB4Ij48L3A+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWUzYTNmYjY4MTI5NjdlMDJjNjA0NWNlNzk2ODM4NTg5MGY0 ZTI5Zi4uOWQ3Y2U2NWNlNTI2ZGJiZWExYTcxMjVhYzI2MWY4NjRhMGMzMGRkYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTA4LTIzICBUYXRpYW5hIE1lc2hrb3ZhICA8dGF0aWFu YS5tZXNoa292YUBub2tpYS5jb20+CisKKyAgICAgICAgUGFpbnQgU2xpZGVyVHJhY2sgYW5kIFNs aWRlclRodW1iIGluZGVwZW5kZW50bHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MDQ1MworICAgICAgICBBbHNvIGZpeGVzIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTQ1NiBjcmFzaC4KKworICAgICAgICBHZXQgcmlk IG9mIHVwY2FzdGluZy4gQWxsb3cgdG8gZGlzcGxheSBTbGlkZXJUcmFjayBhbmQgU2xpZGVyVGh1 bWIKKyAgICAgICAgd2l0aG91dCA8aW5wdXQgdHlwZT1yYW5nZT4uCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vcXQvZmFzdC9m b3Jtcy9yYW5nZS9zbGlkZXItY3Jhc2guaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vcXQvUmVu ZGVyVGhlbWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVF0OjpwYWludFNs aWRlclRyYWNrKTogRHJhdyBTQ19TbGlkZXJHcm9vdmUuCisgICAgICAgIEFsbG93IHBhaW50U2xp ZGVyVGh1bWIoKSB0byBjYXJlIGFib3V0IFNDX1NsaWRlckhhbmRsZS4KKyAgICAgICAgRHJhdyBm b2N1cyBleHBsaWNpdGx5LCBzaW5jZSBRU3R5bGVPcHRpb25TbGlkZXIgZG9lc24ndCBhbGxvdyB0 byBmb2N1cworICAgICAgICBvbiBDQ19TbGlkZXIgd2l0aG91dCBoYW5kbGUgc3ViY29udHJvbC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OnBhaW50U2xpZGVyVGh1bWIpOiBEcmF3 IFNDX1NsaWRlckhhbmRsZS4KKwogMjAxMS0wNy0yNSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdl YmtpdC5vcmc+CiAKICAgICAgICAgZGl2IGFsaWduPSJjZW50ZXIiIHJlbmRlcmluZyBwcm9ibGVt CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCmluZGV4IGRh NWYxZDI1YTM0MGQ5ODU1ZmExZmNlNDExZWM5ZmZhNWEwNGEyMjIuLjAzOGEwYWFkM2E3MWM2YjNl YzMwNGM2NWYwYTIxNmYyNzdkNzc2ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0 L1JlbmRlclRoZW1lUXQuY3BwCkBAIC05MDksNDcgKzkwOSwyNSBAQCBib29sIFJlbmRlclRoZW1l UXQ6OnBhaW50U2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIHBp LAogewogICAgIFN0eWxlUGFpbnRlciBwKHRoaXMsIHBpKTsKICAgICBpZiAoIXAuaXNWYWxpZCgp KQotICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIFFTdHls ZU9wdGlvblNsaWRlciBvcHRpb247CiAgICAgaW5pdFN0eWxlT3B0aW9uKHAud2lkZ2V0LCBvcHRp b24pOwotICAgIG9wdGlvbi5zdWJDb250cm9scyA9IFFTdHlsZTo6U0NfU2xpZGVyR3Jvb3ZlIHwg UVN0eWxlOjpTQ19TbGlkZXJIYW5kbGU7CisgICAgb3B0aW9uLnN1YkNvbnRyb2xzID0gUVN0eWxl OjpTQ19TbGlkZXJHcm9vdmU7CiAgICAgQ29udHJvbFBhcnQgYXBwZWFyYW5jZSA9IGluaXRpYWxp emVDb21tb25RU3R5bGVPcHRpb25zKG9wdGlvbiwgbyk7Ci0KLSAgICBSZW5kZXJTbGlkZXIqIHJl bmRlclNsaWRlciA9IHRvUmVuZGVyU2xpZGVyKG8pOwotICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlu cHV0ID0gcmVuZGVyU2xpZGVyLT5ub2RlKCktPnRvSW5wdXRFbGVtZW50KCk7Ci0gICAgSW50UmVj dCB0aHVtYlJlY3QgPSBzbGlkZXJUaHVtYkVsZW1lbnRPZihpbnB1dCktPmdldFJlY3QoKTsKLQog ICAgIG9wdGlvbi5yZWN0ID0gcjsKLQotICAgIGludCB2YWx1ZTsKLSAgICBpZiAoYXBwZWFyYW5j ZSA9PSBTbGlkZXJWZXJ0aWNhbFBhcnQpIHsKLSAgICAgICAgb3B0aW9uLm1heGltdW0gPSByLmhl aWdodCgpIC0gdGh1bWJSZWN0LmhlaWdodCgpOwotICAgICAgICB2YWx1ZSA9IHRodW1iUmVjdC55 KCkgLSByLnkoKTsKLSAgICB9IGVsc2UgewotICAgICAgICBvcHRpb24ubWF4aW11bSA9IHIud2lk dGgoKSAtIHRodW1iUmVjdC53aWR0aCgpOwotICAgICAgICB2YWx1ZSA9IHRodW1iUmVjdC54KCkg LSByLngoKTsKLSAgICB9Ci0KLSAgICB2YWx1ZSA9IFFTdHlsZTo6c2xpZGVyVmFsdWVGcm9tUG9z aXRpb24oMCwgb3B0aW9uLm1heGltdW0sIHZhbHVlLCBvcHRpb24ubWF4aW11bSk7Ci0KLSAgICBv cHRpb24uc2xpZGVyVmFsdWUgPSB2YWx1ZTsKLSAgICBvcHRpb24uc2xpZGVyUG9zaXRpb24gPSB2 YWx1ZTsKICAgICBpZiAoYXBwZWFyYW5jZSA9PSBTbGlkZXJWZXJ0aWNhbFBhcnQpCiAgICAgICAg IG9wdGlvbi5vcmllbnRhdGlvbiA9IFF0OjpWZXJ0aWNhbDsKLQotICAgIGlmIChyZW5kZXJTbGlk ZXItPmluRHJhZ01vZGUoKSkgewotICAgICAgICBvcHRpb24uYWN0aXZlU3ViQ29udHJvbHMgPSBR U3R5bGU6OlNDX1NsaWRlckhhbmRsZTsKKyAgICBpZiAoaXNQcmVzc2VkKG8pKQogICAgICAgICBv cHRpb24uc3RhdGUgfD0gUVN0eWxlOjpTdGF0ZV9TdW5rZW47Ci0gICAgfQotCi0gICAgY29uc3Qg UVBvaW50IHRvcExlZnQgPSByLmxvY2F0aW9uKCk7Ci0gICAgcC5wYWludGVyLT50cmFuc2xhdGUo dG9wTGVmdCk7Ci0gICAgb3B0aW9uLnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7Ci0gICAgb3B0 aW9uLnJlY3Quc2V0U2l6ZShyLnNpemUoKSk7CiAKICAgICBwLmRyYXdDb21wbGV4Q29udHJvbChR U3R5bGU6OkNDX1NsaWRlciwgb3B0aW9uKTsKLSAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSgtdG9w TGVmdCk7CisKKyAgICBpZiAob3B0aW9uLnN0YXRlICYgUVN0eWxlOjpTdGF0ZV9IYXNGb2N1cykg eworICAgICAgICBRU3R5bGVPcHRpb25Gb2N1c1JlY3QgZm9jdXNPcHRpb247CisgICAgICAgIGZv Y3VzT3B0aW9uLnJlY3QgPSByOworICAgICAgICBwLmRyYXdQcmltaXRpdmUoUVN0eWxlOjpQRV9G cmFtZUZvY3VzUmVjdCwgZm9jdXNPcHRpb24pOworICAgIH0KIAogICAgIHJldHVybiBmYWxzZTsK IH0KQEAgLTk2Miw3ICs5NDAsMjQgQEAgdm9pZCBSZW5kZXJUaGVtZVF0OjphZGp1c3RTbGlkZXJU cmFja1N0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUKIGJvb2wgUmVu ZGVyVGhlbWVRdDo6cGFpbnRTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50 SW5mbyYgcGksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50 UmVjdCYgcikKIHsKLSAgICAvLyBXZSd2ZSBhbHJlYWR5IHBhaW50ZWQgaXQgaW4gcGFpbnRTbGlk ZXJUcmFjaygpLCBubyBuZWVkIHRvIGRvIGFueXRoaW5nIGhlcmUuCisgICAgU3R5bGVQYWludGVy IHAodGhpcywgcGkpOworICAgIGlmICghcC5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiB0cnVl OworCisgICAgUVN0eWxlT3B0aW9uU2xpZGVyIG9wdGlvbjsKKyAgICBpbml0U3R5bGVPcHRpb24o cC53aWRnZXQsIG9wdGlvbik7CisgICAgb3B0aW9uLnN1YkNvbnRyb2xzID0gUVN0eWxlOjpTQ19T bGlkZXJIYW5kbGU7CisgICAgQ29udHJvbFBhcnQgYXBwZWFyYW5jZSA9IGluaXRpYWxpemVDb21t b25RU3R5bGVPcHRpb25zKG9wdGlvbiwgbyk7CisgICAgb3B0aW9uLnJlY3QgPSByOworICAgIGlm IChhcHBlYXJhbmNlID09IFNsaWRlclRodW1iVmVydGljYWxQYXJ0KQorICAgICAgICBvcHRpb24u b3JpZW50YXRpb24gPSBRdDo6VmVydGljYWw7CisgICAgaWYgKGlzUHJlc3NlZChvKSkgeworICAg ICAgICBvcHRpb24uYWN0aXZlU3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRlckhhbmRsZTsK KyAgICAgICAgb3B0aW9uLnN0YXRlIHw9IFFTdHlsZTo6U3RhdGVfU3Vua2VuOworICAgIH0KKwor ICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2xpZGVyLCBvcHRpb24pOworCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCg== 104927 2011-08-23 16:31:39 -0700 2011-08-24 03:51:36 -0700 Patch bug-50453-20110823162754.patch text/plain 7308 tanya.meshkova U3VidmVyc2lvbiBSZXZpc2lvbjogOTM2MTgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNmJkNjQ3MDdmMjNhYmM0ZTc0OTM0 NDFkNWQyMGRiYjkyOWE0MDE4Li44MDc5ODhjOWUyZTg5YzMyNDIxOGM1M2YzZDFiNDM2MTBiNzI1 YjVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMjMgIFRhdGlhbmEgTWVzaGtvdmEg IDx0YXRpYW5hLm1lc2hrb3ZhQG5va2lhLmNvbT4KKworICAgICAgICBQaXhlbCBjcmFzaCB0ZXN0 IGZvciBSZW5kZXJUaGVtZVF0OjpwYWludFNsaWRlclRyYWNrLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXBwb3J0IC13ZWJraXQtYXBwZWFyYW5jZTog c2xpZGVyLWhvcml6b250YWwvdmVydGljYWwKKyAgICAgICAgcGFpbnRpbmcgd2l0aG91dCByYW5n ZSBpbnB1dC4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L2Zhc3QvZm9ybXMvcmFuZ2Uvc2xpZGVy LWNyYXNoLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vcXQvZmFzdC9m b3Jtcy9yYW5nZS9zbGlkZXItY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5odG1sOiBBZGRlZC4KKwog MjAxMS0wNy0yNSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg ZGl2IGFsaWduPSJjZW50ZXIiIHJlbmRlcmluZyBwcm9ibGVtCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC1leHBlY3RlZC5w bmcgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFz aC1leHBlY3RlZC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGM4ZjAwMzdhMmQ3OGEyODMyZTA1Mjk3OGIyZTM0 NWZmZTc3ZjMyZQpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMzM2NQp6Y21lQVNATj8ob2xIeWB1 VkJxIWlhMHl+eVV7K3ZZVjJhPmkxQiVRbFlicFJ6RVg3V3FBc2okWiE7I1ZmPFp+OHkKekw+NG5K QEVya1IjO013VChtK0FZNjQhezU8YyFxaD9CZGN+aFU2M3JHcVlxdjFBYDx9NkhDTD9XUnRXczN1 OXdiCnpHWHdKISkxKU1tIzZ7ZDJVb2tON08hOVBiNDVecyZfTzJtY3Z3O1khVkBGWS1BRGo4I216 TzNkPX13dD4+Z25xPgp6UXp6YT9QY3ZnK1hnSEFsNj09KFlkSlh7dzFfZm1ZcGh5bmBCTGptRzZB Sl53MzU0TDhZTWA9dFBjOGMxfEZrKloKej5kakUwI0s/M1lfaittV3podiRNYFpaMGczPUFuTzkx SUstMVFpJDw5TlpkIVc9YitMNWhZa35gXj1obzM8c1J3CnpKe0FMN3RRM2RTNE9rc0VEdUA8U3FY OUErQW8lbjBYYktya0EpX2UtUzR9c1hKNFNRSVh6bSF6OWhoejQoVU83ZQpjbEhtK3trKHpqYHMm Y3A/dXclZ0I+RlZkUSZNQmJAME9XPypFQzJ1aQoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9mb3Jtcy9yYW5nZS9zbGlkZXIt Y3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9mb3Jtcy9y YW5nZS9zbGlkZXItY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQwOWE5MTZlMjRiOWRm MDg4MDQxOGE1ZmQ2N2E4ZDg0MDQ5MTgwMWIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSw2IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmll dyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBS ZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9keSB7 Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTc2CisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAs MCkgc2l6ZSA3ODR4MTUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2Zhc3Qv Zm9ybXMvcmFuZ2Uvc2xpZGVyLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9m YXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjllYWNlYWViZmYw NGQ1ZWNkMzNiNTQ1OGIyOWNjNTYxMjQyYTI1ZWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2Zvcm1zL3JhbmdlL3NsaWRlci1jcmFzaC5odG1sCkBAIC0w LDAgKzEsNSBAQAorPGh0bWw+Cis8Ym9keT4KKzxwIHN0eWxlPSItd2Via2l0LWFwcGVhcmFuY2U6 IHNsaWRlci12ZXJ0aWNhbDsgaGVpZ2h0OiAxNXB4Ij48L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggNWUzYTNmYjY4MTI5NjdlMDJjNjA0NWNlNzk2ODM4NTg5MGY0ZTI5Zi4uMjBk ZjNmM2Q5OGUwYTkwM2NhMzk5ODMzMGFjNzIxNjk1MzJhMWVmOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI3IEBACisyMDExLTA4LTIzICBUYXRpYW5hIE1lc2hrb3ZhICA8dGF0aWFuYS5tZXNoa292 YUBub2tpYS5jb20+CisKKyAgICAgICAgUGFpbnQgU2xpZGVyVHJhY2sgYW5kIFNsaWRlclRodW1i IGluZGVwZW5kZW50bHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MDQ1MworICAgICAgICBBbHNvIGZpeGVzIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NTQ1NiBjcmFzaC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJTbGlkZXIgd29ya3Mgb25seSB3aXRoIDxpbnB1 dCB0eXBlPXJhbmdlPi4gTm93YWRheXMgUmVuZGVyVGhlbWUKKyAgICAgICAgc3VwcG9ydHMgcGFp bnRpbmcgb2YgU2xpZGVyVHJhY2sgYW5kIFNsaWRlclRodW1iIHdpdGhvdXQgcmFuZ2UgaW5wdXQu CisgICAgICAgIEluIG9yZGVyIHRvIGJlIGluIHN5bmMgd2l0aCBvdGhlciBwbGF0Zm9ybXMgdGhp cyBwYXRjaCBnZXRzIHJpZCBvZgorICAgICAgICB1cGNhc3RpbmcgaW4gUmVuZGVyVGhlbWVRdDo6 cGFpbnRTbGlkZXJUcmFjayBhbmQgYWxsb3dzIHRvIHBhaW50CisgICAgICAgIFNsaWRlclRyYWNr IGFuZCBTbGlkZXJUaHVtYiBpbmRlcGVuZGVudGx5LgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3Jt L3F0L2Zhc3QvZm9ybXMvcmFuZ2Uvc2xpZGVyLWNyYXNoLmh0bWwKKworICAgICAgICAqIHBsYXRm b3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVR dDo6cGFpbnRTbGlkZXJUcmFjayk6IERyYXcgU0NfU2xpZGVyR3Jvb3ZlLgorICAgICAgICBBbGxv dyBwYWludFNsaWRlclRodW1iKCkgdG8gY2FyZSBhYm91dCBTQ19TbGlkZXJIYW5kbGUuIFdlIGRv bid0IG5lZWQKKyAgICAgICAgdG8gc2V0dXAgdmFsdWUgYW5kIHBvc2l0aW9uIGFueW1vcmUsIHNp bmNlIGhhbmRsZSBpcyBkcmF3biBzZXBhcmF0ZWx5LgorICAgICAgICBEcmF3IGZvY3VzIGV4cGxp Y2l0bHksIHNpbmNlIFFTdHlsZU9wdGlvblNsaWRlciBkb2Vzbid0IGFsbG93IHRvIGZvY3VzCisg ICAgICAgIG9uIENDX1NsaWRlciB3aXRob3V0IGhhbmRsZSBzdWJjb250cm9sLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVRdDo6cGFpbnRTbGlkZXJUaHVtYik6IERyYXcgU0NfU2xpZGVy SGFuZGxlLgorCiAyMDExLTA3LTI1ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4K IAogICAgICAgICBkaXYgYWxpZ249ImNlbnRlciIgcmVuZGVyaW5nIHByb2JsZW0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKaW5kZXggZGE1ZjFkMjVhMzQw ZDk4NTVmYTFmY2U0MTFlYzlmZmE1YTA0YTIyMi4uMDM4YTBhYWQzYTcxYzZiM2VjMzA0YzY1ZjBh MjE2ZjI3N2Q3NzZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVu ZGVyVGhlbWVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhl bWVRdC5jcHAKQEAgLTkwOSw0NyArOTA5LDI1IEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6cGFpbnRT bGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGksCiB7CiAgICAg U3R5bGVQYWludGVyIHAodGhpcywgcGkpOwogICAgIGlmICghcC5pc1ZhbGlkKCkpCi0gICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgUVN0eWxlT3B0aW9uU2xp ZGVyIG9wdGlvbjsKICAgICBpbml0U3R5bGVPcHRpb24ocC53aWRnZXQsIG9wdGlvbik7Ci0gICAg b3B0aW9uLnN1YkNvbnRyb2xzID0gUVN0eWxlOjpTQ19TbGlkZXJHcm9vdmUgfCBRU3R5bGU6OlND X1NsaWRlckhhbmRsZTsKKyAgICBvcHRpb24uc3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRl ckdyb292ZTsKICAgICBDb250cm9sUGFydCBhcHBlYXJhbmNlID0gaW5pdGlhbGl6ZUNvbW1vblFT dHlsZU9wdGlvbnMob3B0aW9uLCBvKTsKLQotICAgIFJlbmRlclNsaWRlciogcmVuZGVyU2xpZGVy ID0gdG9SZW5kZXJTbGlkZXIobyk7Ci0gICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSByZW5k ZXJTbGlkZXItPm5vZGUoKS0+dG9JbnB1dEVsZW1lbnQoKTsKLSAgICBJbnRSZWN0IHRodW1iUmVj dCA9IHNsaWRlclRodW1iRWxlbWVudE9mKGlucHV0KS0+Z2V0UmVjdCgpOwotCiAgICAgb3B0aW9u LnJlY3QgPSByOwotCi0gICAgaW50IHZhbHVlOwotICAgIGlmIChhcHBlYXJhbmNlID09IFNsaWRl clZlcnRpY2FsUGFydCkgewotICAgICAgICBvcHRpb24ubWF4aW11bSA9IHIuaGVpZ2h0KCkgLSB0 aHVtYlJlY3QuaGVpZ2h0KCk7Ci0gICAgICAgIHZhbHVlID0gdGh1bWJSZWN0LnkoKSAtIHIueSgp OwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG9wdGlvbi5tYXhpbXVtID0gci53aWR0aCgpIC0gdGh1 bWJSZWN0LndpZHRoKCk7Ci0gICAgICAgIHZhbHVlID0gdGh1bWJSZWN0LngoKSAtIHIueCgpOwot ICAgIH0KLQotICAgIHZhbHVlID0gUVN0eWxlOjpzbGlkZXJWYWx1ZUZyb21Qb3NpdGlvbigwLCBv cHRpb24ubWF4aW11bSwgdmFsdWUsIG9wdGlvbi5tYXhpbXVtKTsKLQotICAgIG9wdGlvbi5zbGlk ZXJWYWx1ZSA9IHZhbHVlOwotICAgIG9wdGlvbi5zbGlkZXJQb3NpdGlvbiA9IHZhbHVlOwogICAg IGlmIChhcHBlYXJhbmNlID09IFNsaWRlclZlcnRpY2FsUGFydCkKICAgICAgICAgb3B0aW9uLm9y aWVudGF0aW9uID0gUXQ6OlZlcnRpY2FsOwotCi0gICAgaWYgKHJlbmRlclNsaWRlci0+aW5EcmFn TW9kZSgpKSB7Ci0gICAgICAgIG9wdGlvbi5hY3RpdmVTdWJDb250cm9scyA9IFFTdHlsZTo6U0Nf U2xpZGVySGFuZGxlOworICAgIGlmIChpc1ByZXNzZWQobykpCiAgICAgICAgIG9wdGlvbi5zdGF0 ZSB8PSBRU3R5bGU6OlN0YXRlX1N1bmtlbjsKLSAgICB9Ci0KLSAgICBjb25zdCBRUG9pbnQgdG9w TGVmdCA9IHIubG9jYXRpb24oKTsKLSAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSh0b3BMZWZ0KTsK LSAgICBvcHRpb24ucmVjdC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKLSAgICBvcHRpb24ucmVjdC5z ZXRTaXplKHIuc2l6ZSgpKTsKIAogICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0Nf U2xpZGVyLCBvcHRpb24pOwotICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKC10b3BMZWZ0KTsKKwor ICAgIGlmIChvcHRpb24uc3RhdGUgJiBRU3R5bGU6OlN0YXRlX0hhc0ZvY3VzKSB7CisgICAgICAg IFFTdHlsZU9wdGlvbkZvY3VzUmVjdCBmb2N1c09wdGlvbjsKKyAgICAgICAgZm9jdXNPcHRpb24u cmVjdCA9IHI7CisgICAgICAgIHAuZHJhd1ByaW1pdGl2ZShRU3R5bGU6OlBFX0ZyYW1lRm9jdXNS ZWN0LCBmb2N1c09wdGlvbik7CisgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtOTYy LDcgKzk0MCwyNCBAQCB2b2lkIFJlbmRlclRoZW1lUXQ6OmFkanVzdFNsaWRlclRyYWNrU3R5bGUo Q1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiBzdHlsZQogYm9vbCBSZW5kZXJUaGVtZVF0 OjpwYWludFNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBwaSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiByKQog ewotICAgIC8vIFdlJ3ZlIGFscmVhZHkgcGFpbnRlZCBpdCBpbiBwYWludFNsaWRlclRyYWNrKCks IG5vIG5lZWQgdG8gZG8gYW55dGhpbmcgaGVyZS4KKyAgICBTdHlsZVBhaW50ZXIgcCh0aGlzLCBw aSk7CisgICAgaWYgKCFwLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBR U3R5bGVPcHRpb25TbGlkZXIgb3B0aW9uOworICAgIGluaXRTdHlsZU9wdGlvbihwLndpZGdldCwg b3B0aW9uKTsKKyAgICBvcHRpb24uc3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1NsaWRlckhhbmRs ZTsKKyAgICBDb250cm9sUGFydCBhcHBlYXJhbmNlID0gaW5pdGlhbGl6ZUNvbW1vblFTdHlsZU9w dGlvbnMob3B0aW9uLCBvKTsKKyAgICBvcHRpb24ucmVjdCA9IHI7CisgICAgaWYgKGFwcGVhcmFu Y2UgPT0gU2xpZGVyVGh1bWJWZXJ0aWNhbFBhcnQpCisgICAgICAgIG9wdGlvbi5vcmllbnRhdGlv biA9IFF0OjpWZXJ0aWNhbDsKKyAgICBpZiAoaXNQcmVzc2VkKG8pKSB7CisgICAgICAgIG9wdGlv bi5hY3RpdmVTdWJDb250cm9scyA9IFFTdHlsZTo6U0NfU2xpZGVySGFuZGxlOworICAgICAgICBv cHRpb24uc3RhdGUgfD0gUVN0eWxlOjpTdGF0ZV9TdW5rZW47CisgICAgfQorCisgICAgcC5kcmF3 Q29tcGxleENvbnRyb2woUVN0eWxlOjpDQ19TbGlkZXIsIG9wdGlvbik7CisKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAK