91374 2012-07-16 04:24:17 -0700 [chromium] Only apply page scale delta to root scroll layer 2012-07-16 12:06:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 skyostil skyostil aelias cc-bugs enne jamesr webkit.review.bot oldest_to_newest 670234 0 skyostil 2012-07-16 04:24:17 -0700 Only apply page scale delta to root scroll layer 670237 1 152508 skyostil 2012-07-16 04:36:46 -0700 Created attachment 152508 Patch 670400 2 152508 enne 2012-07-16 09:31:10 -0700 Comment on attachment 152508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152508&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:796 > + if (m_rootScrollLayerImpl) > + m_rootScrollLayerImpl->setPageScaleDelta(m_pageScaleDelta); If page delta is applied recursively through the tree, then I wonder why you're applying it to the scroll layer and not to the root itself. Is it because you don't want to scale the root scrollbars? > Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp:1015 > + // The page scale delta should only be applied to the scrollable root layer. > + EXPECT_EQ(root->pageScaleDelta(), newPageScale); > + EXPECT_EQ(child->pageScaleDelta(), defaultPageScale); > + EXPECT_EQ(grandChild->pageScaleDelta(), defaultPageScale); If the real bug is that the resulting draw transforms have double scale in them, can you make that assertion here as well? 670402 3 skyostil 2012-07-16 09:35:14 -0700 (In reply to comment #2) > If page delta is applied recursively through the tree, then I wonder why you're applying it to the scroll layer and not to the root itself. Is it because you don't want to scale the root scrollbars? That's right. The overlay controls should not be scaled when pinch zooming. > > Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp:1015 > > + // The page scale delta should only be applied to the scrollable root layer. > > + EXPECT_EQ(root->pageScaleDelta(), newPageScale); > > + EXPECT_EQ(child->pageScaleDelta(), defaultPageScale); > > + EXPECT_EQ(grandChild->pageScaleDelta(), defaultPageScale); > > If the real bug is that the resulting draw transforms have double scale in them, can you make that assertion here as well? Good idea. I don't think we're checking for that anywhere at the moment. 670404 4 skyostil 2012-07-16 09:35:56 -0700 (In reply to comment #3) > That's right. The overlay controls should not be scaled when pinch zooming. Sorry, I meant *overflow* controls. 670413 5 152552 skyostil 2012-07-16 09:50:47 -0700 Created attachment 152552 Patch - Check for correct draw transforms on all layers. 670425 6 aelias 2012-07-16 10:10:57 -0700 Looks good to me, thanks. 670531 7 152552 enne 2012-07-16 11:56:35 -0700 Comment on attachment 152552 Patch R=me. Thanks for the extra tests. 670541 8 152552 webkit.review.bot 2012-07-16 12:06:13 -0700 Comment on attachment 152552 Patch Clearing flags on attachment: 152552 Committed r122746: <http://trac.webkit.org/changeset/122746> 670542 9 webkit.review.bot 2012-07-16 12:06:18 -0700 All reviewed patches have been landed. Closing bug. 152508 2012-07-16 04:36:46 -0700 2012-07-16 09:50:41 -0700 Patch bug-91374-20120716123645.patch text/plain 6259 skyostil U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzllODc0OThmYmU0MGU4 YjRiZmY1NDQ3YmU0ODgyNDU1YmZjZDBmNS4uMjI0NGMzOGMxODQ4MDUzZjlhZTg1NTg5NGJmYjU3 NGFhMTg5M2I3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTE2ICBTYW1p IEt5b3N0aWxhICA8c2t5b3N0aWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g T25seSBhcHBseSBwYWdlIHNjYWxlIGRlbHRhIHRvIHJvb3Qgc2Nyb2xsIGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTM3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIHVzZXIgcGlu Y2gtem9vbXMgdGhlIHdlYiBwYWdlIHRob3VnaCB0aGUgQ2hyb21pdW0gY29tcG9zaXRvciwgdGhl CisgICAgICAgIHBlci1sYXllciBwYWdlIHNjYWxlIGRlbHRhIGlzIHVzZWQgdG8ga2VlcCB0cmFj ayBvZiB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZQorICAgICAgICBwYWdlIHNjYWxlIG9uIHRo ZSBjb21wb3NpdG9yIHRocmVhZCB2ZXJzdXMgdGhlIG1haW4gdGhyZWFkLiBPbiB0aGUgbmV4dAor ICAgICAgICBjb21taXQgdG8gdGhlIG1haW4gdGhyZWFkIHRoZXNlIHZhbHVlcyBhcmUgcmVzZXQg dG8gMS4KKworICAgICAgICBXaGVuIGNhbGN1bGF0aW5nIGxheWVyIHBvc2l0aW9ucywgdGhlIGNv bXBvc2l0b3IgYXBwbGllcyBhIGxheWVyJ3MgcGFnZSBzY2FsZQorICAgICAgICBkZWx0YSBib3Ro IHRvIHRoZSBsYXllciBpdHNlbGYgYXMgd2VsbCBhcyBhbGwgb2YgaXRzIGNoaWxkcmVuLiBTaW5j ZSB3ZSBhcmUKKyAgICAgICAgY3VycmVudGx5IHVwZGF0aW5nIHRoZSBwYWdlIHNjYWxlIGRlbHRh IG9uIGFsbCBzY3JvbGxhYmxlIGxheWVycywgdGhpcyByZXN1bHRzCisgICAgICAgIGluIHNjcm9s bGFibGUgY2hpbGQgbGF5ZXJzIGdldHRpbmcgc2NhbGVkIG11bHRpcGxlIHRpbWVzLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgY29tcG9zaXRvciB0byBvbmx5IGFwcGx5IHRoZSBw YWdlIHNjYWxlIGRlbHRhIG9uIHRoZQorICAgICAgICByb290IHNjcm9sbCBsYXllci4KKworICAg ICAgICBOZXcgdW5pdCB0ZXN0OiBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5wYWdlU2NhbGVEZWx0 YUFwcGxpZWRUb1Jvb3RTY3JvbGxMYXllck9ubHkKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6c2V0UGFnZVNjYWxlRmFjdG9yQW5kTGltaXRzKToKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZURlbHRhKToK KwogMjAxMi0wNy0xNiAgRXVnZW5lIEtseXVjaG5pa292ICA8ZXVzdGFzLmJpZ0BnbWFpbC5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wbGVtZW50IG1lc3NhZ2UgbG9vcCBpbnN0cnVt ZW50YXRpb24gZm9yIHRpbWVsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGNhMDA0 OTE2OGRkZTY1NWRmOGRkOTA3MmZkMGZkZjExNWVhYmEwZTguLjZmYTdjODFmYjU1ZTZlNmE0YTMw YjVmMmYzNzc2ZGRlMDQ5YWE2YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTItMDctMTYgIFNhbWkgS3lvc3RpbGEgIDxza3lvc3RpbEBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBPbmx5IGFwcGx5IHBhZ2Ugc2NhbGUgZGVsdGEgdG8g cm9vdCBzY3JvbGwgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkxMzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTmV3IHVuaXQgdGVzdAorICAgICAgICBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5w YWdlU2NhbGVEZWx0YUFwcGxpZWRUb1Jvb3RTY3JvbGxMYXllck9ubHkgdG8gdmVyaWZ5CisgICAg ICAgIHRoZSB0cmFuc2Zvcm1hdGlvbiBvZiBjaGlsZCBsYXllciB3aGlsZSBwaW5jaCB6b29taW5n LgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwOgorCiAyMDEy LTA3LTEzICBFcmljIFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hy b21pdW1dIEFkZCAnc2VsZi1tYW5hZ2VkJyBvcHRpb24gdG8gQ0NQcmlvcml0aXplZFRleHR1cmUg dG8gZW5hYmxlIHJlbmRlci1zdXJmYWNlIGFuZCBjYW52YXMgdXNlIGNhc2VzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCBhZGEzYzhlM2I4NjEwZTI3ZmQ0ZmE5 YjRmMDI3ZDRhMDJhOTJlMmIyLi45ZmUxYTEyOTVlYTgxMjc0YmE5ZGNhOTk0N2JkYTA3Nzg1OTE5 NjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtNzU4LDE4 ICs3NTgsNiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RTY3JvbGxzRm9yUGFnZVNjYWxlQ2hhbmdlKEND TGF5ZXJJbXBsKiBsYXllckltcGwsIGZsb2F0IHBhZ2VTYwogICAgICAgICBhZGp1c3RTY3JvbGxz Rm9yUGFnZVNjYWxlQ2hhbmdlKGxheWVySW1wbC0+Y2hpbGRyZW4oKVtpXS5nZXQoKSwgcGFnZVNj YWxlQ2hhbmdlKTsKIH0KIAotc3RhdGljIHZvaWQgYXBwbHlQYWdlU2NhbGVEZWx0YVRvU2Nyb2xs TGF5ZXJzKENDTGF5ZXJJbXBsKiBsYXllckltcGwsIGZsb2F0IHBhZ2VTY2FsZURlbHRhKQotewot ICAgIGlmICghbGF5ZXJJbXBsKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobGF5ZXJJbXBs LT5zY3JvbGxhYmxlKCkpCi0gICAgICAgIGxheWVySW1wbC0+c2V0UGFnZVNjYWxlRGVsdGEocGFn ZVNjYWxlRGVsdGEpOwotCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsYXllckltcGwtPmNo aWxkcmVuKCkuc2l6ZSgpOyArK2kpCi0gICAgICAgIGFwcGx5UGFnZVNjYWxlRGVsdGFUb1Njcm9s bExheWVycyhsYXllckltcGwtPmNoaWxkcmVuKClbaV0uZ2V0KCksIHBhZ2VTY2FsZURlbHRhKTsK LX0KLQogdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9h dCBkZXZpY2VTY2FsZUZhY3RvcikKIHsKICAgICBpZiAoZGV2aWNlU2NhbGVGYWN0b3IgPT0gbV9k ZXZpY2VTY2FsZUZhY3RvcikKQEAgLTgwNCw3ICs3OTIsOCBAQCB2b2lkIENDTGF5ZXJUcmVlSG9z dEltcGw6OnNldFBhZ2VTY2FsZUZhY3RvckFuZExpbWl0cyhmbG9hdCBwYWdlU2NhbGUsIGZsb2F0 IG1pbgogICAgIC8vIENsYW1wIGRlbHRhIHRvIGxpbWl0cyBhbmQgcmVmcmVzaCBkaXNwbGF5IG1h dHJpeC4KICAgICBzZXRQYWdlU2NhbGVEZWx0YShtX3BhZ2VTY2FsZURlbHRhIC8gbV9zZW50UGFn ZVNjYWxlRGVsdGEpOwogICAgIG1fc2VudFBhZ2VTY2FsZURlbHRhID0gMTsKLSAgICBhcHBseVBh Z2VTY2FsZURlbHRhVG9TY3JvbGxMYXllcnMobV9yb290U2Nyb2xsTGF5ZXJJbXBsLCBtX3BhZ2VT Y2FsZURlbHRhKTsKKyAgICBpZiAobV9yb290U2Nyb2xsTGF5ZXJJbXBsKQorICAgICAgICBtX3Jv b3RTY3JvbGxMYXllckltcGwtPnNldFBhZ2VTY2FsZURlbHRhKG1fcGFnZVNjYWxlRGVsdGEpOwog fQogCiB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZURlbHRhKGZsb2F0IGRl bHRhKQpAQCAtODIyLDcgKzgxMSw4IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0UGFn ZVNjYWxlRGVsdGEoZmxvYXQgZGVsdGEpCiAgICAgbV9wYWdlU2NhbGVEZWx0YSA9IGRlbHRhOwog CiAgICAgdXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKLSAgICBhcHBseVBhZ2VTY2FsZURlbHRh VG9TY3JvbGxMYXllcnMobV9yb290U2Nyb2xsTGF5ZXJJbXBsLCBtX3BhZ2VTY2FsZURlbHRhKTsK KyAgICBpZiAobV9yb290U2Nyb2xsTGF5ZXJJbXBsKQorICAgICAgICBtX3Jvb3RTY3JvbGxMYXll ckltcGwtPnNldFBhZ2VTY2FsZURlbHRhKG1fcGFnZVNjYWxlRGVsdGEpOwogfQogCiB2b2lkIEND TGF5ZXJUcmVlSG9zdEltcGw6OnVwZGF0ZU1heFNjcm9sbFBvc2l0aW9uKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5j cHAKaW5kZXggY2IyYjdmMzZmYTc1NDM5MDliMDAyODFkNWQ5YjE1OTI2OGQ4NjU1OC4uYWU4Mjhk OTllZThkZWFlYTc3YzE3OWQ4MzFiNjFiOWNkZmRiM2UzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKQEAg LTk4OSw2ICs5ODksMzIgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzY3JvbGxS b290QW5kQ2hhbmdlUGFnZVNjYWxlT25JbXBsVGhyZWFkKQogICAgIEVYUEVDVF9FUShtX2hvc3RJ bXBsLT5yb290TGF5ZXIoKS0+cGFnZVNjYWxlRGVsdGEoKSwgcGFnZVNjYWxlKTsKIH0KIAorVEVT VF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBwYWdlU2NhbGVEZWx0YUFwcGxpZWRUb1Jvb3RT Y3JvbGxMYXllck9ubHkpCit7CisgICAgSW50U2l6ZSBzdXJmYWNlU2l6ZSgxMCwgMTApOworICAg IGZsb2F0IGRlZmF1bHRQYWdlU2NhbGUgPSAxOworICAgIGZsb2F0IG5ld1BhZ2VTY2FsZSA9IDI7 CisKKyAgICAvLyBDcmVhdGUgYSBub3JtYWwgc2Nyb2xsYWJsZSByb290IGxheWVyIGFuZCBhbm90 aGVyIHNjcm9sbGFibGUgY2hpbGQgbGF5ZXIuCisgICAgc2V0dXBTY3JvbGxBbmRDb250ZW50c0xh eWVycyhzdXJmYWNlU2l6ZSk7CisgICAgQ0NMYXllckltcGwqIHJvb3QgPSBtX2hvc3RJbXBsLT5y b290TGF5ZXIoKTsKKyAgICBDQ0xheWVySW1wbCogY2hpbGQgPSByb290LT5jaGlsZHJlbigpWzBd LmdldCgpOworCisgICAgT3duUHRyPENDTGF5ZXJJbXBsPiBzY3JvbGxhYmxlQ2hpbGQgPSBjcmVh dGVTY3JvbGxhYmxlTGF5ZXIoMywgRmxvYXRQb2ludCgpLCBzdXJmYWNlU2l6ZSk7CisgICAgY2hp bGQtPmFkZENoaWxkKHNjcm9sbGFibGVDaGlsZC5yZWxlYXNlKCkpOworICAgIENDTGF5ZXJJbXBs KiBncmFuZENoaWxkID0gY2hpbGQtPmNoaWxkcmVuKClbMF0uZ2V0KCk7CisKKyAgICAvLyBTZXQg bmV3IHBhZ2Ugc2NhbGUgb24gaW1wbCB0aHJlYWQgYnkgcGluY2hpbmcuCisgICAgbV9ob3N0SW1w bC0+cGluY2hHZXN0dXJlQmVnaW4oKTsKKyAgICBtX2hvc3RJbXBsLT5waW5jaEdlc3R1cmVVcGRh dGUobmV3UGFnZVNjYWxlLCBJbnRQb2ludCgpKTsKKyAgICBtX2hvc3RJbXBsLT5waW5jaEdlc3R1 cmVFbmQoKTsKKworICAgIC8vIFRoZSBwYWdlIHNjYWxlIGRlbHRhIHNob3VsZCBvbmx5IGJlIGFw cGxpZWQgdG8gdGhlIHNjcm9sbGFibGUgcm9vdCBsYXllci4KKyAgICBFWFBFQ1RfRVEocm9vdC0+ cGFnZVNjYWxlRGVsdGEoKSwgbmV3UGFnZVNjYWxlKTsKKyAgICBFWFBFQ1RfRVEoY2hpbGQtPnBh Z2VTY2FsZURlbHRhKCksIGRlZmF1bHRQYWdlU2NhbGUpOworICAgIEVYUEVDVF9FUShncmFuZENo aWxkLT5wYWdlU2NhbGVEZWx0YSgpLCBkZWZhdWx0UGFnZVNjYWxlKTsKK30KKwogVEVTVF9GKEND TGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzY3JvbGxDaGlsZEFuZENoYW5nZVBhZ2VTY2FsZU9uTWFp blRocmVhZCkKIHsKICAgICBJbnRTaXplIHN1cmZhY2VTaXplKDEwLCAxMCk7Cg== 152552 2012-07-16 09:50:47 -0700 2012-07-16 12:06:13 -0700 Patch bug-91374-20120716175046.patch text/plain 6876 skyostil U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzllODc0OThmYmU0MGU4 YjRiZmY1NDQ3YmU0ODgyNDU1YmZjZDBmNS4uMjI0NGMzOGMxODQ4MDUzZjlhZTg1NTg5NGJmYjU3 NGFhMTg5M2I3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTE2ICBTYW1p IEt5b3N0aWxhICA8c2t5b3N0aWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g T25seSBhcHBseSBwYWdlIHNjYWxlIGRlbHRhIHRvIHJvb3Qgc2Nyb2xsIGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTM3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIHVzZXIgcGlu Y2gtem9vbXMgdGhlIHdlYiBwYWdlIHRob3VnaCB0aGUgQ2hyb21pdW0gY29tcG9zaXRvciwgdGhl CisgICAgICAgIHBlci1sYXllciBwYWdlIHNjYWxlIGRlbHRhIGlzIHVzZWQgdG8ga2VlcCB0cmFj ayBvZiB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZQorICAgICAgICBwYWdlIHNjYWxlIG9uIHRo ZSBjb21wb3NpdG9yIHRocmVhZCB2ZXJzdXMgdGhlIG1haW4gdGhyZWFkLiBPbiB0aGUgbmV4dAor ICAgICAgICBjb21taXQgdG8gdGhlIG1haW4gdGhyZWFkIHRoZXNlIHZhbHVlcyBhcmUgcmVzZXQg dG8gMS4KKworICAgICAgICBXaGVuIGNhbGN1bGF0aW5nIGxheWVyIHBvc2l0aW9ucywgdGhlIGNv bXBvc2l0b3IgYXBwbGllcyBhIGxheWVyJ3MgcGFnZSBzY2FsZQorICAgICAgICBkZWx0YSBib3Ro IHRvIHRoZSBsYXllciBpdHNlbGYgYXMgd2VsbCBhcyBhbGwgb2YgaXRzIGNoaWxkcmVuLiBTaW5j ZSB3ZSBhcmUKKyAgICAgICAgY3VycmVudGx5IHVwZGF0aW5nIHRoZSBwYWdlIHNjYWxlIGRlbHRh IG9uIGFsbCBzY3JvbGxhYmxlIGxheWVycywgdGhpcyByZXN1bHRzCisgICAgICAgIGluIHNjcm9s bGFibGUgY2hpbGQgbGF5ZXJzIGdldHRpbmcgc2NhbGVkIG11bHRpcGxlIHRpbWVzLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgY29tcG9zaXRvciB0byBvbmx5IGFwcGx5IHRoZSBw YWdlIHNjYWxlIGRlbHRhIG9uIHRoZQorICAgICAgICByb290IHNjcm9sbCBsYXllci4KKworICAg ICAgICBOZXcgdW5pdCB0ZXN0OiBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5wYWdlU2NhbGVEZWx0 YUFwcGxpZWRUb1Jvb3RTY3JvbGxMYXllck9ubHkKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6c2V0UGFnZVNjYWxlRmFjdG9yQW5kTGltaXRzKToKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZURlbHRhKToK KwogMjAxMi0wNy0xNiAgRXVnZW5lIEtseXVjaG5pa292ICA8ZXVzdGFzLmJpZ0BnbWFpbC5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wbGVtZW50IG1lc3NhZ2UgbG9vcCBpbnN0cnVt ZW50YXRpb24gZm9yIHRpbWVsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGNhMDA0 OTE2OGRkZTY1NWRmOGRkOTA3MmZkMGZkZjExNWVhYmEwZTguLjZmYTdjODFmYjU1ZTZlNmE0YTMw YjVmMmYzNzc2ZGRlMDQ5YWE2YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTItMDctMTYgIFNhbWkgS3lvc3RpbGEgIDxza3lvc3RpbEBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBPbmx5IGFwcGx5IHBhZ2Ugc2NhbGUgZGVsdGEgdG8g cm9vdCBzY3JvbGwgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkxMzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTmV3IHVuaXQgdGVzdAorICAgICAgICBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5w YWdlU2NhbGVEZWx0YUFwcGxpZWRUb1Jvb3RTY3JvbGxMYXllck9ubHkgdG8gdmVyaWZ5CisgICAg ICAgIHRoZSB0cmFuc2Zvcm1hdGlvbiBvZiBjaGlsZCBsYXllciB3aGlsZSBwaW5jaCB6b29taW5n LgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwOgorCiAyMDEy LTA3LTEzICBFcmljIFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hy b21pdW1dIEFkZCAnc2VsZi1tYW5hZ2VkJyBvcHRpb24gdG8gQ0NQcmlvcml0aXplZFRleHR1cmUg dG8gZW5hYmxlIHJlbmRlci1zdXJmYWNlIGFuZCBjYW52YXMgdXNlIGNhc2VzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCBhZGEzYzhlM2I4NjEwZTI3ZmQ0ZmE5 YjRmMDI3ZDRhMDJhOTJlMmIyLi45ZmUxYTEyOTVlYTgxMjc0YmE5ZGNhOTk0N2JkYTA3Nzg1OTE5 NjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtNzU4LDE4 ICs3NTgsNiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RTY3JvbGxzRm9yUGFnZVNjYWxlQ2hhbmdlKEND TGF5ZXJJbXBsKiBsYXllckltcGwsIGZsb2F0IHBhZ2VTYwogICAgICAgICBhZGp1c3RTY3JvbGxz Rm9yUGFnZVNjYWxlQ2hhbmdlKGxheWVySW1wbC0+Y2hpbGRyZW4oKVtpXS5nZXQoKSwgcGFnZVNj YWxlQ2hhbmdlKTsKIH0KIAotc3RhdGljIHZvaWQgYXBwbHlQYWdlU2NhbGVEZWx0YVRvU2Nyb2xs TGF5ZXJzKENDTGF5ZXJJbXBsKiBsYXllckltcGwsIGZsb2F0IHBhZ2VTY2FsZURlbHRhKQotewot ICAgIGlmICghbGF5ZXJJbXBsKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobGF5ZXJJbXBs LT5zY3JvbGxhYmxlKCkpCi0gICAgICAgIGxheWVySW1wbC0+c2V0UGFnZVNjYWxlRGVsdGEocGFn ZVNjYWxlRGVsdGEpOwotCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsYXllckltcGwtPmNo aWxkcmVuKCkuc2l6ZSgpOyArK2kpCi0gICAgICAgIGFwcGx5UGFnZVNjYWxlRGVsdGFUb1Njcm9s bExheWVycyhsYXllckltcGwtPmNoaWxkcmVuKClbaV0uZ2V0KCksIHBhZ2VTY2FsZURlbHRhKTsK LX0KLQogdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9h dCBkZXZpY2VTY2FsZUZhY3RvcikKIHsKICAgICBpZiAoZGV2aWNlU2NhbGVGYWN0b3IgPT0gbV9k ZXZpY2VTY2FsZUZhY3RvcikKQEAgLTgwNCw3ICs3OTIsOCBAQCB2b2lkIENDTGF5ZXJUcmVlSG9z dEltcGw6OnNldFBhZ2VTY2FsZUZhY3RvckFuZExpbWl0cyhmbG9hdCBwYWdlU2NhbGUsIGZsb2F0 IG1pbgogICAgIC8vIENsYW1wIGRlbHRhIHRvIGxpbWl0cyBhbmQgcmVmcmVzaCBkaXNwbGF5IG1h dHJpeC4KICAgICBzZXRQYWdlU2NhbGVEZWx0YShtX3BhZ2VTY2FsZURlbHRhIC8gbV9zZW50UGFn ZVNjYWxlRGVsdGEpOwogICAgIG1fc2VudFBhZ2VTY2FsZURlbHRhID0gMTsKLSAgICBhcHBseVBh Z2VTY2FsZURlbHRhVG9TY3JvbGxMYXllcnMobV9yb290U2Nyb2xsTGF5ZXJJbXBsLCBtX3BhZ2VT Y2FsZURlbHRhKTsKKyAgICBpZiAobV9yb290U2Nyb2xsTGF5ZXJJbXBsKQorICAgICAgICBtX3Jv b3RTY3JvbGxMYXllckltcGwtPnNldFBhZ2VTY2FsZURlbHRhKG1fcGFnZVNjYWxlRGVsdGEpOwog fQogCiB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZURlbHRhKGZsb2F0IGRl bHRhKQpAQCAtODIyLDcgKzgxMSw4IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0UGFn ZVNjYWxlRGVsdGEoZmxvYXQgZGVsdGEpCiAgICAgbV9wYWdlU2NhbGVEZWx0YSA9IGRlbHRhOwog CiAgICAgdXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKLSAgICBhcHBseVBhZ2VTY2FsZURlbHRh VG9TY3JvbGxMYXllcnMobV9yb290U2Nyb2xsTGF5ZXJJbXBsLCBtX3BhZ2VTY2FsZURlbHRhKTsK KyAgICBpZiAobV9yb290U2Nyb2xsTGF5ZXJJbXBsKQorICAgICAgICBtX3Jvb3RTY3JvbGxMYXll ckltcGwtPnNldFBhZ2VTY2FsZURlbHRhKG1fcGFnZVNjYWxlRGVsdGEpOwogfQogCiB2b2lkIEND TGF5ZXJUcmVlSG9zdEltcGw6OnVwZGF0ZU1heFNjcm9sbFBvc2l0aW9uKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5j cHAKaW5kZXggY2IyYjdmMzZmYTc1NDM5MDliMDAyODFkNWQ5YjE1OTI2OGQ4NjU1OC4uZTliOWYw MjgxM2NjYjNjZjNhOWU1MThjMjJiYmRhNDc2Y2JjM2Y2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKQEAg LTk4OSw2ICs5ODksNDUgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzY3JvbGxS b290QW5kQ2hhbmdlUGFnZVNjYWxlT25JbXBsVGhyZWFkKQogICAgIEVYUEVDVF9FUShtX2hvc3RJ bXBsLT5yb290TGF5ZXIoKS0+cGFnZVNjYWxlRGVsdGEoKSwgcGFnZVNjYWxlKTsKIH0KIAorVEVT VF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBwYWdlU2NhbGVEZWx0YUFwcGxpZWRUb1Jvb3RT Y3JvbGxMYXllck9ubHkpCit7CisgICAgSW50U2l6ZSBzdXJmYWNlU2l6ZSgxMCwgMTApOworICAg IGZsb2F0IGRlZmF1bHRQYWdlU2NhbGUgPSAxOworICAgIGZsb2F0IG5ld1BhZ2VTY2FsZSA9IDI7 CisKKyAgICAvLyBDcmVhdGUgYSBub3JtYWwgc2Nyb2xsYWJsZSByb290IGxheWVyIGFuZCBhbm90 aGVyIHNjcm9sbGFibGUgY2hpbGQgbGF5ZXIuCisgICAgc2V0dXBTY3JvbGxBbmRDb250ZW50c0xh eWVycyhzdXJmYWNlU2l6ZSk7CisgICAgQ0NMYXllckltcGwqIHJvb3QgPSBtX2hvc3RJbXBsLT5y b290TGF5ZXIoKTsKKyAgICBDQ0xheWVySW1wbCogY2hpbGQgPSByb290LT5jaGlsZHJlbigpWzBd LmdldCgpOworCisgICAgT3duUHRyPENDTGF5ZXJJbXBsPiBzY3JvbGxhYmxlQ2hpbGQgPSBjcmVh dGVTY3JvbGxhYmxlTGF5ZXIoMywgRmxvYXRQb2ludCg1LCA1KSwgc3VyZmFjZVNpemUpOworICAg IGNoaWxkLT5hZGRDaGlsZChzY3JvbGxhYmxlQ2hpbGQucmVsZWFzZSgpKTsKKyAgICBDQ0xheWVy SW1wbCogZ3JhbmRDaGlsZCA9IGNoaWxkLT5jaGlsZHJlbigpWzBdLmdldCgpOworCisgICAgLy8g U2V0IG5ldyBwYWdlIHNjYWxlIG9uIGltcGwgdGhyZWFkIGJ5IHBpbmNoaW5nLgorICAgIG1faG9z dEltcGwtPnBpbmNoR2VzdHVyZUJlZ2luKCk7CisgICAgbV9ob3N0SW1wbC0+cGluY2hHZXN0dXJl VXBkYXRlKG5ld1BhZ2VTY2FsZSwgSW50UG9pbnQoKSk7CisgICAgbV9ob3N0SW1wbC0+cGluY2hH ZXN0dXJlRW5kKCk7CisKKyAgICAvLyBUaGUgcGFnZSBzY2FsZSBkZWx0YSBzaG91bGQgb25seSBi ZSBhcHBsaWVkIHRvIHRoZSBzY3JvbGxhYmxlIHJvb3QgbGF5ZXIuCisgICAgRVhQRUNUX0VRKHJv b3QtPnBhZ2VTY2FsZURlbHRhKCksIG5ld1BhZ2VTY2FsZSk7CisgICAgRVhQRUNUX0VRKGNoaWxk LT5wYWdlU2NhbGVEZWx0YSgpLCBkZWZhdWx0UGFnZVNjYWxlKTsKKyAgICBFWFBFQ1RfRVEoZ3Jh bmRDaGlsZC0+cGFnZVNjYWxlRGVsdGEoKSwgZGVmYXVsdFBhZ2VTY2FsZSk7CisKKyAgICAvLyBN YWtlIHN1cmUgYWxsIHRoZSBsYXllcnMgYXJlIGRyYXduIHdpdGggdGhlIHBhZ2Ugc2NhbGUgZGVs dGEgYXBwbGllZCwgaS5lLiwgdGhlIHBhZ2Ugc2NhbGUKKyAgICAvLyBkZWx0YSBvbiB0aGUgcm9v dCBsYXllciBpcyBhcHBsaWVkIGhpZXJhcmNoaWNhbGx5LgorICAgIENDTGF5ZXJUcmVlSG9zdElt cGw6OkZyYW1lRGF0YSBmcmFtZTsKKyAgICBFWFBFQ1RfVFJVRShtX2hvc3RJbXBsLT5wcmVwYXJl VG9EcmF3KGZyYW1lKSk7CisgICAgbV9ob3N0SW1wbC0+ZHJhd0xheWVycyhmcmFtZSk7CisgICAg bV9ob3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CisKKyAgICBXZWJUcmFuc2Zvcm1h dGlvbk1hdHJpeCBwYWdlU2NhbGVUcmFuc2Zvcm07CisgICAgcGFnZVNjYWxlVHJhbnNmb3JtLnNj YWxlKG5ld1BhZ2VTY2FsZSk7CisgICAgRVhQRUNUX0VRKHJvb3QtPmRyYXdUcmFuc2Zvcm0oKSwg cGFnZVNjYWxlVHJhbnNmb3JtKTsKKyAgICBFWFBFQ1RfRVEoY2hpbGQtPmRyYXdUcmFuc2Zvcm0o KSwgcGFnZVNjYWxlVHJhbnNmb3JtKTsKKyAgICBFWFBFQ1RfRVEoZ3JhbmRDaGlsZC0+ZHJhd1Ry YW5zZm9ybSgpLCBwYWdlU2NhbGVUcmFuc2Zvcm0pOworfQorCiBURVNUX0YoQ0NMYXllclRyZWVI b3N0SW1wbFRlc3QsIHNjcm9sbENoaWxkQW5kQ2hhbmdlUGFnZVNjYWxlT25NYWluVGhyZWFkKQog ewogICAgIEludFNpemUgc3VyZmFjZVNpemUoMTAsIDEwKTsK