36219 2010-03-17 07:09:26 -0700 [Qt] GraphicsLayer: Pausing and resuming of animations don't work as expected 2010-03-25 03:04:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All CLOSED FIXED Qt P2 Normal --- 36191 1 noam noam commit-queue hausmann kenneth oldest_to_newest 200753 0 noam 2010-03-17 07:09:26 -0700 LayoutTests/animations/play-state.html fails because of this bug. 200826 1 50915 kim.1.gronholm 2010-03-17 09:28:21 -0700 Created attachment 50915 Fix for how GraphicsLayer deals with animation states 200827 2 noam 2010-03-17 09:29:55 -0700 LGTM (we worked on this together :)) 201264 3 51021 kim.1.gronholm 2010-03-18 06:28:59 -0700 Created attachment 51021 Fix for how GraphicsLayer deals with animation states Updated the patch because it caused a compiler warning. 201281 4 hausmann 2010-03-18 07:27:07 -0700 How can this patch fix a layout test if this code isn't even executed during the DRT run? :) Note that DumpRenderTree doesn't use QGraphicsWebView but QWebView, so the accelerated compositing code path isn't taken AFAICS. 201284 5 noam 2010-03-18 07:30:50 -0700 We tested that layout-test manually. It's one of the tests that failed originally when we enabled compositing by default, which raises the question, how did the tests fail in the first place if DRT isn't called? :) in any case, it does fix the layout-test even if it's run manually and not through DRT. 201285 6 kenneth 2010-03-18 07:32:26 -0700 (In reply to comment #5) > We tested that layout-test manually. > It's one of the tests that failed originally when we enabled compositing by > default, which raises the question, how did the tests fail in the first place > if DRT isn't called? :) > > in any case, it does fix the layout-test even if it's run manually and not > through DRT. That is actually a very good point! Strange that enabling AC by default broke 3 tests. I think it is about time we change DRT to use the QGraphicsWebView. 201290 7 hausmann 2010-03-18 07:52:52 -0700 (In reply to comment #5) > We tested that layout-test manually. > It's one of the tests that failed originally when we enabled compositing by > default, which raises the question, how did the tests fail in the first place > if DRT isn't called? :) It sounds like there's a side-effect somewhere... > in any case, it does fix the layout-test even if it's run manually and not > through DRT. Okay, sounds good. Just wanted to check :) 201292 8 hausmann 2010-03-18 07:55:52 -0700 (In reply to comment #6) > (In reply to comment #5) > > We tested that layout-test manually. > > It's one of the tests that failed originally when we enabled compositing by > > default, which raises the question, how did the tests fail in the first place > > if DRT isn't called? :) > > > > in any case, it does fix the layout-test even if it's run manually and not > > through DRT. > > That is actually a very good point! Strange that enabling AC by default broke 3 > tests. > > I think it is about time we change DRT to use the QGraphicsWebView. We should do that at the same time as changing QtLauncher's default then. 201326 9 51021 commit-queue 2010-03-18 08:58:50 -0700 Comment on attachment 51021 Fix for how GraphicsLayer deals with animation states Clearing flags on attachment: 51021 Committed r56163: <http://trac.webkit.org/changeset/56163> 201327 10 commit-queue 2010-03-18 08:58:55 -0700 All reviewed patches have been landed. Closing bug. 50915 2010-03-17 09:28:21 -0700 2010-03-18 06:28:59 -0700 Fix for how GraphicsLayer deals with animation states patch-36219.diff text/plain 7062 kim.1.gronholm ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjUzOTExLi5mNWYyMjVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMt MTcgIEtpbSBHcsO2bmhvbG0gIDxraW0uZ3JvbmhvbG1Abm9tb3Zvay5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBHcmFwaGljc0xheWVy OiBQYXVzaW5nIGFuZCByZXN1bWluZyBvZiBhbmltYXRpb25zIGRvbid0IHdvcmsgYXMgZXhwZWN0 ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MjE5 CisgICAgICAgIAorICAgICAgICBUaGUgcGxheS1zdGF0ZSBsYXlvdXQgdGVzdCBub3cgd29ya3Ms IGFuZCBjYW4gYmUgcmVtb3ZlZCBmcm9tIHRoZSBza2lwIGxpc3QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9xdC9Ta2lwcGVkOiBhbmltYXRpb25zL3BsYXktc3RhdGUuaHRtbCBpcyByZW1vdmVkIGZy b20gdGhlIHNraXBwZWQgbGlzdAorCiAyMDEwLTAzLTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDogdXBkYXRlIG1pbWV0eXBl IGV4cGVjdGF0aW9ucyBpbiBpbnNwZWN0b3IgdGVzdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApp bmRleCBjNDc5MDYyLi5jYTIwMzQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9x dC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTUxMTgs NSArNTExOCw0IEBAIHBsdWdpbnMvcmVzaXplLWZyb20tcGx1Z2luLmh0bWwKICMgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTkxCiAjW1F0XSBHcmFwaGljc0xheWVy OiBmaXggdGVzdCByZWdyZXNzaW9ucwogYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0 bWwKLWFuaW1hdGlvbnMvcGxheS1zdGF0ZS5odG1sCiBhbmltYXRpb25zL3NpbXVsdGFuZW91cy1z dGFydC1sZWZ0Lmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYzFlY2I0Zi4uMTYxMGFmZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wMy0x NyAgS2ltIEdyw7ZuaG9sbSAgPGtpbS5ncm9uaG9sbUBub21vdm9rLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5ZXI6 IFBhdXNpbmcgYW5kIHJlc3VtaW5nIG9mIGFuaW1hdGlvbnMgZG9uJ3Qgd29yayBhcyBleHBlY3Rl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMTkK KyAgICAgICAgCisgICAgICAgIGFkZEFuaW1hdGlvbiBhbmQgcGF1c2VBbmltYXRpb24gd2VyZSBo YW5kbGluZyBhbmltYXRpb24gc3RhdGUgY2hhbmdlcyBpbgorICAgICAgICB0aGUgd3Jvbmcgd2F5 LgorICAgICAgICBBcHBhcmVudGx5IFdlYkNvcmUgY2FsbHMgYWRkQW5pbWF0aW9uIGZvciByZXN1 bWluZywgc28gd2UgaGF2ZSB0byBtYWtlIAorICAgICAgICBzdXJlIHRvIHJlc3VtZSBhbiBleGlz dGluZyBhbmltYXRpb24gaWYgdGhhdCBoYXBwZW5zLiBBbHNvLCB0aW1lT2Zmc2V0IAorICAgICAg ICBpcyBub3cgdXNlZCBmb3Igc3luY2hyb25pemF0aW9uIG9mIHRoZSBRdCBhbmltYXRpb24gY2xv Y2sgd2l0aCB0aGUgCisgICAgICAgIFdlYkNvcmUgY2xvY2ssIGFzIG9wcG9zZWQgdG8gdXNpbmcg aXQgYXMgYSBkZWxheSB0aW1lci4gCisgICAgICAgIEJvdGggdGhvc2UgZml4ZXMgd2VyZSBuZWNl c3NhcnkgdG8gZ2V0IHRoZSBsYXlvdXQgdGVzdCB0byB3b3JrLgorICAgICAgICAKKyAgICAgICAg TGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9wbGF5LXN0YXRlLmh0bWwgbm93IHBhc3NlZCBvbiBRdC4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25RdEJhc2U6OkFuaW1hdGlvblF0QmFzZSk6CisgICAg ICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1BbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRpb24pOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllclF0OjpwYXVzZUFuaW1hdGlvbik6CisKIDIwMTAtMDMtMTcgIFN0 ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvR3JhcGhpY3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NMYXllclF0LmNwcAppbmRleCA5NTdiNDljLi45MjQzNzcyIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC05NjksNiArOTY5 LDcgQEAgcHVibGljOgogICAgICAgICAsIG1faXNBbHRlcm5hdGUoYW5pbS0+ZGlyZWN0aW9uKCkg PT0gQW5pbWF0aW9uOjpBbmltYXRpb25EaXJlY3Rpb25BbHRlcm5hdGUpCiAgICAgICAgICwgbV93 ZWJraXRQcm9wZXJ0eUlEKHZhbHVlcy5wcm9wZXJ0eSgpKQogICAgICAgICAsIG1fa2V5ZnJhbWVz TmFtZShuYW1lKQorICAgICAgICAsIG1fd2Via2l0QW5pbWF0aW9uKGFuaW0pCiAgICAgewogICAg IH0KIApAQCAtOTg4LDYgKzk4OSw5IEBAIHB1YmxpYzoKICAgICBpbnQgbV9kdXJhdGlvbjsKICAg ICBib29sIG1faXNBbHRlcm5hdGU7CiAgICAgQW5pbWF0ZWRQcm9wZXJ0eUlEIG1fd2Via2l0UHJv cGVydHlJRDsKKworICAgIC8vIHdlIG1pZ2h0IG5lZWQgdGhpcyBpbiBjYXNlIHRoZSBzYW1lIGFu aW1hdGlvbiBpcyBhZGRlZCBhZ2FpbiAoaS5lLiByZXN1bWVkIGJ5IFdlYkNvcmUpCisgICAgY29u c3QgQW5pbWF0aW9uKiBtX3dlYmtpdEFuaW1hdGlvbjsKICAgICBRU3RyaW5nIG1fa2V5ZnJhbWVz TmFtZTsKIH07CiAKQEAgLTExMTYsNyArMTEyMCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1f c291cmNlTWF0cml4ID0gbV9sYXllci5kYXRhKCktPm1fbGF5ZXItPnRyYW5zZm9ybSgpOwogICAg ICAgICAgICAgbV9sYXllci5kYXRhKCktPm1fdHJhbnNmb3JtQW5pbWF0aW9uUnVubmluZyA9IHRy dWU7CiAgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+YWRqdXN0Q2FjaGluZ1JlY3Vyc2l2ZWx5 KHRydWUpOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKG5ld1N0YXRlID09 IFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RvcHBlZCkgewogICAgICAgICAgICAgbV9sYXllci5kYXRh KCktPm1fdHJhbnNmb3JtQW5pbWF0aW9uUnVubmluZyA9IGZhbHNlOwogICAgICAgICAgICAgbV9s YXllci5kYXRhKCktPmFkanVzdENhY2hpbmdSZWN1cnNpdmVseShmYWxzZSk7CiAgICAgICAgIH0K QEAgLTExNTgsMzMgKzExNjIsNDYgQEAgYm9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlv bihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKICAgICBpZiAo IWFuaW0tPmR1cmF0aW9uKCkgfHwgIWFuaW0tPml0ZXJhdGlvbkNvdW50KCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIFFBYnN0cmFjdEFuaW1hdGlvbiogbmV3QW5pbTsKKyAgICBRQWJz dHJhY3RBbmltYXRpb24qIG5ld0FuaW0gPSAwOwogCi0gICAgc3dpdGNoICh2YWx1ZXMucHJvcGVy dHkoKSkgewotICAgIGNhc2UgQW5pbWF0ZWRQcm9wZXJ0eU9wYWNpdHk6Ci0gICAgICAgIG5ld0Fu aW0gPSBuZXcgT3BhY2l0eUFuaW1hdGlvblF0KG1faW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXpl LCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBbmltYXRl ZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtOgotICAgICAgICBuZXdBbmltID0gbmV3IFRyYW5zZm9y bUFuaW1hdGlvblF0KG1faW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFt ZXNOYW1lKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIC8vIGZpeGVkOiB3ZSBtaWdodCBhbHJlYWR5IGhhdmUgdGhlIFF0IGFuaW1hdGlv biBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViQ29yZTo6QW5pbWF0aW9uIG9iamVjdAor ICAgIGZvciAoUUxpc3Q8UVdlYWtQb2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4gPjo6aXRlcmF0 b3IgaXQgPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1fYW5p bWF0aW9ucy5lbmQoKTsgKytpdCkgeworICAgICAgICBpZiAoKml0KSB7CisgICAgICAgICAgICBB bmltYXRpb25RdEJhc2UqIGN1ckFuaW1hdGlvbiA9IHN0YXRpY19jYXN0PEFuaW1hdGlvblF0QmFz ZSo+KGl0LT5kYXRhKCkpOworICAgICAgICAgICAgaWYgKGN1ckFuaW1hdGlvbiAmJiBjdXJBbmlt YXRpb24tPm1fd2Via2l0QW5pbWF0aW9uID09IGFuaW0pCisgICAgICAgICAgICAgICAgbmV3QW5p bSA9IGN1ckFuaW1hdGlvbjsKKyAgICAgICAgfQogICAgIH0KIAotICAgIC8vIHdlIG1ha2Ugc3Vy ZSBXZWJDb3JlOjpBbmltYXRpb24gYW5kIFFBbmltYXRpb24gYXJlIG9uIHRoZSBzYW1lIHRlcm1z Ci0gICAgbmV3QW5pbS0+c2V0TG9vcENvdW50KGFuaW0tPml0ZXJhdGlvbkNvdW50KCkpOwotICAg IG1faW1wbC0+bV9hbmltYXRpb25zLmFwcGVuZChRV2Vha1BvaW50ZXI8UUFic3RyYWN0QW5pbWF0 aW9uPihuZXdBbmltKSk7Ci0gICAgUU9iamVjdDo6Y29ubmVjdCgmbV9pbXBsLT5tX3N1c3BlbmRU aW1lciwgU0lHTkFMKHRpbWVvdXQoKSksIG5ld0FuaW0sIFNMT1QocmVzdW1lKCkpKTsKLSAgICB0 aW1lT2Zmc2V0ICs9IGFuaW0tPmRlbGF5KCk7CisgICAgaWYgKCFuZXdBbmltKSB7CisgICAgICAg IHN3aXRjaCAodmFsdWVzLnByb3BlcnR5KCkpIHsKKyAgICAgICAgY2FzZSBBbmltYXRlZFByb3Bl cnR5T3BhY2l0eToKKyAgICAgICAgICAgIG5ld0FuaW0gPSBuZXcgT3BhY2l0eUFuaW1hdGlvblF0 KG1faW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFu c2Zvcm06CisgICAgICAgICAgICBuZXdBbmltID0gbmV3IFRyYW5zZm9ybUFuaW1hdGlvblF0KG1f aW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CisKKyAgICAgICAgLy8gd2UgbWFrZSBzdXJlIFdlYkNvcmU6OkFuaW1hdGlv biBhbmQgUUFuaW1hdGlvbiBhcmUgb24gdGhlIHNhbWUgdGVybXMKKyAgICAgICAgbmV3QW5pbS0+ c2V0TG9vcENvdW50KGFuaW0tPml0ZXJhdGlvbkNvdW50KCkpOworICAgICAgICBtX2ltcGwtPm1f YW5pbWF0aW9ucy5hcHBlbmQoUVdlYWtQb2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4obmV3QW5p bSkpOworICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZtX2ltcGwtPm1fc3VzcGVuZFRpbWVyLCBT SUdOQUwodGltZW91dCgpKSwgbmV3QW5pbSwgU0xPVChyZXN1bWUoKSkpOworICAgIH0KIAogICAg IC8vIGZsdXNoIG5vdyBvciBmbGlja2VyLi4uCiAgICAgbV9pbXBsLT5mbHVzaENoYW5nZXMoZmFs c2UpOwogCi0gICAgaWYgKHRpbWVPZmZzZXQpCi0gICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCh0 aW1lT2Zmc2V0ICogMTAwMCwgbmV3QW5pbSwgU0xPVChzdGFydCgpKSk7CisgICAgaWYgKGFuaW0t PmRlbGF5KCkpCisgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdChhbmltLT5kZWxheSgpICogMTAw MCwgbmV3QW5pbSwgU0xPVChzdGFydCgpKSk7CiAgICAgZWxzZQogICAgICAgICBuZXdBbmltLT5z dGFydCgpOwogCisgICAgLy8gd2Ugc3luY2hyb25pemUgdGhlIGFuaW1hdGlvbidzIGNsb2NrIHRv IFdlYkNvcmUncyB0aW1lT2Zmc2V0CisgICAgbmV3QW5pbS0+c2V0Q3VycmVudFRpbWUodGltZU9m ZnNldCAqIDEwMDApOworCiAgICAgLy8gd2UgZG9uJ3QgbmVlZCB0byBtYW5hZ2UgdGhlIGFuaW1h dGlvbiBvYmplY3QncyBsaWZlY3ljbGU6CiAgICAgLy8gV2ViQ29yZSB3b3VsZCBjYWxsIHJlbW92 ZUFuaW1hdGlvbnMgd2hlbiBpdCdzIHRpbWUgdG8gZGVsZXRlLgogCkBAIC0xMjI2LDggKzEyNDMs MTEgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnBhdXNlQW5pbWF0aW9uKGNvbnN0IFN0cmluZyYg bmFtZSwgZG91YmxlIHRpbWVPZmZzZXQpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAg ICBBbmltYXRpb25RdEJhc2UqIGFuaW0gPSBzdGF0aWNfY2FzdDxBbmltYXRpb25RdEJhc2UqPigo Kml0KS5kYXRhKCkpOwotICAgICAgICBpZiAoYW5pbSAmJiBhbmltLT5tX2tleWZyYW1lc05hbWUg PT0gUVN0cmluZyhuYW1lKSkKLSAgICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCh0aW1lT2Zm c2V0ICogMTAwMCwgYW5pbSwgU0xPVChwYXVzZSgpKSk7CisgICAgICAgIGlmIChhbmltICYmIGFu aW0tPm1fa2V5ZnJhbWVzTmFtZSA9PSBRU3RyaW5nKG5hbWUpKSB7CisgICAgICAgICAgICAvLyB3 ZSBzeW5jaHJvbml6ZSB0aGUgYW5pbWF0aW9uJ3MgY2xvY2sgdG8gV2ViQ29yZSdzIHRpbWVPZmZz ZXQKKyAgICAgICAgICAgIGFuaW0tPnNldEN1cnJlbnRUaW1lKHRpbWVPZmZzZXQgKiAxMDAwKTsK KyAgICAgICAgICAgIGFuaW0tPnBhdXNlKCk7CisgICAgICAgIH0KICAgICB9CiB9CiAK 51021 2010-03-18 06:28:59 -0700 2010-03-18 08:58:50 -0700 Fix for how GraphicsLayer deals with animation states patch-36219-2.diff text/plain 7107 kim.1.gronholm ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjUzOTExLi5mNWYyMjVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMt MTcgIEtpbSBHcsO2bmhvbG0gIDxraW0uZ3JvbmhvbG1Abm9tb3Zvay5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBHcmFwaGljc0xheWVy OiBQYXVzaW5nIGFuZCByZXN1bWluZyBvZiBhbmltYXRpb25zIGRvbid0IHdvcmsgYXMgZXhwZWN0 ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MjE5 CisgICAgICAgIAorICAgICAgICBUaGUgcGxheS1zdGF0ZSBsYXlvdXQgdGVzdCBub3cgd29ya3Ms IGFuZCBjYW4gYmUgcmVtb3ZlZCBmcm9tIHRoZSBza2lwIGxpc3QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9xdC9Ta2lwcGVkOiBhbmltYXRpb25zL3BsYXktc3RhdGUuaHRtbCBpcyByZW1vdmVkIGZy b20gdGhlIHNraXBwZWQgbGlzdAorCiAyMDEwLTAzLTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDogdXBkYXRlIG1pbWV0eXBl IGV4cGVjdGF0aW9ucyBpbiBpbnNwZWN0b3IgdGVzdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApp bmRleCBjNDc5MDYyLi5jYTIwMzQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9x dC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTUxMTgs NSArNTExOCw0IEBAIHBsdWdpbnMvcmVzaXplLWZyb20tcGx1Z2luLmh0bWwKICMgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTkxCiAjW1F0XSBHcmFwaGljc0xheWVy OiBmaXggdGVzdCByZWdyZXNzaW9ucwogYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0 bWwKLWFuaW1hdGlvbnMvcGxheS1zdGF0ZS5odG1sCiBhbmltYXRpb25zL3NpbXVsdGFuZW91cy1z dGFydC1sZWZ0Lmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYzFlY2I0Zi4uMTYxMGFmZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wMy0x NyAgS2ltIEdyw7ZuaG9sbSAgPGtpbS5ncm9uaG9sbUBub21vdm9rLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5ZXI6 IFBhdXNpbmcgYW5kIHJlc3VtaW5nIG9mIGFuaW1hdGlvbnMgZG9uJ3Qgd29yayBhcyBleHBlY3Rl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMTkK KyAgICAgICAgCisgICAgICAgIGFkZEFuaW1hdGlvbiBhbmQgcGF1c2VBbmltYXRpb24gd2VyZSBo YW5kbGluZyBhbmltYXRpb24gc3RhdGUgY2hhbmdlcyBpbgorICAgICAgICB0aGUgd3Jvbmcgd2F5 LgorICAgICAgICBBcHBhcmVudGx5IFdlYkNvcmUgY2FsbHMgYWRkQW5pbWF0aW9uIGZvciByZXN1 bWluZywgc28gd2UgaGF2ZSB0byBtYWtlIAorICAgICAgICBzdXJlIHRvIHJlc3VtZSBhbiBleGlz dGluZyBhbmltYXRpb24gaWYgdGhhdCBoYXBwZW5zLiBBbHNvLCB0aW1lT2Zmc2V0IAorICAgICAg ICBpcyBub3cgdXNlZCBmb3Igc3luY2hyb25pemF0aW9uIG9mIHRoZSBRdCBhbmltYXRpb24gY2xv Y2sgd2l0aCB0aGUgCisgICAgICAgIFdlYkNvcmUgY2xvY2ssIGFzIG9wcG9zZWQgdG8gdXNpbmcg aXQgYXMgYSBkZWxheSB0aW1lci4gCisgICAgICAgIEJvdGggdGhvc2UgZml4ZXMgd2VyZSBuZWNl c3NhcnkgdG8gZ2V0IHRoZSBsYXlvdXQgdGVzdCB0byB3b3JrLgorICAgICAgICAKKyAgICAgICAg TGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9wbGF5LXN0YXRlLmh0bWwgbm93IHBhc3NlZCBvbiBRdC4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25RdEJhc2U6OkFuaW1hdGlvblF0QmFzZSk6CisgICAg ICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1BbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRpb24pOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllclF0OjpwYXVzZUFuaW1hdGlvbik6CisKIDIwMTAtMDMtMTcgIFN0 ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvR3JhcGhpY3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NMYXllclF0LmNwcAppbmRleCA5NTdiNDljLi5kNWY3YWQzIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC05NjgsNiArOTY4 LDcgQEAgcHVibGljOgogICAgICAgICAsIG1fZHVyYXRpb24oYW5pbS0+ZHVyYXRpb24oKSAqIDEw MDApCiAgICAgICAgICwgbV9pc0FsdGVybmF0ZShhbmltLT5kaXJlY3Rpb24oKSA9PSBBbmltYXRp b246OkFuaW1hdGlvbkRpcmVjdGlvbkFsdGVybmF0ZSkKICAgICAgICAgLCBtX3dlYmtpdFByb3Bl cnR5SUQodmFsdWVzLnByb3BlcnR5KCkpCisgICAgICAgICwgbV93ZWJraXRBbmltYXRpb24oYW5p bSkKICAgICAgICAgLCBtX2tleWZyYW1lc05hbWUobmFtZSkKICAgICB7CiAgICAgfQpAQCAtOTg4 LDYgKzk4OSw5IEBAIHB1YmxpYzoKICAgICBpbnQgbV9kdXJhdGlvbjsKICAgICBib29sIG1faXNB bHRlcm5hdGU7CiAgICAgQW5pbWF0ZWRQcm9wZXJ0eUlEIG1fd2Via2l0UHJvcGVydHlJRDsKKwor ICAgIC8vIHdlIG1pZ2h0IG5lZWQgdGhpcyBpbiBjYXNlIHRoZSBzYW1lIGFuaW1hdGlvbiBpcyBh ZGRlZCBhZ2FpbiAoaS5lLiByZXN1bWVkIGJ5IFdlYkNvcmUpCisgICAgY29uc3QgQW5pbWF0aW9u KiBtX3dlYmtpdEFuaW1hdGlvbjsKICAgICBRU3RyaW5nIG1fa2V5ZnJhbWVzTmFtZTsKIH07CiAK QEAgLTExMTYsNyArMTEyMCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fc291cmNlTWF0cml4 ID0gbV9sYXllci5kYXRhKCktPm1fbGF5ZXItPnRyYW5zZm9ybSgpOwogICAgICAgICAgICAgbV9s YXllci5kYXRhKCktPm1fdHJhbnNmb3JtQW5pbWF0aW9uUnVubmluZyA9IHRydWU7CiAgICAgICAg ICAgICBtX2xheWVyLmRhdGEoKS0+YWRqdXN0Q2FjaGluZ1JlY3Vyc2l2ZWx5KHRydWUpOwotICAg ICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKG5ld1N0YXRlID09IFFBYnN0cmFjdEFu aW1hdGlvbjo6U3RvcHBlZCkgewogICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPm1fdHJhbnNm b3JtQW5pbWF0aW9uUnVubmluZyA9IGZhbHNlOwogICAgICAgICAgICAgbV9sYXllci5kYXRhKCkt PmFkanVzdENhY2hpbmdSZWN1cnNpdmVseShmYWxzZSk7CiAgICAgICAgIH0KQEAgLTExNTgsMzMg KzExNjIsNDYgQEAgYm9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbihjb25zdCBLZXlm cmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKICAgICBpZiAoIWFuaW0tPmR1cmF0 aW9uKCkgfHwgIWFuaW0tPml0ZXJhdGlvbkNvdW50KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIFFBYnN0cmFjdEFuaW1hdGlvbiogbmV3QW5pbTsKKyAgICBRQWJzdHJhY3RBbmltYXRp b24qIG5ld0FuaW0gPSAwOwogCi0gICAgc3dpdGNoICh2YWx1ZXMucHJvcGVydHkoKSkgewotICAg IGNhc2UgQW5pbWF0ZWRQcm9wZXJ0eU9wYWNpdHk6Ci0gICAgICAgIG5ld0FuaW0gPSBuZXcgT3Bh Y2l0eUFuaW1hdGlvblF0KG1faW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlm cmFtZXNOYW1lKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBbmltYXRlZFByb3BlcnR5V2Vi a2l0VHJhbnNmb3JtOgotICAgICAgICBuZXdBbmltID0gbmV3IFRyYW5zZm9ybUFuaW1hdGlvblF0 KG1faW1wbC5nZXQoKSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKLSAg ICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIC8v IGZpeGVkOiB3ZSBtaWdodCBhbHJlYWR5IGhhdmUgdGhlIFF0IGFuaW1hdGlvbiBvYmplY3QgYXNz b2NpYXRlZCB3aXRoIHRoaXMgV2ViQ29yZTo6QW5pbWF0aW9uIG9iamVjdAorICAgIGZvciAoUUxp c3Q8UVdlYWtQb2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2lt cGwtPm1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5lbmQo KTsgKytpdCkgeworICAgICAgICBpZiAoKml0KSB7CisgICAgICAgICAgICBBbmltYXRpb25RdEJh c2UqIGN1ckFuaW1hdGlvbiA9IHN0YXRpY19jYXN0PEFuaW1hdGlvblF0QmFzZSo+KGl0LT5kYXRh KCkpOworICAgICAgICAgICAgaWYgKGN1ckFuaW1hdGlvbiAmJiBjdXJBbmltYXRpb24tPm1fd2Vi a2l0QW5pbWF0aW9uID09IGFuaW0pCisgICAgICAgICAgICAgICAgbmV3QW5pbSA9IGN1ckFuaW1h dGlvbjsKKyAgICAgICAgfQogICAgIH0KIAotICAgIC8vIHdlIG1ha2Ugc3VyZSBXZWJDb3JlOjpB bmltYXRpb24gYW5kIFFBbmltYXRpb24gYXJlIG9uIHRoZSBzYW1lIHRlcm1zCi0gICAgbmV3QW5p bS0+c2V0TG9vcENvdW50KGFuaW0tPml0ZXJhdGlvbkNvdW50KCkpOwotICAgIG1faW1wbC0+bV9h bmltYXRpb25zLmFwcGVuZChRV2Vha1BvaW50ZXI8UUFic3RyYWN0QW5pbWF0aW9uPihuZXdBbmlt KSk7Ci0gICAgUU9iamVjdDo6Y29ubmVjdCgmbV9pbXBsLT5tX3N1c3BlbmRUaW1lciwgU0lHTkFM KHRpbWVvdXQoKSksIG5ld0FuaW0sIFNMT1QocmVzdW1lKCkpKTsKLSAgICB0aW1lT2Zmc2V0ICs9 IGFuaW0tPmRlbGF5KCk7CisgICAgaWYgKCFuZXdBbmltKSB7CisgICAgICAgIHN3aXRjaCAodmFs dWVzLnByb3BlcnR5KCkpIHsKKyAgICAgICAgY2FzZSBBbmltYXRlZFByb3BlcnR5T3BhY2l0eToK KyAgICAgICAgICAgIG5ld0FuaW0gPSBuZXcgT3BhY2l0eUFuaW1hdGlvblF0KG1faW1wbC5nZXQo KSwgdmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBjYXNlIEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm06CisgICAg ICAgICAgICBuZXdBbmltID0gbmV3IFRyYW5zZm9ybUFuaW1hdGlvblF0KG1faW1wbC5nZXQoKSwg dmFsdWVzLCBib3hTaXplLCBhbmltLCBrZXlmcmFtZXNOYW1lKTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9 CisKKyAgICAgICAgLy8gd2UgbWFrZSBzdXJlIFdlYkNvcmU6OkFuaW1hdGlvbiBhbmQgUUFuaW1h dGlvbiBhcmUgb24gdGhlIHNhbWUgdGVybXMKKyAgICAgICAgbmV3QW5pbS0+c2V0TG9vcENvdW50 KGFuaW0tPml0ZXJhdGlvbkNvdW50KCkpOworICAgICAgICBtX2ltcGwtPm1fYW5pbWF0aW9ucy5h cHBlbmQoUVdlYWtQb2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4obmV3QW5pbSkpOworICAgICAg ICBRT2JqZWN0Ojpjb25uZWN0KCZtX2ltcGwtPm1fc3VzcGVuZFRpbWVyLCBTSUdOQUwodGltZW91 dCgpKSwgbmV3QW5pbSwgU0xPVChyZXN1bWUoKSkpOworICAgIH0KIAogICAgIC8vIGZsdXNoIG5v dyBvciBmbGlja2VyLi4uCiAgICAgbV9pbXBsLT5mbHVzaENoYW5nZXMoZmFsc2UpOwogCi0gICAg aWYgKHRpbWVPZmZzZXQpCi0gICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCh0aW1lT2Zmc2V0ICog MTAwMCwgbmV3QW5pbSwgU0xPVChzdGFydCgpKSk7CisgICAgaWYgKGFuaW0tPmRlbGF5KCkpCisg ICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdChhbmltLT5kZWxheSgpICogMTAwMCwgbmV3QW5pbSwg U0xPVChzdGFydCgpKSk7CiAgICAgZWxzZQogICAgICAgICBuZXdBbmltLT5zdGFydCgpOwogCisg ICAgLy8gd2Ugc3luY2hyb25pemUgdGhlIGFuaW1hdGlvbidzIGNsb2NrIHRvIFdlYkNvcmUncyB0 aW1lT2Zmc2V0CisgICAgbmV3QW5pbS0+c2V0Q3VycmVudFRpbWUodGltZU9mZnNldCAqIDEwMDAp OworCiAgICAgLy8gd2UgZG9uJ3QgbmVlZCB0byBtYW5hZ2UgdGhlIGFuaW1hdGlvbiBvYmplY3Qn cyBsaWZlY3ljbGU6CiAgICAgLy8gV2ViQ29yZSB3b3VsZCBjYWxsIHJlbW92ZUFuaW1hdGlvbnMg d2hlbiBpdCdzIHRpbWUgdG8gZGVsZXRlLgogCkBAIC0xMjI2LDggKzEyNDMsMTEgQEAgdm9pZCBH cmFwaGljc0xheWVyUXQ6OnBhdXNlQW5pbWF0aW9uKGNvbnN0IFN0cmluZyYgbmFtZSwgZG91Ymxl IHRpbWVPZmZzZXQpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBBbmltYXRpb25R dEJhc2UqIGFuaW0gPSBzdGF0aWNfY2FzdDxBbmltYXRpb25RdEJhc2UqPigoKml0KS5kYXRhKCkp OwotICAgICAgICBpZiAoYW5pbSAmJiBhbmltLT5tX2tleWZyYW1lc05hbWUgPT0gUVN0cmluZyhu YW1lKSkKLSAgICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCh0aW1lT2Zmc2V0ICogMTAwMCwg YW5pbSwgU0xPVChwYXVzZSgpKSk7CisgICAgICAgIGlmIChhbmltICYmIGFuaW0tPm1fa2V5ZnJh bWVzTmFtZSA9PSBRU3RyaW5nKG5hbWUpKSB7CisgICAgICAgICAgICAvLyB3ZSBzeW5jaHJvbml6 ZSB0aGUgYW5pbWF0aW9uJ3MgY2xvY2sgdG8gV2ViQ29yZSdzIHRpbWVPZmZzZXQKKyAgICAgICAg ICAgIGFuaW0tPnNldEN1cnJlbnRUaW1lKHRpbWVPZmZzZXQgKiAxMDAwKTsKKyAgICAgICAgICAg IGFuaW0tPnBhdXNlKCk7CisgICAgICAgIH0KICAgICB9CiB9CiAK