135227 2014-07-23 21:38:26 -0700 [WK2] Fixed/Sticky layers can get mispositioned when the layer tree commit change their position or size 2014-07-24 15:26:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin cmarcelo commit-queue jamesr luiz simon.fraser tonikitoo oldest_to_newest 1024435 0 benjamin 2014-07-23 21:38:26 -0700 [WK2] Fixed/Sticky layers can get mispositioned when the layer tree commit change their position or size 1024437 1 235404 benjamin 2014-07-23 21:54:38 -0700 Created attachment 235404 Patch 1024438 2 benjamin 2014-07-23 21:54:52 -0700 First round. 1024446 3 235404 simon.fraser 2014-07-23 22:16:47 -0700 Comment on attachment 235404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235404&action=review > Source/WebCore/page/scrolling/ScrollingTree.h:134 > + void fixedOrStickyNodeRemoved() { --m_fixedOrStickyNodeCount; } Should assert that m_fixedOrStickyNodeCount isn't going to underflow. > Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm:50 > + scrollingTree().fixedOrStickyNodeRemoved(); Not a huge fan of doing work like this in the destructor. I think it would be better to make more explicit didAddNode/didRemoveNode (which also enter the node in m_nodeMap), but maybe that's too risky at this point. 1024633 4 benjamin 2014-07-24 15:26:21 -0700 Committed r171532: <http://trac.webkit.org/changeset/171532> 235404 2014-07-23 21:54:38 -0700 2014-07-23 22:16:47 -0700 Patch bug-135227-20140723215338.patch text/plain 14793 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxNDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDlhMTNmZjVjNDBkMDFk ZTk1NGRlYzFiZGJhMjkyYzQ2MWJiOWYyMC4uN2ZlYmMwOWRkMmM1MWQ0MDkzNDk1NjdkY2ExZGUx MGIwZTJhMzRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA3LTIzICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbV0syXSBGaXhl ZC9TdGlja3kgbGF5ZXJzIGNhbiBnZXQgbWlzcG9zaXRpb25lZCB3aGVuIHRoZSBsYXllciB0cmVl IGNvbW1pdCBjaGFuZ2UgdGhlaXIgcG9zaXRpb24gb3Igc2l6ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MjI3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgS2VlcCB0cmFjayBvZiB0aGUgY3JlYXRpb24v ZGVzdHJ1Y3Rpb24gb2YgRml4ZWQgYW5kIFN0aWNreSBub2RlcyBpbiB0aGUgU2Nyb2xsaW5nVHJl ZS4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6U2Nyb2xsaW5nVHJlZSk6CisgICAgICAgICogcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5n VHJlZTo6aGFzRml4ZWRPclN0aWNreSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVl OjpmaXhlZE9yU3RpY2t5Tm9kZUFkZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWU6OmZpeGVkT3JTdGlja3lOb2RlUmVtb3ZlZCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdUcmVlRml4ZWROb2RlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6On5TY3JvbGxpbmdUcmVlRml4ZWROb2RlKToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUubW06Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZTo6U2Nyb2xsaW5nVHJlZVN0 aWNreU5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6On5T Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZSk6CisKIDIwMTQtMDctMjMgIHBlYXZvQG91dGxvb2suY29t ICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBHc3RyZWFtZXIgcmVu ZGVyaW5nIGlzIG5vdCB3b3JraW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGY5Nzg3MzllMWQ1NjBlYmY0NGJi ZmQxNjhkNGM4MGYxNjU4ZWQ5YzAuLjVlOWMxZGVmNDc5MjIyMzE3MWE0ZDJiYTQwMDg0OGY2Zjhj NDFiZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxNC0wNy0yMyAgQmVuamFtaW4g UG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dLMl0gRml4ZWQvU3Rp Y2t5IGxheWVycyBjYW4gZ2V0IG1pc3Bvc2l0aW9uZWQgd2hlbiB0aGUgbGF5ZXIgdHJlZSBjb21t aXQgY2hhbmdlIHRoZWlyIHBvc2l0aW9uIG9yIHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTIyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTcyNzk1MDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW4gc29tZSBjYXNlcywgYSBmaXhlZCBvciBzdGlja3kgcG9zaXRpb25lZCBsYXllciB3b3Vs ZCBlbmQgdXAgYXQgaXRzIHBvc2l0aW9uIGNvcnJlc3BvbmRpbmcgdG8gdGhlIFdlYlByb2Nlc3MK KyAgICAgICAgaW5zdGVhZCBvZiBzdGlja2luZyB0aGUgdG8gcmVhbCB2aWV3cG9ydCBpbiB0aGUg VUlQcm9jZXNzLgorCisgICAgICAgIFRoZSBzZXF1ZW5jZSBvZiBldmVudCBpczoKKyAgICAgICAg MSkgQSBsYXllciBiZWNvbWVzIGZpeGVkIGluIHNvbWUgU2Nyb2xsaW5nVHJlZSB0cmFuc2FjdGlv bi4KKyAgICAgICAgMikgTGF0ZXIsIHNvbWUgY2hhbmdlIGluIHRoZSBXZWJQcm9jZXNzIGNhdXNl cyBhIExheWVyVHJlZSB1cGRhdGUgZm9yIHRoYXQgZXhhY3Qgc2FtZSBsYXllciwgYnV0IG5vIGNv cnJlc3BvbmRpbmcKKyAgICAgICAgICAgU2Nyb2xsaW5nVHJlZSB1cGRhdGUgaXMgbWFkZS4KKyAg ICAgICAgMykgSW4gdGhlIFVJUHJvY2VzcywgdGhlIHBvc2l0aW9uIG9mIHRoZSBmaXhlZCBsYXll ciBpcyBjaGFuZ2VkIGR1ZSB0byB0aGUgTGF5ZXJUcmVlIHVwZGF0ZS4KKyAgICAgICAgICAgQnV0 ISBUaGVyZSBpcyBubyBTY3JvbGxpbmdUcmVlIGNoYW5nZSwgdXBkYXRlU2Nyb2xsaW5nVHJlZSgp IG5ldmVyIHNldHMgZml4ZWRPclN0aWNreUxheWVyQ2hhbmdlZCB0byB0cnVlLAorICAgICAgICAg ICBhbmQgdGhlIHBvc2l0aW9uIGlzIG5vdCBjb3JyZWN0ZWQuCisgICAgICAgIC0+IFRoZSBsYXll ciBpcyBub3cgYXQgdGhlIHdyb25nIHBvc2l0aW9uIHVudGlsIHRoZSBuZXh0IFZpc2libGVDb250 ZW50UmVjdFVwZGF0ZS4KKworICAgICAgICBJZGVhbGx5LCB3ZSBzaG91bGQgaGF2ZSBmaXhlZE9y U3RpY2t5TGF5ZXJDaGFuZ2VkIHRyYWNrIGlmIGVpdGhlciB0aGUgcG9zaXRpb24gb3Igc2l6ZSBv ZiBhIGZpeGVkIGxheWVyIGNoYW5nZWQKKyAgICAgICAgaW4gdGhlIGxheWVyIHRyZWUuIFRoaXMg aXMgdHJpY2t5IHNpbmNlIHRoZSBsYXllciB0cmVlIGRvZXMgbm90IGtlZXAgdHJhY2sgb2YgdGhl IGZpeGVkIG5vZGVzIG9mIHRoZSBzY3JvbGxpbmcgdHJlZS4KKworICAgICAgICBTaW5jZSB0aGlz IGNvbXBsZXhpdHkgc2VlbXMgcmlza3kgYXQgdGhpcyBwb2ludCwgSSB3ZW50IGZvciBzb21ldGhp bmcgc2ltcGxlciBidXQgd2l0aCBtb3JlIG92ZXJoZWFkOgorICAgICAgICBhbnkgdGltZSB0aGUg c2Nyb2xsaW5nIHRyZWUgY29udGFpbnMgZWl0aGVyIGEgZml4ZWQgb3Igc3RpY2t5IGxheWVyLCB2 aWV3cG9ydENoYW5nZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcoKQorICAgICAgICBpcyBjYWxsZWQg dG8gImZpeCIgdGhlIHBvc2l0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL1Njcm9sbGluZy9S ZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eTo6dXBkYXRlU2Nyb2xsaW5nVHJlZSk6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0 ZU5vZGVMYXllcnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5OjpoYXNGaXhlZE9yU3RpY2t5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW06CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXll cnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eTo6Y29tbWl0TGF5ZXJUcmVlKToKKwogMjAxNC0wNy0yMyAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHBzZXVkbyB0YXJnZXQgdG8gY3JlYXRlIHNhbmRi b3ggb3ZlcnJpZGUgcm9vdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZS5jcHAKaW5kZXggMmJmMWQwYjgwOTMwOGY3YWU4ZjFjZWNkYjU1ZjBjNTk0NGUz MTAyOS4uMjEzOTY5MzM1NzkxNTZkN2M3NmNmYzhhYjNlYjM2ZDIzMTNlNDE4YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTUxLDYg KzUxLDcgQEAgU2Nyb2xsaW5nVHJlZTo6U2Nyb2xsaW5nVHJlZSgpCiAgICAgLCBtX2xhdGNoZWRO b2RlKDApCiAgICAgLCBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoZmFsc2Up CiAgICAgLCBtX2lzSGFuZGxpbmdQcm9ncmFtbWF0aWNTY3JvbGwoZmFsc2UpCisgICAgLCBtX2Zp eGVkT3JTdGlja3lOb2RlQ291bnQoMCkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4IDgxZjRlNzgxZWRhODBkZTRhYjQ0NTU2OGE2 NjVkZWZlYjZjNzNmYjQuLmM5NWIyOTZmODczNzQ1ZWZkZTZkY2NhOWIwNzkxMTA1MmI3MmZjYTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAg LTEyOCw2ICsxMjgsMTAgQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNMYXRjaGVkTm9kZSgpIGNv bnN0IHsgcmV0dXJuIG1fbGF0Y2hlZE5vZGU7IH0KICAgICB2b2lkIHNldE9yQ2xlYXJMYXRjaGVk Tm9kZShjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBTY3JvbGxpbmdOb2RlSUQpOworCisgICAg Ym9vbCBoYXNGaXhlZE9yU3RpY2t5KCkgY29uc3QgeyByZXR1cm4gISFtX2ZpeGVkT3JTdGlja3lO b2RlQ291bnQ7IH0KKyAgICB2b2lkIGZpeGVkT3JTdGlja3lOb2RlQWRkZWQoKSB7ICsrbV9maXhl ZE9yU3RpY2t5Tm9kZUNvdW50OyB9CisgICAgdm9pZCBmaXhlZE9yU3RpY2t5Tm9kZVJlbW92ZWQo KSB7IC0tbV9maXhlZE9yU3RpY2t5Tm9kZUNvdW50OyB9CiAgICAgCiBwcm90ZWN0ZWQ6CiAgICAg dm9pZCBzZXRNYWluRnJhbWVTY3JvbGxQb3NpdGlvbihGbG9hdFBvaW50KTsKQEAgLTE2Nyw2ICsx NzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdF bmFibGVkOwogICAgIAogICAgIGJvb2wgbV9pc0hhbmRsaW5nUHJvZ3JhbW1hdGljU2Nyb2xsOwor ICAgIHVuc2lnbmVkIG1fZml4ZWRPclN0aWNreU5vZGVDb3VudDsKIH07CiAKICNkZWZpbmUgU0NS T0xMSU5HX1RSRUVfVFlQRV9DQVNUUyhUb1ZhbHVlVHlwZU5hbWUsIHByZWRpY2F0ZSkgXApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVG aXhlZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZS5tbQppbmRleCBlMjRkMWE1MjIwNzRhZTQ4NTY1MjBkY2QwMzExZmU4NWQ2 M2FlNmI4Li40YzJkZTg1MWMwYzZkOWEzNzE2NTU3NGVjMTFhNWY2Zjk0ZWJhMmFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVk Tm9kZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZS5tbQpAQCAtNDIsMTAgKzQyLDEyIEBAIFBhc3NSZWZQdHI8U2Nyb2xsaW5n VHJlZUZpeGVkTm9kZT4gU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZTo6Y3JlYXRlKFNjcm9sbGluZ1Ry ZWUmCiBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlKFNjcm9s bGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAgOiBT Y3JvbGxpbmdUcmVlTm9kZShzY3JvbGxpbmdUcmVlLCBGaXhlZE5vZGUsIG5vZGVJRCkKIHsKKyAg ICBzY3JvbGxpbmdUcmVlLmZpeGVkT3JTdGlja3lOb2RlQWRkZWQoKTsKIH0KIAogU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZTo6flNjcm9sbGluZ1RyZWVGaXhlZE5vZGUoKQogeworICAgIHNjcm9sbGlu Z1RyZWUoKS5maXhlZE9yU3RpY2t5Tm9kZVJlbW92ZWQoKTsKIH0KIAogdm9pZCBTY3JvbGxpbmdU cmVlRml4ZWROb2RlOjp1cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5v ZGUmIHN0YXRlTm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCBhMzhhNTMyMmI1MzZl MDNjYjc5ZTcxMmVhZGZiMjM1ZTVhYjY1YmMzLi4yZjM5NTQ0MGU0Yzk1ZTljZTM4Mzk2ZWU5MzEz OGJjMmRkNTE5OTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTdGlja3lOb2RlLm1tCkBAIC00MywxMCArNDMsMTIg QEAgUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZT4gU2Nyb2xsaW5nVHJlZVN0aWNr eU5vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmUKIFNjcm9sbGluZ1RyZWVTdGlja3lOb2RlOjpTY3Jv bGxpbmdUcmVlU3RpY2t5Tm9kZShTY3JvbGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlLCBTY3JvbGxp bmdOb2RlSUQgbm9kZUlEKQogICAgIDogU2Nyb2xsaW5nVHJlZU5vZGUoc2Nyb2xsaW5nVHJlZSwg U3RpY2t5Tm9kZSwgbm9kZUlEKQogeworICAgIHNjcm9sbGluZ1RyZWUuZml4ZWRPclN0aWNreU5v ZGVBZGRlZCgpOwogfQogCiBTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZTo6flNjcm9sbGluZ1RyZWVT dGlja3lOb2RlKCkKIHsKKyAgICBzY3JvbGxpbmdUcmVlKCkuZml4ZWRPclN0aWNreU5vZGVSZW1v dmVkKCk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OnVwZGF0ZUJlZm9yZUNo aWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYgc3RhdGVOb2RlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3Rl U2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKaW5kZXggYjlmYjkzZThiNmU3Nzk5ZGIyMjRh YTQwMGQxMDAwNzQ5ODY3YjA2Zi4uYTFlYTBlMDQ4Njg4NjJjMzVlN2Y4NjU2YzJmYzJmOGFiZTM0 ODgzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1v dGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCkBAIC0z NSw3ICszNSw2IEBACiAjaW5jbHVkZSAiUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIKICNp bmNsdWRlICJSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvck1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAi UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5oIgotI2luY2x1ZGUgIlJlbW90 ZVNjcm9sbGluZ1RyZWUuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRlICJX ZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1Njcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlLmg+CkBAIC03OCw3ICs3Nyw3IEBAIGNvbnN0IFJlbW90ZUxheWVyVHJlZUhv c3QqIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmxheWVyVHJlZUhvc3QoKSBjb25z CiAgICAgcmV0dXJuICZyZW1vdGVEcmF3aW5nQXJlYS0+cmVtb3RlTGF5ZXJUcmVlSG9zdCgpOwog fQogCi12b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnVwZGF0ZVNjcm9sbGlu Z1RyZWUoY29uc3QgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbiYgdHJhbnNh Y3Rpb24sIGJvb2wmIGZpeGVkT3JTdGlja3lMYXllckNoYW5nZWQpCit2b2lkIFJlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yUHJveHk6OnVwZGF0ZVNjcm9sbGluZ1RyZWUoY29uc3QgUmVtb3RlU2Ny b2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24pCiB7CiAgICAgT3duUHRy PFNjcm9sbGluZ1N0YXRlVHJlZT4gc3RhdGVUcmVlID0gY29uc3RfY2FzdDxSZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvclRyYW5zYWN0aW9uJj4odHJhbnNhY3Rpb24pLnNjcm9sbGluZ1N0YXRlVHJl ZSgpLnJlbGVhc2UoKTsKICAgICAKQEAgLTg4LDEyICs4NywxMiBAQCB2b2lkIFJlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yUHJveHk6OnVwZGF0ZVNjcm9sbGluZ1RyZWUoY29uc3QgUmVtb3RlU2Ny b2xsaW5nQwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY29ubmVjdFN0YXRlTm9kZUxh eWVycygqc3RhdGVUcmVlLCAqbGF5ZXJUcmVlSG9zdCwgZml4ZWRPclN0aWNreUxheWVyQ2hhbmdl ZCk7CisgICAgY29ubmVjdFN0YXRlTm9kZUxheWVycygqc3RhdGVUcmVlLCAqbGF5ZXJUcmVlSG9z dCk7CiAgICAgbV9zY3JvbGxpbmdUcmVlLT5jb21taXROZXdUcmVlU3RhdGUoc3RhdGVUcmVlLnJl bGVhc2UoKSk7CiB9CiAKICNpZiAhUExBVEZPUk0oSU9TKQotdm9pZCBSZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJl ZSYgc3RhdGVUcmVlLCBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0JiBsYXllclRyZWVIb3N0LCBi b29sJiBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKQordm9pZCBSZW1vdGVTY3JvbGxpbmdDb29y ZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYg c3RhdGVUcmVlLCBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0JiBsYXllclRyZWVIb3N0KQogewog ICAgIGZvciAoYXV0byYgY3Vyck5vZGUgOiBzdGF0ZVRyZWUubm9kZU1hcCgpLnZhbHVlcygpKSB7 CiAgICAgICAgIGlmIChjdXJyTm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRl Tm9kZTo6U2Nyb2xsTGF5ZXIpKQpAQCAtMTMxLDEyICsxMzAsNyBAQCB2b2lkIFJlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Nyb2xsaW5nU3Rh dGVUcmVlJgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBGaXhl ZE5vZGU6Ci0gICAgICAgICAgICBpZiAoY3Vyck5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3Jv bGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKLSAgICAgICAgICAgICAgICBmaXhlZE9yU3Rp Y2t5TGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IFN0aWNreU5vZGU6Ci0gICAgICAgICAgICBpZiAoY3Vyck5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKLSAgICAgICAgICAgICAgICBmaXhl ZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGlu Zy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaAppbmRleCA5 MWJlN2ExMmY4YTA3MzhmMzg1MTdmNmJmOTRmYTAyZmJhYzE1N2I4Li4yNmZjNTRiYTJhM2JhZDY4 YjIyMjNhZjYyNjEyNmVkZDVkMWI1YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5h dG9yUHJveHkuaApAQCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVy LmgiCiAjaW5jbHVkZSAiUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIKKyNpbmNsdWRlICJS ZW1vdGVTY3JvbGxpbmdUcmVlLmgiCiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5j bHVkZSA8d3RmL1JlZlB0ci5oPgogCkBAIC02NywxMCArNjgsMTEgQEAgcHVibGljOgogCiAgICAg Y29uc3QgUmVtb3RlTGF5ZXJUcmVlSG9zdCogbGF5ZXJUcmVlSG9zdCgpIGNvbnN0OwogCi0gICAg dm9pZCB1cGRhdGVTY3JvbGxpbmdUcmVlKGNvbnN0IFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y VHJhbnNhY3Rpb24mLCBib29sJiBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKTsKKyAgICB2b2lk IHVwZGF0ZVNjcm9sbGluZ1RyZWUoY29uc3QgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFu c2FjdGlvbiYpOwogCiAgICAgdm9pZCBzZXRQcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xscyhib29s IHByb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxzKSB7IG1fcHJvcGFnYXRlc01haW5GcmFtZVNjcm9s bHMgPSBwcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xsczsgfQogICAgIGJvb2wgcHJvcGFnYXRlc01h aW5GcmFtZVNjcm9sbHMoKSBjb25zdCB7IHJldHVybiBtX3Byb3BhZ2F0ZXNNYWluRnJhbWVTY3Jv bGxzOyB9CisgICAgYm9vbCBoYXNGaXhlZE9yU3RpY2t5KCkgY29uc3QgeyByZXR1cm4gbV9zY3Jv bGxpbmdUcmVlLT5oYXNGaXhlZE9yU3RpY2t5KCk7IH0KIAogI2lmIFBMQVRGT1JNKElPUykKICAg ICBXZWJDb3JlOjpGbG9hdFJlY3QgY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QoKSBjb25zdDsKQEAg LTgwLDcgKzgyLDcgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6Ci0gICAgdm9pZCBjb25u ZWN0U3RhdGVOb2RlTGF5ZXJzKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZSYsIGNvbnN0IFJl bW90ZUxheWVyVHJlZUhvc3QmLCBib29sJiBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKTsKKyAg ICB2b2lkIGNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVUcmVl JiwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlSG9zdCYpOwogCiAgICAgV2ViUGFnZVByb3h5JiBtX3dl YlBhZ2VQcm94eTsKICAgICBSZWZQdHI8UmVtb3RlU2Nyb2xsaW5nVHJlZT4gbV9zY3JvbGxpbmdU cmVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tCmluZGV4IDRjZGQ3Nzk2NWY5 YTIwY2ZhOTY0Y2Y0YzBjOWRhMDA3YjQyNzgyZTUuLmQ1NDlkNGE2OTkyY2M5NTI1NTEzODI1MWY1 YjMzY2U3NjUwNzgxNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KQEAg LTQ2LDcgKzQ2LDcgQEAgc3RhdGljIExheWVyUmVwcmVzZW50YXRpb24gbGF5ZXJSZXByZXNlbnRh dGlvbkZyb21MYXllck9yVmlldyhMYXllck9yVmlldyAqbGF5ZXIKICAgICByZXR1cm4gTGF5ZXJS ZXByZXNlbnRhdGlvbihsYXllck9yVmlldy5sYXllcik7CiB9CiAKLXZvaWQgUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eTo6Y29ubmVjdFN0YXRlTm9kZUxheWVycyhTY3JvbGxpbmdTdGF0 ZVRyZWUmIHN0YXRlVHJlZSwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlSG9zdCYgbGF5ZXJUcmVlSG9z dCwgYm9vbCYgZml4ZWRPclN0aWNreUxheWVyQ2hhbmdlZCkKK3ZvaWQgUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JQcm94eTo6Y29ubmVjdFN0YXRlTm9kZUxheWVycyhTY3JvbGxpbmdTdGF0ZVRy ZWUmIHN0YXRlVHJlZSwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlSG9zdCYgbGF5ZXJUcmVlSG9zdCkK IHsKICAgICBmb3IgKGF1dG8mIGN1cnJOb2RlIDogc3RhdGVUcmVlLm5vZGVNYXAoKS52YWx1ZXMo KSkgewogICAgICAgICBzd2l0Y2ggKGN1cnJOb2RlLT5ub2RlVHlwZSgpKSB7CkBAIC03OCwxNiAr NzgsOSBAQCB2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0 ZU5vZGVMYXllcnMoU2Nyb2xsaW5nU3RhdGVUcmVlJgogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICAgICAgY2FzZSBGaXhlZE5vZGU6Ci0gICAgICAgICAgICBpZiAoY3Vyck5vZGUt Pmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKLSAg ICAgICAgICAgICAgICBjdXJyTm9kZS0+c2V0TGF5ZXIobGF5ZXJSZXByZXNlbnRhdGlvbkZyb21M YXllck9yVmlldyhsYXllclRyZWVIb3N0LmdldExheWVyKGN1cnJOb2RlLT5sYXllcigpKSkpOwot ICAgICAgICAgICAgCi0gICAgICAgICAgICBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkIHw9IGN1 cnJOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydGllcygpOwotICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgU3RpY2t5Tm9kZToKICAgICAgICAgICAgIGlmIChjdXJyTm9kZS0+aGFzQ2hhbmdl ZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsTGF5ZXIpKQogICAgICAgICAgICAg ICAgIGN1cnJOb2RlLT5zZXRMYXllcihsYXllclJlcHJlc2VudGF0aW9uRnJvbUxheWVyT3JWaWV3 KGxheWVyVHJlZUhvc3QuZ2V0TGF5ZXIoY3Vyck5vZGUtPmxheWVyKCkpKSk7Ci0KLSAgICAgICAg ICAgIGZpeGVkT3JTdGlja3lMYXllckNoYW5nZWQgfD0gY3Vyck5vZGUtPmhhc0NoYW5nZWRQcm9w ZXJ0aWVzKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWFQcm94eS5tbQppbmRleCAxYTY1YzVmYzQ0ODYzMDVkYmZhNjk1M2YzOGVkN2Q0 YzcxZmNkYmU5Li41MjM2MmYyYzExMDgyYzYxOWNjNDc4MjRmZGIyN2NiMmM5YjUzOWVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tCkBAIC0yMDUsMTEgKzIwNSwxMCBAQCB2b2lkIFJl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OmNvbW1pdExheWVyVHJlZShjb25zdCBSZW1v dGVMYXllclRyZWVUcmFucwogI2VuZGlmCiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQot ICAgIGJvb2wgZml4ZWRPclN0aWNreUxheWVyQ2hhbmdlZCA9IGZhbHNlOwotICAgIG1fd2ViUGFn ZVByb3h5LT5zY3JvbGxpbmdDb29yZGluYXRvclByb3h5KCktPnVwZGF0ZVNjcm9sbGluZ1RyZWUo c2Nyb2xsaW5nVHJlZVRyYW5zYWN0aW9uLCBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKTsKKyAg ICBtX3dlYlBhZ2VQcm94eS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpLT51cGRhdGVTY3Jv bGxpbmdUcmVlKHNjcm9sbGluZ1RyZWVUcmFuc2FjdGlvbik7CiAKICNpZiBQTEFURk9STShJT1Mp Ci0gICAgaWYgKGZpeGVkT3JTdGlja3lMYXllckNoYW5nZWQpIHsKKyAgICBpZiAobV93ZWJQYWdl UHJveHktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+aGFzRml4ZWRPclN0aWNreSgpKSB7 CiAgICAgICAgIEZsb2F0UmVjdCBjdXN0b21GaXhlZFBvc2l0aW9uUmVjdCA9IG1fd2ViUGFnZVBy b3h5LT5jb21wdXRlQ3VzdG9tRml4ZWRQb3NpdGlvblJlY3QobV93ZWJQYWdlUHJveHktPnVub2Jz Y3VyZWRDb250ZW50UmVjdCgpLCBtX3dlYlBhZ2VQcm94eS0+ZGlzcGxheWVkQ29udGVudFNjYWxl KCkpOwogICAgICAgICAvLyBJZiB3ZSBnb3QgYSBuZXcgbGF5ZXIgZm9yIGEgZml4ZWQgb3Igc3Rp Y2t5IG5vZGUsIGl0cyBwb3NpdGlvbiBmcm9tIHRoZSBXZWJQcm9jZXNzIGlzIHByb2JhYmx5IHN0 YWxlLiBXZSBuZWVkIHRvIHJlLXJ1biB0aGUgInZpZXdwb3J0IiBjaGFuZ2VkIGxvZ2ljIHRvIHVk cGF0ZSBpdCB3aXRoIG91ciBVSS1zaWRlIHN0YXRlLgogICAgICAgICBtX3dlYlBhZ2VQcm94eS0+ c2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpLT52aWV3cG9ydENoYW5nZWRWaWFEZWxlZ2F0ZWRT Y3JvbGxpbmcobV93ZWJQYWdlUHJveHktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+cm9v dFNjcm9sbGluZ05vZGVJRCgpLCBjdXN0b21GaXhlZFBvc2l0aW9uUmVjdCwgbV93ZWJQYWdlUHJv eHktPmRpc3BsYXllZENvbnRlbnRTY2FsZSgpKTsK