25568 2009-05-05 07:45:04 -0700 Add ASSERT(useTransforms) to mapLocalToContainer and fix patterns on transformed text 2009-05-05 18:20:54 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 25532 1 eric webkit-unassigned simon.fraser oldest_to_newest 119962 0 eric 2009-05-05 07:45:04 -0700 Add ASSERT(useTransforms) to mapLocalToContainer and fix patterns on transformed text This is the last patch attached to https://bugs.webkit.org/show_bug.cgi?id=25532 which got landed, and then rolled out, and now is ready for landing again. 119964 1 30018 eric 2009-05-05 07:46:36 -0700 Created attachment 30018 Add back ASSERT(useTransforms) 7 files changed, 130 insertions(+), 19 deletions(-) 119965 2 eric 2009-05-05 07:47:35 -0700 I'll add the expected results when I land. Since the important part is the pixel tests, they're of little use to the reviewer and just make the patch larger. 119973 3 30018 simon.fraser 2009-05-05 08:43:46 -0700 Comment on attachment 30018 Add back ASSERT(useTransforms) r=me Would prefer we replace the isPaintingText bool with an enum to make the code more readable at the call site (even though it wasn't added in this patch). 119977 4 eric 2009-05-05 08:57:02 -0700 (In reply to comment #3) > (From update of attachment 30018 [review]) > r=me > > Would prefer we replace the isPaintingText bool with an enum to make the code > more readable at the call site (even though it wasn't added in this patch). Thank you. I think the enum change is for another patch though. We're almost to the point where we don't even need it for this function! 120049 5 eric 2009-05-05 18:20:54 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.checksum M LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.png A LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.checksum A LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png A LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt A LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.checksum A LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.png A LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.txt A LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html.xhtml A LayoutTests/svg/transforms/text-with-pattern-with-svg-transform.svg M WebCore/ChangeLog M WebCore/rendering/RenderSVGRoot.cpp M WebCore/rendering/SVGRenderSupport.cpp M WebCore/svg/graphics/SVGPaintServerPattern.cpp Committed r43269 30018 2009-05-05 07:46:36 -0700 2009-05-05 08:43:46 -0700 Add back ASSERT(useTransforms) Add-back-ASSERT-useTransforms-.patch text/plain 11604 eric NDExNDM2MmEyYTQ1ZjQ3MDMwOGUzMDEzYmJiNzQ5MDY5MTk0OWZjOQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUzZjMxN2Eu LjllZmIzNjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0wNS0wNSAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGFuIEFTU0VSVCh1c2VUcmFuc2Zvcm1zKSB0byBtYXBMb2NhbFRvQ29u dGFpbmVyIGltcGxlbWVudGF0aW9ucyBpbiBTVkcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTUzMgorCisgICAgICAgIFRoaXMgcmVxdWlyZWQgYSBj aGFuZ2UgdG8gU1ZHUGFpbnRTZXJ2ZXJQYXR0ZXJuOjpzZXR1cAorICAgICAgICBUaGF0IGNoYW5n ZSBmaXhlZCBkcmF3aW5nIG9mIHRyYW5zZm9ybWVkIFNWRyB0ZXh0IHdpdGggb2JqZWN0Qm91bmRp bmdCb3ggcGF0dGVybnMuCisgICAgICAgIHRleHQtd2l0aC1wYXR0ZXJuLXdpdGgtc3ZnLXRyYW5z Zm9ybS5zdmcgc2hvd3MgdGhlIGltcHJvdmVtZW50IGZyb20gdGhpcyBjaGFuZ2UKKyAgICAgICAg dGV4dC13aXRoLXBhdHRlcm4taW5zaWRlLXRyYW5zZm9ybWVkLWh0bWwueGh0bWwgc2hvd3Mgbm8g Y2hhbmdlLCBidXQgZG9jdW1lbnRzCisgICAgICAgIHRoYXQgdGhpcyBjaGFuZ2UgZG9lcyBub3Qg YnJlYWsgQ1NTIHRyYW5zZm9ybWVkIHBhdHRlcm4gdGV4dC4KKworICAgICAgICAqIHN2Zy90cmFu c2Zvcm1zL3RleHQtd2l0aC1wYXR0ZXJuLWluc2lkZS10cmFuc2Zvcm1lZC1odG1sLnhodG1sOiBB ZGRlZC4KKyAgICAgICAgKiBzdmcvdHJhbnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi13aXRoLXN2 Zy10cmFuc2Zvcm0uc3ZnOiBBZGRlZC4KKwogMjAwOS0wNS0wNCAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi1p bnNpZGUtdHJhbnNmb3JtZWQtaHRtbC54aHRtbCBiL0xheW91dFRlc3RzL3N2Zy90cmFuc2Zvcm1z L3RleHQtd2l0aC1wYXR0ZXJuLWluc2lkZS10cmFuc2Zvcm1lZC1odG1sLnhodG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNkNDI2MjYKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi1pbnNpZGUtdHJhbnNm b3JtZWQtaHRtbC54aHRtbApAQCAtMCwwICsxLDUyIEBACis8aHRtbCB4bWxucz0iaHR0cDovL3d3 dy53My5vcmcvMTk5OS94aHRtbCI+Cis8aGVhZD4KKyAgPHRpdGxlPlNWRyBpbnNpZGUgdHJhbnNm b3JtZWQgZGl2PC90aXRsZT4KKyAgPHN0eWxlPgorICAgIGJvZHkgeworICAgICAgYmFja2dyb3Vu ZC1jb2xvcjogd2hpdGU7CisgICAgfQorICAgIC5ib3ggeworICAgICAgaGVpZ2h0OiA0MDBweDsK KyAgICAgIHdpZHRoOiA0MDBweDsKKyAgICAgIG1hcmdpbjogNTBweDsKKyAgICAgIGJvcmRlcjog MXB4IHNvbGlkIGJsYWNrOworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZSgzMHB4 LCAzMHB4KSByb3RhdGUoMjBkZWcpOworICAgIH0KKyAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 PgorICA8cD5DU1MgVHJhbnNmb3JtZWQgSFRNTCBkaXYgd2l0aCBTVkcgaW5zaWRlIGl0LiAgb2Jq ZWN0Qm91bmRpbmdCb3ggcGF0dGVybnMgb24gdGV4dC48L3A+CisgIDxkaXYgY2xhc3M9ImJveCI+ CisgICAgICA8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxp bms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHZpZXdCb3g9IjAgMCA0ODAgMzYwIj4K KyAgICAgICAgICA8cGF0dGVybiBpZD0icGF0MSIgd2lkdGg9Ii4wNCIgaGVpZ2h0PSIuNCIgdmll d0JveD0iNSA1IDIwIDIwIj4KKyAgICAgICAgICAgIDxyZWN0IHg9IjUiIHk9IjUiIHdpZHRoPSIx MCIgaGVpZ2h0PSIxMCIgZmlsbD0icmVkIiAvPgorICAgICAgICAgICAgPHJlY3QgeD0iMTAiIHk9 IjEwIiB3aWR0aD0iMTAiIGhlaWdodD0iMTAiIGZpbGw9ImdyZWVuIiAvPgorICAgICAgICAgIDwv cGF0dGVybj4KKyAgICAgICAgICA8cmVjdCB4PSIyNSIgeT0iMTAiIHdpZHRoPSI0MzAiIGhlaWdo dD0iNjAiIHN0cm9rZT0iYmxhY2siIGZpbGw9InVybCgjcGF0MSkiIC8+CisgICAgICAgICAgPHRl eHQgZm9udC1mYW1pbHk9IkFyaWFsIiBmb250LXNpemU9IjEyIiAgeD0iMjUiIHk9Ijg1Ij5QYXR0 ZXJuIGNyZWF0ZWQgdXNpbmcgcmVkIGFuZCBncmVlbiByZWN0YW5nbGVzIGFwcGxpZWQgdG8gZmls bCBvZiByZWN0YW5nbGU8L3RleHQ+CisgICAgICAgICAgPHBhdHRlcm4gaWQ9InBhdDIiIHdpZHRo PSIuMDQiIGhlaWdodD0iLjQiIHZpZXdCb3g9IjAgMCAyMCAyMCI+CisgICAgICAgICAgICA8cmVj dCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAiIGhlaWdodD0iMTAiIGZpbGw9InJlZCIgLz4KKyAgICAg ICAgICAgIDxyZWN0IHg9IjEwIiB5PSIwIiB3aWR0aD0iMTAiIGhlaWdodD0iMTAiIGZpbGw9Imdy ZWVuIiAvPgorICAgICAgICAgICAgPHJlY3QgeD0iMCIgeT0iMTAiIHdpZHRoPSIxMCIgaGVpZ2h0 PSIxMCIgZmlsbD0iYmx1ZSIgLz4KKyAgICAgICAgICAgIDxyZWN0IHg9IjEwIiB5PSIxMCIgd2lk dGg9IjEwIiBoZWlnaHQ9IjEwIiBmaWxsPSJ5ZWxsb3ciIC8+CisgICAgICAgICAgPC9wYXR0ZXJu PgorICAgICAgICAgIDxyZWN0IHg9IjM1IiB5PSIxMTAiIHdpZHRoPSI0MTAiIGhlaWdodD0iNDAi IGZpbGw9Im5vbmUiIHN0cm9rZT0idXJsKCNwYXQyKSIgc3Ryb2tlLXdpZHRoPSIyMCIgLz4KKyAg ICAgICAgICA8dGV4dCBmb250LWZhbWlseT0iQXJpYWwiIGZvbnQtc2l6ZT0iMTIiICB4PSIyNSIg eT0iMTc1Ij5QYXR0ZXJuIG9mIDQgcmVjdGFuZ2xlcyBhcHBsaWVkIHRvIGEgc3Ryb2tlIG9mIGEg cmVjdGFuZ2xlLjwvdGV4dD4KKyAgICAgICAgICA8cGF0dGVybiBpZD0icGF0MyIgd2lkdGg9Ii4w MyIgaGVpZ2h0PSIuMyIgdmlld0JveD0iMCAwIDEwIDIwIj4KKyAgICAgICAgICAgIDxyZWN0IHg9 IjAiIHk9IjAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgZmlsbD0icmVkIiAvPgorICAgICAgICAg ICAgPHJlY3QgeD0iMCIgeT0iMTAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgZmlsbD0iZ3JlZW4i IC8+CisgICAgICAgICAgPC9wYXR0ZXJuPgorICAgICAgICAgIDx0ZXh0IGZvbnQtZmFtaWx5PSJB cmlhbCIgZm9udC1zaXplPSI1MCIgZmlsbD0idXJsKCNwYXQzKSIgIHg9IjI1IiB5PSIyMjAiPlBh dHRlcm4gb24gZmlsbDwvdGV4dD4KKyAgICAgICAgICA8dGV4dCBmb250LWZhbWlseT0iQXJpYWwi IGZvbnQtc2l6ZT0iMTIiICB4PSIyNSIgeT0iMjM1Ij5QYXR0ZXJuIGNvbnNpc3RzIG9mIHJlZCBh bmQgZ3JlZW4gcm93czwvdGV4dD4KKyAgICAgICAgICA8cGF0dGVybiBpZD0icGF0NCIgd2lkdGg9 Ii4wNiIgaGVpZ2h0PSIuMiIgdmlld0JveD0iMCAwIDIwIDEwIj4KKyAgICAgICAgICAgIDxyZWN0 IHg9IjAiIHk9IjAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgZmlsbD0icmVkIiAvPgorICAgICAg ICAgICAgPHJlY3QgeD0iMTAiIHk9IjAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgZmlsbD0iYmx1 ZSIgLz4KKyAgICAgICAgICA8L3BhdHRlcm4+CisgICAgICAgICAgPHRleHQgZm9udC1mYW1pbHk9 IkFyaWFsIiBmb250LXNpemU9IjQwIiBmaWxsPSJub25lIiBzdHJva2U9InVybCgjcGF0NCkiIHN0 cm9rZS13aWR0aD0iMiIgIHg9IjI1IiB5PSIyNzUiPlBhdHRlcm4gb24gc3Ryb2tlPC90ZXh0Pgor ICAgICAgICAgIDx0ZXh0IGZvbnQtZmFtaWx5PSJBcmlhbCIgZm9udC1zaXplPSIxMiIgIHg9IjI1 IiB5PSIyOTAiPlBhdHRlcm4gY29uc2lzdHMgb2YgcmVkIGFuZCBibHVlIGNvbHVtbnM8L3RleHQ+ CisgICAgICAgIDx0ZXh0IGlkPSJyZXZpc2lvbiIgeD0iMTAiIHk9IjM0MCIgZm9udC1zaXplPSI0 MCIgc3Ryb2tlPSJub25lIiBmaWxsPSJibGFjayI+JFJldmlzaW9uOiAxLjYgJDwvdGV4dD4KKyAg ICAgICAgPHJlY3QgaWQ9InRlc3QtZnJhbWUiIHg9IjEiIHk9IjEiIHdpZHRoPSI0NzgiIGhlaWdo dD0iMzU4IiBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiLz4KKyAgICAgIDwvc3ZnPgorICA8 L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N2Zy90cmFu c2Zvcm1zL3RleHQtd2l0aC1wYXR0ZXJuLXdpdGgtc3ZnLXRyYW5zZm9ybS5zdmcgYi9MYXlvdXRU ZXN0cy9zdmcvdHJhbnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi13aXRoLXN2Zy10cmFuc2Zvcm0u c3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVjNDM0ZmEKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi13 aXRoLXN2Zy10cmFuc2Zvcm0uc3ZnCkBAIC0wLDAgKzEsMzIgQEAKKzxzdmcgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5 OS94bGluayIgdmlld0JveD0iMCAwIDQ4MCAzNjAiPgorICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgz MCkiPgorICAgIDxwYXR0ZXJuIGlkPSJwYXQxIiB3aWR0aD0iLjA0IiBoZWlnaHQ9Ii40IiB2aWV3 Qm94PSI1IDUgMjAgMjAiPgorICAgICAgPHJlY3QgeD0iNSIgeT0iNSIgd2lkdGg9IjEwIiBoZWln aHQ9IjEwIiBmaWxsPSJyZWQiIC8+CisgICAgICA8cmVjdCB4PSIxMCIgeT0iMTAiIHdpZHRoPSIx MCIgaGVpZ2h0PSIxMCIgZmlsbD0iZ3JlZW4iIC8+CisgICAgPC9wYXR0ZXJuPgorICAgIDxyZWN0 IHg9IjI1IiB5PSIxMCIgd2lkdGg9IjQzMCIgaGVpZ2h0PSI2MCIgc3Ryb2tlPSJibGFjayIgZmls bD0idXJsKCNwYXQxKSIgLz4KKyAgICA8dGV4dCBmb250LWZhbWlseT0iQXJpYWwiIGZvbnQtc2l6 ZT0iMTIiICB4PSIyNSIgeT0iODUiPlBhdHRlcm4gY3JlYXRlZCB1c2luZyByZWQgYW5kIGdyZWVu IHJlY3RhbmdsZXMgYXBwbGllZCB0byBmaWxsIG9mIHJlY3RhbmdsZTwvdGV4dD4KKyAgICA8cGF0 dGVybiBpZD0icGF0MiIgd2lkdGg9Ii4wNCIgaGVpZ2h0PSIuNCIgdmlld0JveD0iMCAwIDIwIDIw Ij4KKyAgICAgIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgZmlsbD0i cmVkIiAvPgorICAgICAgPHJlY3QgeD0iMTAiIHk9IjAiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIg ZmlsbD0iZ3JlZW4iIC8+CisgICAgICA8cmVjdCB4PSIwIiB5PSIxMCIgd2lkdGg9IjEwIiBoZWln aHQ9IjEwIiBmaWxsPSJibHVlIiAvPgorICAgICAgPHJlY3QgeD0iMTAiIHk9IjEwIiB3aWR0aD0i MTAiIGhlaWdodD0iMTAiIGZpbGw9InllbGxvdyIgLz4KKyAgICA8L3BhdHRlcm4+CisgICAgPHJl Y3QgeD0iMzUiIHk9IjExMCIgd2lkdGg9IjQxMCIgaGVpZ2h0PSI0MCIgZmlsbD0ibm9uZSIgc3Ry b2tlPSJ1cmwoI3BhdDIpIiBzdHJva2Utd2lkdGg9IjIwIiAvPgorICAgIDx0ZXh0IGZvbnQtZmFt aWx5PSJBcmlhbCIgZm9udC1zaXplPSIxMiIgIHg9IjI1IiB5PSIxNzUiPlBhdHRlcm4gb2YgNCBy ZWN0YW5nbGVzIGFwcGxpZWQgdG8gYSBzdHJva2Ugb2YgYSByZWN0YW5nbGUuPC90ZXh0PgorICAg IDxwYXR0ZXJuIGlkPSJwYXQzIiB3aWR0aD0iLjAzIiBoZWlnaHQ9Ii4zIiB2aWV3Qm94PSIwIDAg MTAgMjAiPgorICAgICAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwIiBoZWlnaHQ9IjEwIiBm aWxsPSJyZWQiIC8+CisgICAgICA8cmVjdCB4PSIwIiB5PSIxMCIgd2lkdGg9IjEwIiBoZWlnaHQ9 IjEwIiBmaWxsPSJncmVlbiIgLz4KKyAgICA8L3BhdHRlcm4+CisgICAgPHRleHQgZm9udC1mYW1p bHk9IkFyaWFsIiBmb250LXNpemU9IjUwIiBmaWxsPSJ1cmwoI3BhdDMpIiAgeD0iMjUiIHk9IjIy MCI+UGF0dGVybiBvbiBmaWxsPC90ZXh0PgorICAgIDx0ZXh0IGZvbnQtZmFtaWx5PSJBcmlhbCIg Zm9udC1zaXplPSIxMiIgIHg9IjI1IiB5PSIyMzUiPlBhdHRlcm4gY29uc2lzdHMgb2YgcmVkIGFu ZCBncmVlbiByb3dzPC90ZXh0PgorICAgIDxwYXR0ZXJuIGlkPSJwYXQ0IiB3aWR0aD0iLjA2IiBo ZWlnaHQ9Ii4yIiB2aWV3Qm94PSIwIDAgMjAgMTAiPgorICAgICAgPHJlY3QgeD0iMCIgeT0iMCIg d2lkdGg9IjEwIiBoZWlnaHQ9IjEwIiBmaWxsPSJyZWQiIC8+CisgICAgICA8cmVjdCB4PSIxMCIg eT0iMCIgd2lkdGg9IjEwIiBoZWlnaHQ9IjEwIiBmaWxsPSJibHVlIiAvPgorICAgIDwvcGF0dGVy bj4KKyAgICA8dGV4dCBmb250LWZhbWlseT0iQXJpYWwiIGZvbnQtc2l6ZT0iNDAiIGZpbGw9Im5v bmUiIHN0cm9rZT0idXJsKCNwYXQ0KSIgc3Ryb2tlLXdpZHRoPSIyIiAgeD0iMjUiIHk9IjI3NSI+ UGF0dGVybiBvbiBzdHJva2U8L3RleHQ+CisgICAgPHRleHQgZm9udC1mYW1pbHk9IkFyaWFsIiBm b250LXNpemU9IjEyIiAgeD0iMjUiIHk9IjI5MCI+UGF0dGVybiBjb25zaXN0cyBvZiByZWQgYW5k IGJsdWUgY29sdW1uczwvdGV4dD4KKyAgPHRleHQgaWQ9InJldmlzaW9uIiB4PSIxMCIgeT0iMzQw IiBmb250LXNpemU9IjQwIiBzdHJva2U9Im5vbmUiIGZpbGw9ImJsYWNrIj4kUmV2aXNpb246IDEu NiAkPC90ZXh0PgorICA8cmVjdCBpZD0idGVzdC1mcmFtZSIgeD0iMSIgeT0iMSIgd2lkdGg9IjQ3 OCIgaGVpZ2h0PSIzNTgiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzAwMDAwMCIvPgorICA8L2c+Cis8 L3N2Zz4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggODBhMmEyNi4uMTIzYjk0NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAwOS0wNS0wNSAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFTU0VSVCh1c2VUcmFuc2Zvcm1zKSB0byBtYXBMb2Nh bFRvQ29udGFpbmVyIGltcGxlbWVudGF0aW9ucyBpbiBTVkcuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTUzMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU1NjgKKworICAgICAgICBBZGRpbmcgdGhpcyBB U1NFUlQgZXhwb3NlZCBhIGJ1ZyBpbiBTVkdQYWludFNlcnZlclBhdHRlcm46OnNldHVwCisgICAg ICAgIHdoaWNoIHdhcyBjYXVzaW5nIHRyYW5zZm9ybWVkIFNWRyB0ZXh0IHdoZW4gZmlsbGVkL3N0 cm9rZWQgd2l0aCBhCisgICAgICAgIHBhdHRlcm4gdXNpbmcgcGF0dGVyblVuaXRzPW9iamVjdEJv dW5kaW5nQm94IHRvIGRyYXcgaW5jb3JyZWN0bHkuCisKKyAgICAgICAgSSBmaXhlZCB0aGUgaW5j b3JyZWN0IGRyYXdpbmcgKGJ5IHJlbW92aW5nIHRoZSBicm9rZW4gY29kZSkgYW5kIGFkZGVkCisg ICAgICAgIHR3byB0ZXN0IGNhc2VzIHRvIHRlc3QgdGhlIGZpeDoKKyAgICAgICAgKiBzdmcvdHJh bnNmb3Jtcy90ZXh0LXdpdGgtcGF0dGVybi1pbnNpZGUtdHJhbnNmb3JtZWQtaHRtbC54aHRtbAor ICAgICAgICAqIHN2Zy90cmFuc2Zvcm1zL3RleHQtd2l0aC1wYXR0ZXJuLXdpdGgtc3ZnLXRyYW5z Zm9ybS5zdmcKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTVkdSb290LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jvb3Q6Om1hcExvY2FsVG9Db250YWluZXIpOgorICAgICAg ICAqIHJlbmRlcmluZy9TVkdSZW5kZXJTdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNW R1JlbmRlckJhc2U6Om1hcExvY2FsVG9Db250YWluZXIpOgorICAgICAgICAqIHN2Zy9ncmFwaGlj cy9TVkdQYWludFNlcnZlclBhdHRlcm4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUGFpbnRT ZXJ2ZXJQYXR0ZXJuOjpzZXR1cCk6CisKIDIwMDktMDUtMDUgIEhvbGdlciBIYW5zIFBldGVyIEZy ZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExv cGV6LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU1ZHUm9vdC5jcHAgYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdSb290LmNwcAppbmRleCAyNTE2MDY1Li41NjJkOTBm IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdSb290LmNwcAorKysgYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdSb290LmNwcApAQCAtMjcxLDEzICsyNzEsMTAgQEAg dm9pZCBSZW5kZXJTVkdSb290Ojpjb21wdXRlUmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxP YmplY3QqIHJlcGFpbnRDb250YWluZXIKIHZvaWQgUmVuZGVyU1ZHUm9vdDo6bWFwTG9jYWxUb0Nv bnRhaW5lcihSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgYm9vbCBmaXhl ZCAsIGJvb2wgdXNlVHJhbnNmb3JtcywgVHJhbnNmb3JtU3RhdGUmIHRyYW5zZm9ybVN0YXRlKSBj b25zdAogewogICAgIEFTU0VSVCghZml4ZWQpOyAvLyBXZSBzaG91bGQgaGF2ZSBubyBmaXhlZCBj b250ZW50IGluIHRoZSBTVkcgcmVuZGVyaW5nIHRyZWUuCisgICAgQVNTRVJUKHVzZVRyYW5zZm9y bXMpOyAvLyBtYXBwaW5nIGEgcG9pbnQgdGhyb3VnaCBTVkcgdy9vIHJlc3BlY3RpbmcgdHJhc25m b3JtcyBpcyB1c2VsZXNzLgogCi0gICAgLy8gRklYTUU6IElmIHdlIGRvbid0IHJlc3BlY3QgdXNl VHJhbnNmb3JtcyB3ZSBicmVhayBTVkcgdGV4dCByZW5kZXJpbmcuCi0gICAgLy8gU2VlbXMgUmVu ZGVyU1ZHSW5saW5lVGV4dCBoYXMgc29tZSBvd24gYnJva2VuIHRyYW5zbGF0aW9uIGhhY2tzIHdo aWNoIGRlcGVuZCB1c2VUcmFuc2Zvcm1zPWZhbHNlCi0gICAgLy8gVGhpcyBzaG91bGQgaW5zdGVh ZCBiZSBBU1NFUlQodXNlVHJhbnNmb3Jtcykgb25jZSB3ZSBmaXggUmVuZGVyU1ZHSW5saW5lVGV4 dAotICAgIGlmICh1c2VUcmFuc2Zvcm1zKQotICAgICAgICB0cmFuc2Zvcm1TdGF0ZS5hcHBseVRy YW5zZm9ybShsb2NhbFRvQm9yZGVyQm94VHJhbnNmb3JtKCkpOwotCisgICAgLy8gVHJhbnNmb3Jt IHRvIG91ciBib3JkZXIgYm94IGFuZCBsZXQgUmVuZGVyQm94IHRyYW5zZm9ybSB0aGUgcmVzdCBv ZiB0aGUgd2F5LgorICAgIHRyYW5zZm9ybVN0YXRlLmFwcGx5VHJhbnNmb3JtKGxvY2FsVG9Cb3Jk ZXJCb3hUcmFuc2Zvcm0oKSk7CiAgICAgUmVuZGVyQm94OjptYXBMb2NhbFRvQ29udGFpbmVyKHJl cGFpbnRDb250YWluZXIsIGZpeGVkLCB1c2VUcmFuc2Zvcm1zLCB0cmFuc2Zvcm1TdGF0ZSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1NWR1JlbmRlclN1cHBvcnQuY3BwIGIv V2ViQ29yZS9yZW5kZXJpbmcvU1ZHUmVuZGVyU3VwcG9ydC5jcHAKaW5kZXggMWZmNDhiYi4uOWI0 ODFlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvU1ZHUmVuZGVyU3VwcG9ydC5jcHAK KysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvU1ZHUmVuZGVyU3VwcG9ydC5jcHAKQEAgLTY0LDEzICs2 NCw4IEBAIHZvaWQgU1ZHUmVuZGVyQmFzZTo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KFJlbmRlck9i amVjdCogb2JqZWN0LCBSZW5kZXJCb3hNb2RlbE9iCiB2b2lkIFNWR1JlbmRlckJhc2U6Om1hcExv Y2FsVG9Db250YWluZXIoY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3QsIFJlbmRlckJveE1vZGVs T2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBib29sIGZpeGVkICwgYm9vbCB1c2VUcmFuc2Zvcm1z LCBUcmFuc2Zvcm1TdGF0ZSYgdHJhbnNmb3JtU3RhdGUpCiB7CiAgICAgQVNTRVJUKCFmaXhlZCk7 IC8vIFdlIHNob3VsZCBoYXZlIG5vIGZpeGVkIGNvbnRlbnQgaW4gdGhlIFNWRyByZW5kZXJpbmcg dHJlZS4KLQotICAgIC8vIEZJWE1FOiBJZiB3ZSBkb24ndCByZXNwZWN0IHVzZVRyYW5zZm9ybXMg d2UgYnJlYWsgU1ZHIHRleHQgcmVuZGVyaW5nLgotICAgIC8vIFNlZW1zIFJlbmRlclNWR0lubGlu ZVRleHQgaGFzIHNvbWUgb3duIGJyb2tlbiB0cmFuc2xhdGlvbiBoYWNrcyB3aGljaCBkZXBlbmQg dXNlVHJhbnNmb3Jtcz1mYWxzZQotICAgIC8vIFRoaXMgc2hvdWxkIGluc3RlYWQgYmUgQVNTRVJU KHVzZVRyYW5zZm9ybXMpIG9uY2Ugd2UgZml4IFJlbmRlclNWR0lubGluZVRleHQKLSAgICBpZiAo dXNlVHJhbnNmb3JtcykKLSAgICAgICAgdHJhbnNmb3JtU3RhdGUuYXBwbHlUcmFuc2Zvcm0ob2Jq ZWN0LT5sb2NhbFRvUGFyZW50VHJhbnNmb3JtKCkpOwotCisgICAgQVNTRVJUKHVzZVRyYW5zZm9y bXMpOyAvLyBtYXBwaW5nIGEgcG9pbnQgdGhyb3VnaCBTVkcgdy9vIHJlc3BlY3RpbmcgdHJhc25m b3JtcyBpcyB1c2VsZXNzLgorICAgIHRyYW5zZm9ybVN0YXRlLmFwcGx5VHJhbnNmb3JtKG9iamVj dC0+bG9jYWxUb1BhcmVudFRyYW5zZm9ybSgpKTsKICAgICBvYmplY3QtPnBhcmVudCgpLT5tYXBM b2NhbFRvQ29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsIGZpeGVkLCB1c2VUcmFuc2Zvcm1zLCB0 cmFuc2Zvcm1TdGF0ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NW R1BhaW50U2VydmVyUGF0dGVybi5jcHAgYi9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdQYWludFNl cnZlclBhdHRlcm4uY3BwCmluZGV4IDA0NmYzODYuLmI4MDZkOTYgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvc3ZnL2dyYXBoaWNzL1NWR1BhaW50U2VydmVyUGF0dGVybi5jcHAKKysrIGIvV2ViQ29yZS9z dmcvZ3JhcGhpY3MvU1ZHUGFpbnRTZXJ2ZXJQYXR0ZXJuLmNwcApAQCAtOTcsMTIgKzk3LDcgQEAg VGV4dFN0cmVhbSYgU1ZHUGFpbnRTZXJ2ZXJQYXR0ZXJuOjpleHRlcm5hbFJlcHJlc2VudGF0aW9u KFRleHRTdHJlYW0mIHRzKSBjb25zdAogCiBib29sIFNWR1BhaW50U2VydmVyUGF0dGVybjo6c2V0 dXAoR3JhcGhpY3NDb250ZXh0KiYgY29udGV4dCwgY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3Qs IFNWR1BhaW50VGFyZ2V0VHlwZSB0eXBlLCBib29sIGlzUGFpbnRpbmdUZXh0KSBjb25zdAogewot ICAgIEZsb2F0UmVjdCB0YXJnZXRSZWN0OwotICAgIGlmIChpc1BhaW50aW5nVGV4dCkgewotICAg ICAgICBJbnRSZWN0IHRleHRCb3VuZGFyeSA9IGNvbnN0X2Nhc3Q8UmVuZGVyT2JqZWN0Kj4ob2Jq ZWN0KS0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKTsKLSAgICAgICAgdGFyZ2V0UmVjdCA9IG9i amVjdC0+YWJzb2x1dGVUcmFuc2Zvcm0oKS5pbnZlcnNlKCkubWFwUmVjdCh0ZXh0Qm91bmRhcnkp OwotICAgIH0gZWxzZQotICAgICAgICB0YXJnZXRSZWN0ID0gb2JqZWN0LT5vYmplY3RCb3VuZGlu Z0JveCgpOworICAgIEZsb2F0UmVjdCB0YXJnZXRSZWN0ID0gb2JqZWN0LT5vYmplY3RCb3VuZGlu Z0JveCgpOwogCiAgICAgY29uc3QgU1ZHUmVuZGVyU3R5bGUqIHN0eWxlID0gb2JqZWN0LT5zdHls ZSgpLT5zdmdTdHlsZSgpOwogICAgIGJvb2wgaXNGaWxsZWQgPSAodHlwZSAmIEFwcGx5VG9GaWxs VGFyZ2V0VHlwZSkgJiYgc3R5bGUtPmhhc0ZpbGwoKTsK