40327 2010-06-08 13:19:51 -0700 Leftover calls to RenderStyle color accessors, which are no longer public methods. 2010-06-17 08:12:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 3251 1 cmsigler webkit-unassigned alex darin eric hyatt red47514f7 oldest_to_newest 235478 0 cmsigler 2010-06-08 13:19:51 -0700 Hi, I just filed Bug 40326, which causes WebCore/mathml/RenderMathMLRoot.cpp and WebCore/mathml/RenderMathMLSquareRoot.cpp to be re-included in the WebKitGtk build process for GtkLauncher. This change has uncovered some stale code that was made invalid by Rev. 59956. That rev. made RenderStyle color accessors private, but there are still a goodly number of calls, e.g. 'style()->color()', that lurk in a number of modules in the tree, including RenderMathMLRoot.cpp and RenderMathMLSquareRoot.cpp. All this stale code needs to be searched out and updated. I don't believe I can make this contribution myself; I don't know the correct method to update the code :^( Rev. 59956 is documented thusly: "Make the RenderStyle color accessors private. This forces callers to use visitedDependentColor instead (or to make the decision to become friends of the RenderStyle class in order to get access to the real style information)." Do all modules having 'style()->color()' calls simply need to declare themselves friends of RenderStyle? Is that simple solution really the correct solution??? Sorry I can't be of more help. Clemmitt 235747 1 cmsigler 2010-06-09 05:28:50 -0700 (In reply to comment #0) <snip> > made invalid by Rev. 59956. That rev. made RenderStyle color > accessors private, but there are still a goodly number of calls, > e.g. 'style()->color()', that lurk in a number of modules in the > tree, including RenderMathMLRoot.cpp and RenderMathMLSquareRoot.cpp. <snip> > Do all modules having 'style()->color()' calls simply need to declare > themselves friends of RenderStyle? Is that simple solution really > the correct solution??? OK, I have more of my wits about me this morning. If all existing 'style()->color()' calls are the only instances of offending out-of-date code, then this problem exists only in these three modules in the tree: WebKit/WebCore/rendering/RenderTreeAsText.cpp WebKit/WebCore/mathml/RenderMathMLRoot.cpp WebKit/WebCore/mathml/RenderMathMLSquareRoot.cpp I note that RenderTreeAsText.cpp isn't generating errors because WebCore/rendering/style/RenderStyle.h declares 'friend class RenderTreeAsText', so I'll try exactly the same solution: friend class RenderMathMLRoot friend class RenderMathMLSquareRoot in RenderStyle.h with corresponding FIXME comments like Dave Hyatt did in rev. 59956. Patch coming RSN. HTH. Clemmitt 235758 2 58239 cmsigler 2010-06-09 06:12:38 -0700 Created attachment 58239 Patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. Rev. 59956 made color accessors private, which keeps RenderMathMLRoot and RenderMathMLSquareRoot from building. This patch is a fix for that. 235808 3 58239 levin 2010-06-09 08:58:11 -0700 Comment on attachment 58239 Patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 60887) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,16 @@ > +2010-06-09 Clemmitt Sigler <cmsigler@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Add classes RenderMathMLRoot and RenderMathMLSquareRoot as friends > + of class RenderStyle to allow these two to build until rebaselining > + or a "correct" fix is implemented. Please add a bug link here and re-upload. 235867 4 cmsigler 2010-06-09 10:43:53 -0700 (In reply to comment #3) > Please add a bug link here and re-upload. Hi David, and thanks. Working.... Done, patch is against latest rev. 60899. Attaching corrected patch next. HTH. Clemmitt 235868 5 58257 cmsigler 2010-06-09 10:45:45 -0700 Created attachment 58257 Revised patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. Revised patch, obsoletes previous one. TIA. 237413 6 eric 2010-06-12 19:03:20 -0700 Why not just rebaseline the MathML results? do we even ahve any mathml layout test results? 237551 7 alex 2010-06-13 06:20:13 -0700 This doesn't seem like the correct way to update the code. Instead, we should just use: style()->visitedDependentColor(CSSPropertyColor) to replace the use of style()->color() 237930 8 58257 levin 2010-06-14 11:27:27 -0700 Comment on attachment 58257 Revised patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. Please consider Alex's suggestion. I guess the better fix is to get rid of the dependency that is causing these to be "friend class". PS I suspect this part of the comment is incorrect "Rebaselining should be performed to remove this." 238384 9 58778 alex 2010-06-15 08:15:41 -0700 Created attachment 58778 Fix to remove the use of color() and fixes a crash in the tests 238520 10 58778 levin 2010-06-15 13:32:14 -0700 Comment on attachment 58778 Fix to remove the use of color() and fixes a crash in the tests > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 61186) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,19 @@ > +2010-06-15 Alex Milowski <alex@milowski.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Fixed a compile error in the paint() methods by making them use the Extra space after them. > + new visitedDependentColor() method. Please add bug link. > + > + Fixed a crash in RenderMathMLRoot with the tests where there were > + bad assumptions about the children in the layout. This would be better as a function comment (for RenderMathMLRoot::layout). 238679 11 alex 2010-06-15 23:13:21 -0700 (In reply to comment #10) > (From update of attachment 58778 [details]) > > Index: WebCore/ChangeLog > > =================================================================== > > --- WebCore/ChangeLog (revision 61186) > > +++ WebCore/ChangeLog (working copy) > > @@ -1,3 +1,19 @@ > > +2010-06-15 Alex Milowski <alex@milowski.com> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Fixed a compile error in the paint() methods by making them use the > > Extra space after them. *sigh* Really? > > > + new visitedDependentColor() method. > > Please add bug link. Bug link to what bug? > > > + > > + Fixed a crash in RenderMathMLRoot with the tests where there were > > + bad assumptions about the children in the layout. > > This would be better as a function comment (for RenderMathMLRoot::layout). No, not really. There would be no useful comment to add for either of the two changes that would enhance the understanding of the code relating to the current status and the fix for the above code. Of course, you can always argue for more comments in general in the layout() method, but not relating to the fix for this crash. What mark it review+ when you don't like the ChangeLog entry? 238821 12 58889 alex 2010-06-16 05:43:10 -0700 Created attachment 58889 Updated patch in response to comments. 238824 13 alex 2010-06-16 05:45:23 -0700 (In reply to comment #6) > Why not just rebaseline the MathML results? do we even ahve any mathml layout test results? Yes, there are layout tests for MathML. They all now need to be re-baselined. Recent changes have made the layout change slightly. This patch does not address that. I will submit a different patch with some tweaks and a new baseline. 238890 14 58889 darin 2010-06-16 08:13:00 -0700 Comment on attachment 58889 Updated patch in response to comments. > - RenderBlock* container = new (renderArena()) RenderBlock(node()); > + RenderBlock* container = new (renderArena()) RenderMathMLBlock(node()); What does this change have to do with the bug you're fixing? This seems OK to change, but unrelated to the change log or other changes. > > - RenderBlock* container = new (renderArena()) RenderBlock(node()); > + RenderBlock* container = new (renderArena()) RenderMathMLBlock(node()); Ditto. > - toRenderMathMLBlock(current)->style()->setVerticalAlign(BASELINE); > + // FIXME: should we really be setting the vertical align here? > + current->style()->setVerticalAlign(BASELINE); Comment sentence should be capitalized. Also, would be better if the comment said why it's questionable. As it is, the comment just says "should this next line of code exist", which doesn't give context for what your doubt is. > + // Adjust the bottom position of the index. > indexBox->style()->setBottom(Length(radicalHeight + style()->paddingBottom().value(), Fixed)); This comment says the same thing the line of code does. We normally leave those out, and make sure comments say something the code does not say. Patch otherwise looks fine. review- because of the seemingly unrelated changes 238904 15 alex 2010-06-16 08:45:00 -0700 > > Patch otherwise looks fine. review- because of the seemingly unrelated changes Did you look at the comments in this bug? There is a crash caused by this code as well that I am fixing. The previous reviewer denied the review because I documented that in the change log. Now you're denying the patch because I'm including it. Quite untenable. 238920 16 darin 2010-06-16 09:26:26 -0700 (In reply to comment #15) > The previous reviewer denied the review because I documented that in the change log. I just read David’s comments; he suggested that the comment from the change log go into a comment in the the source file instead. You disagreed and instead deleted the explanation entirely. That was a mistake. If you strongly felt a comment should not go in the source file, then you should have left it in the change log. Checking in a change with no explanation at all is wrong. You can check with him, but I’m sure David and I both agree on that. 238928 17 alex 2010-06-16 09:47:44 -0700 (In reply to comment #16) > (In reply to comment #15) > > The previous reviewer denied the review because I documented that in the change log. > > I just read David’s comments; he suggested that the comment from the change log go into a comment in the the source file instead. You disagreed and instead deleted the explanation entirely. That was a mistake. > > If you strongly felt a comment should not go in the source file, then you should have left it in the change log. > > Checking in a change with no explanation at all is wrong. You can check with him, but I’m sure David and I both agree on that. I'm just trying to push this all along. I deleted the comment from the change log against my better judgement trying to see if I can get my code changes in so this will compile again. My general experience is that reviewer are very inconsistent in terms of what they expect. So, next I'll submit a patch that you like and someone else will review it and they'll deny it on the basis of the changes you expect. ...and then the cycle starts again. 238929 18 darin 2010-06-16 09:56:29 -0700 I’m sorry you’re frustrated. You have a review+ from David Levin, so you could be getting that patch committed. He asked for a three minor, optional tweaks and gave you a review+. I think you’re twisting yourself up in knots for no good reason here. Removing all explanation of the change from the patch was wrong, and that’s why I did review-. Nothing deeper than that. No infinite sequence of reviews required. 238975 19 58909 alex 2010-06-16 11:19:33 -0700 Created attachment 58909 Update patch yet again. 239391 20 red47514f7 2010-06-17 07:59:11 -0700 *** Bug 40773 has been marked as a duplicate of this bug. *** 239400 21 58909 darin 2010-06-17 08:12:08 -0700 Comment on attachment 58909 Update patch yet again. Clearing flags on attachment: 58909 Committed r61326: <http://trac.webkit.org/changeset/61326> 239401 22 darin 2010-06-17 08:12:14 -0700 All reviewed patches have been landed. Closing bug. 58239 2010-06-09 06:12:38 -0700 2010-06-09 10:45:45 -0700 Patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. renderstyle_fix.patch text/plain 1825 cmsigler SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDg4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDYtMDkgIENsZW1taXR0IFNpZ2xlciAgPGNtc2lnbGVyQGdt YWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgY2xhc3NlcyBSZW5kZXJNYXRoTUxSb290IGFuZCBSZW5kZXJNYXRoTUxTcXVhcmVSb290 IGFzIGZyaWVuZHMKKyAgICAgICAgb2YgY2xhc3MgUmVuZGVyU3R5bGUgdG8gYWxsb3cgdGhlc2Ug dHdvIHRvIGJ1aWxkIHVudGlsIHJlYmFzZWxpbmluZworICAgICAgICBvciBhICJjb3JyZWN0IiBm aXggaXMgaW1wbGVtZW50ZWQuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkg c28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl Lmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDEwLTA2LTA5ICBDc2FiYSBPc3p0cm9nb27D oWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGlyayBTY2h1bHpl LgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiA2MDg4 NykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEyMSw2ICsxMjEsOCBAQCBjbGFzcyBSZW5kZXJTdHlsZTogcHVibGljIFJlZkNvdW50 ZWQ8UmVuCiAgICAgZnJpZW5kIGNsYXNzIFByb3BlcnR5V3JhcHBlck1heWJlSW52YWxpZENvbG9y OyAvLyBVc2VkIGJ5IENTUyBhbmltYXRpb25zLiBXZSBjYW4ndCBhbGxvdyB0aGVtIHRvIGFuaW1h dGUgYmFzZWQgb2ZmIHZpc2l0ZWQgY29sb3JzLgogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJTVkdS ZXNvdXJjZTsgLy8gRklYTUU6IE5lZWRzIHRvIGFsdGVyIHRoZSB2aXNpdGVkIHN0YXRlIGJ5IGhh bmQuIFNob3VsZCBjbGVhbiB0aGUgU1ZHIGNvZGUgdXAgYW5kIG1vdmUgaXQgaW50byBSZW5kZXJT dHlsZSBwZXJoYXBzLgogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJUcmVlQXNUZXh0OyAvLyBGSVhN RTogT25seSBuZWVkZWQgc28gdGhlIHJlbmRlciB0cmVlIGNhbiBrZWVwIGx5aW5nIGFuZCBkdW1w IHRoZSB3cm9uZyBjb2xvcnMuICBSZWJhc2VsaW5pbmcgd291bGQgYWxsb3cgdGhpcyB0byBiZSB5 YW5rZWQuCisgICAgZnJpZW5kIGNsYXNzIFJlbmRlck1hdGhNTFJvb3Q7IC8vIEZJWE1FOiBBZGRl ZCBvdXQgb2Ygc2FtZSBuZWVkIGFzIFJlbmRlclRyZWVBc1RleHQgYWJvdmUuICBSZWJhc2VsaW5p bmcgc2hvdWxkIGJlIHBlcmZvcm1lZCB0byByZW1vdmUgdGhpcy4KKyAgICBmcmllbmQgY2xhc3Mg UmVuZGVyTWF0aE1MU3F1YXJlUm9vdDsgLy8gRklYTUU6IEFkZGVkIG91dCBvZiBzYW1lIG5lZWQg YXMgUmVuZGVyVHJlZUFzVGV4dCBhYm92ZS4gIFJlYmFzZWxpbmluZyBzaG91bGQgYmUgcGVyZm9y bWVkIHRvIHJlbW92ZSB0aGlzLgogcHJvdGVjdGVkOgogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBi aXRmaWVsZCBpcyAzMi1iaXRzIGxvbmcsIHdoaWNoIG9wdGltaXplcyBwYWRkaW5nIHdpdGggdGhl Cg== 58257 2010-06-09 10:45:45 -0700 2010-06-14 11:27:26 -0700 Revised patch to get RenderMathMLRoot and RenderMathMLSquareRoot to build after rev. 59956. renderstyle_fix_new.patch text/plain 1884 cmsigler SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDg5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMDkgIENsZW1taXR0IFNpZ2xlciAgPGNtc2lnbGVyQGdt YWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgY2xhc3NlcyBSZW5kZXJNYXRoTUxSb290IGFuZCBSZW5kZXJNYXRoTUxTcXVhcmVSb290 IGFzIGZyaWVuZHMKKyAgICAgICAgb2YgY2xhc3MgUmVuZGVyU3R5bGUgdG8gYWxsb3cgdGhlc2Ug dHdvIG1vZHVsZXMgdG8gYnVpbGQgdW50aWwKKyAgICAgICAgcmViYXNlbGluaW5nIG9yIGEgIm1v cmUgY29ycmVjdCIgZml4IGlzIGltcGxlbWVudGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMjcKKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVu Y3Rpb25hbGl0eSBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisKIDIwMTAtMDYtMDkgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFy dGguCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDYw ODk5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBj b3B5KQpAQCAtMTIxLDYgKzEyMSw4IEBAIGNsYXNzIFJlbmRlclN0eWxlOiBwdWJsaWMgUmVmQ291 bnRlZDxSZW4KICAgICBmcmllbmQgY2xhc3MgUHJvcGVydHlXcmFwcGVyTWF5YmVJbnZhbGlkQ29s b3I7IC8vIFVzZWQgYnkgQ1NTIGFuaW1hdGlvbnMuIFdlIGNhbid0IGFsbG93IHRoZW0gdG8gYW5p bWF0ZSBiYXNlZCBvZmYgdmlzaXRlZCBjb2xvcnMuCiAgICAgZnJpZW5kIGNsYXNzIFJlbmRlclNW R1Jlc291cmNlOyAvLyBGSVhNRTogTmVlZHMgdG8gYWx0ZXIgdGhlIHZpc2l0ZWQgc3RhdGUgYnkg aGFuZC4gU2hvdWxkIGNsZWFuIHRoZSBTVkcgY29kZSB1cCBhbmQgbW92ZSBpdCBpbnRvIFJlbmRl clN0eWxlIHBlcmhhcHMuCiAgICAgZnJpZW5kIGNsYXNzIFJlbmRlclRyZWVBc1RleHQ7IC8vIEZJ WE1FOiBPbmx5IG5lZWRlZCBzbyB0aGUgcmVuZGVyIHRyZWUgY2FuIGtlZXAgbHlpbmcgYW5kIGR1 bXAgdGhlIHdyb25nIGNvbG9ycy4gIFJlYmFzZWxpbmluZyB3b3VsZCBhbGxvdyB0aGlzIHRvIGJl IHlhbmtlZC4KKyAgICBmcmllbmQgY2xhc3MgUmVuZGVyTWF0aE1MUm9vdDsgLy8gRklYTUU6IEFk ZGVkIG91dCBvZiBzYW1lIG5lZWQgYXMgUmVuZGVyVHJlZUFzVGV4dCBhYm92ZS4gIFJlYmFzZWxp bmluZyBzaG91bGQgYmUgcGVyZm9ybWVkIHRvIHJlbW92ZSB0aGlzLgorICAgIGZyaWVuZCBjbGFz cyBSZW5kZXJNYXRoTUxTcXVhcmVSb290OyAvLyBGSVhNRTogQWRkZWQgb3V0IG9mIHNhbWUgbmVl ZCBhcyBSZW5kZXJUcmVlQXNUZXh0IGFib3ZlLiAgUmViYXNlbGluaW5nIHNob3VsZCBiZSBwZXJm b3JtZWQgdG8gcmVtb3ZlIHRoaXMuCiBwcm90ZWN0ZWQ6CiAKICAgICAvLyBUaGUgZm9sbG93aW5n IGJpdGZpZWxkIGlzIDMyLWJpdHMgbG9uZywgd2hpY2ggb3B0aW1pemVzIHBhZGRpbmcgd2l0aCB0 aGUK 58778 2010-06-15 08:15:41 -0700 2010-06-16 05:43:10 -0700 Fix to remove the use of color() and fixes a crash in the tests WebKit-mathml-update.patch text/plain 2844 alex SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTE4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDYtMTUgIEFsZXggTWlsb3dza2kgIDxhbGV4QG1pbG93c2tp LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlZCBhIGNvbXBpbGUgZXJyb3IgaW4gdGhlIHBhaW50KCkgbWV0aG9kcyBieSBtYWtpbmcgdGhl bSAgdXNlIHRoZSAKKyAgICAgICAgbmV3IHZpc2l0ZWREZXBlbmRlbnRDb2xvcigpIG1ldGhvZC4K KworICAgICAgICBGaXhlZCBhIGNyYXNoIGluIFJlbmRlck1hdGhNTFJvb3Qgd2l0aCB0aGUgdGVz dHMgd2hlcmUgdGhlcmUgd2VyZSAKKyAgICAgICAgYmFkIGFzc3VtcHRpb25zIGFib3V0IHRoZSBj aGlsZHJlbiBpbiB0aGUgbGF5b3V0LgorCisgICAgICAgICogbWF0aG1sL1JlbmRlck1hdGhNTFJv b3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MUm9vdDo6cGFpbnQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MUm9vdDo6bGF5b3V0KToKKyAgICAgICAgKiBtYXRo bWwvUmVuZGVyTWF0aE1MU3F1YXJlUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN YXRoTUxTcXVhcmVSb290OjpwYWludCk6CisKIDIwMTAtMDYtMTUgIFpoZW55YW8gTW8gIDx6bW9A Z29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4 OiBXZWJDb3JlL21hdGhtbC9SZW5kZXJNYXRoTUxSb290LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL21hdGhtbC9SZW5kZXJNYXRoTUxSb290LmNwcAkocmV2aXNpb24gNjEwODcpCisrKyBXZWJD b3JlL21hdGhtbC9SZW5kZXJNYXRoTUxSb290LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ1LDcg KzE0NSw3IEBAIHZvaWQgUmVuZGVyTWF0aE1MUm9vdDo6cGFpbnQoUGFpbnRJbmZvJiAKICAgICAK ICAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZVRoaWNrbmVzcyhnUmFkaWNhbExpbmVUaGlja25l c3MgKiBzdHlsZSgpLT5mb250U2l6ZSgpKTsKICAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZVN0 eWxlKFNvbGlkU3Ryb2tlKTsKLSAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZUNvbG9yKHN0eWxl KCktPmNvbG9yKCksIHNSR0JDb2xvclNwYWNlKTsKKyAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9r ZUNvbG9yKHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwg c1JHQkNvbG9yU3BhY2UpOwogICAgIGluZm8uY29udGV4dC0+c2V0TGluZUpvaW4oTWl0ZXJKb2lu KTsKICAgICBpbmZvLmNvbnRleHQtPnNldE1pdGVyTGltaXQoc3R5bGUoKS0+Zm9udFNpemUoKSk7 CiAgICAgCkBAIC0yMDUsNyArMjA1LDcgQEAgdm9pZCBSZW5kZXJNYXRoTUxSb290OjpsYXlvdXQo KQogICAgIAogICAgIFJlbmRlck9iamVjdCogY3VycmVudCA9IGxhc3RDaGlsZCgpLT5maXJzdENo aWxkKCk7CiAgICAgCi0gICAgdG9SZW5kZXJNYXRoTUxCbG9jayhjdXJyZW50KS0+c3R5bGUoKS0+ c2V0VmVydGljYWxBbGlnbihCQVNFTElORSk7CisgICAgY3VycmVudC0+c3R5bGUoKS0+c2V0VmVy dGljYWxBbGlnbihCQVNFTElORSk7CiAgICAgCiAgICAgaWYgKCFtYXhIZWlnaHQpCiAgICAgICAg IG1heEhlaWdodCA9IHN0eWxlKCktPmZvbnRTaXplKCk7CkBAIC0yNDAsNiArMjQwLDcgQEAgdm9p ZCBSZW5kZXJNYXRoTUxSb290OjpsYXlvdXQoKQogICAgIFJlbmRlckJsb2NrOjpsYXlvdXQoKTsK ICAgICAKICAgICBpbmRleEJveC0+c3R5bGUoKS0+c2V0Qm90dG9tKExlbmd0aChyYWRpY2FsSGVp Z2h0ICsgc3R5bGUoKS0+cGFkZGluZ0JvdHRvbSgpLnZhbHVlKCksIEZpeGVkKSk7CisgICAgaW5k ZXhCb3gtPnNldE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOwogICAgIAogICAgIGlu ZGV4Qm94LT5sYXlvdXQoKTsKIH0KSW5kZXg6IFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhNTFNx dWFyZVJvb3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhNTFNx dWFyZVJvb3QuY3BwCShyZXZpc2lvbiA2MTA4NykKKysrIFdlYkNvcmUvbWF0aG1sL1JlbmRlck1h dGhNTFNxdWFyZVJvb3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTQsNyArMTE0LDcgQEAgdm9p ZCBSZW5kZXJNYXRoTUxTcXVhcmVSb290OjpwYWludChQYWludAogICAgIAogICAgIGluZm8uY29u dGV4dC0+c2V0U3Ryb2tlVGhpY2tuZXNzKGdSYWRpY2FsTGluZVRoaWNrbmVzcyAqIHN0eWxlKCkt PmZvbnRTaXplKCkpOwogICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoU29saWRTdHJv a2UpOwotICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlQ29sb3Ioc3R5bGUoKS0+Y29sb3IoKSwg c1JHQkNvbG9yU3BhY2UpOworICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlQ29sb3Ioc3R5bGUo KS0+dmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpLCBzUkdCQ29sb3JTcGFj ZSk7CiAgICAgaW5mby5jb250ZXh0LT5zZXRMaW5lSm9pbihNaXRlckpvaW4pOwogICAgIGluZm8u Y29udGV4dC0+c2V0TWl0ZXJMaW1pdChzdHlsZSgpLT5mb250U2l6ZSgpKTsKICAgICAK 58889 2010-06-16 05:43:10 -0700 2010-06-16 11:19:33 -0700 Updated patch in response to comments. WebKit-mathml-update.patch text/plain 4259 alex SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTE4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMTUgIEFsZXggTWlsb3dza2kgIDxhbGV4QG1pbG93c2tp LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlZCBhIGNvbXBpbGUgZXJyb3IgaW4gdGhlIHBhaW50KCkgbWV0aG9kcyBieSBtYWtpbmcgdGhl bSB1c2UgdGhlIAorICAgICAgICBuZXcgdmlzaXRlZERlcGVuZGVudENvbG9yKCkgbWV0aG9kLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMjcKKwor ICAgICAgICAqIG1hdGhtbC9SZW5kZXJNYXRoTUxSb290LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck1hdGhNTFJvb3Q6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhN TFJvb3Q6OmxheW91dCk6CisgICAgICAgICogbWF0aG1sL1JlbmRlck1hdGhNTFNxdWFyZVJvb3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MU3F1YXJlUm9vdDo6cGFpbnQpOgor CiAyMDEwLTA2LTE1ICBaaGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0 aE1MT3BlcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhN TE9wZXJhdG9yLmNwcAkocmV2aXNpb24gNjEwODcpCisrKyBXZWJDb3JlL21hdGhtbC9SZW5kZXJN YXRoTUxPcGVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw3ICsxNjUsNyBAQCB2b2lk IFJlbmRlck1hdGhNTE9wZXJhdG9yOjp1cGRhdGVGcm9tRWxlCiAgICAgLy8gRWl0aGVyIHN0cmV0 Y2ggaXMgZGlzYWJsZWQgb3Igd2UgZG9uJ3QgaGF2ZSBhIHN0cmV0Y2hhYmxlIGNoYXJhY3RlciBv dmVyIHRoZSBtaW5pbXVtIGhlaWdodAogICAgIGlmIChzdHJldGNoRGlzYWJsZWQgfHwgIXNob3Vs ZFN0cmV0Y2gpIHsKICAgICAgICAgbV9pc1N0YWNrZWQgPSBmYWxzZTsKLSAgICAgICAgUmVuZGVy QmxvY2sqIGNvbnRhaW5lciA9IG5ldyAocmVuZGVyQXJlbmEoKSkgUmVuZGVyQmxvY2sobm9kZSgp KTsKKyAgICAgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciA9IG5ldyAocmVuZGVyQXJlbmEoKSkg UmVuZGVyTWF0aE1MQmxvY2sobm9kZSgpKTsKICAgICAgICAgCiAgICAgICAgIFJlZlB0cjxSZW5k ZXJTdHlsZT4gbmV3U3R5bGUgPSBSZW5kZXJTdHlsZTo6Y3JlYXRlKCk7CiAgICAgICAgIG5ld1N0 eWxlLT5pbmhlcml0RnJvbShzdHlsZSgpKTsKQEAgLTI5Niw3ICsyOTYsNyBAQCBSZWZQdHI8UmVu ZGVyU3R5bGU+IFJlbmRlck1hdGhNTE9wZXJhdG9yCiAKIFJlbmRlckJsb2NrKiBSZW5kZXJNYXRo TUxPcGVyYXRvcjo6Y3JlYXRlR2x5cGgoVUNoYXIgZ2x5cGgsIGludCBzaXplLCBpbnQgY2hhclJl bGF0aXZlLCBpbnQgdG9wUmVsYXRpdmUpCiB7Ci0gICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5lciA9 IG5ldyAocmVuZGVyQXJlbmEoKSkgUmVuZGVyQmxvY2sobm9kZSgpKTsKKyAgICBSZW5kZXJCbG9j ayogY29udGFpbmVyID0gbmV3IChyZW5kZXJBcmVuYSgpKSBSZW5kZXJNYXRoTUxCbG9jayhub2Rl KCkpOwogICAgIGNvbnRhaW5lci0+c2V0U3R5bGUoY3JlYXRlU3RhY2thYmxlU3R5bGUoc2l6ZSwg dG9wUmVsYXRpdmUpLnJlbGVhc2UoKSk7CiAgICAgYWRkQ2hpbGQoY29udGFpbmVyKTsKICAgICBS ZW5kZXJCbG9jayogcGFyZW50ID0gY29udGFpbmVyOwpJbmRleDogV2ViQ29yZS9tYXRobWwvUmVu ZGVyTWF0aE1MUm9vdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0 aE1MUm9vdC5jcHAJKHJldmlzaW9uIDYxMDg3KQorKysgV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0 aE1MUm9vdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NSw3ICsxNDUsNyBAQCB2b2lkIFJlbmRl ck1hdGhNTFJvb3Q6OnBhaW50KFBhaW50SW5mbyYgCiAgICAgCiAgICAgaW5mby5jb250ZXh0LT5z ZXRTdHJva2VUaGlja25lc3MoZ1JhZGljYWxMaW5lVGhpY2tuZXNzICogc3R5bGUoKS0+Zm9udFNp emUoKSk7CiAgICAgaW5mby5jb250ZXh0LT5zZXRTdHJva2VTdHlsZShTb2xpZFN0cm9rZSk7Ci0g ICAgaW5mby5jb250ZXh0LT5zZXRTdHJva2VDb2xvcihzdHlsZSgpLT5jb2xvcigpLCBzUkdCQ29s b3JTcGFjZSk7CisgICAgaW5mby5jb250ZXh0LT5zZXRTdHJva2VDb2xvcihzdHlsZSgpLT52aXNp dGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlDb2xvciksIHNSR0JDb2xvclNwYWNlKTsKICAg ICBpbmZvLmNvbnRleHQtPnNldExpbmVKb2luKE1pdGVySm9pbik7CiAgICAgaW5mby5jb250ZXh0 LT5zZXRNaXRlckxpbWl0KHN0eWxlKCktPmZvbnRTaXplKCkpOwogICAgIApAQCAtMjA1LDcgKzIw NSw4IEBAIHZvaWQgUmVuZGVyTWF0aE1MUm9vdDo6bGF5b3V0KCkKICAgICAKICAgICBSZW5kZXJP YmplY3QqIGN1cnJlbnQgPSBsYXN0Q2hpbGQoKS0+Zmlyc3RDaGlsZCgpOwogICAgIAotICAgIHRv UmVuZGVyTWF0aE1MQmxvY2soY3VycmVudCktPnN0eWxlKCktPnNldFZlcnRpY2FsQWxpZ24oQkFT RUxJTkUpOworICAgIC8vIEZJWE1FOiBzaG91bGQgd2UgcmVhbGx5IGJlIHNldHRpbmcgdGhlIHZl cnRpY2FsIGFsaWduIGhlcmU/CisgICAgY3VycmVudC0+c3R5bGUoKS0+c2V0VmVydGljYWxBbGln bihCQVNFTElORSk7CiAgICAgCiAgICAgaWYgKCFtYXhIZWlnaHQpCiAgICAgICAgIG1heEhlaWdo dCA9IHN0eWxlKCktPmZvbnRTaXplKCk7CkBAIC0yMzgsOSArMjM5LDEyIEBAIHZvaWQgUmVuZGVy TWF0aE1MUm9vdDo6bGF5b3V0KCkKICAgICBzZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNh bGMoKTsKICAgICBtYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dCgpOwogICAgIFJlbmRlckJs b2NrOjpsYXlvdXQoKTsKLSAgICAKKworICAgIC8vIEFkanVzdCB0aGUgYm90dG9tIHBvc2l0aW9u IG9mIHRoZSBpbmRleC4KICAgICBpbmRleEJveC0+c3R5bGUoKS0+c2V0Qm90dG9tKExlbmd0aChy YWRpY2FsSGVpZ2h0ICsgc3R5bGUoKS0+cGFkZGluZ0JvdHRvbSgpLnZhbHVlKCksIEZpeGVkKSk7 CiAgICAgCisgICAgLy8gTm93IHRoYXQgd2UndmUgcG90ZW50aWFsbHkgY2hhbmdlZCBpdHMgcG9z aXRpb24sIHdlIG5lZWQgbGF5b3V0IHRoZSBpbmRleCBhZ2Fpbi4KKyAgICBpbmRleEJveC0+c2V0 TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7CiAgICAgaW5kZXhCb3gtPmxheW91dCgp OwogfQogICAgIApJbmRleDogV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0aE1MU3F1YXJlUm9vdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0aE1MU3F1YXJlUm9vdC5j cHAJKHJldmlzaW9uIDYxMDg3KQorKysgV2ViQ29yZS9tYXRobWwvUmVuZGVyTWF0aE1MU3F1YXJl Um9vdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw3ICsxMTQsNyBAQCB2b2lkIFJlbmRlck1h dGhNTFNxdWFyZVJvb3Q6OnBhaW50KFBhaW50CiAgICAgCiAgICAgaW5mby5jb250ZXh0LT5zZXRT dHJva2VUaGlja25lc3MoZ1JhZGljYWxMaW5lVGhpY2tuZXNzICogc3R5bGUoKS0+Zm9udFNpemUo KSk7CiAgICAgaW5mby5jb250ZXh0LT5zZXRTdHJva2VTdHlsZShTb2xpZFN0cm9rZSk7Ci0gICAg aW5mby5jb250ZXh0LT5zZXRTdHJva2VDb2xvcihzdHlsZSgpLT5jb2xvcigpLCBzUkdCQ29sb3JT cGFjZSk7CisgICAgaW5mby5jb250ZXh0LT5zZXRTdHJva2VDb2xvcihzdHlsZSgpLT52aXNpdGVk RGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlDb2xvciksIHNSR0JDb2xvclNwYWNlKTsKICAgICBp bmZvLmNvbnRleHQtPnNldExpbmVKb2luKE1pdGVySm9pbik7CiAgICAgaW5mby5jb250ZXh0LT5z ZXRNaXRlckxpbWl0KHN0eWxlKCktPmZvbnRTaXplKCkpOwogICAgIAo= 58909 2010-06-16 11:19:33 -0700 2010-06-17 08:12:07 -0700 Update patch yet again. WebKit-mathml-update.patch text/plain 3241 alex SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTI2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMTYgIEFsZXggTWlsb3dza2kgIDxhbGV4QG1pbG93c2tp LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlZCBhIGNvbXBpbGUgZXJyb3IgaW4gdGhlIHBhaW50KCkgbWV0aG9kcyBieSBtYWtpbmcgdGhl bSB1c2UgdGhlCisgICAgICAgIG5ldyB2aXNpdGVkRGVwZW5kZW50Q29sb3IoKSBtZXRob2QuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDMyNworCisg ICAgICAgICogbWF0aG1sL1JlbmRlck1hdGhNTFJvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTWF0aE1MUm9vdDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1M Um9vdDo6bGF5b3V0KTogRml4ZWQgYSBjcmFzaCB3aGVyZSBldmVyeSBjaGlsZCAKKyAgICAgICAg d2FzIGFzc3VtZWQgdG8gYmUgYSBSZW5kZXJNYXRoTUxCbG9jayBpbnN0YW5jZSB3aGVuIHRoYXQg aXNuJ3QgdGhlIAorICAgICAgICBjYXNlLiAgQWxzbywgbGF5b3V0KCkgbmVlZGVkIHRvIG1hcmsg dGhlIGluZGV4IGZvciBsYXlvdXQgYmVmb3JlIAorICAgICAgICBjYWxsaW5nIGxheW91dCgpIG9u IHRoZSBpbmRleC4KKyAgICAgICAgKiBtYXRobWwvUmVuZGVyTWF0aE1MU3F1YXJlUm9vdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxTcXVhcmVSb290OjpwYWludCk6CisKIDIw MTAtMDYtMTYgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6IFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhN TFJvb3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhNTFJvb3Qu Y3BwCShyZXZpc2lvbiA2MTI2MSkKKysrIFdlYkNvcmUvbWF0aG1sL1JlbmRlck1hdGhNTFJvb3Qu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsNyArMTQ1LDcgQEAgdm9pZCBSZW5kZXJNYXRoTUxS b290OjpwYWludChQYWludEluZm8mIAogICAgIAogICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tl VGhpY2tuZXNzKGdSYWRpY2FsTGluZVRoaWNrbmVzcyAqIHN0eWxlKCktPmZvbnRTaXplKCkpOwog ICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoU29saWRTdHJva2UpOwotICAgIGluZm8u Y29udGV4dC0+c2V0U3Ryb2tlQ29sb3Ioc3R5bGUoKS0+Y29sb3IoKSwgc1JHQkNvbG9yU3BhY2Up OworICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlQ29sb3Ioc3R5bGUoKS0+dmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpLCBzUkdCQ29sb3JTcGFjZSk7CiAgICAgaW5mby5j b250ZXh0LT5zZXRMaW5lSm9pbihNaXRlckpvaW4pOwogICAgIGluZm8uY29udGV4dC0+c2V0TWl0 ZXJMaW1pdChzdHlsZSgpLT5mb250U2l6ZSgpKTsKICAgICAKQEAgLTIwNCw4ICsyMDQsNyBAQCB2 b2lkIFJlbmRlck1hdGhNTFJvb3Q6OmxheW91dCgpCiAgICAgaW50IG1heEhlaWdodCA9IHRvUmVu ZGVyQm94TW9kZWxPYmplY3QobGFzdENoaWxkKCkpLT5vZmZzZXRIZWlnaHQoKTsKICAgICAKICAg ICBSZW5kZXJPYmplY3QqIGN1cnJlbnQgPSBsYXN0Q2hpbGQoKS0+Zmlyc3RDaGlsZCgpOwotICAg IAotICAgIHRvUmVuZGVyTWF0aE1MQmxvY2soY3VycmVudCktPnN0eWxlKCktPnNldFZlcnRpY2Fs QWxpZ24oQkFTRUxJTkUpOworICAgIGN1cnJlbnQtPnN0eWxlKCktPnNldFZlcnRpY2FsQWxpZ24o QkFTRUxJTkUpOwogICAgIAogICAgIGlmICghbWF4SGVpZ2h0KQogICAgICAgICBtYXhIZWlnaHQg PSBzdHlsZSgpLT5mb250U2l6ZSgpOwpAQCAtMjM4LDkgKzIzNywxMSBAQCB2b2lkIFJlbmRlck1h dGhNTFJvb3Q6OmxheW91dCgpCiAgICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxj KCk7CiAgICAgbWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoKTsKICAgICBSZW5kZXJCbG9j azo6bGF5b3V0KCk7Ci0gICAgCisKICAgICBpbmRleEJveC0+c3R5bGUoKS0+c2V0Qm90dG9tKExl bmd0aChyYWRpY2FsSGVpZ2h0ICsgc3R5bGUoKS0+cGFkZGluZ0JvdHRvbSgpLnZhbHVlKCksIEZp eGVkKSk7Ci0gICAgCisKKyAgICAvLyBOb3cgdGhhdCB3ZSd2ZSBwb3RlbnRpYWxseSBjaGFuZ2Vk IGl0cyBwb3NpdGlvbiwgd2UgbmVlZCBsYXlvdXQgdGhlIGluZGV4IGFnYWluLgorICAgIGluZGV4 Qm94LT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsKICAgICBpbmRleEJveC0+ bGF5b3V0KCk7CiB9CiAgICAgCkluZGV4OiBXZWJDb3JlL21hdGhtbC9SZW5kZXJNYXRoTUxTcXVh cmVSb290LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL21hdGhtbC9SZW5kZXJNYXRoTUxTcXVh cmVSb290LmNwcAkocmV2aXNpb24gNjEyNjEpCisrKyBXZWJDb3JlL21hdGhtbC9SZW5kZXJNYXRo TUxTcXVhcmVSb290LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDcgKzExNCw3IEBAIHZvaWQg UmVuZGVyTWF0aE1MU3F1YXJlUm9vdDo6cGFpbnQoUGFpbnQKICAgICAKICAgICBpbmZvLmNvbnRl eHQtPnNldFN0cm9rZVRoaWNrbmVzcyhnUmFkaWNhbExpbmVUaGlja25lc3MgKiBzdHlsZSgpLT5m b250U2l6ZSgpKTsKICAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZVN0eWxlKFNvbGlkU3Ryb2tl KTsKLSAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZUNvbG9yKHN0eWxlKCktPmNvbG9yKCksIHNS R0JDb2xvclNwYWNlKTsKKyAgICBpbmZvLmNvbnRleHQtPnNldFN0cm9rZUNvbG9yKHN0eWxlKCkt PnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwgc1JHQkNvbG9yU3BhY2Up OwogICAgIGluZm8uY29udGV4dC0+c2V0TGluZUpvaW4oTWl0ZXJKb2luKTsKICAgICBpbmZvLmNv bnRleHQtPnNldE1pdGVyTGltaXQoc3R5bGUoKS0+Zm9udFNpemUoKSk7CiAgICAgCg==