64365 2011-07-12 09:22:59 -0700 TiledDrawingArea: Handle update requests in the order they were received. 2011-08-02 10:01:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte benjamin oldest_to_newest 435691 0 jturcotte 2011-07-12 09:22:59 -0700 TiledDrawingArea: Handle update requests in the order they were received. 435693 1 100497 jturcotte 2011-07-12 09:25:29 -0700 Created attachment 100497 Patch 442379 2 100497 kling 2011-07-26 11:09:19 -0700 Comment on attachment 100497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100497&action=review Looks good, but let's clean it up a bit. > Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp:181 > + for (UpdateList::iterator it = m_pendingUpdates.begin(); it != m_pendingUpdates.end(); ++it) { Keep the end() iterator in a separate variable for micro-optimization goodness. > Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp:196 > + for (UpdateList::iterator it = m_pendingUpdates.begin(); it != m_pendingUpdates.end(); ++it) { Ditto. > Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp:200 > + found = true; > + break; Simply return; here, and you won't even need the "found" variable. 443964 3 102369 jturcotte 2011-07-29 08:53:57 -0700 Created attachment 102369 Patch Suggestions proudly fulfilled. 444548 4 102369 kling 2011-08-01 00:14:41 -0700 Comment on attachment 102369 Patch r=me! 445328 5 jturcotte 2011-08-02 10:01:37 -0700 Committed r92198: <http://trac.webkit.org/changeset/92198> 100497 2011-07-12 09:25:29 -0700 2011-07-29 08:53:51 -0700 Patch bug-64365-20110712182527.patch text/plain 4835 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA2MmU0Y2Q3MDNhYThhZjY2 YzlkMThjNzJmOWVhYjY1MWE1NmY5NWY4Li4yYzRlNGM2NDlmYmVjYmFhYTg3MzIzZDVjOTI1M2Iw YTBjZGQ3OWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEtMDctMTIgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAorICAgICAgICBUaWxl ZERyYXdpbmdBcmVhOiBIYW5kbGUgdXBkYXRlIHJlcXVlc3RzIGluIHRoZSBvcmRlciB0aGV5IHdl cmUgcmVjZWl2ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NDM2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlVGlsZXMoKSB1c2VzIHRoZSBkaXN0YW5j ZSBvZiB0aGUgdGlsZSB0byB0aGUKKyAgICAgICAgY2VudGVyIG9mIHRoZSB2aWV3cG9ydCB0byBk ZWNpZGUgd2hpY2ggdGlsZXMgc2hvdWxkIGJlIHJlbmRlcmVkIGZpcnN0LgorICAgICAgICBUaGlz IGxvZ2ljIGlzIHVzZWxlc3MgaWYgdGhlIHJlcXVlc3RzIGFyZSBub3QgaGFuZGxlZCBpbiB0aGUg b3JkZXIgdGhhdAorICAgICAgICB0aGV5IHdlcmUgcmVjZWl2ZWQuCisgICAgICAgIE5vdyB1c2Ug YSBsaXN0IGluc3RlYWQgb2YgYSBtYXAgdG8gaG9sZCBwZW5kaW5nIHRpbGUgdXBkYXRlIHJlcXVl c3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuY3Bw OgorICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhOjp0aWxlVXBkYXRlVGltZXJGaXJl ZCk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWE6OmNhbmNlbFRpbGVVcGRhdGUp OgorICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhOjpyZXF1ZXN0VGlsZVVwZGF0ZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaDoKKworMjAx MS0wNy0xMiAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgor CiAgICAgICAgIFtRdF0gRm9yd2FyZCB0aGUgdG91Y2ggdmlldyBzY2FsZSBjaGFuZ2VzIHRvIHRo ZSB0aWxlZCBkcmF3aW5nIGFyZWEuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NDM1NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHAKaW5kZXggMjYzNzM2NDJkY2Y1MDQ5ZWQ0 MmQxNzk4MmRlMmU2ZmVjZmM4ZmYxMS4uMjExNmVlNmM2NWQ3ZjFjODUyMWNiYmJjMDA3MzQ4ODlm ZDJlZDY3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1Rp bGVkRHJhd2luZ0FyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9UaWxlZERyYXdpbmdBcmVhLmNwcApAQCAtMTY1LDExICsxNjUsMTAgQEAgdm9pZCBUaWxlZERy YXdpbmdBcmVhOjp0aWxlVXBkYXRlVGltZXJGaXJlZCgpCiB7CiAgICAgQVNTRVJUKCFtX3BlbmRp bmdVcGRhdGVzLmlzRW1wdHkoKSk7CiAKLSAgICBVcGRhdGVNYXA6Oml0ZXJhdG9yIGl0ID0gbV9w ZW5kaW5nVXBkYXRlcy5iZWdpbigpOwotICAgIFRpbGVVcGRhdGUgdXBkYXRlID0gaXQtPnNlY29u ZDsKLSAgICBtX3BlbmRpbmdVcGRhdGVzLnJlbW92ZShpdCk7CisgICAgT3duUHRyPFRpbGVVcGRh dGU+IHVwZGF0ZSA9IG1fcGVuZGluZ1VwZGF0ZXMuZmlyc3QoKS5yZWxlYXNlKCk7CisgICAgbV9w ZW5kaW5nVXBkYXRlcy5yZW1vdmVGaXJzdCgpOwogCi0gICAgdXBkYXRlVGlsZSh1cGRhdGUudGls ZUlELCB1cGRhdGUuZGlydHlSZWN0LCB1cGRhdGUuc2NhbGUpOworICAgIHVwZGF0ZVRpbGUodXBk YXRlLT50aWxlSUQsIHVwZGF0ZS0+ZGlydHlSZWN0LCB1cGRhdGUtPnNjYWxlKTsKIAogICAgIGlm IChtX3BlbmRpbmdVcGRhdGVzLmlzRW1wdHkoKSkKICAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1l c3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpBbGxUaWxlVXBkYXRlc1Byb2Nlc3NlZCgpKTsKQEAg LTE3OSwxMCArMTc4LDEyIEBAIHZvaWQgVGlsZWREcmF3aW5nQXJlYTo6dGlsZVVwZGF0ZVRpbWVy RmlyZWQoKQogCiB2b2lkIFRpbGVkRHJhd2luZ0FyZWE6OmNhbmNlbFRpbGVVcGRhdGUoaW50IHRp bGVJRCkKIHsKLSAgICBVcGRhdGVNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nVXBkYXRlcy5m aW5kKHRpbGVJRCk7Ci0gICAgaWYgKGl0ID09IG1fcGVuZGluZ1VwZGF0ZXMuZW5kKCkpCi0gICAg ICAgIHJldHVybjsKLSAgICBtX3BlbmRpbmdVcGRhdGVzLnJlbW92ZShpdCk7CisgICAgZm9yIChV cGRhdGVMaXN0OjppdGVyYXRvciBpdCA9IG1fcGVuZGluZ1VwZGF0ZXMuYmVnaW4oKTsgaXQgIT0g bV9wZW5kaW5nVXBkYXRlcy5lbmQoKTsgKytpdCkgeworICAgICAgICBpZiAoKCppdCktPnRpbGVJ RCA9PSB0aWxlSUQpIHsKKyAgICAgICAgICAgIG1fcGVuZGluZ1VwZGF0ZXMucmVtb3ZlKGl0KTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQogICAgIGlmIChtX3BlbmRpbmdV cGRhdGVzLmlzRW1wdHkoKSkgewogICAgICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRy YXdpbmdBcmVhUHJveHk6OkFsbFRpbGVVcGRhdGVzUHJvY2Vzc2VkKCkpOwogICAgICAgICBtX3Rp bGVVcGRhdGVUaW1lci5zdG9wKCk7CkBAIC0xOTEsMTUgKzE5MiwyMCBAQCB2b2lkIFRpbGVkRHJh d2luZ0FyZWE6OmNhbmNlbFRpbGVVcGRhdGUoaW50IHRpbGVJRCkKIAogdm9pZCBUaWxlZERyYXdp bmdBcmVhOjpyZXF1ZXN0VGlsZVVwZGF0ZShpbnQgdGlsZUlELCBjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiBkaXJ0eVJlY3QsIGZsb2F0IHNjYWxlKQogewotICAgIFVwZGF0ZU1hcDo6aXRlcmF0b3Ig aXQgPSBtX3BlbmRpbmdVcGRhdGVzLmZpbmQodGlsZUlEKTsKLSAgICBpZiAoaXQgIT0gbV9wZW5k aW5nVXBkYXRlcy5lbmQoKSkKLSAgICAgICAgaXQtPnNlY29uZC5kaXJ0eVJlY3QudW5pdGUoZGly dHlSZWN0KTsKLSAgICBlbHNlIHsKLSAgICAgICAgVGlsZVVwZGF0ZSB1cGRhdGU7Ci0gICAgICAg IHVwZGF0ZS50aWxlSUQgPSB0aWxlSUQ7Ci0gICAgICAgIHVwZGF0ZS5kaXJ0eVJlY3QgPSBkaXJ0 eVJlY3Q7Ci0gICAgICAgIHVwZGF0ZS5zY2FsZSA9IHNjYWxlOwotICAgICAgICBtX3BlbmRpbmdV cGRhdGVzLmFkZCh0aWxlSUQsIHVwZGF0ZSk7CisgICAgYm9vbCBmb3VuZCA9IGZhbHNlOworICAg IGZvciAoVXBkYXRlTGlzdDo6aXRlcmF0b3IgaXQgPSBtX3BlbmRpbmdVcGRhdGVzLmJlZ2luKCk7 IGl0ICE9IG1fcGVuZGluZ1VwZGF0ZXMuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgaWYgKCgqaXQp LT50aWxlSUQgPT0gdGlsZUlEKSB7CisgICAgICAgICAgICAoKml0KS0+ZGlydHlSZWN0LnVuaXRl KGRpcnR5UmVjdCk7CisgICAgICAgICAgICBmb3VuZCA9IHRydWU7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQorICAgIH0KKyAgICBpZiAoIWZvdW5kKSB7CisgICAgICAgIE93blB0cjxU aWxlVXBkYXRlPiB1cGRhdGUoYWRvcHRQdHIobmV3IFRpbGVVcGRhdGUpKTsKKyAgICAgICAgdXBk YXRlLT50aWxlSUQgPSB0aWxlSUQ7CisgICAgICAgIHVwZGF0ZS0+ZGlydHlSZWN0ID0gZGlydHlS ZWN0OworICAgICAgICB1cGRhdGUtPnNjYWxlID0gc2NhbGU7CisgICAgICAgIG1fcGVuZGluZ1Vw ZGF0ZXMuYXBwZW5kKHVwZGF0ZS5yZWxlYXNlKCkpOwogICAgICAgICBzY2hlZHVsZVRpbGVVcGRh dGUoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1RpbGVkRHJhd2luZ0FyZWEuaAppbmRleCAxZjkwMzJiMWFlZGE3MDA0NDllZDliMjU3NzY4 ZWExNTE2NjQ5ZTI3Li5mMTBmODhhYTZkYWJhMTRhNzJiMTgwNTc5ZWJmYzZjMjc2OTRlN2U2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5n QXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdp bmdBcmVhLmgKQEAgLTMxLDcgKzMxLDcgQEAKICNpbmNsdWRlICJEcmF3aW5nQXJlYS5oIgogI2lu Y2x1ZGUgIlJ1bkxvb3AuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KLSNpbmNsdWRl IDx3dGYvVmVjdG9yLmg+CisjaW5jbHVkZSA8d3RmL0RlcXVlLmg+CiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCkBAIC04Myw4ICs4Myw4IEBAIHByaXZhdGU6CiAgICAgICAgIFdlYkNvcmU6OkludFJl Y3QgZGlydHlSZWN0OwogICAgICAgICBmbG9hdCBzY2FsZTsKICAgICB9OwotICAgIHR5cGVkZWYg SGFzaE1hcDxpbnQsIFRpbGVVcGRhdGU+IFVwZGF0ZU1hcDsKLSAgICBVcGRhdGVNYXAgbV9wZW5k aW5nVXBkYXRlczsKKyAgICB0eXBlZGVmIERlcXVlPE93blB0cjxUaWxlVXBkYXRlPiA+IFVwZGF0 ZUxpc3Q7CisgICAgVXBkYXRlTGlzdCBtX3BlbmRpbmdVcGRhdGVzOwogICAgIFJ1bkxvb3A6OlRp bWVyPFRpbGVkRHJhd2luZ0FyZWE+IG1fdGlsZVVwZGF0ZVRpbWVyOwogfTsKIAo= 102369 2011-07-29 08:53:57 -0700 2011-08-01 00:14:41 -0700 Patch bug-64365-20110729175356.patch text/plain 4812 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTE5OTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0NTM3ZDUzMzcwODc1ZDEx NWE2ZjZiYzZmODIzMDEzYmVlYWZiNjE0Li5iYWUzZDk4YTAwMTZmODkyNDZhOTZjN2Y2OGQ2Y2Yz NjgyNDNmYThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTIgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBUaWxl ZERyYXdpbmdBcmVhOiBIYW5kbGUgdXBkYXRlIHJlcXVlc3RzIGluIHRoZSBvcmRlciB0aGV5IHdl cmUgcmVjZWl2ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NDM2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlVGlsZXMoKSB1c2VzIHRoZSBkaXN0YW5j ZSBvZiB0aWxlcyB0byB0aGUKKyAgICAgICAgY2VudGVyIG9mIHRoZSB2aWV3cG9ydCB0byBkZWNp ZGUgd2hpY2ggdGlsZSBzaG91bGQgYmUgcmVuZGVyZWQgZmlyc3QuCisgICAgICAgIFRoaXMgbG9n aWMgaXMgdXNlbGVzcyBpZiB0aGUgcmVxdWVzdHMgYXJlIG5vdCBoYW5kbGVkIGluIHRoZSBzYW1l IG9yZGVyCisgICAgICAgIGFzIHRoZXkgd2VyZSByZWNlaXZlZC4KKyAgICAgICAgTm93IHVzZSBh IGxpc3QgaW5zdGVhZCBvZiBhIG1hcCB0byBob2xkIHBlbmRpbmcgdGlsZSB1cGRhdGUgcmVxdWVz dHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWE6OnRpbGVVcGRhdGVUaW1lckZpcmVk KToKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYTo6Y2FuY2VsVGlsZVVwZGF0ZSk6 CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWE6OnJlcXVlc3RUaWxlVXBkYXRlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5oOgorCiAyMDEx LTA3LTI5ICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAK ICAgICAgICAgRml4IHRoZSBRVG91Y2hXZWJWaWV3IGluIGRlYnVnIHNlZ2ZhdWx0IG9uIHNodXRk b3duIGludHJvZHVjZWQgaW4gOTE5NzkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHAKaW5kZXggMjYzNzM2NDJkY2Y1MDQ5 ZWQ0MmQxNzk4MmRlMmU2ZmVjZmM4ZmYxMS4uZDQwMmM1MDA3OGU4NGZkZmU5ZmVhZjgwNzIzMjcw ZTgzYzBiMTg5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1RpbGVkRHJhd2luZ0FyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9UaWxlZERyYXdpbmdBcmVhLmNwcApAQCAtMTY1LDExICsxNjUsMTAgQEAgdm9pZCBUaWxl ZERyYXdpbmdBcmVhOjp0aWxlVXBkYXRlVGltZXJGaXJlZCgpCiB7CiAgICAgQVNTRVJUKCFtX3Bl bmRpbmdVcGRhdGVzLmlzRW1wdHkoKSk7CiAKLSAgICBVcGRhdGVNYXA6Oml0ZXJhdG9yIGl0ID0g bV9wZW5kaW5nVXBkYXRlcy5iZWdpbigpOwotICAgIFRpbGVVcGRhdGUgdXBkYXRlID0gaXQtPnNl Y29uZDsKLSAgICBtX3BlbmRpbmdVcGRhdGVzLnJlbW92ZShpdCk7CisgICAgT3duUHRyPFRpbGVV cGRhdGU+IHVwZGF0ZSA9IG1fcGVuZGluZ1VwZGF0ZXMuZmlyc3QoKS5yZWxlYXNlKCk7CisgICAg bV9wZW5kaW5nVXBkYXRlcy5yZW1vdmVGaXJzdCgpOwogCi0gICAgdXBkYXRlVGlsZSh1cGRhdGUu dGlsZUlELCB1cGRhdGUuZGlydHlSZWN0LCB1cGRhdGUuc2NhbGUpOworICAgIHVwZGF0ZVRpbGUo dXBkYXRlLT50aWxlSUQsIHVwZGF0ZS0+ZGlydHlSZWN0LCB1cGRhdGUtPnNjYWxlKTsKIAogICAg IGlmIChtX3BlbmRpbmdVcGRhdGVzLmlzRW1wdHkoKSkKICAgICAgICAgbV93ZWJQYWdlLT5zZW5k KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpBbGxUaWxlVXBkYXRlc1Byb2Nlc3NlZCgpKTsK QEAgLTE3OSwxMCArMTc4LDEzIEBAIHZvaWQgVGlsZWREcmF3aW5nQXJlYTo6dGlsZVVwZGF0ZVRp bWVyRmlyZWQoKQogCiB2b2lkIFRpbGVkRHJhd2luZ0FyZWE6OmNhbmNlbFRpbGVVcGRhdGUoaW50 IHRpbGVJRCkKIHsKLSAgICBVcGRhdGVNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nVXBkYXRl cy5maW5kKHRpbGVJRCk7Ci0gICAgaWYgKGl0ID09IG1fcGVuZGluZ1VwZGF0ZXMuZW5kKCkpCi0g ICAgICAgIHJldHVybjsKLSAgICBtX3BlbmRpbmdVcGRhdGVzLnJlbW92ZShpdCk7CisgICAgVXBk YXRlTGlzdDo6aXRlcmF0b3IgZW5kID0gbV9wZW5kaW5nVXBkYXRlcy5lbmQoKTsKKyAgICBmb3Ig KFVwZGF0ZUxpc3Q6Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nVXBkYXRlcy5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKKyAgICAgICAgaWYgKCgqaXQpLT50aWxlSUQgPT0gdGlsZUlEKSB7Cisg ICAgICAgICAgICBtX3BlbmRpbmdVcGRhdGVzLnJlbW92ZShpdCk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQorICAgIH0KICAgICBpZiAobV9wZW5kaW5nVXBkYXRlcy5pc0VtcHR5KCkp IHsKICAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpB bGxUaWxlVXBkYXRlc1Byb2Nlc3NlZCgpKTsKICAgICAgICAgbV90aWxlVXBkYXRlVGltZXIuc3Rv cCgpOwpAQCAtMTkxLDE3ICsxOTMsMjAgQEAgdm9pZCBUaWxlZERyYXdpbmdBcmVhOjpjYW5jZWxU aWxlVXBkYXRlKGludCB0aWxlSUQpCiAKIHZvaWQgVGlsZWREcmF3aW5nQXJlYTo6cmVxdWVzdFRp bGVVcGRhdGUoaW50IHRpbGVJRCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlSZWN0LCBm bG9hdCBzY2FsZSkKIHsKLSAgICBVcGRhdGVNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nVXBk YXRlcy5maW5kKHRpbGVJRCk7Ci0gICAgaWYgKGl0ICE9IG1fcGVuZGluZ1VwZGF0ZXMuZW5kKCkp Ci0gICAgICAgIGl0LT5zZWNvbmQuZGlydHlSZWN0LnVuaXRlKGRpcnR5UmVjdCk7Ci0gICAgZWxz ZSB7Ci0gICAgICAgIFRpbGVVcGRhdGUgdXBkYXRlOwotICAgICAgICB1cGRhdGUudGlsZUlEID0g dGlsZUlEOwotICAgICAgICB1cGRhdGUuZGlydHlSZWN0ID0gZGlydHlSZWN0OwotICAgICAgICB1 cGRhdGUuc2NhbGUgPSBzY2FsZTsKLSAgICAgICAgbV9wZW5kaW5nVXBkYXRlcy5hZGQodGlsZUlE LCB1cGRhdGUpOwotICAgICAgICBzY2hlZHVsZVRpbGVVcGRhdGUoKTsKKyAgICBVcGRhdGVMaXN0 OjppdGVyYXRvciBlbmQgPSBtX3BlbmRpbmdVcGRhdGVzLmVuZCgpOworICAgIGZvciAoVXBkYXRl TGlzdDo6aXRlcmF0b3IgaXQgPSBtX3BlbmRpbmdVcGRhdGVzLmJlZ2luKCk7IGl0ICE9IGVuZDsg KytpdCkgeworICAgICAgICBpZiAoKCppdCktPnRpbGVJRCA9PSB0aWxlSUQpIHsKKyAgICAgICAg ICAgICgqaXQpLT5kaXJ0eVJlY3QudW5pdGUoZGlydHlSZWN0KTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQogICAgIH0KKworICAgIE93blB0cjxUaWxlVXBkYXRlPiB1cGRhdGUoYWRv cHRQdHIobmV3IFRpbGVVcGRhdGUpKTsKKyAgICB1cGRhdGUtPnRpbGVJRCA9IHRpbGVJRDsKKyAg ICB1cGRhdGUtPmRpcnR5UmVjdCA9IGRpcnR5UmVjdDsKKyAgICB1cGRhdGUtPnNjYWxlID0gc2Nh bGU7CisgICAgbV9wZW5kaW5nVXBkYXRlcy5hcHBlbmQodXBkYXRlLnJlbGVhc2UoKSk7CisgICAg c2NoZWR1bGVUaWxlVXBkYXRlKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEu aCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdpbmdBcmVhLmgK aW5kZXggMWY5MDMyYjFhZWRhNzAwNDQ5ZWQ5YjI1Nzc2OGVhMTUxNjY0OWUyNy4uZjEwZjg4YWE2 ZGFiYTE0YTcyYjE4MDU3OWViZmM2YzI3Njk0ZTdlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5oCkBAIC0zMSw3ICszMSw3 IEBACiAjaW5jbHVkZSAiRHJhd2luZ0FyZWEuaCIKICNpbmNsdWRlICJSdW5Mb29wLmgiCiAjaW5j bHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgorI2luY2x1 ZGUgPHd0Zi9EZXF1ZS5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtODMsOCArODMsOCBA QCBwcml2YXRlOgogICAgICAgICBXZWJDb3JlOjpJbnRSZWN0IGRpcnR5UmVjdDsKICAgICAgICAg ZmxvYXQgc2NhbGU7CiAgICAgfTsKLSAgICB0eXBlZGVmIEhhc2hNYXA8aW50LCBUaWxlVXBkYXRl PiBVcGRhdGVNYXA7Ci0gICAgVXBkYXRlTWFwIG1fcGVuZGluZ1VwZGF0ZXM7CisgICAgdHlwZWRl ZiBEZXF1ZTxPd25QdHI8VGlsZVVwZGF0ZT4gPiBVcGRhdGVMaXN0OworICAgIFVwZGF0ZUxpc3Qg bV9wZW5kaW5nVXBkYXRlczsKICAgICBSdW5Mb29wOjpUaW1lcjxUaWxlZERyYXdpbmdBcmVhPiBt X3RpbGVVcGRhdGVUaW1lcjsKIH07CiAK