30784 2009-10-26 12:47:48 -0700 WebKit cannot remove nested bold tags 2009-10-28 10:33:23 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac (Intel) OS X 10.5 RESOLVED FIXED P3 Normal --- 30812 1 rniwa rniwa enrica eric justin.garcia oldest_to_newest 157875 0 rniwa 2009-10-26 12:47:48 -0700 WebKit fails to remove bold tags from "<b><b>hello</b></b>". Unbold it, and it produces "<b>hello</b>". Similarly, unbolding "<b><b>hello</b> world</b>" results in "<b>hello world</b>". We expect to get "hello" and "hello world" in respective cases. This bug is due to the fact executeToggleStyle compares the font weight with "bold" but triStateOfStyleInComputedStyle returns the value 700. Since "bold" != "700", triState is false and causes executeToogleStyle to bold the text instead of removing the bold. 158060 1 41926 rniwa 2009-10-26 19:34:32 -0700 Created attachment 41926 fixes the bug by making getPropertiesNotInComputedStyle more flexible 158062 2 41927 rniwa 2009-10-26 19:37:14 -0700 Created attachment 41927 fixes the bug by making getPropertiesNotInComputedStyle more flexible (fixed expected result) 158066 3 rniwa 2009-10-26 19:47:22 -0700 Since triStateOfStyleInComputedStyle calls getPropertiesNotInComputedStyle, I added new function getFontWeightValue in ApplyStyleCommand. getPropertiesNotInComputedStyle removes font-weight property from the style whenever the return value of getFontWeightValue match with that of the computed style. Because getFontWeightValue always converts the value of font-weight property to either 500 or 700, CSSValueBold and CSSValue700...900 will always match to each other. 158278 4 41927 darin 2009-10-27 11:26:54 -0700 Comment on attachment 41927 fixes the bug by making getPropertiesNotInComputedStyle more flexible (fixed expected result) > +int getFontWeightValue(CSSStyleDeclaration* style) { Naming here does not match the WebKit coding style. We use nouns to name functions with return values, not "get". I also think the word "value" is not so good here in the name. There is already a font weight value, and it's a CSSValue object. The name of the function needs to describe what it does. It seems to me that this function actually just returns a boolean stating whether or not the font weight is a "bold" weight. So it would probably be better to make a function named fontWeightIsBold that returns a boolean. Or perhaps you have plans for the future that involve multiple font weights and therefore want to use the font weight numbers. Formatting here does not match the WebKit coding style. The brace goes on the beginning of the next line. I think the code needs a comment explaining exactly why "there are only two font-weights for rich text editing purposes". A concrete explanation of this. > + case CSSValue100 : > + case CSSValue200 : > + case CSSValue300 : > + case CSSValue400 : > + case CSSValue500 : > + case CSSValueNormal : > + return 500; > + case CSSValueBold : > + case CSSValue600 : > + case CSSValue700 : > + case CSSValue800 : > + case CSSValue900 : > + return 700; Formatting here does not match the WebKit coding style. We don't line up the colons like this. Patch otherwise looks pretty good to me. review- because of the issues mentioned above 158311 5 41975 rniwa 2009-10-27 12:21:57 -0700 Created attachment 41975 fixed per Darin's comment 158319 6 41975 eric 2009-10-27 12:36:33 -0700 Comment on attachment 41975 fixed per Darin's comment LGTM. 158380 7 eric 2009-10-27 14:52:32 -0700 Yeah, the queue is kinda backed up at the moment. It may be faster for you to land by hand. Mostly it's backed up because the buildbots are so red. :( 158409 8 rniwa 2009-10-27 16:34:17 -0700 Landed as http://trac.webkit.org/changeset/50172. 41926 2009-10-26 19:34:32 -0700 2009-10-26 19:37:14 -0700 fixes the bug by making getPropertiesNotInComputedStyle more flexible fix30784 text/plain 5949 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDEyMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi S2l0IGNhbm5vdCByZW1vdmUgbmVzdGVkIGJvbGQgdGFncworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3ODQKKworICAgICAgICBUaGlzIHBhdGNoIG1v ZGlmaWVzIGdldFByb3BlcnRpZXNOb3RJbkNvbXB1dGVkU3R5bGUgc28gdGhhdCBpdCBjb21wYXJl cyBmb250LXdlaWdodAorICAgICAgICBtb3JlIGZsZXhpYmx5LiAgSW5zdGVhZCBvZiBjb21wYXJp bmcgY3NzVGV4dCwgaXQgdXNlcyBnZXRGb250V2VpZ2h0VmFsdWUgd2hpY2ggY29udmVydHMKKyAg ICAgICAgbm9ybWFsIG9yIGxpZ2h0ZXIgd2VpZ2h0cyB0byA1MDAgYW5kIGNvbnZlcnRzIGJvbGRl ciB3ZWlnaHRzIHRvIDcwMC4KKworICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0Rm9udFdlaWdodFZhbHVlKTogUmV0dXJucyBlaXRo ZXIgNTAwIG9yIDcwMC4KKyAgICAgICAgKFdlYkNvcmU6OmdldFByb3BlcnRpZXNOb3RJbkNvbXB1 dGVkU3R5bGUpOiBSZW1vdmVzIGZvbnQtd2VpZ2h0IHByb3BlcnR5CisgICAgICAgIGlmIHR3byBz dHlsZSBoYXZlIHRoZSBzYW1lIHZhbHVlIHVuZGVyIGdldEZvbnRXZWlnaHRWYWx1ZQorCiAyMDA5 LTEwLTI2ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9BcHBs eVN0eWxlQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5 bGVDb21tYW5kLmNwcAkocmV2aXNpb24gNTAwOTApCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlT dHlsZUNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzQsNiArMzM0LDM3IEBAIHN0YXRp YyB2b2lkIGRpZmZUZXh0RGVjb3JhdGlvbnMoQ1NTTXV0YWIKICAgICBzZXRUZXh0RGVjb3JhdGlv blByb3BlcnR5KHN0eWxlLCBuZXdUZXh0RGVjb3JhdGlvbi5nZXQoKSwgcHJvcGVydElEKTsKIH0K IAoraW50IGdldEZvbnRXZWlnaHRWYWx1ZShDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSkgewor ICAgIEFTU0VSVChzdHlsZSk7CisgICAgUmVmUHRyPENTU1ZhbHVlPiBmb250V2VpZ2h0ID0gc3R5 bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250V2VpZ2h0KTsKKworICAgIGlm ICghZm9udFdlaWdodCkKKyAgICAgICAgcmV0dXJuIDUwMDsKKyAgICBpZiAoIWZvbnRXZWlnaHQt PmlzUHJpbWl0aXZlVmFsdWUoKSkKKyAgICAgICAgcmV0dXJuIDUwMDsKKworICAgIC8vIFRoZXJl IGFyZSBvbmx5IHR3byBmb250LXdlaWdodHMgZm9yIHJpY2ggdGV4dCBlZGl0aW5nIHB1cnBvc2Vz OgorICAgIC8vIDUwMCBmb3Igbm9ybWFsIG9yIHVuYm9sZGVkIHRleHQgYW5kIDcwMCBmb3IgYm9s ZGVkIHRleHQuCisgICAgc3dpdGNoIChzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KGZv bnRXZWlnaHQuZ2V0KCkpLT5nZXRJZGVudCgpKSB7CisgICAgICAgIGNhc2UgQ1NTVmFsdWUxMDAg ICAgOgorICAgICAgICBjYXNlIENTU1ZhbHVlMjAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1 ZTMwMCAgICA6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU0MDAgICAgOgorICAgICAgICBjYXNlIENT U1ZhbHVlNTAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZU5vcm1hbCA6CisgICAgICAgICAg ICByZXR1cm4gNTAwOworICAgICAgICBjYXNlIENTU1ZhbHVlQm9sZCAgIDoKKyAgICAgICAgY2Fz ZSBDU1NWYWx1ZTYwMCAgICA6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU3MDAgICAgOgorICAgICAg ICBjYXNlIENTU1ZhbHVlODAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTkwMCAgICA6Cisg ICAgICAgICAgICByZXR1cm4gNzAwOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OyAvLyBGb3IgQ1NTVmFsdWVCb2xkZXIgYW5kIENTU1ZhbHVlTGlnaHRlcgorICAgIHJldHVybiAt MTsgLy8gTWFrZSBjb21waWxlciBoYXBweQorfQorCiBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVj bGFyYXRpb24+IGdldFByb3BlcnRpZXNOb3RJbkNvbXB1dGVkU3R5bGUoQ1NTU3R5bGVEZWNsYXJh dGlvbiogc3R5bGUsIENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbiogY29tcHV0ZWRTdHlsZSkK IHsKICAgICBBU1NFUlQoc3R5bGUpOwpAQCAtMzQ1LDYgKzM3Niw5IEBAIFJlZlB0cjxDU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbj4gZ2V0UHIKICAgICBkaWZmVGV4dERlY29yYXRpb25zKHJlc3Vs dC5nZXQoKSwgQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbiwgY29tcHV0ZWRUZXh0RGVjb3JhdGlv bnNJbkVmZmVjdC5nZXQoKSk7CiAgICAgZGlmZlRleHREZWNvcmF0aW9ucyhyZXN1bHQuZ2V0KCks IENTU1Byb3BlcnR5V2Via2l0VGV4dERlY29yYXRpb25zSW5FZmZlY3QsIGNvbXB1dGVkVGV4dERl Y29yYXRpb25zSW5FZmZlY3QuZ2V0KCkpOwogCisgICAgaWYgKGdldEZvbnRXZWlnaHRWYWx1ZShy ZXN1bHQuZ2V0KCkpID09IGdldEZvbnRXZWlnaHRWYWx1ZShjb21wdXRlZFN0eWxlKSkKKyAgICAg ICAgcmVzdWx0LT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRXZWlnaHQpOworCiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTAxMjApCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMC0y NiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgY2Fubm90IHJlbW92ZSBuZXN0ZWQg Ym9sZCB0YWdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDc4NAorCisgICAgICAgIEFkZHMgdHdvIG1vcmUgZWRnZSBjYXNlcyB0byByZW1vdmUtbmVz dGVkLWlubGluZS1zdHlsZXMuanM6CisgICAgICAgIDxiPjxiPjxiPjEyPC9iPjwvYj48L2I+IGFu ZCA8Yj48Yj48Yj4xPC9iPjwvYj4yPC9iPgorICAgICAgICBXZWJLaXQgbm93IHBhc3NlcyB0aGUg b25lIGV4aXN0aW5nIHRlc3QgdXNlZCB0byBmYWlsLgorCisgICAgICAgICogZWRpdGluZy9zdHls ZS9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGVk aXRpbmcvc3R5bGUvc2NyaXB0LXRlc3RzL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy5qczoK KwogMjAwOS0xMC0yNiAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCAtIFVwZGF0aW5nIGdldENvbXB1dGVkU3R5bGUgcmVzdWx0cyBm b3IgV2luZG93cy4KSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvcmVtb3ZlLW5lc3Rl ZC1pbmxpbmUtc3R5bGVzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL3N0eWxlL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDUwMDkwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9yZW1vdmUtbmVzdGVk LWlubGluZS1zdHlsZXMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01LDcgKzUsNyBA QCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBCiAKIFBBU1MgJzxzcGFu IGlkPSJlIj4xMjwvc3Bhbj4nIGlzICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+JwogUEFTUyAnPHNw YW4gaWQ9ImUiPjxzcGFuIGlkPSJmb28iPjEyPC9zcGFuPjwvc3Bhbj4nIGlzICc8c3BhbiBpZD0i ZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicKLUZBSUwgJzxzcGFuIGlkPSJlIj48 YiBpZD0iZm9vIj48Yj48Yj4xPC9iPjwvYj4yPC9iPjwvc3Bhbj4nIHNob3VsZCBiZSA8c3BhbiBp ZD0iZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPi4gV2FzIDxzcGFuIGlkPSJlIj48 YiBpZD0iZm9vIj48Yj48Yj4xPC9iPjwvYj4yPC9iPjwvc3Bhbj4uCitQQVNTICc8c3BhbiBpZD0i ZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicgaXMgJzxzcGFuIGlkPSJlIj48c3Bh biBpZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+JwogUEFTUyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFu PicgaXMgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nCiBQQVNTICc8c3BhbiBpZD0iZSI+MTI8L3Nw YW4+JyBpcyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvc2NyaXB0LXRlc3RzL3Jl bW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL3N0eWxlL3NjcmlwdC10ZXN0cy9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMuanMJ KHJldmlzaW9uIDUwMDkwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9zY3JpcHQtdGVz dHMvcmVtb3ZlLW5lc3RlZC1pbmxpbmUtc3R5bGVzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw2 ICsyNCw4IEBAIGZ1bmN0aW9uIHJlbW92ZVN0eWxlQW5kRXhwZWN0KGNvbW1hbmQsIGMKIHJlbW92 ZVN0eWxlQW5kRXhwZWN0KCdib2xkJywgJzxzcGFuIGlkPSJlIj48Yj4xPGI+MjwvYj48L2I+PC9z cGFuPicsICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CiByZW1vdmVTdHlsZUFuZEV4cGVjdCgn Ym9sZCcsICc8c3BhbiBpZD0iZSI+PGIgaWQ9ImZvbyI+MTxiPjI8L2I+PC9iPjwvc3Bhbj4nLCAn PHNwYW4gaWQ9ImUiPjxzcGFuIGlkPSJmb28iPjEyPC9zcGFuPjwvc3Bhbj4nKTsKIHJlbW92ZVN0 eWxlQW5kRXhwZWN0KCdib2xkJywgJzxzcGFuIGlkPSJlIj48YiBpZD0iZm9vIj48Yj4xPC9iPjI8 L2I+PC9zcGFuPicsICc8c3BhbiBpZD0iZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFu PicpOworcmVtb3ZlU3R5bGVBbmRFeHBlY3QoJ2JvbGQnLCAnPHNwYW4gaWQ9ImUiPjxiPjxiPjxi PjEyPC9iPjwvYj48L2I+PC9zcGFuPicsICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CityZW1v dmVTdHlsZUFuZEV4cGVjdCgnYm9sZCcsICc8c3BhbiBpZD0iZSI+PGI+PGI+PGI+MTwvYj48L2I+ MjwvYj48L3NwYW4+JywgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nKTsKIHJlbW92ZVN0eWxlQW5k RXhwZWN0KCdpdGFsaWMnLCAnPHNwYW4gaWQ9ImUiPjxpPjE8aT4yPC9pPjwvaT48L3NwYW4+Jywg JzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nKTsKIHJlbW92ZVN0eWxlQW5kRXhwZWN0KCdzdHJpa2VU aHJvdWdoJywgJzxzcGFuIGlkPSJlIj48cz4xPHM+Mjwvcz48L3M+PC9zcGFuPicsICc8c3BhbiBp ZD0iZSI+MTI8L3NwYW4+Jyk7CiAK 41927 2009-10-26 19:37:14 -0700 2009-10-27 12:21:57 -0700 fixes the bug by making getPropertiesNotInComputedStyle more flexible (fixed expected result) fix30784b text/plain 6067 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDEyMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi S2l0IGNhbm5vdCByZW1vdmUgbmVzdGVkIGJvbGQgdGFncworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3ODQKKworICAgICAgICBUaGlzIHBhdGNoIG1v ZGlmaWVzIGdldFByb3BlcnRpZXNOb3RJbkNvbXB1dGVkU3R5bGUgc28gdGhhdCBpdCBjb21wYXJl cyBmb250LXdlaWdodAorICAgICAgICBtb3JlIGZsZXhpYmx5LiAgSW5zdGVhZCBvZiBjb21wYXJp bmcgY3NzVGV4dCwgaXQgdXNlcyBnZXRGb250V2VpZ2h0VmFsdWUgd2hpY2ggY29udmVydHMKKyAg ICAgICAgbm9ybWFsIG9yIGxpZ2h0ZXIgd2VpZ2h0cyB0byA1MDAgYW5kIGNvbnZlcnRzIGJvbGRl ciB3ZWlnaHRzIHRvIDcwMC4KKworICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0Rm9udFdlaWdodFZhbHVlKTogUmV0dXJucyBlaXRo ZXIgNTAwIG9yIDcwMC4KKyAgICAgICAgKFdlYkNvcmU6OmdldFByb3BlcnRpZXNOb3RJbkNvbXB1 dGVkU3R5bGUpOiBSZW1vdmVzIGZvbnQtd2VpZ2h0IHByb3BlcnR5CisgICAgICAgIGlmIHR3byBz dHlsZSBoYXZlIHRoZSBzYW1lIHZhbHVlIHVuZGVyIGdldEZvbnRXZWlnaHRWYWx1ZQorCiAyMDA5 LTEwLTI2ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9BcHBs eVN0eWxlQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5 bGVDb21tYW5kLmNwcAkocmV2aXNpb24gNTAwOTApCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlT dHlsZUNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzQsNiArMzM0LDM3IEBAIHN0YXRp YyB2b2lkIGRpZmZUZXh0RGVjb3JhdGlvbnMoQ1NTTXV0YWIKICAgICBzZXRUZXh0RGVjb3JhdGlv blByb3BlcnR5KHN0eWxlLCBuZXdUZXh0RGVjb3JhdGlvbi5nZXQoKSwgcHJvcGVydElEKTsKIH0K IAoraW50IGdldEZvbnRXZWlnaHRWYWx1ZShDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSkgewor ICAgIEFTU0VSVChzdHlsZSk7CisgICAgUmVmUHRyPENTU1ZhbHVlPiBmb250V2VpZ2h0ID0gc3R5 bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250V2VpZ2h0KTsKKworICAgIGlm ICghZm9udFdlaWdodCkKKyAgICAgICAgcmV0dXJuIDUwMDsKKyAgICBpZiAoIWZvbnRXZWlnaHQt PmlzUHJpbWl0aXZlVmFsdWUoKSkKKyAgICAgICAgcmV0dXJuIDUwMDsKKworICAgIC8vIFRoZXJl IGFyZSBvbmx5IHR3byBmb250LXdlaWdodHMgZm9yIHJpY2ggdGV4dCBlZGl0aW5nIHB1cnBvc2Vz OgorICAgIC8vIDUwMCBmb3Igbm9ybWFsIG9yIHVuYm9sZGVkIHRleHQgYW5kIDcwMCBmb3IgYm9s ZGVkIHRleHQuCisgICAgc3dpdGNoIChzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KGZv bnRXZWlnaHQuZ2V0KCkpLT5nZXRJZGVudCgpKSB7CisgICAgICAgIGNhc2UgQ1NTVmFsdWUxMDAg ICAgOgorICAgICAgICBjYXNlIENTU1ZhbHVlMjAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1 ZTMwMCAgICA6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU0MDAgICAgOgorICAgICAgICBjYXNlIENT U1ZhbHVlNTAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZU5vcm1hbCA6CisgICAgICAgICAg ICByZXR1cm4gNTAwOworICAgICAgICBjYXNlIENTU1ZhbHVlQm9sZCAgIDoKKyAgICAgICAgY2Fz ZSBDU1NWYWx1ZTYwMCAgICA6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU3MDAgICAgOgorICAgICAg ICBjYXNlIENTU1ZhbHVlODAwICAgIDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTkwMCAgICA6Cisg ICAgICAgICAgICByZXR1cm4gNzAwOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OyAvLyBGb3IgQ1NTVmFsdWVCb2xkZXIgYW5kIENTU1ZhbHVlTGlnaHRlcgorICAgIHJldHVybiAt MTsgLy8gTWFrZSBjb21waWxlciBoYXBweQorfQorCiBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVj bGFyYXRpb24+IGdldFByb3BlcnRpZXNOb3RJbkNvbXB1dGVkU3R5bGUoQ1NTU3R5bGVEZWNsYXJh dGlvbiogc3R5bGUsIENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbiogY29tcHV0ZWRTdHlsZSkK IHsKICAgICBBU1NFUlQoc3R5bGUpOwpAQCAtMzQ1LDYgKzM3Niw5IEBAIFJlZlB0cjxDU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbj4gZ2V0UHIKICAgICBkaWZmVGV4dERlY29yYXRpb25zKHJlc3Vs dC5nZXQoKSwgQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbiwgY29tcHV0ZWRUZXh0RGVjb3JhdGlv bnNJbkVmZmVjdC5nZXQoKSk7CiAgICAgZGlmZlRleHREZWNvcmF0aW9ucyhyZXN1bHQuZ2V0KCks IENTU1Byb3BlcnR5V2Via2l0VGV4dERlY29yYXRpb25zSW5FZmZlY3QsIGNvbXB1dGVkVGV4dERl Y29yYXRpb25zSW5FZmZlY3QuZ2V0KCkpOwogCisgICAgaWYgKGdldEZvbnRXZWlnaHRWYWx1ZShy ZXN1bHQuZ2V0KCkpID09IGdldEZvbnRXZWlnaHRWYWx1ZShjb21wdXRlZFN0eWxlKSkKKyAgICAg ICAgcmVzdWx0LT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRXZWlnaHQpOworCiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTAxMjApCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMC0y NiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgY2Fubm90IHJlbW92ZSBuZXN0ZWQg Ym9sZCB0YWdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDc4NAorCisgICAgICAgIEFkZHMgdHdvIG1vcmUgZWRnZSBjYXNlcyB0byByZW1vdmUtbmVz dGVkLWlubGluZS1zdHlsZXMuanM6CisgICAgICAgIDxiPjxiPjxiPjEyPC9iPjwvYj48L2I+IGFu ZCA8Yj48Yj48Yj4xPC9iPjwvYj4yPC9iPgorICAgICAgICBXZWJLaXQgbm93IHBhc3NlcyB0aGUg b25lIGV4aXN0aW5nIHRlc3QgdXNlZCB0byBmYWlsLgorCisgICAgICAgICogZWRpdGluZy9zdHls ZS9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGVk aXRpbmcvc3R5bGUvc2NyaXB0LXRlc3RzL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy5qczoK KwogMjAwOS0xMC0yNiAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCAtIFVwZGF0aW5nIGdldENvbXB1dGVkU3R5bGUgcmVzdWx0cyBm b3IgV2luZG93cy4KSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvcmVtb3ZlLW5lc3Rl ZC1pbmxpbmUtc3R5bGVzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL3N0eWxlL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDUwMDkwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9yZW1vdmUtbmVzdGVk LWlubGluZS1zdHlsZXMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01LDcgKzUsOSBA QCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBCiAKIFBBU1MgJzxzcGFu IGlkPSJlIj4xMjwvc3Bhbj4nIGlzICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+JwogUEFTUyAnPHNw YW4gaWQ9ImUiPjxzcGFuIGlkPSJmb28iPjEyPC9zcGFuPjwvc3Bhbj4nIGlzICc8c3BhbiBpZD0i ZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicKLUZBSUwgJzxzcGFuIGlkPSJlIj48 YiBpZD0iZm9vIj48Yj48Yj4xPC9iPjwvYj4yPC9iPjwvc3Bhbj4nIHNob3VsZCBiZSA8c3BhbiBp ZD0iZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPi4gV2FzIDxzcGFuIGlkPSJlIj48 YiBpZD0iZm9vIj48Yj48Yj4xPC9iPjwvYj4yPC9iPjwvc3Bhbj4uCitQQVNTICc8c3BhbiBpZD0i ZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicgaXMgJzxzcGFuIGlkPSJlIj48c3Bh biBpZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+JworUEFTUyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFu PicgaXMgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nCitQQVNTICc8c3BhbiBpZD0iZSI+MTI8L3Nw YW4+JyBpcyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicKIFBBU1MgJzxzcGFuIGlkPSJlIj4xMjwv c3Bhbj4nIGlzICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+JwogUEFTUyAnPHNwYW4gaWQ9ImUiPjEy PC9zcGFuPicgaXMgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nCiBQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3N0eWxlL3NjcmlwdC10ZXN0 cy9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZWRpdGluZy9zdHlsZS9zY3JpcHQtdGVzdHMvcmVtb3ZlLW5lc3RlZC1pbmxpbmUtc3R5bGVz LmpzCShyZXZpc2lvbiA1MDA5MCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvc2NyaXB0 LXRlc3RzL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0eWxlcy5qcwkod29ya2luZyBjb3B5KQpAQCAt MjQsNiArMjQsOCBAQCBmdW5jdGlvbiByZW1vdmVTdHlsZUFuZEV4cGVjdChjb21tYW5kLCBjCiBy ZW1vdmVTdHlsZUFuZEV4cGVjdCgnYm9sZCcsICc8c3BhbiBpZD0iZSI+PGI+MTxiPjI8L2I+PC9i Pjwvc3Bhbj4nLCAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicpOwogcmVtb3ZlU3R5bGVBbmRFeHBl Y3QoJ2JvbGQnLCAnPHNwYW4gaWQ9ImUiPjxiIGlkPSJmb28iPjE8Yj4yPC9iPjwvYj48L3NwYW4+ JywgJzxzcGFuIGlkPSJlIj48c3BhbiBpZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+Jyk7CiByZW1v dmVTdHlsZUFuZEV4cGVjdCgnYm9sZCcsICc8c3BhbiBpZD0iZSI+PGIgaWQ9ImZvbyI+PGI+MTwv Yj4yPC9iPjwvc3Bhbj4nLCAnPHNwYW4gaWQ9ImUiPjxzcGFuIGlkPSJmb28iPjEyPC9zcGFuPjwv c3Bhbj4nKTsKK3JlbW92ZVN0eWxlQW5kRXhwZWN0KCdib2xkJywgJzxzcGFuIGlkPSJlIj48Yj48 Yj48Yj4xMjwvYj48L2I+PC9iPjwvc3Bhbj4nLCAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicpOwor cmVtb3ZlU3R5bGVBbmRFeHBlY3QoJ2JvbGQnLCAnPHNwYW4gaWQ9ImUiPjxiPjxiPjxiPjE8L2I+ PC9iPjI8L2I+PC9zcGFuPicsICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CiByZW1vdmVTdHls ZUFuZEV4cGVjdCgnaXRhbGljJywgJzxzcGFuIGlkPSJlIj48aT4xPGk+MjwvaT48L2k+PC9zcGFu PicsICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CiByZW1vdmVTdHlsZUFuZEV4cGVjdCgnc3Ry aWtlVGhyb3VnaCcsICc8c3BhbiBpZD0iZSI+PHM+MTxzPjI8L3M+PC9zPjwvc3Bhbj4nLCAnPHNw YW4gaWQ9ImUiPjEyPC9zcGFuPicpOwogCg== 41975 2009-10-27 12:21:57 -0700 2009-10-27 14:50:23 -0700 fixed per Darin's comment fix30784c text/plain 6114 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDE2NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMjcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi S2l0IGNhbm5vdCByZW1vdmUgbmVzdGVkIGJvbGQgdGFncworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3ODQKKworICAgICAgICBUaGlzIHBhdGNoIG1v ZGlmaWVzIGdldFByb3BlcnRpZXNOb3RJbkNvbXB1dGVkU3R5bGUgc28gdGhhdCBpdCBjb21wYXJl cyBmb250LXdlaWdodAorICAgICAgICBtb3JlIGZsZXhpYmx5LiBJbnN0ZWFkIG9mIGNvbXBhcmlu ZyBjc3NUZXh0LCBpdCB1c2VzIGZvbnRXZWlnaHRJc0JvbGQgd2hpY2ggY29udmVydHMKKyAgICAg ICAgYWxsIGZvbnQgd2VpZ2h0cyB0byBlaXRoZXIgYm9sZCBvciB1bmJvbGQgc3RhdGUuCisKKyAg ICAgICAgKiBlZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmZvbnRXZWlnaHRJc0JvbGQpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0UHJvcGVydGllc05vdElu Q29tcHV0ZWRTdHlsZSk6IFJlbW92ZXMgZm9udC13ZWlnaHQgcHJvcGVydHkKKyAgICAgICAgaWYg dHdvIHN0eWxlIGhhdmUgdGhlIHNhbWUgdmFsdWUgdW5kZXIgZ2V0Rm9udFdlaWdodFZhbHVlCisK IDIwMDktMTAtMjcgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9BcHBs eVN0eWxlQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5 bGVDb21tYW5kLmNwcAkocmV2aXNpb24gNTAwOTApCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlT dHlsZUNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzQsNiArMzM0LDM4IEBAIHN0YXRp YyB2b2lkIGRpZmZUZXh0RGVjb3JhdGlvbnMoQ1NTTXV0YWIKICAgICBzZXRUZXh0RGVjb3JhdGlv blByb3BlcnR5KHN0eWxlLCBuZXdUZXh0RGVjb3JhdGlvbi5nZXQoKSwgcHJvcGVydElEKTsKIH0K IAorYm9vbCBmb250V2VpZ2h0SXNCb2xkKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKQorewor ICAgIEFTU0VSVChzdHlsZSk7CisgICAgUmVmUHRyPENTU1ZhbHVlPiBmb250V2VpZ2h0ID0gc3R5 bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250V2VpZ2h0KTsKKworICAgIGlm ICghZm9udFdlaWdodCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZm9udFdlaWdo dC0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBC ZWNhdXNlIGIgdGFnIGNhbiBvbmx5IGJvbGQgdGV4dCwgdGhlcmUgYXJlIG9ubHkgdHdvIHN0YXRl cyBpbiBwbGFpbiBodG1sOiBib2xkIGFuZCBub3QgYm9sZC4KKyAgICAvLyBDb2xsYXBzZSBhbGwg b3RoZXIgdmFsdWVzIHRvIGVpdGhlciBvbmUgb2YgdGhlc2UgdHdvIHN0YXRlcyBmb3IgZWRpdGlu ZyBwdXJwb3Nlcy4KKyAgICBzd2l0Y2ggKHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4o Zm9udFdlaWdodC5nZXQoKSktPmdldElkZW50KCkpIHsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTEw MDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTIwMDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTMwMDoK KyAgICAgICAgY2FzZSBDU1NWYWx1ZTQwMDoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZTUwMDoKKyAg ICAgICAgY2FzZSBDU1NWYWx1ZU5vcm1hbDoKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgY2FzZSBDU1NWYWx1ZUJvbGQ6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU2MDA6CisgICAg ICAgIGNhc2UgQ1NTVmFsdWU3MDA6CisgICAgICAgIGNhc2UgQ1NTVmFsdWU4MDA6CisgICAgICAg IGNhc2UgQ1NTVmFsdWU5MDA6CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgLy8gRm9yIENTU1ZhbHVlQm9sZGVyIGFuZCBDU1NWYWx1 ZUxpZ2h0ZXIKKyAgICByZXR1cm4gZmFsc2U7IC8vIE1ha2UgY29tcGlsZXIgaGFwcHkKK30KKwog UmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBnZXRQcm9wZXJ0aWVzTm90SW5Db21w dXRlZFN0eWxlKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlLCBDU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb24qIGNvbXB1dGVkU3R5bGUpCiB7CiAgICAgQVNTRVJUKHN0eWxlKTsKQEAgLTM0NSw2 ICszNzcsOSBAQCBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IGdldFByCiAgICAg ZGlmZlRleHREZWNvcmF0aW9ucyhyZXN1bHQuZ2V0KCksIENTU1Byb3BlcnR5VGV4dERlY29yYXRp b24sIGNvbXB1dGVkVGV4dERlY29yYXRpb25zSW5FZmZlY3QuZ2V0KCkpOwogICAgIGRpZmZUZXh0 RGVjb3JhdGlvbnMocmVzdWx0LmdldCgpLCBDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9u c0luRWZmZWN0LCBjb21wdXRlZFRleHREZWNvcmF0aW9uc0luRWZmZWN0LmdldCgpKTsKIAorICAg IGlmIChmb250V2VpZ2h0SXNCb2xkKHJlc3VsdC5nZXQoKSkgPT0gZm9udFdlaWdodElzQm9sZChj b21wdXRlZFN0eWxlKSkKKyAgICAgICAgcmVzdWx0LT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0 eUZvbnRXZWlnaHQpOworCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApJbmRleDogTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNp b24gNTAxNjUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNyBAQAorMjAwOS0xMC0yNyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQg Y2Fubm90IHJlbW92ZSBuZXN0ZWQgYm9sZCB0YWdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDc4NAorCisgICAgICAgIEFkZHMgdHdvIG1vcmUgZWRn ZSBjYXNlcyB0byByZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMuanM6CisgICAgICAgIDxiPjxi PjxiPjEyPC9iPjwvYj48L2I+IGFuZCA8Yj48Yj48Yj4xPC9iPjwvYj4yPC9iPgorICAgICAgICBX ZWJLaXQgbm93IHBhc3NlcyB0aGUgb25lIGV4aXN0aW5nIHRlc3QgdXNlZCB0byBmYWlsLgorCisg ICAgICAgICogZWRpdGluZy9zdHlsZS9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMtZXhwZWN0 ZWQudHh0OiBBZGRlZCB0d28gdGVzdHMuCisgICAgICAgICogZWRpdGluZy9zdHlsZS9zY3JpcHQt dGVzdHMvcmVtb3ZlLW5lc3RlZC1pbmxpbmUtc3R5bGVzLmpzOiBBZGRlZCB0d28gdGVzdHMuCisK IDIwMDktMTAtMjcgIEFkZWxlIFBldGVyc29uICA8YWRlbGVAYXBwbGUuY29tPgogCiAgICAgICAg IFRlc3QgZm9yIDxyZGFyOi8vcHJvYmxlbS83MjY5MDc1PiBSRUdSRVNTSU9OIChTYWZhcmkgNC4w LjMtVG9UKTogQWZ0ZXIgcHJlc3NpbmcgU2hpZnQtUGFnZURvd24sIHByZXNzaW5nIFNoaWZ0LVVw IApJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9yZW1vdmUtbmVzdGVkLWlubGluZS1z dHlsZXMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvc3R5 bGUvcmVtb3ZlLW5lc3RlZC1pbmxpbmUtc3R5bGVzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNTAw OTApCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3N0eWxlL3JlbW92ZS1uZXN0ZWQtaW5saW5lLXN0 eWxlcy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTUsNyArNSw5IEBAIE9uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEEKIAogUEFTUyAnPHNwYW4gaWQ9ImUiPjEy PC9zcGFuPicgaXMgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nCiBQQVNTICc8c3BhbiBpZD0iZSI+ PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicgaXMgJzxzcGFuIGlkPSJlIj48c3BhbiBp ZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+JwotRkFJTCAnPHNwYW4gaWQ9ImUiPjxiIGlkPSJmb28i PjxiPjxiPjE8L2I+PC9iPjI8L2I+PC9zcGFuPicgc2hvdWxkIGJlIDxzcGFuIGlkPSJlIj48c3Bh biBpZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+LiBXYXMgPHNwYW4gaWQ9ImUiPjxiIGlkPSJmb28i PjxiPjxiPjE8L2I+PC9iPjI8L2I+PC9zcGFuPi4KK1BBU1MgJzxzcGFuIGlkPSJlIj48c3BhbiBp ZD0iZm9vIj4xMjwvc3Bhbj48L3NwYW4+JyBpcyAnPHNwYW4gaWQ9ImUiPjxzcGFuIGlkPSJmb28i PjEyPC9zcGFuPjwvc3Bhbj4nCitQQVNTICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+JyBpcyAnPHNw YW4gaWQ9ImUiPjEyPC9zcGFuPicKK1BBU1MgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nIGlzICc8 c3BhbiBpZD0iZSI+MTI8L3NwYW4+JwogUEFTUyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicgaXMg JzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nCiBQQVNTICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+JyBp cyAnPHNwYW4gaWQ9ImUiPjEyPC9zcGFuPicKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvc2NyaXB0LXRlc3RzL3JlbW92ZS1u ZXN0ZWQtaW5saW5lLXN0eWxlcy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5n L3N0eWxlL3NjcmlwdC10ZXN0cy9yZW1vdmUtbmVzdGVkLWlubGluZS1zdHlsZXMuanMJKHJldmlz aW9uIDUwMDkwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9zY3JpcHQtdGVzdHMvcmVt b3ZlLW5lc3RlZC1pbmxpbmUtc3R5bGVzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw2ICsyNCw4 IEBAIGZ1bmN0aW9uIHJlbW92ZVN0eWxlQW5kRXhwZWN0KGNvbW1hbmQsIGMKIHJlbW92ZVN0eWxl QW5kRXhwZWN0KCdib2xkJywgJzxzcGFuIGlkPSJlIj48Yj4xPGI+MjwvYj48L2I+PC9zcGFuPics ICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CiByZW1vdmVTdHlsZUFuZEV4cGVjdCgnYm9sZCcs ICc8c3BhbiBpZD0iZSI+PGIgaWQ9ImZvbyI+MTxiPjI8L2I+PC9iPjwvc3Bhbj4nLCAnPHNwYW4g aWQ9ImUiPjxzcGFuIGlkPSJmb28iPjEyPC9zcGFuPjwvc3Bhbj4nKTsKIHJlbW92ZVN0eWxlQW5k RXhwZWN0KCdib2xkJywgJzxzcGFuIGlkPSJlIj48YiBpZD0iZm9vIj48Yj4xPC9iPjI8L2I+PC9z cGFuPicsICc8c3BhbiBpZD0iZSI+PHNwYW4gaWQ9ImZvbyI+MTI8L3NwYW4+PC9zcGFuPicpOwor cmVtb3ZlU3R5bGVBbmRFeHBlY3QoJ2JvbGQnLCAnPHNwYW4gaWQ9ImUiPjxiPjxiPjxiPjEyPC9i PjwvYj48L2I+PC9zcGFuPicsICc8c3BhbiBpZD0iZSI+MTI8L3NwYW4+Jyk7CityZW1vdmVTdHls ZUFuZEV4cGVjdCgnYm9sZCcsICc8c3BhbiBpZD0iZSI+PGI+PGI+PGI+MTwvYj48L2I+MjwvYj48 L3NwYW4+JywgJzxzcGFuIGlkPSJlIj4xMjwvc3Bhbj4nKTsKIHJlbW92ZVN0eWxlQW5kRXhwZWN0 KCdpdGFsaWMnLCAnPHNwYW4gaWQ9ImUiPjxpPjE8aT4yPC9pPjwvaT48L3NwYW4+JywgJzxzcGFu IGlkPSJlIj4xMjwvc3Bhbj4nKTsKIHJlbW92ZVN0eWxlQW5kRXhwZWN0KCdzdHJpa2VUaHJvdWdo JywgJzxzcGFuIGlkPSJlIj48cz4xPHM+Mjwvcz48L3M+PC9zcGFuPicsICc8c3BhbiBpZD0iZSI+ MTI8L3NwYW4+Jyk7CiAK