17306 2008-02-10 23:07:21 -0800 Transitions between styles that have different transition-* properties behave inconsistently 2008-02-15 13:09:02 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 mitz webkit-unassigned hyatt oldest_to_newest 70186 0 mitz 2008-02-10 23:07:21 -0800 Transitions between styles that have different transition properties behave inconsistently: the transitioning properties, the durations and the timing functions are determined by the first target style that specifies a transition, and remain in effect for all subsequent transitions regardless of what they specify. The exception is transitions to a style that does not specify transitions, which resets everything. The attached test case describes the expected behavior according to the rule that the "from" style determines the transition properties. That rule is my interpretation of the proposed spec. However it might make more sense for the "target" style to determine the transition. The latter rule is also a little easier to implement. 70187 1 19058 mitz 2008-02-10 23:07:49 -0800 Created attachment 19058 Test case 70420 2 mitz 2008-02-12 10:53:19 -0800 <rdar://problem/5737923> 70592 3 19117 mitz 2008-02-13 18:38:37 -0800 Created attachment 19117 Patch, including tedious manual test 70786 4 19117 hyatt 2008-02-15 12:04:06 -0800 Comment on attachment 19117 Patch, including tedious manual test r=me 70791 5 mitz 2008-02-15 13:09:02 -0800 Fixed in <http://trac.webkit.org/projects/webkit/changeset/30319>. 19058 2008-02-10 23:07:49 -0800 2008-02-10 23:07:49 -0800 Test case transitions.html text/html 2038 mitz //48AHMAdAB5AGwAZQA+AAoAIAAgACAAIABkAGkAdgAgAHsACgAgACAAIAAgACAAIAAgACAAdwBp AGQAdABoADoAIAA1ADAAcAB4ADsACgAgACAAIAAgACAAIAAgACAAaABlAGkAZwBoAHQAOgAgADUA MABwAHgAOwAKACAAIAAgACAAIAAgACAAIABiAGEAYwBrAGcAcgBvAHUAbgBkAC0AYwBvAGwAbwBy ADoAIAB5AGUAbABsAG8AdwA7AAoAIAAgACAAIAB9AAoACgAgACAAIAAgAGQAaQB2AC4AZwByAGUA ZQBuACAAewAKACAAIAAgACAAIAAgACAAIAB3AGkAZAB0AGgAOgAgADEAMAAwAHAAeAA7AAoAIAAg ACAAIAAgACAAIAAgAGIAYQBjAGsAZwByAG8AdQBuAGQALQBjAG8AbABvAHIAOgAgAGcAcgBlAGUA bgA7AAoAIAAgACAAIAAgACAAIAAgAC0AdwBlAGIAawBpAHQALQB0AHIAYQBuAHMAaQB0AGkAbwBu AC0AcAByAG8AcABlAHIAdAB5ADoAIABiAGEAYwBrAGcAcgBvAHUAbgBkAC0AYwBvAGwAbwByADsA CgAgACAAIAAgACAAIAAgACAALQB3AGUAYgBrAGkAdAAtAHQAcgBhAG4AcwBpAHQAaQBvAG4ALQBk AHUAcgBhAHQAaQBvAG4AOgAgADUAcwA7AAoAIAAgACAAIAB9AAoACgAgACAAIAAgAGQAaQB2AC4A cwBxAHUAYQByAGUAIAB7AAoAIAAgACAAIAAgACAAIAAgAHcAaQBkAHQAaAA6ACAAMQAwADAAcAB4 ADsACgAgACAAIAAgACAAIAAgACAAaABlAGkAZwBoAHQAOgAgADEAMAAwAHAAeAA7AAoAIAAgACAA IAAgACAAIAAgAC0AdwBlAGIAawBpAHQALQB0AHIAYQBuAHMAaQB0AGkAbwBuAC0AcAByAG8AcABl AHIAdAB5ADoAIABoAGUAaQBnAGgAdAA7AAoAIAAgACAAIAAgACAAIAAgAC0AdwBlAGIAawBpAHQA LQB0AHIAYQBuAHMAaQB0AGkAbwBuAC0AZAB1AHIAYQB0AGkAbwBuADoAIAAyAHMAOwAKACAAIAAg ACAAfQAKADwALwBzAHQAeQBsAGUAPgAKADwAcAA+AAoAIAAgACAAIAA8AGIAdQB0AHQAbwBuACAA bwBuAGMAbABpAGMAawA9ACIAdABhAHIAZwBlAHQALgBjAGwAYQBzAHMATgBhAG0AZQAgAD0AIAAn ACcAIgA+AFMAbQBhAGwAbAAgAHkAZQBsAGwAbwB3ACAAcwBxAHUAYQByAGUAPAAvAGIAdQB0AHQA bwBuAD4ACgAgACAAIAAgAEEAIABzAG0AYQBsAGwAIAB5AGUAbABsAG8AdwAgAHMAcQB1AGEAcgBl ACAAYwBoAGEAbgBnAGUAcwAgAGkAbgBzAHQAYQBuAHQAbAB5AC4ACgA8AHAAPgAKADwAcAA+AAoA IAAgACAAIAA8AGIAdQB0AHQAbwBuACAAbwBuAGMAbABpAGMAawA9ACIAdABhAHIAZwBlAHQALgBj AGwAYQBzAHMATgBhAG0AZQAgAD0AIAAnAGcAcgBlAGUAbgAnACIAPgBHAHIAZQBlAG4AIAByAGUA YwB0ADwALwBiAHUAdAB0AG8AbgA+AAoAIAAgACAAIABBACAAZwByAGUAZQBuACAAcgBlAGMAdAAm AHIAcwBxAHUAbwA7AHMAIABzAGgAYQBwAGUAIABjAGgAYQBuAGcAZQBzACAAaQBuAHMAdABhAG4A dABsAHkALAAgAGIAdQB0ACAAaQB0AHMAIABjAG8AbABvAHIAIABhAG4AaQBtAGEAdABlAHMAIABv AHYAZQByACAANQAgAHMAZQBjAG8AbgBkAHMALgAKADwALwBwAD4ACgA8AHAAPgAKACAAIAAgACAA PABiAHUAdAB0AG8AbgAgAG8AbgBjAGwAaQBjAGsAPQAiAHQAYQByAGcAZQB0AC4AYwBsAGEAcwBz AE4AYQBtAGUAIAA9ACAAJwBzAHEAdQBhAHIAZQAnACIAPgBCAGkAZwAgAHkAZQBsAGwAbwB3ACAA cwBxAHUAYQByAGUAPAAvAGIAdQB0AHQAbwBuAD4ACgAgACAAIAAgAEEAIABiAGkAZwAgAHkAZQBs AGwAbwB3ACAAcwBxAHUAYQByAGUAJgByAHMAcQB1AG8AOwBzACAAYwBvAGwAbwByACAAYQBuAGQA IAB3AGkAZAB0AGgAIABjAGgAYQBuAGcAZQAgAGkAbgBzAHQAYQBuAHQAbAB5ACwAIABiAHUAdAAg AGkAdABzACAAaABlAGkAZwBoAHQAIABhAG4AaQBtAGEAdABlAHMAIABvAHYAZQByACAAMgAgAHMA ZQBjAG8AbgBkAHMALgAKADwAcAA+AAoAPABkAGkAdgAgAGkAZAA9ACIAdABhAHIAZwBlAHQAIgA+ ADwALwBkAGkAdgA+AAoAPABzAGMAcgBpAHAAdAA+AAoAIAAgACAAIAB2AGEAcgAgAHQAYQByAGcA ZQB0ACAAPQAgAGQAbwBjAHUAbQBlAG4AdAAuAGcAZQB0AEUAbABlAG0AZQBuAHQAQgB5AEkAZAAo ACIAdABhAHIAZwBlAHQAIgApADsACgA8AC8AcwBjAHIAaQBwAHQAPgAKAA== 19117 2008-02-13 18:38:37 -0800 2008-02-15 12:04:06 -0800 Patch, including tedious manual test 17306_r1.diff text/plain 7255 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMDIxOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDgtMDItMTMgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGZp eCBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMwNgorICAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81NzM3OTIzPiBUcmFuc2l0aW9ucyBiZXR3ZWVuIHN0eWxlcyB0aGF0 IGhhdmUgZGlmZmVyZW50IHRyYW5zaXRpb24tKiBwcm9wZXJ0aWVzIGJlaGF2ZSBpbmNvbnNpc3Rl bnRseQorCisgICAgICAgICogbWFudWFsLXRlc3RzL3RyYW5zaXRpb25zLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIHBhZ2UvQW5pbWF0aW9uQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb21wb3NpdGVJbXBsaWNpdEFuaW1hdGlvbjo6YW5pbWF0ZSk6IENoYW5nZWQgdG8gdXNlIHRo ZQorICAgICAgICB0cmFuc2l0aW9uIHByb3BlcnRpZXMgb2YgdGhlIGN1cnJlbnQgc3R5bGUgcmF0 aGVyIHRoYW4gdGhlIHRhcmdldCBzdHlsZS4KKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNv bnRyb2xsZXJQcml2YXRlOjpnZXQpOiBDaGFuZ2VkIHRvIG5vdCBjcmVhdGUgYW4KKyAgICAgICAg YW5pbWF0aW9uIGlmIHRoZSBzdHlsZSBkb2VzIG5vdCBoYXZlIHRyYW5zaXRpb25zLgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlcjo6dXBkYXRlSW1wbGljaXRBbmltYXRpb25z KTogQWRkZWQgY29kZSB0bworICAgICAgICByZXR1cm4gdGhlIHRhcmdldCBzdHlsZSBpZiB0aGUg Y3VycmVudCBzdHlsZSBpcyBub3QgYW5pbWF0aW5nLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZXRBbmltYXRh YmxlU3R5bGUpOiBDaGFuZ2VkIHRvIGNhbGwKKyAgICAgICAgdXBkYXRlSW1wbGljaXRBbmltYXRp b25zKCkgZXZlbiBpZiB0aGUgY3VycmVudCBzdHlsZSBkb2VzIG5vdCBoYXZlCisgICAgICAgIHRy YW5zaXRpb25zLCBiZWNhdXNlIHdlIG1heSBiZSBhbmltYXRpbmcgb3V0IG9mIGEgc3R5bGUgdGhh dCBoYWQgdGhlbS4KKwogMjAwOC0wMi0xMyAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycy4KSW5kZXg6IFdlYkNvcmUvbWFu dWFsLXRlc3RzL3RyYW5zaXRpb25zLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYW51YWwt dGVzdHMvdHJhbnNpdGlvbnMuaHRtbAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRl c3RzL3RyYW5zaXRpb25zLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTQgQEAKKzxzdHls ZT4KKyAgICBkaXYgeworICAgICAgICB3aWR0aDogNTBweDsKKyAgICAgICAgaGVpZ2h0OiA1MHB4 OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7CisgICAgfQorCisgICAgZGl2Lmdy ZWVuIHsKKyAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBn cmVlbjsKKyAgICAgICAgLXdlYmtpdC10cmFuc2l0aW9uLXByb3BlcnR5OiBiYWNrZ3JvdW5kLWNv bG9yOworICAgICAgICAtd2Via2l0LXRyYW5zaXRpb24tZHVyYXRpb246IDVzOworICAgIH0KKwor ICAgIGRpdi5zcXVhcmUgeworICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgIGhlaWdodDog MTAwcHg7CisgICAgICAgIC13ZWJraXQtdHJhbnNpdGlvbi1wcm9wZXJ0eTogaGVpZ2h0OworICAg ICAgICAtd2Via2l0LXRyYW5zaXRpb24tZHVyYXRpb246IDJzOworICAgIH0KKzwvc3R5bGU+Cis8 cCBpZD0iaW5zdHJ1Y3Rpb25zIj4KKyAgICBXaGVuIHlvdSBjbGljayB0aGUgQ2hhbmdlIGJ1dHRv biwgdGhlIHNoYXBlIHdpbGwKKyAgICA8c3BhbiBpZD0iZGVzY3JpcHRpb24iPjwvc3Bhbj4uCisg ICAgPGJ1dHRvbiBzdHlsZT0iZGlzcGxheTogYmxvY2s7IiBvbmNsaWNrPSJ0cmFuc2l0aW9uKCki PkNoYW5nZTwvYnV0dG9uPgorPC9wPgorPGRpdiBpZD0idGFyZ2V0Ij48L2Rpdj4KKzxzY3JpcHQ+ CisgICAgdmFyIHN0YXRlID0gMDsKKyAgICB2YXIgdHJhbnNpdGlvbnMgPSBbCisgICAgICAgIHtj bGFzc05hbWU6ImdyZWVuIiwgZGVzY3JpcHRpb246Imluc3RhbnRseSBjaGFuZ2UgaW50byBhIGdy ZWVuIHJlY3RhbmdsZSJ9LAorICAgICAgICB7Y2xhc3NOYW1lOiIiLCBkZXNjcmlwdGlvbjoiaW5z dGFudGx5IGNoYW5nZSBpbnRvIGEgc21hbGwgZ3JlZW4gc3F1YXJlIHRoZW4gYW5pbWF0ZSB0byB5 ZWxsb3cgb3ZlciA1IHNlY29uZHMifSwKKyAgICAgICAge2NsYXNzTmFtZToic3F1YXJlIiwgZGVz Y3JpcHRpb246Imluc3RhbnRseSBjaGFuZ2UgaW50byBhIGJpZyB5ZWxsb3cgc3F1YXJlIn0sCisg ICAgICAgIHtjbGFzc05hbWU6ImdyZWVuIiwgZGVzY3JpcHRpb246Imluc3RhbnRseSBjaGFuZ2Ug aW50byBhIGdyZWVuIHNxdWFyZSBhbmQgdGhlbiBhbmltYXRlIHRvIGEgcmVjdGFuZ2Ugb3ZlciAy IHNlY29uZHMifSwKKyAgICAgICAge2NsYXNzTmFtZToiIiwgZGVzY3JpcHRpb246Imluc3RhbnRs eSBjaGFuZ2UgaW50byBhIHNtYWxsIGdyZWVuIHNxdWFyZSB0aGVuIGFuaW1hdGUgdG8geWVsbG93 IG92ZXIgNSBzZWNvbmRzIn0sCisgICAgICAgIHtjbGFzc05hbWU6ImdyZWVuIiwgZGVzY3JpcHRp b246Imluc3RhbnRseSBjaGFuZ2UgaW50byBhIGdyZWVuIHJlY3RhbmdsZSJ9LAorICAgICAgICB7 Y2xhc3NOYW1lOiJzcXVhcmUiLCBkZXNjcmlwdGlvbjoiaW5zdGFudGx5IGNoYW5nZSBpbnRvIGEg Z3JlZW4gcmVjdGFuZ2xlIHRoZW4gYW5pbWF0ZSB0byB5ZWxsb3cgb3ZlciA1IHNlY29uZHMifSwK KyAgICAgICAge2NsYXNzTmFtZToiIiwgZGVzY3JpcHRpb246Imluc3RhbnRseSBjaGFuZ2UgaW50 byBhIHJlY3RhbmdsZSB0aGVuIGFuaW1hdGUgaW50byBhIHNxdWFyZSBvdmVyIDIgc2Vjb25kcyJ9 CisgICAgXTsKKworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkZXNjcmlwdGlvbiIpLmlu bmVyVGV4dCA9IHRyYW5zaXRpb25zWzBdLmRlc2NyaXB0aW9uOworCisgICAgZnVuY3Rpb24gdHJh bnNpdGlvbigpCisgICAgeworICAgICAgICB2YXIgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoInRhcmdldCIpOworICAgICAgICB0YXJnZXQuY2xhc3NOYW1lID0gdHJhbnNpdGlvbnNb c3RhdGVdLmNsYXNzTmFtZTsKKyAgICAgICAgc3RhdGUrKzsKKyAgICAgICAgaWYgKHN0YXRlIDwg dHJhbnNpdGlvbnMubGVuZ3RoKQorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImRlc2NyaXB0aW9uIikuaW5uZXJUZXh0ID0gdHJhbnNpdGlvbnNbc3RhdGVdLmRlc2NyaXB0aW9u OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJp bnN0cnVjdGlvbnMiKS5pbm5lclRleHQgPSAiRG9uZS4iOworICAgICAgICB9CisgICAgfQorPC9z Y3JpcHQ+CkluZGV4OiBXZWJDb3JlL3BhZ2UvQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wYWdlL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAz MDIxNCkKKysrIFdlYkNvcmUvcGFnZS9BbmltYXRpb25Db250cm9sbGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDI3LDExICs0MjcsMTkgQEAgdm9pZCBJbXBsaWNpdEFuaW1hdGlvbjo6YW5pbWF0 ZShDb21wb3NpdAogCiBSZW5kZXJTdHlsZSogQ29tcG9zaXRlSW1wbGljaXRBbmltYXRpb246OmFu aW1hdGUoUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgUmVuZGVyU3R5bGUqIGN1cnJlbnRTdHlsZSwg UmVuZGVyU3R5bGUqIHRhcmdldFN0eWxlKQogeworICAgIGNvbnN0IFRyYW5zaXRpb24qIGN1cnJl bnRUcmFuc2l0aW9ucyA9IGN1cnJlbnRTdHlsZS0+dHJhbnNpdGlvbnMoKTsKKyAgICBjb25zdCBU cmFuc2l0aW9uKiB0YXJnZXRUcmFuc2l0aW9ucyA9IHRhcmdldFN0eWxlLT50cmFuc2l0aW9ucygp OworICAgIGlmIChjdXJyZW50VHJhbnNpdGlvbnMgIT0gdGFyZ2V0VHJhbnNpdGlvbnMgJiYgIShj dXJyZW50VHJhbnNpdGlvbnMgJiYgdGFyZ2V0VHJhbnNpdGlvbnMgJiYgKmN1cnJlbnRUcmFuc2l0 aW9ucyA9PSAqdGFyZ2V0VHJhbnNpdGlvbnMpKSB7CisgICAgICAgIHJlc2V0KHJlbmRlcmVyKTsK KyAgICAgICAgZGVsZXRlQWxsVmFsdWVzKG1fYW5pbWF0aW9ucyk7CisgICAgICAgIG1fYW5pbWF0 aW9ucy5jbGVhcigpOworICAgIH0KKwogICAgIC8vIEdldCB0aGUgYW5pbWF0aW9uIGxheWVycyBm cm9tIHRoZSB0YXJnZXQgc3R5bGUuCiAgICAgLy8gRm9yIGVhY2ggb25lLCB3ZSBuZWVkIHRvIGNy ZWF0ZSBhIG5ldyBhbmltYXRpb24gdW5sZXNzIG9uZSBleGlzdHMgYWxyZWFkeSAobGF0ZXIgb2Nj dXJyZW5jZXMgb2YgZHVwbGljYXRlCiAgICAgLy8gdHJpZ2dlcnMgaW4gdGhlIGxheWVyIGxpc3Qg Z2V0IGlnbm9yZWQpLgogICAgIGlmIChtX2FuaW1hdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAgICAg IGZvciAoY29uc3QgVHJhbnNpdGlvbiogdHJhbnNpdGlvbiA9IHRhcmdldFN0eWxlLT50cmFuc2l0 aW9ucygpOyB0cmFuc2l0aW9uOyB0cmFuc2l0aW9uID0gdHJhbnNpdGlvbi0+bmV4dCgpKSB7Cisg ICAgICAgIGZvciAoY29uc3QgVHJhbnNpdGlvbiogdHJhbnNpdGlvbiA9IGN1cnJlbnRUcmFuc2l0 aW9uczsgdHJhbnNpdGlvbjsgdHJhbnNpdGlvbiA9IHRyYW5zaXRpb24tPm5leHQoKSkgewogICAg ICAgICAgICAgaW50IHByb3BlcnR5ID0gdHJhbnNpdGlvbi0+dHJhbnNpdGlvblByb3BlcnR5KCk7 CiAgICAgICAgICAgICBpbnQgZHVyYXRpb24gPSB0cmFuc2l0aW9uLT50cmFuc2l0aW9uRHVyYXRp b24oKTsKICAgICAgICAgICAgIGludCByZXBlYXRDb3VudCA9IHRyYW5zaXRpb24tPnRyYW5zaXRp b25SZXBlYXRDb3VudCgpOwpAQCAtNDQ4LDcgKzQ1Niw3IEBAIFJlbmRlclN0eWxlKiBDb21wb3Np dGVJbXBsaWNpdEFuaW1hdGlvbjoKICAgICBIYXNoTWFwPGludCwgSW1wbGljaXRBbmltYXRpb24q Pjo6aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwogICAgIGZvciAoSGFzaE1hcDxp bnQsIEltcGxpY2l0QW5pbWF0aW9uKj46Oml0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2lu KCk7IGl0ICE9IGVuZDsgKytpdCkKICAgICAgICAgaXQtPnNlY29uZC0+YW5pbWF0ZSh0aGlzLCBy ZW5kZXJlciwgY3VycmVudFN0eWxlLCB0YXJnZXRTdHlsZSwgcmVzdWx0KTsKLSAgICAKKwogICAg IGlmIChyZXN1bHQpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKQEAgLTUwNCw3ICs1MTIsNyBA QCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6fkFuaW1hdGlvbkNvCiBDb21wb3NpdGVJbXBs aWNpdEFuaW1hdGlvbiogQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmdldChSZW5kZXJPYmpl Y3QqIHJlbmRlcmVyKQogewogICAgIENvbXBvc2l0ZUltcGxpY2l0QW5pbWF0aW9uKiBhbmltYXRp b24gPSBtX2FuaW1hdGlvbnMuZ2V0KHJlbmRlcmVyKTsKLSAgICBpZiAoIWFuaW1hdGlvbikgewor ICAgIGlmICghYW5pbWF0aW9uICYmIHJlbmRlcmVyLT5zdHlsZSgpLT50cmFuc2l0aW9ucygpKSB7 CiAgICAgICAgIGFuaW1hdGlvbiA9IG5ldyBDb21wb3NpdGVJbXBsaWNpdEFuaW1hdGlvbigpOwog ICAgICAgICBtX2FuaW1hdGlvbnMuc2V0KHJlbmRlcmVyLCBhbmltYXRpb24pOwogICAgIH0KQEAg LTU4NCw4ICs1OTIsMTEgQEAgUmVuZGVyU3R5bGUqIEFuaW1hdGlvbkNvbnRyb2xsZXI6OnVwZGF0 ZQogICAgIC8vIGhhdmUgY2hhbmdlZCwgd2UgcmVzZXQgdGhlIGFuaW1hdGlvbi4gIFdlIHRoZW4g ZG8gYSBibGVuZCB0byBnZXQgbmV3IHZhbHVlcyBhbmQgd2UgcmV0dXJuCiAgICAgLy8gYSBuZXcg c3R5bGUuCiAgICAgQVNTRVJUKHJlbmRlcmVyLT5lbGVtZW50KCkpOyAvLyBGSVhNRTogV2UgZG8g bm90IGFuaW1hdGUgZ2VuZXJhdGVkIGNvbnRlbnQgeWV0LgotICAgIAorCiAgICAgQ29tcG9zaXRl SW1wbGljaXRBbmltYXRpb24qIGFuaW1hdGlvbiA9IG1fZGF0YS0+Z2V0KHJlbmRlcmVyKTsKKyAg ICBpZiAoIWFuaW1hdGlvbikKKyAgICAgICAgcmV0dXJuIG5ld1N0eWxlOworCiAgICAgUmVuZGVy U3R5bGUqIHJlc3VsdCA9IGFuaW1hdGlvbi0+YW5pbWF0ZShyZW5kZXJlciwgcmVuZGVyZXItPnN0 eWxlKCksIG5ld1N0eWxlKTsKICAgICBtX2RhdGEtPnVwZGF0ZVRpbWVyKCk7CiAgICAgcmV0dXJu IHJlc3VsdDsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMzAy MTQpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMTUzLDEyICsyMTUzLDkgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmhhbmRsZUR5bmFtaWNG bG9hdFBvcwogCiB2b2lkIFJlbmRlck9iamVjdDo6c2V0QW5pbWF0YWJsZVN0eWxlKFJlbmRlclN0 eWxlKiBzdHlsZSkKIHsKLSAgICBpZiAoIWlzVGV4dCgpICYmIG1fc3R5bGUgJiYgc3R5bGUpIHsK LSAgICAgICAgaWYgKCFtX3N0eWxlLT50cmFuc2l0aW9ucygpKQotICAgICAgICAgICAgYW5pbWF0 aW9uQ29udHJvbGxlcigpLT5jYW5jZWxJbXBsaWNpdEFuaW1hdGlvbnModGhpcyk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHN0eWxlID0gYW5pbWF0aW9uQ29udHJvbGxlcigpLT51cGRhdGVJ bXBsaWNpdEFuaW1hdGlvbnModGhpcywgc3R5bGUpOwotICAgIH0KKyAgICBpZiAoIWlzVGV4dCgp ICYmIG1fc3R5bGUgJiYgc3R5bGUpCisgICAgICAgIHN0eWxlID0gYW5pbWF0aW9uQ29udHJvbGxl cigpLT51cGRhdGVJbXBsaWNpdEFuaW1hdGlvbnModGhpcywgc3R5bGUpOworCiAgICAgc2V0U3R5 bGUoc3R5bGUpOwogfQogCg==