54907 2011-02-21 14:03:52 -0800 DrawingAreaProxyImpl should tell DrawingAreaImpl what sequence number to use 2011-02-21 14:22:00 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 51262 1 aroben aroben andersca oldest_to_newest 354795 0 aroben 2011-02-21 14:03:52 -0800 DrawingAreaProxyImpl should tell DrawingAreaImpl what sequence number to use 354796 1 83213 aroben 2011-02-21 14:06:04 -0800 Created attachment 83213 Patch 354802 2 aroben 2011-02-21 14:22:00 -0800 Committed r79251: <http://trac.webkit.org/changeset/79251> 83213 2011-02-21 14:06:04 -0800 2011-02-21 14:10:00 -0800 Patch bug-54907-20110221170807.patch text/plain 12432 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogNzkyMzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhNjY1OTE0YTYyNTg4MTZm YWIzNDdjMTk5MWQ2YTA4NjJmY2QwMzU5Li5iYzI3ZmJmMjI2MTdhNzFkOTQ2N2RmYTNhZDZlNmU3 NDQ0NzliN2M0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNzMgQEAKKzIwMTEtMDItMjEgIEFkYW0g Um9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgY29udHJvbCBvZiB0aGUg c2VxdWVuY2UgbnVtYmVyIGZyb20gRHJhd2luZ0FyZWFJbXBsIHRvIERyYXdpbmdBcmVhUHJveHlJ bXBsCisKKyAgICAgICAgRHJhd2luZ0FyZWFQcm94eUltcGwgaGFzIHNvbWUgc3RhdGUgdGhhdCwg d2hlbiBpdCBjaGFuZ2VzLCBjYXVzZXMgYWxsIG9wZXJhdGlvbnMgcGVyZm9ybWVkCisgICAgICAg IGJlZm9yZSB0aGF0IHN0YXRlIGNoYW5nZSB0byBiZWNvbWUgaW52YWxpZC4gV2hlbiBwYWludGlu Zywgd2UgbmVlZCB0byBoYXZlIHBlcmZvcm1lZCBhdAorICAgICAgICBsZWFzdCBvbmUgVXBkYXRl IGZvciB0aGUgbW9zdCByZWNlbnQgc3RhdGU7IG90aGVyd2lzZSwgd2UnbGwgYmUgcGFpbnRpbmcg b2xkL2luY29ycmVjdCBiaXRzCisgICAgICAgIGludG8gdGhlIHZpZXcuCisKKyAgICAgICAgQ3Vy cmVudGx5LCB0aGlzIHN0YXRlIGNvbnNpc3RzIG9mIGEgc2luZ2xlIHBpZWNlIG9mIGRhdGE6IHRo ZSB2aWV3J3Mgc2l6ZS4gV2hlbmV2ZXIgdGhlCisgICAgICAgIHN0YXRlIChpLmUuLCBzaXplKSBj aGFuZ2VzLCB3ZSB0ZWxsIHRoZSB3ZWIgcHJvY2VzcyB2aWEgdGhlIFNldFNpemUgbWVzc2FnZSwg YW5kIHRoZSB3ZWIKKyAgICAgICAgcHJvY2VzcyBsZXRzIHVzIGtub3cgdGhhdCBpdCBoYXMgdXBk YXRlZCB0byBtYXRjaCB0aGUgbmV3IHN0YXRlIChpLmUuLCBzaXplKSB2aWEgdGhlCisgICAgICAg IERpZFNldFNpemUgbWVzc2FnZS4KKworICAgICAgICBXaGVuIGl0J3MgdGltZSB0byBwYWludCwg aWYgd2UncmUgd2FpdGluZyBmb3IgdGhlIHdlYiBwcm9jZXNzIHRvIHVwZGF0ZSB0byBtYXRjaCBv dXIgY3VycmVudAorICAgICAgICBzdGF0ZSAoaS5lLiwgc2l6ZSksIHdlIGJsb2NrIGZvciBhIGxp dHRsZSB3aGlsZSBob3BpbmcgdG8gcmVjZWl2ZSBhIERpZFNldFNpemUgbWVzc2FnZSBzbworICAg ICAgICB0aGF0IHdlIGNhbiBwYWludCB1cC10by1kYXRlIGJpdHMgaW50byB0aGUgd2luZG93LiBU aGlzIGNhbiBjYXVzZSB1cyB0byByZWNlaXZlIG1lc3NhZ2VzCisgICAgICAgIG91dC1vZi1vcmRl cjsgdGhlIERpZFNldFNpemUgbWVzc2FnZSB3aWxsIGJlIHByb2Nlc3NlZCBpbW1lZGlhdGVseSwg YW5kIGFueSBtZXNzYWdlcyB0aGF0CisgICAgICAgIHdlcmUgc2VudCBiZWZvcmUgdGhlIERpZFNl dFNpemUgbWVzc2FnZSB3aWxsIGJlIHByb2Nlc3NlZCBsYXRlci4gU2luY2UgdGhlIG1lc3NhZ2Vz IGZyb20KKyAgICAgICAgYmVmb3JlIHRoZSBEaWRTZXRTaXplIG1lc3NhZ2UgY29ycmVzcG9uZCB0 byBhbiBvbGQgc3RhdGUgKGkuZS4sIHNpemUpLCB0aGV5IGFyZSBubyBsb25nZXIKKyAgICAgICAg dXNlZnVsIChlLmcuLCB0aGV5IGNvbnRhaW4gYml0cyBvZiB0aGUgcGFnZSB0aGF0IGFyZSBkcmF3 biBhdCB0aGUgd3Jvbmcgc2l6ZS9sb2NhdGlvbiksIHNvCisgICAgICAgIHdlIGRpc2NhcmQgdGhl bS4KKworICAgICAgICBUaGUgd2F5IHdlIGlkZW50aWZ5IGFuZCBkaXNjYXJkIHRoZXNlIG1lc3Nh Z2VzIGlzIGJ5IGtlZXBpbmcgdHJhY2sgb2YgYSBzZXF1ZW5jZSBudW1iZXIuCisgICAgICAgIEN1 cnJlbnRseSwgRHJhd2luZ0FyZWFJbXBsIHNlbmRzIGEgbW9ub3RvbmljYWxseS1pbmNyZWFzaW5n IHNlcXVlbmNlIG51bWJlciB0bworICAgICAgICBEcmF3aW5nQXJlYVByb3h5SW1wbCB3aXRoIGV2 ZXJ5IG1lc3NhZ2UuIFdoZW5ldmVyIERyYXdpbmdBcmVhUHJveHlJbXBsIHJlY2VpdmVzIGEgRGlk U2V0U2l6ZQorICAgICAgICBtZXNzYWdlLCBpdCByZWNvcmRzIHRoZSBzZXF1ZW5jZSBudW1iZXIg dGhhdCBjYW1lIGFsb25nIHdpdGggaXQuIElmIHdlIHRoZW4gbGF0ZXIgcmVjZWl2ZQorICAgICAg ICBhbnkgbWVzc2FnZXMgdGhhdCBoYXZlIGEgbG93ZXIgc2VxdWVuY2UgbnVtYmVyLCB3ZSBrbm93 IHRoZXkgY29ycmVzcG9uZCB0byBhbiBvbGQgc3RhdGUKKyAgICAgICAgKGkuZS4sIHNpemUpIGFu ZCBjYW4gZGlzY2FyZCB0aGVtLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbW92ZXMgY29udHJvbCBv ZiB0aGUgc2VxdWVuY2UgbnVtYmVyIHRvIERyYXdpbmdBcmVhUHJveHlJbXBsLgorICAgICAgICBE cmF3aW5nQXJlYVByb3h5SW1wbCBub3cgc2VuZHMgYSBtb25vdG9uaWNhbGx5LWluY3JlYXNpbmcg c2VxdWVuY2UgbnVtYmVyIGluIHRoZSBTZXRTaXplCisgICAgICAgIG1lc3NhZ2UuIERyYXdpbmdB cmVhSW1wbCByZWNvcmRzIHRoaXMgc2VxdWVuY2UgbnVtYmVyIHdoZW4gaXQgcmVjZWl2ZXMgdGhl IFNldFNpemUgbWVzc2FnZSwKKyAgICAgICAgYW5kIHNlbmRzIGl0IGJhY2sgdG8gRHJhd2luZ0Fy ZWFQcm94eUltcGwgaW4gZXZlcnkgbWVzc2FnZS4gT3RoZXJ3aXNlIHRoZSBsb2dpYyBpcyB0aGUg c2FtZQorICAgICAgICBhcyBiZWZvcmUuCisKKyAgICAgICAgVGhpcyBzaG91bGQgY2F1c2Ugbm8g Y2hhbmdlcyBpbiBiZWhhdmlvciwgYnV0IHdpbGwgYWxsb3cgRHJhd2luZ0FyZWFQcm94eUltcGwg dG8gcmVxdWVzdCBhCisgICAgICAgIGZ1bGwgYmFja2luZyBzdG9yZSB1cGRhdGUgKGJ5IGluY3Jl bWVudGluZyB0aGUgc2VxdWVuY2UgbnVtYmVyKSBhdCB0aW1lcyBvdGhlciB0aGFuIHdoZW4gdGhl CisgICAgICAgIHZpZXcncyBzaXplIGNoYW5nZXMgKGUuZy4sIGFmdGVyIGl0IGhhcyB0aHJvd24g YXdheSBpdHMgYmFja2luZyBzdG9yZSBpbiBvcmRlciB0byBzYXZlCisgICAgICAgIG1lbW9yeSku CisKKyAgICAgICAgRml4ZXMgPGh0dHA6Ly93ZWJraXQub3JnL2IvNTQ5MDc+IERyYXdpbmdBcmVh UHJveHlJbXBsIHNob3VsZCB0ZWxsIERyYXdpbmdBcmVhSW1wbCB3aGF0CisgICAgICAgIHNlcXVl bmNlIG51bWJlciB0byB1c2UKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OmdlbmVyYXRlU2VxdWVuY2VOdW1iZXIpOiBNb3ZlZCBoZXJlIGZyb20gRHJhd2lu Z0FyZWFJbXBsLmNwcC4KKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OnNl bmRTZXRTaXplKTogQ2hhbmdlZCB0byBwYXNzIGEgbmV3IHNlcXVlbmNlIG51bWJlciBpbiB0aGUK KyAgICAgICAgU2V0U2l6ZSBtZXNzYWdlLgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVBy b3h5SW1wbDo6d2FpdEZvckFuZERpc3BhdGNoRGlkU2V0U2l6ZSk6IEFkZGVkIGEgRklYTUUgYWJv dXQgYQorICAgICAgICBwb3RlbnRpYWwgaW1wcm92ZW1lbnQuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6 OnNldFNpemUpOiBVcGRhdGVkIHRvIG1hdGNoIHRoZSBtZXNzYWdlJ3MgbmV3IHBhcmFtZXRlcnMu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW46 IEFkZGVkIGEgc2VxdWVuY2VOdW1iZXIgcGFyYW1ldGVyIHRvIFNldFNpemUuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6RHJhd2luZ0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwpOiBJbml0aWFsaXplIG1fc2VxdWVu Y2VOdW1iZXIuCisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6c2V0U2l6ZSk6IFJl Y29yZCB0aGUgbmV3IHNlcXVlbmNlIG51bWJlciBmcm9tIHRoZSBVSSBwcm9jZXNzLgorCisgICAg ICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6bGF5ZXJIb3N0RGlkRmx1c2hMYXllcnMpOgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6ZGlzcGxheSk6Cisg ICAgICAgIFNlbmQgbV9zZXF1ZW5jZU51bWJlciwgaW5zdGVhZCBvZiBhIG5ldyBzZXF1ZW5jZSBu dW1iZXIsIGJhY2sgdG8gdGhlIFVJIHByb2Nlc3MuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmg6IEFkZGVkIG1fc2VxdWVuY2VOdW1iZXIsIHVwZGF0ZWQg c2V0U2l6ZSBmdW5jdGlvbiB0bworICAgICAgICBtYXRjaCB0aGUgYmFzZSBjbGFzcy4KKwogMjAx MS0wMi0yMSAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCBlOGI1YWUxMTYy ZjQ5Mjk1OTgyMzM5MzUzNDhlMjY5YzBiZTdmYWIwLi5kOTNlYjA5NzM0ODRmMjg4ZmMyNjI4OWU3 ODk4OTEwM2JlYjMwODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3 aW5nQXJlYVByb3h5SW1wbC5jcHAKQEAgLTQyLDYgKzQyLDEyIEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRl U2VxdWVuY2VOdW1iZXIoKQoreworICAgIHN0YXRpYyB1aW50NjRfdCBzZXF1ZW5jZU51bWJlcjsK KyAgICByZXR1cm4gKytzZXF1ZW5jZU51bWJlcjsKK30KKwogUGFzc093blB0cjxEcmF3aW5nQXJl YVByb3h5SW1wbD4gRHJhd2luZ0FyZWFQcm94eUltcGw6OmNyZWF0ZShXZWJQYWdlUHJveHkqIHdl YlBhZ2VQcm94eSkKIHsKICAgICByZXR1cm4gYWRvcHRQdHIobmV3IERyYXdpbmdBcmVhUHJveHlJ bXBsKHdlYlBhZ2VQcm94eSkpOwpAQCAtMjI4LDcgKzIzNCw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQ cm94eUltcGw6OnNlbmRTZXRTaXplKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9pc1dhaXRp bmdGb3JEaWRTZXRTaXplID0gdHJ1ZTsKLSAgICBtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0U2l6ZShtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0 KSwgbV93ZWJQYWdlUHJveHktPnBhZ2VJRCgpKTsKKyAgICBtX3dlYlBhZ2VQcm94eS0+cHJvY2Vz cygpLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0U2l6ZShnZW5lcmF0ZVNlcXVlbmNl TnVtYmVyKCksIG1fc2l6ZSwgbV9zY3JvbGxPZmZzZXQpLCBtX3dlYlBhZ2VQcm94eS0+cGFnZUlE KCkpOwogICAgIG1fc2Nyb2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCiAgICAgaWYgKCFtX2xheWVy VHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CkBAIC0yNDcsNiArMjUzLDExIEBAIHZvaWQgRHJhd2lu Z0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXNwYXRjaERpZFNldFNpemUoKQogICAgIGlmICht X3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5pc0xhdW5jaGluZygpKQogICAgICAgICByZXR1cm47 CiAgICAgCisgICAgLy8gRklYTUU6IHdhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5IHdpbGwg YWx3YXlzIHJldHVybiB0aGUgb2xkZXN0IERpZFNldFNpemUgbWVzc2FnZSB0aGF0CisgICAgLy8g aGFzbid0IHlldCBiZWVuIHByb2Nlc3NlZC4gQnV0IGl0IG1pZ2h0IGJlIGJldHRlciB0byBza2lw IGFoZWFkIHRvIHNvbWUgb3RoZXIgRGlkU2V0U2l6ZQorICAgIC8vIG1lc3NhZ2UsIGlmIG11bHRp cGxlIERpZFNldFNpemUgbWVzc2FnZXMgYXJlIHdhaXRpbmcgdG8gYmUgcHJvY2Vzc2VkLiBGb3Ig aW5zdGFuY2UsIHdlIGNvdWxkCisgICAgLy8gY2hvb3NlIHRoZSBtb3N0IHJlY2VudCBvbmUsIG9y IHRoZSBvbmUgdGhhdCBpcyBjbG9zZXN0IHRvIG91ciBjdXJyZW50IHNpemUuCisKICAgICAvLyBU aGUgdGltZW91dCwgaW4gc2Vjb25kcywgd2UgdXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRTZXRT aXplIG1lc3NhZ2Ugd2hlbiB3ZSdyZSBhc2tlZCB0byBwYWludC4KICAgICBzdGF0aWMgY29uc3Qg ZG91YmxlIGRpZFNldFNpemVUaW1lb3V0ID0gMC41OwogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9j ZXNzKCktPmNvbm5lY3Rpb24oKS0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2Fn ZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFNldFNpemU+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQo KSwgZGlkU2V0U2l6ZVRpbWVvdXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRleCBkZTI1NmI2NTBmYzA1NWUxOGJkYjBmYzQzNmI1ZDMz NjE3MThhYWJkLi42ODY3MjVlMTJmYjhhOTNiM2E0NGE5MTliMzkzZjA0NWU2OWVjOTBhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaApAQCAt ODUsNyArODUsNyBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIC8vIENvcmVJUEMgbWVzc2Fn ZSBoYW5kbGVycy4KICAgICAvLyBGSVhNRTogVGhlc2Ugc2hvdWxkIGJlIHB1cmUgdmlydHVhbC4K LSAgICB2aXJ0dWFsIHZvaWQgc2V0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplLCBj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpIHsgfQorICAgIHZpcnR1YWwgdm9p ZCBzZXRTaXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRTaXpl JiBzaXplLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpIHsgfQogICAgIHZp cnR1YWwgdm9pZCBkaWRVcGRhdGUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZFBhaW50 aW5nKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlc3VtZVBhaW50aW5nKCkgeyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2Fn ZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVz c2FnZXMuaW4KaW5kZXggZWMwOWUxOGM2MWNiMjRlZjdmYmExN2I1ZjE1YWQ1NDJjNWM1M2ZlMy4u MjFkMWJmYjY4ZDBjOTU2NTc0ZWI3N2FmNjVhMjczM2YzZmY5YTQ2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2VzLmluCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5tZXNzYWdl cy5pbgpAQCAtMjEsNyArMjEsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBtZXNzYWdlcyAtPiBEcmF3 aW5nQXJlYSB7Ci0gICAgU2V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUsIFdlYkNvcmU6Oklu dFNpemUgc2Nyb2xsT2Zmc2V0KQorICAgIFNldFNpemUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIs IFdlYkNvcmU6OkludFNpemUgc2l6ZSwgV2ViQ29yZTo6SW50U2l6ZSBzY3JvbGxPZmZzZXQpCiAg ICAgRGlkVXBkYXRlKCkKICAgICBTdXNwZW5kUGFpbnRpbmcoKQogICAgIFJlc3VtZVBhaW50aW5n KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5n QXJlYUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdB cmVhSW1wbC5jcHAKaW5kZXggZjJmMWMwMDIxOTJlYzY4MDNjMTM4MjI1MzY1ODQ2ODM0MmMzNmY0 MS4uMzM5NzE4OTdjMjliYjIwMzA3N2QxMDBmNTA1ZDBhYzU2ZDZhZjNlYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAK QEAgLTQ1LDEyICs0NSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKQotewot ICAgIHN0YXRpYyB1aW50NjRfdCBzZXF1ZW5jZU51bWJlcjsKLSAgICByZXR1cm4gKytzZXF1ZW5j ZU51bWJlcjsKLX0KLQogUGFzc1JlZlB0cjxEcmF3aW5nQXJlYUltcGw+IERyYXdpbmdBcmVhSW1w bDo6Y3JlYXRlKFdlYlBhZ2UqIHdlYlBhZ2UsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmIHBhcmFtZXRlcnMpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBEcmF3aW5nQXJlYUlt cGwod2ViUGFnZSwgcGFyYW1ldGVycykpOwpAQCAtNjQsNiArNTgsNyBAQCBEcmF3aW5nQXJlYUlt cGw6On5EcmF3aW5nQXJlYUltcGwoKQogCiBEcmF3aW5nQXJlYUltcGw6OkRyYXdpbmdBcmVhSW1w bChXZWJQYWdlKiB3ZWJQYWdlLCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJh bWV0ZXJzKQogICAgIDogRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFJbmZvOjpJbXBsLCBwYXJhbWV0 ZXJzLmRyYXdpbmdBcmVhSW5mby5pZGVudGlmaWVyLCB3ZWJQYWdlKQorICAgICwgbV9zZXF1ZW5j ZU51bWJlcigwKQogICAgICwgbV9pblNldFNpemUoZmFsc2UpCiAgICAgLCBtX2lzV2FpdGluZ0Zv ckRpZFVwZGF0ZShmYWxzZSkKICAgICAsIG1faXNQYWludGluZ1N1c3BlbmRlZCghcGFyYW1ldGVy cy5pc1Zpc2libGUpCkBAIC0xOTQsNyArMTg5LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6Omxh eWVySG9zdERpZEZsdXNoTGF5ZXJzKCkKICAgICBpZiAoIW1fbGF5ZXJUcmVlSG9zdCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVBy b3h5OjpFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGdlbmVyYXRlU2VxdWVuY2VOdW1i ZXIoKSwgbV9sYXllclRyZWVIb3N0LT5sYXllclRyZWVDb250ZXh0KCkpKTsKKyAgICBtX3dlYlBh Z2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUobV9zZXF1ZW5jZU51bWJlciwgbV9sYXllclRyZWVIb3N0LT5sYXllclRyZWVD b250ZXh0KCkpKTsKIH0KIAogdm9pZCBEcmF3aW5nQXJlYUltcGw6OmF0dGFjaENvbXBvc2l0aW5n Q29udGV4dCgpCkBAIC0yNDgsMTEgKzI0MywxNCBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6ZGlk UmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRAog ewogfQogCi12b2lkIERyYXdpbmdBcmVhSW1wbDo6c2V0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRT aXplJiBzaXplLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpCit2b2lkIERy YXdpbmdBcmVhSW1wbDo6c2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29uc3QgV2Vi Q29yZTo6SW50U2l6ZSYgc2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0 KQogewogICAgIEFTU0VSVCghbV9pblNldFNpemUpOwogICAgIG1faW5TZXRTaXplID0gdHJ1ZTsK IAorICAgIEFTU0VSVF9BUkcoc2VxdWVuY2VOdW1iZXIsIHNlcXVlbmNlTnVtYmVyID4gbV9zZXF1 ZW5jZU51bWJlcik7CisgICAgbV9zZXF1ZW5jZU51bWJlciA9IHNlcXVlbmNlTnVtYmVyOworCiAg ICAgLy8gU2V0IHRoaXMgdG8gZmFsc2Ugc2luY2Ugd2UncmUgYWJvdXQgdG8gY2FsbCBkaXNwbGF5 KCkuCiAgICAgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGUgPSBmYWxzZTsKIApAQCAtMjc4LDcgKzI3 Niw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHNpemUsIGNvbnN0IFdlYkNvcmU6OkludFNpCiAgICAgICAgIEFTU0VSVCghbV9sYXllclRy ZWVIb3N0KTsKICAgICB9CiAKLSAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdB cmVhUHJveHk6OkRpZFNldFNpemUoZ2VuZXJhdGVTZXF1ZW5jZU51bWJlcigpLCB1cGRhdGVJbmZv LCBsYXllclRyZWVDb250ZXh0KSk7CisgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3 aW5nQXJlYVByb3h5OjpEaWRTZXRTaXplKG1fc2VxdWVuY2VOdW1iZXIsIHVwZGF0ZUluZm8sIGxh eWVyVHJlZUNvbnRleHQpKTsKIAogICAgIG1faW5TZXRTaXplID0gZmFsc2U7CiB9CkBAIC0zNjAs NyArMzU4LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSgpCiAgICAgLy8gU2VuZCBhbG9uZyBhIGNvbXBsZXRlIHVwZGF0ZSBvZiB0aGUgcGFn ZSBzbyB3ZSBjYW4gcGFpbnQgdGhlIGNvbnRlbnRzIHJpZ2h0IGFmdGVyIHdlIGV4aXQgdGhlCiAg ICAgLy8gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZSwgZWxpbWluaWF0aW5nIGZsaWNrZXIu CiAgICAgaWYgKCFtX2luU2V0U2l6ZSkKLSAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2Vz OjpEcmF3aW5nQXJlYVByb3h5OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoZ2VuZXJh dGVTZXF1ZW5jZU51bWJlcigpLCB1cGRhdGVJbmZvKSk7CisgICAgICAgIG1fd2ViUGFnZS0+c2Vu ZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKG1fc2VxdWVuY2VOdW1iZXIsIHVwZGF0ZUluZm8pKTsKIH0KIAogdm9pZCBEcmF3aW5nQXJl YUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVNvb24oKQpAQCAtNDA4LDcgKzQw Niw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5KCkKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6 VXBkYXRlKGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKSwgdXBkYXRlSW5mbykpOworICAgIG1fd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6VXBkYXRlKG1fc2VxdWVuY2VO dW1iZXIsIHVwZGF0ZUluZm8pKTsKICAgICBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZSA9IHRydWU7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3 aW5nQXJlYUltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5n QXJlYUltcGwuaAppbmRleCBjN2ViNzYzMDAxZDU5MDJkMGFmZWVlYjhhZmNjYzdiY2YxNmYxMmVk Li4yNjI1ZDdlMDExMmEzYWUyZjI0ZmFjNGE5M2Y2MjVlODBjOWIyODUyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCkBAIC02 Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdl KENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciopOwogCiAgICAgLy8gQ29yZUlQQyBtZXNzYWdlIGhhbmRsZXJzLgotICAgIHZp cnR1YWwgdm9pZCBzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmLCBjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpOworICAgIHZpcnR1YWwgdm9pZCBzZXRTaXplKHVpbnQ2 NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgY29uc3QgV2ViQ29y ZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkVXBkYXRlKCk7 CiAgICAgdmlydHVhbCB2b2lkIHN1c3BlbmRQYWludGluZygpOwogICAgIHZpcnR1YWwgdm9pZCBy ZXN1bWVQYWludGluZygpOwpAQCAtNzUsNiArNzUsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlz cGxheSgpOwogICAgIHZvaWQgZGlzcGxheShVcGRhdGVJbmZvJik7CiAKKyAgICB1aW50NjRfdCBt X3NlcXVlbmNlTnVtYmVyOworCiAgICAgUmVnaW9uIG1fZGlydHlSZWdpb247CiAgICAgV2ViQ29y ZTo6SW50UmVjdCBtX3Njcm9sbFJlY3Q7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX3Njcm9sbE9m ZnNldDsK