107542 2013-01-22 03:01:16 -0800 Move top layer flag from ElementRareData to NodeFlags 2013-01-22 13:42:04 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 falken falken cmarcelo eric jchaffraix morrita ojan.autocc ojan rniwa simon.fraser webkit.review.bot oldest_to_newest 812857 0 falken 2013-01-22 03:01:16 -0800 Try moving the top layer flag from ElementRareData to NodeFlags. It may fix the perf regression described in bug 106726, and has been suggested earlier, e.g., https://bugs.webkit.org/show_bug.cgi?id=84796#c31 Moving it to NodeFlags also simplifies some of the code and makes it no longer necessary to allocate rare data. 812860 1 183951 falken 2013-01-22 03:12:28 -0800 Created attachment 183951 Patch 812912 2 183951 webkit.review.bot 2013-01-22 04:16:43 -0800 Comment on attachment 183951 Patch Clearing flags on attachment: 183951 Committed r140411: <http://trac.webkit.org/changeset/140411> 812913 3 webkit.review.bot 2013-01-22 04:16:47 -0800 All reviewed patches have been landed. Closing bug. 813379 4 ojan 2013-01-22 13:42:04 -0800 Doesn't look like it fixed the performance regression. :( 183951 2013-01-22 03:12:28 -0800 2013-01-22 04:16:43 -0800 Patch bug-107542-20130122200923.patch text/plain 9991 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM4OWU1NmMzODJjODA3 NzcwOTZjMTAwNGM0N2M0NzlmY2I4OWQ1Ni4uYWYyODJmNGM4M2Q0ZGM0YmU1MDM3M2E0YTQ3ZDE5 NDAwZTc4MWVkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTIyICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHRvcCBs YXllciBmbGFnIGZyb20gRWxlbWVudFJhcmVEYXRhIHRvIE5vZGVGbGFncworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTQyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhIHNwZWN1bGF0aXZl IGZpeCBmb3IgYSBwZXJmIHJlZ3Jlc3Npb24gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDY3MjYpCisgICAgICAgIGxpa2VseSBkdWUgdG8gY2hlY2tpbmcgdGhlIHRv cCBsYXllciBmbGFnIGluIEVsZW1lbnQ6OnJlbW92ZWRGcm9tLiBJdAorICAgICAgICBhbHNvIHNp bXBsaWZpZXMgY29kZSBkZWFsaW5nIHdpdGggdG9wIGxheWVyIGFuZCBtYWtlcyBpdCBubyBsb25n ZXIKKyAgICAgICAgbmVjZXNzYXJ5IHRvIGFsbG9jYXRlIHJhcmUgZGF0YSBmb3IgdG9wIGxheWVy LgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVu dDo6cmVtb3ZlZEZyb20pOiBDaGVjayBpc0luVG9wTGF5ZXIgZmlyc3QgaW4gY2FzZSBpdCBoZWxw cyBmaXggdGhlIHBlcmYgcmVncmVzc2lvbi4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IGRvbS9FbGVtZW50Lmg6IE1vdmUgdG9wIGxheWVyIGZ1bmN0aW9ucyBmcm9tIEVsZW1lbnQgdG8g Tm9kZS4KKyAgICAgICAgKiBkb20vRWxlbWVudFJhcmVEYXRhLmg6CisgICAgICAgIChFbGVtZW50 UmFyZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudFJhcmVEYXRhOjpFbGVtZW50UmFy ZURhdGEpOiBSZW1vdmUgdG9wIGxheWVyIGZsYWcgZnJvbSBFbGVtZW50UmFyZURhdGEuCisgICAg ICAgICogZG9tL05vZGUuY3BwOiBNb3ZlIHRvcCBsYXllciBmdW5jdGlvbnMgZnJvbSBFbGVtZW50 IHRvIE5vZGUuICAKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6 c2V0SXNJblRvcExheWVyKToKKyAgICAgICAgKiBkb20vTm9kZS5oOgorICAgICAgICAoTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjppc0luVG9wTGF5ZXIpOgorICAgICAgICAqIGRvbS9O b2RlUmVuZGVyaW5nQ29udGV4dC5jcHA6IFJlbW92ZSB1bm5lY2Vzc2FyeSBjYXN0cyB0byBFbGVt ZW50IGZvciBpc0luVG9wTGF5ZXIoKS4KKyAgICAgICAgKFdlYkNvcmU6OmlzUmVuZGVyZXJSZXBh cmVudGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0OjpwcmV2aW91 c1JlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0OjpwYXJl bnRSZW5kZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6aXNJblRvcExheWVyKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZWJ1aWxkWk9yZGVyTGlzdHMpOgorCiAyMDEzLTAxLTIy ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIE1h a2UgYW4gSXNvbGF0ZSBwYXJhbWV0ZXIgbWFuZGF0b3J5IGluIHRvVjgoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuY3BwCmluZGV4IDAwYWY0YjY4OTRkYTQyNThjY2Q0ZWI4MGE2MzY4MGE0NWY5OTczYzguLmIx NDBmMzU5OGRkYjBkOTEzODc2OTRkMGI5YTk4NWMyNGI5NjBjYTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAKQEAgLTExNzEsNyArMTE3MSw4IEBAIHZvaWQgRWxlbWVudDo6cmVtb3ZlZEZyb20oQ29u dGFpbmVyTm9kZSogaW5zZXJ0aW9uUG9pbnQpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShESUFMT0df RUxFTUVOVCkKLSAgICBkb2N1bWVudCgpLT5yZW1vdmVGcm9tVG9wTGF5ZXIodGhpcyk7CisgICAg aWYgKGlzSW5Ub3BMYXllcigpKQorICAgICAgICBkb2N1bWVudCgpLT5yZW1vdmVGcm9tVG9wTGF5 ZXIodGhpcyk7CiAjZW5kaWYKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgaWYgKGNv bnRhaW5zRnVsbFNjcmVlbkVsZW1lbnQoKSkKQEAgLTIzODEsMjIgKzIzODIsNiBAQCB2b2lkIEVs ZW1lbnQ6OnNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRPbkFuY2VzdG9yc0Nyb3NzaW5nRnJh bWVCb3VuZGFyaWVzKGJvbwogfQogI2VuZGlmICAgIAogCi0jaWYgRU5BQkxFKERJQUxPR19FTEVN RU5UKQotYm9vbCBFbGVtZW50Ojppc0luVG9wTGF5ZXIoKSBjb25zdAotewotICAgIHJldHVybiBo YXNSYXJlRGF0YSgpICYmIGVsZW1lbnRSYXJlRGF0YSgpLT5pc0luVG9wTGF5ZXIoKTsKLX0KLQot dm9pZCBFbGVtZW50OjpzZXRJc0luVG9wTGF5ZXIoYm9vbCBpblRvcExheWVyKQotewotICAgIGVu c3VyZUVsZW1lbnRSYXJlRGF0YSgpLT5zZXRJc0luVG9wTGF5ZXIoaW5Ub3BMYXllcik7Ci0KLSAg ICAvLyBXZSBtdXN0IGVuc3VyZSBhIHJlYXR0YWNoIG9jY3VycyBzbyB0aGUgcmVuZGVyZXIgaXMg aW5zZXJ0ZWQgaW4gdGhlIGNvcnJlY3Qgc2libGluZyBvcmRlciB1bmRlciBSZW5kZXJWaWV3IGFj Y29yZGluZyB0byBpdHMKLSAgICAvLyB0b3AgbGF5ZXIgcG9zaXRpb24sIG9yIGluIGl0cyB1c3Vh bCBwbGFjZSBpZiBub3QgaW4gdGhlIHRvcCBsYXllci4KLSAgICByZWF0dGFjaElmQXR0YWNoZWQo KTsKLX0KLSNlbmRpZgotCiAjaWYgRU5BQkxFKFBPSU5URVJfTE9DSykKIHZvaWQgRWxlbWVudDo6 d2Via2l0UmVxdWVzdFBvaW50ZXJMb2NrKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IDZkMThk Y2M3YTNiMDg3ZmFkMWZkNDk2NWY4YmJkZmNlODlmM2M5MzUuLjg0NzViNjBkM2QzNTc4ODM4OGVl YjNiNTljOTMzNGE0NDYzMmZjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtNDY0LDExICs0NjQs NiBAQCBwdWJsaWM6CiAgICAgdm9pZCB3ZWJraXRSZXF1ZXN0RnVsbHNjcmVlbigpOwogI2VuZGlm CiAKLSNpZiBFTkFCTEUoRElBTE9HX0VMRU1FTlQpCi0gICAgYm9vbCBpc0luVG9wTGF5ZXIoKSBj b25zdDsKLSAgICB2b2lkIHNldElzSW5Ub3BMYXllcihib29sKTsKLSNlbmRpZgotCiAjaWYgRU5B QkxFKFBPSU5URVJfTE9DSykKICAgICB2b2lkIHdlYmtpdFJlcXVlc3RQb2ludGVyTG9jaygpOwog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgKaW5kZXggYjM0N2IyODJhOTcx NGM3MGVkNDA0YmI2ZWYyNTk1NmEyYWU1NjBmOS4uNWJmODI1NGE0YTNlYzA2NDBjMTA2OTVmOWQz YTA1YjM0Mzk0YTM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRSYXJl RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50UmFyZURhdGEuaApAQCAtNjUs MTEgKzY1LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVu dChib29sIHZhbHVlKSB7IG1fY29udGFpbnNGdWxsU2NyZWVuRWxlbWVudCA9IHZhbHVlOyB9CiAj ZW5kaWYKIAotI2lmIEVOQUJMRShESUFMT0dfRUxFTUVOVCkKLSAgICBib29sIGlzSW5Ub3BMYXll cigpIGNvbnN0IHsgcmV0dXJuIG1faXNJblRvcExheWVyOyB9Ci0gICAgdm9pZCBzZXRJc0luVG9w TGF5ZXIoYm9vbCB2YWx1ZSkgeyBtX2lzSW5Ub3BMYXllciA9IHZhbHVlOyB9Ci0jZW5kaWYKLQog ICAgIGJvb2wgY2hpbGRyZW5BZmZlY3RlZEJ5SG92ZXIoKSBjb25zdCB7IHJldHVybiBtX2NoaWxk cmVuQWZmZWN0ZWRCeUhvdmVyOyB9CiAgICAgdm9pZCBzZXRDaGlsZHJlbkFmZmVjdGVkQnlIb3Zl cihib29sIHZhbHVlKSB7IG1fY2hpbGRyZW5BZmZlY3RlZEJ5SG92ZXIgPSB2YWx1ZTsgfQogICAg IGJvb2wgY2hpbGRyZW5BZmZlY3RlZEJ5QWN0aXZlKCkgY29uc3QgeyByZXR1cm4gbV9jaGlsZHJl bkFmZmVjdGVkQnlBY3RpdmU7IH0KQEAgLTEzNSw5ICsxMzAsNiBAQCBwcml2YXRlOgogI2lmIEVO QUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICB1bnNpZ25lZCBtX2NvbnRhaW5zRnVsbFNjcmVlbkVs ZW1lbnQgOiAxOwogI2VuZGlmCi0jaWYgRU5BQkxFKERJQUxPR19FTEVNRU5UKQotICAgIHVuc2ln bmVkIG1faXNJblRvcExheWVyIDogMTsKLSNlbmRpZgogI2lmIEVOQUJMRShTVkcpCiAgICAgdW5z aWduZWQgbV9oYXNQZW5kaW5nUmVzb3VyY2VzIDogMTsKICNlbmRpZgpAQCAtMTg1LDkgKzE3Nyw2 IEBAIGlubGluZSBFbGVtZW50UmFyZURhdGE6OkVsZW1lbnRSYXJlRGF0YShSZW5kZXJPYmplY3Qq IHJlbmRlcmVyKQogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICAsIG1fY29udGFpbnNG dWxsU2NyZWVuRWxlbWVudChmYWxzZSkKICNlbmRpZgotI2lmIEVOQUJMRShESUFMT0dfRUxFTUVO VCkKLSAgICAsIG1faXNJblRvcExheWVyKGZhbHNlKQotI2VuZGlmCiAjaWYgRU5BQkxFKFNWRykK ICAgICAsIG1faGFzUGVuZGluZ1Jlc291cmNlcyhmYWxzZSkKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3Bw CmluZGV4IDhkY2NjNjgxZTNjZjBjZjBmZTIyNTBjZTA4NDliNzdkNTE0ZjQ2MGUuLjliZDhmMmMx N2RhZTQzYWNkOWQyN2JhZDBiYzdlNjA2NmIzODllODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTI2 MjAsNiArMjYyMCwxNyBAQCB2b2lkIE5vZGU6OmRlY3JlbWVudENvbm5lY3RlZFN1YmZyYW1lQ291 bnQodW5zaWduZWQgYW1vdW50KQogICAgIHJhcmVEYXRhKCktPmRlY3JlbWVudENvbm5lY3RlZFN1 YmZyYW1lQ291bnQoYW1vdW50KTsKIH0KIAorI2lmIEVOQUJMRShESUFMT0dfRUxFTUVOVCkKK3Zv aWQgTm9kZTo6c2V0SXNJblRvcExheWVyKGJvb2wgaXNJblRvcExheWVyKQoreworICAgIHNldEZs YWcoaXNJblRvcExheWVyLCBJc0luVG9wTGF5ZXIpOworCisgICAgLy8gV2UgbXVzdCBlbnN1cmUg YSByZWF0dGFjaCBvY2N1cnMgc28gdGhlIHJlbmRlcmVyIGlzIGluc2VydGVkIGluIHRoZSBjb3Jy ZWN0IHNpYmxpbmcgb3JkZXIgdW5kZXIgUmVuZGVyVmlldyBhY2NvcmRpbmcgdG8gaXRzCisgICAg Ly8gdG9wIGxheWVyIHBvc2l0aW9uLCBvciBpbiBpdHMgdXN1YWwgcGxhY2UgaWYgbm90IGluIHRo ZSB0b3AgbGF5ZXIuCisgICAgcmVhdHRhY2hJZkF0dGFjaGVkKCk7Cit9CisjZW5kaWYKKwogdm9p ZCBOb2RlOjpyZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCkKIHsKICAgICBzZXRIYXNTY29w ZWRIVE1MU3R5bGVDaGlsZCh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCmluZGV4IDJkMjBhZGI0MjlhMTA0YWNl ZGNjYjhkYjY2NmUyODFmOGNlNWM1NzMuLjlkZDYwMTk1N2JhMThiZDRhMDE5MGM1NjFjNzAxMDJl YTExZGViNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtNjgyLDYgKzY4MiwxMSBAQCBwdWJsaWM6CiAgICAg dm9pZCBpbmNyZW1lbnRDb25uZWN0ZWRTdWJmcmFtZUNvdW50KHVuc2lnbmVkIGFtb3VudCA9IDEp OwogICAgIHZvaWQgZGVjcmVtZW50Q29ubmVjdGVkU3ViZnJhbWVDb3VudCh1bnNpZ25lZCBhbW91 bnQgPSAxKTsKIAorI2lmIEVOQUJMRShESUFMT0dfRUxFTUVOVCkKKyAgICBib29sIGlzSW5Ub3BM YXllcigpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSXNJblRvcExheWVyKTsgfQorICAgIHZvaWQg c2V0SXNJblRvcExheWVyKGJvb2wpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgZW51bSBOb2Rl RmxhZ3MgewogICAgICAgICBJc1RleHRGbGFnID0gMSwKQEAgLTcxOSwxMSArNzI0LDE0IEBAIHBy aXZhdGU6CiAgICAgICAgIFY4Q29sbGVjdGFibGVEdXJpbmdNaW5vckdDRmxhZyA9IDEgPDwgMjQs CiAgICAgICAgIE5lZWRzU2hhZG93VHJlZVdhbGtlckZsYWcgPSAxIDw8IDI1LAogICAgICAgICBJ c0luU2hhZG93VHJlZUZsYWcgPSAxIDw8IDI2LAorI2lmIEVOQUJMRShESUFMT0dfRUxFTUVOVCkK KyAgICAgICAgSXNJblRvcExheWVyID0gMSA8PCAyNywKKyNlbmRpZgogCiAgICAgICAgIERlZmF1 bHROb2RlRmxhZ3MgPSBJc1BhcnNpbmdDaGlsZHJlbkZpbmlzaGVkRmxhZwogICAgIH07CiAKLSAg ICAvLyA1IGJpdHMgcmVtYWluaW5nCisgICAgLy8gNCBiaXRzIHJlbWFpbmluZwogCiAgICAgYm9v bCBnZXRGbGFnKE5vZGVGbGFncyBtYXNrKSBjb25zdCB7IHJldHVybiBtX25vZGVGbGFncyAmIG1h c2s7IH0KICAgICB2b2lkIHNldEZsYWcoYm9vbCBmLCBOb2RlRmxhZ3MgbWFzaykgY29uc3QgeyBt X25vZGVGbGFncyA9IChtX25vZGVGbGFncyAmIH5tYXNrKSB8ICgtKGludDMyX3QpZiAmIG1hc2sp OyB9IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXgg YmFlNTFhNzRiOGJiNzJiMmMxN2I2M2FjNzJmNjU5MDU0Y2Y5NWQwNy4uMmRiZjNhNGNlNDViYjFk MDIzN2ZmYjczMjIwN2Q2ZTM4NTMyYzAxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJl bmRlcmluZ0NvbnRleHQuY3BwCkBAIC03NSwxMiArNzUsMTAgQEAgTm9kZVJlbmRlcmluZ0NvbnRl eHQ6On5Ob2RlUmVuZGVyaW5nQ29udGV4dCgpCiAKIHN0YXRpYyBib29sIGlzUmVuZGVyZXJSZXBh cmVudGVkKGNvbnN0IFJlbmRlck9iamVjdCogcmVuZGVyZXIpCiB7Ci0gICAgaWYgKCFyZW5kZXJl ci0+bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBp ZiAocmVuZGVyZXItPnN0eWxlKCkgJiYgIXJlbmRlcmVyLT5zdHlsZSgpLT5mbG93VGhyZWFkKCku aXNFbXB0eSgpKQorICAgIGlmIChyZW5kZXJlci0+bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkgJiYg cmVuZGVyZXItPnN0eWxlKCkgJiYgIXJlbmRlcmVyLT5zdHlsZSgpLT5mbG93VGhyZWFkKCkuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICNpZiBFTkFCTEUoRElBTE9HX0VMRU1FTlQp Ci0gICAgaWYgKHRvRWxlbWVudChyZW5kZXJlci0+bm9kZSgpKS0+aXNJblRvcExheWVyKCkpCisg ICAgaWYgKHJlbmRlcmVyLT5ub2RlKCktPmlzSW5Ub3BMYXllcigpKQogICAgICAgICByZXR1cm4g dHJ1ZTsKICNlbmRpZgogICAgIHJldHVybiBmYWxzZTsKQEAgLTEzMSw3ICsxMjksNyBAQCBSZW5k ZXJPYmplY3QqIE5vZGVSZW5kZXJpbmdDb250ZXh0OjpwcmV2aW91c1JlbmRlcmVyKCkgY29uc3QK ICAgICAvLyBGSVhNRTogVGhpcyBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IGZvciB0aGluZ3MgaW4g dGhlIHRvcCBsYXllciB0aGF0IGFyZQogICAgIC8vIGRpc3BsYXk6IG5vbmUuIFdlJ2QgbmVlZCB0 byBkdXBsaWNhdGUgdGhlIGxvZ2ljIGluIG5leHRSZW5kZXJlciwgYnV0IHNpbmNlCiAgICAgLy8g bm90aGluZyBuZWVkcyB0aGF0IHlldCBqdXN0IGFzc2VydC4KLSAgICBBU1NFUlQoIW1fbm9kZS0+ aXNFbGVtZW50Tm9kZSgpIHx8ICF0b0VsZW1lbnQobV9ub2RlKS0+aXNJblRvcExheWVyKCkpOwor ICAgIEFTU0VSVCghbV9ub2RlLT5pc0luVG9wTGF5ZXIoKSk7CiAjZW5kaWYKIAogICAgIGlmICht X3BhcmVudEZsb3dSZW5kZXJlcikKQEAgLTE1NCw3ICsxNTIsNyBAQCBSZW5kZXJPYmplY3QqIE5v ZGVSZW5kZXJpbmdDb250ZXh0OjpwYXJlbnRSZW5kZXJlcigpIGNvbnN0CiAgICAgICAgIHJldHVy biByZW5kZXJlci0+cGFyZW50KCk7CiAKICNpZiBFTkFCTEUoRElBTE9HX0VMRU1FTlQpCi0gICAg aWYgKG1fbm9kZS0+aXNFbGVtZW50Tm9kZSgpICYmIHRvRWxlbWVudChtX25vZGUpLT5pc0luVG9w TGF5ZXIoKSkgeworICAgIGlmIChtX25vZGUtPmlzSW5Ub3BMYXllcigpKSB7CiAgICAgICAgIC8v IFRoZSBwYXJlbnQgcmVuZGVyZXIgb2YgdG9wIGxheWVyIGVsZW1lbnRzIGlzIHRoZSBSZW5kZXJW aWV3LCBidXQgb25seQogICAgICAgICAvLyBpZiB0aGUgbm9ybWFsIHBhcmVudCB3b3VsZCBoYXZl IGhhZCBhIHJlbmRlcmVyLgogICAgICAgICAvLyBGSVhNRTogVGhpcyBiZWhhdmlvciBpc24ndCBx dWl0ZSByaWdodCBhcyB0aGUgc3BlYyBmb3IgdG9wIGxheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBiODljY2QzMTc0NDNhMmJlMWJjYTA1MTAyYmM5YThi MWEzN2U4YmJhLi45ZTI5OTJhMzdhMzkyZGE5ZGUxNzMxOTYxODAzY2VkNWNiY2M4NjQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTQwMTQsNyArNDAxNCw3 IEBAIE5vZGUqIFJlbmRlckxheWVyOjplbmNsb3NpbmdFbGVtZW50KCkgY29uc3QKIGJvb2wgUmVu ZGVyTGF5ZXI6OmlzSW5Ub3BMYXllcigpIGNvbnN0CiB7CiAgICAgTm9kZSogbm9kZSA9IHJlbmRl cmVyKCktPm5vZGUoKTsKLSAgICByZXR1cm4gbm9kZSAmJiBub2RlLT5pc0VsZW1lbnROb2RlKCkg JiYgdG9FbGVtZW50KG5vZGUpLT5pc0luVG9wTGF5ZXIoKTsKKyAgICByZXR1cm4gbm9kZSAmJiBu b2RlLT5pc0luVG9wTGF5ZXIoKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllcjo6aXNJblRvcExheWVy U3VidHJlZSgpIGNvbnN0CkBAIC01MTY3LDggKzUxNjcsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpy ZWJ1aWxkWk9yZGVyTGlzdHMoKQogICAgIGlmIChpc1Jvb3RMYXllcigpKSB7CiAgICAgICAgIFJl bmRlck9iamVjdCogdmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICAgICAgZm9yIChSZW5k ZXJPYmplY3QqIGNoaWxkID0gdmlldy0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+bmV4dFNpYmxpbmcoKSkgewotICAgICAgICAgICAgRWxlbWVudCogY2hpbGRFbGVtZW50ID0g KGNoaWxkLT5ub2RlKCkgJiYgY2hpbGQtPm5vZGUoKS0+aXNFbGVtZW50Tm9kZSgpKSA/IHRvRWxl bWVudChjaGlsZC0+bm9kZSgpKSA6IDA7Ci0gICAgICAgICAgICBpZiAoY2hpbGRFbGVtZW50ICYm IGNoaWxkRWxlbWVudC0+aXNJblRvcExheWVyKCkpIHsKKyAgICAgICAgICAgIGlmIChjaGlsZC0+ bm9kZSgpICYmIGNoaWxkLT5ub2RlKCktPmlzSW5Ub3BMYXllcigpKSB7CiAgICAgICAgICAgICAg ICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gdG9SZW5kZXJMYXllck1vZGVsT2JqZWN0KGNoaWxkKS0+ bGF5ZXIoKTsKICAgICAgICAgICAgICAgICBtX3Bvc1pPcmRlckxpc3QtPmFwcGVuZChsYXllcik7 CiAgICAgICAgICAgICB9Cg==