148490 2015-08-26 12:57:55 -0700 Use WorkQueue::concurrentApply in FEConvolveMatrix 2015-08-27 11:49:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 148497 1 andersca andersca aestes oldest_to_newest 1121031 0 andersca 2015-08-26 12:57:55 -0700 Use WorkQueue::concurrentApply in FEConvolveMatrix 1121032 1 259972 andersca 2015-08-26 13:02:41 -0700 Created attachment 259972 Patch 1121036 2 259974 andersca 2015-08-26 13:25:29 -0700 Created attachment 259974 Patch 1121045 3 andersca 2015-08-26 13:44:19 -0700 Committed r188987: <http://trac.webkit.org/changeset/188987> 1121048 4 259974 sabouhallawa 2015-08-26 13:54:20 -0700 Comment on attachment 259974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259974&action=review > Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp:459 > + }); If chunkCount == 1, should not we fallback to single thread mode? 1121053 5 259974 andersca 2015-08-26 14:03:29 -0700 Comment on attachment 259974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259974&action=review >> Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp:459 >> + }); > > If chunkCount == 1, should not we fallback to single thread mode? WorkQueue::concurrentApply does that. 1121107 6 aestes 2015-08-26 17:06:08 -0700 This caused imported/mozilla/svg/filters/feConvolveMatrix-1.svg to start failing. See <https://bugs.webkit.org/show_bug.cgi?id=148497> for details. 1121377 7 ap 2015-08-27 11:34:47 -0700 As this broke a test, do we want to keep this in, or to roll out? 1121385 8 andersca 2015-08-27 11:49:51 -0700 (In reply to comment #7) > As this broke a test, do we want to keep this in, or to roll out? Looking at it. 259972 2015-08-26 13:02:41 -0700 2015-08-26 13:25:26 -0700 Patch bug-148490-20150826130230.patch text/plain 6792 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4OTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY2MWY1ODIzZDkzYmY1 MDc0MTAwYTMzNTE1Mjg1ZTQ3Y2E2MzE2My4uNGY2MDcxNDAxZTQ2YmYyYzUyMWZkNzM5NjE0Mjc2 OGU3YTFiNjM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIFdvcmtRdWV1 ZTo6Y29uY3VycmVudEFwcGx5IGluIEZFQ29udm9sdmVNYXRyaXgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ5MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIFdvcmtRdWV1ZTo6Y29uY3VycmVu dEFwcGx5IGxldHMgdXMgc2ltcGxpZnkgdGhlIGNvZGUgYSBsb3QsIGFuZCBtZWFzdXJlbWVudHMg c2hvdworICAgICAgICBubyBkaWZmZXJlbmNlIGluIHBlcmZvcm1hbmNlLiBUaGUgc3RyaWRpbmcg aGFzIGJlZW4gc2xpZ2h0bHkgdHdlYWtlZCB0byBtYWtlIG1vcmUgc2Vuc2UKKyAgICAgICAgKHdl IG5vIGxvbmdlciBkaXZpZGUgdXAgdGhlIHJlbWFpbmRlciBhY3Jvc3Mgc29tZSBvZiB0aGUgaXRl cmF0aW9ucywgaW5zdGVhZCB3ZSBqdXN0IHByb2Nlc3MgCisgICAgICAgIGl0IHNlcGFyYXRlbHkg bGFzdCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVN YXRyaXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVDb252b2x2ZU1hdHJpeDo6cGxhdGZvcm1B cHBseVNvZnR3YXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkZFQ29udm9sdmVNYXRyaXg6OnNldElu dGVyaW9yUGl4ZWxzV29ya2VyKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguaDoKKwogMjAxNS0wOC0yNiAgUGVyIEFybmUgVm9s bGFuICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW0N1cmxdIERlYWRsb2NrIHdoZW4g ZG93bmxvYWRpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZmlsdGVycy9GRUNvbnZvbHZlTWF0cml4LmNwcAppbmRleCBkYzdmOWFhN2EyNDkx ZjEzNDRhZTM5YTM3MGNkYjk4YzEyOWJiMjdiLi4wMzYxMjA0NTdmNjU1NDM4ZmQ2YTk2NGQyMDhi NjZjZmMyZTZjMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb252b2x2ZU1hdHJpeC5jcHAKQEAgLTI5LDYgKzI5LDcg QEAKIAogI2luY2x1ZGUgPHJ1bnRpbWUvVWludDhDbGFtcGVkQXJyYXkuaD4KICNpbmNsdWRlIDx3 dGYvUGFyYWxsZWxKb2JzLmg+CisjaW5jbHVkZSA8d3RmL1dvcmtRdWV1ZS5oPgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKQEAgLTQwOCwxMSArNDA5LDYgQEAgQUxXQVlTX0lOTElORSB2b2lkIEZF Q29udm9sdmVNYXRyaXg6OnNldE91dGVyUGl4ZWxzKFBhaW50aW5nRGF0YSYgcGFpbnRpbmdEYXRh LAogICAgICAgICBmYXN0U2V0T3V0ZXJQaXhlbHM8ZmFsc2U+KHBhaW50aW5nRGF0YSwgeDEsIHkx LCB4MiwgeTIpOwogfQogCi12b2lkIEZFQ29udm9sdmVNYXRyaXg6OnNldEludGVyaW9yUGl4ZWxz V29ya2VyKEludGVyaW9yUGl4ZWxQYXJhbWV0ZXJzKiBwYXJhbSkKLXsKLSAgICBwYXJhbS0+Zmls dGVyLT5zZXRJbnRlcmlvclBpeGVscygqcGFyYW0tPnBhaW50aW5nRGF0YSwgcGFyYW0tPmNsaXBS aWdodCwgcGFyYW0tPmNsaXBCb3R0b20sIHBhcmFtLT55U3RhcnQsIHBhcmFtLT55RW5kKTsKLX0K LQogdm9pZCBGRUNvbnZvbHZlTWF0cml4OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUoKQogewogICAg IEZpbHRlckVmZmVjdCogaW4gPSBpbnB1dEVmZmVjdCgwKTsKQEAgLTQ0NSw1MCArNDQxLDMzIEBA IHZvaWQgRkVDb252b2x2ZU1hdHJpeDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICBpbnQg Y2xpcFJpZ2h0ID0gcGFpbnRTaXplLndpZHRoKCkgLSBtX2tlcm5lbFNpemUud2lkdGgoKTsKICAg ICBpbnQgY2xpcEJvdHRvbSA9IHBhaW50U2l6ZS5oZWlnaHQoKSAtIG1fa2VybmVsU2l6ZS5oZWln aHQoKTsKIAotICAgIGlmIChjbGlwUmlnaHQgPj0gMCAmJiBjbGlwQm90dG9tID49IDApIHsKLQot ICAgICAgICBpbnQgb3B0aW1hbFRocmVhZE51bWJlciA9IChhYnNvbHV0ZVBhaW50UmVjdCgpLndp ZHRoKCkgKiBhYnNvbHV0ZVBhaW50UmVjdCgpLmhlaWdodCgpKSAvIHNfbWluaW1hbFJlY3REaW1l bnNpb247Ci0gICAgICAgIGlmIChvcHRpbWFsVGhyZWFkTnVtYmVyID4gMSkgewotICAgICAgICAg ICAgV1RGOjpQYXJhbGxlbEpvYnM8SW50ZXJpb3JQaXhlbFBhcmFtZXRlcnM+IHBhcmFsbGVsSm9i cygmV2ViQ29yZTo6RkVDb252b2x2ZU1hdHJpeDo6c2V0SW50ZXJpb3JQaXhlbHNXb3JrZXIsIG9w dGltYWxUaHJlYWROdW1iZXIpOwotICAgICAgICAgICAgY29uc3QgaW50IG51bU9mVGhyZWFkcyA9 IHBhcmFsbGVsSm9icy5udW1iZXJPZkpvYnMoKTsKLQotICAgICAgICAgICAgLy8gU3BsaXQgdGhl IGpvYiBpbnRvICJoZWlnaHRQZXJUaHJlYWQiIGpvYnMgYnV0IHRoZXJlIGEgZmV3IGpvYnMgdGhh dCBuZWVkIHRvIGJlIHNsaWdodGx5IGxhcmdlciBzaW5jZQotICAgICAgICAgICAgLy8gaGVpZ2h0 UGVyVGhyZWFkICogam9icyA8IHRvdGFsIHNpemUuIFRoZXNlIGV4dHJhcyBhcmUgaGFuZGxlZCBi eSB0aGUgcmVtYWluZGVyICJqb2JzV2l0aEV4dHJhIi4KLSAgICAgICAgICAgIGNvbnN0IGludCBo ZWlnaHRQZXJUaHJlYWQgPSBjbGlwQm90dG9tIC8gbnVtT2ZUaHJlYWRzOwotICAgICAgICAgICAg Y29uc3QgaW50IGpvYnNXaXRoRXh0cmEgPSBjbGlwQm90dG9tICUgbnVtT2ZUaHJlYWRzOwotCi0g ICAgICAgICAgICBpbnQgc3RhcnRZID0gMDsKLSAgICAgICAgICAgIGZvciAoaW50IGpvYiA9IDA7 IGpvYiA8IG51bU9mVGhyZWFkczsgKytqb2IpIHsKLSAgICAgICAgICAgICAgICBJbnRlcmlvclBp eGVsUGFyYW1ldGVycyYgcGFyYW0gPSBwYXJhbGxlbEpvYnMucGFyYW1ldGVyKGpvYik7Ci0gICAg ICAgICAgICAgICAgcGFyYW0uZmlsdGVyID0gdGhpczsKLSAgICAgICAgICAgICAgICBwYXJhbS5w YWludGluZ0RhdGEgPSAmcGFpbnRpbmdEYXRhOwotICAgICAgICAgICAgICAgIHBhcmFtLmNsaXBS aWdodCA9IGNsaXBSaWdodDsKLSAgICAgICAgICAgICAgICBwYXJhbS5jbGlwQm90dG9tID0gY2xp cEJvdHRvbTsKLSAgICAgICAgICAgICAgICBwYXJhbS55U3RhcnQgPSBzdGFydFk7Ci0gICAgICAg ICAgICAgICAgc3RhcnRZICs9IGpvYiA8IGpvYnNXaXRoRXh0cmEgPyBoZWlnaHRQZXJUaHJlYWQg KyAxIDogaGVpZ2h0UGVyVGhyZWFkOwotICAgICAgICAgICAgICAgIHBhcmFtLnlFbmQgPSBzdGFy dFk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIHBhcmFsbGVsSm9icy5leGVjdXRlKCk7 Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBGYWxsYmFjayB0byBzaW5nbGUgdGhy ZWFkZWQgbW9kZS4KLSAgICAgICAgICAgIHNldEludGVyaW9yUGl4ZWxzKHBhaW50aW5nRGF0YSwg Y2xpcFJpZ2h0LCBjbGlwQm90dG9tLCAwLCBjbGlwQm90dG9tKTsKLSAgICAgICAgfQotCi0gICAg ICAgIGNsaXBSaWdodCArPSBtX3RhcmdldE9mZnNldC54KCkgKyAxOwotICAgICAgICBjbGlwQm90 dG9tICs9IG1fdGFyZ2V0T2Zmc2V0LnkoKSArIDE7Ci0gICAgICAgIGlmIChtX3RhcmdldE9mZnNl dC55KCkgPiAwKQotICAgICAgICAgICAgc2V0T3V0ZXJQaXhlbHMocGFpbnRpbmdEYXRhLCAwLCAw LCBwYWludFNpemUud2lkdGgoKSwgbV90YXJnZXRPZmZzZXQueSgpKTsKLSAgICAgICAgaWYgKGNs aXBCb3R0b20gPCBwYWludFNpemUuaGVpZ2h0KCkpCi0gICAgICAgICAgICBzZXRPdXRlclBpeGVs cyhwYWludGluZ0RhdGEsIDAsIGNsaXBCb3R0b20sIHBhaW50U2l6ZS53aWR0aCgpLCBwYWludFNp emUuaGVpZ2h0KCkpOwotICAgICAgICBpZiAobV90YXJnZXRPZmZzZXQueCgpID4gMCkKLSAgICAg ICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgbV90YXJnZXRPZmZzZXQueSgp LCBtX3RhcmdldE9mZnNldC54KCksIGNsaXBCb3R0b20pOwotICAgICAgICBpZiAoY2xpcFJpZ2h0 IDwgcGFpbnRTaXplLndpZHRoKCkpCi0gICAgICAgICAgICBzZXRPdXRlclBpeGVscyhwYWludGlu Z0RhdGEsIGNsaXBSaWdodCwgbV90YXJnZXRPZmZzZXQueSgpLCBwYWludFNpemUud2lkdGgoKSwg Y2xpcEJvdHRvbSk7Ci0gICAgfSBlbHNlIHsKKyAgICBpZiAoY2xpcFJpZ2h0IDwgMCB8fCBjbGlw Qm90dG9tIDwgMCkgewogICAgICAgICAvLyBSYXJlIHNpdHVhdGlvbiwgbm90IG9wdGltaXppZWQg Zm9yIHNwZWVkCiAgICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgMCwgcGFp bnRTaXplLndpZHRoKCksIHBhaW50U2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIHJldHVybjsKICAg ICB9CisKKyAgICBpbnQgaXRlcmF0aW9ucyA9IChhYnNvbHV0ZVBhaW50UmVjdCgpLndpZHRoKCkg KiBhYnNvbHV0ZVBhaW50UmVjdCgpLmhlaWdodCgpKSAvIHNfbWluaW1hbFJlY3REaW1lbnNpb247 CisgICAgaW50IHN0cmlkZSA9IGNsaXBCb3R0b20gLyBpdGVyYXRpb25zOworICAgIGludCBjaHVu a0NvdW50ID0gKGNsaXBCb3R0b20gKyBzdHJpZGUgLSAxKSAvIHN0cmlkZTsKKworICAgIFdvcmtR dWV1ZTo6Y29uY3VycmVudEFwcGx5KGNodW5rQ291bnQsIFsmXShzaXplX3QgaW5kZXgpIHsKKyAg ICAgICAgaW50IHlTdGFydCA9IChzdHJpZGUgKiBpbmRleCk7CisgICAgICAgIGludCB5RW5kID0g c3RkOjptaW48aW50PihzdHJpZGUgKiAoaW5kZXggKyAxKSwgY2xpcEJvdHRvbSk7CisKKyAgICAg ICAgc2V0SW50ZXJpb3JQaXhlbHMocGFpbnRpbmdEYXRhLCBjbGlwUmlnaHQsIGNsaXBCb3R0b20s IHlTdGFydCwgeUVuZCk7CisgICAgfSk7CisKKyAgICBjbGlwUmlnaHQgKz0gbV90YXJnZXRPZmZz ZXQueCgpICsgMTsKKyAgICBjbGlwQm90dG9tICs9IG1fdGFyZ2V0T2Zmc2V0LnkoKSArIDE7Cisg ICAgaWYgKG1fdGFyZ2V0T2Zmc2V0LnkoKSA+IDApCisgICAgICAgIHNldE91dGVyUGl4ZWxzKHBh aW50aW5nRGF0YSwgMCwgMCwgcGFpbnRTaXplLndpZHRoKCksIG1fdGFyZ2V0T2Zmc2V0LnkoKSk7 CisgICAgaWYgKGNsaXBCb3R0b20gPCBwYWludFNpemUuaGVpZ2h0KCkpCisgICAgICAgIHNldE91 dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgY2xpcEJvdHRvbSwgcGFpbnRTaXplLndpZHRoKCks IHBhaW50U2l6ZS5oZWlnaHQoKSk7CisgICAgaWYgKG1fdGFyZ2V0T2Zmc2V0LngoKSA+IDApCisg ICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgbV90YXJnZXRPZmZzZXQueSgp LCBtX3RhcmdldE9mZnNldC54KCksIGNsaXBCb3R0b20pOworICAgIGlmIChjbGlwUmlnaHQgPCBw YWludFNpemUud2lkdGgoKSkKKyAgICAgICAgc2V0T3V0ZXJQaXhlbHMocGFpbnRpbmdEYXRhLCBj bGlwUmlnaHQsIG1fdGFyZ2V0T2Zmc2V0LnkoKSwgcGFpbnRTaXplLndpZHRoKCksIGNsaXBCb3R0 b20pOwogfQogCiB2b2lkIEZFQ29udm9sdmVNYXRyaXg6OmR1bXAoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbnZvbHZlTWF0cml4Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRy aXguaAppbmRleCBkY2M5YTZlMDJjMTE1MzhhNTc5MmM5NGY3YTkwMjA5NjMzNjIwYTU5Li4wNWQ2 NGFhMWUxOWMyNTkyYTdlMDJkMGIwN2FkYzIwMjBjMWVjN2VmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRy aXguaApAQCAtMTAzLDIwICsxMDMsNiBAQCBwcml2YXRlOgogICAgIC8vIFBhcmFsbGVsaXphdGlv biBwYXJ0cwogICAgIHN0YXRpYyBjb25zdCBpbnQgc19taW5pbWFsUmVjdERpbWVuc2lvbiA9ICgx MDAgKiAxMDApOyAvLyBFbXBpcmljYWwgZGF0YSBsaW1pdCBmb3IgcGFyYWxsZWwgam9icwogCi0g ICAgdGVtcGxhdGU8dHlwZW5hbWUgVHlwZT4KLSAgICBmcmllbmQgY2xhc3MgUGFyYWxsZWxKb2Jz OwotCi0gICAgc3RydWN0IEludGVyaW9yUGl4ZWxQYXJhbWV0ZXJzIHsKLSAgICAgICAgRkVDb252 b2x2ZU1hdHJpeCogZmlsdGVyOwotICAgICAgICBQYWludGluZ0RhdGEqIHBhaW50aW5nRGF0YTsK LSAgICAgICAgaW50IGNsaXBCb3R0b207Ci0gICAgICAgIGludCBjbGlwUmlnaHQ7Ci0gICAgICAg IGludCB5U3RhcnQ7Ci0gICAgICAgIGludCB5RW5kOwotICAgIH07Ci0KLSAgICBzdGF0aWMgdm9p ZCBzZXRJbnRlcmlvclBpeGVsc1dvcmtlcihJbnRlcmlvclBpeGVsUGFyYW1ldGVycyopOwotCiAg ICAgSW50U2l6ZSBtX2tlcm5lbFNpemU7CiAgICAgZmxvYXQgbV9kaXZpc29yOwogICAgIGZsb2F0 IG1fYmlhczsK 259974 2015-08-26 13:25:29 -0700 2015-08-26 13:40:01 -0700 Patch bug-148490-20150826132517.patch text/plain 7371 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4OTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY2MWY1ODIzZDkzYmY1 MDc0MTAwYTMzNTE1Mjg1ZTQ3Y2E2MzE2My4uNGY2MDcxNDAxZTQ2YmYyYzUyMWZkNzM5NjE0Mjc2 OGU3YTFiNjM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIFdvcmtRdWV1 ZTo6Y29uY3VycmVudEFwcGx5IGluIEZFQ29udm9sdmVNYXRyaXgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ5MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIFdvcmtRdWV1ZTo6Y29uY3VycmVu dEFwcGx5IGxldHMgdXMgc2ltcGxpZnkgdGhlIGNvZGUgYSBsb3QsIGFuZCBtZWFzdXJlbWVudHMg c2hvdworICAgICAgICBubyBkaWZmZXJlbmNlIGluIHBlcmZvcm1hbmNlLiBUaGUgc3RyaWRpbmcg aGFzIGJlZW4gc2xpZ2h0bHkgdHdlYWtlZCB0byBtYWtlIG1vcmUgc2Vuc2UKKyAgICAgICAgKHdl IG5vIGxvbmdlciBkaXZpZGUgdXAgdGhlIHJlbWFpbmRlciBhY3Jvc3Mgc29tZSBvZiB0aGUgaXRl cmF0aW9ucywgaW5zdGVhZCB3ZSBqdXN0IHByb2Nlc3MgCisgICAgICAgIGl0IHNlcGFyYXRlbHkg bGFzdCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVN YXRyaXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVDb252b2x2ZU1hdHJpeDo6cGxhdGZvcm1B cHBseVNvZnR3YXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkZFQ29udm9sdmVNYXRyaXg6OnNldElu dGVyaW9yUGl4ZWxzV29ya2VyKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguaDoKKwogMjAxNS0wOC0yNiAgUGVyIEFybmUgVm9s bGFuICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW0N1cmxdIERlYWRsb2NrIHdoZW4g ZG93bmxvYWRpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuY3BwIGIv U291cmNlL1dURi93dGYvV29ya1F1ZXVlLmNwcAppbmRleCBhYzM4MTIyMzM5ZDhjM2E1ZGZjNDc4 MmQ3NjYxYmQzZTYyM2FkNzY4Li40M2I2NDUwYjI1NmQxYzgyMWYwOGY1YzgzNjJkYTM4M2FiYzE5 NjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuY3BwCisrKyBiL1NvdXJj ZS9XVEYvd3RmL1dvcmtRdWV1ZS5jcHAKQEAgLTI3LDEzICsyNywxMyBAQAogI2luY2x1ZGUgIldv cmtRdWV1ZS5oIgogCiAjaW5jbHVkZSA8bXV0ZXg+Ci0jaW5jbHVkZSA8d3RmL0JpbmFyeVNlbWFw aG9yZS5oPgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVldWUuaD4KICNpbmNsdWRlIDx3dGYvTmV2 ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvTnVtYmVyT2ZDb3Jlcy5oPgogI2luY2x1ZGUg PHd0Zi9SZWYuaD4KICNpbmNsdWRlIDx3dGYvVGhyZWFkaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3Rl eHQvV1RGU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL3RocmVhZHMvQmluYXJ5U2VtYXBob3JlLmg+ CiAKIG5hbWVzcGFjZSBXVEYgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbnZvbHZlTWF0cml4LmNwcAppbmRleCBkYzdm OWFhN2EyNDkxZjEzNDRhZTM5YTM3MGNkYjk4YzEyOWJiMjdiLi4wMzYxMjA0NTdmNjU1NDM4ZmQ2 YTk2NGQyMDhiNjZjZmMyZTZjMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRyaXguY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb252b2x2ZU1hdHJpeC5jcHAKQEAgLTI5 LDYgKzI5LDcgQEAKIAogI2luY2x1ZGUgPHJ1bnRpbWUvVWludDhDbGFtcGVkQXJyYXkuaD4KICNp bmNsdWRlIDx3dGYvUGFyYWxsZWxKb2JzLmg+CisjaW5jbHVkZSA8d3RmL1dvcmtRdWV1ZS5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQwOCwxMSArNDA5LDYgQEAgQUxXQVlTX0lOTElO RSB2b2lkIEZFQ29udm9sdmVNYXRyaXg6OnNldE91dGVyUGl4ZWxzKFBhaW50aW5nRGF0YSYgcGFp bnRpbmdEYXRhLAogICAgICAgICBmYXN0U2V0T3V0ZXJQaXhlbHM8ZmFsc2U+KHBhaW50aW5nRGF0 YSwgeDEsIHkxLCB4MiwgeTIpOwogfQogCi12b2lkIEZFQ29udm9sdmVNYXRyaXg6OnNldEludGVy aW9yUGl4ZWxzV29ya2VyKEludGVyaW9yUGl4ZWxQYXJhbWV0ZXJzKiBwYXJhbSkKLXsKLSAgICBw YXJhbS0+ZmlsdGVyLT5zZXRJbnRlcmlvclBpeGVscygqcGFyYW0tPnBhaW50aW5nRGF0YSwgcGFy YW0tPmNsaXBSaWdodCwgcGFyYW0tPmNsaXBCb3R0b20sIHBhcmFtLT55U3RhcnQsIHBhcmFtLT55 RW5kKTsKLX0KLQogdm9pZCBGRUNvbnZvbHZlTWF0cml4OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUo KQogewogICAgIEZpbHRlckVmZmVjdCogaW4gPSBpbnB1dEVmZmVjdCgwKTsKQEAgLTQ0NSw1MCAr NDQxLDMzIEBAIHZvaWQgRkVDb252b2x2ZU1hdHJpeDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkK ICAgICBpbnQgY2xpcFJpZ2h0ID0gcGFpbnRTaXplLndpZHRoKCkgLSBtX2tlcm5lbFNpemUud2lk dGgoKTsKICAgICBpbnQgY2xpcEJvdHRvbSA9IHBhaW50U2l6ZS5oZWlnaHQoKSAtIG1fa2VybmVs U2l6ZS5oZWlnaHQoKTsKIAotICAgIGlmIChjbGlwUmlnaHQgPj0gMCAmJiBjbGlwQm90dG9tID49 IDApIHsKLQotICAgICAgICBpbnQgb3B0aW1hbFRocmVhZE51bWJlciA9IChhYnNvbHV0ZVBhaW50 UmVjdCgpLndpZHRoKCkgKiBhYnNvbHV0ZVBhaW50UmVjdCgpLmhlaWdodCgpKSAvIHNfbWluaW1h bFJlY3REaW1lbnNpb247Ci0gICAgICAgIGlmIChvcHRpbWFsVGhyZWFkTnVtYmVyID4gMSkgewot ICAgICAgICAgICAgV1RGOjpQYXJhbGxlbEpvYnM8SW50ZXJpb3JQaXhlbFBhcmFtZXRlcnM+IHBh cmFsbGVsSm9icygmV2ViQ29yZTo6RkVDb252b2x2ZU1hdHJpeDo6c2V0SW50ZXJpb3JQaXhlbHNX b3JrZXIsIG9wdGltYWxUaHJlYWROdW1iZXIpOwotICAgICAgICAgICAgY29uc3QgaW50IG51bU9m VGhyZWFkcyA9IHBhcmFsbGVsSm9icy5udW1iZXJPZkpvYnMoKTsKLQotICAgICAgICAgICAgLy8g U3BsaXQgdGhlIGpvYiBpbnRvICJoZWlnaHRQZXJUaHJlYWQiIGpvYnMgYnV0IHRoZXJlIGEgZmV3 IGpvYnMgdGhhdCBuZWVkIHRvIGJlIHNsaWdodGx5IGxhcmdlciBzaW5jZQotICAgICAgICAgICAg Ly8gaGVpZ2h0UGVyVGhyZWFkICogam9icyA8IHRvdGFsIHNpemUuIFRoZXNlIGV4dHJhcyBhcmUg aGFuZGxlZCBieSB0aGUgcmVtYWluZGVyICJqb2JzV2l0aEV4dHJhIi4KLSAgICAgICAgICAgIGNv bnN0IGludCBoZWlnaHRQZXJUaHJlYWQgPSBjbGlwQm90dG9tIC8gbnVtT2ZUaHJlYWRzOwotICAg ICAgICAgICAgY29uc3QgaW50IGpvYnNXaXRoRXh0cmEgPSBjbGlwQm90dG9tICUgbnVtT2ZUaHJl YWRzOwotCi0gICAgICAgICAgICBpbnQgc3RhcnRZID0gMDsKLSAgICAgICAgICAgIGZvciAoaW50 IGpvYiA9IDA7IGpvYiA8IG51bU9mVGhyZWFkczsgKytqb2IpIHsKLSAgICAgICAgICAgICAgICBJ bnRlcmlvclBpeGVsUGFyYW1ldGVycyYgcGFyYW0gPSBwYXJhbGxlbEpvYnMucGFyYW1ldGVyKGpv Yik7Ci0gICAgICAgICAgICAgICAgcGFyYW0uZmlsdGVyID0gdGhpczsKLSAgICAgICAgICAgICAg ICBwYXJhbS5wYWludGluZ0RhdGEgPSAmcGFpbnRpbmdEYXRhOwotICAgICAgICAgICAgICAgIHBh cmFtLmNsaXBSaWdodCA9IGNsaXBSaWdodDsKLSAgICAgICAgICAgICAgICBwYXJhbS5jbGlwQm90 dG9tID0gY2xpcEJvdHRvbTsKLSAgICAgICAgICAgICAgICBwYXJhbS55U3RhcnQgPSBzdGFydFk7 Ci0gICAgICAgICAgICAgICAgc3RhcnRZICs9IGpvYiA8IGpvYnNXaXRoRXh0cmEgPyBoZWlnaHRQ ZXJUaHJlYWQgKyAxIDogaGVpZ2h0UGVyVGhyZWFkOwotICAgICAgICAgICAgICAgIHBhcmFtLnlF bmQgPSBzdGFydFk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIHBhcmFsbGVsSm9icy5l eGVjdXRlKCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBGYWxsYmFjayB0byBz aW5nbGUgdGhyZWFkZWQgbW9kZS4KLSAgICAgICAgICAgIHNldEludGVyaW9yUGl4ZWxzKHBhaW50 aW5nRGF0YSwgY2xpcFJpZ2h0LCBjbGlwQm90dG9tLCAwLCBjbGlwQm90dG9tKTsKLSAgICAgICAg fQotCi0gICAgICAgIGNsaXBSaWdodCArPSBtX3RhcmdldE9mZnNldC54KCkgKyAxOwotICAgICAg ICBjbGlwQm90dG9tICs9IG1fdGFyZ2V0T2Zmc2V0LnkoKSArIDE7Ci0gICAgICAgIGlmIChtX3Rh cmdldE9mZnNldC55KCkgPiAwKQotICAgICAgICAgICAgc2V0T3V0ZXJQaXhlbHMocGFpbnRpbmdE YXRhLCAwLCAwLCBwYWludFNpemUud2lkdGgoKSwgbV90YXJnZXRPZmZzZXQueSgpKTsKLSAgICAg ICAgaWYgKGNsaXBCb3R0b20gPCBwYWludFNpemUuaGVpZ2h0KCkpCi0gICAgICAgICAgICBzZXRP dXRlclBpeGVscyhwYWludGluZ0RhdGEsIDAsIGNsaXBCb3R0b20sIHBhaW50U2l6ZS53aWR0aCgp LCBwYWludFNpemUuaGVpZ2h0KCkpOwotICAgICAgICBpZiAobV90YXJnZXRPZmZzZXQueCgpID4g MCkKLSAgICAgICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgbV90YXJnZXRP ZmZzZXQueSgpLCBtX3RhcmdldE9mZnNldC54KCksIGNsaXBCb3R0b20pOwotICAgICAgICBpZiAo Y2xpcFJpZ2h0IDwgcGFpbnRTaXplLndpZHRoKCkpCi0gICAgICAgICAgICBzZXRPdXRlclBpeGVs cyhwYWludGluZ0RhdGEsIGNsaXBSaWdodCwgbV90YXJnZXRPZmZzZXQueSgpLCBwYWludFNpemUu d2lkdGgoKSwgY2xpcEJvdHRvbSk7Ci0gICAgfSBlbHNlIHsKKyAgICBpZiAoY2xpcFJpZ2h0IDwg MCB8fCBjbGlwQm90dG9tIDwgMCkgewogICAgICAgICAvLyBSYXJlIHNpdHVhdGlvbiwgbm90IG9w dGltaXppZWQgZm9yIHNwZWVkCiAgICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwg MCwgMCwgcGFpbnRTaXplLndpZHRoKCksIHBhaW50U2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIHJl dHVybjsKICAgICB9CisKKyAgICBpbnQgaXRlcmF0aW9ucyA9IChhYnNvbHV0ZVBhaW50UmVjdCgp LndpZHRoKCkgKiBhYnNvbHV0ZVBhaW50UmVjdCgpLmhlaWdodCgpKSAvIHNfbWluaW1hbFJlY3RE aW1lbnNpb247CisgICAgaW50IHN0cmlkZSA9IGNsaXBCb3R0b20gLyBpdGVyYXRpb25zOworICAg IGludCBjaHVua0NvdW50ID0gKGNsaXBCb3R0b20gKyBzdHJpZGUgLSAxKSAvIHN0cmlkZTsKKwor ICAgIFdvcmtRdWV1ZTo6Y29uY3VycmVudEFwcGx5KGNodW5rQ291bnQsIFsmXShzaXplX3QgaW5k ZXgpIHsKKyAgICAgICAgaW50IHlTdGFydCA9IChzdHJpZGUgKiBpbmRleCk7CisgICAgICAgIGlu dCB5RW5kID0gc3RkOjptaW48aW50PihzdHJpZGUgKiAoaW5kZXggKyAxKSwgY2xpcEJvdHRvbSk7 CisKKyAgICAgICAgc2V0SW50ZXJpb3JQaXhlbHMocGFpbnRpbmdEYXRhLCBjbGlwUmlnaHQsIGNs aXBCb3R0b20sIHlTdGFydCwgeUVuZCk7CisgICAgfSk7CisKKyAgICBjbGlwUmlnaHQgKz0gbV90 YXJnZXRPZmZzZXQueCgpICsgMTsKKyAgICBjbGlwQm90dG9tICs9IG1fdGFyZ2V0T2Zmc2V0Lnko KSArIDE7CisgICAgaWYgKG1fdGFyZ2V0T2Zmc2V0LnkoKSA+IDApCisgICAgICAgIHNldE91dGVy UGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgMCwgcGFpbnRTaXplLndpZHRoKCksIG1fdGFyZ2V0T2Zm c2V0LnkoKSk7CisgICAgaWYgKGNsaXBCb3R0b20gPCBwYWludFNpemUuaGVpZ2h0KCkpCisgICAg ICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgY2xpcEJvdHRvbSwgcGFpbnRTaXpl LndpZHRoKCksIHBhaW50U2l6ZS5oZWlnaHQoKSk7CisgICAgaWYgKG1fdGFyZ2V0T2Zmc2V0Lngo KSA+IDApCisgICAgICAgIHNldE91dGVyUGl4ZWxzKHBhaW50aW5nRGF0YSwgMCwgbV90YXJnZXRP ZmZzZXQueSgpLCBtX3RhcmdldE9mZnNldC54KCksIGNsaXBCb3R0b20pOworICAgIGlmIChjbGlw UmlnaHQgPCBwYWludFNpemUud2lkdGgoKSkKKyAgICAgICAgc2V0T3V0ZXJQaXhlbHMocGFpbnRp bmdEYXRhLCBjbGlwUmlnaHQsIG1fdGFyZ2V0T2Zmc2V0LnkoKSwgcGFpbnRTaXplLndpZHRoKCks IGNsaXBCb3R0b20pOwogfQogCiB2b2lkIEZFQ29udm9sdmVNYXRyaXg6OmR1bXAoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbnZvbHZl TWF0cml4LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29u dm9sdmVNYXRyaXguaAppbmRleCBkY2M5YTZlMDJjMTE1MzhhNTc5MmM5NGY3YTkwMjA5NjMzNjIw YTU5Li4wNWQ2NGFhMWUxOWMyNTkyYTdlMDJkMGIwN2FkYzIwMjBjMWVjN2VmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29udm9sdmVNYXRy aXguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29u dm9sdmVNYXRyaXguaApAQCAtMTAzLDIwICsxMDMsNiBAQCBwcml2YXRlOgogICAgIC8vIFBhcmFs bGVsaXphdGlvbiBwYXJ0cwogICAgIHN0YXRpYyBjb25zdCBpbnQgc19taW5pbWFsUmVjdERpbWVu c2lvbiA9ICgxMDAgKiAxMDApOyAvLyBFbXBpcmljYWwgZGF0YSBsaW1pdCBmb3IgcGFyYWxsZWwg am9icwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVHlwZT4KLSAgICBmcmllbmQgY2xhc3MgUGFy YWxsZWxKb2JzOwotCi0gICAgc3RydWN0IEludGVyaW9yUGl4ZWxQYXJhbWV0ZXJzIHsKLSAgICAg ICAgRkVDb252b2x2ZU1hdHJpeCogZmlsdGVyOwotICAgICAgICBQYWludGluZ0RhdGEqIHBhaW50 aW5nRGF0YTsKLSAgICAgICAgaW50IGNsaXBCb3R0b207Ci0gICAgICAgIGludCBjbGlwUmlnaHQ7 Ci0gICAgICAgIGludCB5U3RhcnQ7Ci0gICAgICAgIGludCB5RW5kOwotICAgIH07Ci0KLSAgICBz dGF0aWMgdm9pZCBzZXRJbnRlcmlvclBpeGVsc1dvcmtlcihJbnRlcmlvclBpeGVsUGFyYW1ldGVy cyopOwotCiAgICAgSW50U2l6ZSBtX2tlcm5lbFNpemU7CiAgICAgZmxvYXQgbV9kaXZpc29yOwog ICAgIGZsb2F0IG1fYmlhczsK