144827 2015-05-09 07:17:38 -0700 Get rid of the public item accessors in BackForwardClient 2015-05-10 14:46:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sungmann.cho sungmann.cho commit-queue oldest_to_newest 1093418 0 sungmann.cho 2015-05-09 07:17:38 -0700 Remove backItem(), currentItem(), and forwardItem() from BackForwardClient. We can still use these functionalities through BackForwardController. 1093420 1 252774 sungmann.cho 2015-05-09 07:21:46 -0700 Created attachment 252774 Patch 1093422 2 252776 sungmann.cho 2015-05-09 08:34:50 -0700 Created attachment 252776 Patch 1093589 3 252776 commit-queue 2015-05-10 14:46:50 -0700 Comment on attachment 252776 Patch Clearing flags on attachment: 252776 Committed r184056: <http://trac.webkit.org/changeset/184056> 1093590 4 commit-queue 2015-05-10 14:46:54 -0700 All reviewed patches have been landed. Closing bug. 252774 2015-05-09 07:21:46 -0700 2015-05-09 08:34:44 -0700 Patch bug-144827-20150509232026.patch text/plain 4976 sungmann.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzY1M2Q1MDQyZjU0NjY2 MmE2ZjVmMjNiOGU5NmI1NDRiODVmOTdlMS4uMjgxZGZhNzczZWRjMGRhNjNlOGZjZmQ2MjhiMGFm ZGQ4ZjBlYmJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA1LTA5ICBTdW5n bWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJjb3JwLmNvbT4KKworICAgICAgICBHZXQgcmlk IG9mIHRoZSBwdWJsaWMgaXRlbSBhY2Nlc3NvcnMgaW4gQmFja0ZvcndhcmRDbGllbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDgyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBiYWNrSXRl bSgpLCBjdXJyZW50SXRlbSgpLCBhbmQgZm9yd2FyZEl0ZW0oKSBmcm9tIEJhY2tGb3J3YXJkQ2xp ZW50LgorICAgICAgICBXZSBjYW4gc3RpbGwgdXNlIHRoZXNlIGZ1bmN0aW9uYWxpdGllcyB0aHJv dWdoIEJhY2tGb3J3YXJkQ29udHJvbGxlci4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRDbGllbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkJhY2tGb3J3YXJkQ2xpZW50OjpiYWNrSXRlbSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpCYWNrRm9yd2FyZENsaWVudDo6Y3VycmVudEl0ZW0pOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6QmFja0ZvcndhcmRDbGllbnQ6OmZvcndhcmRJdGVtKTog RGVsZXRlZC4KKwogMjAxNS0wNS0wOSAgWW9hdiBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAg ICAgICBSZW1vdmUgdGhlIFBJQ1RVUkVfU0laRVMgYnVpbGQgZmxhZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGZiODY0ZGNhYjNhY2EyYjJlMjU0MmMwZDQ2ZjM3YmM3MTNjYTE0ZGQuLjYyMmVmZjliYzY2 NDQ4ZmVlYmY3ODVlMWNjZjhkZTIxNjZkNWNkMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOCBAQAorMjAxNS0wNS0wOSAgU3VuZ21hbm4gQ2hvICA8c3VuZ21hbm4uY2hvQG5hdmVyY29y cC5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgcHVibGljIGl0ZW0gYWNjZXNzb3JzIGlu IEJhY2tGb3J3YXJkQ2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ4MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW1vdmUgYmFja0l0ZW0oKSwgY3VycmVudEl0ZW0oKSwgYW5kIGZvcndhcmRJ dGVtKCkgZnJvbSBCYWNrRm9yd2FyZENsaWVudC4KKyAgICAgICAgV2UgY2FuIHN0aWxsIHVzZSB0 aGVzZSBmdW5jdGlvbmFsaXRpZXMgdGhyb3VnaCBCYWNrRm9yd2FyZENvbnRyb2xsZXIuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2xvYWRCYWNrRm9yd2FyZExpc3RG cm9tT3RoZXJWaWV3Ol0pOgorCiAyMDE1LTA1LTA5ICBZb2F2IFdlaXNzICA8eW9hdkB5b2F2Lndz PgogCiAgICAgICAgIFJlbW92ZSB0aGUgUElDVFVSRV9TSVpFUyBidWlsZCBmbGFnCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkQ2xpZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkQ2xpZW50LmgKaW5kZXggMDgyMDQxNWZlODEwZmVk MTNjNWQ5ZGEyNmFlYmJmZjc3MGIwOWJmNi4uNzc4YWM4ZmYwYWFkMTgyNGE4MDdmYTVjYWJjOGQ2 MDI5M2Q2YTMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2Fy ZENsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRDbGllbnQu aApAQCAtNTksMTIgKzU5LDYgQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBDb25zaWRlciByZW5h bWluZyB0aGlzIG1ldGhvZCBvbmNlIHdlIHVwc3RyZWFtIHRoZSBpT1MgY2hhbmdlcyB0byBXZWJW aWV3Lm1tLgogICAgIHZpcnR1YWwgYm9vbCBjbGVhckFsbFBhZ2VDYWNoZXMoKSA9IDA7CiAjZW5k aWYKLQotICAgIC8vIEZJWE1FOiBEZWxldGUgdGhlc2Ugb25jZSBhbGwgY2FsbGVycyBhcmUgdXNp bmcgQmFja0ZvcndhcmRDb250cm9sbGVyCi0gICAgLy8gaW5zdGVhZCBvZiBjYWxsaW5nIHRoaXMg ZGlyZWN0bHkuCi0gICAgSGlzdG9yeUl0ZW0qIGJhY2tJdGVtKCkgeyByZXR1cm4gaXRlbUF0SW5k ZXgoLTEpOyB9Ci0gICAgSGlzdG9yeUl0ZW0qIGN1cnJlbnRJdGVtKCkgeyByZXR1cm4gaXRlbUF0 SW5kZXgoMCk7IH0KLSAgICBIaXN0b3J5SXRlbSogZm9yd2FyZEl0ZW0oKSB7IHJldHVybiBpdGVt QXRJbmRleCgxKTsgfQogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IGY5MjBmOTdiNDZkNDNiYzY3MWU2OWFmMGYwZTM1MDFm NmQwZDMxNDAuLmJkYjQ5ZTdkYTM4MjJkMTU1NTE3NjRhZjQyZTZmYzMwYzQ2NzA4ZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTIwMDgsMjkgKzIwMDgsMjkgQEAgc3Rh dGljIGJvb2wgZmFzdERvY3VtZW50VGVhcmRvd25FbmFibGVkKCkKICAgICAvLyB0eXBlLiAgKFNl ZSBiZWhhdmlvciBtYXRyaXggYXQgdGhlIHRvcCBvZiBXZWJGcmFtZVByaXZhdGUuKSAgU28gd2Ug Y29weSBhbGwgdGhlIGl0ZW1zCiAgICAgLy8gaW4gdGhlIGJhY2sgZm9yd2FyZCBsaXN0LCBhbmQg Z28gdG8gdGhlIGN1cnJlbnQgb25lLgogCi0gICAgQmFja0ZvcndhcmRDbGllbnQqIGJhY2tGb3J3 YXJkQ2xpZW50ID0gX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7Ci0gICAg QVNTRVJUKCFiYWNrRm9yd2FyZENsaWVudC0+Y3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9u IGxpc3Qgc2hvdWxkIGJlIGVtcHR5CisgICAgQmFja0ZvcndhcmRDb250cm9sbGVyJiBiYWNrRm9y d2FyZCA9IF9wcml2YXRlLT5wYWdlLT5iYWNrRm9yd2FyZCgpOworICAgIEFTU0VSVCghYmFja0Zv cndhcmQuY3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9uIGxpc3Qgc2hvdWxkIGJlIGVtcHR5 CiAKLSAgICBCYWNrRm9yd2FyZENsaWVudCogb3RoZXJCYWNrRm9yd2FyZENsaWVudCA9IG90aGVy Vmlldy0+X3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7Ci0gICAgaWYgKCFv dGhlckJhY2tGb3J3YXJkQ2xpZW50LT5jdXJyZW50SXRlbSgpKQorICAgIEJhY2tGb3J3YXJkQ29u dHJvbGxlciYgb3RoZXJCYWNrRm9yd2FyZCA9IG90aGVyVmlldy0+X3ByaXZhdGUtPnBhZ2UtPmJh Y2tGb3J3YXJkKCk7CisgICAgaWYgKCFvdGhlckJhY2tGb3J3YXJkLmN1cnJlbnRJdGVtKCkpCiAg ICAgICAgIHJldHVybjsgLy8gZW1wdHkgYmFjayBmb3J3YXJkIGxpc3QsIGJhaWwKICAgICAKICAg ICBIaXN0b3J5SXRlbSogbmV3SXRlbVRvR29UbyA9IG51bGxwdHI7CiAKLSAgICBpbnQgbGFzdEl0 ZW1JbmRleCA9IG90aGVyQmFja0ZvcndhcmRDbGllbnQtPmZvcndhcmRMaXN0Q291bnQoKTsKLSAg ICBmb3IgKGludCBpID0gLW90aGVyQmFja0ZvcndhcmRDbGllbnQtPmJhY2tMaXN0Q291bnQoKTsg aSA8PSBsYXN0SXRlbUluZGV4OyArK2kpIHsKKyAgICBpbnQgbGFzdEl0ZW1JbmRleCA9IG90aGVy QmFja0ZvcndhcmQuZm9yd2FyZENvdW50KCk7CisgICAgZm9yIChpbnQgaSA9IC1vdGhlckJhY2tG b3J3YXJkLmJhY2tDb3VudCgpOyBpIDw9IGxhc3RJdGVtSW5kZXg7ICsraSkgewogICAgICAgICBp ZiAoaSA9PSAwKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGlzIGl0ZW0gaXMgc2hvd2luZyAsIHNh dmUgYXdheSBpdHMgY3VycmVudCBzY3JvbGwgYW5kIGZvcm0gc3RhdGUsCiAgICAgICAgICAgICAv LyBzaW5jZSB0aGF0IG1pZ2h0IGhhdmUgY2hhbmdlZCBzaW5jZSBsb2FkaW5nIGFuZCBpdCBpcyBu b3JtYWxseSBub3Qgc2F2ZWQKICAgICAgICAgICAgIC8vIHVudGlsIHdlIGxlYXZlIHRoYXQgcGFn ZS4KICAgICAgICAgICAgIG90aGVyVmlldy0+X3ByaXZhdGUtPnBhZ2UtPm1haW5GcmFtZSgpLmxv YWRlcigpLmhpc3RvcnkoKS5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgpOwogICAgICAgICB9 Ci0gICAgICAgIFJlZjxIaXN0b3J5SXRlbT4gbmV3SXRlbSA9IG90aGVyQmFja0ZvcndhcmRDbGll bnQtPml0ZW1BdEluZGV4KGkpLT5jb3B5KCk7CisgICAgICAgIFJlZjxIaXN0b3J5SXRlbT4gbmV3 SXRlbSA9IG90aGVyQmFja0ZvcndhcmQuaXRlbUF0SW5kZXgoaSktPmNvcHkoKTsKICAgICAgICAg aWYgKGkgPT0gMCkgCiAgICAgICAgICAgICBuZXdJdGVtVG9Hb1RvID0gbmV3SXRlbS5wdHIoKTsK LSAgICAgICAgYmFja0ZvcndhcmRDbGllbnQtPmFkZEl0ZW0oV1RGOjptb3ZlKG5ld0l0ZW0pKTsK KyAgICAgICAgYmFja0ZvcndhcmQuY2xpZW50KCktPmFkZEl0ZW0oV1RGOjptb3ZlKG5ld0l0ZW0p KTsKICAgICB9Ci0gICAgCisKICAgICBBU1NFUlQobmV3SXRlbVRvR29Ubyk7CiAgICAgX3ByaXZh dGUtPnBhZ2UtPmdvVG9JdGVtKCpuZXdJdGVtVG9Hb1RvLCBGcmFtZUxvYWRUeXBlOjpJbmRleGVk QmFja0ZvcndhcmQpOwogfQo= 252776 2015-05-09 08:34:50 -0700 2015-05-10 14:46:50 -0700 Patch bug-144827-20150510003330.patch text/plain 8083 sungmann.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzY1M2Q1MDQyZjU0NjY2 MmE2ZjVmMjNiOGU5NmI1NDRiODVmOTdlMS4uMjgxZGZhNzczZWRjMGRhNjNlOGZjZmQ2MjhiMGFm ZGQ4ZjBlYmJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA1LTA5ICBTdW5n bWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJjb3JwLmNvbT4KKworICAgICAgICBHZXQgcmlk IG9mIHRoZSBwdWJsaWMgaXRlbSBhY2Nlc3NvcnMgaW4gQmFja0ZvcndhcmRDbGllbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDgyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBiYWNrSXRl bSgpLCBjdXJyZW50SXRlbSgpLCBhbmQgZm9yd2FyZEl0ZW0oKSBmcm9tIEJhY2tGb3J3YXJkQ2xp ZW50LgorICAgICAgICBXZSBjYW4gc3RpbGwgdXNlIHRoZXNlIGZ1bmN0aW9uYWxpdGllcyB0aHJv dWdoIEJhY2tGb3J3YXJkQ29udHJvbGxlci4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRDbGllbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkJhY2tGb3J3YXJkQ2xpZW50OjpiYWNrSXRlbSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpCYWNrRm9yd2FyZENsaWVudDo6Y3VycmVudEl0ZW0pOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6QmFja0ZvcndhcmRDbGllbnQ6OmZvcndhcmRJdGVtKTog RGVsZXRlZC4KKwogMjAxNS0wNS0wOSAgWW9hdiBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAg ICAgICBSZW1vdmUgdGhlIFBJQ1RVUkVfU0laRVMgYnVpbGQgZmxhZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGZiODY0ZGNhYjNhY2EyYjJlMjU0MmMwZDQ2ZjM3YmM3MTNjYTE0ZGQuLjYyMmVmZjliYzY2 NDQ4ZmVlYmY3ODVlMWNjZjhkZTIxNjZkNWNkMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOCBAQAorMjAxNS0wNS0wOSAgU3VuZ21hbm4gQ2hvICA8c3VuZ21hbm4uY2hvQG5hdmVyY29y cC5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgcHVibGljIGl0ZW0gYWNjZXNzb3JzIGlu IEJhY2tGb3J3YXJkQ2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ4MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW1vdmUgYmFja0l0ZW0oKSwgY3VycmVudEl0ZW0oKSwgYW5kIGZvcndhcmRJ dGVtKCkgZnJvbSBCYWNrRm9yd2FyZENsaWVudC4KKyAgICAgICAgV2UgY2FuIHN0aWxsIHVzZSB0 aGVzZSBmdW5jdGlvbmFsaXRpZXMgdGhyb3VnaCBCYWNrRm9yd2FyZENvbnRyb2xsZXIuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2xvYWRCYWNrRm9yd2FyZExpc3RG cm9tT3RoZXJWaWV3Ol0pOgorCiAyMDE1LTA1LTA5ICBZb2F2IFdlaXNzICA8eW9hdkB5b2F2Lndz PgogCiAgICAgICAgIFJlbW92ZSB0aGUgUElDVFVSRV9TSVpFUyBidWlsZCBmbGFnCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkQ2xpZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkQ2xpZW50LmgKaW5kZXggMDgyMDQxNWZlODEwZmVk MTNjNWQ5ZGEyNmFlYmJmZjc3MGIwOWJmNi4uNzc4YWM4ZmYwYWFkMTgyNGE4MDdmYTVjYWJjOGQ2 MDI5M2Q2YTMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2Fy ZENsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRDbGllbnQu aApAQCAtNTksMTIgKzU5LDYgQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBDb25zaWRlciByZW5h bWluZyB0aGlzIG1ldGhvZCBvbmNlIHdlIHVwc3RyZWFtIHRoZSBpT1MgY2hhbmdlcyB0byBXZWJW aWV3Lm1tLgogICAgIHZpcnR1YWwgYm9vbCBjbGVhckFsbFBhZ2VDYWNoZXMoKSA9IDA7CiAjZW5k aWYKLQotICAgIC8vIEZJWE1FOiBEZWxldGUgdGhlc2Ugb25jZSBhbGwgY2FsbGVycyBhcmUgdXNp bmcgQmFja0ZvcndhcmRDb250cm9sbGVyCi0gICAgLy8gaW5zdGVhZCBvZiBjYWxsaW5nIHRoaXMg ZGlyZWN0bHkuCi0gICAgSGlzdG9yeUl0ZW0qIGJhY2tJdGVtKCkgeyByZXR1cm4gaXRlbUF0SW5k ZXgoLTEpOyB9Ci0gICAgSGlzdG9yeUl0ZW0qIGN1cnJlbnRJdGVtKCkgeyByZXR1cm4gaXRlbUF0 SW5kZXgoMCk7IH0KLSAgICBIaXN0b3J5SXRlbSogZm9yd2FyZEl0ZW0oKSB7IHJldHVybiBpdGVt QXRJbmRleCgxKTsgfQogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IGY5MjBmOTdiNDZkNDNiYzY3MWU2OWFmMGYwZTM1MDFm NmQwZDMxNDAuLmJkYjQ5ZTdkYTM4MjJkMTU1NTE3NjRhZjQyZTZmYzMwYzQ2NzA4ZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTIwMDgsMjkgKzIwMDgsMjkgQEAgc3Rh dGljIGJvb2wgZmFzdERvY3VtZW50VGVhcmRvd25FbmFibGVkKCkKICAgICAvLyB0eXBlLiAgKFNl ZSBiZWhhdmlvciBtYXRyaXggYXQgdGhlIHRvcCBvZiBXZWJGcmFtZVByaXZhdGUuKSAgU28gd2Ug Y29weSBhbGwgdGhlIGl0ZW1zCiAgICAgLy8gaW4gdGhlIGJhY2sgZm9yd2FyZCBsaXN0LCBhbmQg Z28gdG8gdGhlIGN1cnJlbnQgb25lLgogCi0gICAgQmFja0ZvcndhcmRDbGllbnQqIGJhY2tGb3J3 YXJkQ2xpZW50ID0gX3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7Ci0gICAg QVNTRVJUKCFiYWNrRm9yd2FyZENsaWVudC0+Y3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9u IGxpc3Qgc2hvdWxkIGJlIGVtcHR5CisgICAgQmFja0ZvcndhcmRDb250cm9sbGVyJiBiYWNrRm9y d2FyZCA9IF9wcml2YXRlLT5wYWdlLT5iYWNrRm9yd2FyZCgpOworICAgIEFTU0VSVCghYmFja0Zv cndhcmQuY3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9uIGxpc3Qgc2hvdWxkIGJlIGVtcHR5 CiAKLSAgICBCYWNrRm9yd2FyZENsaWVudCogb3RoZXJCYWNrRm9yd2FyZENsaWVudCA9IG90aGVy Vmlldy0+X3ByaXZhdGUtPnBhZ2UtPmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7Ci0gICAgaWYgKCFv dGhlckJhY2tGb3J3YXJkQ2xpZW50LT5jdXJyZW50SXRlbSgpKQorICAgIEJhY2tGb3J3YXJkQ29u dHJvbGxlciYgb3RoZXJCYWNrRm9yd2FyZCA9IG90aGVyVmlldy0+X3ByaXZhdGUtPnBhZ2UtPmJh Y2tGb3J3YXJkKCk7CisgICAgaWYgKCFvdGhlckJhY2tGb3J3YXJkLmN1cnJlbnRJdGVtKCkpCiAg ICAgICAgIHJldHVybjsgLy8gZW1wdHkgYmFjayBmb3J3YXJkIGxpc3QsIGJhaWwKICAgICAKICAg ICBIaXN0b3J5SXRlbSogbmV3SXRlbVRvR29UbyA9IG51bGxwdHI7CiAKLSAgICBpbnQgbGFzdEl0 ZW1JbmRleCA9IG90aGVyQmFja0ZvcndhcmRDbGllbnQtPmZvcndhcmRMaXN0Q291bnQoKTsKLSAg ICBmb3IgKGludCBpID0gLW90aGVyQmFja0ZvcndhcmRDbGllbnQtPmJhY2tMaXN0Q291bnQoKTsg aSA8PSBsYXN0SXRlbUluZGV4OyArK2kpIHsKKyAgICBpbnQgbGFzdEl0ZW1JbmRleCA9IG90aGVy QmFja0ZvcndhcmQuZm9yd2FyZENvdW50KCk7CisgICAgZm9yIChpbnQgaSA9IC1vdGhlckJhY2tG b3J3YXJkLmJhY2tDb3VudCgpOyBpIDw9IGxhc3RJdGVtSW5kZXg7ICsraSkgewogICAgICAgICBp ZiAoaSA9PSAwKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGlzIGl0ZW0gaXMgc2hvd2luZyAsIHNh dmUgYXdheSBpdHMgY3VycmVudCBzY3JvbGwgYW5kIGZvcm0gc3RhdGUsCiAgICAgICAgICAgICAv LyBzaW5jZSB0aGF0IG1pZ2h0IGhhdmUgY2hhbmdlZCBzaW5jZSBsb2FkaW5nIGFuZCBpdCBpcyBu b3JtYWxseSBub3Qgc2F2ZWQKICAgICAgICAgICAgIC8vIHVudGlsIHdlIGxlYXZlIHRoYXQgcGFn ZS4KICAgICAgICAgICAgIG90aGVyVmlldy0+X3ByaXZhdGUtPnBhZ2UtPm1haW5GcmFtZSgpLmxv YWRlcigpLmhpc3RvcnkoKS5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgpOwogICAgICAgICB9 Ci0gICAgICAgIFJlZjxIaXN0b3J5SXRlbT4gbmV3SXRlbSA9IG90aGVyQmFja0ZvcndhcmRDbGll bnQtPml0ZW1BdEluZGV4KGkpLT5jb3B5KCk7CisgICAgICAgIFJlZjxIaXN0b3J5SXRlbT4gbmV3 SXRlbSA9IG90aGVyQmFja0ZvcndhcmQuaXRlbUF0SW5kZXgoaSktPmNvcHkoKTsKICAgICAgICAg aWYgKGkgPT0gMCkgCiAgICAgICAgICAgICBuZXdJdGVtVG9Hb1RvID0gbmV3SXRlbS5wdHIoKTsK LSAgICAgICAgYmFja0ZvcndhcmRDbGllbnQtPmFkZEl0ZW0oV1RGOjptb3ZlKG5ld0l0ZW0pKTsK KyAgICAgICAgYmFja0ZvcndhcmQuY2xpZW50KCktPmFkZEl0ZW0oV1RGOjptb3ZlKG5ld0l0ZW0p KTsKICAgICB9Ci0gICAgCisKICAgICBBU1NFUlQobmV3SXRlbVRvR29Ubyk7CiAgICAgX3ByaXZh dGUtPnBhZ2UtPmdvVG9JdGVtKCpuZXdJdGVtVG9Hb1RvLCBGcmFtZUxvYWRUeXBlOjpJbmRleGVk QmFja0ZvcndhcmQpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAppbmRleCBlMDE1NzM0ZjQ0MDBkMGM4 NjA3OGE3YWY3MjFkZDhjZjNlMmVhNzJhLi4yM2E0ODZlODI0MTlmM2VlYjI0NmQ3MGE1NTkyNDAx ZmE0NWUyODQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcApAQCAtMzk2NSw3ICszOTY1LDcgQEAgSFJF U1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpjYW5Hb0JhY2soCiAgICAgICAgIC8qIFtp bl0gKi8gSVVua25vd24qIC8qc2VuZGVyKi8sCiAgICAgICAgIC8qIFtyZXR2YWxdW291dF0gKi8g Qk9PTCogcmVzdWx0KQogewotICAgICpyZXN1bHQgPSAhIShtX3BhZ2UtPmJhY2tGb3J3YXJkKCku Y2xpZW50KCktPmJhY2tJdGVtKCkgJiYgIW1fcGFnZS0+ZGVmZXJzTG9hZGluZygpKTsKKyAgICAq cmVzdWx0ID0gISEobV9wYWdlLT5iYWNrRm9yd2FyZCgpLmJhY2tJdGVtKCkgJiYgIW1fcGFnZS0+ ZGVmZXJzTG9hZGluZygpKTsKICAgICByZXR1cm4gU19PSzsKIH0KICAgICAKQEAgLTM5ODAsNyAr Mzk4MCw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6Y2FuR29Gb3J3YXJk KAogICAgICAgICAvKiBbaW5dICovIElVbmtub3duKiAvKnNlbmRlciovLAogICAgICAgICAvKiBb cmV0dmFsXVtvdXRdICovIEJPT0wqIHJlc3VsdCkKIHsKLSAgICAqcmVzdWx0ID0gISEobV9wYWdl LT5iYWNrRm9yd2FyZCgpLmNsaWVudCgpLT5mb3J3YXJkSXRlbSgpICYmICFtX3BhZ2UtPmRlZmVy c0xvYWRpbmcoKSk7CisgICAgKnJlc3VsdCA9ICEhKG1fcGFnZS0+YmFja0ZvcndhcmQoKS5mb3J3 YXJkSXRlbSgpICYmICFtX3BhZ2UtPmRlZmVyc0xvYWRpbmcoKSk7CiAgICAgcmV0dXJuIFNfT0s7 CiB9CiAgICAgCkBAIC01NDkxLDMwICs1NDkxLDMwIEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgV2ViVmlldzo6bG9hZEJhY2tGb3J3YXJkTGlzdEZyb21PdGhlclZpZXcoCiAgICAgLy8gSXQg dHVybnMgb3V0IHRoZSByaWdodCBjb21iaW5hdGlvbiBvZiBiZWhhdmlvciBpcyBkb25lIHdpdGgg dGhlIGJhY2svZm9yd2FyZCBsb2FkCiAgICAgLy8gdHlwZS4gIChTZWUgYmVoYXZpb3IgbWF0cml4 IGF0IHRoZSB0b3Agb2YgV2ViRnJhbWVQcml2YXRlLikgIFNvIHdlIGNvcHkgYWxsIHRoZSBpdGVt cwogICAgIC8vIGluIHRoZSBiYWNrIGZvcndhcmQgbGlzdCwgYW5kIGdvIHRvIHRoZSBjdXJyZW50 IG9uZS4KLSAgICBCYWNrRm9yd2FyZENsaWVudCogYmFja0ZvcndhcmRDbGllbnQgPSBtX3BhZ2Ut PmJhY2tGb3J3YXJkKCkuY2xpZW50KCk7Ci0gICAgQVNTRVJUKCFiYWNrRm9yd2FyZENsaWVudC0+ Y3VycmVudEl0ZW0oKSk7IC8vIGRlc3RpbmF0aW9uIGxpc3Qgc2hvdWxkIGJlIGVtcHR5CisgICAg QmFja0ZvcndhcmRDb250cm9sbGVyJiBiYWNrRm9yd2FyZCA9IG1fcGFnZS0+YmFja0ZvcndhcmQo KTsKKyAgICBBU1NFUlQoIWJhY2tGb3J3YXJkLmN1cnJlbnRJdGVtKCkpOyAvLyBkZXN0aW5hdGlv biBsaXN0IHNob3VsZCBiZSBlbXB0eQogCiAgICAgQ09NUHRyPFdlYlZpZXc+IG90aGVyV2ViVmll dzsKICAgICBpZiAoRkFJTEVEKG90aGVyVmlldy0+UXVlcnlJbnRlcmZhY2UoJm90aGVyV2ViVmll dykpKQogICAgICAgICByZXR1cm4gRV9GQUlMOwotICAgIEJhY2tGb3J3YXJkQ2xpZW50KiBvdGhl ckJhY2tGb3J3YXJkQ2xpZW50ID0gb3RoZXJXZWJWaWV3LT5tX3BhZ2UtPmJhY2tGb3J3YXJkKCku Y2xpZW50KCk7Ci0gICAgaWYgKCFvdGhlckJhY2tGb3J3YXJkQ2xpZW50LT5jdXJyZW50SXRlbSgp KQorICAgIEJhY2tGb3J3YXJkQ29udHJvbGxlciYgb3RoZXJCYWNrRm9yd2FyZCA9IG90aGVyV2Vi Vmlldy0+bV9wYWdlLT5iYWNrRm9yd2FyZCgpOworICAgIGlmICghb3RoZXJCYWNrRm9yd2FyZC5j dXJyZW50SXRlbSgpKQogICAgICAgICByZXR1cm4gU19PSzsgLy8gZW1wdHkgYmFjayBmb3J3YXJk IGxpc3QsIGJhaWwKICAgICAKICAgICBIaXN0b3J5SXRlbSogbmV3SXRlbVRvR29UbyA9IDA7CiAK LSAgICBpbnQgbGFzdEl0ZW1JbmRleCA9IG90aGVyQmFja0ZvcndhcmRDbGllbnQtPmZvcndhcmRM aXN0Q291bnQoKTsKLSAgICBmb3IgKGludCBpID0gLW90aGVyQmFja0ZvcndhcmRDbGllbnQtPmJh Y2tMaXN0Q291bnQoKTsgaSA8PSBsYXN0SXRlbUluZGV4OyArK2kpIHsKKyAgICBpbnQgbGFzdEl0 ZW1JbmRleCA9IG90aGVyQmFja0ZvcndhcmQuZm9yd2FyZENvdW50KCk7CisgICAgZm9yIChpbnQg aSA9IC1vdGhlckJhY2tGb3J3YXJkLmJhY2tDb3VudCgpOyBpIDw9IGxhc3RJdGVtSW5kZXg7ICsr aSkgewogICAgICAgICBpZiAoIWkpIHsKICAgICAgICAgICAgIC8vIElmIHRoaXMgaXRlbSBpcyBz aG93aW5nICwgc2F2ZSBhd2F5IGl0cyBjdXJyZW50IHNjcm9sbCBhbmQgZm9ybSBzdGF0ZSwKICAg ICAgICAgICAgIC8vIHNpbmNlIHRoYXQgbWlnaHQgaGF2ZSBjaGFuZ2VkIHNpbmNlIGxvYWRpbmcg YW5kIGl0IGlzIG5vcm1hbGx5IG5vdCBzYXZlZAogICAgICAgICAgICAgLy8gdW50aWwgd2UgbGVh dmUgdGhhdCBwYWdlLgogICAgICAgICAgICAgb3RoZXJXZWJWaWV3LT5tX3BhZ2UtPm1haW5GcmFt ZSgpLmxvYWRlcigpLmhpc3RvcnkoKS5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgpOwogICAg ICAgICB9Ci0gICAgICAgIFJlZjxIaXN0b3J5SXRlbT4gbmV3SXRlbSA9IG90aGVyQmFja0Zvcndh cmRDbGllbnQtPml0ZW1BdEluZGV4KGkpLT5jb3B5KCk7CisgICAgICAgIFJlZjxIaXN0b3J5SXRl bT4gbmV3SXRlbSA9IG90aGVyQmFja0ZvcndhcmQuaXRlbUF0SW5kZXgoaSktPmNvcHkoKTsKICAg ICAgICAgaWYgKCFpKSAKICAgICAgICAgICAgIG5ld0l0ZW1Ub0dvVG8gPSBuZXdJdGVtLnB0cigp OwotICAgICAgICBiYWNrRm9yd2FyZENsaWVudC0+YWRkSXRlbShXVEY6Om1vdmUobmV3SXRlbSkp OworICAgICAgICBiYWNrRm9yd2FyZC5jbGllbnQoKS0+YWRkSXRlbShXVEY6Om1vdmUobmV3SXRl bSkpOwogICAgIH0KICAgICAKICAgICBBU1NFUlQobmV3SXRlbVRvR29Ubyk7Cg==