22594 2008-12-02 11:26:26 -0800 Fetching inline style with foo.style.webkitTransition returns nothing 2008-12-07 22:59:12 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser cmarrin dino oldest_to_newest 101030 0 simon.fraser 2008-12-02 11:26:26 -0800 If an element has inline -webkit-transform style, reading back foo.style.webkitTransform returns nothing. 101031 1 simon.fraser 2008-12-02 11:27:02 -0800 Transition, not transform. 101079 2 25683 simon.fraser 2008-12-02 14:48:07 -0800 Created attachment 25683 Testcase 101080 3 simon.fraser 2008-12-02 14:49:37 -0800 Patch is something like this: diff --git a/WebCore/css/CSSMutableStyleDeclaration.cpp b/WebCore/css/CSSMutableStyleDeclaration.cpp index ca0295a..8651761 100644 --- a/WebCore/css/CSSMutableStyleDeclaration.cpp +++ b/WebCore/css/CSSMutableStyleDeclaration.cpp @@ -201,6 +201,17 @@ String CSSMutableStyleDeclaration::getPropertyValue(int propertyID) const CSSPropertyWebkitMaskOrigin }; return getLayeredShorthandValue(properties, 6); } + case CSSPropertyWebkitTransition: { + const int properties[4] = { CSSPropertyWebkitTransitionProperty, CSSPropertyWebkitTransitionDuration, + CSSPropertyWebkitTransitionTimingFunction, CSSPropertyWebkitTransitionDelay }; + return getShorthandValue(properties, 4); + } + case CSSPropertyWebkitTransformOrigin: { + // FIXME: Is this correct? The code in cssparser.cpp is confusing + const int properties[2] = { CSSPropertyWebkitTransformOriginX, + CSSPropertyWebkitTransformOriginY }; + return getLayeredShorthandValue(properties, 2); + } #if ENABLE(SVG) case CSSPropertyMarker: { RefPtr<CSSValue> value = getPropertyCSSValue(CSSPropertyMarkerStart); but that isn't quite right. In the testcase, it prints "style: left 1s ease-in initial" when the delay is not in the shorthand. It should not print the "initial". Compare with "border". 101082 4 simon.fraser 2008-12-02 14:52:09 -0800 Also, 'all' doesn't show in the output. 'all' is broken in computed style, too. 101785 5 simon.fraser 2008-12-07 22:06:35 -0800 Taking. 101786 6 25836 simon.fraser 2008-12-07 22:29:34 -0800 Created attachment 25836 Patch, testcase, changelog 101787 7 25836 mitz 2008-12-07 22:34:47 -0800 Comment on attachment 25836 Patch, testcase, changelog r=me, but feel free to use standard indentation in the change log :) 101788 8 simon.fraser 2008-12-07 22:59:12 -0800 Fixed the changelog. Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/fast/css/transform-inline-style-expected.txt A LayoutTests/fast/css/transform-inline-style.html M WebCore/ChangeLog M WebCore/css/CSSMutableStyleDeclaration.cpp M WebCore/css/CSSParser.cpp M WebCore/css/CSSStyleSelector.cpp Committed r39090 25683 2008-12-02 14:48:07 -0800 2008-12-02 14:48:07 -0800 Testcase inline-style-value.html text/html 849 simon.fraser PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIKICAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cgo8aHRtbCBs YW5nPSJlbiI+CjxoZWFkPgogIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVu dD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4KICA8dGl0bGU+RmV0Y2hpbmcgaW5saW5lIHN0 eWxlPC90aXRsZT4KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgogICAg I2JveCB7CiAgICAgIGhlaWdodDogMTAwcHg7CiAgICAgIHdpZHRoOiAxMDBweDsKICAgICAgYmFj a2dyb3VuZC1jb2xvcjogYmx1ZTsKICAgIH0KICAgICNib3g6aG92ZXIgewogICAgICB3aWR0aDog MjAwcHg7CiAgICB9CiAgPC9zdHlsZT4KICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg Y2hhcnNldD0idXRmLTgiPgogICAgZnVuY3Rpb24gbG9nTWUoZSkKICAgIHsKICAgICAgdmFyIGNv bnNvbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpOwogICAgICBjb25zb2xl LmlubmVySFRNTCArPSAnc3R5bGU6ICcgKyBlLnN0eWxlLndlYmtpdFRyYW5zaXRpb24gKyAnPGJy Pic7CiAgICB9CiAgPC9zY3JpcHQ+CjwvaGVhZD4KPGJvZHk+CjxkaXYgaWQ9ImJveCIgc3R5bGU9 ImJvcmRlcjogMXB4IGJsYWNrOyAtd2Via2l0LXRyYW5zaXRpb246IGxlZnQgMXMgZWFzZS1pbjsg LXdlYmtpdC10cmFuc2Zvcm0tb3JpZ2luOiAzMiUgNDUlOyIgb25jbGljaz0ibG9nTWUodGhpcyki Pgo8L2Rpdj4KPGRpdiBpZD0iY29uc29sZSI+CjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 25836 2008-12-07 22:29:34 -0800 2008-12-07 22:34:47 -0800 Patch, testcase, changelog 22594_patch.txt text/plain 6763 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYzU5NzkxLi5hNzI0OTBmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMTIt MDcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNTk0CisgICAgICAgIAorICAgICAgICBUZXN0Y2FzZSBmb3Ig ZmV0Y2hpbmcgaW5saW5lIHN0eWxlIGZvciAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4KKyAgICAg ICAgYW5kIC13ZWJraXQtdHJhbnNpdGlvbi4KKworICAgICAgICAqIGZhc3QvY3NzL3RyYW5zZm9y bS1pbmxpbmUtc3R5bGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy90 cmFuc2Zvcm0taW5saW5lLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAyMDA4LTEyLTA3ICBEaXJrIFNj aHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1 bnQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy90cmFuc2Zvcm0taW5saW5lLXN0 eWxlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3RyYW5zZm9ybS1pbmxpbmUt c3R5bGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAz ODJjOTIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy90cmFuc2Zvcm0t aW5saW5lLXN0eWxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1Rlc3RzIHJlYWRpbmcg aW5saW5lIHN0eWxlIG9mIHRyYW5zaXRpb24sIGFuZCAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4K K2h0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU5NAorCitzdHlsZTog YWxsIDFzIGVhc2UsIG5vbmUgMnMgZWFzZS1pbiwgbGVmdCAzcyBjdWJpYy1iZXppZXIoMC4yLCAw LjMsIDAuNiwgMC44KSAycworc3R5bGU6IDAlIDMwJQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy90cmFuc2Zvcm0taW5saW5lLXN0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy90cmFuc2Zvcm0taW5saW5lLXN0eWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uYWJkY2I5MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL3RyYW5zZm9ybS1pbmxpbmUtc3R5bGUuaHRtbApAQCAtMCwwICsxLDM0IEBACis8aHRtbD4K KzxoZWFkPgorICA8dGl0bGU+SW5saW5lIHRyYW5zaXRpb24gc3R5bGU8L3RpdGxlPgorICA8c3R5 bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgICNib3ggeworICAgICAgaGVp Z2h0OiAxMDBweDsKKyAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6 IGJsdWU7CisgICAgfQorICA8L3N0eWxlPgorICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCIgY2hhcnNldD0idXRmLTgiPgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIp CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICBmdW5jdGlv biBkb1Rlc3QoKQorICAgIHsKKyAgICAgIHZhciBib3ggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnYm94Jyk7CisgICAgICB2YXIgY29uc29sZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdj b25zb2xlJyk7CisgICAgICBjb25zb2xlLmlubmVySFRNTCArPSAnc3R5bGU6ICcgKyBib3guc3R5 bGUud2Via2l0VHJhbnNpdGlvbiArICc8YnI+JzsKKyAgICAgIGNvbnNvbGUuaW5uZXJIVE1MICs9 ICdzdHlsZTogJyArIGJveC5zdHlsZS53ZWJraXRUcmFuc2Zvcm1PcmlnaW4gKyAnPGJyPic7Cisg ICAgfQorICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0iZG9UZXN0KCkiPgorICA8 cD5UZXN0cyByZWFkaW5nIGlubGluZSBzdHlsZSBvZiB0cmFuc2l0aW9uLCBhbmQgLXdlYmtpdC10 cmFuc2Zvcm0tb3JpZ2luPGJyPgorICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjU5NCI+aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNTk0PC9hPgorICAgIDwvcD4KKyAgICA8ZGl2IGlkPSJib3giIHN0eWxlPSJib3Jk ZXI6IDFweCBibGFjazsKKyAgICAgICAgICAgICAgICAgICAgICAgICAtd2Via2l0LXRyYW5zaXRp b246IGFsbCAxcyBlYXNlLCBub25lIDJzIGVhc2UtaW4sIGxlZnQgM3MgY3ViaWMtYmV6aWVyKDAu MiwgMC4zLCAwLjYsIDAuOCkgMnM7CisgICAgICAgICAgICAgICAgICAgICAgICAgLXdlYmtpdC10 cmFuc2Zvcm0tb3JpZ2luOiBsZWZ0IDMwJTsiPgorICAgIDwvZGl2PgorICAgIDxkaXYgaWQ9ImNv bnNvbGUiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFu Z2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNDFlNzE2Li5lMTc2NGU4IDEwMDY0NAot LS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDI5IEBACisyMDA4LTEyLTA3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU5NAorCisgICAgICAgIEZpeCBp c3N1ZXMgd2hpY2ggYnJlYWsgcmVhZGluZyBpbmxpbmUgc3R5bGUgZm9yIC13ZWJraXQtdHJhbnNp dGlvbgorICAgICAgICBhbmQgLXdlYmtpdC10cmFuc2Zvcm0tb3JpZ2luLgorICAgICAgICAKKyAg ICAgICAgVGVzdDogZmFzdC9jc3MvdHJhbnNmb3JtLWlubGluZS1zdHlsZS5odG1sCisKKyAgICAg ICAgKiBjc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5VmFsdWUpOgorICAgICAg ICAgICAgQWRkIGNhc2VzIGZvciBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpbiBhbmQg Q1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uCisgICAgICAgICAgICBzbyB0aGF0IHRoZXNlIHNo b3J0aGFuZCBwcm9wZXJ0aWVzIGFyZSByZXR1cm5lZCBjb3JyZWN0bHkuCisgICAgICAgICAgICAK KyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNl cjo6cGFyc2VBbmltYXRpb25Qcm9wZXJ0eSk6CisgICAgICAgICAgICBDcmVhdGUgQ1NTUHJpbWl0 aXZlVmFsdWVzIHdpdGggdGhlIGNvcnJlY3QgQ1NTVmFsdWVBbGwgYW5kIENTU1ZhbHVlTm9uZQor ICAgICAgICAgICAgaWRlbnRpZmllcnMsIG5vdCB0aGUgUmVuZGVyU3R5bGUtbGV2ZWwgY0FuaW1h dGVBbGwsIGNBbmltYXRlTm9uZS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvblByb3Bl cnR5KToKKyAgICAgICAgICAgIFNwZWNpYWwtY2FzZSBDU1NWYWx1ZUFsbCBhbmQgQ1NTVmFsdWVO b25lIHZhbHVlcyB0byBzZXQgY0FuaW1hdGVBbGwKKyAgICAgICAgICAgIGFuZCBjQW5pbWF0ZU5v bmUgdHJhbnNpdGlvbiBwcm9wZXJ0aWVzLgorCiAyMDA4LTEyLTA3ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1dl YkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCA3NmIxYjhiLi45 ZjI3ZGY4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv bi5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCkBA IC0yMTYsNiArMjE2LDE2IEBAIFN0cmluZyBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0 UHJvcGVydHlWYWx1ZShpbnQgcHJvcGVydHlJRCkgY29uc3QKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5V2Via2l0TWFza09yaWdpbiB9OwogICAgICAg ICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVzLCA2KTsKICAg ICAgICAgfQorICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VHJhbnNmb3JtT3JpZ2luOiB7 CisgICAgICAgICAgICBjb25zdCBpbnQgcHJvcGVydGllc1syXSA9IHsgQ1NTUHJvcGVydHlXZWJr aXRUcmFuc2Zvcm1PcmlnaW5YLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIENTU1Byb3BlcnR5V2Via2l0VHJhbnNmb3JtT3JpZ2luWSB9OworICAgICAgICAgICAgcmV0 dXJuIGdldFNob3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDIpOworICAgICAgICB9CisgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uOiB7CisgICAgICAgICAgICBjb25zdCBp bnQgcHJvcGVydGllc1s0XSA9IHsgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uUHJvcGVydHks IENTU1Byb3BlcnR5V2Via2l0VHJhbnNpdGlvbkR1cmF0aW9uLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5V2Via2l0VHJhbnNpdGlvblRpbWluZ0Z1 bmN0aW9uLCBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zaXRpb25EZWxheSB9OworICAgICAgICAgICAg cmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVzLCA0KTsKKyAgICAgICAg fQogI2lmIEVOQUJMRShTVkcpCiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJrZXI6IHsKICAg ICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBnZXRQcm9wZXJ0eUNTU1ZhbHVlKENT U1Byb3BlcnR5TWFya2VyU3RhcnQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmNwcCBiL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggNDhkMjIzMy4uMjFiOGFmMCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9D U1NQYXJzZXIuY3BwCkBAIC0yMzU4LDkgKzIzNTgsOSBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBD U1NQYXJzZXI6OnBhcnNlQW5pbWF0aW9uUHJvcGVydHkoKQogICAgIGlmIChyZXN1bHQpCiAgICAg ICAgIHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlSWRlbnRpZmllcihyZXN1bHQpOwog ICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZS0+c3RyaW5nLCAiYWxsIikpCi0gICAgICAg IHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlSWRlbnRpZmllcihjQW5pbWF0ZUFsbCk7 IC8vIEZJWE1FOiBXaHkgbm90IHVzZSBDU1NWYWx1ZUFsbCBpbnN0ZWFkPworICAgICAgICByZXR1 cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoQ1NTVmFsdWVBbGwpOwogICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZS0+c3RyaW5nLCAibm9uZSIpKQotICAgICAgICBy ZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoY0FuaW1hdGVOb25lKTsg Ly8gRklYTUU6IFdoeSBub3QgdXNlIENTU1ZhbHVlTm9uZSBpbnN0ZWFkPworICAgICAgICByZXR1 cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoQ1NTVmFsdWVOb25lKTsKICAg ICByZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA2NjY1MTViLi43 YThlZTQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAorKysg Yi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcApAQCAtNTMyNCw3ICs1MzI0LDEyIEBA IHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uUHJvcGVydHkoQW5pbWF0aW9uKiBh bmltYXRpb24sIENTU1ZhbHVlKiB2YWx1CiAgICAgICAgIHJldHVybjsKIAogICAgIENTU1ByaW1p dGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVl Kj4odmFsdWUpOwotICAgIGFuaW1hdGlvbi0+c2V0UHJvcGVydHkoc3RhdGljX2Nhc3Q8Q1NTUHJv cGVydHlJRD4ocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkpKTsKKyAgICBpZiAocHJpbWl0aXZl VmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBbGwpCisgICAgICAgIGFuaW1hdGlvbi0+c2V0 UHJvcGVydHkoY0FuaW1hdGVBbGwpOworICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpID09IENTU1ZhbHVlTm9uZSkKKyAgICAgICAgYW5pbWF0aW9uLT5zZXRQcm9wZXJ0eShj QW5pbWF0ZU5vbmUpOworICAgIGVsc2UKKyAgICAgICAgYW5pbWF0aW9uLT5zZXRQcm9wZXJ0eShz dGF0aWNfY2FzdDxDU1NQcm9wZXJ0eUlEPihwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkpOwog fQogCiB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKEFu aW1hdGlvbiogYW5pbWF0aW9uLCBDU1NWYWx1ZSogdmFsdWUpCg==