167790 2017-02-03 05:25:49 -0800 Resource usage overlay should be notified when root layer is attached/detached 2017-02-05 22:54:08 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED DUPLICATE 167850 Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply kling thorton oldest_to_newest 1272882 0 cgarcia 2017-02-03 05:25:49 -0800 Since r211141 we properly destroy and create the overlay root layers when the root layer is attached/detached, but we leave the graphic layers in m_overlayGraphicsLayers alive. They should also be destroyed and created, and their children should e notified too. This is what causes that the resource usage overlay disappears when navigating to another page, and also the reason why it's not shown initially when starting the Mac MiniBrowser and the setting is enabled. 1272889 1 300524 cgarcia 2017-02-03 05:34:59 -0800 Created attachment 300524 Patch 1273472 2 300524 cgarcia 2017-02-05 22:53:32 -0800 Comment on attachment 300524 Patch This has been fixed in r211683 in a simpler way. 1273473 3 cgarcia 2017-02-05 22:54:08 -0800 *** This bug has been marked as a duplicate of bug 167850 *** 300524 2017-02-03 05:34:59 -0800 2017-02-05 22:53:32 -0800 Patch wk-overlay-detached.diff text/plain 15354 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5OTIxZWJkZjQyNy4uZjM2ZjRhZDA4YTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1MSBAQAogMjAxNy0wMi0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgUmVzb3VyY2UgdXNhZ2Ugb3ZlcmxheSBzaG91bGQgYmUgbm90 aWZpZWQgd2hlbiByb290IGxheWVyIGlzIGF0dGFjaGVkL2RldGFjaGVkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3OTAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSByMjExMTQxIHdlIHByb3Bl cmx5IGRlc3Ryb3kgYW5kIGNyZWF0ZSB0aGUgb3ZlcmxheSByb290IGxheWVycyB3aGVuIHRoZSBy b290IGxheWVyIGlzIGF0dGFjaGVkL2RldGFjaGVkLAorICAgICAgICBidXQgd2UgbGVhdmUgdGhl IGdyYXBoaWMgbGF5ZXJzIGluIG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzIGFsaXZlLiBUaGV5IHNo b3VsZCBhbHNvIGJlIGRlc3Ryb3llZCBhbmQgY3JlYXRlZCwgYW5kCisgICAgICAgIHRoZWlyIGNo aWxkcmVuIHNob3VsZCBiZSBub3RpZmllZCB0b28uIFRoaXMgaXMgd2hhdCBjYXVzZXMgdGhhdCB0 aGUgcmVzb3VyY2UgdXNhZ2Ugb3ZlcmxheSBkaXNhcHBlYXJzIHdoZW4KKyAgICAgICAgbmF2aWdh dGluZyB0byBhbm90aGVyIHBhZ2UsIGFuZCBhbHNvIHRoZSByZWFzb24gd2h5IGl0J3Mgbm90IHNo b3duIGluaXRpYWxseSB3aGVuIHN0YXJ0aW5nIHRoZSBNYWMgTWluaUJyb3dzZXIKKyAgICAgICAg YW5kIHRoZSBzZXR0aW5nIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwYWdlL1BhZ2VPdmVybGF5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VPdmVybGF5Ojp3aWxsQXR0YWNoUm9vdExheWVy KTogTm90aWZ5IHRoZSBjbGllbnQuCisgICAgICAgIChXZWJDb3JlOjpQYWdlT3ZlcmxheTo6d2ls bERldGFjaFJvb3RMYXllcik6IERpdHRvLgorICAgICAgICAqIHBhZ2UvUGFnZU92ZXJsYXkuaDoK KyAgICAgICAgKiBwYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OmNyZWF0ZU92ZXJsYXlHcmFwaGljc0xheWVyKTog TW92ZSB0aGUgY29kZSB0aGF0IGNyZWF0ZXMgYW5kIHNldHVwIHRoZQorICAgICAgICBHcmFwaGlj c0xheWVyIGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OmRl c3Ryb3lPdmVybGF5R3JhcGhpY3NMYXllcik6IERlc3Ryb3kgdGhlIEdyYXBoaWNzTGF5ZXIuCisg ICAgICAgIChXZWJDb3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6Omluc3RhbGxQYWdlT3Zlcmxh eSk6IENhbGwgY3JlYXRlT3ZlcmxheUdyYXBoaWNzTGF5ZXIoKS4KKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VPdmVybGF5Q29udHJvbGxlcjo6dW5pbnN0YWxsUGFnZU92ZXJsYXkpOiBDYWxsIGRlc3Ry b3lPdmVybGF5R3JhcGhpY3NMYXllcigpLgorICAgICAgICAoV2ViQ29yZTo6UGFnZU92ZXJsYXlD b250cm9sbGVyOjpzZXRQYWdlT3ZlcmxheU9wYWNpdHkpOiBBc3NlcnQgaWYgb3ZlcmxheSBub3Qg aW4gbV9vdmVybGF5R3JhcGhpY3NMYXllcnMuCisgICAgICAgIChXZWJDb3JlOjpQYWdlT3Zlcmxh eUNvbnRyb2xsZXI6OmNsZWFyUGFnZU92ZXJsYXkpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VPdmVybGF5Q29udHJvbGxlcjo6bGF5ZXJGb3JPdmVybGF5KTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OndpbGxBdHRhY2hSb290TGF5ZXIpOiBJ ZiB0aGUgR3JhcGhpY3NMYXllciBhbHJlYWR5IGV4aXN0cywgc2ltcGx5IHVwZGF0ZSBpdHMKKyAg ICAgICAgZ2VvbWV0cnksIG90aGVyd2lzZSBjYWxsIGNyZWF0ZU92ZXJsYXlHcmFwaGljc0xheWVy KCkgdG8gY3JlYXRlIGEgbmV3IG9uZS4gSW4gYm90aCBjYXNlcyBub3RpZnkgdGhlIG92ZXJsYXku CisgICAgICAgIChXZWJDb3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OndpbGxEZXRhY2hSb290 TGF5ZXIpOiBEZXN0cm95IHRoZSBHcmFwaGljc0xheWVycyBhbmQgbm90aWZ5IHRoZSBvdmVybGF5 LgorICAgICAgICAoV2ViQ29yZTo6UGFnZU92ZXJsYXlDb250cm9sbGVyOjpkaWRDaGFuZ2VPdmVy bGF5RnJhbWUpOiBBc3NlcnQgaWYgb3ZlcmxheSBub3QgaW4gbV9vdmVybGF5R3JhcGhpY3NMYXll cnMuCisgICAgICAgIChXZWJDb3JlOjpQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OmRpZENoYW5nZU92 ZXJsYXlCYWNrZ3JvdW5kQ29sb3IpOiBBc3NlcnQgaWYgb3ZlcmxheSBub3QgaW4gbV9vdmVybGF5 R3JhcGhpY3NMYXllcnMuCisgICAgICAgICogcGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaDog Q291bnQgdGhlIG92ZXJsYXlzIGluIHRoZSB2ZWN0b3IgaW5zdGVhZCBvZiB0aGUgR3JhcGhpY3NM YXllcnMgaW4gdGhlIG1hcC4KKyAgICAgICAgKiBwYWdlL1Jlc291cmNlVXNhZ2VPdmVybGF5Lmg6 CisgICAgICAgICogcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VVc2FnZU92ZXJsYXk6OndpbGxBdHRhY2hSb290TGF5ZXIp OiBDYWxsIHNldENvbnRlbnRzVG9QbGF0Zm9ybUxheWVyIG9uIHRoZSBuZXcgb3ZlcmxheSBsYXll ci4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlVXNhZ2VPdmVybGF5Ojp3aWxsRGV0YWNoUm9v dExheWVyKToKKyAgICAgICAgKiBwYWdlL2xpbnV4L1Jlc291cmNlVXNhZ2VPdmVybGF5TGludXgu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VVc2FnZU92ZXJsYXk6OmNyZWF0ZVBhaW50 TGF5ZXIpOiBNb3ZlIHRoZSBjb2RlIHRvIGNyZWF0ZSB0aGUgcGFpbnQgbGF5ZXIgaGVyZS4KKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlVXNhZ2VPdmVybGF5OjpkZXN0cm95UGFpbnRMYXllcik6 IE1vdmUgdGhlIGNvZGUgdG8gZGVzdHJveSB0aGUgcGFpbnQgbGF5ZXIgaGVyZS4KKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybUluaXRpYWxpemUpOiBDYWxs IGNyZWF0ZVBhaW50TGF5ZXIoKSBhbmQgZG8gbm90IHRyeSB0byB1c2UgdGhlIHBhaW50CisgICAg ICAgIGxheWVyIGlmIHRoZSByb290IGxheWVyIHdhcyBkZXRhY2hlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybURlc3Ryb3kpOiBDYWxsIGRlc3Ryb3lQ YWludExheWVyKCkuCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVVzYWdlT3ZlcmxheTo6d2ls bEF0dGFjaFJvb3RMYXllcik6IElmIHdlIGhhdmUgYSBwYWludCBsYXllciB1cGRhdGUgaXRzIHNp emUsIG90aGVyd2lzZSBjcmVhdGUKKyAgICAgICAgYSBuZXcgb25lLgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VVc2FnZU92ZXJsYXk6OndpbGxEZXRhY2hSb290TGF5ZXIpOiBEZXN0cm95IHRo ZSBwYWludCBsYXllci4KKworMjAxNy0wMi0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWRkIGluaXRpYWwgaW1wbGVtZW50YXRp b24gb2YgcmVzb3VyY2UgdXNhZ2Ugb3ZlcmxheQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NzMxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZU92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3ZlcmxheS5j cHAKaW5kZXggMmNhODZmOTgyODAuLjE1NzhhMGEyZmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VP dmVybGF5LmNwcApAQCAtMjEwLDYgKzIxMCwxNiBAQCB2b2lkIFBhZ2VPdmVybGF5OjpkaWRTY3Jv bGxGcmFtZShGcmFtZSYgZnJhbWUpCiAgICAgbV9jbGllbnQuZGlkU2Nyb2xsRnJhbWUoKnRoaXMs IGZyYW1lKTsKIH0KIAordm9pZCBQYWdlT3ZlcmxheTo6d2lsbEF0dGFjaFJvb3RMYXllcigpCit7 CisgICAgbV9jbGllbnQud2lsbEF0dGFjaFJvb3RMYXllcigqdGhpcyk7Cit9CisKK3ZvaWQgUGFn ZU92ZXJsYXk6OndpbGxEZXRhY2hSb290TGF5ZXIoKQoreworICAgIG1fY2xpZW50LndpbGxEZXRh Y2hSb290TGF5ZXIoKnRoaXMpOworfQorCiBib29sIFBhZ2VPdmVybGF5Ojpjb3B5QWNjZXNzaWJp bGl0eUF0dHJpYnV0ZVN0cmluZ1ZhbHVlRm9yUG9pbnQoU3RyaW5nIGF0dHJpYnV0ZSwgRmxvYXRQ b2ludCBwYXJhbWV0ZXIsIFN0cmluZyYgdmFsdWUpCiB7CiAgICAgcmV0dXJuIG1fY2xpZW50LmNv cHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlU3RyaW5nVmFsdWVGb3JQb2ludCgqdGhpcywgYXR0cmli dXRlLCBwYXJhbWV0ZXIsIHZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZU92ZXJsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZU92ZXJsYXkuaAppbmRleCBl MTZkNjY5NmYwNi4uYjllZjBiM2E5NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZU92ZXJsYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5LmgKQEAg LTU1LDYgKzU1LDggQEAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZHJhd1JlY3QoUGFn ZU92ZXJsYXkmLCBHcmFwaGljc0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpID0g MDsKICAgICAgICAgdmlydHVhbCBib29sIG1vdXNlRXZlbnQoUGFnZU92ZXJsYXkmLCBjb25zdCBQ bGF0Zm9ybU1vdXNlRXZlbnQmKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRTY3JvbGxG cmFtZShQYWdlT3ZlcmxheSYsIEZyYW1lJikgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCB3aWxs QXR0YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5JikgeyB9CisgICAgICAgIHZpcnR1YWwgdm9pZCB3 aWxsRGV0YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5JikgeyB9CiAKICAgICAgICAgdmlydHVhbCBi b29sIGNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlU3RyaW5nVmFsdWVGb3JQb2ludChQYWdlT3Zl cmxheSYsIFN0cmluZyAvKiBhdHRyaWJ1dGUgKi8sIEZsb2F0UG9pbnQsIFN0cmluZyYpIHsgcmV0 dXJuIGZhbHNlOyB9CiAgICAgICAgIHZpcnR1YWwgYm9vbCBjb3B5QWNjZXNzaWJpbGl0eUF0dHJp YnV0ZUJvb2xWYWx1ZUZvclBvaW50KFBhZ2VPdmVybGF5JiwgU3RyaW5nIC8qIGF0dHJpYnV0ZSAq LywgRmxvYXRQb2ludCwgYm9vbCYpICB7IHJldHVybiBmYWxzZTsgfQpAQCAtODIsNiArODQsOCBA QCBwdWJsaWM6CiAgICAgdm9pZCBkcmF3UmVjdChHcmFwaGljc0NvbnRleHQmLCBjb25zdCBJbnRS ZWN0JiBkaXJ0eVJlY3QpOwogICAgIGJvb2wgbW91c2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNl RXZlbnQmKTsKICAgICB2b2lkIGRpZFNjcm9sbEZyYW1lKEZyYW1lJik7CisgICAgdm9pZCB3aWxs QXR0YWNoUm9vdExheWVyKCk7CisgICAgdm9pZCB3aWxsRGV0YWNoUm9vdExheWVyKCk7CiAKICAg ICBib29sIGNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlU3RyaW5nVmFsdWVGb3JQb2ludChTdHJp bmcgYXR0cmlidXRlLCBGbG9hdFBvaW50IHBhcmFtZXRlciwgU3RyaW5nJiB2YWx1ZSk7CiAgICAg Ym9vbCBjb3B5QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZUJvb2xWYWx1ZUZvclBvaW50KFN0cmluZyBh dHRyaWJ1dGUsIEZsb2F0UG9pbnQgcGFyYW1ldGVyLCBib29sJiB2YWx1ZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5jcHAKaW5kZXggOWYxZTU0YzE4ODYu LjhhYjRkZTFkNDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5 Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3ZlcmxheUNvbnRy b2xsZXIuY3BwCkBAIC05NSwxNSArOTUsMTAgQEAgc3RhdGljIHZvaWQgdXBkYXRlT3ZlcmxheUdl b21ldHJ5KFBhZ2VPdmVybGF5JiBvdmVybGF5LCBHcmFwaGljc0xheWVyJiBncmFwaGljc0wKICAg ICBncmFwaGljc0xheWVyLnNldFNpemUob3ZlcmxheUZyYW1lLnNpemUoKSk7CiB9CiAKLXZvaWQg UGFnZU92ZXJsYXlDb250cm9sbGVyOjppbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkmIG92 ZXJsYXksIFBhZ2VPdmVybGF5OjpGYWRlTW9kZSBmYWRlTW9kZSkKK3ZvaWQgUGFnZU92ZXJsYXlD b250cm9sbGVyOjpjcmVhdGVPdmVybGF5R3JhcGhpY3NMYXllcihQYWdlT3ZlcmxheSYgb3Zlcmxh eSkKIHsKICAgICBjcmVhdGVSb290TGF5ZXJzSWZOZWVkZWQoKTsKIAotICAgIGlmIChtX3BhZ2VP dmVybGF5cy5jb250YWlucygmb3ZlcmxheSkpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fcGFn ZU92ZXJsYXlzLmFwcGVuZCgmb3ZlcmxheSk7Ci0KICAgICBzdGQ6OnVuaXF1ZV9wdHI8R3JhcGhp Y3NMYXllcj4gbGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUobV9tYWluRnJhbWUucGFnZSgp LT5jaHJvbWUoKS5jbGllbnQoKS5ncmFwaGljc0xheWVyRmFjdG9yeSgpLCAqdGhpcyk7CiAgICAg bGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKICAgICBsYXllci0+c2V0QmFj a2dyb3VuZENvbG9yKG92ZXJsYXkuYmFja2dyb3VuZENvbG9yKCkpOwpAQCAtMTIyLDggKzExNywy MyBAQCB2b2lkIFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6aW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VP dmVybGF5JiBvdmVybGF5LCBQYWdlT3ZlcmxheQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAg ICBHcmFwaGljc0xheWVyJiByYXdMYXllciA9ICpsYXllcjsKICAgICBtX292ZXJsYXlHcmFwaGlj c0xheWVycy5zZXQoJm92ZXJsYXksIFdURk1vdmUobGF5ZXIpKTsKK30KKwordm9pZCBQYWdlT3Zl cmxheUNvbnRyb2xsZXI6OmRlc3Ryb3lPdmVybGF5R3JhcGhpY3NMYXllcihQYWdlT3ZlcmxheSYg b3ZlcmxheSkKK3sKKyAgICBpZiAoYXV0byBsYXllciA9IG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJz LnRha2UoJm92ZXJsYXkpKQorICAgICAgICBsYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOworfQor Cit2b2lkIFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6aW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVy bGF5JiBvdmVybGF5LCBQYWdlT3ZlcmxheTo6RmFkZU1vZGUgZmFkZU1vZGUpCit7CisgICAgaWYg KG1fcGFnZU92ZXJsYXlzLmNvbnRhaW5zKCZvdmVybGF5KSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9wYWdlT3ZlcmxheXMuYXBwZW5kKCZvdmVybGF5KTsKKworICAgIGNyZWF0ZU92ZXJsYXlH cmFwaGljc0xheWVyKG92ZXJsYXkpOwogCiAgICAgdXBkYXRlRm9yY2VTeW5jaHJvbm91c1Njcm9s bExheWVyUG9zaXRpb25VcGRhdGVzKCk7CiAKQEAgLTEzMiw3ICsxNDIsNyBAQCB2b2lkIFBhZ2VP dmVybGF5Q29udHJvbGxlcjo6aW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5JiBvdmVybGF5 LCBQYWdlT3ZlcmxheQogICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fbWFpbkZyYW1l LnZpZXcoKSkKICAgICAgICAgZnJhbWVWaWV3LT5lbnRlckNvbXBvc2l0aW5nTW9kZSgpOwogCi0g ICAgdXBkYXRlT3ZlcmxheUdlb21ldHJ5KG92ZXJsYXksIHJhd0xheWVyKTsKKyAgICB1cGRhdGVP dmVybGF5R2VvbWV0cnkob3ZlcmxheSwgKm1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzLmdldCgmb3Zl cmxheSkpOwogCiAgICAgaWYgKGZhZGVNb2RlID09IFBhZ2VPdmVybGF5OjpGYWRlTW9kZTo6RmFk ZSkKICAgICAgICAgb3ZlcmxheS5zdGFydEZhZGVJbkFuaW1hdGlvbigpOwpAQCAtMTQ2LDggKzE1 Niw3IEBAIHZvaWQgUGFnZU92ZXJsYXlDb250cm9sbGVyOjp1bmluc3RhbGxQYWdlT3ZlcmxheShQ YWdlT3ZlcmxheSYgb3ZlcmxheSwgUGFnZU92ZXJsCiAgICAgfQogCiAgICAgb3ZlcmxheS5zZXRQ YWdlKG51bGxwdHIpOwotCi0gICAgbV9vdmVybGF5R3JhcGhpY3NMYXllcnMudGFrZSgmb3Zlcmxh eSktPnJlbW92ZUZyb21QYXJlbnQoKTsKKyAgICBkZXN0cm95T3ZlcmxheUdyYXBoaWNzTGF5ZXIo b3ZlcmxheSk7CiAKICAgICBib29sIHJlbW92ZWQgPSBtX3BhZ2VPdmVybGF5cy5yZW1vdmVGaXJz dCgmb3ZlcmxheSk7CiAgICAgQVNTRVJUX1VOVVNFRChyZW1vdmVkLCByZW1vdmVkKTsKQEAgLTE4 NiwyOSArMTk1LDQxIEBAIHZvaWQgUGFnZU92ZXJsYXlDb250cm9sbGVyOjpzZXRQYWdlT3Zlcmxh eU5lZWRzRGlzcGxheShQYWdlT3ZlcmxheSYgb3ZlcmxheSwgY29uCiB2b2lkIFBhZ2VPdmVybGF5 Q29udHJvbGxlcjo6c2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5JiBvdmVybGF5LCBm bG9hdCBvcGFjaXR5KQogewogICAgIEFTU0VSVChtX3BhZ2VPdmVybGF5cy5jb250YWlucygmb3Zl cmxheSkpOworICAgIEFTU0VSVChtX292ZXJsYXlHcmFwaGljc0xheWVycy5jb250YWlucygmb3Zl cmxheSkpOwogICAgIG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzLmdldCgmb3ZlcmxheSktPnNldE9w YWNpdHkob3BhY2l0eSk7CiB9CiAKIHZvaWQgUGFnZU92ZXJsYXlDb250cm9sbGVyOjpjbGVhclBh Z2VPdmVybGF5KFBhZ2VPdmVybGF5JiBvdmVybGF5KQogewogICAgIEFTU0VSVChtX3BhZ2VPdmVy bGF5cy5jb250YWlucygmb3ZlcmxheSkpOworICAgIEFTU0VSVChtX292ZXJsYXlHcmFwaGljc0xh eWVycy5jb250YWlucygmb3ZlcmxheSkpOwogICAgIG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzLmdl dCgmb3ZlcmxheSktPnNldERyYXdzQ29udGVudChmYWxzZSk7CiB9CiAKIEdyYXBoaWNzTGF5ZXIm IFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6bGF5ZXJGb3JPdmVybGF5KFBhZ2VPdmVybGF5JiBvdmVy bGF5KSBjb25zdAogewogICAgIEFTU0VSVChtX3BhZ2VPdmVybGF5cy5jb250YWlucygmb3Zlcmxh eSkpOworICAgIEFTU0VSVChtX292ZXJsYXlHcmFwaGljc0xheWVycy5jb250YWlucygmb3Zlcmxh eSkpOwogICAgIHJldHVybiAqbV9vdmVybGF5R3JhcGhpY3NMYXllcnMuZ2V0KCZvdmVybGF5KTsK IH0KIAogdm9pZCBQYWdlT3ZlcmxheUNvbnRyb2xsZXI6OndpbGxBdHRhY2hSb290TGF5ZXIoKQog ewotICAgIGZvciAoYXV0byYgb3ZlcmxheUFuZExheWVyIDogbV9vdmVybGF5R3JhcGhpY3NMYXll cnMpCi0gICAgICAgIHVwZGF0ZU92ZXJsYXlHZW9tZXRyeSgqb3ZlcmxheUFuZExheWVyLmtleSwg Km92ZXJsYXlBbmRMYXllci52YWx1ZSk7CisgICAgZm9yIChhdXRvJiBvdmVybGF5IDogbV9wYWdl T3ZlcmxheXMpIHsKKyAgICAgICAgaWYgKGF1dG8gbGF5ZXIgPSBtX292ZXJsYXlHcmFwaGljc0xh eWVycy5nZXQob3ZlcmxheS5nZXQoKSkpCisgICAgICAgICAgICB1cGRhdGVPdmVybGF5R2VvbWV0 cnkoKm92ZXJsYXksICpsYXllcik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNyZWF0ZU92 ZXJsYXlHcmFwaGljc0xheWVyKCpvdmVybGF5KTsKKyAgICAgICAgb3ZlcmxheS0+d2lsbEF0dGFj aFJvb3RMYXllcigpOworICAgIH0KIH0KIAogdm9pZCBQYWdlT3ZlcmxheUNvbnRyb2xsZXI6Ondp bGxEZXRhY2hSb290TGF5ZXIoKQogeworICAgIGZvciAoYXV0byYgb3ZlcmxheSA6IG1fcGFnZU92 ZXJsYXlzKSB7CisgICAgICAgIG92ZXJsYXktPndpbGxEZXRhY2hSb290TGF5ZXIoKTsKKyAgICAg ICAgZGVzdHJveU92ZXJsYXlHcmFwaGljc0xheWVyKCpvdmVybGF5KTsKKyAgICB9CiAgICAgbV9k b2N1bWVudE92ZXJsYXlSb290TGF5ZXIgPSBudWxscHRyOwogICAgIG1fdmlld092ZXJsYXlSb290 TGF5ZXIgPSBudWxscHRyOwogICAgIG1faW5pdGlhbGl6ZWQgPSBmYWxzZTsKQEAgLTM1MywxMiAr Mzc0LDE0IEBAIHZvaWQgUGFnZU92ZXJsYXlDb250cm9sbGVyOjpub3RpZnlGbHVzaFJlcXVpcmVk KGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKQogdm9pZCBQYWdlT3ZlcmxheUNvbnRyb2xs ZXI6OmRpZENoYW5nZU92ZXJsYXlGcmFtZShQYWdlT3ZlcmxheSYgb3ZlcmxheSkKIHsKICAgICBB U1NFUlQobV9wYWdlT3ZlcmxheXMuY29udGFpbnMoJm92ZXJsYXkpKTsKKyAgICBBU1NFUlQobV9v dmVybGF5R3JhcGhpY3NMYXllcnMuY29udGFpbnMoJm92ZXJsYXkpKTsKICAgICB1cGRhdGVPdmVy bGF5R2VvbWV0cnkob3ZlcmxheSwgKm1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzLmdldCgmb3Zlcmxh eSkpOwogfQogCiB2b2lkIFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6ZGlkQ2hhbmdlT3ZlcmxheUJh Y2tncm91bmRDb2xvcihQYWdlT3ZlcmxheSYgb3ZlcmxheSkKIHsKICAgICBBU1NFUlQobV9wYWdl T3ZlcmxheXMuY29udGFpbnMoJm92ZXJsYXkpKTsKKyAgICBBU1NFUlQobV9vdmVybGF5R3JhcGhp Y3NMYXllcnMuY29udGFpbnMoJm92ZXJsYXkpKTsKICAgICBtX292ZXJsYXlHcmFwaGljc0xheWVy cy5nZXQoJm92ZXJsYXkpLT5zZXRCYWNrZ3JvdW5kQ29sb3Iob3ZlcmxheS5iYWNrZ3JvdW5kQ29s b3IoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZU92ZXJsYXlD b250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5o CmluZGV4IGJmYjQxMGQyMDg4Li44YjViZDE0ZWQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VPdmVybGF5Q29udHJvbGxlci5oCkBAIC03MCw3ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIGRpZENoYW5nZU92ZXJsYXlGcmFtZShQYWdlT3ZlcmxheSYpOwogICAgIHZvaWQgZGlkQ2hh bmdlT3ZlcmxheUJhY2tncm91bmRDb2xvcihQYWdlT3ZlcmxheSYpOwogCi0gICAgaW50IG92ZXJs YXlDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzLnNpemUoKTsg fQorICAgIGludCBvdmVybGF5Q291bnQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VPdmVybGF5cy5z aXplKCk7IH0KIAogICAgIGJvb2wgaGFuZGxlTW91c2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNl RXZlbnQmKTsKIApAQCAtODAsNiArODAsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9p ZCBjcmVhdGVSb290TGF5ZXJzSWZOZWVkZWQoKTsKKyAgICB2b2lkIGNyZWF0ZU92ZXJsYXlHcmFw aGljc0xheWVyKFBhZ2VPdmVybGF5Jik7CisgICAgdm9pZCBkZXN0cm95T3ZlcmxheUdyYXBoaWNz TGF5ZXIoUGFnZU92ZXJsYXkmKTsKIAogICAgIHZvaWQgdXBkYXRlU2V0dGluZ3NGb3JMYXllcihH cmFwaGljc0xheWVyJik7CiAgICAgdm9pZCB1cGRhdGVGb3JjZVN5bmNocm9ub3VzU2Nyb2xsTGF5 ZXJQb3NpdGlvblVwZGF0ZXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUmVz b3VyY2VVc2FnZU92ZXJsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VVc2FnZU92 ZXJsYXkuaAppbmRleCBiOWQwNTM4NjFmMy4uYmM1ZjI0ODRiMGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VVc2FnZU92ZXJsYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1Jlc291cmNlVXNhZ2VPdmVybGF5LmgKQEAgLTY3LDEyICs2NywxOSBAQCBwcml2YXRl OgogICAgIHZvaWQgZHJhd1JlY3QoUGFnZU92ZXJsYXkmLCBHcmFwaGljc0NvbnRleHQmLCBjb25z dCBJbnRSZWN0Jikgb3ZlcnJpZGUgeyB9CiAgICAgYm9vbCBtb3VzZUV2ZW50KFBhZ2VPdmVybGF5 JiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaWRTY3Jv bGxGcmFtZShQYWdlT3ZlcmxheSYsIEZyYW1lJikgb3ZlcnJpZGUgeyB9CisgICAgdm9pZCB3aWxs QXR0YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5Jikgb3ZlcnJpZGU7CisgICAgdm9pZCB3aWxsRGV0 YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5Jikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIGluaXRpYWxp emUoKTsKIAogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CiAgICAgdm9pZCBwbGF0Zm9y bURlc3Ryb3koKTsKIAorI2lmIE9TKExJTlVYKQorICAgIHZvaWQgY3JlYXRlUGFpbnRMYXllcigp OworICAgIHZvaWQgZGVzdHJveVBhaW50TGF5ZXIoKTsKKyNlbmRpZgorCiAgICAgUGFnZSYgbV9w YWdlOwogICAgIFJlZlB0cjxQYWdlT3ZlcmxheT4gbV9vdmVybGF5OwogICAgIGJvb2wgbV9kcmFn Z2luZyB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jl c291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jl c291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW0KaW5kZXggMzY2NjAxZTM5MGMuLjQ1MzhiZjdmM2Ni IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVy bGF5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdl T3ZlcmxheUNvY29hLm1tCkBAIC00OTAsNiArNDkwLDE1IEBAIHZvaWQgUmVzb3VyY2VVc2FnZU92 ZXJsYXk6OnBsYXRmb3JtRHJhdyhDR0NvbnRleHRSZWYgY29udGV4dCkKICAgICBkcmF3TWVtb3J5 UGllKGNvbnRleHQsIHBpZVJlY3QsIGRhdGEpOwogfQogCit2b2lkIFJlc291cmNlVXNhZ2VPdmVy bGF5Ojp3aWxsQXR0YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5JikKK3sKKyAgICBvdmVybGF5KCku bGF5ZXIoKS5zZXRDb250ZW50c1RvUGxhdGZvcm1MYXllcihtX2xheWVyLmdldCgpLCBHcmFwaGlj c0xheWVyOjpOb0NvbnRlbnRzTGF5ZXIpOworfQorCit2b2lkIFJlc291cmNlVXNhZ2VPdmVybGF5 Ojp3aWxsRGV0YWNoUm9vdExheWVyKFBhZ2VPdmVybGF5JikKK3sKK30KKwogfQogCiAjZW5kaWYg Ly8gRU5BQkxFKFJFU09VUkNFX1VTQUdFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9saW51eC9SZXNvdXJjZVVzYWdlT3ZlcmxheUxpbnV4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvbGludXgvUmVzb3VyY2VVc2FnZU92ZXJsYXlMaW51eC5jcHAKaW5kZXggY2ZmNjNlMDBlYTAu LjNhZGViN2MwYzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2xpbnV4L1Jlc291 cmNlVXNhZ2VPdmVybGF5TGludXguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbGludXgv UmVzb3VyY2VVc2FnZU92ZXJsYXlMaW51eC5jcHAKQEAgLTEzMSwzMyArMTMxLDY2IEBAIHByaXZh dGU6CiAgICAgRm9udENhc2NhZGUgbV90ZXh0Rm9udDsKIH07CiAKLXZvaWQgUmVzb3VyY2VVc2Fn ZU92ZXJsYXk6OnBsYXRmb3JtSW5pdGlhbGl6ZSgpCit2b2lkIFJlc291cmNlVXNhZ2VPdmVybGF5 OjpjcmVhdGVQYWludExheWVyKCkKIHsKLSAgICBtX292ZXJsYXlQYWludGVyID0gc3RkOjptYWtl X3VuaXF1ZTxSZXNvdXJjZVVzYWdlT3ZlcmxheVBhaW50ZXI+KCp0aGlzKTsKICAgICBtX3BhaW50 TGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUob3ZlcmxheSgpLnBhZ2UoKS0+Y2hyb21lKCku Y2xpZW50KCkuZ3JhcGhpY3NMYXllckZhY3RvcnkoKSwgKm1fb3ZlcmxheVBhaW50ZXIpOwogICAg IG1fcGFpbnRMYXllci0+c2V0QW5jaG9yUG9pbnQoRmxvYXRQb2ludDNEKCkpOwogICAgIG1fcGFp bnRMYXllci0+c2V0U2l6ZSh7IG5vcm1hbFdpZHRoLCBub3JtYWxIZWlnaHQgfSk7CiAgICAgbV9w YWludExheWVyLT5zZXRCYWNrZ3JvdW5kQ29sb3IoQ29sb3IoMC4wZiwgMC4wZiwgMC4wZiwgMC44 ZikpOwogICAgIG1fcGFpbnRMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOwogICAgIG92ZXJs YXkoKS5sYXllcigpLmFkZENoaWxkKG1fcGFpbnRMYXllci5nZXQoKSk7Cit9CisKK3ZvaWQgUmVz b3VyY2VVc2FnZU92ZXJsYXk6OmRlc3Ryb3lQYWludExheWVyKCkKK3sKKyAgICBpZiAoIW1fcGFp bnRMYXllcikKKyAgICAgICAgcmV0dXJuOworICAgIG1fcGFpbnRMYXllci0+cmVtb3ZlRnJvbVBh cmVudCgpOworICAgIG1fcGFpbnRMYXllciA9IG51bGxwdHI7Cit9CisKK3ZvaWQgUmVzb3VyY2VV c2FnZU92ZXJsYXk6OnBsYXRmb3JtSW5pdGlhbGl6ZSgpCit7CisgICAgbV9vdmVybGF5UGFpbnRl ciA9IHN0ZDo6bWFrZV91bmlxdWU8UmVzb3VyY2VVc2FnZU92ZXJsYXlQYWludGVyPigqdGhpcyk7 CisgICAgY3JlYXRlUGFpbnRMYXllcigpOwogCiAgICAgUmVzb3VyY2VVc2FnZVRocmVhZDo6YWRk T2JzZXJ2ZXIodGhpcywgW3RoaXNdIChjb25zdCBSZXNvdXJjZVVzYWdlRGF0YSYgZGF0YSkgewog ICAgICAgICBnRGF0YSA9IGRhdGE7Ci0gICAgICAgIG1fcGFpbnRMYXllci0+c2V0TmVlZHNEaXNw bGF5KCk7CisgICAgICAgIGlmIChtX3BhaW50TGF5ZXIpCisgICAgICAgICAgICBtX3BhaW50TGF5 ZXItPnNldE5lZWRzRGlzcGxheSgpOwogICAgIH0pOwogfQogCiB2b2lkIFJlc291cmNlVXNhZ2VP dmVybGF5OjpwbGF0Zm9ybURlc3Ryb3koKQogewotICAgIFJlc291cmNlVXNhZ2VUaHJlYWQ6OnJl bW92ZU9ic2VydmVyKHRoaXMpOwotICAgIGlmICghbV9wYWludExheWVyKQorICAgIGlmICghbV9v dmVybGF5UGFpbnRlcikgeworICAgICAgICAvLyBOb3QgaW5pdGlhbGl6ZWQuCiAgICAgICAgIHJl dHVybjsKKyAgICB9CiAKLSAgICBtX3BhaW50TGF5ZXItPnJlbW92ZUZyb21QYXJlbnQoKTsKLSAg ICBtX3BhaW50TGF5ZXIgPSBudWxscHRyOworICAgIFJlc291cmNlVXNhZ2VUaHJlYWQ6OnJlbW92 ZU9ic2VydmVyKHRoaXMpOworICAgIGRlc3Ryb3lQYWludExheWVyKCk7CiAgICAgbV9vdmVybGF5 UGFpbnRlciA9IG51bGxwdHI7CiB9CiAKK3ZvaWQgUmVzb3VyY2VVc2FnZU92ZXJsYXk6OndpbGxB dHRhY2hSb290TGF5ZXIoUGFnZU92ZXJsYXkmKQoreworICAgIGlmICghbV9vdmVybGF5UGFpbnRl cikgeworICAgICAgICAvLyBOb3QgaW5pdGlhbGl6ZWQgeWV0LgorICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgaWYgKG1fcGFpbnRMYXllcikKKyAgICAgICAgbV9wYWludExheWVyLT5zZXRT aXplKHsgbm9ybWFsV2lkdGgsIG5vcm1hbEhlaWdodCB9KTsKKyAgICBlbHNlCisgICAgICAgIGNy ZWF0ZVBhaW50TGF5ZXIoKTsKK30KKwordm9pZCBSZXNvdXJjZVVzYWdlT3ZlcmxheTo6d2lsbERl dGFjaFJvb3RMYXllcihQYWdlT3ZlcmxheSYpCit7CisgICAgZGVzdHJveVBhaW50TGF5ZXIoKTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKFJFU09VUkNF X1VTQUdFKSAmJiBPUyhMSU5VWCkK