125922 2013-12-18 04:59:53 -0800 Use range for syntax in Frame and FrameView. 2013-12-18 07:01:27 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 960900 0 kling 2013-12-18 04:59:53 -0800 Use range for syntax in Frame and FrameView. 960901 1 219525 kling 2013-12-18 05:01:15 -0800 Created attachment 219525 Patch 960903 2 219526 kling 2013-12-18 05:02:45 -0800 Created attachment 219526 Patch 960926 3 219526 commit-queue 2013-12-18 07:01:25 -0800 Comment on attachment 219526 Patch Clearing flags on attachment: 219526 Committed r160764: <http://trac.webkit.org/changeset/160764> 960927 4 commit-queue 2013-12-18 07:01:27 -0800 All reviewed patches have been landed. Closing bug. 219525 2013-12-18 05:01:15 -0800 2013-12-18 05:02:45 -0800 Patch bug-125922.diff text/plain 5750 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZjk0MDVkLi4yNjZlZjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQg QEAKIDIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFVzZSByYW5nZSBmb3Igc3ludGF4IGluIEZyYW1lIGFuZCBGcmFtZVZpZXcuCisgICAgICAg IDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjU5MjI+CisKKyAgICAgICAgQ29udmVydCBjb2RlIGlu IEZyYW1lIGFuZCBGcmFtZVZpZXcgdG8gdXNlIEMrKzExJ3MgcmFuZ2UgZm9yIHN5bnRheC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworMjAxMy0xMi0xOCAgQW5kcmVh cyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKICAgICAgICAgUmVuZGVyRWxlbWVudC1pemUg YWRqdXN0Rm9yQWJzb2x1dGVab29tKCkgYW5kIGZyaWVuZHMuCiAgICAgICAgIDxodHRwczovL3dl YmtpdC5vcmcvYi8xMjU5MjE+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggYjhkODc3OC4uZjkx ODA2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTIyMyw5ICsyMjMsOCBAQCBGcmFtZTo6fkZy YW1lKCkKIAogICAgIGRpc2Nvbm5lY3RPd25lckVsZW1lbnQoKTsKIAotICAgIEhhc2hTZXQ8RnJh bWVEZXN0cnVjdGlvbk9ic2VydmVyKj46Oml0ZXJhdG9yIHN0b3AgPSBtX2Rlc3RydWN0aW9uT2Jz ZXJ2ZXJzLmVuZCgpOwotICAgIGZvciAoSGFzaFNldDxGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIq Pjo6aXRlcmF0b3IgaXQgPSBtX2Rlc3RydWN0aW9uT2JzZXJ2ZXJzLmJlZ2luKCk7IGl0ICE9IHN0 b3A7ICsraXQpCi0gICAgICAgICgqaXQpLT5mcmFtZURlc3Ryb3llZCgpOworICAgIGZvciAoYXV0 byYgb2JzZXJ2ZXIgOiBtX2Rlc3RydWN0aW9uT2JzZXJ2ZXJzKQorICAgICAgICBvYnNlcnZlci0+ ZnJhbWVEZXN0cm95ZWQoKTsKIAogICAgIGlmICghaXNNYWluRnJhbWUoKSkKICAgICAgICAgbV9t YWluRnJhbWUuc2VsZk9ubHlEZXJlZigpOwpAQCAtNjE0LDkgKzYxMyw4IEBAIHZvaWQgRnJhbWU6 OndpbGxEZXRhY2hQYWdlKCkKICAgICBpZiAoRnJhbWUqIHBhcmVudCA9IHRyZWUoKS5wYXJlbnQo KSkKICAgICAgICAgcGFyZW50LT5sb2FkZXIoKS5jaGVja0xvYWRDb21wbGV0ZSgpOwogCi0gICAg SGFzaFNldDxGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIqPjo6aXRlcmF0b3Igc3RvcCA9IG1fZGVz dHJ1Y3Rpb25PYnNlcnZlcnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoU2V0PEZyYW1lRGVzdHJ1Y3Rp b25PYnNlcnZlcio+OjppdGVyYXRvciBpdCA9IG1fZGVzdHJ1Y3Rpb25PYnNlcnZlcnMuYmVnaW4o KTsgaXQgIT0gc3RvcDsgKytpdCkKLSAgICAgICAgKCppdCktPndpbGxEZXRhY2hQYWdlKCk7Cisg ICAgZm9yIChhdXRvJiBvYnNlcnZlciA6IG1fZGVzdHJ1Y3Rpb25PYnNlcnZlcnMpCisgICAgICAg IG9ic2VydmVyLT53aWxsRGV0YWNoUGFnZSgpOwogCiAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVh ciBhcyB0byB3aHkgdGhpcyBpcyBjYWxsZWQgbW9yZSB0aGFuIG9uY2UsIGJ1dCBpdCBpcywKICAg ICAvLyBzbyBwYWdlKCkgY291bGQgYmUgTlVMTC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApp bmRleCBhMjgxOWNkLi4zYjViYTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0x NjQ1LDggKzE2NDUsNyBAQCBib29sIEZyYW1lVmlldzo6c2Nyb2xsQ29udGVudHNGYXN0UGF0aChj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgY29uc3QgSW50UmVjdAogCiAgICAgLy8gR2V0IHRo ZSByZWN0cyBvZiB0aGUgZml4ZWQgb2JqZWN0cyB2aXNpYmxlIGluIHRoZSByZWN0VG9TY3JvbGwK ICAgICBSZWdpb24gcmVnaW9uVG9VcGRhdGU7Ci0gICAgZm9yIChhdXRvIGl0ID0gbV92aWV3cG9y dENvbnN0cmFpbmVkT2JqZWN0cy0+YmVnaW4oKSwgZW5kID0gbV92aWV3cG9ydENvbnN0cmFpbmVk T2JqZWN0cy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBSZW5kZXJFbGVtZW50 KiByZW5kZXJlciA9ICppdDsKKyAgICBmb3IgKGF1dG8mIHJlbmRlcmVyIDogKm1fdmlld3BvcnRD b25zdHJhaW5lZE9iamVjdHMpIHsKICAgICAgICAgaWYgKCFyZW5kZXJlci0+c3R5bGUoKS5oYXNW aWV3cG9ydENvbnN0cmFpbmVkUG9zaXRpb24oKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKQEAgLTE3NDUsOCArMTc0NCw4IEBAIHZvaWQg RnJhbWVWaWV3OjpyZXBhaW50U2xvd1JlcGFpbnRPYmplY3RzKCkKIAogICAgIC8vIFJlbmRlcmVy cyB3aXRoIGZpeGVkIGJhY2tncm91bmRzIG1heSBiZSBpbiBjb21wb3NpdGluZyBsYXllcnMsIHNv IHdlIG5lZWQgdG8gZXhwbGljaXRseQogICAgIC8vIHJlcGFpbnQgdGhlbSBhZnRlciBzY3JvbGxp bmcuCi0gICAgZm9yIChhdXRvIGl0ID0gbV9zbG93UmVwYWludE9iamVjdHMtPmJlZ2luKCksIGVu ZCA9IG1fc2xvd1JlcGFpbnRPYmplY3RzLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAg ICAoKml0KS0+cmVwYWludCgpOworICAgIGZvciAoYXV0byYgcmVuZGVyZXIgOiAqbV9zbG93UmVw YWludE9iamVjdHMpCisgICAgICAgIHJlbmRlcmVyLT5yZXBhaW50KCk7CiB9CiAKIC8vIE5vdGUg dGhhdCB0aGlzIGdldHMgY2FsbGVkIGF0IHBhaW50aW5nIHRpbWUuCkBAIC0xOTQ1LDggKzE5NDQs OCBAQCB2b2lkIEZyYW1lVmlldzo6c2V0Vmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHNOZWVkTGF5 b3V0KCkKICAgICBpZiAoIWhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGZvciAoYXV0byBpdCA9IG1fdmlld3BvcnRDb25zdHJhaW5lZE9iamVj dHMtPmJlZ2luKCksIGVuZCA9IG1fdmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHMtPmVuZCgpOyBp dCAhPSBlbmQ7ICsraXQpCi0gICAgICAgICgqaXQpLT5zZXROZWVkc0xheW91dCgpOworICAgIGZv ciAoYXV0byYgcmVuZGVyZXIgOiAqbV92aWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0cykKKyAgICAg ICAgcmVuZGVyZXItPnNldE5lZWRzTGF5b3V0KCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpzY3Jv bGxQb3NpdGlvbkNoYW5nZWRWaWFQbGF0Zm9ybVdpZGdldCgpCkBAIC0yNTkxLDggKzI1OTAsNyBA QCB2b2lkIEZyYW1lVmlldzo6cmVzdW1lU2NoZWR1bGVkRXZlbnRzKCkKICAgICAgICAgcmV0dXJu OwogCiAgICAgVmVjdG9yPFNjaGVkdWxlZEV2ZW50PiBldmVudHNUb0Rpc3BhdGNoID0gc3RkOjpt b3ZlKG1fc2NoZWR1bGVkRXZlbnRzKTsKLSAgICBmb3IgKGF1dG8gaXQgPSBldmVudHNUb0Rpc3Bh dGNoLmJlZ2luKCksIGVuZCA9IGV2ZW50c1RvRGlzcGF0Y2guZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkgewotICAgICAgICBTY2hlZHVsZWRFdmVudCYgc2NoZWR1bGVkRXZlbnQgPSAqaXQ7CisgICAg Zm9yIChhdXRvJiBzY2hlZHVsZWRFdmVudCA6IGV2ZW50c1RvRGlzcGF0Y2gpIHsKICAgICAgICAg aWYgKCFzY2hlZHVsZWRFdmVudC50YXJnZXQtPmluRG9jdW1lbnQoKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICBzY2hlZHVsZWRFdmVudC50YXJnZXQtPmRpc3BhdGNoRXZlbnQoc2No ZWR1bGVkRXZlbnQuZXZlbnQucmVsZWFzZSgpLCBJR05PUkVfRVhDRVBUSU9OKTsKQEAgLTMxNjgs MTAgKzMxNjYsOCBAQCB2b2lkIEZyYW1lVmlldzo6bm90aWZ5UGFnZVRoYXRDb250ZW50QXJlYVdp bGxQYWludCgpIGNvbnN0CiAgICAgaWYgKCFtX3Njcm9sbGFibGVBcmVhcykKICAgICAgICAgcmV0 dXJuOwogCi0gICAgZm9yIChIYXNoU2V0PFNjcm9sbGFibGVBcmVhKj46OmNvbnN0X2l0ZXJhdG9y IGl0ID0gbV9zY3JvbGxhYmxlQXJlYXMtPmJlZ2luKCksIGVuZCA9IG1fc2Nyb2xsYWJsZUFyZWFz LT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFNjcm9sbGFibGVBcmVhKiBzY3Jv bGxhYmxlQXJlYSA9ICppdDsKKyAgICBmb3IgKGF1dG8mIHNjcm9sbGFibGVBcmVhIDogKm1fc2Ny b2xsYWJsZUFyZWFzKQogICAgICAgICBzY3JvbGxhYmxlQXJlYS0+Y29udGVudEFyZWFXaWxsUGFp bnQoKTsKLSAgICB9CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpzY3JvbGxBbmltYXRvckVuYWJsZWQo KSBjb25zdApAQCAtMzMxOCwxNCArMzMxNCwxMiBAQCBDb2xvciBGcmFtZVZpZXc6OmRvY3VtZW50 QmFja2dyb3VuZENvbG9yKCkgY29uc3QKIAogYm9vbCBGcmFtZVZpZXc6Omhhc0N1c3RvbVNjcm9s bGJhcnMoKSBjb25zdAogewotICAgIGZvciAoYXV0byBpdCA9IGNoaWxkcmVuKCkuYmVnaW4oKSwg ZW5kID0gY2hpbGRyZW4oKS5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFdpZGdl dCogd2lkZ2V0ID0gaXQtPmdldCgpOworICAgIGZvciAoYXV0byYgd2lkZ2V0IDogY2hpbGRyZW4o KSkgewogICAgICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKSB7CiAgICAgICAgICAgICBp ZiAodG9GcmFtZVZpZXcod2lkZ2V0KS0+aGFzQ3VzdG9tU2Nyb2xsYmFycygpKQogICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9IGVsc2UgaWYgKHdpZGdldC0+aXNTY3JvbGxi YXIoKSkgewotICAgICAgICAgICAgU2Nyb2xsYmFyKiBzY3JvbGxiYXIgPSBzdGF0aWNfY2FzdDxT Y3JvbGxiYXIqPih3aWRnZXQpOwotICAgICAgICAgICAgaWYgKHNjcm9sbGJhci0+aXNDdXN0b21T Y3JvbGxiYXIoKSkKKyAgICAgICAgICAgIGlmICh0b1Njcm9sbGJhcih3aWRnZXQpLT5pc0N1c3Rv bVNjcm9sbGJhcigpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAg ICAgfQpAQCAtMzYzMSw5ICszNjI1LDkgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFu ZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQogICAgIC8vIGFuZCB0aHVzIG11dGF0ZXMgdGhlIGNo aWxkcmVuKCkgc2V0LgogICAgIFZlY3RvcjxSZWY8RnJhbWVWaWV3PiwgMTY+IGNoaWxkVmlld3M7 CiAgICAgY2hpbGRWaWV3cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNoaWxkcmVuKCkuc2l6ZSgp KTsKLSAgICBmb3IgKGF1dG8gaXQgPSBjaGlsZHJlbigpLmJlZ2luKCksIGVuZCA9IGNoaWxkcmVu KCkuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBpZiAoaXQtPmdldCgpLT5pc0Zy YW1lVmlldygpKQotICAgICAgICAgICAgY2hpbGRWaWV3cy51bmNoZWNrZWRBcHBlbmQoKnRvRnJh bWVWaWV3KGl0LT5nZXQoKSkpOworICAgIGZvciAoYXV0byYgd2lkZ2V0IDogY2hpbGRyZW4oKSkg eworICAgICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKQorICAgICAgICAgICAgY2hpbGRW aWV3cy51bmNoZWNrZWRBcHBlbmQodG9GcmFtZVZpZXcoKndpZGdldCkpOwogICAgIH0KIAogICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjaGlsZFZpZXdzLnNpemUoKTsgKytpKQo= 219526 2013-12-18 05:02:45 -0800 2013-12-18 07:01:25 -0800 Patch bug-125922.diff text/plain 5811 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZjk0MDVkLi4yNjZlZjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQg QEAKIDIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFVzZSByYW5nZSBmb3Igc3ludGF4IGluIEZyYW1lIGFuZCBGcmFtZVZpZXcuCisgICAgICAg IDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjU5MjI+CisKKyAgICAgICAgQ29udmVydCBjb2RlIGlu IEZyYW1lIGFuZCBGcmFtZVZpZXcgdG8gdXNlIEMrKzExJ3MgcmFuZ2UgZm9yIHN5bnRheC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworMjAxMy0xMi0xOCAgQW5kcmVh cyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKICAgICAgICAgUmVuZGVyRWxlbWVudC1pemUg YWRqdXN0Rm9yQWJzb2x1dGVab29tKCkgYW5kIGZyaWVuZHMuCiAgICAgICAgIDxodHRwczovL3dl YmtpdC5vcmcvYi8xMjU5MjE+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggYjhkODc3OC4uZjkx ODA2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTIyMyw5ICsyMjMsOCBAQCBGcmFtZTo6fkZy YW1lKCkKIAogICAgIGRpc2Nvbm5lY3RPd25lckVsZW1lbnQoKTsKIAotICAgIEhhc2hTZXQ8RnJh bWVEZXN0cnVjdGlvbk9ic2VydmVyKj46Oml0ZXJhdG9yIHN0b3AgPSBtX2Rlc3RydWN0aW9uT2Jz ZXJ2ZXJzLmVuZCgpOwotICAgIGZvciAoSGFzaFNldDxGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIq Pjo6aXRlcmF0b3IgaXQgPSBtX2Rlc3RydWN0aW9uT2JzZXJ2ZXJzLmJlZ2luKCk7IGl0ICE9IHN0 b3A7ICsraXQpCi0gICAgICAgICgqaXQpLT5mcmFtZURlc3Ryb3llZCgpOworICAgIGZvciAoYXV0 byYgb2JzZXJ2ZXIgOiBtX2Rlc3RydWN0aW9uT2JzZXJ2ZXJzKQorICAgICAgICBvYnNlcnZlci0+ ZnJhbWVEZXN0cm95ZWQoKTsKIAogICAgIGlmICghaXNNYWluRnJhbWUoKSkKICAgICAgICAgbV9t YWluRnJhbWUuc2VsZk9ubHlEZXJlZigpOwpAQCAtNjE0LDkgKzYxMyw4IEBAIHZvaWQgRnJhbWU6 OndpbGxEZXRhY2hQYWdlKCkKICAgICBpZiAoRnJhbWUqIHBhcmVudCA9IHRyZWUoKS5wYXJlbnQo KSkKICAgICAgICAgcGFyZW50LT5sb2FkZXIoKS5jaGVja0xvYWRDb21wbGV0ZSgpOwogCi0gICAg SGFzaFNldDxGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIqPjo6aXRlcmF0b3Igc3RvcCA9IG1fZGVz dHJ1Y3Rpb25PYnNlcnZlcnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoU2V0PEZyYW1lRGVzdHJ1Y3Rp b25PYnNlcnZlcio+OjppdGVyYXRvciBpdCA9IG1fZGVzdHJ1Y3Rpb25PYnNlcnZlcnMuYmVnaW4o KTsgaXQgIT0gc3RvcDsgKytpdCkKLSAgICAgICAgKCppdCktPndpbGxEZXRhY2hQYWdlKCk7Cisg ICAgZm9yIChhdXRvJiBvYnNlcnZlciA6IG1fZGVzdHJ1Y3Rpb25PYnNlcnZlcnMpCisgICAgICAg IG9ic2VydmVyLT53aWxsRGV0YWNoUGFnZSgpOwogCiAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVh ciBhcyB0byB3aHkgdGhpcyBpcyBjYWxsZWQgbW9yZSB0aGFuIG9uY2UsIGJ1dCBpdCBpcywKICAg ICAvLyBzbyBwYWdlKCkgY291bGQgYmUgTlVMTC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApp bmRleCBhMjgxOWNkLi40MzU3OTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0x NjQ1LDggKzE2NDUsNyBAQCBib29sIEZyYW1lVmlldzo6c2Nyb2xsQ29udGVudHNGYXN0UGF0aChj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgY29uc3QgSW50UmVjdAogCiAgICAgLy8gR2V0IHRo ZSByZWN0cyBvZiB0aGUgZml4ZWQgb2JqZWN0cyB2aXNpYmxlIGluIHRoZSByZWN0VG9TY3JvbGwK ICAgICBSZWdpb24gcmVnaW9uVG9VcGRhdGU7Ci0gICAgZm9yIChhdXRvIGl0ID0gbV92aWV3cG9y dENvbnN0cmFpbmVkT2JqZWN0cy0+YmVnaW4oKSwgZW5kID0gbV92aWV3cG9ydENvbnN0cmFpbmVk T2JqZWN0cy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBSZW5kZXJFbGVtZW50 KiByZW5kZXJlciA9ICppdDsKKyAgICBmb3IgKGF1dG8mIHJlbmRlcmVyIDogKm1fdmlld3BvcnRD b25zdHJhaW5lZE9iamVjdHMpIHsKICAgICAgICAgaWYgKCFyZW5kZXJlci0+c3R5bGUoKS5oYXNW aWV3cG9ydENvbnN0cmFpbmVkUG9zaXRpb24oKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKQEAgLTE3NDUsOCArMTc0NCw4IEBAIHZvaWQg RnJhbWVWaWV3OjpyZXBhaW50U2xvd1JlcGFpbnRPYmplY3RzKCkKIAogICAgIC8vIFJlbmRlcmVy cyB3aXRoIGZpeGVkIGJhY2tncm91bmRzIG1heSBiZSBpbiBjb21wb3NpdGluZyBsYXllcnMsIHNv IHdlIG5lZWQgdG8gZXhwbGljaXRseQogICAgIC8vIHJlcGFpbnQgdGhlbSBhZnRlciBzY3JvbGxp bmcuCi0gICAgZm9yIChhdXRvIGl0ID0gbV9zbG93UmVwYWludE9iamVjdHMtPmJlZ2luKCksIGVu ZCA9IG1fc2xvd1JlcGFpbnRPYmplY3RzLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAg ICAoKml0KS0+cmVwYWludCgpOworICAgIGZvciAoYXV0byYgcmVuZGVyZXIgOiAqbV9zbG93UmVw YWludE9iamVjdHMpCisgICAgICAgIHJlbmRlcmVyLT5yZXBhaW50KCk7CiB9CiAKIC8vIE5vdGUg dGhhdCB0aGlzIGdldHMgY2FsbGVkIGF0IHBhaW50aW5nIHRpbWUuCkBAIC0xOTQ1LDggKzE5NDQs OCBAQCB2b2lkIEZyYW1lVmlldzo6c2V0Vmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHNOZWVkTGF5 b3V0KCkKICAgICBpZiAoIWhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGZvciAoYXV0byBpdCA9IG1fdmlld3BvcnRDb25zdHJhaW5lZE9iamVj dHMtPmJlZ2luKCksIGVuZCA9IG1fdmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHMtPmVuZCgpOyBp dCAhPSBlbmQ7ICsraXQpCi0gICAgICAgICgqaXQpLT5zZXROZWVkc0xheW91dCgpOworICAgIGZv ciAoYXV0byYgcmVuZGVyZXIgOiAqbV92aWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0cykKKyAgICAg ICAgcmVuZGVyZXItPnNldE5lZWRzTGF5b3V0KCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpzY3Jv bGxQb3NpdGlvbkNoYW5nZWRWaWFQbGF0Zm9ybVdpZGdldCgpCkBAIC0yNTkxLDggKzI1OTAsNyBA QCB2b2lkIEZyYW1lVmlldzo6cmVzdW1lU2NoZWR1bGVkRXZlbnRzKCkKICAgICAgICAgcmV0dXJu OwogCiAgICAgVmVjdG9yPFNjaGVkdWxlZEV2ZW50PiBldmVudHNUb0Rpc3BhdGNoID0gc3RkOjpt b3ZlKG1fc2NoZWR1bGVkRXZlbnRzKTsKLSAgICBmb3IgKGF1dG8gaXQgPSBldmVudHNUb0Rpc3Bh dGNoLmJlZ2luKCksIGVuZCA9IGV2ZW50c1RvRGlzcGF0Y2guZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkgewotICAgICAgICBTY2hlZHVsZWRFdmVudCYgc2NoZWR1bGVkRXZlbnQgPSAqaXQ7CisgICAg Zm9yIChhdXRvJiBzY2hlZHVsZWRFdmVudCA6IGV2ZW50c1RvRGlzcGF0Y2gpIHsKICAgICAgICAg aWYgKCFzY2hlZHVsZWRFdmVudC50YXJnZXQtPmluRG9jdW1lbnQoKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICBzY2hlZHVsZWRFdmVudC50YXJnZXQtPmRpc3BhdGNoRXZlbnQoc2No ZWR1bGVkRXZlbnQuZXZlbnQucmVsZWFzZSgpLCBJR05PUkVfRVhDRVBUSU9OKTsKQEAgLTMxNjgs MTAgKzMxNjYsOCBAQCB2b2lkIEZyYW1lVmlldzo6bm90aWZ5UGFnZVRoYXRDb250ZW50QXJlYVdp bGxQYWludCgpIGNvbnN0CiAgICAgaWYgKCFtX3Njcm9sbGFibGVBcmVhcykKICAgICAgICAgcmV0 dXJuOwogCi0gICAgZm9yIChIYXNoU2V0PFNjcm9sbGFibGVBcmVhKj46OmNvbnN0X2l0ZXJhdG9y IGl0ID0gbV9zY3JvbGxhYmxlQXJlYXMtPmJlZ2luKCksIGVuZCA9IG1fc2Nyb2xsYWJsZUFyZWFz LT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFNjcm9sbGFibGVBcmVhKiBzY3Jv bGxhYmxlQXJlYSA9ICppdDsKKyAgICBmb3IgKGF1dG8mIHNjcm9sbGFibGVBcmVhIDogKm1fc2Ny b2xsYWJsZUFyZWFzKQogICAgICAgICBzY3JvbGxhYmxlQXJlYS0+Y29udGVudEFyZWFXaWxsUGFp bnQoKTsKLSAgICB9CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpzY3JvbGxBbmltYXRvckVuYWJsZWQo KSBjb25zdApAQCAtMzMxOCwxNCArMzMxNCwxMiBAQCBDb2xvciBGcmFtZVZpZXc6OmRvY3VtZW50 QmFja2dyb3VuZENvbG9yKCkgY29uc3QKIAogYm9vbCBGcmFtZVZpZXc6Omhhc0N1c3RvbVNjcm9s bGJhcnMoKSBjb25zdAogewotICAgIGZvciAoYXV0byBpdCA9IGNoaWxkcmVuKCkuYmVnaW4oKSwg ZW5kID0gY2hpbGRyZW4oKS5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFdpZGdl dCogd2lkZ2V0ID0gaXQtPmdldCgpOworICAgIGZvciAoYXV0byYgd2lkZ2V0IDogY2hpbGRyZW4o KSkgewogICAgICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKSB7Ci0gICAgICAgICAgICBp ZiAodG9GcmFtZVZpZXcod2lkZ2V0KS0+aGFzQ3VzdG9tU2Nyb2xsYmFycygpKQorICAgICAgICAg ICAgaWYgKHRvRnJhbWVWaWV3KCp3aWRnZXQpLmhhc0N1c3RvbVNjcm9sbGJhcnMoKSkKICAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfSBlbHNlIGlmICh3aWRnZXQtPmlzU2Ny b2xsYmFyKCkpIHsKLSAgICAgICAgICAgIFNjcm9sbGJhciogc2Nyb2xsYmFyID0gc3RhdGljX2Nh c3Q8U2Nyb2xsYmFyKj4od2lkZ2V0KTsKLSAgICAgICAgICAgIGlmIChzY3JvbGxiYXItPmlzQ3Vz dG9tU2Nyb2xsYmFyKCkpCisgICAgICAgICAgICBpZiAodG9TY3JvbGxiYXIoKndpZGdldCkuaXND dXN0b21TY3JvbGxiYXIoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAg fQogICAgIH0KQEAgLTM2MzEsOSArMzYyNSw5IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlv dXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkKICAgICAvLyBhbmQgdGh1cyBtdXRhdGVzIHRo ZSBjaGlsZHJlbigpIHNldC4KICAgICBWZWN0b3I8UmVmPEZyYW1lVmlldz4sIDE2PiBjaGlsZFZp ZXdzOwogICAgIGNoaWxkVmlld3MucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShjaGlsZHJlbigpLnNp emUoKSk7Ci0gICAgZm9yIChhdXRvIGl0ID0gY2hpbGRyZW4oKS5iZWdpbigpLCBlbmQgPSBjaGls ZHJlbigpLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgaWYgKGl0LT5nZXQoKS0+ aXNGcmFtZVZpZXcoKSkKLSAgICAgICAgICAgIGNoaWxkVmlld3MudW5jaGVja2VkQXBwZW5kKCp0 b0ZyYW1lVmlldyhpdC0+Z2V0KCkpKTsKKyAgICBmb3IgKGF1dG8mIHdpZGdldCA6IGNoaWxkcmVu KCkpIHsKKyAgICAgICAgaWYgKHdpZGdldC0+aXNGcmFtZVZpZXcoKSkKKyAgICAgICAgICAgIGNo aWxkVmlld3MudW5jaGVja2VkQXBwZW5kKHRvRnJhbWVWaWV3KCp3aWRnZXQpKTsKICAgICB9CiAK ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hpbGRWaWV3cy5zaXplKCk7ICsraSkK