89173 2012-06-14 22:57:28 -0700 [WK2][EFL] Implement navigation back/forward in Ewk_View 2012-06-15 03:59:05 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez kenneth ryuan.choi webkit.review.bot oldest_to_newest 649904 0 cdumez 2012-06-14 22:57:28 -0700 There is currently to way to navigate back or forward in Ewk_View. This functionality would be useful to the MiniBrowser as well. 649919 1 147744 cdumez 2012-06-14 23:29:16 -0700 Created attachment 147744 Patch 649992 2 147744 cdumez 2012-06-15 00:59:33 -0700 Comment on attachment 147744 Patch Clearing cq flag for now as the patch will need rebasing due to another patch in the commit queue. 650058 3 147781 cdumez 2012-06-15 03:23:23 -0700 Created attachment 147781 Patch for landing Rebase on master. Could someone please cq+? 650071 4 147781 webkit.review.bot 2012-06-15 03:59:00 -0700 Comment on attachment 147781 Patch for landing Clearing flags on attachment: 147781 Committed r120437: <http://trac.webkit.org/changeset/120437> 650072 5 webkit.review.bot 2012-06-15 03:59:05 -0700 All reviewed patches have been landed. Closing bug. 147744 2012-06-14 23:29:16 -0700 2012-06-15 03:23:23 -0700 Patch 89173_view_navigation.patch text/plain 6991 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzMGRlYTUzLi5hMzhhMTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDYtMTQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXVtFRkxdIEltcGxlbWVudCBuYXZpZ2F0aW9uIGJhY2svZm9y d2FyZCBpbiBFd2tfVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODkxNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgQVBJIGZvciBFd2tfVmlldyB0byBhc2sgdGhlIG1haW4gZnJhbWUgdG8gbmF2 aWdhdGUgYmFja3dhcmRzCisgICAgICAgIG9yIGZvcndhcmRzIGluIGhpc3RvcnkuIEFsc28gYWRk IEFQSSB0byBxdWVyeSBpZiBzdWNoIG5hdmlnYXRpb24KKyAgICAgICAgaXMgcG9zc2libGUuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tf dmlld19iYWNrKToKKyAgICAgICAgKGV3a192aWV3X2ZvcndhcmQpOgorICAgICAgICAoZXdrX3Zp ZXdfYmFja19wb3NzaWJsZSk6CisgICAgICAgIChld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorCiAyMDEyLTA2LTE0ICBL ZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBWYWxpZGF0ZSBmb3Jt IHN0YXRlIHN0cmluZ3MgaW4gRm9ybUNvbnRyb2xsZXI6OnNldFN0YXRlRm9yTmV3Rm9ybUVsZW1l bnRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApp bmRleCBkZTJhYTg5Li4xYTZjYmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC01MzIsNiArNTMyLDQ4IEBAIHZvaWQgZXdrX3ZpZXdfZGlz cGxheShFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBldmFz X29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQoc21hcnREYXRhLT5pbWFnZSwgcmVjdC54KCks IHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogfQogCitFaW5hX0Jvb2wg ZXdrX3ZpZXdfYmFjayhFdmFzX09iamVjdCogZXdrVmlldykKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BS SVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKworICAgIFdLUGFnZVJl ZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKTsKKyAgICBpZiAoV0tQ YWdlQ2FuR29CYWNrKHBhZ2VSZWYpKSB7CisgICAgICAgIFdLUGFnZUdvQmFjayhwYWdlUmVmKTsK KyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKworRWlu YV9Cb29sIGV3a192aWV3X2ZvcndhcmQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdL X1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBF V0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisKKyAg ICBXS1BhZ2VSZWYgcGFnZVJlZiA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7Cisg ICAgaWYgKFdLUGFnZUNhbkdvRm9yd2FyZChwYWdlUmVmKSkgeworICAgICAgICBXS1BhZ2VHb0Zv cndhcmQocGFnZVJlZik7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19iYWNrX3Bvc3NpYmxlKEV2YXNfT2JqZWN0 KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21h cnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0 YSwgcHJpdiwgZmFsc2UpOworCisgICAgcmV0dXJuIFdLUGFnZUNhbkdvQmFjayh0b0FQSShwcml2 LT5wYWdlQ2xpZW50LT5wYWdlKCkpKTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X2ZvcndhcmRf cG9zc2libGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09S X1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisKKyAgICByZXR1cm4gV0tQYWdl Q2FuR29Gb3J3YXJkKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworfQorCiB2b2lk IGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCB2b2lkKiBpbWFn ZURhdGEsIGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JF VFVSTihld2tWaWV3LCBzbWFydERhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmgKaW5kZXggMWRiNGY1ZS4uODIxNmU0YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xNjQsNiArMTY0LDQ3IEBAIEVBUEkg RWluYV9Cb29sIGV3a192aWV3X3VyaV9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnVy aSk7CiAgKi8KIEVBUEkgY29uc3QgY2hhciAqZXdrX3ZpZXdfdXJpX2dldChjb25zdCBFdmFzX09i amVjdCAqbyk7CiAKKy8qKgorICogQXNrcyB0aGUgbWFpbiBmcmFtZSB0byBuYXZpZ2F0ZSBiYWNr IGluIHRoZSBoaXN0b3J5LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIG5hdmlnYXRl IGJhY2sKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFf RkFMU0Ugb3RoZXJ3aXNlCisgKgorICogQHNlZSBld2tfZnJhbWVfYmFjaygpCisgKi8KK0VBUEkg RWluYV9Cb29sICAgIGV3a192aWV3X2JhY2soRXZhc19PYmplY3QgKm8pOworCisvKioKKyAqIEFz a3MgdGhlIG1haW4gZnJhbWUgdG8gbmF2aWdhdGUgZm9yd2FyZCBpbiB0aGUgaGlzdG9yeS4KKyAq CisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBuYXZpZ2F0ZSBmb3J3YXJkCisgKgorICogQHJl dHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQor ICoKKyAqIEBzZWUgZXdrX2ZyYW1lX2ZvcndhcmQoKQorICovCitFQVBJIEVpbmFfQm9vbCAgICBl d2tfdmlld19mb3J3YXJkKEV2YXNfT2JqZWN0ICpvKTsKKworLyoqCisgKiBRdWVyaWVzIGlmIGl0 IGlzIHBvc3NpYmxlIHRvIG5hdmlnYXRlIGJhY2t3YXJkcyBvbmUgaXRlbSBpbiB0aGUgaGlzdG9y eS4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBxdWVyeSBpZiBiYWNrd2FyZCBuYXZp Z2F0aW9uIGlzIHBvc3NpYmxlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgaXQgaXMg cG9zc2libGUgdG8gbmF2aWdhdGUgYmFja3dhcmRzIGluIHRoZSBoaXN0b3J5LCBAYyBFSU5BX0ZB TFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19iYWNrX3Bvc3Np YmxlKEV2YXNfT2JqZWN0ICpvKTsKKworLyoqCisgKiBRdWVyaWVzIGlmIGl0IGlzIHBvc3NpYmxl IHRvIG5hdmlnYXRlIGZvcndhcmRzIG9uZSBpdGVtIGluIHRoZSBoaXN0b3J5LgorICoKKyAqIEBw YXJhbSBvIHZpZXcgb2JqZWN0IHRvIHF1ZXJ5IGlmIGZvcndhcmQgbmF2aWdhdGlvbiBpcyBwb3Nz aWJsZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGl0IGlzIHBvc3NpYmxlIHRvIG5h dmlnYXRlIGZvcndhcmRzIGluIHRoZSBoaXN0b3J5LCBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQor ICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKEV2YXNfT2Jq ZWN0ICpvKTsKKworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDhjYjUyZmEuLmRmOTcwZjMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMi0wNi0xNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVt ZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtXSzJdW0VGTF0gSW1wbGVtZW50IG5hdmlnYXRpb24g YmFjay9mb3J3YXJkIGluIEV3a19WaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04OTE3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCBuYXZpZ2F0aW9uIGJhY2sgLyBmb3J3YXJkIGluIE1p bmlCcm93c2VyLiBVc2UKKyAgICAgICAgJ0YxJyB0byBuYXZpZ2F0ZSBiYWNrIGFuZCAnRjInIHRv IG5hdmlnYXRlIGZvcndhcmQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgor ICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6CisKIDIwMTIt MDYtMTQgIFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW0tQW5kcm9pZF0gSW5pdGlhbGl6ZSBmb250IHJlbmRlcmluZyBpbiBEdW1wUmVu ZGVyVHJlZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xz L01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggYzg1ZmYyZi4uZTIzYzA4MiAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9l ZmwvbWFpbi5jCkBAIC0yNiw2ICsyNiwxNCBAQCBzdGF0aWMgY29uc3QgaW50IERFRkFVTFRfV0lE VEggPSA4MDA7CiBzdGF0aWMgY29uc3QgaW50IERFRkFVTFRfSEVJR0hUID0gNjAwOwogc3RhdGlj IGNvbnN0IGNoYXIgREVGQVVMVF9VUkxbXSA9ICJodHRwOi8vd3d3Lmdvb2dsZS5jb20vIjsKIAor I2RlZmluZSBpbmZvKGZvcm1hdCwgYXJncy4uLikgICAgICAgXAorICAgIGRvIHsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAorICAgICAgICBpZiAodmVyYm9zZSkgICAgICAgICAgICAgICAg XAorICAgICAgICAgICAgcHJpbnRmKGZvcm1hdCwgIyNhcmdzKTsgXAorICAgIH0gd2hpbGUgKDAp CisKK3N0YXRpYyBpbnQgdmVyYm9zZSA9IDA7CisKIHR5cGVkZWYgc3RydWN0IF9NaW5pQnJvd3Nl ciB7CiAgICAgRWNvcmVfRXZhcyAqZWU7CiAgICAgRXZhcyAqZXZhczsKQEAgLTU2LDYgKzY0LDIx IEBAIHN0YXRpYyB2b2lkIG9uX2Vjb3JlX2V2YXNfcmVzaXplKEVjb3JlX0V2YXMgKmVlKQogICAg IGV2YXNfb2JqZWN0X3Jlc2l6ZSh3ZWJ2aWV3LCB3LCBoKTsKIH0KIAorc3RhdGljIHZvaWQKK29u X2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2 ZW50X2luZm8pCit7CisgICAgRXZhc19FdmVudF9LZXlfRG93biAqZXYgPSAoRXZhc19FdmVudF9L ZXlfRG93biopIGV2ZW50X2luZm87CisgICAgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkYxIikpIHsK KyAgICAgICAgaW5mbygiQmFjayAoRjEpIHdhcyBwcmVzc2VkXG4iKTsKKyAgICAgICAgaWYgKCFl d2tfdmlld19iYWNrKG9iaikpCisgICAgICAgICAgICBpbmZvKCJCYWNrIGlnbm9yZWQ6IE5vIGJh Y2sgaGlzdG9yeVxuIik7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMiIpKSB7 CisgICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3YXMgcHJlc3NlZFxuIik7CisgICAgICAgIGlm ICghZXdrX3ZpZXdfZm9yd2FyZChvYmopKQorICAgICAgICAgICAgaW5mbygiRm9yd2FyZCBpZ25v cmVkOiBObyBmb3J3YXJkIGhpc3RvcnlcbiIpOworICAgIH0KK30KKwogc3RhdGljIE1pbmlCcm93 c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKIHsKICAgICBNaW5pQnJvd3NlciAq YXBwID0gbWFsbG9jKHNpemVvZihNaW5pQnJvd3NlcikpOwpAQCAtODEsOCArMTA0LDEwIEBAIHN0 YXRpYyBNaW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwpCiAgICAgLyog Q3JlYXRlIHdlYnZpZXcgKi8KICAgICBhcHAtPmJyb3dzZXIgPSBld2tfdmlld19hZGQoYXBwLT5l dmFzKTsKICAgICBldmFzX29iamVjdF9uYW1lX3NldChhcHAtPmJyb3dzZXIsICJicm93c2VyIik7 Ci0gICAgZXZhc19vYmplY3Rfc2l6ZV9oaW50X3dlaWdodF9zZXQoYXBwLT5icm93c2VyLCBFVkFT X0hJTlRfRVhQQU5ELCBFVkFTX0hJTlRfRVhQQU5EKTsKIAorICAgIGV2YXNfb2JqZWN0X2V2ZW50 X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tfS0VZX0RPV04sIG9uX2tl eV9kb3duLCBhcHApOworCisgICAgZXZhc19vYmplY3Rfc2l6ZV9oaW50X3dlaWdodF9zZXQoYXBw LT5icm93c2VyLCBFVkFTX0hJTlRfRVhQQU5ELCBFVkFTX0hJTlRfRVhQQU5EKTsKICAgICBldmFz X29iamVjdF9yZXNpemUoYXBwLT5icm93c2VyLCBERUZBVUxUX1dJRFRILCBERUZBVUxUX0hFSUdI VCk7CiAgICAgZXZhc19vYmplY3Rfc2hvdyhhcHAtPmJyb3dzZXIpOwogICAgIGV2YXNfb2JqZWN0 X2ZvY3VzX3NldChhcHAtPmJyb3dzZXIsIEVJTkFfVFJVRSk7Cg== 147781 2012-06-15 03:23:23 -0700 2012-06-15 03:59:00 -0700 Patch for landing 89173_view_navigation.patch text/plain 6012 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1OTQxNTAxLi5iY2YwMDQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTItMDYtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXVtFRkxdIEltcGxlbWVudCBuYXZpZ2F0aW9uIGJhY2svZm9y d2FyZCBpbiBFd2tfVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODkxNzMKKworICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlz dGlhbnNlbi4KKworICAgICAgICBBZGQgQVBJIGZvciBFd2tfVmlldyB0byBhc2sgdGhlIG1haW4g ZnJhbWUgdG8gbmF2aWdhdGUgYmFja3dhcmRzCisgICAgICAgIG9yIGZvcndhcmRzIGluIGhpc3Rv cnkuIEFsc28gYWRkIEFQSSB0byBxdWVyeSBpZiBzdWNoIG5hdmlnYXRpb24KKyAgICAgICAgaXMg cG9zc2libGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6Cisg ICAgICAgIChld2tfdmlld19iYWNrKToKKyAgICAgICAgKGV3a192aWV3X2ZvcndhcmQpOgorICAg ICAgICAoZXdrX3ZpZXdfYmFja19wb3NzaWJsZSk6CisgICAgICAgIChld2tfdmlld19mb3J3YXJk X3Bvc3NpYmxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorCisy MDEyLTA2LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+ CisKICAgICAgICAgW0VGTF1bV0syXSBJbXBsZW1lbnQgcmVsb2FkIC8gc3RvcCBpbiBFd2tfVmll dwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxNjgK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4 IDU2OTQ3ZjIuLjY1YmE4ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5jcHAKQEAgLTU1MSw2ICs1NTEsNDggQEAgdm9pZCBld2tfdmlld19kaXNwbGF5 KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIGV2YXNfb2Jq ZWN0X2ltYWdlX2RhdGFfdXBkYXRlX2FkZChzbWFydERhdGEtPmltYWdlLCByZWN0LngoKSwgcmVj dC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CiB9CiAKK0VpbmFfQm9vbCBld2tf dmlld19iYWNrKEV2YXNfT2JqZWN0KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOworCisgICAgV0tQYWdlUmVmIHBh Z2VSZWYgPSB0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpOworICAgIGlmIChXS1BhZ2VD YW5Hb0JhY2socGFnZVJlZikpIHsKKyAgICAgICAgV0tQYWdlR29CYWNrKHBhZ2VSZWYpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCitFaW5hX0Jv b2wgZXdrX3ZpZXdfZm9yd2FyZChFdmFzX09iamVjdCogZXdrVmlldykKK3sKKyAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKworICAgIFdL UGFnZVJlZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKTsKKyAgICBp ZiAoV0tQYWdlQ2FuR29Gb3J3YXJkKHBhZ2VSZWYpKSB7CisgICAgICAgIFdLUGFnZUdvRm9yd2Fy ZChwYWdlUmVmKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxz ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X2JhY2tfcG9zc2libGUoRXZhc19PYmplY3QqIGV3 a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERh dGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2LCBmYWxzZSk7CisKKyAgICByZXR1cm4gV0tQYWdlQ2FuR29CYWNrKHRvQVBJKHByaXYtPnBh Z2VDbGllbnQtPnBhZ2UoKSkpOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfZm9yd2FyZF9wb3Nz aWJsZShFdmFzX09iamVjdCogZXdrVmlldykKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVU VVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKworICAgIHJldHVybiBXS1BhZ2VDYW5H b0ZvcndhcmQodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7Cit9CisKIHZvaWQgZXdr X3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZvaWQqIGltYWdlRGF0 YSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJO KGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaAppbmRleCBhMjY4YTI2Li42YTJmYmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTE4NSw2ICsxODUsNDYgQEAgRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfcmVsb2FkKEV2YXNfT2JqZWN0ICpvKTsKICAqLwogRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc3RvcChFdmFzX09iamVjdCAqbyk7CiAKKy8qCisgKiBBc2tzIHRo ZSBtYWluIGZyYW1lIHRvIG5hdmlnYXRlIGJhY2sgaW4gdGhlIGhpc3RvcnkuCisgKgorICogQHBh cmFtIG8gdmlldyBvYmplY3QgdG8gbmF2aWdhdGUgYmFjaworICoKKyAqIEByZXR1cm4gQGMgRUlO QV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKKyAqCisgKiBAc2Vl IGV3a19mcmFtZV9iYWNrKCkKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfYmFjayhF dmFzX09iamVjdCAqbyk7CisKKy8qKgorICogQXNrcyB0aGUgbWFpbiBmcmFtZSB0byBuYXZpZ2F0 ZSBmb3J3YXJkIGluIHRoZSBoaXN0b3J5LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IG5hdmlnYXRlIGZvcndhcmQKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNz IG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKgorICogQHNlZSBld2tfZnJhbWVfZm9yd2Fy ZCgpCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X2ZvcndhcmQoRXZhc19PYmplY3Qg Km8pOworCisvKioKKyAqIFF1ZXJpZXMgaWYgaXQgaXMgcG9zc2libGUgdG8gbmF2aWdhdGUgYmFj a3dhcmRzIG9uZSBpdGVtIGluIHRoZSBoaXN0b3J5LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2Jq ZWN0IHRvIHF1ZXJ5IGlmIGJhY2t3YXJkIG5hdmlnYXRpb24gaXMgcG9zc2libGUKKyAqCisgKiBA cmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBpdCBpcyBwb3NzaWJsZSB0byBuYXZpZ2F0ZSBiYWNrd2Fy ZHMgaW4gdGhlIGhpc3RvcnksIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWlu YV9Cb29sICAgIGV3a192aWV3X2JhY2tfcG9zc2libGUoRXZhc19PYmplY3QgKm8pOworCisvKioK KyAqIFF1ZXJpZXMgaWYgaXQgaXMgcG9zc2libGUgdG8gbmF2aWdhdGUgZm9yd2FyZHMgb25lIGl0 ZW0gaW4gdGhlIGhpc3RvcnkuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gcXVlcnkg aWYgZm9yd2FyZCBuYXZpZ2F0aW9uIGlzIHBvc3NpYmxlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgaWYgaXQgaXMgcG9zc2libGUgdG8gbmF2aWdhdGUgZm9yd2FyZHMgaW4gdGhlIGhpc3Rv cnksIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192 aWV3X2ZvcndhcmRfcG9zc2libGUoRXZhc19PYmplY3QgKm8pOworCiAjaWZkZWYgX19jcGx1c3Bs dXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDRkMjYxYTIuLjA1YjA3YzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMi0wNi0xNSAgQ2hyaXN0 b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCisgICAgICAgIFtXSzJd W0VGTF0gSW1wbGVtZW50IG5hdmlnYXRpb24gYmFjay9mb3J3YXJkIGluIEV3a19WaWV3CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE3MworCisgICAg ICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIElt cGxlbWVudCBuYXZpZ2F0aW9uIGJhY2sgLyBmb3J3YXJkIGluIE1pbmlCcm93c2VyLiBVc2UKKyAg ICAgICAgJ0YxJyB0byBuYXZpZ2F0ZSBiYWNrIGFuZCAnRjInIHRvIG5hdmlnYXRlIGZvcndhcmQu CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rv d24pOgorCisyMDEyLTA2LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBp bnRlbC5jb20+CisKICAgICAgICAgW0VGTF0gRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9l cyBub3Qgc3VwcG9ydCB0aXRsZVRleHREaXJlY3Rpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDc1CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDg4 MGJmOGIuLmFjOTgxNGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNjksNyArNjksMTUgQEAgc3Rh dGljIHZvaWQKIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpv YmosIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAgRXZhc19FdmVudF9LZXlfRG93biAqZXYgPSAo RXZhc19FdmVudF9LZXlfRG93biopIGV2ZW50X2luZm87Ci0gICAgaWYgKCFzdHJjbXAoZXYtPmtl eSwgIkY1IikpIHsKKyAgICBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEiKSkgeworICAgICAgICBp bmZvKCJCYWNrIChGMSkgd2FzIHByZXNzZWRcbiIpOworICAgICAgICBpZiAoIWV3a192aWV3X2Jh Y2sob2JqKSkKKyAgICAgICAgICAgIGluZm8oIkJhY2sgaWdub3JlZDogTm8gYmFjayBoaXN0b3J5 XG4iKTsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkYyIikpIHsKKyAgICAgICAg aW5mbygiRm9yd2FyZCAoRjIpIHdhcyBwcmVzc2VkXG4iKTsKKyAgICAgICAgaWYgKCFld2tfdmll d19mb3J3YXJkKG9iaikpCisgICAgICAgICAgICBpbmZvKCJGb3J3YXJkIGlnbm9yZWQ6IE5vIGZv cndhcmQgaGlzdG9yeVxuIik7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNSIp KSB7CiAgICAgICAgICAgICBpbmZvKCJSZWxvYWQgKEY1KSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5n LlxuIik7CiAgICAgICAgICAgICBld2tfdmlld19yZWxvYWQob2JqKTsKICAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgIkY2IikpIHsK