94544 2012-08-20 16:22:29 -0700 [chromium] REGRESSION(126076) Should not touch old GraphicsLayerChromium::m_contentsLayer when setting up a new contents layer 2012-08-20 17:06:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth cc-bugs dglazkov enne fishd kbalazs tkent+wkapi webkit.review.bot zmo oldest_to_newest 700138 0 jamesr 2012-08-20 16:22:29 -0700 [chromium] REGRESSION(126076) Should not touch old GraphicsLayerChromium::m_contentsLayer when setting up a new contents layer 700139 1 159556 jamesr 2012-08-20 16:23:48 -0700 Created attachment 159556 Patch 700140 2 jamesr 2012-08-20 16:24:44 -0700 This is caught by gpu_tests:GPUCrashTest.WebkitLoseContext on the GPU waterfall. I'm not yet sure why there are no layout tests that catch this, the test catches the issue when run in chromium without any automation hooks. 700141 3 159557 jamesr 2012-08-20 16:25:11 -0700 Created attachment 159557 Patch 700145 4 159557 jamesr 2012-08-20 16:26:17 -0700 Comment on attachment 159557 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159557&action=review This relies on setupContentsLayer() being called before any setters that touch the m_contentsLayer's properties are set, which appears to be the case. If this isn't safe enough for us we could introduce a refcounted wrapper in between the layers and GLC. > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:-771 > - if (contentsLayer == m_contentsLayer) this is also bogus, GraphicsLayerChromium does not have ownership of m_contentsLayer so it could be deallocated and a new layer allocated at the same address 700197 5 159563 jamesr 2012-08-20 17:00:48 -0700 Created attachment 159563 Patch 700202 6 159563 enne 2012-08-20 17:03:33 -0700 Comment on attachment 159563 Patch R=me. Sounds good to me. 700203 7 webkit.review.bot 2012-08-20 17:04:53 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 700206 8 jamesr 2012-08-20 17:06:41 -0700 Committed r126099: <http://trac.webkit.org/changeset/126099> 159556 2012-08-20 16:23:48 -0700 2012-08-20 16:25:08 -0700 Patch bug-94544-20120820162308.patch text/plain 1799 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjIzMGYzNjRjMzczZmZj MDIyYTYyMTUwNjIxZDZjOTNhMWQ1Y2ZmOC4uMzhkMTk2ODU3MDUyZWFhMjJkNDJlNDUzZmJiNjk3 ODQ1NDM1OGExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTIwICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKDEyNjA3NikgU2hvdWxkIG5vdCB0b3VjaCBvbGQgR3JhcGhpY3NMYXllckNocm9t aXVtOjptX2NvbnRlbnRzTGF5ZXIgd2hlbiBzZXR0aW5nIHVwIGEgbmV3IGNvbnRlbnRzIGxheWVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDU0NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNz TGF5ZXJDaHJvbWl1bSBvbmx5IGtlZXBzIGEgd2VhayBwb2ludGVyIHRvIGl0cyBtX2NvbnRlbnRz TGF5ZXIuIFdoZW4gcmVwbGFjaW5nIGl0IHdpdGggYSBuZXcgY29udGVudHMKKyAgICAgICAgbGF5 ZXIsIGl0IG1heSBiZSB1bnNhZmUgdG8gdG91Y2ggdGhlIG9sZCB2YWx1ZS4gSXQncyBhbHNvIGNv bXBsZXRlbHkgdW5uZWNlc3NhcnkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorCiAyMDEyLTA4LTE2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBD aGFuZ2UgV2ViTGF5ZXIgZnJvbSBhIGNvbmNyZXRlIHR5cGUgdG8gYSBwdXJlIHZpcnR1YWwgaW50 ZXJmYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAppbmRleCA0YzdhNTU2 Y2IwZTlkYWI5OTIxNjhmMjIyY2U2YjYxZGRjNmEwYWM3Li4zZTA2OWI2Y2VlZmUzYWNlYjY1YWE5 ZjE5ZTMxMzQ0MGEzM2Q5MGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTc3MSwxMSArNzcxLDYgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldHVw Q29udGVudHNMYXllcihXZWJMYXllciogY29udGVudHNMYXllcikKICAgICBpZiAoY29udGVudHNM YXllciA9PSBtX2NvbnRlbnRzTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2Nv bnRlbnRzTGF5ZXIpIHsKLSAgICAgICAgbV9jb250ZW50c0xheWVyLT5zZXRVc2VQYXJlbnRCYWNr ZmFjZVZpc2liaWxpdHkoZmFsc2UpOwotICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnJlbW92ZUZy b21QYXJlbnQoKTsKLSAgICB9Ci0KICAgICBtX2NvbnRlbnRzTGF5ZXIgPSBjb250ZW50c0xheWVy OwogCiAgICAgaWYgKG1fY29udGVudHNMYXllcikgewo= 159557 2012-08-20 16:25:11 -0700 2012-08-20 17:00:45 -0700 Patch bug-94544-20120820162431.patch text/plain 1855 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjIzMGYzNjRjMzczZmZj MDIyYTYyMTUwNjIxZDZjOTNhMWQ1Y2ZmOC4uMzhkMTk2ODU3MDUyZWFhMjJkNDJlNDUzZmJiNjk3 ODQ1NDM1OGExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTIwICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKDEyNjA3NikgU2hvdWxkIG5vdCB0b3VjaCBvbGQgR3JhcGhpY3NMYXllckNocm9t aXVtOjptX2NvbnRlbnRzTGF5ZXIgd2hlbiBzZXR0aW5nIHVwIGEgbmV3IGNvbnRlbnRzIGxheWVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDU0NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNz TGF5ZXJDaHJvbWl1bSBvbmx5IGtlZXBzIGEgd2VhayBwb2ludGVyIHRvIGl0cyBtX2NvbnRlbnRz TGF5ZXIuIFdoZW4gcmVwbGFjaW5nIGl0IHdpdGggYSBuZXcgY29udGVudHMKKyAgICAgICAgbGF5 ZXIsIGl0IG1heSBiZSB1bnNhZmUgdG8gdG91Y2ggdGhlIG9sZCB2YWx1ZS4gSXQncyBhbHNvIGNv bXBsZXRlbHkgdW5uZWNlc3NhcnkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorCiAyMDEyLTA4LTE2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBD aGFuZ2UgV2ViTGF5ZXIgZnJvbSBhIGNvbmNyZXRlIHR5cGUgdG8gYSBwdXJlIHZpcnR1YWwgaW50 ZXJmYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAppbmRleCA0YzdhNTU2 Y2IwZTlkYWI5OTIxNjhmMjIyY2U2YjYxZGRjNmEwYWM3Li4xNDE1N2U0ZjExY2E0MjY3ZjAzOThk OTQ1NGI0ZTAxMmQyYmNjNzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTc2OCwxNCArNzY4LDYgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0 ZUNvbnRlbnRzU2NhbGUoKQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250 ZW50c0xheWVyKFdlYkxheWVyKiBjb250ZW50c0xheWVyKQogewotICAgIGlmIChjb250ZW50c0xh eWVyID09IG1fY29udGVudHNMYXllcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKG1fY29u dGVudHNMYXllcikgewotICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldFVzZVBhcmVudEJhY2tm YWNlVmlzaWJpbGl0eShmYWxzZSk7Ci0gICAgICAgIG1fY29udGVudHNMYXllci0+cmVtb3ZlRnJv bVBhcmVudCgpOwotICAgIH0KLQogICAgIG1fY29udGVudHNMYXllciA9IGNvbnRlbnRzTGF5ZXI7 CiAKICAgICBpZiAobV9jb250ZW50c0xheWVyKSB7Cg== 159563 2012-08-20 17:00:48 -0700 2012-08-20 17:03:33 -0700 Patch bug-94544-20120820170008.patch text/plain 7813 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAwYWEwMDlmNDk0NDk1 ZDcyNDUwNzhjNzYwNTgwYmEwMzdhNWI2NTAyLi44OTkwYzJkNmMwZGM5YjEwYjk2ODA1YTEyMGJj ZTlmZDNjM2YzYmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wOC0yMCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gUkVHUkVTU0lPTigxMjYwNzYpIFNob3VsZCBub3QgdG91Y2ggb2xkIEdyYXBoaWNzTGF5ZXJD aHJvbWl1bTo6bV9jb250ZW50c0xheWVyIHdoZW4gc2V0dGluZyB1cCBhIG5ldyBjb250ZW50cyBs YXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ1 NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBv c2VzIGFuIGlkIHNvIHVzZXJzIG9mIHRoZSBXZWJMYXllciBBUEkgY2FuIG1ha2UgaWRlbnRpdHkg Y2hlY2tzIGZvciBsYXllcnMgdGhhdCB0aGV5IGRvIG5vdCBoYXZlIG93bmVyc2hpcAorICAgICAg ICBvZi4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJMYXllci5oOgorICAgICAgICAo V2ViTGF5ZXIpOgorCiAyMDEyLTA4LTE2ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDaGFuZ2UgV2ViTGF5ZXIgZnJvbSBhIGNvbmNy ZXRlIHR5cGUgdG8gYSBwdXJlIHZpcnR1YWwgaW50ZXJmYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM1ZTEz MmUxZGVkYzVlZjY3ZGUwNTg5MzY2NDI2YjA5M2RlNWEyOC4uNmE2NzJjNTEyOGVhZTYwMjgwOGFk ZDdkMTBhNjRiMWZiZDNkNWMzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4 LTIwICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2No cm9taXVtXSBSRUdSRVNTSU9OKDEyNjA3NikgU2hvdWxkIG5vdCB0b3VjaCBvbGQgR3JhcGhpY3NM YXllckNocm9taXVtOjptX2NvbnRlbnRzTGF5ZXIgd2hlbiBzZXR0aW5nIHVwIGEgbmV3IGNvbnRl bnRzIGxheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05NDU0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSBvbmx5IGtlZXBzIGEgd2VhayBwb2ludGVyIHRvIGl0cyBt X2NvbnRlbnRzTGF5ZXIuIFdoZW4gcmVwbGFjaW5nIGl0IHdpdGggYSBuZXcgY29udGVudHMKKyAg ICAgICAgbGF5ZXIsIGl0IG1heSBiZSB1bnNhZmUgdG8gdG91Y2ggdGhlIG9sZCB2YWx1ZS4gSXQn cyBhbHNvIGNvbXBsZXRlbHkgdW5uZWNlc3NhcnkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpHcmFwaGljc0xheWVyQ2hyb21pdW0pOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50c1RvSW1hZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50c1RvKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xh eWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVy Q2hyb21pdW0uaDoKKwogMjAxMi0wOC0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBBc3NlcnRpb24gZ29pbmcgYmFjayB0byByZXN1bHRzLmh0bWwg cGFnZSBmcm9tIGFuIGltYWdlIGRpZmYgcmVzdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGMwMDdjYTQwMmJmMTZkNWU2YjczYjY5MmQ2Mjk0YzNjYjNkYWNiZWYuLmQ1YWNkNzA5Mzg4 ZjQ3ZTg0OGQ1MmQyOTk5MDZiYTVjNzQyYjhjZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMTggQEAKIDIwMTItMDgtMjAgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNo cm9taXVtLm9yZz4KIAorICAgICAgICBbY2hyb21pdW1dIFJFR1JFU1NJT04oMTI2MDc2KSBTaG91 bGQgbm90IHRvdWNoIG9sZCBHcmFwaGljc0xheWVyQ2hyb21pdW06Om1fY29udGVudHNMYXllciB3 aGVuIHNldHRpbmcgdXAgYSBuZXcgY29udGVudHMgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViTGF5ZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTGF5ZXJJbXBsOjppZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAg ICAqIHNyYy9XZWJMYXllckltcGwuaDoKKyAgICAgICAgKFdlYkxheWVySW1wbCk6CisKKzIwMTIt MDgtMjAgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwogICAgICAgICBV bnJldmlld2VkLiBSb2xsIFdlYktpdCBjaHJvbWl1bSBERVBTIGZvcndhcmQuCiAKICAgICAgICAg KiBERVBTOgpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJM YXllci5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJMYXllci5oCmluZGV4 IGY4YjYwNzMxZDQwMzFlOTk4Y2M2MWRiYmJlYjBiNjk3MzdjMDM1Y2IuLjYwZWQ2OTQyMzlkYTM0 OTNlZjIwMGE0NjA0Mjc2OTkxMTI2MzUzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9j aHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXIuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0v cHVibGljL1dlYkxheWVyLmgKQEAgLTU0LDYgKzU0LDkgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB+V2ViTGF5ZXIoKSB7IH0KIAorICAgIC8vIFJldHVybnMgYSBwb3NpdGl2ZSBJRCB0aGF0IHdp bGwgYmUgdW5pcXVlIGFjcm9zcyBhbGwgV2ViTGF5ZXJzIGFsbG9jYXRlZCBpbiB0aGlzIHByb2Nl c3MuCisgICAgdmlydHVhbCBpbnQgaWQoKSBjb25zdCA9IDA7CisKICAgICAvLyBTZXRzIGEgcmVn aW9uIG9mIHRoZSBsYXllciBhcyBpbnZhbGlkLCBpLmUuIG5lZWRzIHRvIHVwZGF0ZSBpdHMgY29u dGVudC4KICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVJlY3QoY29uc3QgV2ViRmxvYXRSZWN0 JikgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAppbmRleCA0Yzdh NTU2Y2IwZTlkYWI5OTIxNjhmMjIyY2U2YjYxZGRjNmEwYWM3Li45MDBlOWZlZTk4NzY2ZmY0M2Rm MjhkYWEyZTI2ZWU3Zjk2MjU1MTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1 bS5jcHAKQEAgLTg0LDYgKzg0LDcgQEAgUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGlj c0xheWVyOjpjcmVhdGUoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogR3JhcGhpY3NMYXll ckNocm9taXVtOjpHcmFwaGljc0xheWVyQ2hyb21pdW0oR3JhcGhpY3NMYXllckNsaWVudCogY2xp ZW50KQogICAgIDogR3JhcGhpY3NMYXllcihjbGllbnQpCiAgICAgLCBtX2NvbnRlbnRzTGF5ZXIo MCkKKyAgICAsIG1fY29udGVudHNMYXllcklkKDApCiAgICAgLCBtX2NvbnRlbnRzTGF5ZXJQdXJw b3NlKE5vQ29udGVudHNMYXllcikKICAgICAsIG1fY29udGVudHNMYXllckhhc0JhY2tncm91bmRD b2xvcihmYWxzZSkKICAgICAsIG1faW5TZXRDaGlsZHJlbihmYWxzZSkKQEAgLTQ0Myw3ICs0NDQs NyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUb0ltYWdlKEltYWdl KiBpbWFnZSkKIHsKICAgICBib29sIGNoaWxkcmVuQ2hhbmdlZCA9IGZhbHNlOwogICAgIGlmIChp bWFnZSkgewotICAgICAgICBpZiAoIW1fY29udGVudHNMYXllciB8fCBtX2NvbnRlbnRzTGF5ZXJQ dXJwb3NlICE9IENvbnRlbnRzTGF5ZXJGb3JJbWFnZSkgeworICAgICAgICBpZiAobV9jb250ZW50 c0xheWVyUHVycG9zZSAhPSBDb250ZW50c0xheWVyRm9ySW1hZ2UpIHsKICAgICAgICAgICAgIG1f aW1hZ2VMYXllciA9IGFkb3B0UHRyKFdlYkltYWdlTGF5ZXI6OmNyZWF0ZSgpKTsKICAgICAgICAg ICAgIHNldHVwQ29udGVudHNMYXllcihtX2ltYWdlTGF5ZXItPmxheWVyKCkpOwogICAgICAgICAg ICAgbV9jb250ZW50c0xheWVyUHVycG9zZSA9IENvbnRlbnRzTGF5ZXJGb3JJbWFnZTsKQEAgLTQ4 MSw3ICs0ODIsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUbyhD b250ZW50c0xheWVyUHVycG9zZSBwdXJwb3NlLCBXZWJLaXQ6OgogewogICAgIGJvb2wgY2hpbGRy ZW5DaGFuZ2VkID0gZmFsc2U7CiAgICAgaWYgKGxheWVyKSB7Ci0gICAgICAgIGlmIChtX2NvbnRl bnRzTGF5ZXIgfHwgbV9jb250ZW50c0xheWVyUHVycG9zZSAhPSBwdXJwb3NlKSB7CisgICAgICAg IGlmIChtX2NvbnRlbnRzTGF5ZXJJZCAhPSBsYXllci0+aWQoKSkgewogICAgICAgICAgICAgc2V0 dXBDb250ZW50c0xheWVyKGxheWVyKTsKICAgICAgICAgICAgIG1fY29udGVudHNMYXllclB1cnBv c2UgPSBwdXJwb3NlOwogICAgICAgICAgICAgY2hpbGRyZW5DaGFuZ2VkID0gdHJ1ZTsKQEAgLTc2 OCwxNCArNzY5LDYgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0ZUNvbnRlbnRz U2NhbGUoKQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVy KFdlYkxheWVyKiBjb250ZW50c0xheWVyKQogewotICAgIGlmIChjb250ZW50c0xheWVyID09IG1f Y29udGVudHNMYXllcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKG1fY29udGVudHNMYXll cikgewotICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldFVzZVBhcmVudEJhY2tmYWNlVmlzaWJp bGl0eShmYWxzZSk7Ci0gICAgICAgIG1fY29udGVudHNMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgp OwotICAgIH0KLQogICAgIG1fY29udGVudHNMYXllciA9IGNvbnRlbnRzTGF5ZXI7CiAKICAgICBp ZiAobV9jb250ZW50c0xheWVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oCmlu ZGV4IDU1N2FiNGRkODJjZmFjNDU2ZjRjNGY4ZGMwZWUyNmE5MDViMTMwNzMuLjVmNDhhMDg3ODIz OTM2Yjk2NTcyODkxODNmMzU0NjUxYTk0NjBkOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJD aHJvbWl1bS5oCkBAIC0xNjgsNiArMTY4LDExIEBAIHByaXZhdGU6CiAgICAgT3duUHRyPFdlYktp dDo6V2ViTGF5ZXI+IG1fdHJhbnNmb3JtTGF5ZXI7CiAgICAgT3duUHRyPFdlYktpdDo6V2ViSW1h Z2VMYXllcj4gbV9pbWFnZUxheWVyOwogICAgIFdlYktpdDo6V2ViTGF5ZXIqIG1fY29udGVudHNM YXllcjsKKyAgICAvLyBXZSBkb24ndCBoYXZlIG93bmVyc2hpcCBvZiBtX2NvbnRlbnRzTGF5ZXIs IGJ1dCB3ZSBkbyB3YW50IHRvIGtub3cgaWYgYSBnaXZlbiBsYXllciBpcyB0aGUKKyAgICAvLyBz YW1lIGFzIG91ciBjdXJyZW50IGxheWVyIGluIHNldENvbnRlbnRzVG8oKS4gU2luY2UgbV9jb250 ZW50c0xheWVyIG1heSBiZSBkZWxldGVkIGF0IHRoaXMgcG9pbnQsCisgICAgLy8gd2Ugc3Rhc2gg YW4gSUQgYXdheSB3aGVuIHdlIGtub3cgbV9jb250ZW50c0xheWVyIGlzIGFsaXZlIGFuZCB1c2Ug dGhhdCBmb3IgY29tcGFyaXNvbnMgZnJvbSB0aGF0IHBvaW50CisgICAgLy8gb24uCisgICAgaW50 IG1fY29udGVudHNMYXllcklkOwogCiAgICAgT3duUHRyPE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRl bnRMYXllckRlbGVnYXRlPiBtX29wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllckltcGwu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXJJbXBsLmNwcAppbmRleCAx YTViZGQyMTEwZmYyNTFjM2NmMWQ1ZDU1MmMyMjI1MjQ2YzliMDMyLi40MGNlZDQ4NWQ3MTg4NzMw Yjg2OGRiZTg2Y2U1N2JhNWQzNmEzMzJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJMYXllckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkxheWVySW1wbC5jcHAKQEAgLTkzLDYgKzkzLDExIEBAIFdlYkxheWVySW1wbDo6fldlYkxh eWVySW1wbCgpCiAgICAgbV9sYXllci0+c2V0TGF5ZXJBbmltYXRpb25EZWxlZ2F0ZSgwKTsKIH0K IAoraW50IFdlYkxheWVySW1wbDo6aWQoKSBjb25zdAoreworICAgIHJldHVybiBtX2xheWVyLT5p ZCgpOworfQorCiB2b2lkIFdlYkxheWVySW1wbDo6aW52YWxpZGF0ZVJlY3QoY29uc3QgV2ViRmxv YXRSZWN0JiByZWN0KQogewogICAgIG1fbGF5ZXItPnNldE5lZWRzRGlzcGxheVJlY3QocmVjdCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllckltcGwuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkxheWVySW1wbC5oCmluZGV4IDRiNDRmYmNk NDQ2OWZhMTk2OGU1NzRjNmM5MzQ5N2ZiOWM3NGU0MDkuLjdlM2I1MzNiY2ZmMWExZmVkOWQ3N2Ex Njc3MWU1ZWFkZjRlYmUyNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkxheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkxheWVy SW1wbC5oCkBAIC00MSw2ICs0MSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJMYXllcklt cGwoKTsKIAogICAgIC8vIFdlYkxheWVyIGltcGxlbWVudGF0aW9uLgorICAgIHZpcnR1YWwgaW50 IGlkKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVSZWN0KGNv bnN0IFdlYkZsb2F0UmVjdCYpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRl KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkKFdlYkxheWVyKikgT1ZFUlJJ REU7Cg==