41954 2010-07-09 05:18:22 -0700 [Qt] GraphicsLayerQt must have syncCompositingStateForThisLayerOnly() implemented 2010-07-14 06:03:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 38744 1 jesus jesus commit-queue kenneth noam oldest_to_newest 248929 0 jesus 2010-07-09 05:18:22 -0700 [Qt] GraphicsLayerQt must have syncCompositingStateForThisLayerOnly() implemented 248935 1 61036 jesus 2010-07-09 05:32:37 -0700 Created attachment 61036 Patch 248939 2 jesus 2010-07-09 05:37:59 -0700 Noam and Kenneth, could you please take at this? We need to implement this in order to get AC working with WebKit2. Thanks in advance! 248960 3 noam 2010-07-09 06:40:48 -0700 the first think I'd do for that is to make sure only flushChanges calls m_layer and m_pendingContent, and everyone else calls m_state and m_currentContent. I think maybe updateTransform still calls m_layer directly - also the animations, but that's fine because animations work on an already synced layer. ~ m_layer and m_pendingContent contain the non-synced state, m_state and m_currentContent contain the synced state. 249316 4 61036 commit-queue 2010-07-09 15:21:17 -0700 Comment on attachment 61036 Patch Clearing flags on attachment: 61036 Committed r63001: <http://trac.webkit.org/changeset/63001> 249317 5 commit-queue 2010-07-09 15:21:22 -0700 All reviewed patches have been landed. Closing bug. 250706 6 61410 jesus 2010-07-13 13:29:21 -0700 Created attachment 61410 Patch 250710 7 61410 jesus 2010-07-13 13:36:12 -0700 Comment on attachment 61410 Patch I'm not going to ask for review it. No'am, could you please take a look at this follow-up patch? I'm addressing your last comments with a few exceptions. I noticed that modifying GraphicsLayerQtImpl::recache(), GraphicsLayerQtImpl::notifySyncRequired() and GraphicsLayerQt::setContentsToImage() leaves Accelerated Compositing with a strange behavior, crashing often and not working on some examples (i.e.g.: falling leaves). It would help to have more info on whether a function should use the synced state or the non-synced one. Maybe I missed something... thanks in advance! 250715 8 61410 noam 2010-07-13 13:43:20 -0700 Comment on attachment 61410 Patch > - if (!m_transformAnimationRunning) > - m_baseTransform = m_layer->transform(); > + if (!m_transformAnimationRunning && m_state.maskLayer) > + m_baseTransform = m_state.maskLayer->transform(); should be m_state.transform, not m_state.maskLayer->transform. There's no mask layer involved > void GraphicsLayerQt::setNeedsDisplay() > { > - m_impl->m_pendingContent.regionToUpdate = QRegion(QRect(QPoint(0, 0), QSize(size().width(), size().height()))); > + m_impl->m_currentContent.regionToUpdate = QRegion(QRect(QPoint(0, 0), QSize(size().width(), size().height()))); > m_impl->notifyChange(GraphicsLayerQtImpl::DisplayChange); > } No need for all that :) it needs to update m_pendingContent and not m_currentContent. The only function we really need to change is updateTransform(), to not read m_layer->transform(). 250766 9 61422 jesus 2010-07-13 14:59:54 -0700 Created attachment 61422 Patch 250773 10 noam 2010-07-13 15:14:30 -0700 LGTM 61036 2010-07-09 05:32:37 -0700 2010-07-13 13:29:10 -0700 Patch bug-41954-20100709093552.patch text/plain 2254 jesus ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTRkMmZkNGRmNWYwZmJiMzVkNjY5YTY4ODQ0ZGIyNzQyNWRkNGVhYi4uNTNlNWI1ZGEyODVlZGQy MGQwMmVlZDdjNzFhMmJmNzBkZjJiZGM1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNy0wOSAgSmVz dXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBHcmFwaGlj c0xheWVyUXQgbXVzdCBoYXZlIHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgp IGltcGxlbWVudGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00MTk1NAorCisgICAgICAgIEFkZCBHcmFwaGljc0xheWVyUXQ6OnN5bmNDb21wb3NpdGlu Z1N0YXRlRm9yVGhpc0xheWVyT25seSwgYSBub24tcmVjdXJzaXZlCisgICAgICAgIGltcGxlbWVu dGF0aW9uIG9mIEdyYXBoaWNzTGF5ZXJRdDo6c3luY0NvbXBvc2l0aW5nU3RhdGUgYW5kIHdoaWNo IHRhcmdldHMKKyAgICAgICAgdGhlIGN1cnJlbnQgbGF5ZXIgb25seS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0xheWVyUXQ6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0Lmg6CisKIDIw MTAtMDctMDggIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAppbmRleCAyMjZmMWZiZDdmZDQ3MjM3MjZl YTY2YWE1NTBmY2E4NzQ0NTBlNjJjLi42ZGY1NzIxMTA2Mzg0YTQyZWU3NmRmODQ1M2ZiOTZlZTVh OGU3OTIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz TGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xh eWVyUXQuY3BwCkBAIC0xMTg0LDYgKzExODQsMTUgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnN5 bmNDb21wb3NpdGluZ1N0YXRlKCkKIH0KIAogLyogXHJlaW1wIChHcmFwaGljc0xheWVyLmgpCisq Lwordm9pZCBHcmFwaGljc0xheWVyUXQ6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVy T25seSgpCit7CisgICAgLy8gV2UgY2FuJ3QgY2FsbCBmbHVzaENoYW5nZXMgcmVjdXJzaXZlbHkg aGVyZQorICAgIG1faW1wbC0+Zmx1c2hDaGFuZ2VzKGZhbHNlKTsKKyAgICBHcmFwaGljc0xheWVy OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKK30KKworLyogXHJlaW1w IChHcmFwaGljc0xheWVyLmgpCiAgKi8KIE5hdGl2ZUxheWVyIEdyYXBoaWNzTGF5ZXJRdDo6bmF0 aXZlTGF5ZXIoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0xheWVyUXQuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NMYXllclF0LmgKaW5kZXggNmRlNWE2ZWNjNGZiYjRjNzE3NmZjNTYwZWZkMjMyZmViNGU0 NDA3Ni4uZjgxYmQzZDkwOGRhYjI2MmMwY2JmMGQ1MGRkNTNiMzIzYTE2YWRjZSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuaAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5oCkBAIC04Myw2ICs4 Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzdHJpYnV0ZU9wYWNpdHkoZmxvYXQp OwogICAgIHZpcnR1YWwgZmxvYXQgYWNjdW11bGF0ZWRPcGFjaXR5KCkgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIHN5bmNDb21wb3NpdGluZ1N0YXRlKCk7CisgICAgdmlydHVhbCB2b2lkIHN5bmND b21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwogCiBwcml2YXRlOgogICAgIE93blB0 cjxHcmFwaGljc0xheWVyUXRJbXBsPiBtX2ltcGw7Cg== 61410 2010-07-13 13:29:21 -0700 2010-07-13 14:59:46 -0700 Patch bug-41954-20100713173239.patch text/plain 5813 jesus ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTdiYTBlN2E3YTJlODBlMzQzNWZjYzZiNDFlZjdiZjAzNWI4YzUyYS4uMWRlMjBlNDVmMGU4ZGI3 ZmNhNGMwZWQyZWI1NWRjYTczMzBkNTc4NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wNy0xMyAgSmVz dXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBHcmFwaGljc0xheWVyUXQgbXVz dCBoYXZlIHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpIGltcGxlbWVudGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTk1NAor CisgICAgICAgIE5vdyBvbmx5IEdyYXBoaWNzTGF5ZXJRdDo6Zmx1c2hDaGFuZ2VzKCkgY2FsbHMg bV9sYXllciBhbmQgbV9wZW5kaW5nQ29udGVudAorICAgICAgICBhbmQgdGhlIG1vZGlmaWVkIGZ1 bmN0aW9ucyBjYWxsIG1fc3RhdGUgYW5kIG1fY3VycmVudENvbnRlbnQuCisgICAgICAgIEFuaW1h dGlvbnMgYXJlIGV4Y2VwdGlvbnMgYmVjYXVzZSB0aGV5IHdvcmsgb24gYW4gYWxyZWFkeSBzeW5j ZWQgbGF5ZXIuCisgICAgICAgIENoYW5nZXMgd2VyZSBtYWRlIGJlY2F1c2UgbV9sYXllciBhbmQg bV9wZW5kaW5nQ29udGVudCBjb250YWluIHRoZSBub24tc3luY2VkIHN0YXRlCisgICAgICAgIHdo aWxlIG1fc3RhdGUgYW5kIG1fY3VycmVudENvbnRlbnQgY29udGFpbiB0aGUgc3luY2VkIG9uZS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXRJbXBsOjp1cGRhdGVUcmFuc2Zvcm0pOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjpzZXROZWVkc0Rpc3BsYXkpOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjpzZXROZWVkc0Rpc3BsYXlJblJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjpzZXRCYWNrZ3JvdW5kQ29sb3IpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjpjbGVhckJhY2tncm91bmRDb2xvcik6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzQmFja2dyb3Vu ZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNU b0dyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdDo6 c2V0Q29udGVudHNUb01lZGlhKToKKwogMjAxMC0wNy0xMyAgQW50dGkgS29pdmlzdG8gIDxrb2l2 aXN0b0Bpa2kuZmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz TGF5ZXJRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJR dC5jcHAKaW5kZXggODliYWRjY2M3OTYyZjIyNTljOWZlYWQ5ZmU5NzY0MjI5MjkwNzZlYy4uMjlk ZTU1NjliNGQ4MzE1YmNiMGIxMzZlZTVkZDAzZGUxMjc3YWFmOCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApAQCAtNDU2LDggKzQ1Niw4 IEBAIFFQaXhtYXAgR3JhcGhpY3NMYXllclF0SW1wbDo6cmVjYWNoZShjb25zdCBRUmVnaW9uJiBy ZWdpb25Ub1VwZGF0ZSkKIAogdm9pZCBHcmFwaGljc0xheWVyUXRJbXBsOjp1cGRhdGVUcmFuc2Zv cm0oKQogewotICAgIGlmICghbV90cmFuc2Zvcm1BbmltYXRpb25SdW5uaW5nKQotICAgICAgICBt X2Jhc2VUcmFuc2Zvcm0gPSBtX2xheWVyLT50cmFuc2Zvcm0oKTsKKyAgICBpZiAoIW1fdHJhbnNm b3JtQW5pbWF0aW9uUnVubmluZyAmJiBtX3N0YXRlLm1hc2tMYXllcikKKyAgICAgICAgbV9iYXNl VHJhbnNmb3JtID0gbV9zdGF0ZS5tYXNrTGF5ZXItPnRyYW5zZm9ybSgpOwogCiAgICAgVHJhbnNm b3JtYXRpb25NYXRyaXggbG9jYWxUcmFuc2Zvcm07CiAKQEAgLTg0OCw3ICs4NDgsNyBAQCBHcmFw aGljc0xheWVyOjpDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb24gR3JhcGhpY3NMYXll cjo6Y29tcG9zaXRpbmdDb29yZAogKi8KIHZvaWQgR3JhcGhpY3NMYXllclF0OjpzZXROZWVkc0Rp c3BsYXkoKQogewotICAgIG1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5yZWdpb25Ub1VwZGF0ZSA9 IFFSZWdpb24oUVJlY3QoUVBvaW50KDAsIDApLCBRU2l6ZShzaXplKCkud2lkdGgoKSwgc2l6ZSgp LmhlaWdodCgpKSkpOworICAgIG1faW1wbC0+bV9jdXJyZW50Q29udGVudC5yZWdpb25Ub1VwZGF0 ZSA9IFFSZWdpb24oUVJlY3QoUVBvaW50KDAsIDApLCBRU2l6ZShzaXplKCkud2lkdGgoKSwgc2l6 ZSgpLmhlaWdodCgpKSkpOwogICAgIG1faW1wbC0+bm90aWZ5Q2hhbmdlKEdyYXBoaWNzTGF5ZXJR dEltcGw6OkRpc3BsYXlDaGFuZ2UpOwogfQogCkBAIC04NTYsNyArODU2LDcgQEAgdm9pZCBHcmFw aGljc0xheWVyUXQ6OnNldE5lZWRzRGlzcGxheSgpCiAqLwogdm9pZCBHcmFwaGljc0xheWVyUXQ6 OnNldE5lZWRzRGlzcGxheUluUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7Ci0gICAgbV9p bXBsLT5tX3BlbmRpbmdDb250ZW50LnJlZ2lvblRvVXBkYXRlIHw9IFFSZWN0RihyZWN0KS50b0Fs aWduZWRSZWN0KCk7CisgICAgbV9pbXBsLT5tX2N1cnJlbnRDb250ZW50LnJlZ2lvblRvVXBkYXRl IHw9IFFSZWN0RihyZWN0KS50b0FsaWduZWRSZWN0KCk7CiAgICAgbV9pbXBsLT5ub3RpZnlDaGFu Z2UoR3JhcGhpY3NMYXllclF0SW1wbDo6RGlzcGxheUNoYW5nZSk7CiB9CiAKQEAgLTEwMzIsOSAr MTAzMiw5IEBAIHZvaWQgR3JhcGhpY3NMYXllclF0OjpzZXREcmF3c0NvbnRlbnQoYm9vbCB2YWx1 ZSkKICovCiB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IENv bG9yJiB2YWx1ZSkKIHsKLSAgICBpZiAodmFsdWUgPT0gbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50 LmJhY2tncm91bmRDb2xvcikKKyAgICBpZiAodmFsdWUgPT0gbV9pbXBsLT5tX2N1cnJlbnRDb250 ZW50LmJhY2tncm91bmRDb2xvcikKICAgICAgICAgcmV0dXJuOwotICAgIG1faW1wbC0+bV9wZW5k aW5nQ29udGVudC5iYWNrZ3JvdW5kQ29sb3IgPSB2YWx1ZTsKKyAgICBtX2ltcGwtPm1fY3VycmVu dENvbnRlbnQuYmFja2dyb3VuZENvbG9yID0gdmFsdWU7CiAgICAgR3JhcGhpY3NMYXllcjo6c2V0 QmFja2dyb3VuZENvbG9yKHZhbHVlKTsKICAgICBtX2ltcGwtPm5vdGlmeUNoYW5nZShHcmFwaGlj c0xheWVyUXRJbXBsOjpCYWNrZ3JvdW5kQ29sb3JDaGFuZ2UpOwogfQpAQCAtMTA0Myw5ICsxMDQz LDkgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBDb2xv ciYgdmFsdWUpCiAqLwogdm9pZCBHcmFwaGljc0xheWVyUXQ6OmNsZWFyQmFja2dyb3VuZENvbG9y KCkKIHsKLSAgICBpZiAoIW1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5iYWNrZ3JvdW5kQ29sb3Iu aXNWYWxpZCgpKQorICAgIGlmICghbV9pbXBsLT5tX2N1cnJlbnRDb250ZW50LmJhY2tncm91bmRD b2xvci5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2ltcGwtPm1fcGVuZGluZ0Nv bnRlbnQuYmFja2dyb3VuZENvbG9yID0gUUNvbG9yKCk7CisgICAgbV9pbXBsLT5tX2N1cnJlbnRD b250ZW50LmJhY2tncm91bmRDb2xvciA9IFFDb2xvcigpOwogICAgIEdyYXBoaWNzTGF5ZXI6OmNs ZWFyQmFja2dyb3VuZENvbG9yKCk7CiAgICAgbV9pbXBsLT5ub3RpZnlDaGFuZ2UoR3JhcGhpY3NM YXllclF0SW1wbDo6QmFja2dyb3VuZENvbG9yQ2hhbmdlKTsKIH0KQEAgLTExMTMsOCArMTExMyw4 IEBAIHZvaWQgR3JhcGhpY3NMYXllclF0OjpzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2UqIGltYWdl KQogdm9pZCBHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzQmFja2dyb3VuZENvbG9yKGNvbnN0 IENvbG9yJiBjb2xvcikKIHsKICAgICBtX2ltcGwtPm5vdGlmeUNoYW5nZShHcmFwaGljc0xheWVy UXRJbXBsOjpDb250ZW50Q2hhbmdlKTsKLSAgICBtX2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQuY29u dGVudFR5cGUgPSBHcmFwaGljc0xheWVyUXRJbXBsOjpDb2xvckNvbnRlbnRUeXBlOwotICAgIG1f aW1wbC0+bV9wZW5kaW5nQ29udGVudC5jb250ZW50c0JhY2tncm91bmRDb2xvciA9IFFDb2xvcihj b2xvcik7CisgICAgbV9pbXBsLT5tX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID0gR3JhcGhp Y3NMYXllclF0SW1wbDo6Q29sb3JDb250ZW50VHlwZTsKKyAgICBtX2ltcGwtPm1fY3VycmVudENv bnRlbnQuY29udGVudHNCYWNrZ3JvdW5kQ29sb3IgPSBRQ29sb3IoY29sb3IpOwogICAgIEdyYXBo aWNzTGF5ZXI6OnNldENvbnRlbnRzQmFja2dyb3VuZENvbG9yKGNvbG9yKTsKIH0KIApAQCAtMTEy NCw3ICsxMTI0LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzVG9HcmFwaGlj c0NvbnRleHQzRChjb25zdCBHcmFwaGljc0NvbnRleHQzRCogY3QKICAgICBpZiAoY3R4ID09IG1f aW1wbC0+bV9nYzNEKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2ltcGwtPm1fcGVuZGluZ0Nv bnRlbnQuY29udGVudFR5cGUgPSBHcmFwaGljc0xheWVyUXRJbXBsOjpDYW52YXMzRENvbnRlbnRU eXBlOworICAgIG1faW1wbC0+bV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9IEdyYXBoaWNz TGF5ZXJRdEltcGw6OkNhbnZhczNEQ29udGVudFR5cGU7CiAgICAgbV9pbXBsLT5tX2djM0QgPSBj dHg7CiAgICAgbV9pbXBsLT5ub3RpZnlDaGFuZ2UoR3JhcGhpY3NMYXllclF0SW1wbDo6Q29udGVu dENoYW5nZSk7CiB9CkBAIC0xMTM4LDEwICsxMTM4LDEwIEBAIHZvaWQgR3JhcGhpY3NMYXllclF0 OjpzZXRHcmFwaGljc0NvbnRleHQzRE5lZWRzRGlzcGxheSgpCiB2b2lkIEdyYXBoaWNzTGF5ZXJR dDo6c2V0Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIqIG1lZGlhKQogewogICAgIGlmICht ZWRpYSkgewotICAgICAgICBtX2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGUgPSBH cmFwaGljc0xheWVyUXRJbXBsOjpNZWRpYUNvbnRlbnRUeXBlOwotICAgICAgICBtX2ltcGwtPm1f cGVuZGluZ0NvbnRlbnQubWVkaWFMYXllciA9IG1lZGlhLT50b0dyYXBoaWNzT2JqZWN0KCk7Cisg ICAgICAgIG1faW1wbC0+bV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9IEdyYXBoaWNzTGF5 ZXJRdEltcGw6Ok1lZGlhQ29udGVudFR5cGU7CisgICAgICAgIG1faW1wbC0+bV9jdXJyZW50Q29u dGVudC5tZWRpYUxheWVyID0gbWVkaWEtPnRvR3JhcGhpY3NPYmplY3QoKTsKICAgICB9IGVsc2UK LSAgICAgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50LmNvbnRlbnRUeXBlID0gR3JhcGhpY3NM YXllclF0SW1wbDo6SFRNTENvbnRlbnRUeXBlOworICAgICAgICBtX2ltcGwtPm1fY3VycmVudENv bnRlbnQuY29udGVudFR5cGUgPSBHcmFwaGljc0xheWVyUXRJbXBsOjpIVE1MQ29udGVudFR5cGU7 CiAKICAgICBtX2ltcGwtPm5vdGlmeUNoYW5nZShHcmFwaGljc0xheWVyUXRJbXBsOjpDb250ZW50 Q2hhbmdlKTsKICAgICBHcmFwaGljc0xheWVyOjpzZXRDb250ZW50c1RvTWVkaWEobWVkaWEpOwo= 61422 2010-07-13 14:59:54 -0700 2010-07-14 06:03:03 -0700 Patch bug-41954-20100713190314.patch text/plain 1713 jesus ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTdiYTBlN2E3YTJlODBlMzQzNWZjYzZiNDFlZjdiZjAzNWI4YzUyYS4uNGVlNmYwNzNjNTA3NTJm MDA1NTRlMjUwNDdlYzI5ZDY4NmRiYTRiOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNy0xMyAgSmVz dXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBHcmFwaGljc0xheWVyUXQgbXVz dCBoYXZlIHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpIGltcGxlbWVudGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTk1NAor CisgICAgICAgIE5vdyBvbmx5IEdyYXBoaWNzTGF5ZXJRdEltcGw6OmZsdXNoQ2hhbmdlcygpIGNh bGxzIG1fbGF5ZXIgYW5kIG1fcGVuZGluZ0NvbnRlbnQKKyAgICAgICAgYW5kIEdyYXBoaWNzTGF5 ZXJRdEltcGw6OnVwZGF0ZVRyYW5zZm9ybSgpIGNhbGxzIG1fc3RhdGUudHJhbnNmb3JtLgorICAg ICAgICBBbmltYXRpb25zIGFyZSBleGNlcHRpb25zIGJlY2F1c2UgdGhleSB3b3JrIG9uIGFuIGFs cmVhZHkgc3luY2VkIGxheWVyLgorICAgICAgICBDaGFuZ2VzIHdlcmUgbWFkZSBiZWNhdXNlIG1f bGF5ZXIgYW5kIG1fcGVuZGluZ0NvbnRlbnQgY29udGFpbiB0aGUgbm9uLXN5bmNlZCBzdGF0ZQor ICAgICAgICB3aGlsZSBtX3N0YXRlIGFuZCBtX2N1cnJlbnRDb250ZW50IGNvbnRhaW4gdGhlIHN5 bmNlZCBvbmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVy UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0SW1wbDo6dXBkYXRlVHJh bnNmb3JtKToKKwogMjAxMC0wNy0xMyAgQW50dGkgS29pdmlzdG8gIDxrb2l2aXN0b0Bpa2kuZmk+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKaW5kZXgg ODliYWRjY2M3OTYyZjIyNTljOWZlYWQ5ZmU5NzY0MjI5MjkwNzZlYy4uYjQyZTc3NDgxYWFjNTkw NTMyODRjYWYxYjUyOGVkNTc1ZDRjMDZiNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApAQCAtNDU3LDcgKzQ1Nyw3IEBAIFFQaXhtYXAg R3JhcGhpY3NMYXllclF0SW1wbDo6cmVjYWNoZShjb25zdCBRUmVnaW9uJiByZWdpb25Ub1VwZGF0 ZSkKIHZvaWQgR3JhcGhpY3NMYXllclF0SW1wbDo6dXBkYXRlVHJhbnNmb3JtKCkKIHsKICAgICBp ZiAoIW1fdHJhbnNmb3JtQW5pbWF0aW9uUnVubmluZykKLSAgICAgICAgbV9iYXNlVHJhbnNmb3Jt ID0gbV9sYXllci0+dHJhbnNmb3JtKCk7CisgICAgICAgIG1fYmFzZVRyYW5zZm9ybSA9IG1fc3Rh dGUudHJhbnNmb3JtOwogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbG9jYWxUcmFuc2Zvcm07 CiAK