81968 2012-03-22 14:31:19 -0700 [chromium] Force update of nonFastScrollableRegion if target CCLayerImpl has been freshly created. 2012-03-22 18:42:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 wjmaclean wjmaclean cc-bugs enne jamesr nduca rjkroege webkit.review.bot oldest_to_newest 585709 0 wjmaclean 2012-03-22 14:31:19 -0700 [chromium] Force update of nonFastScrollableRegion if target CCLayerImpl has been freshly created. 585711 1 133347 wjmaclean 2012-03-22 14:33:04 -0700 Created attachment 133347 Patch 585714 2 wjmaclean 2012-03-22 14:36:44 -0700 I'll add a test if the approach in this patch is deemed correct. 585726 3 133347 jamesr 2012-03-22 14:48:51 -0700 Comment on attachment 133347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133347&action=review Good catch! This looks like the right fix, but it definitely needs test coverage before R+. Dropping CCLayerImpl's on !visible is troublesome, we should perhaps revisit that sometimes. > Source/WebCore/ChangeLog:8 > + No new tests, yet. (OOPS!) This needs tests, obviously. > Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp:76 > + // FIXME: Is it valid to assume a reused CCLayerImpl will have the correct nonFastScrollableRegion? yes, it is > Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp:77 > + layer->setNonFastScrollableRegionChanged(); // We just cleared the impl layer, so don't opt-out of transferring the nonFastScrollableRegion. the double negative isn't hard to misunderstand here. rephrase perhaps? 585739 4 133347 wjmaclean 2012-03-22 14:59:55 -0700 Comment on attachment 133347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133347&action=review >> Source/WebCore/ChangeLog:8 >> + No new tests, yet. (OOPS!) > > This needs tests, obviously. Working on one now, will upload with new patch shortly. >> Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp:76 >> + // FIXME: Is it valid to assume a reused CCLayerImpl will have the correct nonFastScrollableRegion? > > yes, it is Good to know ... FIXME comment removed. >> Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp:77 >> + layer->setNonFastScrollableRegionChanged(); // We just cleared the impl layer, so don't opt-out of transferring the nonFastScrollableRegion. > > the double negative isn't hard to misunderstand here. rephrase perhaps? Fixed. 585817 5 133374 wjmaclean 2012-03-22 15:58:34 -0700 Created attachment 133374 Patch 585869 6 enne 2012-03-22 16:53:53 -0700 (In reply to comment #3) > (From update of attachment 133347 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133347&action=review > > Good catch! This looks like the right fix, but it definitely needs test coverage before R+. > > Dropping CCLayerImpl's on !visible is troublesome, we should perhaps revisit that sometimes. I don't really agree, but am willing to be convinced. I think the problem here is really that there's this additional caching flag for whether or not this property should be synced or not. Properties that simply always get synced have no issue and no extra complications. 585878 7 133374 enne 2012-03-22 17:05:09 -0700 Comment on attachment 133374 Patch Looks good to me. Thanks for the test. 585961 8 133374 webkit.review.bot 2012-03-22 18:42:51 -0700 Comment on attachment 133374 Patch Clearing flags on attachment: 133374 Committed r111803: <http://trac.webkit.org/changeset/111803> 585962 9 webkit.review.bot 2012-03-22 18:42:56 -0700 All reviewed patches have been landed. Closing bug. 133347 2012-03-22 14:33:04 -0700 2012-03-22 15:58:31 -0700 Patch bug-81968-20120322173302.patch text/plain 2610 wjmaclean U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFlNzQ3NWI3MzVhMWUz Y2VmZWI5NWM1MjhmMTBjYWIwOTQ3MjQ2OC4uNzViMWI4ODJhMWY5MGQ5MWYxOGUyMTVjYWE5YTFm YmY4MmNmZmJmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTIyICBXLiBK YW1lcyBNYWNMZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIEZvcmNlIHVwZGF0ZSBvZiBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiBpZiB0YXJnZXQgQ0NM YXllckltcGwgaGFzIGJlZW4gZnJlc2hseSBjcmVhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHlldC4gKE9PUFMhKQorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAg ICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6c2V0Tm9uRmFzdFNjcm9sbGFibGVSZWdpb25D aGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmVlU3luY2hy b25pemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRyZWVTeW5jaHJvbml6ZXI6OnJldXNlT3JD cmVhdGVDQ0xheWVySW1wbCk6CisKIDIwMTItMDMtMjIgIEFsZXhlaSBGaWxpcHBvdiAgPGFsZXhl aWZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwZWVkIHVwIHRoZSBi dWlsZCByZXRhaW5lcnMgcGhhc2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKaW5kZXggNGZmMTI4MjcwYTE1 MzU5MjA5NmY5YzY1MDFiODBjZTMzYTQxM2IzOS4uMmJjMjE0NmM2N2IwNTQyZjdiNWY3MDJlMzIx MDdiOTJlMzgyZWU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaApAQCAtMTQzLDYgKzE0Myw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHNldFNob3VsZFNjcm9sbE9uTWFpblRocmVhZChib29sKTsKICAgICB2 b2lkIHNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMoYm9vbCk7CiAgICAgdm9pZCBzZXROb25GYXN0 U2Nyb2xsYWJsZVJlZ2lvbihjb25zdCBSZWdpb24mKTsKKyAgICB2b2lkIHNldE5vbkZhc3RTY3Jv bGxhYmxlUmVnaW9uQ2hhbmdlZCgpIHsgbV9ub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbkNoYW5nZWQg PSB0cnVlOyB9CiAKICAgICBJbnRTaXplIHNjcm9sbERlbHRhKCkgY29uc3QgeyByZXR1cm4gSW50 U2l6ZSgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL1RyZWVTeW5jaHJvbml6ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVHJlZVN5bmNocm9uaXplci5jcHAKaW5kZXggOTc0NTEzZmYxNjky NjAzNGMzNjg4OTlkNzMwY2U0OTkzZTU2MGZjOS4uZWVhNGViOGJkODljMjE1MTRmMDRkOTg5MzVi NTIwOGI1ZDg2OTI3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVHJlZVN5bmNocm9uaXplci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVHJlZVN5bmNocm9uaXplci5jcHAKQEAgLTcxLDggKzcx LDExIEBAIFBhc3NPd25QdHI8Q0NMYXllckltcGw+IFRyZWVTeW5jaHJvbml6ZXI6OnJldXNlT3JD cmVhdGVDQ0xheWVySW1wbChSYXdQdHJDQ0xheWVyCiB7CiAgICAgT3duUHRyPENDTGF5ZXJJbXBs PiBjY0xheWVySW1wbCA9IG9sZExheWVycy50YWtlKGxheWVyLT5pZCgpKTsKIAotICAgIGlmICgh Y2NMYXllckltcGwpCisgICAgaWYgKCFjY0xheWVySW1wbCkgewogICAgICAgICBjY0xheWVySW1w bCA9IGxheWVyLT5jcmVhdGVDQ0xheWVySW1wbCgpOworICAgICAgICAvLyBGSVhNRTogSXMgaXQg dmFsaWQgdG8gYXNzdW1lIGEgcmV1c2VkIENDTGF5ZXJJbXBsIHdpbGwgaGF2ZSB0aGUgY29ycmVj dCBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbj8KKyAgICAgICAgbGF5ZXItPnNldE5vbkZhc3RTY3Jv bGxhYmxlUmVnaW9uQ2hhbmdlZCgpOyAvLyBXZSBqdXN0IGNsZWFyZWQgdGhlIGltcGwgbGF5ZXIs IHNvIGRvbid0IG9wdC1vdXQgb2YgdHJhbnNmZXJyaW5nIHRoZSBub25GYXN0U2Nyb2xsYWJsZVJl Z2lvbi4KKyAgICB9CiAKICAgICBuZXdMYXllcnMuc2V0KGxheWVyLT5pZCgpLCBjY0xheWVySW1w bC5nZXQoKSk7CiAgICAgcmV0dXJuIGNjTGF5ZXJJbXBsLnJlbGVhc2UoKTsK 133374 2012-03-22 15:58:34 -0700 2012-03-22 18:42:51 -0700 Patch bug-81968-20120322185833.patch text/plain 6185 wjmaclean U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFlNzQ3NWI3MzVhMWUz Y2VmZWI5NWM1MjhmMTBjYWIwOTQ3MjQ2OC4uOWIyNzViMDIzZGEyODYzNTNhMGI3MWZiOTEwMTlm Yjc3YzE1YmNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAzLTIyICBXLiBK YW1lcyBNYWNMZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIEZvcmNlIHVwZGF0ZSBvZiBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiBpZiB0YXJnZXQgQ0NM YXllckltcGwgaGFzIGJlZW4gZnJlc2hseSBjcmVhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB1bml0IHRlc3QgdG8gZXhpc3RpbmcgdGVz dHMgZm9yIFRyZWVTeW5jaHJvbml6ZXIuCisKKyAgICAgICAgV2hlbiBjcmVhdGluZyBhIG5ldyBD Q0xheWVySW1wbCBkdXJpbmcgdHJlZSBzeW5jaHJvbml6YXRpb24sIG1ha2Ugc3VyZSB3ZSB0cmFu c2ZlciB0aGUgbm9uRmFzdFNjcm9sbGFibGVSZWdpb24gYXMKKyAgICAgICAgdGhlIG5ldyBDQ0xh eWVySW1wbCB3aWxsIGRlZmF1bHQgdG8gYW4gZW1wdHkgcmVnaW9uLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5ZXJDaHJvbWl1bTo6bm9uRmFzdFNjcm9sbGFibGVSZWdpb24pOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJDaHJvbWl1bTo6c2V0Tm9uRmFzdFNjcm9sbGFibGVSZWdpb25DaGFuZ2VkKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmVlU3luY2hyb25pemVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlRyZWVTeW5jaHJvbml6ZXI6OnJldXNlT3JDcmVhdGVDQ0xh eWVySW1wbCk6CisKIDIwMTItMDMtMjIgIEFsZXhlaSBGaWxpcHBvdiAgPGFsZXhlaWZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwZWVkIHVwIHRoZSBidWlsZCByZXRh aW5lcnMgcGhhc2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDEwYjk1NGE4NTNiNTU1 ZTM3ZGVhMGUwNzA2YmMxYjY3ZGVlNTUxYWQuLjIwYTkyMjlmMmQ1ZjJhMjkzOGM2NWZmNGMwNjVl YzEyZGZmY2EwOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTItMDMtMjIgIFcuIEphbWVzIE1hY0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgog CisgICAgICAgIFtjaHJvbWl1bV0gRm9yY2UgdXBkYXRlIG9mIG5vbkZhc3RTY3JvbGxhYmxlUmVn aW9uIGlmIHRhcmdldCBDQ0xheWVySW1wbCBoYXMgYmVlbiBmcmVzaGx5IGNyZWF0ZWQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTk2OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvVHJlZVN5 bmNocm9uaXplclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0VGVzdHM6OmV4cGVjdFRyZWVzQXJl SWRlbnRpY2FsKToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToKKyAgICAgICAgKFdlYktp dFRlc3RzKToKKworMjAxMi0wMy0yMiAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJv bWl1bS5vcmc+CisKICAgICAgICAgUmVuYW1lIHRvdWNocGFkIGZsaW5nIGN1cnZlLCBhZGQgY3Vy dmUgcGFyYW1ldGVycyB0byBjb25zdHJ1Y3Rvci4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgxODIwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAppbmRleCA0ZmYx MjgyNzBhMTUzNTkyMDk2ZjljNjUwMWI4MGNlMzNhNDEzYjM5Li5iNDc2MDcyYWQ0M2EyNWVmMzYz OTI5ZTM5YTM4Mzc0Mzc2MjhlMzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCkBAIC0xNDIsNyArMTQy LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2Nyb2xsYWJsZShib29sKTsKICAgICB2b2lkIHNl dFNob3VsZFNjcm9sbE9uTWFpblRocmVhZChib29sKTsKICAgICB2b2lkIHNldEhhdmVXaGVlbEV2 ZW50SGFuZGxlcnMoYm9vbCk7CisgICAgY29uc3QgUmVnaW9uJiBub25GYXN0U2Nyb2xsYWJsZVJl Z2lvbigpIHsgcmV0dXJuIG1fbm9uRmFzdFNjcm9sbGFibGVSZWdpb247IH0KICAgICB2b2lkIHNl dE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKGNvbnN0IFJlZ2lvbiYpOworICAgIHZvaWQgc2V0Tm9u RmFzdFNjcm9sbGFibGVSZWdpb25DaGFuZ2VkKCkgeyBtX25vbkZhc3RTY3JvbGxhYmxlUmVnaW9u Q2hhbmdlZCA9IHRydWU7IH0KIAogICAgIEludFNpemUgc2Nyb2xsRGVsdGEoKSBjb25zdCB7IHJl dHVybiBJbnRTaXplKCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVHJlZVN5bmNocm9uaXplci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmVlU3luY2hyb25pemVyLmNwcAppbmRleCA5NzQ1 MTNmZjE2OTI2MDM0YzM2ODg5OWQ3MzBjZTQ5OTNlNTYwZmM5Li5lN2U4ZDZhNDVmNzc3MGEzN2M1 OTg1ZGJlNWJiMjQ2ZmI1ZjBhNDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9UcmVlU3luY2hyb25pemVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmVlU3luY2hyb25pemVyLmNwcApAQCAt NzEsOCArNzEsMTAgQEAgUGFzc093blB0cjxDQ0xheWVySW1wbD4gVHJlZVN5bmNocm9uaXplcjo6 cmV1c2VPckNyZWF0ZUNDTGF5ZXJJbXBsKFJhd1B0ckNDTGF5ZXIKIHsKICAgICBPd25QdHI8Q0NM YXllckltcGw+IGNjTGF5ZXJJbXBsID0gb2xkTGF5ZXJzLnRha2UobGF5ZXItPmlkKCkpOwogCi0g ICAgaWYgKCFjY0xheWVySW1wbCkKKyAgICBpZiAoIWNjTGF5ZXJJbXBsKSB7CiAgICAgICAgIGNj TGF5ZXJJbXBsID0gbGF5ZXItPmNyZWF0ZUNDTGF5ZXJJbXBsKCk7CisgICAgICAgIGxheWVyLT5z ZXROb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbkNoYW5nZWQoKTsgLy8gV2UganVzdCBjcmVhdGVkIGEg ZnJlc2ggQ0NMYXllckltcGwsIHNvIG1ha2Ugc3VyZSB3ZSB0cmFuc2ZlciB0aGUgbm9uRmFzdFNj cm9sbGFibGVSZWdpb24uCisgICAgfQogCiAgICAgbmV3TGF5ZXJzLnNldChsYXllci0+aWQoKSwg Y2NMYXllckltcGwuZ2V0KCkpOwogICAgIHJldHVybiBjY0xheWVySW1wbC5yZWxlYXNlKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RyZWVTeW5jaHJvbml6ZXJU ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVHJlZVN5bmNocm9uaXplclRl c3QuY3BwCmluZGV4IDViMzc2Y2E5ZmUyMjExZGZhMDBhOWNmOTExZWYwZTYxZjg5MDgyNDguLjNh OTVhZWM3ODYxMjRjZjZkYWNkNTkwMWMyYjQ2NWVhNmQ3NDJjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVHJlZVN5bmNocm9uaXplclRlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVHJlZVN5bmNocm9uaXplclRlc3QuY3BwCkBAIC0y OCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJDQ0FuaW1hdGlvblRlc3RDb21tb24uaCIKICNpbmNs dWRlICJMYXllckNocm9taXVtLmgiCisjaW5jbHVkZSAiUmVnaW9uLmgiCiAjaW5jbHVkZSAiY2Mv Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJjYy9DQ0xheWVySW1wbC5o IgogI2luY2x1ZGUgImNjL0NDUHJveHkuaCIKQEAgLTEyNiw2ICsxMjcsOCBAQCB2b2lkIGV4cGVj dFRyZWVzQXJlSWRlbnRpY2FsKExheWVyQ2hyb21pdW0qIGxheWVyLCBDQ0xheWVySW1wbCogY2NM YXllcikKIAogICAgIEVYUEVDVF9FUShsYXllci0+aWQoKSwgY2NMYXllci0+aWQoKSk7CiAKKyAg ICBFWFBFQ1RfRVEobGF5ZXItPm5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKCksIGNjTGF5ZXItPm5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uKCkpOworCiAgICAgQVNTRVJUX0VRKCEhbGF5ZXItPm1hc2tM YXllcigpLCAhIWNjTGF5ZXItPm1hc2tMYXllcigpKTsKICAgICBpZiAobGF5ZXItPm1hc2tMYXll cigpKQogICAgICAgICBleHBlY3RUcmVlc0FyZUlkZW50aWNhbChsYXllci0+bWFza0xheWVyKCks IGNjTGF5ZXItPm1hc2tMYXllcigpKTsKQEAgLTE5NCw2ICsxOTcsMjkgQEAgVEVTVChUcmVlU3lu Y2hyb25pemVyVGVzdCwgc3luY1NpbXBsZVRyZWVSZXVzaW5nTGF5ZXJzKQogICAgIEVYUEVDVF9F UShzZWNvbmRDQ0xheWVySWQsIGNjTGF5ZXJEZXN0cnVjdGlvbkxpc3RbMF0pOwogfQogCitURVNU KFRyZWVTeW5jaHJvbml6ZXJUZXN0LCBzeW5jU2ltcGxlVHJlZVdpdGhOb25GYXN0U2Nyb2xsYWJs ZVJlZ2lvbkFuZEZyZXNoTGF5ZXIpCit7CisgICAgRGVidWdTY29wZWRTZXRJbXBsVGhyZWFkIGlt cGw7CisgICAgVmVjdG9yPGludD4gY2NMYXllckRlc3RydWN0aW9uTGlzdDsKKyAgICBSZWdpb24g dGVzdFJlZ2lvbihJbnRSZWN0KDAsIDAsIDEsIDEpKTsKKworICAgIFJlZlB0cjxMYXllckNocm9t aXVtPiBsYXllclRyZWVSb290ID0gTW9ja0xheWVyQ2hyb21pdW06OmNyZWF0ZSgmY2NMYXllckRl c3RydWN0aW9uTGlzdCk7CisgICAgbGF5ZXJUcmVlUm9vdC0+YWRkQ2hpbGQoTW9ja0xheWVyQ2hy b21pdW06OmNyZWF0ZSgmY2NMYXllckRlc3RydWN0aW9uTGlzdCkpOworICAgIGxheWVyVHJlZVJv b3QtPmFkZENoaWxkKE1vY2tMYXllckNocm9taXVtOjpjcmVhdGUoJmNjTGF5ZXJEZXN0cnVjdGlv bkxpc3QpKTsKKworICAgIC8vIENyZWF0ZSBub24tZW1wdHkgbm9uRmFzdFNjcm9sbGFibGVSZWdp b24gaW4gb25lIG9mIHRoZSBjaGlsZHJlbi4KKyAgICBsYXllclRyZWVSb290LT5jaGlsZHJlbigp WzBdLT5zZXROb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbih0ZXN0UmVnaW9uKTsKKworICAgIE93blB0 cjxDQ0xheWVySW1wbD4gY2NMYXllclRyZWVSb290ID0gVHJlZVN5bmNocm9uaXplcjo6c3luY2hy b25pemVUcmVlcyhsYXllclRyZWVSb290LmdldCgpLCBudWxscHRyKTsKKyAgICBleHBlY3RUcmVl c0FyZUlkZW50aWNhbChsYXllclRyZWVSb290LmdldCgpLCBjY0xheWVyVHJlZVJvb3QuZ2V0KCkp OworCisgICAgY2NMYXllclRyZWVSb290LT5yZW1vdmVBbGxDaGlsZHJlbigpOyAvLyBGb3JjZSB0 aGVzZSB0byBiZSByZS1jcmVhdGVkIG9uIG5leHQgc3luYy4KKworICAgIC8vIFN5bmNocm9uaXpl IGFnYWluLiBBZnRlciB0aGUgc3luYyB0aGUgdHJlZXMgc2hvdWxkIGJlIGVxdWl2YWxlbnQgYW5k IHdlIHNob3VsZCBoYXZlIHJlLWNyZWF0ZWQgb25lIENDTGF5ZXJJbXBsIHRoYXQgaGFzIGEgbm9u LWVtcHR5IG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uLgorICAgIGNjTGF5ZXJUcmVlUm9vdCA9IFRy ZWVTeW5jaHJvbml6ZXI6OnN5bmNocm9uaXplVHJlZXMobGF5ZXJUcmVlUm9vdC5nZXQoKSwgY2NM YXllclRyZWVSb290LnJlbGVhc2UoKSk7CisgICAgZXhwZWN0VHJlZXNBcmVJZGVudGljYWwobGF5 ZXJUcmVlUm9vdC5nZXQoKSwgY2NMYXllclRyZWVSb290LmdldCgpKTsKK30KKwogVEVTVChUcmVl U3luY2hyb25pemVyVGVzdCwgc3luY1NpbXBsZVRyZWVBbmRQcm9wZXJ0aWVzKQogewogICAgIERl YnVnU2NvcGVkU2V0SW1wbFRocmVhZCBpbXBsOwo=