87421 2012-05-24 13:34:05 -0700 Make sure that the layer hosting mode is up-to-date when reconnecting to a new web process 2012-05-24 15:39:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca gustavo xan.lopez oldest_to_newest 633131 0 andersca 2012-05-24 13:34:05 -0700 Make sure that the layer hosting mode is up-to-date when reconnecting to a new web process 633140 1 143885 andersca 2012-05-24 13:36:29 -0700 Created attachment 143885 Patch 633194 2 143885 gustavo 2012-05-24 13:57:08 -0700 Comment on attachment 143885 Patch Attachment 143885 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/12791306 633203 3 143885 buildbot 2012-05-24 14:03:56 -0700 Comment on attachment 143885 Patch Attachment 143885 did not pass win-ews (win): Output: http://queues.webkit.org/results/12794304 633247 4 143900 andersca 2012-05-24 14:38:31 -0700 Created attachment 143900 Patch 633308 5 andersca 2012-05-24 15:39:50 -0700 Committed r118439: <http://trac.webkit.org/changeset/118439> 143885 2012-05-24 13:36:29 -0700 2012-05-24 14:38:27 -0700 Patch bug-87421-20120524133911.patch text/plain 9326 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWUwZjM5ZGRlZTdjODcy Yjk4ZWJkZWYzNTQxNzhmZDMyMDIwZmQ1MS4uY2E1NjQ0YTVhMDFmMzM2MTBkYTkyNGNkNDg0YmM2 MmVjYmY3MmNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA1LTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIHRo YXQgdGhlIGxheWVyIGhvc3RpbmcgbW9kZSBpcyB1cC10by1kYXRlIHdoZW4gcmVjb25uZWN0aW5n IHRvIGEgbmV3IHdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NzQyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTE1MTAzMzc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VuZCBvdmVy IHRoZSBsYXllciBob3N0aW5nIG1vZGUgYXMgcGFydCBvZiB0aGUgd2ViIHBhZ2UgY3JlYXRpb24g cGFyYW1ldGVycyBhbmQgY3JlYXRlIHRoZSByaWdodAorICAgICAgICBsYXllciBob3N0aW5nIGNv bnRleHQgYmFzZWQgb24gdGhlIG1vZGUuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMu aDoKKyAgICAgICAgKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNy ZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmg6CisgICAg ICAgIChUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYSk6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWE6OnNldExheWVySG9zdGluZ01vZGUpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUxheWVySG9zdGlu Z0NvbnRleHQpOgorCiAyMDEyLTA1LTI0ICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lh LmNvbT4KIAogICAgICAgICBbUXRdIFN0b3AgdXNpbmcgdGhlIGZsYWcgRklYRURfUE9TSVRJT05f Q1JFQVRFU19TVEFDS0lOR19DT05URVhUCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggMDhiZWRiNjFmZjQ5YmI1OGQ1ZGY5 N2U5MDRjODNmMGYzODU2MmNmOC4uZWI3MmVkNTU0YmU2OWQyN2NiZWI3MmM4M2Y2NmNkNTg0ODYw NGZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcApAQCAtNjAsNiArNjAsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnM6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiAK ICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2Rlci0+ZW5jb2RlKGlzU21hcnRJbnNlcnREZWxl dGVFbmFibGVkKTsKKyAgICBlbmNvZGVyLT5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01vZGUpOwog I2VuZGlmCiAKICNpZiBQTEFURk9STShXSU4pCkBAIC0xMjEsNiArMTIyLDggQEAgYm9vbCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBk ZWNvZGVyLCBXZWJQYWcKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGUocGFyYW1ldGVycy5pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZUVudW0ocGFyYW1ldGVycy5sYXllckhv c3RpbmdNb2RlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCiAKICNpZiBQTEFURk9S TShXSU4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuaAppbmRleCA3ZTRmNjNhNGMwZGEwNmE1OTI4ZjA1YTQ3NDU4MTc0MjE3ZDU2MTFhLi41 NDg0NWI4MWM2MTI5ZTBhNDExOWM1MmUzNzNlMjhmNTMzMzJlOTE5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTgyLDYgKzgy LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogCiAjaWYgUExBVEZPUk0o TUFDKQogICAgIGJvb2wgaXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQ7CisgICAgTGF5ZXJIb3N0 aW5nTW9kZSBsYXllckhvc3RpbmdNb2RlOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShXSU4pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGZiN2Y0ZmI1Y2Ux OWVlNmIyYmRmZWI5NzgxZDMyMWNhZWNkZDYzZDAuLjkzMGU3OTU5OGE0MGIzOGU1YjQyOWRmODc1 NWEzNDM4MDA4NzY1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCkBAIC0zNDYzLDYgKzM0NjMsNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBh Z2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkgY29uc3QKIAogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBwYXJhbWV0ZXJzLmlzU21hcnRJbnNlcnREZWxldGVFbmFibGVkID0gbV9pc1NtYXJ0SW5z ZXJ0RGVsZXRlRW5hYmxlZDsKKyAgICBwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUgPSBtX2xh eWVySG9zdGluZ01vZGU7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFdJTikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA2OGU0N2Y0YzBiMjkx NTQ0YTBhOGUyMGU5ZDcyNmM4NDBjMjhjNDhkLi4wNDYxNWQyMDM2YThkZWQzOWQzNTc2MzBmYTQ2 YWY1ZTI3NDNiMTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC0xOTIsNyArMTkyLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBw YWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAjaWYg UExBVEZPUk0oTUFDKQogICAgICwgbV93aW5kb3dJc1Zpc2libGUoZmFsc2UpCiAgICAgLCBtX2lz U21hcnRJbnNlcnREZWxldGVFbmFibGVkKHBhcmFtZXRlcnMuaXNTbWFydEluc2VydERlbGV0ZUVu YWJsZWQpCi0gICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQp CisgICAgLCBtX2xheWVySG9zdGluZ01vZGUocGFyYW1ldGVycy5sYXllckhvc3RpbmdNb2RlKQog ICAgICwgbV9rZXlib2FyZEV2ZW50QmVpbmdJbnRlcnByZXRlZCgwKQogI2VsaWYgUExBVEZPUk0o V0lOKQogICAgICwgbV9uYXRpdmVXaW5kb3cocGFyYW1ldGVycy5uYXRpdmVXaW5kb3cpCkBAIC0y MjksNiArMjI5LDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgLCBtX3Zpc2liaWxpdHlT dGF0ZShXZWJDb3JlOjpQYWdlVmlzaWJpbGl0eVN0YXRlVmlzaWJsZSkKICNlbmRpZgogeworICAg IHByaW50ZigiJXAgLSBjcmVhdGlvbiBwYXJhbWV0ZXJzIGhvc3RpbmcgJWRcbiIsIHRoaXMsIHBh cmFtZXRlcnMubGF5ZXJIb3N0aW5nTW9kZSk7CiAgICAgQVNTRVJUKG1fcGFnZUlEKTsKICAgICAv LyBGSVhNRTogVGhpcyBpcyBhIG5vbi1pZGVhbCBsb2NhdGlvbiBmb3IgdGhpcyBTZXR0aW5nIGFu ZAogICAgIC8vIDRtcyBzaG91bGQgYmUgYWRvcHRlZCBwcm9qZWN0LXdpZGUgbm93LCBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEyMTQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCA4NjA4ZjA3NTUyYmIyMWUzYjBiZjUzZmJiNTc4 YTlhOWI1YWRlYjc5Li45ZDBiMDc3OWVlOTc3NDQ1OTA0N2E3NmIyMzljNzZjMWYxYTc5NTY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC04Niw2ICs4Niw4 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHNldERldmljZVNjYWxlRmFjdG9yKGZsb2F0 KSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJIb3N0aW5nTW9kZSh1aW50MzJf dCkgT1ZFUlJJREU7CiAKKyAgICB2b2lkIHVwZGF0ZUxheWVySG9zdGluZ0NvbnRleHQoKTsKKwog ICAgIHZvaWQgc2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoQ0FMYXllciAqKTsKIAogICAgIHZvaWQg Y3JlYXRlUGFnZU92ZXJsYXlMYXllcigpOwpAQCAtOTUsNyArOTcsNiBAQCBwcml2YXRlOgogICAg IFdlYkNvcmU6OkxheWVyRmx1c2hTY2hlZHVsZXIgbV9sYXllckZsdXNoU2NoZWR1bGVyOwogCiAg ICAgT3duUHRyPExheWVySG9zdGluZ0NvbnRleHQ+IG1fbGF5ZXJIb3N0aW5nQ29udGV4dDsKLSAg ICBMYXllckhvc3RpbmdNb2RlIG1fbGF5ZXJIb3N0aW5nTW9kZTsKICAgICAKICAgICBSZXRhaW5Q dHI8Q0FMYXllcj4gbV9yb290TGF5ZXI7CiAgICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fcGVuZGlu Z1Jvb3RDb21wb3NpdGluZ0xheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWEubW0KaW5kZXggYjY3YmVkMTkwOGI4NzQyYjIzMmQxNGU4ZjgzYTcxYWFlOWNkNzkzOS4u NWVkOTZlMTNkNTQyNDVjNDZlNTFiYTI1N2RkZGZhZTVlNjY3N2MzNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC04Myw4ICs4Myw3IEBAIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQ YWdlKiB3ZWJQYWdlLCBjCiAgICAgbV9yb290TGF5ZXIuZ2V0KCkub3BhcXVlID0gWUVTOwogICAg IG1fcm9vdExheWVyLmdldCgpLmdlb21ldHJ5RmxpcHBlZCA9IFlFUzsKIAotICAgIG1fbGF5ZXJI b3N0aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRleHQ6OmNyZWF0ZUZvclBvcnQoV2ViUHJv Y2Vzczo6c2hhcmVkKCkuY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0KCkpOwotICAgIG1fbGF5 ZXJIb3N0aW5nQ29udGV4dC0+c2V0Um9vdExheWVyKG1fcm9vdExheWVyLmdldCgpKTsKKyAgICB1 cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCk7CiAgICAgCiAgICAgTGF5ZXJUcmVlQ29udGV4dCBs YXllclRyZWVDb250ZXh0OwogICAgIGxheWVyVHJlZUNvbnRleHQuY29udGV4dElEID0gbV9sYXll ckhvc3RpbmdDb250ZXh0LT5jb250ZXh0SUQoKTsKQEAgLTM1MiwzNCArMzUxLDQwIEBAIHZvaWQg VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldERldmljZVNjYWxlRmFjdG9yKGZsb2F0 IGRldmljZVNjYWxlRmFjdG9yCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpz ZXRMYXllckhvc3RpbmdNb2RlKHVpbnQzMl90IG9wYXF1ZUxheWVySG9zdGluZ01vZGUpCiB7CiAg ICAgTGF5ZXJIb3N0aW5nTW9kZSBsYXllckhvc3RpbmdNb2RlID0gc3RhdGljX2Nhc3Q8TGF5ZXJI b3N0aW5nTW9kZT4ob3BhcXVlTGF5ZXJIb3N0aW5nTW9kZSk7Ci0gICAgaWYgKGxheWVySG9zdGlu Z01vZGUgIT0gbV9sYXllckhvc3RpbmdDb250ZXh0LT5sYXllckhvc3RpbmdNb2RlKCkpIHsKLSAg ICAgICAgLy8gVGhlIG1vZGUgaGFzIGNoYW5nZWQuCi0gICAgICAgIAotICAgICAgICAvLyBGaXJz dCwgaW52YWxpZGF0ZSB0aGUgb2xkIGhvc3RpbmcgY29udGV4dC4KKyAgICBpZiAobGF5ZXJIb3N0 aW5nTW9kZSA9PSBtX3dlYlBhZ2UtPmxheWVySG9zdGluZ01vZGUoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgbV93ZWJQYWdlLT5zZXRMYXllckhvc3RpbmdNb2RlKGxheWVySG9zdGluZ01vZGUp OworCisgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOworCisgICAgLy8gRmluYWxseSwg aW5mb3JtIHRoZSBVSVByb2Nlc3MgdGhhdCB0aGUgY29udGV4dCBoYXMgY2hhbmdlZC4KKyAgICBM YXllclRyZWVDb250ZXh0IGxheWVyVHJlZUNvbnRleHQ7CisgICAgbGF5ZXJUcmVlQ29udGV4dC5j b250ZXh0SUQgPSBtX2xheWVySG9zdGluZ0NvbnRleHQtPmNvbnRleHRJRCgpOworICAgIG1fd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6VXBkYXRlQWNjZWxlcmF0ZWRD b21wb3NpdGluZ01vZGUoMCwgbGF5ZXJUcmVlQ29udGV4dCkpOworfQorCit2b2lkIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCkKK3sKKyAg ICAvLyBJbnZhbGlkYXRlIHRoZSBvbGQgY29udGV4dC4KKyAgICBpZiAobV9sYXllckhvc3RpbmdD b250ZXh0KSB7CiAgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4dC0+aW52YWxpZGF0ZSgpOwog ICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQgPSBudWxscHRyOworICAgIH0KIAotICAgICAg ICAvLyBDcmVhdGUgYSBuZXcgY29udGV4dCBhbmQgc2V0IGl0IHVwLgotICAgICAgICBzd2l0Y2gg KGxheWVySG9zdGluZ01vZGUpIHsKLSAgICAgICAgY2FzZSBMYXllckhvc3RpbmdNb2RlRGVmYXVs dDoKLSAgICAgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRl eHQ6OmNyZWF0ZUZvclBvcnQoV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29tcG9zaXRpbmdSZW5kZXJT ZXJ2ZXJQb3J0KCkpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgLy8gQ3JlYXRlIGEgbmV3IGNv bnRleHQgYW5kIHNldCBpdCB1cC4KKyAgICBzd2l0Y2ggKG1fd2ViUGFnZS0+bGF5ZXJIb3N0aW5n TW9kZSgpKSB7CisgICAgY2FzZSBMYXllckhvc3RpbmdNb2RlRGVmYXVsdDoKKyAgICAgICAgbV9s YXllckhvc3RpbmdDb250ZXh0ID0gTGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yUG9ydChX ZWJQcm9jZXNzOjpzaGFyZWQoKS5jb21wb3NpdGluZ1JlbmRlclNlcnZlclBvcnQoKSk7CisgICAg ICAgIGJyZWFrOwogI2lmIEhBVkUoTEFZRVJfSE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQotICAg ICAgICBjYXNlIExheWVySG9zdGluZ01vZGVJbldpbmRvd1NlcnZlcjoKLSAgICAgICAgICAgIG1f bGF5ZXJIb3N0aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRleHQ6OmNyZWF0ZUZvcldpbmRv d1NlcnZlcigpOyAgICAgICAgCi0gICAgICAgICAgICBicmVhazsKKyAgICBjYXNlIExheWVySG9z dGluZ01vZGVJbldpbmRvd1NlcnZlcjoKKyAgICAgICAgbV9sYXllckhvc3RpbmdDb250ZXh0ID0g TGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlRm9yV2luZG93U2VydmVyKCk7CisgICAgICAgIGJy ZWFrOwogI2VuZGlmCi0gICAgICAgIH0KLQotICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQt PnNldFJvb3RMYXllcihtX3Jvb3RMYXllci5nZXQoKSk7Ci0KLSAgICAgICAgbV93ZWJQYWdlLT5z ZXRMYXllckhvc3RpbmdNb2RlKGxheWVySG9zdGluZ01vZGUpOwotCi0gICAgICAgIC8vIEZpbmFs bHksIGluZm9ybSB0aGUgVUlQcm9jZXNzIHRoYXQgdGhlIGNvbnRleHQgaGFzIGNoYW5nZWQuCi0g ICAgICAgIExheWVyVHJlZUNvbnRleHQgbGF5ZXJUcmVlQ29udGV4dDsKLSAgICAgICAgbGF5ZXJU cmVlQ29udGV4dC5jb250ZXh0SUQgPSBtX2xheWVySG9zdGluZ0NvbnRleHQtPmNvbnRleHRJRCgp OwotICAgICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OlVw ZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKDAsIGxheWVyVHJlZUNvbnRleHQpKTsKICAg ICB9CisKKyAgICBtX2xheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3Jvb3RMYXll ci5nZXQoKSk7CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldFJv b3RDb21wb3NpdGluZ0xheWVyKENBTGF5ZXIgKmxheWVyKQo= 143900 2012-05-24 14:38:31 -0700 2012-05-24 14:47:28 -0700 Patch bug-87421-20120524144113.patch text/plain 8883 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWUwZjM5ZGRlZTdjODcy Yjk4ZWJkZWYzNTQxNzhmZDMyMDIwZmQ1MS4uY2E1NjQ0YTVhMDFmMzM2MTBkYTkyNGNkNDg0YmM2 MmVjYmY3MmNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA1LTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIHRo YXQgdGhlIGxheWVyIGhvc3RpbmcgbW9kZSBpcyB1cC10by1kYXRlIHdoZW4gcmVjb25uZWN0aW5n IHRvIGEgbmV3IHdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NzQyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTE1MTAzMzc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VuZCBvdmVy IHRoZSBsYXllciBob3N0aW5nIG1vZGUgYXMgcGFydCBvZiB0aGUgd2ViIHBhZ2UgY3JlYXRpb24g cGFyYW1ldGVycyBhbmQgY3JlYXRlIHRoZSByaWdodAorICAgICAgICBsYXllciBob3N0aW5nIGNv bnRleHQgYmFzZWQgb24gdGhlIG1vZGUuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMu aDoKKyAgICAgICAgKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNy ZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmg6CisgICAg ICAgIChUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYSk6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWE6OnNldExheWVySG9zdGluZ01vZGUpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUxheWVySG9zdGlu Z0NvbnRleHQpOgorCiAyMDEyLTA1LTI0ICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lh LmNvbT4KIAogICAgICAgICBbUXRdIFN0b3AgdXNpbmcgdGhlIGZsYWcgRklYRURfUE9TSVRJT05f Q1JFQVRFU19TVEFDS0lOR19DT05URVhUCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggMDhiZWRiNjFmZjQ5YmI1OGQ1ZGY5 N2U5MDRjODNmMGYzODU2MmNmOC4uZWI3MmVkNTU0YmU2OWQyN2NiZWI3MmM4M2Y2NmNkNTg0ODYw NGZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcApAQCAtNjAsNiArNjAsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnM6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiAK ICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2Rlci0+ZW5jb2RlKGlzU21hcnRJbnNlcnREZWxl dGVFbmFibGVkKTsKKyAgICBlbmNvZGVyLT5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01vZGUpOwog I2VuZGlmCiAKICNpZiBQTEFURk9STShXSU4pCkBAIC0xMjEsNiArMTIyLDggQEAgYm9vbCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBk ZWNvZGVyLCBXZWJQYWcKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGUocGFyYW1ldGVycy5pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZUVudW0ocGFyYW1ldGVycy5sYXllckhv c3RpbmdNb2RlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCiAKICNpZiBQTEFURk9S TShXSU4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuaAppbmRleCA3ZTRmNjNhNGMwZGEwNmE1OTI4ZjA1YTQ3NDU4MTc0MjE3ZDU2MTFhLi41 NDg0NWI4MWM2MTI5ZTBhNDExOWM1MmUzNzNlMjhmNTMzMzJlOTE5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTgyLDYgKzgy LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogCiAjaWYgUExBVEZPUk0o TUFDKQogICAgIGJvb2wgaXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQ7CisgICAgTGF5ZXJIb3N0 aW5nTW9kZSBsYXllckhvc3RpbmdNb2RlOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShXSU4pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGZiN2Y0ZmI1Y2Ux OWVlNmIyYmRmZWI5NzgxZDMyMWNhZWNkZDYzZDAuLjkzMGU3OTU5OGE0MGIzOGU1YjQyOWRmODc1 NWEzNDM4MDA4NzY1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCkBAIC0zNDYzLDYgKzM0NjMsNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBh Z2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkgY29uc3QKIAogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBwYXJhbWV0ZXJzLmlzU21hcnRJbnNlcnREZWxldGVFbmFibGVkID0gbV9pc1NtYXJ0SW5z ZXJ0RGVsZXRlRW5hYmxlZDsKKyAgICBwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUgPSBtX2xh eWVySG9zdGluZ01vZGU7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFdJTikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA2OGU0N2Y0YzBiMjkx NTQ0YTBhOGUyMGU5ZDcyNmM4NDBjMjhjNDhkLi5hMDdiNjc1Zjk2NzYzODQzMDA2YmVhMjU5Yjdm MmMxOGFhNGQyZDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC0xOTIsNyArMTkyLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBw YWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAjaWYg UExBVEZPUk0oTUFDKQogICAgICwgbV93aW5kb3dJc1Zpc2libGUoZmFsc2UpCiAgICAgLCBtX2lz U21hcnRJbnNlcnREZWxldGVFbmFibGVkKHBhcmFtZXRlcnMuaXNTbWFydEluc2VydERlbGV0ZUVu YWJsZWQpCi0gICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQp CisgICAgLCBtX2xheWVySG9zdGluZ01vZGUocGFyYW1ldGVycy5sYXllckhvc3RpbmdNb2RlKQog ICAgICwgbV9rZXlib2FyZEV2ZW50QmVpbmdJbnRlcnByZXRlZCgwKQogI2VsaWYgUExBVEZPUk0o V0lOKQogICAgICwgbV9uYXRpdmVXaW5kb3cocGFyYW1ldGVycy5uYXRpdmVXaW5kb3cpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKaW5kZXggODYwOGYwNzU1MmJiMjFl M2IwYmY1M2ZiYjU3OGE5YTliNWFkZWI3OS4uOWQwYjA3NzllZTk3NzQ0NTkwNDdhNzZiMjM5Yzc2 YzFmMWE3OTU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaApA QCAtODYsNiArODYsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzZXREZXZpY2VTY2Fs ZUZhY3RvcihmbG9hdCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNldExheWVySG9zdGlu Z01vZGUodWludDMyX3QpIE9WRVJSSURFOwogCisgICAgdm9pZCB1cGRhdGVMYXllckhvc3RpbmdD b250ZXh0KCk7CisKICAgICB2b2lkIHNldFJvb3RDb21wb3NpdGluZ0xheWVyKENBTGF5ZXIgKik7 CiAKICAgICB2b2lkIGNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoKTsKQEAgLTk1LDcgKzk3LDYgQEAg cHJpdmF0ZToKICAgICBXZWJDb3JlOjpMYXllckZsdXNoU2NoZWR1bGVyIG1fbGF5ZXJGbHVzaFNj aGVkdWxlcjsKIAogICAgIE93blB0cjxMYXllckhvc3RpbmdDb250ZXh0PiBtX2xheWVySG9zdGlu Z0NvbnRleHQ7Ci0gICAgTGF5ZXJIb3N0aW5nTW9kZSBtX2xheWVySG9zdGluZ01vZGU7CiAgICAg CiAgICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fcm9vdExheWVyOwogICAgIFJldGFpblB0cjxDQUxh eWVyPiBtX3BlbmRpbmdSb290Q29tcG9zaXRpbmdMYXllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IGI2N2JlZDE5MDhiODc0MmIyMzJkMTRlOGY4M2E3 MWFhZTljZDc5MzkuLjVlZDk2ZTEzZDU0MjQ1YzQ2ZTUxYmEyNTdkZGRmYWU1ZTY2NzdjMzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtODMsOCArODMs NyBAQCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEoV2ViUGFnZSogd2ViUGFnZSwgYwogICAgIG1fcm9vdExheWVyLmdldCgpLm9wYXF1 ZSA9IFlFUzsKICAgICBtX3Jvb3RMYXllci5nZXQoKS5nZW9tZXRyeUZsaXBwZWQgPSBZRVM7CiAK LSAgICBtX2xheWVySG9zdGluZ0NvbnRleHQgPSBMYXllckhvc3RpbmdDb250ZXh0OjpjcmVhdGVG b3JQb3J0KFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbXBvc2l0aW5nUmVuZGVyU2VydmVyUG9ydCgp KTsKLSAgICBtX2xheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3Jvb3RMYXllci5n ZXQoKSk7CisgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIAogICAgIExheWVy VHJlZUNvbnRleHQgbGF5ZXJUcmVlQ29udGV4dDsKICAgICBsYXllclRyZWVDb250ZXh0LmNvbnRl eHRJRCA9IG1fbGF5ZXJIb3N0aW5nQ29udGV4dC0+Y29udGV4dElEKCk7CkBAIC0zNTIsMzQgKzM1 MSw0MCBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzZXREZXZpY2VTY2Fs ZUZhY3RvcihmbG9hdCBkZXZpY2VTY2FsZUZhY3Rvcgogdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6c2V0TGF5ZXJIb3N0aW5nTW9kZSh1aW50MzJfdCBvcGFxdWVMYXllckhvc3Rp bmdNb2RlKQogewogICAgIExheWVySG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5nTW9kZSA9IHN0YXRp Y19jYXN0PExheWVySG9zdGluZ01vZGU+KG9wYXF1ZUxheWVySG9zdGluZ01vZGUpOwotICAgIGlm IChsYXllckhvc3RpbmdNb2RlICE9IG1fbGF5ZXJIb3N0aW5nQ29udGV4dC0+bGF5ZXJIb3N0aW5n TW9kZSgpKSB7Ci0gICAgICAgIC8vIFRoZSBtb2RlIGhhcyBjaGFuZ2VkLgotICAgICAgICAKLSAg ICAgICAgLy8gRmlyc3QsIGludmFsaWRhdGUgdGhlIG9sZCBob3N0aW5nIGNvbnRleHQuCisgICAg aWYgKGxheWVySG9zdGluZ01vZGUgPT0gbV93ZWJQYWdlLT5sYXllckhvc3RpbmdNb2RlKCkpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fd2ViUGFnZS0+c2V0TGF5ZXJIb3N0aW5nTW9kZShsYXll ckhvc3RpbmdNb2RlKTsKKworICAgIHVwZGF0ZUxheWVySG9zdGluZ0NvbnRleHQoKTsKKworICAg IC8vIEZpbmFsbHksIGluZm9ybSB0aGUgVUlQcm9jZXNzIHRoYXQgdGhlIGNvbnRleHQgaGFzIGNo YW5nZWQuCisgICAgTGF5ZXJUcmVlQ29udGV4dCBsYXllclRyZWVDb250ZXh0OworICAgIGxheWVy VHJlZUNvbnRleHQuY29udGV4dElEID0gbV9sYXllckhvc3RpbmdDb250ZXh0LT5jb250ZXh0SUQo KTsKKyAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OlVwZGF0 ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKDAsIGxheWVyVHJlZUNvbnRleHQpKTsKK30KKwor dm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlTGF5ZXJIb3N0aW5nQ29u dGV4dCgpCit7CisgICAgLy8gSW52YWxpZGF0ZSB0aGUgb2xkIGNvbnRleHQuCisgICAgaWYgKG1f bGF5ZXJIb3N0aW5nQ29udGV4dCkgewogICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQtPmlu dmFsaWRhdGUoKTsKICAgICAgICAgbV9sYXllckhvc3RpbmdDb250ZXh0ID0gbnVsbHB0cjsKKyAg ICB9CiAKLSAgICAgICAgLy8gQ3JlYXRlIGEgbmV3IGNvbnRleHQgYW5kIHNldCBpdCB1cC4KLSAg ICAgICAgc3dpdGNoIChsYXllckhvc3RpbmdNb2RlKSB7Ci0gICAgICAgIGNhc2UgTGF5ZXJIb3N0 aW5nTW9kZURlZmF1bHQ6Ci0gICAgICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQgPSBMYXll ckhvc3RpbmdDb250ZXh0OjpjcmVhdGVGb3JQb3J0KFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbXBv c2l0aW5nUmVuZGVyU2VydmVyUG9ydCgpKTsKLSAgICAgICAgICAgIGJyZWFrOworICAgIC8vIENy ZWF0ZSBhIG5ldyBjb250ZXh0IGFuZCBzZXQgaXQgdXAuCisgICAgc3dpdGNoIChtX3dlYlBhZ2Ut PmxheWVySG9zdGluZ01vZGUoKSkgeworICAgIGNhc2UgTGF5ZXJIb3N0aW5nTW9kZURlZmF1bHQ6 CisgICAgICAgIG1fbGF5ZXJIb3N0aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRleHQ6OmNy ZWF0ZUZvclBvcnQoV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQ b3J0KCkpOworICAgICAgICBicmVhazsKICNpZiBIQVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9X X1NFUlZFUikKLSAgICAgICAgY2FzZSBMYXllckhvc3RpbmdNb2RlSW5XaW5kb3dTZXJ2ZXI6Ci0g ICAgICAgICAgICBtX2xheWVySG9zdGluZ0NvbnRleHQgPSBMYXllckhvc3RpbmdDb250ZXh0Ojpj cmVhdGVGb3JXaW5kb3dTZXJ2ZXIoKTsgICAgICAgIAotICAgICAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBMYXllckhvc3RpbmdNb2RlSW5XaW5kb3dTZXJ2ZXI6CisgICAgICAgIG1fbGF5ZXJIb3N0 aW5nQ29udGV4dCA9IExheWVySG9zdGluZ0NvbnRleHQ6OmNyZWF0ZUZvcldpbmRvd1NlcnZlcigp OworICAgICAgICBicmVhazsKICNlbmRpZgotICAgICAgICB9Ci0KLSAgICAgICAgbV9sYXllckhv c3RpbmdDb250ZXh0LT5zZXRSb290TGF5ZXIobV9yb290TGF5ZXIuZ2V0KCkpOwotCi0gICAgICAg IG1fd2ViUGFnZS0+c2V0TGF5ZXJIb3N0aW5nTW9kZShsYXllckhvc3RpbmdNb2RlKTsKLQotICAg ICAgICAvLyBGaW5hbGx5LCBpbmZvcm0gdGhlIFVJUHJvY2VzcyB0aGF0IHRoZSBjb250ZXh0IGhh cyBjaGFuZ2VkLgotICAgICAgICBMYXllclRyZWVDb250ZXh0IGxheWVyVHJlZUNvbnRleHQ7Ci0g ICAgICAgIGxheWVyVHJlZUNvbnRleHQuY29udGV4dElEID0gbV9sYXllckhvc3RpbmdDb250ZXh0 LT5jb250ZXh0SUQoKTsKLSAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5n QXJlYVByb3h5OjpVcGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgwLCBsYXllclRyZWVD b250ZXh0KSk7CiAgICAgfQorCisgICAgbV9sYXllckhvc3RpbmdDb250ZXh0LT5zZXRSb290TGF5 ZXIobV9yb290TGF5ZXIuZ2V0KCkpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihDQUxheWVyICpsYXllcikK