110470 2013-02-21 07:31:16 -0800 [GTK][AC] Animating layer disappears while running with clutter backend 2013-03-29 01:20:49 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 105699 113318 0 kevin.cs.oh webkit-unassigned gustavo webkit.review.bot oldest_to_newest 838407 0 kevin.cs.oh 2013-02-21 07:31:16 -0800 'Toss' & 'fade through' demo in http://www.apple.com/html5/showcase/transitions/ don't run well. Nothing is shown while animation. 839702 1 189790 kevin.cs.oh 2013-02-22 10:24:57 -0800 Created attachment 189790 Patch 861804 2 kevin.cs.oh 2013-03-22 13:34:37 -0700 This patch applied to webkit-clutter as well. http://cgit.collabora.com/git/webkit-clutter.git/commit/?h=wip/changseok/unreviewed&id=fcd8e7cd47f2a0b68110fd709ccf9919cb84c11c 864644 3 189790 gustavo 2013-03-27 10:10:09 -0700 Comment on attachment 189790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189790&action=review I could not reproduce this problem in webkit-clutter. I guess it might be a bad interaction with clutter-gtk. The change makes sense anyway. Please merge this change to webkit-clutter master as well! cq- because of the requested changes. > Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp:656 > + GraphicsLayerClutter* curChild = static_cast<GraphicsLayerClutter*>(childLayers[i]); Let's take the opportunity to fix the naming here, curChild -> currentChild > Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp:658 > + g_assert(GRAPHICS_LAYER_IS_ACTOR(childLayer)); Make this an ASSERT() instead. 865276 4 195508 kevin.cs.oh 2013-03-28 02:32:31 -0700 Created attachment 195508 Patch 865297 5 195514 kevin.cs.oh 2013-03-28 03:04:44 -0700 Created attachment 195514 Patch 865535 6 189790 kevin.cs.oh 2013-03-28 08:31:58 -0700 Comment on attachment 189790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189790&action=review Thank you for the review! >> Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp:656 >> + GraphicsLayerClutter* curChild = static_cast<GraphicsLayerClutter*>(childLayers[i]); > > Let's take the opportunity to fix the naming here, curChild -> currentChild Done. >> Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp:658 >> + g_assert(GRAPHICS_LAYER_IS_ACTOR(childLayer)); > > Make this an ASSERT() instead. Done. 865538 7 kevin.cs.oh 2013-03-28 08:33:47 -0700 (In reply to comment #3) > (From update of attachment 189790 [details]) > Please merge this change to webkit-clutter master as well! cq- because of the requested changes. Yeap. I'll do immediately after landing this patch! 865553 8 195514 webkit.review.bot 2013-03-28 08:58:22 -0700 Comment on attachment 195514 Patch Clearing flags on attachment: 195514 Committed r147121: <http://trac.webkit.org/changeset/147121> 189790 2013-02-22 10:24:57 -0800 2013-03-28 08:31:58 -0700 Patch bug-110470-20130223032116.patch text/plain 4404 kevin.cs.oh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZjNjgzZjBjYTFmYWI4 MzQ4YTZkMDRhMjE1NzQzMmFjM2U2NjZlZS4uY2U5ZDE4Njc4NTI0YWIzNGQ5ZTA0ZWIxZDAyYmM4 MTU4YWQzOTU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAyLTIyICBDaGFu Z1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXVtB Q10gQW5pbWF0aW5nIGxheWVyIGRpc2FwcGVhcnMgd2hpbGUgcnVubmluZyB3aXRoIGNsdXR0ZXIg YmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEwNDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIHJlYXNvbiBvZiB0aGlzIGlzc3VlIGlzIHRoYXQgY2x1dHRlcl9hY3Rvcl9yZW1vdmVfY2hp bGQgbGVhZHMgdG8gc3RvcHBpbmcgYW5pbWF0aW9ucworICAgICAgICBvZiBjaGlsZCBhY3Rvci4g Q2x1dHRlckFjdG9yJ3MgYW5pbWF0aW9uIGNvdWxkIGJlIGRlZmluZWQgb25seSB3aGVuIGl0IGhh cyBhIHBhcmVudCBhY3Rvci4KKyAgICAgICAgU28gd2Ugc2hvdWxkIGF2b2lkIHRoZSBjYXNlIGNh bGxpbmcgdGhlIGFwaSBhcyBtdWNoIGFzIHdlIGNhbi4gQXQgbGVhc3Qgd2UgZG9uJ3QKKyAgICAg ICAgbmVlZCB0byByZXNldCBhIGFjdG9yJ3MgcGFyZW50IGF0IGFsbCBpZiB0aGUgY3VycmVudCBw YXJlbnQgaXMgc2FtZSB3aXRoIG5ldyBvbmUuCisgICAgICAgIElmIHdlIGNhbid0IGF2b2lkIGlu dm9raW5nIGNsdXR0ZXJfYWN0b3JfcmVtb3ZlX2NoaWxkIGZvciBhbiBhbmltYXRpbmcgYWN0b3Is IHdlIG1heSBhcHBseQorICAgICAgICBhIG1vcmUgY29tcGxpY2F0ZWQgd2F5IHRvIGtlZXAgdGhl IGFuaW1hdGlvbi4gQnV0IEkgaGF2ZW4ndCBmYWNlZCBzdWNoIGEgY2FzZSB5ZXQuCisKKyAgICAg ICAgQ292ZXJlZCBieSBleGlzdGluZyBhbmltYXRpb24gdGVzdHMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHA6CisgICAgICAgIChn cmFwaGljc0xheWVyQWN0b3JTZXRTdWJsYXllcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckNsdXR0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllckNsdXR0ZXI6OnVwZGF0ZVN1YmxheWVyTGlzdCk6CisKIDIwMTMtMDItMjIg IEFuZHJleSBMdXNobmlrb3YgIDxsdXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IHNob3cgc291cmNlIGxvY2F0aW9uIGFmdGVyIGRyYXdlciB2aWV3cwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGlj c0xheWVyQWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRl ci9HcmFwaGljc0xheWVyQWN0b3IuY3BwCmluZGV4IGY1NTZkYWI3NjFjNDk0MWViZWVmNGQ0Mjc0 OWMxNmJhYTJmN2U5ZmUuLjc0ZTZlYTE3ZTNiMjZiMzhlODcwN2Q4OTBlMjRiOGIxZGNlMWQzNTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3Jh cGhpY3NMYXllckFjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHAKQEAgLTQ3MCw5ICs0NzAsMTYgQEAgdm9p ZCBncmFwaGljc0xheWVyQWN0b3JTZXRTdWJsYXllcnMoR3JhcGhpY3NMYXllckFjdG9yKiBsYXll ciwgR3JhcGhpY3NMYXllckFjdG8KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIENsdXR0 ZXJBY3RvciogbmV3UGFyZW50QWN0b3IgPSBDTFVUVEVSX0FDVE9SKGxheWVyKTsKICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IHN1YkxheWVycy5zaXplKCk7ICsraSkgewotICAgICAgICBDbHV0 dGVyQWN0b3IqIGxheWVyQWN0b3IgPSBDTFVUVEVSX0FDVE9SKHN1YkxheWVyc1tpXS5nZXQoKSk7 Ci0gICAgICAgIGNsdXR0ZXJfYWN0b3JfYWRkX2NoaWxkKENMVVRURVJfQUNUT1IobGF5ZXIpLCBs YXllckFjdG9yKTsKKyAgICAgICAgQ2x1dHRlckFjdG9yKiBjaGlsZEFjdG9yID0gQ0xVVFRFUl9B Q1RPUihzdWJMYXllcnNbaV0uZ2V0KCkpOworICAgICAgICBDbHV0dGVyQWN0b3IqIG9sZFBhcmVu dEFjdG9yID0gY2x1dHRlcl9hY3Rvcl9nZXRfcGFyZW50KGNoaWxkQWN0b3IpOworICAgICAgICBp ZiAob2xkUGFyZW50QWN0b3IpIHsKKyAgICAgICAgICAgIGlmIChvbGRQYXJlbnRBY3RvciA9PSBu ZXdQYXJlbnRBY3RvcikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGNs dXR0ZXJfYWN0b3JfcmVtb3ZlX2NoaWxkKG9sZFBhcmVudEFjdG9yLCBjaGlsZEFjdG9yKTsKKyAg ICAgICAgfQorICAgICAgICBjbHV0dGVyX2FjdG9yX2FkZF9jaGlsZChuZXdQYXJlbnRBY3Rvciwg Y2hpbGRBY3Rvcik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJDbHV0dGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckNsdXR0ZXIuY3Bw CmluZGV4IDMyODIxNGQ1MzQxZWQ3M2U3MWFmNDNjMjFiM2U2ZDRlMWNhMzA5YTYuLjk0NGMwNTFl N2Y0Y2UyNTIxODFkYmY0YzRkNDM2YTAxM2Q0YzhmMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckNsdXR0ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXll ckNsdXR0ZXIuY3BwCkBAIC02NTEsMjEgKzY1MSwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDbHV0 dGVyOjp1cGRhdGVTdWJsYXllckxpc3QoKQogICAgIEdyYXBoaWNzTGF5ZXJBY3Rvckxpc3QgbmV3 U3VibGF5ZXJzOwogICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4mIGNoaWxkTGF5ZXJz ID0gY2hpbGRyZW4oKTsKIAotICAgIGlmIChjaGlsZExheWVycy5zaXplKCkgPiAwKSB7Ci0gICAg ICAgIHNpemVfdCBudW1DaGlsZHJlbiA9IGNoaWxkTGF5ZXJzLnNpemUoKTsKLSAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7Ci0gICAgICAgICAgICBHcmFw aGljc0xheWVyQ2x1dHRlciogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1 dHRlcio+KGNoaWxkTGF5ZXJzW2ldKTsKLSAgICAgICAgICAgIEdyYXBoaWNzTGF5ZXJBY3Rvciog Y2hpbGRMYXllciA9IGN1ckNoaWxkLT5sYXllckZvclN1cGVybGF5ZXIoKTsKLSAgICAgICAgICAg IGdfYXNzZXJ0KEdSQVBISUNTX0xBWUVSX0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKLSAgICAgICAg ICAgIG5ld1N1YmxheWVycy5hcHBlbmQoY2hpbGRMYXllcik7Ci0gICAgICAgIH0KKyAgICBzaXpl X3QgbnVtQ2hpbGRyZW4gPSBjaGlsZExheWVycy5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7CisgICAgICAgIEdyYXBoaWNzTGF5ZXJDbHV0dGVy KiBjdXJDaGlsZCA9IHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXJDbHV0dGVyKj4oY2hpbGRMYXll cnNbaV0pOworICAgICAgICBHcmFwaGljc0xheWVyQWN0b3IqIGNoaWxkTGF5ZXIgPSBjdXJDaGls ZC0+bGF5ZXJGb3JTdXBlcmxheWVyKCk7CisgICAgICAgIGdfYXNzZXJ0KEdSQVBISUNTX0xBWUVS X0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKIAotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG5ld1N1YmxheWVycy5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgQ2x1dHRlckFjdG9yKiBs YXllckFjdG9yID0gQ0xVVFRFUl9BQ1RPUihuZXdTdWJsYXllcnNbaV0uZ2V0KCkpOwotICAgICAg ICAgICAgQ2x1dHRlckFjdG9yKiBwYXJlbnRBY3RvciA9IGNsdXR0ZXJfYWN0b3JfZ2V0X3BhcmVu dChsYXllckFjdG9yKTsKLSAgICAgICAgICAgIGlmIChwYXJlbnRBY3RvcikKLSAgICAgICAgICAg ICAgICBjbHV0dGVyX2FjdG9yX3JlbW92ZV9jaGlsZChwYXJlbnRBY3RvciwgbGF5ZXJBY3Rvcik7 Ci0gICAgICAgIH0KKyAgICAgICAgbmV3U3VibGF5ZXJzLmFwcGVuZChjaGlsZExheWVyKTsKICAg ICB9CiAKICAgICBncmFwaGljc0xheWVyQWN0b3JTZXRTdWJsYXllcnMobV9sYXllci5nZXQoKSwg bmV3U3VibGF5ZXJzKTsK 195508 2013-03-28 02:32:31 -0700 2013-03-28 03:05:20 -0700 Patch bug-110470-20130328183229.patch text/plain 5091 kevin.cs.oh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg3YzU2ZWJhNzkzOWEw MWQ3Yjc0ZjlhNTI1ODVlNmVjY2FhYzRlYS4uNTg0ZWEzNjcxNzVmN2ZhYmI2ZGM1MjRhNTYwZDY2 ZDVkMzczMzllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAzLTI4ICBDaGFu Z1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXVtB Q10gQW5pbWF0aW5nIGxheWVyIGRpc2FwcGVhcnMgd2hpbGUgcnVubmluZyB3aXRoIGNsdXR0ZXIg YmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEwNDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgorCisg ICAgICAgIFRoZSByZWFzb24gb2YgdGhpcyBpc3N1ZSBpcyB0aGF0IGNsdXR0ZXJfYWN0b3JfcmVt b3ZlX2NoaWxkIGxlYWRzIHRvIHN0b3BwaW5nIGFuaW1hdGlvbnMKKyAgICAgICAgb2YgY2hpbGQg YWN0b3IuIENsdXR0ZXJBY3RvcidzIGFuaW1hdGlvbiBjb3VsZCBiZSBkZWZpbmVkIG9ubHkgd2hl biBpdCBoYXMgYSBwYXJlbnQgYWN0b3IuCisgICAgICAgIFNvIHdlIHNob3VsZCBhdm9pZCB0aGUg Y2FzZSBjYWxsaW5nIHRoZSBhcGkgYXMgbXVjaCBhcyB3ZSBjYW4uIEF0IGxlYXN0IHdlIGRvbid0 CisgICAgICAgIG5lZWQgdG8gcmVzZXQgYSBhY3RvcidzIHBhcmVudCBhdCBhbGwgaWYgdGhlIGN1 cnJlbnQgcGFyZW50IGlzIHNhbWUgd2l0aCBuZXcgb25lLgorICAgICAgICBJZiB3ZSBjYW4ndCBh dm9pZCBpbnZva2luZyBjbHV0dGVyX2FjdG9yX3JlbW92ZV9jaGlsZCBmb3IgYW4gYW5pbWF0aW5n IGFjdG9yLCB3ZSBtYXkgYXBwbHkKKyAgICAgICAgYSBtb3JlIGNvbXBsaWNhdGVkIHdheSB0byBr ZWVwIHRoZSBhbmltYXRpb24uIEJ1dCBJIGhhdmVuJ3QgZmFjZWQgc3VjaCBhIGNhc2UgeWV0Lgor CisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgYW5pbWF0aW9uIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGljc0xheWVyQWN0b3IuY3BwOgorICAg ICAgICAoZ3JhcGhpY3NMYXllckFjdG9yU2V0U3VibGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJDbHV0dGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDbHV0dGVyOjp1cGRhdGVTdWJsYXllckxpc3QpOgorCiAyMDEz LTAzLTI4ICBBcnBpdGEgQmFodWd1bmEgIDxhLmJhaEBzYW1zdW5nLmNvbT4KIAogICAgICAgICBS ZWdyZXNzaW9uOiBDcmFzaCB3aGVuIHNlbGVjdGluZyBIZWJyZXcgYW5kIG51bWJlcnMgaW4gYSBs aXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVy L0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHAKaW5kZXggZjU1NmRhYjc2MWM0OTQxZWJl ZWY0ZDQyNzQ5YzE2YmFhMmY3ZTlmZS4uNzRlNmVhMTdlM2IyNmIzOGU4NzA3ZDg5MGUyNGI4YjFk Y2UxZDM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1 dHRlci9HcmFwaGljc0xheWVyQWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckFjdG9yLmNwcApAQCAtNDcwLDkgKzQ3MCwx NiBAQCB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvclNldFN1YmxheWVycyhHcmFwaGljc0xheWVyQWN0 b3IqIGxheWVyLCBHcmFwaGljc0xheWVyQWN0bwogICAgICAgICByZXR1cm47CiAgICAgfQogCisg ICAgQ2x1dHRlckFjdG9yKiBuZXdQYXJlbnRBY3RvciA9IENMVVRURVJfQUNUT1IobGF5ZXIpOwog ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3ViTGF5ZXJzLnNpemUoKTsgKytpKSB7Ci0gICAg ICAgIENsdXR0ZXJBY3RvciogbGF5ZXJBY3RvciA9IENMVVRURVJfQUNUT1Ioc3ViTGF5ZXJzW2ld LmdldCgpKTsKLSAgICAgICAgY2x1dHRlcl9hY3Rvcl9hZGRfY2hpbGQoQ0xVVFRFUl9BQ1RPUihs YXllciksIGxheWVyQWN0b3IpOworICAgICAgICBDbHV0dGVyQWN0b3IqIGNoaWxkQWN0b3IgPSBD TFVUVEVSX0FDVE9SKHN1YkxheWVyc1tpXS5nZXQoKSk7CisgICAgICAgIENsdXR0ZXJBY3Rvciog b2xkUGFyZW50QWN0b3IgPSBjbHV0dGVyX2FjdG9yX2dldF9wYXJlbnQoY2hpbGRBY3Rvcik7Cisg ICAgICAgIGlmIChvbGRQYXJlbnRBY3RvcikgeworICAgICAgICAgICAgaWYgKG9sZFBhcmVudEFj dG9yID09IG5ld1BhcmVudEFjdG9yKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgY2x1dHRlcl9hY3Rvcl9yZW1vdmVfY2hpbGQob2xkUGFyZW50QWN0b3IsIGNoaWxkQWN0 b3IpOworICAgICAgICB9CisgICAgICAgIGNsdXR0ZXJfYWN0b3JfYWRkX2NoaWxkKG5ld1BhcmVu dEFjdG9yLCBjaGlsZEFjdG9yKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckNsdXR0ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGljc0xheWVyQ2x1 dHRlci5jcHAKaW5kZXggYWM0OWM2OTAzODVkZmI3MmQ5MDI0YjFmMDE2YThhOTZjOGFjODA5Zi4u YjYzYTA0OThiZTc4OTZlNDkwNzQ2YTM1OTIyZWZkN2RhODI4OWU4ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGljc0xheWVyQ2x1dHRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFw aGljc0xheWVyQ2x1dHRlci5jcHAKQEAgLTU3OCw4ICs1NzgsOCBAQCB2b2lkIEdyYXBoaWNzTGF5 ZXJDbHV0dGVyOjpyZWN1cnNpdmVDb21taXRDaGFuZ2VzKGNvbnN0IFRyYW5zZm9ybVN0YXRlJiBz dGF0ZSwgZgogICAgIHNpemVfdCBudW1DaGlsZHJlbiA9IGNoaWxkTGF5ZXJzLnNpemUoKTsKIAog ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtQ2hpbGRyZW47ICsraSkgewotICAgICAgICBH cmFwaGljc0xheWVyQ2x1dHRlciogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVy Q2x1dHRlcio+KGNoaWxkTGF5ZXJzW2ldKTsKLSAgICAgICAgY3VyQ2hpbGQtPnJlY3Vyc2l2ZUNv bW1pdENoYW5nZXMobG9jYWxTdGF0ZSwgcGFnZVNjYWxlRmFjdG9yLCBiYXNlUmVsYXRpdmVQb3Np dGlvbiwgYWZmZWN0ZWRCeVBhZ2VTY2FsZSk7CisgICAgICAgIEdyYXBoaWNzTGF5ZXJDbHV0dGVy KiBjdXJyZW50Q2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1dHRlcio+KGNoaWxk TGF5ZXJzW2ldKTsKKyAgICAgICAgY3VycmVudENoaWxkLT5yZWN1cnNpdmVDb21taXRDaGFuZ2Vz KGxvY2FsU3RhdGUsIHBhZ2VTY2FsZUZhY3RvciwgYmFzZVJlbGF0aXZlUG9zaXRpb24sIGFmZmVj dGVkQnlQYWdlU2NhbGUpOwogICAgIH0KIAogICAgIGNvbW1pdExheWVyQ2hhbmdlc0FmdGVyU3Vi bGF5ZXJzKCk7CkBAIC02NTgsMjEgKzY1OCwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDbHV0dGVy Ojp1cGRhdGVTdWJsYXllckxpc3QoKQogICAgIEdyYXBoaWNzTGF5ZXJBY3Rvckxpc3QgbmV3U3Vi bGF5ZXJzOwogICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4mIGNoaWxkTGF5ZXJzID0g Y2hpbGRyZW4oKTsKIAotICAgIGlmIChjaGlsZExheWVycy5zaXplKCkgPiAwKSB7Ci0gICAgICAg IHNpemVfdCBudW1DaGlsZHJlbiA9IGNoaWxkTGF5ZXJzLnNpemUoKTsKLSAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7Ci0gICAgICAgICAgICBHcmFwaGlj c0xheWVyQ2x1dHRlciogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1dHRl cio+KGNoaWxkTGF5ZXJzW2ldKTsKLSAgICAgICAgICAgIEdyYXBoaWNzTGF5ZXJBY3RvciogY2hp bGRMYXllciA9IGN1ckNoaWxkLT5sYXllckZvclN1cGVybGF5ZXIoKTsKLSAgICAgICAgICAgIGdf YXNzZXJ0KEdSQVBISUNTX0xBWUVSX0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKLSAgICAgICAgICAg IG5ld1N1YmxheWVycy5hcHBlbmQoY2hpbGRMYXllcik7Ci0gICAgICAgIH0KKyAgICBzaXplX3Qg bnVtQ2hpbGRyZW4gPSBjaGlsZExheWVycy5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7CisgICAgICAgIEdyYXBoaWNzTGF5ZXJDbHV0dGVyKiBj dXJyZW50Q2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1dHRlcio+KGNoaWxkTGF5 ZXJzW2ldKTsKKyAgICAgICAgR3JhcGhpY3NMYXllckFjdG9yKiBjaGlsZExheWVyID0gY3VycmVu dENoaWxkLT5sYXllckZvclN1cGVybGF5ZXIoKTsKKyAgICAgICAgQVNTRVJUKEdSQVBISUNTX0xB WUVSX0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKIAotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IG5ld1N1YmxheWVycy5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgQ2x1dHRlckFjdG9y KiBsYXllckFjdG9yID0gQ0xVVFRFUl9BQ1RPUihuZXdTdWJsYXllcnNbaV0uZ2V0KCkpOwotICAg ICAgICAgICAgQ2x1dHRlckFjdG9yKiBwYXJlbnRBY3RvciA9IGNsdXR0ZXJfYWN0b3JfZ2V0X3Bh cmVudChsYXllckFjdG9yKTsKLSAgICAgICAgICAgIGlmIChwYXJlbnRBY3RvcikKLSAgICAgICAg ICAgICAgICBjbHV0dGVyX2FjdG9yX3JlbW92ZV9jaGlsZChwYXJlbnRBY3RvciwgbGF5ZXJBY3Rv cik7Ci0gICAgICAgIH0KKyAgICAgICAgbmV3U3VibGF5ZXJzLmFwcGVuZChjaGlsZExheWVyKTsK ICAgICB9CiAKICAgICBncmFwaGljc0xheWVyQWN0b3JTZXRTdWJsYXllcnMobV9sYXllci5nZXQo KSwgbmV3U3VibGF5ZXJzKTsK 195514 2013-03-28 03:04:44 -0700 2013-03-28 08:58:22 -0700 Patch bug-110470-20130328190441.patch text/plain 5157 kevin.cs.oh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg3YzU2ZWJhNzkzOWEw MWQ3Yjc0ZjlhNTI1ODVlNmVjY2FhYzRlYS4uYjkwMDRmYzE3YzRhNmY0NDg4YjcxOGRjYWMzOGY3 NmU2N2JhNjUyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTI4ICBDaGFu Z1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXVtB Q10gQW5pbWF0aW5nIGxheWVyIGRpc2FwcGVhcnMgd2hpbGUgcnVubmluZyB3aXRoIGNsdXR0ZXIg YmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEwNDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgorCisg ICAgICAgIFRoZSByZWFzb24gb2YgdGhpcyBpc3N1ZSBpcyB0aGF0IGNsdXR0ZXJfYWN0b3JfcmVt b3ZlX2NoaWxkIGxlYWRzIHRvIHN0b3BwaW5nIGFuaW1hdGlvbnMKKyAgICAgICAgb2YgY2hpbGQg YWN0b3IuIENsdXR0ZXJBY3RvcidzIGFuaW1hdGlvbiBjb3VsZCBiZSBkZWZpbmVkIG9ubHkgd2hl biBpdCBoYXMgYSBwYXJlbnQgYWN0b3IuCisgICAgICAgIFNvIHdlIHNob3VsZCBhdm9pZCB0aGUg Y2FzZSBjYWxsaW5nIHRoZSBhcGkgYXMgbXVjaCBhcyB3ZSBjYW4uIEF0IGxlYXN0IHdlIGRvbid0 CisgICAgICAgIG5lZWQgdG8gcmVzZXQgYSBhY3RvcidzIHBhcmVudCBhdCBhbGwgaWYgdGhlIGN1 cnJlbnQgcGFyZW50IGlzIHNhbWUgd2l0aCBuZXcgb25lLgorICAgICAgICBJZiB3ZSBjYW4ndCBh dm9pZCBpbnZva2luZyBjbHV0dGVyX2FjdG9yX3JlbW92ZV9jaGlsZCBmb3IgYW4gYW5pbWF0aW5n IGFjdG9yLCB3ZSBtYXkgYXBwbHkKKyAgICAgICAgYSBtb3JlIGNvbXBsaWNhdGVkIHdheSB0byBr ZWVwIHRoZSBhbmltYXRpb24uIEJ1dCBJIGhhdmVuJ3QgZmFjZWQgc3VjaCBhIGNhc2UgeWV0Lgor CisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgYW5pbWF0aW9uIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGljc0xheWVyQWN0b3IuY3BwOgorICAg ICAgICAoZ3JhcGhpY3NMYXllckFjdG9yU2V0U3VibGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJDbHV0dGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDbHV0dGVyOjpyZWN1cnNpdmVDb21taXRDaGFuZ2VzKToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDbHV0dGVyOjp1cGRhdGVTdWJsYXllckxpc3Qp OgorCiAyMDEzLTAzLTI4ICBBcnBpdGEgQmFodWd1bmEgIDxhLmJhaEBzYW1zdW5nLmNvbT4KIAog ICAgICAgICBSZWdyZXNzaW9uOiBDcmFzaCB3aGVuIHNlbGVjdGluZyBIZWJyZXcgYW5kIG51bWJl cnMgaW4gYSBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5ZXJBY3Rvci5jcHAKaW5kZXggZjU1NmRhYjc2 MWM0OTQxZWJlZWY0ZDQyNzQ5YzE2YmFhMmY3ZTlmZS4uNzRlNmVhMTdlM2IyNmIzOGU4NzA3ZDg5 MGUyNGI4YjFkY2UxZDM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2x1dHRlci9HcmFwaGljc0xheWVyQWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckFjdG9yLmNwcApAQCAtNDcw LDkgKzQ3MCwxNiBAQCB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvclNldFN1YmxheWVycyhHcmFwaGlj c0xheWVyQWN0b3IqIGxheWVyLCBHcmFwaGljc0xheWVyQWN0bwogICAgICAgICByZXR1cm47CiAg ICAgfQogCisgICAgQ2x1dHRlckFjdG9yKiBuZXdQYXJlbnRBY3RvciA9IENMVVRURVJfQUNUT1Io bGF5ZXIpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3ViTGF5ZXJzLnNpemUoKTsgKytp KSB7Ci0gICAgICAgIENsdXR0ZXJBY3RvciogbGF5ZXJBY3RvciA9IENMVVRURVJfQUNUT1Ioc3Vi TGF5ZXJzW2ldLmdldCgpKTsKLSAgICAgICAgY2x1dHRlcl9hY3Rvcl9hZGRfY2hpbGQoQ0xVVFRF Ul9BQ1RPUihsYXllciksIGxheWVyQWN0b3IpOworICAgICAgICBDbHV0dGVyQWN0b3IqIGNoaWxk QWN0b3IgPSBDTFVUVEVSX0FDVE9SKHN1YkxheWVyc1tpXS5nZXQoKSk7CisgICAgICAgIENsdXR0 ZXJBY3Rvciogb2xkUGFyZW50QWN0b3IgPSBjbHV0dGVyX2FjdG9yX2dldF9wYXJlbnQoY2hpbGRB Y3Rvcik7CisgICAgICAgIGlmIChvbGRQYXJlbnRBY3RvcikgeworICAgICAgICAgICAgaWYgKG9s ZFBhcmVudEFjdG9yID09IG5ld1BhcmVudEFjdG9yKQorICAgICAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICAgICAgY2x1dHRlcl9hY3Rvcl9yZW1vdmVfY2hpbGQob2xkUGFyZW50QWN0b3Is IGNoaWxkQWN0b3IpOworICAgICAgICB9CisgICAgICAgIGNsdXR0ZXJfYWN0b3JfYWRkX2NoaWxk KG5ld1BhcmVudEFjdG9yLCBjaGlsZEFjdG9yKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvR3JhcGhpY3NMYXllckNsdXR0 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGlj c0xheWVyQ2x1dHRlci5jcHAKaW5kZXggYWM0OWM2OTAzODVkZmI3MmQ5MDI0YjFmMDE2YThhOTZj OGFjODA5Zi4uYjYzYTA0OThiZTc4OTZlNDkwNzQ2YTM1OTIyZWZkN2RhODI4OWU4ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGljc0xh eWVyQ2x1dHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1 dHRlci9HcmFwaGljc0xheWVyQ2x1dHRlci5jcHAKQEAgLTU3OCw4ICs1NzgsOCBAQCB2b2lkIEdy YXBoaWNzTGF5ZXJDbHV0dGVyOjpyZWN1cnNpdmVDb21taXRDaGFuZ2VzKGNvbnN0IFRyYW5zZm9y bVN0YXRlJiBzdGF0ZSwgZgogICAgIHNpemVfdCBudW1DaGlsZHJlbiA9IGNoaWxkTGF5ZXJzLnNp emUoKTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtQ2hpbGRyZW47ICsraSkgewot ICAgICAgICBHcmFwaGljc0xheWVyQ2x1dHRlciogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFw aGljc0xheWVyQ2x1dHRlcio+KGNoaWxkTGF5ZXJzW2ldKTsKLSAgICAgICAgY3VyQ2hpbGQtPnJl Y3Vyc2l2ZUNvbW1pdENoYW5nZXMobG9jYWxTdGF0ZSwgcGFnZVNjYWxlRmFjdG9yLCBiYXNlUmVs YXRpdmVQb3NpdGlvbiwgYWZmZWN0ZWRCeVBhZ2VTY2FsZSk7CisgICAgICAgIEdyYXBoaWNzTGF5 ZXJDbHV0dGVyKiBjdXJyZW50Q2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1dHRl cio+KGNoaWxkTGF5ZXJzW2ldKTsKKyAgICAgICAgY3VycmVudENoaWxkLT5yZWN1cnNpdmVDb21t aXRDaGFuZ2VzKGxvY2FsU3RhdGUsIHBhZ2VTY2FsZUZhY3RvciwgYmFzZVJlbGF0aXZlUG9zaXRp b24sIGFmZmVjdGVkQnlQYWdlU2NhbGUpOwogICAgIH0KIAogICAgIGNvbW1pdExheWVyQ2hhbmdl c0FmdGVyU3VibGF5ZXJzKCk7CkBAIC02NTgsMjEgKzY1OCwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5 ZXJDbHV0dGVyOjp1cGRhdGVTdWJsYXllckxpc3QoKQogICAgIEdyYXBoaWNzTGF5ZXJBY3Rvckxp c3QgbmV3U3VibGF5ZXJzOwogICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4mIGNoaWxk TGF5ZXJzID0gY2hpbGRyZW4oKTsKIAotICAgIGlmIChjaGlsZExheWVycy5zaXplKCkgPiAwKSB7 Ci0gICAgICAgIHNpemVfdCBudW1DaGlsZHJlbiA9IGNoaWxkTGF5ZXJzLnNpemUoKTsKLSAgICAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7Ci0gICAgICAgICAg ICBHcmFwaGljc0xheWVyQ2x1dHRlciogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xh eWVyQ2x1dHRlcio+KGNoaWxkTGF5ZXJzW2ldKTsKLSAgICAgICAgICAgIEdyYXBoaWNzTGF5ZXJB Y3RvciogY2hpbGRMYXllciA9IGN1ckNoaWxkLT5sYXllckZvclN1cGVybGF5ZXIoKTsKLSAgICAg ICAgICAgIGdfYXNzZXJ0KEdSQVBISUNTX0xBWUVSX0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKLSAg ICAgICAgICAgIG5ld1N1YmxheWVycy5hcHBlbmQoY2hpbGRMYXllcik7Ci0gICAgICAgIH0KKyAg ICBzaXplX3QgbnVtQ2hpbGRyZW4gPSBjaGlsZExheWVycy5zaXplKCk7CisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7CisgICAgICAgIEdyYXBoaWNzTGF5ZXJD bHV0dGVyKiBjdXJyZW50Q2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ2x1dHRlcio+ KGNoaWxkTGF5ZXJzW2ldKTsKKyAgICAgICAgR3JhcGhpY3NMYXllckFjdG9yKiBjaGlsZExheWVy ID0gY3VycmVudENoaWxkLT5sYXllckZvclN1cGVybGF5ZXIoKTsKKyAgICAgICAgQVNTRVJUKEdS QVBISUNTX0xBWUVSX0lTX0FDVE9SKGNoaWxkTGF5ZXIpKTsKIAotICAgICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG5ld1N1YmxheWVycy5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgQ2x1 dHRlckFjdG9yKiBsYXllckFjdG9yID0gQ0xVVFRFUl9BQ1RPUihuZXdTdWJsYXllcnNbaV0uZ2V0 KCkpOwotICAgICAgICAgICAgQ2x1dHRlckFjdG9yKiBwYXJlbnRBY3RvciA9IGNsdXR0ZXJfYWN0 b3JfZ2V0X3BhcmVudChsYXllckFjdG9yKTsKLSAgICAgICAgICAgIGlmIChwYXJlbnRBY3RvcikK LSAgICAgICAgICAgICAgICBjbHV0dGVyX2FjdG9yX3JlbW92ZV9jaGlsZChwYXJlbnRBY3Rvciwg bGF5ZXJBY3Rvcik7Ci0gICAgICAgIH0KKyAgICAgICAgbmV3U3VibGF5ZXJzLmFwcGVuZChjaGls ZExheWVyKTsKICAgICB9CiAKICAgICBncmFwaGljc0xheWVyQWN0b3JTZXRTdWJsYXllcnMobV9s YXllci5nZXQoKSwgbmV3U3VibGF5ZXJzKTsK