100532 2012-10-26 09:15:41 -0700 [CSS Shaders] Software and composited filters should have a common path 2012-10-30 03:33:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100533 1 achicu achicu dino dongseong.hwang eric mvujovic webkit.review.bot oldest_to_newest 752122 0 achicu 2012-10-26 09:15:41 -0700 Software and composited filters path need a common method that can analyze the filters and optimize them. 752137 1 170945 achicu 2012-10-26 09:37:37 -0700 Created attachment 170945 Patch V1 752433 2 170945 mvujovic 2012-10-26 14:42:05 -0700 Comment on attachment 170945 Patch V1 Looks good, Alex. View in context: https://bugs.webkit.org/attachment.cgi?id=170945&action=review > Source/WebCore/rendering/RenderLayer.cpp:5097 > + // Note that RenderLayerFilterInfo will handle the loading and repainting of the layer automatically. Maybe reword this comment like "...will handle the loading of the shaders and repainting of the layer." It sounds like the layer is loading right now. 752440 3 171018 achicu 2012-10-26 14:50:02 -0700 Created attachment 171018 Patch V2 754157 4 171018 webkit.review.bot 2012-10-30 03:33:30 -0700 Comment on attachment 171018 Patch V2 Clearing flags on attachment: 171018 Committed r132889: <http://trac.webkit.org/changeset/132889> 754158 5 webkit.review.bot 2012-10-30 03:33:33 -0700 All reviewed patches have been landed. Closing bug. 170945 2012-10-26 09:37:37 -0700 2012-10-26 14:50:02 -0700 Patch V1 bug100532.patch text/plain 5729 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZDRmYTM0Li45MjVkMDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMjYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgU2hhZGVyc10gU29mdHdhcmUgYW5kIGNvbXBvc2l0ZWQgZmlsdGVycyBz aG91bGQgaGF2ZSBhIGNvbW1vbiBwYXRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDA1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRlZCBjb21wdXRlRmlsdGVyT3BlcmF0aW9ucyBhcyBhIGNvbW1v biBtZXRob2QgYmV0d2VlbiB0aGUgc29mdHdhcmUgZmlsdGVycworICAgICAgICBhbmQgaGFyZHdh cmUgY29tcG9zaXRlZCBvbmVzLiBUaGUgbWV0aG9kIHJlamVjdHMgY3VzdG9tIGZpbHRlcnMgdGhh dCBhcmUgbm90CisgICAgICAgIGxvYWRlZCB5ZXQuIEluIGJ1ZyAxMDA1MzMgaXQgd2lsbCBhbHNv IGNvbnZlcnQgdGhlIEN1c3RvbUZpbHRlck9wZXJhdGlvbiB0byBhIAorICAgICAgICBWYWxpZGF0 ZWRDdXN0b21GaWx0ZXJPcGVyYXRpb24uIFRoYXQgd2lsbCBoZWxwIHVzIGtlZXAgdGhlIGxvYWRp bmcgYW5kIHZlcmlmaWNhdGlvbiAKKyAgICAgICAgY29kZSBmb3IgdGhlIGN1c3RvbSBmaWx0ZXJz IGNvbW1vbiBhY3Jvc3MgYWxsIHRoZSBwb3J0cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGp1 c3QgcmVmYWN0b3JpbmcgZXhpc3RpbmcgY29kZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29tcHV0ZUZpbHRl ck9wZXJhdGlvbnMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6dXBkYXRlT3JSZW1vdmVGaWx0ZXJFZmZlY3QpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChSZW5kZXJMYXll cik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUZpbHRlcnMpOgorCiAyMDEyLTEw LTI1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzEyNTQ0NjI2PiBbY2ddIFJlbmRlckJsb2NrOjpzZWxlY3Rpb25HYXBzKCkgaXMgZXh0 cmVtZWx5IHNsb3cgd2hlbiB0aGVyZSBhcmUgbWFueSBmbG9hdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDY5OTA4YWYuLmY4OWNmOTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTEwLDYgKzExMCwxMCBAQAogI2lu Y2x1ZGUgIlNWR05hbWVzLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShDU1NfU0hBREVSUykKKyNp bmNsdWRlIDxDdXN0b21GaWx0ZXJPcGVyYXRpb24uaD4KKyNlbmRpZgorCiAjaWYgUExBVEZPUk0o QkxBQ0tCRVJSWSkKICNkZWZpbmUgRElTQUJMRV9ST1VOREVEX0NPUk5FUl9DTElQUElORwogI2Vu ZGlmCkBAIC01MDc2LDYgKzUwODAsMzMgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUmVmbGVj dGlvblN0eWxlKCkKIH0KIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKK0ZpbHRlck9wZXJhdGlv bnMgUmVuZGVyTGF5ZXI6OmNvbXB1dGVGaWx0ZXJPcGVyYXRpb25zKGNvbnN0IFJlbmRlclN0eWxl KiBzdHlsZSkKK3sKKyNpZiAhRU5BQkxFKENTU19TSEFERVJTKQorICAgIHJldHVybiBzdHlsZS0+ ZmlsdGVyKCk7CisjZWxzZQorICAgIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMgPSBz dHlsZS0+ZmlsdGVyKCk7CisgICAgaWYgKCFmaWx0ZXJzLmhhc0N1c3RvbUZpbHRlcigpKQorICAg ICAgICByZXR1cm4gZmlsdGVyczsKKworICAgIEZpbHRlck9wZXJhdGlvbnMgb3V0cHV0RmlsdGVy czsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZpbHRlcnMuc2l6ZSgpOyArK2kpIHsKKyAg ICAgICAgUmVmUHRyPEZpbHRlck9wZXJhdGlvbj4gZmlsdGVyT3BlcmF0aW9uID0gZmlsdGVycy5v cGVyYXRpb25zKCkuYXQoaSk7CisgICAgICAgIGlmIChmaWx0ZXJPcGVyYXRpb24tPmdldE9wZXJh dGlvblR5cGUoKSA9PSBGaWx0ZXJPcGVyYXRpb246OkNVU1RPTSkgeworICAgICAgICAgICAgLy8g V2UgaGF2ZSB0byB3YWl0IHVudGlsIHRoZSBwcm9ncmFtIG9mIENTUyBTaGFkZXJzIGlzIGxvYWRl ZCBiZWZvcmUgc2V0dGluZyBpdCBvbiB0aGUgbGF5ZXIuCisgICAgICAgICAgICAvLyBOb3RlIHRo YXQgUmVuZGVyTGF5ZXJGaWx0ZXJJbmZvIHdpbGwgaGFuZGxlIHRoZSBsb2FkaW5nIGFuZCByZXBh aW50aW5nIG9mIHRoZSBsYXllciBhdXRvbWF0aWNhbGx5LgorICAgICAgICAgICAgY29uc3QgQ3Vz dG9tRmlsdGVyT3BlcmF0aW9uKiBjdXN0b21PcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxjb25zdCBD dXN0b21GaWx0ZXJPcGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24uZ2V0KCkpOworICAgICAgICAg ICAgaWYgKCFjdXN0b21PcGVyYXRpb24tPnByb2dyYW0oKS0+aXNMb2FkZWQoKSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBWYWxpZGF0ZSB0aGUgc2hh ZGVycyBhbmQgY29udmVydCB0aGUgb3BlcmF0aW9uIHRvIGEgVmFsaWRhdGVkQ3VzdG9tRmlsdGVy T3BlcmF0aW9uLgorICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMDUzMworICAgICAgICB9CisgICAgICAgIG91dHB1dEZpbHRlcnMub3BlcmF0 aW9ucygpLmFwcGVuZChmaWx0ZXJPcGVyYXRpb24ucmVsZWFzZSgpKTsKKyAgICB9CisgICAgcmV0 dXJuIG91dHB1dEZpbHRlcnM7CisjZW5kaWYKK30KKwogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRl T3JSZW1vdmVGaWx0ZXJFZmZlY3QoKQogewogICAgIGlmICghaGFzRmlsdGVyKCkpIHsKQEAgLTUx MTUsNyArNTE0Niw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZU9yUmVtb3ZlRmlsdGVyRWZm ZWN0KCkKIAogICAgIC8vIElmIHRoZSBmaWx0ZXIgZmFpbHMgdG8gYnVpbGQsIHJlbW92ZSBpdCBm cm9tIHRoZSBsYXllci4gSXQgd2lsbCBzdGlsbCBhdHRlbXB0IHRvCiAgICAgLy8gZ28gdGhyb3Vn aCByZWd1bGFyIHByb2Nlc3NpbmcgKGUuZy4gY29tcG9zaXRpbmcpLCBidXQgbmV2ZXIgYXBwbHkg YW55dGhpbmcuCi0gICAgaWYgKCFmaWx0ZXJJbmZvLT5yZW5kZXJlcigpLT5idWlsZChyZW5kZXJl cigpLT5kb2N1bWVudCgpLCByZW5kZXJlcigpLT5zdHlsZSgpLT5maWx0ZXIoKSkpCisgICAgaWYg KCFmaWx0ZXJJbmZvLT5yZW5kZXJlcigpLT5idWlsZChyZW5kZXJlcigpLT5kb2N1bWVudCgpLCBj b21wdXRlRmlsdGVyT3BlcmF0aW9ucyhyZW5kZXJlcigpLT5zdHlsZSgpKSkpCiAgICAgICAgIGZp bHRlckluZm8tPnNldFJlbmRlcmVyKDApOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oCmluZGV4IDE4MTEwMzYuLmZlZDI0MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5oCkBAIC01Nyw2ICs1Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog I2lmIEVOQUJMRShDU1NfRklMVEVSUykKIGNsYXNzIEZpbHRlckVmZmVjdFJlbmRlcmVyOworY2xh c3MgRmlsdGVyT3BlcmF0aW9uczsKICNlbmRpZgogY2xhc3MgSGl0VGVzdFJlcXVlc3Q7CiBjbGFz cyBIaXRUZXN0UmVzdWx0OwpAQCAtNjUzLDYgKzY1NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNl dENvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyhib29sIGRpcnR5U2Nyb2xsYmFycykgeyBt X2NvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyA9IGRpcnR5U2Nyb2xsYmFyczsgfQogCiAj aWYgRU5BQkxFKENTU19GSUxURVJTKQorICAgIEZpbHRlck9wZXJhdGlvbnMgY29tcHV0ZUZpbHRl ck9wZXJhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUqKTsKICAgICBib29sIHBhaW50c1dpdGhGaWx0 ZXJzKCkgY29uc3Q7CiAgICAgYm9vbCByZXF1aXJlc0Z1bGxMYXllckltYWdlRm9yRmlsdGVycygp IGNvbnN0OwogICAgIEZpbHRlckVmZmVjdFJlbmRlcmVyKiBmaWx0ZXJSZW5kZXJlcigpIGNvbnN0 IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApp bmRleCBmYWI4MDkyLi5lMDI3ZDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMjg0LDE5ICsyODQsNyBAQCB2b2lkIFJlbmRlckxh eWVyQmFja2luZzo6dXBkYXRlVHJhbnNmb3JtKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKICNp ZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlRmls dGVycyhjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7Ci0jaWYgRU5BQkxFKENTU19TSEFERVJT KQotICAgIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMgPSBzdHlsZS0+ZmlsdGVyKCk7 Ci0gICAgaWYgKGZpbHRlcnMuaGFzQ3VzdG9tRmlsdGVyKCkpIHsKLSAgICAgICAgY29uc3QgQ3Vz dG9tRmlsdGVyT3BlcmF0aW9uKiBjdXN0b21PcGVyYXRpb247Ci0gICAgICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgZmlsdGVycy5zaXplKCk7ICsraSkgewotICAgICAgICAgICAgY3VzdG9tT3Bl cmF0aW9uID0gc3RhdGljX2Nhc3Q8Y29uc3QgQ3VzdG9tRmlsdGVyT3BlcmF0aW9uKj4oZmlsdGVy cy5hdChpKSk7Ci0gICAgICAgICAgICAvLyBXZSBoYXZlIHRvIHdhaXQgdW50aWwgdGhlIHByb2dy YW0gb2YgQ1NTIFNoYWRlcnMgaXMgbG9hZGVkIGJlZm9yZSBzZXR0aW5nIGl0IG9uIHRoZSBsYXll ci4KLSAgICAgICAgICAgIGlmIChjdXN0b21PcGVyYXRpb24tPmdldE9wZXJhdGlvblR5cGUoKSA9 PSBGaWx0ZXJPcGVyYXRpb246OkNVU1RPTSAmJiAhY3VzdG9tT3BlcmF0aW9uLT5wcm9ncmFtKCkt PmlzTG9hZGVkKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgfQot I2VuZGlmCi0gICAgbV9jYW5Db21wb3NpdGVGaWx0ZXJzID0gbV9ncmFwaGljc0xheWVyLT5zZXRG aWx0ZXJzKHN0eWxlLT5maWx0ZXIoKSk7CisgICAgbV9jYW5Db21wb3NpdGVGaWx0ZXJzID0gbV9n cmFwaGljc0xheWVyLT5zZXRGaWx0ZXJzKG93bmluZ0xheWVyKCktPmNvbXB1dGVGaWx0ZXJPcGVy YXRpb25zKHN0eWxlKSk7CiB9CiAjZW5kaWYKIAo= 171018 2012-10-26 14:50:02 -0700 2012-10-30 03:33:30 -0700 Patch V2 bug100532_v2.patch text/plain 5741 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZDRmYTM0Li45MjVkMDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMjYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgU2hhZGVyc10gU29mdHdhcmUgYW5kIGNvbXBvc2l0ZWQgZmlsdGVycyBz aG91bGQgaGF2ZSBhIGNvbW1vbiBwYXRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDA1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRlZCBjb21wdXRlRmlsdGVyT3BlcmF0aW9ucyBhcyBhIGNvbW1v biBtZXRob2QgYmV0d2VlbiB0aGUgc29mdHdhcmUgZmlsdGVycworICAgICAgICBhbmQgaGFyZHdh cmUgY29tcG9zaXRlZCBvbmVzLiBUaGUgbWV0aG9kIHJlamVjdHMgY3VzdG9tIGZpbHRlcnMgdGhh dCBhcmUgbm90CisgICAgICAgIGxvYWRlZCB5ZXQuIEluIGJ1ZyAxMDA1MzMgaXQgd2lsbCBhbHNv IGNvbnZlcnQgdGhlIEN1c3RvbUZpbHRlck9wZXJhdGlvbiB0byBhIAorICAgICAgICBWYWxpZGF0 ZWRDdXN0b21GaWx0ZXJPcGVyYXRpb24uIFRoYXQgd2lsbCBoZWxwIHVzIGtlZXAgdGhlIGxvYWRp bmcgYW5kIHZlcmlmaWNhdGlvbiAKKyAgICAgICAgY29kZSBmb3IgdGhlIGN1c3RvbSBmaWx0ZXJz IGNvbW1vbiBhY3Jvc3MgYWxsIHRoZSBwb3J0cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGp1 c3QgcmVmYWN0b3JpbmcgZXhpc3RpbmcgY29kZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29tcHV0ZUZpbHRl ck9wZXJhdGlvbnMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6dXBkYXRlT3JSZW1vdmVGaWx0ZXJFZmZlY3QpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChSZW5kZXJMYXll cik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUZpbHRlcnMpOgorCiAyMDEyLTEw LTI1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzEyNTQ0NjI2PiBbY2ddIFJlbmRlckJsb2NrOjpzZWxlY3Rpb25HYXBzKCkgaXMgZXh0 cmVtZWx5IHNsb3cgd2hlbiB0aGVyZSBhcmUgbWFueSBmbG9hdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDY5OTA4YWYuLmQxNjI3MGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTEwLDYgKzExMCwxMCBAQAogI2lu Y2x1ZGUgIlNWR05hbWVzLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShDU1NfU0hBREVSUykKKyNp bmNsdWRlIDxDdXN0b21GaWx0ZXJPcGVyYXRpb24uaD4KKyNlbmRpZgorCiAjaWYgUExBVEZPUk0o QkxBQ0tCRVJSWSkKICNkZWZpbmUgRElTQUJMRV9ST1VOREVEX0NPUk5FUl9DTElQUElORwogI2Vu ZGlmCkBAIC01MDc2LDYgKzUwODAsMzMgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUmVmbGVj dGlvblN0eWxlKCkKIH0KIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKK0ZpbHRlck9wZXJhdGlv bnMgUmVuZGVyTGF5ZXI6OmNvbXB1dGVGaWx0ZXJPcGVyYXRpb25zKGNvbnN0IFJlbmRlclN0eWxl KiBzdHlsZSkKK3sKKyNpZiAhRU5BQkxFKENTU19TSEFERVJTKQorICAgIHJldHVybiBzdHlsZS0+ ZmlsdGVyKCk7CisjZWxzZQorICAgIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMgPSBz dHlsZS0+ZmlsdGVyKCk7CisgICAgaWYgKCFmaWx0ZXJzLmhhc0N1c3RvbUZpbHRlcigpKQorICAg ICAgICByZXR1cm4gZmlsdGVyczsKKworICAgIEZpbHRlck9wZXJhdGlvbnMgb3V0cHV0RmlsdGVy czsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZpbHRlcnMuc2l6ZSgpOyArK2kpIHsKKyAg ICAgICAgUmVmUHRyPEZpbHRlck9wZXJhdGlvbj4gZmlsdGVyT3BlcmF0aW9uID0gZmlsdGVycy5v cGVyYXRpb25zKCkuYXQoaSk7CisgICAgICAgIGlmIChmaWx0ZXJPcGVyYXRpb24tPmdldE9wZXJh dGlvblR5cGUoKSA9PSBGaWx0ZXJPcGVyYXRpb246OkNVU1RPTSkgeworICAgICAgICAgICAgLy8g V2UgaGF2ZSB0byB3YWl0IHVudGlsIHRoZSBwcm9ncmFtIG9mIENTUyBTaGFkZXJzIGlzIGxvYWRl ZCBiZWZvcmUgc2V0dGluZyBpdCBvbiB0aGUgbGF5ZXIuCisgICAgICAgICAgICAvLyBOb3RlIHRo YXQgd2Ugd2lsbCBoYW5kbGUgdGhlIGxvYWRpbmcgb2YgdGhlIHNoYWRlcnMgYW5kIHJlcGFpbnRp bmcgb2YgdGhlIGxheWVyIGluIHVwZGF0ZU9yUmVtb3ZlRmlsdGVyRWZmZWN0LgorICAgICAgICAg ICAgY29uc3QgQ3VzdG9tRmlsdGVyT3BlcmF0aW9uKiBjdXN0b21PcGVyYXRpb24gPSBzdGF0aWNf Y2FzdDxjb25zdCBDdXN0b21GaWx0ZXJPcGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24uZ2V0KCkp OworICAgICAgICAgICAgaWYgKCFjdXN0b21PcGVyYXRpb24tPnByb2dyYW0oKS0+aXNMb2FkZWQo KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBWYWxp ZGF0ZSB0aGUgc2hhZGVycyBhbmQgY29udmVydCB0aGUgb3BlcmF0aW9uIHRvIGEgVmFsaWRhdGVk Q3VzdG9tRmlsdGVyT3BlcmF0aW9uLgorICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDUzMworICAgICAgICB9CisgICAgICAgIG91dHB1dEZp bHRlcnMub3BlcmF0aW9ucygpLmFwcGVuZChmaWx0ZXJPcGVyYXRpb24ucmVsZWFzZSgpKTsKKyAg ICB9CisgICAgcmV0dXJuIG91dHB1dEZpbHRlcnM7CisjZW5kaWYKK30KKwogdm9pZCBSZW5kZXJM YXllcjo6dXBkYXRlT3JSZW1vdmVGaWx0ZXJFZmZlY3QoKQogewogICAgIGlmICghaGFzRmlsdGVy KCkpIHsKQEAgLTUxMTUsNyArNTE0Niw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZU9yUmVt b3ZlRmlsdGVyRWZmZWN0KCkKIAogICAgIC8vIElmIHRoZSBmaWx0ZXIgZmFpbHMgdG8gYnVpbGQs IHJlbW92ZSBpdCBmcm9tIHRoZSBsYXllci4gSXQgd2lsbCBzdGlsbCBhdHRlbXB0IHRvCiAgICAg Ly8gZ28gdGhyb3VnaCByZWd1bGFyIHByb2Nlc3NpbmcgKGUuZy4gY29tcG9zaXRpbmcpLCBidXQg bmV2ZXIgYXBwbHkgYW55dGhpbmcuCi0gICAgaWYgKCFmaWx0ZXJJbmZvLT5yZW5kZXJlcigpLT5i dWlsZChyZW5kZXJlcigpLT5kb2N1bWVudCgpLCByZW5kZXJlcigpLT5zdHlsZSgpLT5maWx0ZXIo KSkpCisgICAgaWYgKCFmaWx0ZXJJbmZvLT5yZW5kZXJlcigpLT5idWlsZChyZW5kZXJlcigpLT5k b2N1bWVudCgpLCBjb21wdXRlRmlsdGVyT3BlcmF0aW9ucyhyZW5kZXJlcigpLT5zdHlsZSgpKSkp CiAgICAgICAgIGZpbHRlckluZm8tPnNldFJlbmRlcmVyKDApOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDE4MTEwMzYuLmZlZDI0MTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC01Nyw2ICs1Nyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKIGNsYXNzIEZpbHRlckVmZmVjdFJl bmRlcmVyOworY2xhc3MgRmlsdGVyT3BlcmF0aW9uczsKICNlbmRpZgogY2xhc3MgSGl0VGVzdFJl cXVlc3Q7CiBjbGFzcyBIaXRUZXN0UmVzdWx0OwpAQCAtNjUzLDYgKzY1NCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldENvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyhib29sIGRpcnR5U2Ny b2xsYmFycykgeyBtX2NvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyA9IGRpcnR5U2Nyb2xs YmFyczsgfQogCiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQorICAgIEZpbHRlck9wZXJhdGlvbnMg Y29tcHV0ZUZpbHRlck9wZXJhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUqKTsKICAgICBib29sIHBh aW50c1dpdGhGaWx0ZXJzKCkgY29uc3Q7CiAgICAgYm9vbCByZXF1aXJlc0Z1bGxMYXllckltYWdl Rm9yRmlsdGVycygpIGNvbnN0OwogICAgIEZpbHRlckVmZmVjdFJlbmRlcmVyKiBmaWx0ZXJSZW5k ZXJlcigpIGNvbnN0IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAppbmRleCBmYWI4MDkyLi5lMDI3ZDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMjg0LDE5ICsyODQsNyBAQCB2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlVHJhbnNmb3JtKGNvbnN0IFJlbmRlclN0eWxl KiBzdHlsZSkKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiB2b2lkIFJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlRmlsdGVycyhjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7Ci0jaWYgRU5BQkxF KENTU19TSEFERVJTKQotICAgIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMgPSBzdHls ZS0+ZmlsdGVyKCk7Ci0gICAgaWYgKGZpbHRlcnMuaGFzQ3VzdG9tRmlsdGVyKCkpIHsKLSAgICAg ICAgY29uc3QgQ3VzdG9tRmlsdGVyT3BlcmF0aW9uKiBjdXN0b21PcGVyYXRpb247Ci0gICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZmlsdGVycy5zaXplKCk7ICsraSkgewotICAgICAgICAg ICAgY3VzdG9tT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8Y29uc3QgQ3VzdG9tRmlsdGVyT3BlcmF0 aW9uKj4oZmlsdGVycy5hdChpKSk7Ci0gICAgICAgICAgICAvLyBXZSBoYXZlIHRvIHdhaXQgdW50 aWwgdGhlIHByb2dyYW0gb2YgQ1NTIFNoYWRlcnMgaXMgbG9hZGVkIGJlZm9yZSBzZXR0aW5nIGl0 IG9uIHRoZSBsYXllci4KLSAgICAgICAgICAgIGlmIChjdXN0b21PcGVyYXRpb24tPmdldE9wZXJh dGlvblR5cGUoKSA9PSBGaWx0ZXJPcGVyYXRpb246OkNVU1RPTSAmJiAhY3VzdG9tT3BlcmF0aW9u LT5wcm9ncmFtKCktPmlzTG9hZGVkKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9Ci0gICAgfQotI2VuZGlmCi0gICAgbV9jYW5Db21wb3NpdGVGaWx0ZXJzID0gbV9ncmFwaGlj c0xheWVyLT5zZXRGaWx0ZXJzKHN0eWxlLT5maWx0ZXIoKSk7CisgICAgbV9jYW5Db21wb3NpdGVG aWx0ZXJzID0gbV9ncmFwaGljc0xheWVyLT5zZXRGaWx0ZXJzKG93bmluZ0xheWVyKCktPmNvbXB1 dGVGaWx0ZXJPcGVyYXRpb25zKHN0eWxlKSk7CiB9CiAjZW5kaWYKIAo=