109304 2013-02-08 07:48:58 -0800 [GTK][AC] GraphicsLayerActor code clean up after clutter version up. 2013-02-08 09:59:53 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 105699 0 kevin.cs.oh webkit-unassigned webkit.review.bot oldest_to_newest 828571 0 kevin.cs.oh 2013-02-08 07:48:58 -0800 I want to clean up GraphicsLayerActor code here before further feature enhancement. I think GraphicsLayerActor functions could be more simple and readable by using new clutter apis. 828583 1 187321 kevin.cs.oh 2013-02-08 08:08:04 -0800 Created attachment 187321 Patch 828653 2 187321 webkit.review.bot 2013-02-08 09:59:49 -0800 Comment on attachment 187321 Patch Clearing flags on attachment: 187321 Committed r142297: <http://trac.webkit.org/changeset/142297> 828654 3 webkit.review.bot 2013-02-08 09:59:53 -0800 All reviewed patches have been landed. Closing bug. 187321 2013-02-08 08:08:04 -0800 2013-02-08 09:59:49 -0800 Patch bug-109304-20130209010438.patch text/plain 10610 kevin.cs.oh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVkYzA5NzU0NDFlODk5 Yzc5NWVlMGZlOTA5MWRiZDFhNzU2MTQ1NC4uYTQ5M2RiMzgzYzEzOTA4NmViNDMyNjA5MjIwOTgx YWMyNzFiMDJiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTA4ICBDaGFu Z1Nlb2sgT2ggIDxzaGl2YW1pZG93QGdtYWlsLmNvbT4KKworICAgICAgICBbR1RLXVtBQ10gR3Jh cGhpY3NMYXllckFjdG9yIGNvZGUgY2xlYW4gdXAgYWZ0ZXIgY2x1dHRlciB2ZXJzaW9uIHVwLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MzA0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBjbGVhbnMgdXAgR3JhcGhpY3NMYXllckFjdG9yIGZ1bmN0aW9ucyBieSB1c2luZyBuZXcgY2x1 dHRlciBhcGlzCisgICAgICAgIGFuZCBtYWtlcyBleGlzdGluZyBmdW5jdGlvbnMgc2ltcGxlICYg cmVhZGFibGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIG5vIGNoYW5nZSBpbiBmdW5j dGlvbmFsaXR5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNz TGF5ZXJBY3Rvci5jcHA6CisgICAgICAgIChfR3JhcGhpY3NMYXllckFjdG9yUHJpdmF0ZSk6Cisg ICAgICAgIChncmFwaGljc0xheWVyQWN0b3JBcHBseVRyYW5zZm9ybSk6CisgICAgICAgIChncmFw aGljc0xheWVyQWN0b3JQYWludCk6CisgICAgICAgIChncmFwaGljc0xheWVyQWN0b3JEcmF3KToK KyAgICAgICAgKGdyYXBoaWNzTGF5ZXJBY3RvclVwZGF0ZVRleHR1cmUpOgorICAgICAgICAoZHJh d0xheWVyQ29udGVudHMpOgorICAgICAgICAoZ3JhcGhpY3NMYXllckFjdG9yTmV3KToKKyAgICAg ICAgKGdyYXBoaWNzTGF5ZXJBY3RvckludmFsaWRhdGVSZWN0YW5nbGUpOgorICAgICAgICAoZ3Jh cGhpY3NMYXllckFjdG9yU2V0VHJhbnNmb3JtKToKKyAgICAgICAgKGdyYXBoaWNzTGF5ZXJBY3Rv clNldEFuY2hvclBvaW50KToKKyAgICAgICAgKGdyYXBoaWNzTGF5ZXJBY3RvckdldEFuY2hvclBv aW50KToKKyAgICAgICAgKGdyYXBoaWNzTGF5ZXJBY3RvclNldFNjcm9sbFBvc2l0aW9uKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVyL1BsYXRmb3JtQ2x1dHRlckFuaW1hdGlv bi5oOgorCiAyMDEzLTAyLTA3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBDbGVhbnVwIGNvbW1hbmQtbGluZSBkZWZpbmVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVyL0dyYXBoaWNzTGF5 ZXJBY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVyL0dy YXBoaWNzTGF5ZXJBY3Rvci5jcHAKaW5kZXggOTUyZWNhM2M5Nzg1OWM1MTNhMGE2ZTQ4ZjgwMDAw YmVkYmM5ZGQxYS4uZDJlZmQxNjYzMzkwOTJkZTE4YWFjYmUyZmM1MjUxMWYwODZmNDk2YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2x1dHRlci9HcmFwaGlj c0xheWVyQWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Ns dXR0ZXIvR3JhcGhpY3NMYXllckFjdG9yLmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5 cmlnaHQgMjAxMSwgMjAxMiBDb2xsYWJvcmEgTGltaXRlZAorICogQ29weXJpZ2h0IDIwMTEsIDIw MTIsIDIwMTMgQ29sbGFib3JhIExpbWl0ZWQKICAqIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBD b3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIHByb2dyYW0gaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdApA QCAtNDcsMTAgKzQ3LDYgQEAgc3RydWN0IF9HcmFwaGljc0xheWVyQWN0b3JQcml2YXRlIHsKIAog ICAgIGdib29sZWFuIGRyYXdzQ29udGVudDsKIAotICAgIGZsb2F0IGFuY2hvclg7Ci0gICAgZmxv YXQgYW5jaG9yWTsKLSAgICBmbG9hdCBhbmNob3JaOwotCiAgICAgZmxvYXQgc2Nyb2xsWDsKICAg ICBmbG9hdCBzY3JvbGxZOwogCkBAIC0yMTIsMjQgKzIwOCwyNiBAQCBzdGF0aWMgdm9pZCBncmFw aGljc0xheWVyQWN0b3JBcHBseVRyYW5zZm9ybShDbHV0dGVyQWN0b3IqIGFjdG9yLCBDb2dsTWF0 cml4KiBtYQogCiAgICAgQ0xVVFRFUl9BQ1RPUl9DTEFTUyhncmFwaGljc19sYXllcl9hY3Rvcl9w YXJlbnRfY2xhc3MpLT5hcHBseV90cmFuc2Zvcm0oYWN0b3IsIG1hdHJpeCk7CiAKLSAgICBmbG9h dCB3aWR0aCA9IGNsdXR0ZXJfYWN0b3JfZ2V0X3dpZHRoKGFjdG9yKTsKLSAgICBmbG9hdCBoZWln aHQgPSBjbHV0dGVyX2FjdG9yX2dldF9oZWlnaHQoYWN0b3IpOwotICAgIGlmICh3aWR0aCA8PSAx LjAgfHwgaGVpZ2h0IDw9IDEuMCkKLSAgICAgICAgcmV0dXJuOworICAgIGlmIChwcml2LT5tYXRy aXgpIHsKKyAgICAgICAgZmxvYXQgd2lkdGggPSAwLCBoZWlnaHQgPSAwOworICAgICAgICBjbHV0 dGVyX2FjdG9yX2dldF9zaXplKGFjdG9yLCAmd2lkdGgsICZoZWlnaHQpOworICAgICAgICBpZiAo d2lkdGggPD0gMS4wIHx8IGhlaWdodCA8PSAxLjApCisgICAgICAgICAgICByZXR1cm47CiAKLSAg ICBmbG9hdCBwaXZvdFgsIHBpdm90WTsKLSAgICBwaXZvdFggPSB3aWR0aCAqIHByaXYtPmFuY2hv clg7Ci0gICAgcGl2b3RZID0gaGVpZ2h0ICogcHJpdi0+YW5jaG9yWTsKKyAgICAgICAgLy8gVGhl IHBpdm90IG9mIGFjdG9yIGlzIGEgbm9ybWFsaXplZCB2YWx1ZSwgc28gd2UgbmVlZCBhbiBhY3R1 YWwgYW5jaG9yIHBvc2l0aW9uCisgICAgICAgIC8vIGluIGFjdG9yJ3MgbG9jYWwgY29vcmRpbmF0 ZSBzeXN0ZW0gZm9yIHRyYW5zbGF0aW5nLgorICAgICAgICBmbG9hdCBhbmNob3JYID0gMCwgYW5j aG9yWSA9IDAsIGFuY2hvclogPSAwOworICAgICAgICBncmFwaGljc0xheWVyQWN0b3JHZXRBbmNo b3JQb2ludChHUkFQSElDU19MQVlFUl9BQ1RPUihhY3RvciksICZhbmNob3JYLCAmYW5jaG9yWSwg JmFuY2hvclopOworICAgICAgICBhbmNob3JYICo9IHdpZHRoOworICAgICAgICBhbmNob3JZICo9 IGhlaWdodDsKIAotICAgIGlmIChwcml2LT5tYXRyaXgpIHsKLSAgICAgICAgQ29nbE1hdHJpeCog bG9jYWxNYXRyaXg7CiAgICAgICAgIC8vIENTUzMgdHJhbmZvcm0tc3R5bGUgY2FuIGJlIGNoYW5n ZWQgb24gdGhlIGZseSwgCiAgICAgICAgIC8vIHNvIHdlIGhhdmUgdG8gY29weSBwcml2LT5tYXRy aXggaW4gb3JkZXIgdG8gcmVjb3ZlciB6LWF4aXMuIAotICAgICAgICBsb2NhbE1hdHJpeCA9IGNv Z2xfbWF0cml4X2NvcHkocHJpdi0+bWF0cml4KTsKKyAgICAgICAgQ29nbE1hdHJpeCogbG9jYWxN YXRyaXggPSBjb2dsX21hdHJpeF9jb3B5KHByaXYtPm1hdHJpeCk7CiAKLSAgICAgICAgY29nbF9t YXRyaXhfdHJhbnNsYXRlKG1hdHJpeCwgcGl2b3RYLCBwaXZvdFksIHByaXYtPmFuY2hvclopOwor ICAgICAgICBjb2dsX21hdHJpeF90cmFuc2xhdGUobWF0cml4LCBhbmNob3JYLCBhbmNob3JZLCBh bmNob3JaKTsKICAgICAgICAgY29nbF9tYXRyaXhfbXVsdGlwbHkobWF0cml4LCBtYXRyaXgsIGxv Y2FsTWF0cml4KTsKLSAgICAgICAgY29nbF9tYXRyaXhfdHJhbnNsYXRlKG1hdHJpeCwgLXBpdm90 WCwgLXBpdm90WSwgLXByaXYtPmFuY2hvclopOworICAgICAgICBjb2dsX21hdHJpeF90cmFuc2xh dGUobWF0cml4LCAtYW5jaG9yWCwgLWFuY2hvclksIC1hbmNob3JaKTsKICAgICAgICAgY29nbF9t YXRyaXhfZnJlZShsb2NhbE1hdHJpeCk7CiAgICAgfQogfQpAQCAtMjM4LDggKzIzNiw3IEBAIHN0 YXRpYyB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvclBhaW50KENsdXR0ZXJBY3RvciogYWN0b3IpCiB7 CiAgICAgR3JhcGhpY3NMYXllckFjdG9yKiBncmFwaGljc0xheWVyID0gR1JBUEhJQ1NfTEFZRVJf QUNUT1IoYWN0b3IpOwogCi0gICAgR0xpc3QqIGxpc3Q7Ci0gICAgZm9yIChsaXN0ID0gZ3JhcGhp Y3NMYXllci0+Y2hpbGRyZW47IGxpc3Q7IGxpc3QgPSBsaXN0LT5uZXh0KSB7CisgICAgZm9yIChH TGlzdCogbGlzdCA9IGdyYXBoaWNzTGF5ZXItPmNoaWxkcmVuOyBsaXN0OyBsaXN0ID0gbGlzdC0+ bmV4dCkgewogICAgICAgICBDbHV0dGVyQWN0b3IqIGNoaWxkID0gQ0xVVFRFUl9BQ1RPUihsaXN0 LT5kYXRhKTsKICAgICAgICAgY2x1dHRlcl9hY3Rvcl9wYWludChjaGlsZCk7CiAgICAgfQpAQCAt MjQ3LDggKzI0NCw2IEBAIHN0YXRpYyB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvclBhaW50KENsdXR0 ZXJBY3RvciogYWN0b3IpCiAKIHN0YXRpYyBnYm9vbGVhbiBncmFwaGljc0xheWVyQWN0b3JEcmF3 KENsdXR0ZXJDYW52YXMqIHRleHR1cmUsIGNhaXJvX3QqIGNyLCBnaW50IHdpZHRoLCBnaW50IGhl aWdodCwgR3JhcGhpY3NMYXllckFjdG9yKiBsYXllcikKIHsKLSAgICBDbHV0dGVyQWN0b3IqIGFj dG9yID0gQ0xVVFRFUl9BQ1RPUihsYXllcik7Ci0KICAgICBpZiAoIXdpZHRoIHx8ICFoZWlnaHQp CiAgICAgICAgIHJldHVybiBGQUxTRTsKIApAQCAtMjY2LDcgKzI2MSw3IEBAIHN0YXRpYyBnYm9v bGVhbiBncmFwaGljc0xheWVyQWN0b3JEcmF3KENsdXR0ZXJDYW52YXMqIHRleHR1cmUsIGNhaXJv X3QqIGNyLCBnaW50CiAgICAgfQogCiAgICAgaWYgKHByaXYtPmxheWVyVHlwZSA9PSBHcmFwaGlj c0xheWVyQ2x1dHRlcjo6TGF5ZXJUeXBlV2ViTGF5ZXIpCi0gICAgICAgIGRyYXdMYXllckNvbnRl bnRzKGFjdG9yLCBjb250ZXh0KTsKKyAgICAgICAgZHJhd0xheWVyQ29udGVudHMoQ0xVVFRFUl9B Q1RPUihsYXllciksIGNvbnRleHQpOwogCiAgICAgcmV0dXJuIFRSVUU7CiB9CkBAIC0yODcsMjUg KzI4MiwxOSBAQCBzdGF0aWMgdm9pZCBncmFwaGljc0xheWVyQWN0b3JVcGRhdGVUZXh0dXJlKEdy YXBoaWNzTGF5ZXJBY3RvciogbGF5ZXIpCiB7CiAgICAgR3JhcGhpY3NMYXllckFjdG9yUHJpdmF0 ZSogcHJpdiA9IGxheWVyLT5wcml2OwogICAgIEFTU0VSVChwcml2LT5sYXllclR5cGUgIT0gR3Jh cGhpY3NMYXllckNsdXR0ZXI6OkxheWVyVHlwZVZpZGVvTGF5ZXIpOwotICAgIENsdXR0ZXJDb250 ZW50KiBjYW52YXM7Ci0gICAgY2FudmFzID0gY2x1dHRlcl9hY3Rvcl9nZXRfY29udGVudChDTFVU VEVSX0FDVE9SKGxheWVyKSk7Ci0KLSAgICAvLyBOb3RoaW5nIG5lZWRzIGEgdGV4dHVyZSwgcmVt b3ZlIHRoZSBvbmUgd2UgaGF2ZSwgaWYgYW55LgotICAgIGlmICghcHJpdi0+ZHJhd3NDb250ZW50 ICYmICFwcml2LT5zdXJmYWNlKSB7Ci0gICAgICAgIGlmICghY2FudmFzKQotICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhj YW52YXMsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGdyYXBoaWNzTGF5ZXJBY3RvckRyYXcpLCBs YXllcik7Ci0gICAgICAgIGdfb2JqZWN0X3VucmVmKGNhbnZhcyk7CisgICAgQ2x1dHRlckFjdG9y KiBhY3RvciA9IENMVVRURVJfQUNUT1IobGF5ZXIpOworICAgIENsdXR0ZXJDb250ZW50KiBjYW52 YXMgPSBjbHV0dGVyX2FjdG9yX2dldF9jb250ZW50KGFjdG9yKTsKKyAgICBpZiAoY2FudmFzKSB7 CisgICAgICAgIC8vIE5vdGhpbmcgbmVlZHMgYSB0ZXh0dXJlLCByZW1vdmUgdGhlIG9uZSB3ZSBo YXZlLCBpZiBhbnkuCisgICAgICAgIGlmICghcHJpdi0+ZHJhd3NDb250ZW50ICYmICFwcml2LT5z dXJmYWNlKSB7CisgICAgICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1 bmMoY2FudmFzLCByZWludGVycHJldF9jYXN0PHZvaWQqPihncmFwaGljc0xheWVyQWN0b3JEcmF3 KSwgbGF5ZXIpOworICAgICAgICAgICAgZ19vYmplY3RfdW5yZWYoY2FudmFzKTsKKyAgICAgICAg fQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gV2UgbmVlZCBhIHRleHR1cmUsIGJ1 dCBhbHJlYWR5IGhhdmUgb25lIQotICAgIGlmIChjYW52YXMpCi0gICAgICAgIHJldHVybjsKLQot ICAgIC8vIFdlIG5lZWQgYSB0ZXh0dXJlLCBzbyBjcmVhdGUgaXQuCi0gICAgQ2x1dHRlckFjdG9y KiBhY3RvciA9IENMVVRURVJfQUNUT1IobGF5ZXIpOworICAgIC8vIFdlIHNob3VsZCBoYXZlIGEg dGV4dHVyZSwgc28gY3JlYXRlIG9uZS4KICAgICBpbnQgd2lkdGggPSBjZWlsZihjbHV0dGVyX2Fj dG9yX2dldF93aWR0aChhY3RvcikpOwogICAgIGludCBoZWlnaHQgPSBjZWlsZihjbHV0dGVyX2Fj dG9yX2dldF9oZWlnaHQoYWN0b3IpKTsKIApAQCAtMzI1LDggKzMxNCw4IEBAIHN0YXRpYyB2b2lk IGRyYXdMYXllckNvbnRlbnRzKENsdXR0ZXJBY3RvciogYWN0b3IsIEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCkKICAgICBpZiAoIXByaXYtPmRyYXdzQ29udGVudCB8fCAhcHJpdi0+bGF5ZXJDbGll bnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGZsb2F0IHdpZHRoID0gY2x1dHRlcl9hY3Rvcl9n ZXRfd2lkdGgoYWN0b3IpOwotICAgIGZsb2F0IGhlaWdodCA9IGNsdXR0ZXJfYWN0b3JfZ2V0X2hl aWdodChhY3Rvcik7CisgICAgaW50IHdpZHRoID0gc3RhdGljX2Nhc3Q8aW50PihjbHV0dGVyX2Fj dG9yX2dldF93aWR0aChhY3RvcikpOworICAgIGludCBoZWlnaHQgPSBzdGF0aWNfY2FzdDxpbnQ+ KGNsdXR0ZXJfYWN0b3JfZ2V0X2hlaWdodChhY3RvcikpOwogICAgIEludFJlY3QgY2xpcCgwLCAw LCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgIC8vIEFwcGx5IHRoZSBwYWludGVkIGNvbnRlbnQgdG8g dGhlIGxheWVyLgpAQCAtMzM3LDkgKzMyNiw3IEBAIHN0YXRpYyB2b2lkIGRyYXdMYXllckNvbnRl bnRzKENsdXR0ZXJBY3RvciogYWN0b3IsIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKIEdyYXBo aWNzTGF5ZXJBY3RvciogZ3JhcGhpY3NMYXllckFjdG9yTmV3KEdyYXBoaWNzTGF5ZXJDbHV0dGVy OjpMYXllclR5cGUgdHlwZSkKIHsKICAgICBHcmFwaGljc0xheWVyQWN0b3IqIGxheWVyID0gR1JB UEhJQ1NfTEFZRVJfQUNUT1IoZ19vYmplY3RfbmV3KEdSQVBISUNTX0xBWUVSX1RZUEVfQUNUT1Is IDApKTsKLSAgICBHcmFwaGljc0xheWVyQWN0b3JQcml2YXRlKiBwcml2ID0gbGF5ZXItPnByaXY7 Ci0KLSAgICBwcml2LT5sYXllclR5cGUgPSB0eXBlOworICAgIGxheWVyLT5wcml2LT5sYXllclR5 cGUgPSB0eXBlOwogCiAgICAgcmV0dXJuIGxheWVyOwogfQpAQCAtMzg3LDggKzM3NCw3IEBAIHZv aWQgZ3JhcGhpY3NMYXllckFjdG9yU2V0U3VyZmFjZShHcmFwaGljc0xheWVyQWN0b3IqIGxheWVy LCBjYWlyb19zdXJmYWNlX3QqIHN1CiAKIHZvaWQgZ3JhcGhpY3NMYXllckFjdG9ySW52YWxpZGF0 ZVJlY3RhbmdsZShHcmFwaGljc0xheWVyQWN0b3IqIGxheWVyLCBjb25zdCBGbG9hdFJlY3QmIGRp cnR5UmVjdCkKIHsKLSAgICBDbHV0dGVyQ29udGVudCogY2FudmFzOwotICAgIGNhbnZhcyA9IGNs dXR0ZXJfYWN0b3JfZ2V0X2NvbnRlbnQoQ0xVVFRFUl9BQ1RPUihsYXllcikpOworICAgIENsdXR0 ZXJDb250ZW50KiBjYW52YXMgPSBjbHV0dGVyX2FjdG9yX2dldF9jb250ZW50KENMVVRURVJfQUNU T1IobGF5ZXIpKTsKICAgICBpZiAoIWNhbnZhcykKICAgICAgICAgcmV0dXJuOwogCkBAIC0zOTgs MzQgKzM4NCwyNiBAQCB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvckludmFsaWRhdGVSZWN0YW5nbGUo R3JhcGhpY3NMYXllckFjdG9yKiBsYXllciwgY29uc3QgRmxvYQogCiB2b2lkIGdyYXBoaWNzTGF5 ZXJBY3RvclNldFRyYW5zZm9ybShHcmFwaGljc0xheWVyQWN0b3IqIGxheWVyLCBjb25zdCBDb2ds TWF0cml4KiBtYXRyaXgpIAogewotICAgIEdyYXBoaWNzTGF5ZXJBY3RvclByaXZhdGUqIHByaXYg PSBsYXllci0+cHJpdjsKKyAgICBib29sIG5lZWRUb1JlZHJhdyA9IGZhbHNlOwogCisgICAgR3Jh cGhpY3NMYXllckFjdG9yUHJpdmF0ZSogcHJpdiA9IGxheWVyLT5wcml2OwogICAgIGlmIChwcml2 LT5tYXRyaXgpIHsKICAgICAgICAgY29nbF9tYXRyaXhfZnJlZShwcml2LT5tYXRyaXgpOwotICAg ICAgICBwcml2LT5tYXRyaXggPSAwOwotICAgICAgICBjbHV0dGVyX2FjdG9yX3F1ZXVlX3JlZHJh dyhDTFVUVEVSX0FDVE9SKGxheWVyKSk7CisgICAgICAgIG5lZWRUb1JlZHJhdyA9IHRydWU7CiAg ICAgfQogCi0gICAgQ29nbE1hdHJpeCBpZGVudGl0eTsKLSAgICBjb2dsX21hdHJpeF9pbml0X2lk ZW50aXR5KCZpZGVudGl0eSk7Ci0gICAgaWYgKGNvZ2xfbWF0cml4X2VxdWFsKChDb2dsTWF0cml4 KikmaWRlbnRpdHksIChDb2dsTWF0cml4KiltYXRyaXgpKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBpZiAocHJpdi0+bWF0cml4KQotICAgICAgICBjb2dsX21hdHJpeF9mcmVlKHByaXYtPm1hdHJp eCk7CisgICAgaWYgKCFjb2dsX21hdHJpeF9pc19pZGVudGl0eShtYXRyaXgpKSB7CisgICAgICAg IHByaXYtPm1hdHJpeCA9IGNvZ2xfbWF0cml4X2NvcHkobWF0cml4KTsKKyAgICAgICAgbmVlZFRv UmVkcmF3ID0gdHJ1ZTsKKyAgICB9IGVsc2UKKyAgICAgICAgcHJpdi0+bWF0cml4ID0gMDsKIAot ICAgIHByaXYtPm1hdHJpeCA9IGNvZ2xfbWF0cml4X2NvcHkobWF0cml4KTsKLSAgICBjbHV0dGVy X2FjdG9yX3F1ZXVlX3JlZHJhdyhDTFVUVEVSX0FDVE9SKGxheWVyKSk7CisgICAgaWYgKG5lZWRU b1JlZHJhdykKKyAgICAgICAgY2x1dHRlcl9hY3Rvcl9xdWV1ZV9yZWRyYXcoQ0xVVFRFUl9BQ1RP UihsYXllcikpOwogfQogCiB2b2lkIGdyYXBoaWNzTGF5ZXJBY3RvclNldEFuY2hvclBvaW50KEdy YXBoaWNzTGF5ZXJBY3RvciogbGF5ZXIsIGZsb2F0IHgsIGZsb2F0IHksIGZsb2F0IHopCiB7Ci0g ICAgR3JhcGhpY3NMYXllckFjdG9yUHJpdmF0ZSogcHJpdiA9IGxheWVyLT5wcml2OwotCi0gICAg cHJpdi0+YW5jaG9yWCA9IHg7Ci0gICAgcHJpdi0+YW5jaG9yWSA9IHk7Ci0gICAgcHJpdi0+YW5j aG9yWiA9IHo7Ci0KICAgICBDbHV0dGVyQWN0b3IqIGFjdG9yID0gQ0xVVFRFUl9BQ1RPUihsYXll cik7CiAgICAgY2x1dHRlcl9hY3Rvcl9zZXRfcGl2b3RfcG9pbnQoYWN0b3IsIHgsIHkpOwogICAg IGNsdXR0ZXJfYWN0b3Jfc2V0X3Bpdm90X3BvaW50X3ooYWN0b3IsIHopOwpAQCAtNDMzLDI0ICs0 MTEsMjAgQEAgdm9pZCBncmFwaGljc0xheWVyQWN0b3JTZXRBbmNob3JQb2ludChHcmFwaGljc0xh eWVyQWN0b3IqIGxheWVyLCBmbG9hdCB4LCBmbG9hdAogCiB2b2lkIGdyYXBoaWNzTGF5ZXJBY3Rv ckdldEFuY2hvclBvaW50KEdyYXBoaWNzTGF5ZXJBY3RvciogbGF5ZXIsIGZsb2F0KiB4LCBmbG9h dCogeSwgZmxvYXQqIHopCiB7Ci0gICAgR3JhcGhpY3NMYXllckFjdG9yUHJpdmF0ZSogcHJpdiA9 IGxheWVyLT5wcml2OwotICAgIGlmICh4KQotICAgICAgICAqeCA9IHByaXYtPmFuY2hvclg7Ci0K LSAgICBpZiAoeSkKLSAgICAgICAgKnkgPSBwcml2LT5hbmNob3JZOworICAgIEFTU0VSVCh4ICYm IHkpOwogCisgICAgQ2x1dHRlckFjdG9yKiBhY3RvciA9IENMVVRURVJfQUNUT1IobGF5ZXIpOwor ICAgIGNsdXR0ZXJfYWN0b3JfZ2V0X3Bpdm90X3BvaW50KGFjdG9yLCB4LCB5KTsKICAgICBpZiAo eikKLSAgICAgICAgKnogPSBwcml2LT5hbmNob3JaOworICAgICAgICAqeiA9IGNsdXR0ZXJfYWN0 b3JfZ2V0X3Bpdm90X3BvaW50X3ooYWN0b3IpOwogfQogCiB2b2lkIGdyYXBoaWNzTGF5ZXJBY3Rv clNldFNjcm9sbFBvc2l0aW9uKEdyYXBoaWNzTGF5ZXJBY3RvciogbGF5ZXIsIGZsb2F0IHgsIGZs b2F0IHkpCiB7Ci0gICAgR3JhcGhpY3NMYXllckFjdG9yUHJpdmF0ZSogcHJpdiA9IGxheWVyLT5w cml2OwotCiAgICAgaWYgKHggPiAwIHx8IHkgPiAwKQogICAgICAgICByZXR1cm47CiAKKyAgICBH cmFwaGljc0xheWVyQWN0b3JQcml2YXRlKiBwcml2ID0gbGF5ZXItPnByaXY7CiAgICAgcHJpdi0+ c2Nyb2xsWCA9IHg7CiAgICAgcHJpdi0+c2Nyb2xsWSA9IHk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvUGxhdGZvcm1DbHV0dGVyQW5pbWF0 aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jbHV0dGVyL1BsYXRmb3Jt Q2x1dHRlckFuaW1hdGlvbi5oCmluZGV4IDNhNmNjZmU2ZTEzOWE0ODE1ZDA1YTk0YmVlZTk0Mjc1 M2UzNjU1NTQuLjY3YjFlNDg1MjExMzY1NGYwNGE3MzUwMDc1OGM4Y2FiOTQzOTNmZDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NsdXR0ZXIvUGxhdGZvcm1D bHV0dGVyQW5pbWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2x1dHRlci9QbGF0Zm9ybUNsdXR0ZXJBbmltYXRpb24uaApAQCAtMTYxLDQgKzE2MSw0IEBAIHBy aXZhdGU6CiAKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAKLSNlbmRp ZiAvLyBQbGF0Zm9ybUNBQW5pbWF0aW9uX2gKKyNlbmRpZiAvLyBQbGF0Zm9ybUNsdXR0ZXJBbmlt YXRpb25faAo=