107214 2013-01-17 18:40:12 -0800 WebVTT <i>, <b> and <u> elements should have default styles 2013-02-04 14:40:55 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 43668 1 dgorbik dgorbik cmarcelo dgorbik eric.carlson eric esprehn feature-media-reviews koivisto macpherson menard ojan.autocc silviapf vcarbune webkit-bug-importer webkit.review.bot oldest_to_newest 810076 0 dgorbik 2013-01-17 18:40:12 -0800 We shouldn't reuse HTMLElements but set css properties on span elements as specs require. 823524 1 186208 dgorbik 2013-02-01 19:58:50 -0800 Created attachment 186208 Proposed fix 0.1 823547 2 186208 esprehn 2013-02-01 21:38:49 -0800 Comment on attachment 186208 Proposed fix 0.1 View in context: https://bugs.webkit.org/attachment.cgi?id=186208&action=review > Source/WebCore/css/mediaControls.css:270 > +video::-webkit-media-text-track-container ruby > rt { Can we leave the ruby changes out of this patch since there's no tests? The test above doesn't have anything ruby related. > Source/WebCore/rendering/RenderObject.cpp:167 > + if (element->hasTagName(rubyTag) || element->hasTagName(WebVTTElement::rubyElementTagName())) { Lets leave all the changes in this file out until you have some tests. 823549 3 silviapf 2013-02-01 22:02:13 -0800 What makes you think that they should by <span>s ? The spec says otherwise: http://dev.w3.org/html5/webvtt/#webvtt-cue-text-dom-construction-rules . 823558 4 dgorbik 2013-02-01 22:37:15 -0800 (In reply to comment #2) > (From update of attachment 186208 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186208&action=review > > > Source/WebCore/css/mediaControls.css:270 > > +video::-webkit-media-text-track-container ruby > rt { > > Can we leave the ruby changes out of this patch since there's no tests? The test above doesn't have anything ruby related. > > > Source/WebCore/rendering/RenderObject.cpp:167 > > + if (element->hasTagName(rubyTag) || element->hasTagName(WebVTTElement::rubyElementTagName())) { > > Lets leave all the changes in this file out until you have some tests. The problem here is that first of all we should implement display: ruby property, but Hixie said that they will rewrite all ruby specs but for now I still should place rt on top of rb. It works with this patch, though you can't see rt's text because it overflows the top bound of the cue box. I think the only proper way to test ruby/rt is to do a DRT of the cue. Would you suggest doing this? I have broken all elements from being rendered at all with my previous patch (on purpose) but those were not covered by test. That's why I decided to fix this regression though there will be no new tests (except for i, b and u). Do you think that's not a good idea? 823559 5 dgorbik 2013-02-01 22:40:21 -0800 (In reply to comment #3) > What makes you think that they should by <span>s ? The spec says otherwise: http://dev.w3.org/html5/webvtt/#webvtt-cue-text-dom-construction-rules . I only used 'spans' in the bug description because specs say something like "These represent spans of underline text ". I don't use html spans of course, only plain elements. I should probably change the bug description and the changelog so that it's not confusing. 823560 6 silviapf 2013-02-01 22:51:30 -0800 Ah, right, in the meaning of "span of text". I agree that it's an unfortunate choice of word in the spec and confusing. Could you use "span of text" rather than just "span"? I might suggest replacing the word "span" with "snippet" or "passage" in the spec? 823564 7 dgorbik 2013-02-01 22:56:15 -0800 (In reply to comment #6) > Ah, right, in the meaning of "span of text". I agree that it's an unfortunate choice of word in the spec and confusing. Could you use "span of text" rather than just "span"? I might suggest replacing the word "span" with "snippet" or "passage" in the spec? How about just "i, b, u WebVTT elements should have default styles" ? 823569 8 silviapf 2013-02-01 23:15:12 -0800 Works for me! Thanks! 824723 9 186452 dgorbik 2013-02-04 13:54:09 -0800 Created attachment 186452 Proposed fix 0.2 824730 10 webkit-bug-importer 2013-02-04 13:57:35 -0800 <rdar://problem/13147072> 824775 11 186452 webkit.review.bot 2013-02-04 14:40:51 -0800 Comment on attachment 186452 Proposed fix 0.2 Clearing flags on attachment: 186452 Committed r141817: <http://trac.webkit.org/changeset/141817> 824776 12 webkit.review.bot 2013-02-04 14:40:55 -0800 All reviewed patches have been landed. Closing bug. 186208 2013-02-01 19:58:50 -0800 2013-02-04 13:54:09 -0800 Proposed fix 0.1 patch text/plain 7826 dgorbik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyODYzNTE5Li5lMTZmY2U4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDIt MDEgIERpbWEgR29yYmlrICA8ZGdvcmJpa0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViVlRUIDxp PiwgPGI+LCA8dT4gYW5kIDxydWJ5PiBlbGVtZW50cyBzaG91bGQgYmUgc3R5bGVkIHNwYW5zLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MjE0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS90 cmFjay9jYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dDogQWRkZWQuCisgICAgICAg ICogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWRlZmF1bHQtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBtZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC5o dG1sOiBBZGRlZC4KKwogMjAxMy0wMi0wMSAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdA YXBwbGUuY29tPgogCiAgICAgICAgIERvY3VtZW50IGlzIG5ldmVyIHJlbGVhc2VkIGlmIGFuIGlt YWdlJ3Mgc3JjIGF0dHJpYnV0ZSBpcyBjaGFuZ2VkIHRvIGEgdXJsIGJsb2NrZWQgYnkgY29udGVu dC1zZWN1cml0eS1wb2xpY3kuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay9j YXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dCBiL0xheW91dFRlc3RzL21lZGlhL3Ry YWNrL2NhcHRpb25zLXdlYnZ0dC9zdHlsaW5nLWRlZmF1bHQudnR0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjEwZGU1MmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dApAQCAtMCww ICsxLDUgQEAKK1dFQlZUVAorCisxCiswMDowMC4wMDAgLS0+IDAwOjAxLjAwMAorPGI+Ym9sZDwv Yj4gPGk+aXRhbGljPC9pPiA8dT51bmRlcmxpbmU8L3U+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9tZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDk3NTAzYgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1k ZWZhdWx0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCB1LCBiLCBpIFdl YlZUVCBvYmplY3RzIGFyZSBiZWluZyBzdHlsZWQgY29ycmVjdGx5LgorRVZFTlQoY2FucGxheXRo cm91Z2gpCitFVkVOVChzZWVrZWQpCitFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZShjdWVOb2Rl KS5mb250V2VpZ2h0ID09ICdib2xkJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0eWxlKGN1 ZU5vZGUpLmZvbnRTdHlsZSA9PSAnaXRhbGljJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0 eWxlKGN1ZU5vZGUpLnRleHREZWNvcmF0aW9uID09ICd1bmRlcmxpbmUnKSBPSworRU5EIE9GIFRF U1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNo aW5nLWRlZmF1bHQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRj aGluZy1kZWZhdWx0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2I1 NzE0MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNz cy1tYXRjaGluZy1kZWZhdWx0Lmh0bWwKQEAgLTAsMCArMSw0NiBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1U eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNj cmlwdCBzcmM9Li4vbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Li4vdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEt Y29udHJvbHMuanM+PC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICB2YXIg Y3VlTm9kZTsKKworICAgICAgICBmdW5jdGlvbiBzZWVrZWQoKQorICAgICAgICB7CisgICAgICAg ICAgICBpZiAodGVzdEVuZGVkKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAg ICAgY3VlTm9kZSA9IHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnYWxsLW5vZGVzJyku Zmlyc3RFbGVtZW50Q2hpbGQ7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVk U3R5bGUoY3VlTm9kZSkuZm9udFdlaWdodCIsICJib2xkIik7CisgICAgICAgICAgICBjdWVOb2Rl ID0gY3VlTm9kZS5uZXh0RWxlbWVudFNpYmxpbmc7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo ImdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuZm9udFN0eWxlIiwgIml0YWxpYyIpOworICAgICAg ICAgICAgY3VlTm9kZSA9IGN1ZU5vZGUubmV4dEVsZW1lbnRTaWJsaW5nOworICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLnRleHREZWNvcmF0aW9uIiwg InVuZGVybGluZSIpOworCisgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgIH0KKworICAg ICAgICBmdW5jdGlvbiBsb2FkZWQoKQorICAgICAgICB7CisgICAgICAgICAgICBjb25zb2xlV3Jp dGUoIlRlc3QgdGhhdCB1LCBiLCBpIFdlYlZUVCBvYmplY3RzIGFyZSBiZWluZyBzdHlsZWQgY29y cmVjdGx5LiIpOworICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAgICAgICAgICAg dmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vY29udGVudC90ZXN0Jyk7Cisg ICAgICAgICAgICB2aWRlby5pZCA9ICJ0ZXN0dmlkZW8iOworICAgICAgICAgICAgd2FpdEZvckV2 ZW50KCdzZWVrZWQnLCBzZWVrZWQpOworICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdjYW5wbGF5 dGhyb3VnaCcsIGZ1bmN0aW9uKCkgeyB2aWRlby5jdXJyZW50VGltZSA9IDAuMTsgfSk7CisgICAg ICAgIH0KKworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2Fk PSJsb2FkZWQoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyA+CisgICAgICAgICAgICA8dHJh Y2sgc3JjPSJjYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dCIga2luZD0iY2FwdGlv bnMiIGRlZmF1bHQ+CisgICAgICAgIDwvdmlkZW8+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGI5MWQzY2YuLjRmZDFhMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAor MjAxMy0wMi0wMSAgRGltYSBHb3JiaWsgIDxkZ29yYmlrQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWJWVFQgPGk+LCA8Yj4sIDx1PiBhbmQgPHJ1Ynk+IGVsZW1lbnRzIHNob3VsZCBiZSBzdHlsZWQg c3BhbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDcyMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRlZCBkZWZhdWx0IHN0eWxlcyBmb3IgYmFzaWMgd2VidnR0IG9iamVjdCB0eXBlcy4KKyAgICAg ICAgTm8gdGVzdHMgZm9yIHJ1YnkvcnQgZWxlbWVudHMgeWV0IHNpbmNlIHRoZXkgYXJlIG5vdCBi ZWluZyByZW5kZXJlZAorICAgICAgICBjb3JyZWN0bHkgeWV0IChidXQgdGhlIHNhbWUgd2F5IGFz IGJlZm9yZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTc5KS4K KyAgICAgICAgQWxsIG90aGVyIGVsZW1lbnRzIGFyZSBiZWluZyBzdHlsZWQgYW5kIHJlbmRlcmVk IGNvcnJlY3RseSBhY2NvcmRpbmcgdG8gc3BlY3MuCisKKyAgICAgICAgVGVzdDogbWVkaWEvdHJh Y2svdHJhY2stY3NzLW1hdGNoaW5nLWRlZmF1bHQuaHRtbAorCisgICAgICAgICogY3NzL21lZGlh Q29udHJvbHMuY3NzOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1j b250YWluZXIgYik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNv bnRhaW5lciB1KToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29u dGFpbmVyIGkpOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1jb250 YWluZXIgcnVieSA+IHJ0KToKKyAgICAgICAgKiBodG1sL3RyYWNrL1dlYlZUVEVsZW1lbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6OldlYlZUVEVsZW1lbnQ6OnJ1YnlFbGVtZW50VGFnTmFtZSk6Cisg ICAgICAgIChXZWJWVFRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVEVsZW1lbnQ6 OnJ0RWxlbWVudFRhZ05hbWUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw OiBSZW5kZXJSdWJ5IHNob3VsZCBhbHNvIHdvcmsgZm9yIHdlYnZ0dCBub2Rlcy4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y3JlYXRlT2JqZWN0KToKKwogMjAxMy0wMi0wMSAgUm9n ZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIENs ZWFuIHVwIFdlYkNvcmUgVlMyMDEwIHByb2plY3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvbWVkaWFDb250cm9scy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9s cy5jc3MKaW5kZXggZDhmYWY2NC4uODFlZjVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL21lZGlhQ29udHJvbHMuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRy b2xzLmNzcwpAQCAtMjU0LDMgKzI1NCwyMSBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRy YWNrLWRpc3BsYXkgewogdmlkZW86OmN1ZSg6ZnV0dXJlKSB7CiAgICAgY29sb3I6IGdyYXk7CiB9 CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyIGIgeworICAgIGZv bnQtd2VpZ2h0OiBib2xkOworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNv bnRhaW5lciB1IHsKKyAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKK30KKwordmlkZW86 Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1jb250YWluZXIgaSB7CisgICAgZm9udC1zdHlsZTog aXRhbGljOworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciBy dWJ5ID4gcnQgeworICAgIGRpc3BsYXk6IGJsb2NrOworICAgIGZvbnQtc2l6ZTogNTAlOworICAg IHRleHQtYWxpZ246IHN0YXJ0OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9XZWJWVFRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVEVs ZW1lbnQuaAppbmRleCBkNDAwYWQ2Li5mMDcwYzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1dlYlZUVEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL1dlYlZUVEVsZW1lbnQuaApAQCAtNjksNiArNjksMTggQEAgcHVibGljOgogICAgICAgICBy ZXR1cm4gdm9pY2VBdHRyOwogICAgIH0KIAorICAgIHN0YXRpYyBjb25zdCBRdWFsaWZpZWROYW1l JiBydWJ5RWxlbWVudFRhZ05hbWUoKQorICAgIHsKKyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NB TChRdWFsaWZpZWROYW1lLCBydWJ5VGFnLCAobnVsbEF0b20sICJydWJ5IiwgbnVsbEF0b20pKTsK KyAgICAgICAgcmV0dXJuIHJ1YnlUYWc7CisgICAgfQorCisgICAgc3RhdGljIGNvbnN0IFF1YWxp ZmllZE5hbWUmIHJ0RWxlbWVudFRhZ05hbWUoKQorICAgIHsKKyAgICAgICAgREVGSU5FX1NUQVRJ Q19MT0NBTChRdWFsaWZpZWROYW1lLCBydFRhZywgKG51bGxBdG9tLCAicnQiLCBudWxsQXRvbSkp OworICAgICAgICByZXR1cm4gcnRUYWc7CisgICAgfQorCiBwcml2YXRlOgogICAgIFdlYlZUVEVs ZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Kik7CiAgICAgV2ViVlRURWxlbWVu dChXZWJWVFROb2RlVHlwZSwgRG9jdW1lbnQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKaW5kZXggMGRhNzc5YS4uMWM0OWFkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTg1LDYgKzg1LDEwIEBACiAjaW5jbHVkZSAi U1ZHUmVuZGVyU3VwcG9ydC5oIgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVklERU9fVFJBQ0spCisj aW5jbHVkZSAiV2ViVlRURWxlbWVudC5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7 CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTE1OSwxNCArMTYzLDIyIEBAIFJlbmRlck9iamVj dCogUmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QoRWxlbWVudCogZWxlbWVudCwgUmVuZGVyU3R5 bGUqIHN0eWxlKQogICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogCisjaWYgRU5BQkxFKFZJ REVPX1RSQUNLKQorICAgIGlmIChlbGVtZW50LT5oYXNUYWdOYW1lKHJ1YnlUYWcpIHx8IGVsZW1l bnQtPmhhc1RhZ05hbWUoV2ViVlRURWxlbWVudDo6cnVieUVsZW1lbnRUYWdOYW1lKCkpKSB7Cisj ZWxzZQogICAgIGlmIChlbGVtZW50LT5oYXNUYWdOYW1lKHJ1YnlUYWcpKSB7CisjZW5kaWYKICAg ICAgICAgaWYgKHN0eWxlLT5kaXNwbGF5KCkgPT0gSU5MSU5FKQogICAgICAgICAgICAgcmV0dXJu IG5ldyAoYXJlbmEpIFJlbmRlclJ1YnlBc0lubGluZShlbGVtZW50KTsKICAgICAgICAgZWxzZSBp ZiAoc3R5bGUtPmRpc3BsYXkoKSA9PSBCTE9DSykKICAgICAgICAgICAgIHJldHVybiBuZXcgKGFy ZW5hKSBSZW5kZXJSdWJ5QXNCbG9jayhlbGVtZW50KTsKICAgICB9CiAgICAgLy8gdHJlYXQgPHJ0 PiBhcyBydWJ5IHRleHQgT05MWSBpZiBpdCBzdGlsbCBoYXMgaXRzIGRlZmF1bHQgdHJlYXRtZW50 IG9mIGJsb2NrCisjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQorICAgIGlmICgoZWxlbWVudC0+aGFz VGFnTmFtZShydFRhZykgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShXZWJWVFRFbGVtZW50OjpydEVs ZW1lbnRUYWdOYW1lKCkpKSAmJiBzdHlsZS0+ZGlzcGxheSgpID09IEJMT0NLKQorI2Vsc2UKICAg ICBpZiAoZWxlbWVudC0+aGFzVGFnTmFtZShydFRhZykgJiYgc3R5bGUtPmRpc3BsYXkoKSA9PSBC TE9DSykKKyNlbmRpZgogICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyUnVieVRleHQo ZWxlbWVudCk7CiAgICAgaWYgKGRvYy0+Y3NzUmVnaW9uc0VuYWJsZWQoKSAmJiBzdHlsZS0+aXNE aXNwbGF5UmVnaW9uVHlwZSgpICYmICFzdHlsZS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpICYm IGRvYy0+cmVuZGVyVmlldygpKQogICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyUmVn aW9uKGVsZW1lbnQsIDApOwo= 186452 2013-02-04 13:54:09 -0800 2013-02-04 14:40:51 -0800 Proposed fix 0.2 patch text/plain 4805 dgorbik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNjlhZWEwLi5hN2Y2OGRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDIt MDQgIERpbWEgR29yYmlrICA8ZGdvcmJpa0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViVlRUIDxp PiwgPGI+IGFuZCA8dT4gZWxlbWVudHMgc2hvdWxkIGhhdmUgZGVmYXVsdCBzdHlsZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzIxNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvdHJhY2sv Y2FwdGlvbnMtd2VidnR0L3N0eWxpbmctZGVmYXVsdC52dHQ6IEFkZGVkLgorICAgICAgICAqIG1l ZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1kZWZhdWx0LWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWRlZmF1bHQuaHRtbDog QWRkZWQuCisKIDIwMTMtMDItMDQgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICBbV0syXSBbTWFjXSBTdXBwb3J0IGRyYWcgaW4gbW91c2UgZXZlbnRzIGZvciBX ZWJLaXQyIEV2ZW50U2VuZGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay9j YXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dCBiL0xheW91dFRlc3RzL21lZGlhL3Ry YWNrL2NhcHRpb25zLXdlYnZ0dC9zdHlsaW5nLWRlZmF1bHQudnR0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjEwZGU1MmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dApAQCAtMCww ICsxLDUgQEAKK1dFQlZUVAorCisxCiswMDowMC4wMDAgLS0+IDAwOjAxLjAwMAorPGI+Ym9sZDwv Yj4gPGk+aXRhbGljPC9pPiA8dT51bmRlcmxpbmU8L3U+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9tZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDk3NTAzYgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1k ZWZhdWx0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCB1LCBiLCBpIFdl YlZUVCBvYmplY3RzIGFyZSBiZWluZyBzdHlsZWQgY29ycmVjdGx5LgorRVZFTlQoY2FucGxheXRo cm91Z2gpCitFVkVOVChzZWVrZWQpCitFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZShjdWVOb2Rl KS5mb250V2VpZ2h0ID09ICdib2xkJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0eWxlKGN1 ZU5vZGUpLmZvbnRTdHlsZSA9PSAnaXRhbGljJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0 eWxlKGN1ZU5vZGUpLnRleHREZWNvcmF0aW9uID09ICd1bmRlcmxpbmUnKSBPSworRU5EIE9GIFRF U1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNo aW5nLWRlZmF1bHQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRj aGluZy1kZWZhdWx0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2I1 NzE0MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNz cy1tYXRjaGluZy1kZWZhdWx0Lmh0bWwKQEAgLTAsMCArMSw0NiBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1U eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNj cmlwdCBzcmM9Li4vbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Li4vdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEt Y29udHJvbHMuanM+PC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICB2YXIg Y3VlTm9kZTsKKworICAgICAgICBmdW5jdGlvbiBzZWVrZWQoKQorICAgICAgICB7CisgICAgICAg ICAgICBpZiAodGVzdEVuZGVkKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAg ICAgY3VlTm9kZSA9IHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnYWxsLW5vZGVzJyku Zmlyc3RFbGVtZW50Q2hpbGQ7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVk U3R5bGUoY3VlTm9kZSkuZm9udFdlaWdodCIsICJib2xkIik7CisgICAgICAgICAgICBjdWVOb2Rl ID0gY3VlTm9kZS5uZXh0RWxlbWVudFNpYmxpbmc7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo ImdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuZm9udFN0eWxlIiwgIml0YWxpYyIpOworICAgICAg ICAgICAgY3VlTm9kZSA9IGN1ZU5vZGUubmV4dEVsZW1lbnRTaWJsaW5nOworICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLnRleHREZWNvcmF0aW9uIiwg InVuZGVybGluZSIpOworCisgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgIH0KKworICAg ICAgICBmdW5jdGlvbiBsb2FkZWQoKQorICAgICAgICB7CisgICAgICAgICAgICBjb25zb2xlV3Jp dGUoIlRlc3QgdGhhdCB1LCBiLCBpIFdlYlZUVCBvYmplY3RzIGFyZSBiZWluZyBzdHlsZWQgY29y cmVjdGx5LiIpOworICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAgICAgICAgICAg dmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vY29udGVudC90ZXN0Jyk7Cisg ICAgICAgICAgICB2aWRlby5pZCA9ICJ0ZXN0dmlkZW8iOworICAgICAgICAgICAgd2FpdEZvckV2 ZW50KCdzZWVrZWQnLCBzZWVrZWQpOworICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdjYW5wbGF5 dGhyb3VnaCcsIGZ1bmN0aW9uKCkgeyB2aWRlby5jdXJyZW50VGltZSA9IDAuMTsgfSk7CisgICAg ICAgIH0KKworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2Fk PSJsb2FkZWQoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyA+CisgICAgICAgICAgICA8dHJh Y2sgc3JjPSJjYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1kZWZhdWx0LnZ0dCIga2luZD0iY2FwdGlv bnMiIGRlZmF1bHQ+CisgICAgICAgIDwvdmlkZW8+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDdjNTAwNDcuLjEwODE3ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxMy0wMi0wNCAgRGltYSBHb3JiaWsgIDxkZ29yYmlrQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWJWVFQgPGk+LCA8Yj4gYW5kIDx1PiBlbGVtZW50cyBzaG91bGQgaGF2ZSBkZWZhdWx0IHN0eWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MjE0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQg ZGVmYXVsdCBzdHlsZXMgZm9yIGJhc2ljIHdlYnZ0dCBvYmplY3QgdHlwZXMuCisKKyAgICAgICAg VGVzdDogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWRlZmF1bHQuaHRtbAorCisgICAg ICAgICogY3NzL21lZGlhQ29udHJvbHMuY3NzOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVk aWEtdGV4dC10cmFjay1jb250YWluZXIgYik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRp YS10ZXh0LXRyYWNrLWNvbnRhaW5lciB1KToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlh LXRleHQtdHJhY2stY29udGFpbmVyIGkpOgorCiAyMDEzLTAyLTA0ICBUb20gU2VwZXogIDx0c2Vw ZXpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gQmluZGluZyBJbnRlZ3JpdHkgY3Jhc2gg aW4gVjhIVE1MRW1iZWRFbGVtZW50OjpjcmVhdGVXcmFwcGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvbWVkaWFDb250cm9scy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFD b250cm9scy5jc3MKaW5kZXggZDhmYWY2NC4uNWM1ZWRlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL21lZGlhQ29udHJvbHMuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRp YUNvbnRyb2xzLmNzcwpAQCAtMjU0LDMgKzI1NCwxNSBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS10 ZXh0LXRyYWNrLWRpc3BsYXkgewogdmlkZW86OmN1ZSg6ZnV0dXJlKSB7CiAgICAgY29sb3I6IGdy YXk7CiB9CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyIGIgewor ICAgIGZvbnQtd2VpZ2h0OiBib2xkOworfQorCit2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRy YWNrLWNvbnRhaW5lciB1IHsKKyAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKK30KKwor dmlkZW86Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1jb250YWluZXIgaSB7CisgICAgZm9udC1z dHlsZTogaXRhbGljOworfQo=